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

egret/src/mainScene/MainScene.ts

@@ -217,7 +217,8 @@ export default class MainScene extends Scene {
         this.chapterTxt.text = "第" + this.chapter + "关";
         //关卡数据,1期定制，70,后面35关地图一致，步数减少
         var mapDataIndex = this.chapter;
-        if (this.chapter >= 56) {
+        //56到70的话，中间36到50
+        if (this.chapter >= 56 && this.chapter <= 70) {
             //循环36到50
             mapDataIndex = this.chapter - 20
         }
@@ -233,8 +234,8 @@ export default class MainScene extends Scene {
         NetManager.ins.showLog(getlogItem(10))
         NetManager.ins.showLog(getlogItem(13))
 
-        //步数初始化,1期定制，
-        if (this.chapter >= 56) {
+        //步数初始化,1期定制，56到70的话
+        if (this.chapter >= 56 && this.chapter <= 70) {
             this.steps = this.chapterData.stepCount - 4;
         }
         else {
@@ -2373,7 +2374,7 @@ export default class MainScene extends Scene {
         Loading2.instace.show();
         NetManager.ins.hc_submit((s, data) => {
             if (s) {
-                wait(200).then(()=>{
+                wait(200).then(() => {
                     updateMainTimerAfterGetData();//submit之后再判断一次home,更新倒计时
                 });
                 const submitData = DataManager.ins.getData('hc_submit').data;

egret/src/panels/StartPanel.ts

@@ -28,7 +28,7 @@ export default class StartPanel extends Panel {
         this['levelTxt'].text = `第${data}关`;
         this._level = data;
         let mapDataIndex = data;
-        if (data >= 56) {
+        if (data >= 56 && data <= 70) {
             //循环36到50
             mapDataIndex = data - 20
         }
@@ -103,7 +103,7 @@ export default class StartPanel extends Panel {
             // Loading.instace.hide();
             this.touchChildren = true;
             this.touchEnabled = true;
-            wait(5000).then(()=>{
+            wait(5000).then(() => {
                 updateMainTimerAfterGetData();
             });
             if (success) {

egret/src/something/interface/MapData.ts

@@ -7,7 +7,7 @@ import { PathData } from "./PathData";
 export interface MapData {
     /**
      * 一维格子数组，步长9
-     * 0为空，1基本元素，2为浅冰块，3深冰块，4棒棒糖，5石头，6元素枷锁，废弃
+     * 
      * 9*9长度
      * 0无格子
      * 1普通格子