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

egret/src/mainScene/MainScene.ts

@@ -199,10 +199,19 @@ export default class MainScene extends Scene {
         Tool.init();
         //第几关
         this.chapter = (data && data.chapter) ? data.chapter : 1;
-        // this.chapter = 70;
+        // this.chapter = 19;
         this.chapterTxt.text = "第" + this.chapter + "关";
         //关卡数据,1期定制，70,后面35关地图一致，步数减少
-        this.chapterData = Chapters[this.chapter % 35 || 35];
+        var mapDataIndex = this.chapter;
+        if (this.chapter >= 57) {
+            //循环20到33
+            mapDataIndex = this.chapter - 37
+        }
+        else if (this.chapter >= 36) {
+            //循环15到35
+            mapDataIndex = this.chapter - 21
+        }
+        this.chapterData = Chapters[mapDataIndex];
         this.initUi();
         this.initSvgas();
         //先禁掉事件

egret/src/something/Chapters.ts

@@ -552,27 +552,32 @@ export const Chapters: ChapterData[] = [
     {
         map: {
             lattices: [
-                1, 1, 1, 0, 1, 1, 1, 1, 1,
-                1, 1, 1, 0, 1, 1, 1, 1, 1,
-                1, 1, 1, 0, 1, 1, 1, 1, 1,
-                1, 1, 1, 0, 1, 1, 1, 1, 1,
-                0, 0, 0, 0, 1, 1, 1, 1, 1,
-                1, 1, 1, 0, 1, 1, 1, 1, 1,
-                1, 1, 1, 0, 1, 1, 1, 1, 1,
-                1, 1, 1, 0, 1, 1, 1, 1, 1,
-                1, 1, 1, 0, 1, 1, 1, 1, 1,
+                0, 1, 1, 5, 1, 5, 1, 1, 0,
+                0, 1, 1, 5, 1, 5, 1, 1, 0,
+                0, 1, 1, 5, 4, 5, 1, 1, 0,
+                0, 1, 5, 5, 5, 5, 5, 1, 0,
+                0, 1, 1, 5, 5, 5, 1, 1, 0,
+                1, 1, 1, 1, 5, 1, 1, 1, 1,
+                0, 1, 1, 1, 1, 1, 1, 1, 0,
+                0, 0, 1, 1, 4, 1, 1, 0, 0,
+                0, 0, 0, 1, 1, 1, 0, 0, 0,
             ],
-            generateLats: [0, 1, 2, 4, 5, 6, 7, 8],
-            connectedLats: [[27, 45], [28, 46], [29, 47]]
+            generateLats: [0, 1, 2, 3, 4, 5, 6, 7, 8],
+            // connectedLats: [[27, 45], [28, 46], [29, 47]]
         },
-        baseElementTypes: [0, 1, 2, 4],
+        baseElementTypes: [0, 1, 2, 3],
         effectInitProbability: 0.05,
-        stepCount: 15,
+        stepCount: 22,
         passTarget: {
-            type: PassType.SCORE_TARGET,
-            score: 18000
+            type: PassType.ELEMENT_TARGET,
+            elements: [
+                {
+                    type: ElementType.LOLLIPOP,
+                    count: 2
+                }
+            ]
         },
-        starScores: [8000, 12000, 18000]
+        starScores: [8000, 12000, 15000]
     },
     //第二十关
     {