Merge branch 'dev' of gitlab2.dui88.com:wanghongyuan/xiaoxiaole into dev

egret/index.html

@@ -44,6 +44,8 @@
     <script src="libs/security.js"></script>
     <script src="libs/downloadApp.js"></script>
     <script src="libs/svga.egret.min.js"></script>
+    <script src="libs/aes.js"></script>
+    <script src="libs/pad-zeropadding.js"></script>
     <script>
         window['price1']=1;
         window['price2']=2;

egret/libs/pad-zeropadding.js

+/*
+CryptoJS v3.1.2
+code.google.com/p/crypto-js
+(c) 2009-2013 by Jeff Mott. All rights reserved.
+code.google.com/p/crypto-js/wiki/License
+*/
+/**
+ * Zero padding strategy.
+ */
+CryptoJS.pad.ZeroPadding = {
+    pad: function (data, blockSize) {
+        // Shortcut
+        var blockSizeBytes = blockSize * 4;
+
+        // Pad
+        data.clamp();
+        data.sigBytes += blockSizeBytes - ((data.sigBytes % blockSizeBytes) || blockSizeBytes);
+    },
+
+    unpad: function (data) {
+        // Shortcut
+        var dataWords = data.words;
+
+        // Unpad
+        var i = data.sigBytes - 1;
+        while (!((dataWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff)) {
+            i--;
+        }
+        data.sigBytes = i + 1;
+    }
+};

egret/src/mainScene/MainScene.ts

@@ -199,10 +199,10 @@ export default class MainScene extends Scene {
         Tool.init();
         //第几关
         this.chapter = (data && data.chapter) ? data.chapter : 1;
-        // this.chapter = 20;
+        // this.chapter = 33;
         this.chapterTxt.text = "第" + this.chapter + "关";
-        //关卡数据
-        this.chapterData = Chapters[this.chapter];
+        //关卡数据,1期定制，70,后面35关地图一致，步数减少
+        this.chapterData = Chapters[this.chapter % 35 || 35];
         this.initUi();
         this.initSvgas();
         //先禁掉事件
@@ -212,8 +212,16 @@ export default class MainScene extends Scene {
         NetManager.ins.showLog(getlogItem(10))
         NetManager.ins.showLog(getlogItem(13))
 
-        //步数初始化
+        //步数初始化,1期定制，
+        if (this.chapter > 56) {
+            this.steps = this.chapterData.stepCount - 7;
+        }
+        else if (this.chapter > 35) {
+            this.steps = this.chapterData.stepCount - 4;
+        } else {
             this.steps = this.chapterData.stepCount;
+        }
+
         //分数置0
         this.score = 0;
         //通关目标,如果通关目标是元素时，赋值this.passElements，否则
@@ -253,7 +261,7 @@ export default class MainScene extends Scene {
         // } else {
         // }
         //开启事件，具体不应该放在这里，到时看
-        this.enableMouseEvt(true);
+        // this.enableMouseEvt(true);
         //测试代码
         var fail = new eui.Image(RES.getRes("guideKnowBtn_png"));
         fail.x = 10;
@@ -477,9 +485,16 @@ export default class MainScene extends Scene {
             //替换顺序
             this.upsetElement();
         }
-        // else {
-        //     this.enableMouseEvt(true);
-        // }
+        else {
+            this.enableMouseEvt(true);
+        }
+        //第35和70，要枷锁元素,定制，2期去掉
+        if (this.chapter == 35 || this.chapter == 70) {
+            var locks = [4, 13, 22, 31, 40, 49, 57, 58, 59, 66, 67, 68, 75, 76, 77, 63, 64, 72, 73, 70, 71, 79, 80];
+            for (var aaa = 0; aaa < locks.length; aaa++) {
+                this.lattices[locks[aaa]].element.isLock = true;
+            }
+        }
     }
 
     /**

egret/src/something/Chapters.ts

@@ -986,7 +986,7 @@ export const Chapters: ChapterData[] = [
     {
         map: {
             lattices: [
-                1, 1, 4, 1, 1, 1, 1, 1, 4,
+                4, 1, 4, 1, 1, 1, 4, 1, 4,
                 1, 1, 1, 1, 1, 1, 1, 1, 1,
                 1, 1, 0, 0, 1, 0, 0, 1, 1,
                 1, 1, 0, 1, 1, 1, 0, 1, 1,
@@ -996,11 +996,11 @@ export const Chapters: ChapterData[] = [
                 1, 1, 1, 1, 1, 1, 1, 1, 1,
                 1, 1, 1, 1, 1, 1, 1, 1, 1,
             ],
-            generateLats: [0, 1, 2, 3, 5, 6, 7, 8],
+            generateLats: [0, 1, 2, 3, 4, 5, 6, 7, 8],
         },
-        baseElementTypes: [0, 1, 2, 3, 4],
+        baseElementTypes: [0, 1, 2, 3],
         effectInitProbability: 0.1,
-        stepCount: 30,
+        stepCount: 40,
         passTarget: {
             type: PassType.ELEMENT_TARGET,
             elements: [
@@ -1050,4 +1050,38 @@ export const Chapters: ChapterData[] = [
             150000
         ]
     },
+    //第三十五关
+    {
+        map: {
+            lattices: [
+                1, 1, 1, 1, 3, 1, 1, 1, 1,
+                1, 1, 1, 1, 3, 1, 1, 1, 1,
+                1, 1, 1, 1, 3, 1, 1, 1, 1,
+                1, 1, 1, 1, 3, 1, 1, 1, 1,
+                1, 1, 1, 1, 3, 1, 1, 1, 1,
+                1, 1, 1, 1, 3, 1, 1, 1, 1,
+                5, 5, 5, 3, 3, 3, 5, 5, 5,
+                3, 3, 5, 3, 3, 3, 5, 3, 3,
+                3, 3, 5, 3, 3, 3, 5, 3, 3,
+            ],
+            generateLats: [0, 1, 2, 3, 5, 6, 7, 8],
+        },
+        baseElementTypes: [0, 1, 2, 3, 4],
+        effectInitProbability: 0.05,
+        stepCount: 40,
+        passTarget: {
+            type: PassType.ELEMENT_TARGET,
+            elements: [
+                {
+                    type: ElementType.ICE,
+                    count: 23
+                }
+            ],
+        },
+        starScores: [
+            30000,
+            40000,
+            60000
+        ]
+    },
 ]
\ No newline at end of file