Merge branch 'master' of http://git.mokasz.com/zouyong/mk_framework

assets/resources/module/guide/guide.prefab

@@ -180,7 +180,7 @@
     "_prefab": {
       "__id__": 7
     },
-    "_opacity": 120,
+    "_opacity": 180,
     "_color": {
       "__type__": "cc.Color",
       "r": 0,
@@ -1164,7 +1164,7 @@
     "asset": {
       "__uuid__": "5f53c125-7a14-4ca0-986a-0e0d2d665268"
     },
-    "fileId": "dbN3oWWehNqovhIw60cRq1",
+    "fileId": "61shDUdxBJl4Wej3Bami/Z",
     "sync": false
   },
   {

assets/script/before/GamePlay.ts

@@ -175,10 +175,15 @@ export default class GamePlay extends cc.Component {
 
     private clickGuide(data: string) {
         if (data == "1_2") {//点击即可消除哦！
-            this.cellItemDic[0][1].onClick();
+            this.cellItemDic[0][0] && this.cellItemDic[0][0].onClick();
+            this.cellItemDic[0][1] && this.cellItemDic[0][1].onClick();
         }
         else if (data == "1_3") {//再点击一次增加大量进度哦
-            this.cellItemDic[1][0].onClick();
+            this.cellItemDic[1][0] && this.cellItemDic[1][0].onClick();
+            this.cellItemDic[1][1] && this.cellItemDic[1][1].onClick();
+            this.cellItemDic[1][2] && this.cellItemDic[1][2].onClick();
+            this.cellItemDic[1][3] && this.cellItemDic[1][3].onClick();
+            this.cellItemDic[1][4] && this.cellItemDic[1][4].onClick();
         }
     }
 

assets/script/game/data/AppData.ts

@@ -31,7 +31,7 @@ export class AppData {
     /** 安卓版本号 */
     public androidVersion: string = '';
 
-    public mac: string = '5e:35:e1:12:b3:23,f6:60:e4:1a:b7:27';
+    public mac: string = '1e:01:e4:13:b3:23,f6:60:e4:1a:b7:27';
 
     /** 设备信息 */
     public machineInfo = {

assets/script/game/data/module/GuideData.ts

@@ -41,7 +41,7 @@ export class GuideData {
             guide.display_rect = o.displayRect;
             guide.click_rect = o.clickRect;
             guide.finger = o.finger;
-            guide.lag_next = parseInt(o.lagNext);
+            guide.lag_next = parseFloat(o.lagNext);
             if (id != guide.id) {
                 this.data.set(id, arr);
                 arr = [];

assets/script/game/module/guide/Guide.ts

@@ -41,7 +41,6 @@ export default class Guide extends cc.Component {
     }
 
     start() {
-        return;
         if (gData.guideData.crtID == null) {
             this.node.destroy();
             return;
@@ -62,6 +61,7 @@ export default class Guide extends cc.Component {
             this.close();
         }
         else {
+            this.node_bg.opacity = 180;
             this.node_finger.opacity = 255;
             this.node_dialog.opacity = 255;
             this.targetNode = null;
@@ -160,6 +160,7 @@ export default class Guide extends cc.Component {
     }
 
     async clickNodeClick() {
+        mk.audio.playEffect("button");
         cc.Tween.stopAllByTarget(this.node_display);
         console.log("clickNodeClick");
         if (this.targetNode) {
@@ -167,7 +168,7 @@ export default class Guide extends cc.Component {
         }
         if (this.event_data) {
             //event_guide data:1_2 (1_2为新手引导的id)
-            mk.event.emit("event_guide",this.event_data);
+            mk.event.emit("event_guide", this.event_data);
         }
         this.reset();
         if (this.crtGuide.lag_next > 0) {
@@ -178,9 +179,11 @@ export default class Guide extends cc.Component {
 
     /** 等待状态 透明不可点击 */
     private reset() {
-        this.node_display.width = this.node.width;
-        this.node_display.height = this.node.height;
-        this.node_bg.x = this.node_bg.y = 0;
+        this.node_display.width = 0;
+        this.node_display.height = 0;
+        this.node_bg.x = -this.node_display.x;
+        this.node_bg.y = -this.node_display.y;
+        this.node_bg.opacity = 0;
         this.node_click.width = 0
         this.node_click.height = 0;
         this.node_finger.opacity = 0;