zouyong пре 5 година
родитељ
комит
6494cbd360

+ 1 - 1
assets/resources/game/config/level.json

@@ -7,7 +7,7 @@
         "4":{"0":3,"1":4,"2":4,"3":4,"4":4,"5":4,"6":4,"7":4},
         "5":{"0":3,"1":4,"2":4,"3":4,"4":4,"5":4,"6":4,"7":4},
         "6":{"0":4,"1":4,"2":4,"3":4,"4":4,"5":4,"6":4,"7":4},
-        "7":{"0":6,"1":6,"2":6,"3":6,"4":6,"5":6,"6":6,"7":6}
+        "7":{"0":4,"1":4,"2":4,"3":4,"4":4,"5":4,"6":4,"7":4}
     },
     "1": {
         "0":{"0":3,"1":3,"2":5,"3":1,"4":1,"5":2,"6":2,"7":6},

+ 0 - 12
assets/resources/module/hotUpdate/perfab.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.1.2",
-  "uuid": "e45f4d0f-7aa3-4f6e-a64f-6b9bcde71855",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

+ 4 - 5
assets/script/game/module/guide/Guide.ts

@@ -55,7 +55,7 @@ export default class Guide extends cc.Component {
     private nextStep() {
         this.crtStep++;
         this.crtGuide = this.guides[this.crtStep];
-        mk.data.sendDataEvent(DataEventId.guide,`新手引导第${gData.guideData.crtID}_${this.crtStep}步完成`);
+        mk.data.sendDataEvent(DataEventId.guide, `新手引导第${gData.guideData.crtID}_${this.crtStep}步完成`);
         this.updateGuide();
     }
 
@@ -115,7 +115,7 @@ export default class Guide extends cc.Component {
                     h = this.targetNode.parent.height;
                     let pos1 = mk.game.getWorldPos(this.targetNode.parent);
                     x = pos1.x;
-                    y = pos1.y - h / 2;                    
+                    y = pos1.y - h / 2;
                 }
 
                 //穿透点击目标节点时增加一个事件触发下一步,触发后移除
@@ -162,6 +162,7 @@ export default class Guide extends cc.Component {
             if (this.crtGuide.dialog_pos != null && this.crtGuide.dialog_pos.length > 0) {
                 let arr = this.crtGuide.dialog_pos.split(":");
                 let wedgit = this.node_dialog.getComponent(cc.Widget);
+                wedgit.enabled = true;
                 for (let i = 0; i < this.widgets.length; i++) {
                     wedgit[this.widgets[i]] = arr[i] == "" ? null : parseInt(arr[i]);
                 }
@@ -169,9 +170,7 @@ export default class Guide extends cc.Component {
             else {//显示区域偏移
                 let arr = this.crtGuide.dialog_pos1.split(",");
                 let wedgit = this.node_dialog.getComponent(cc.Widget);
-                for (let i = 0; i < this.widgets.length; i++) {
-                    wedgit[this.widgets[i]] = null;
-                }
+                wedgit.enabled = false;
                 this.node_dialog.x = x + parseInt(arr[0]);
                 this.node_dialog.y = y + parseInt(arr[1]);
             }