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

assets/resources/module/reward/rewardLuck.prefab

@@ -21,15 +21,12 @@
         "__id__": 2
       },
       {
-        "__id__": 120
+        "__id__": 121
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 127
-      },
-      {
         "__id__": 128
       },
       {
@@ -37,10 +34,13 @@
       },
       {
         "__id__": 130
+      },
+      {
+        "__id__": 131
       }
     ],
     "_prefab": {
-      "__id__": 131
+      "__id__": 132
     },
     "_opacity": 255,
     "_color": {
@@ -104,17 +104,17 @@
         "__id__": 36
       },
       {
-        "__id__": 101
+        "__id__": 102
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 118
+        "__id__": 119
       }
     ],
     "_prefab": {
-      "__id__": 119
+      "__id__": 120
     },
     "_opacity": 255,
     "_color": {
@@ -1363,20 +1363,20 @@
         "__id__": 68
       },
       {
-        "__id__": 76
+        "__id__": 77
       },
       {
-        "__id__": 83
+        "__id__": 84
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 99
+        "__id__": 100
       }
     ],
     "_prefab": {
-      "__id__": 100
+      "__id__": 101
     },
     "_opacity": 255,
     "_color": {
@@ -2509,9 +2509,13 @@
       }
     ],
     "_active": true,
-    "_components": [],
+    "_components": [
+      {
+        "__id__": 75
+      }
+    ],
     "_prefab": {
-      "__id__": 75
+      "__id__": 76
     },
     "_opacity": 255,
     "_color": {
@@ -2785,6 +2789,16 @@
     "sync": false
   },
   {
+    "__type__": "cc.BlockInputEvents",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 68
+    },
+    "_enabled": true,
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -2804,17 +2818,17 @@
     },
     "_children": [
       {
-        "__id__": 77
+        "__id__": 78
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 80
+        "__id__": 81
       }
     ],
     "_prefab": {
-      "__id__": 82
+      "__id__": 83
     },
     "_opacity": 255,
     "_color": {
@@ -2868,17 +2882,17 @@
     "_name": "动画",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 76
+      "__id__": 77
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 78
+        "__id__": 79
       }
     ],
     "_prefab": {
-      "__id__": 79
+      "__id__": 80
     },
     "_opacity": 255,
     "_color": {
@@ -2932,7 +2946,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 77
+      "__id__": 78
     },
     "_enabled": true,
     "_materials": [
@@ -2985,7 +2999,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 76
+      "__id__": 77
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -2994,7 +3008,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 81
+        "__id__": 82
       }
     ],
     "_N$interactable": true,
@@ -3082,22 +3096,22 @@
     },
     "_children": [
       {
-        "__id__": 84
+        "__id__": 85
       },
       {
-        "__id__": 87
+        "__id__": 88
       },
       {
-        "__id__": 90
+        "__id__": 91
       },
       {
-        "__id__": 94
+        "__id__": 95
       }
     ],
     "_active": false,
     "_components": [],
     "_prefab": {
-      "__id__": 98
+      "__id__": 99
     },
     "_opacity": 0,
     "_color": {
@@ -3151,17 +3165,17 @@
     "_name": "熊猫动画",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 83
+      "__id__": 84
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 85
+        "__id__": 86
       }
     ],
     "_prefab": {
-      "__id__": 86
+      "__id__": 87
     },
     "_opacity": 255,
     "_color": {
@@ -3215,7 +3229,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 84
+      "__id__": 85
     },
     "_enabled": true,
     "_materials": [
@@ -3268,17 +3282,17 @@
     "_name": "通关盖子",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 83
+      "__id__": 84
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 88
+        "__id__": 89
       }
     ],
     "_prefab": {
-      "__id__": 89
+      "__id__": 90
     },
     "_opacity": 255,
     "_color": {
@@ -3332,7 +3346,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 87
+      "__id__": 88
     },
     "_enabled": true,
     "_materials": [
@@ -3375,20 +3389,20 @@
     "_name": "按钮_下一关",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 83
+      "__id__": 84
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 91
+        "__id__": 92
       },
       {
-        "__id__": 92
+        "__id__": 93
       }
     ],
     "_prefab": {
-      "__id__": 93
+      "__id__": 94
     },
     "_opacity": 255,
     "_color": {
@@ -3442,7 +3456,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 90
+      "__id__": 91
     },
     "_enabled": true,
     "_materials": [
@@ -3474,7 +3488,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 90
+      "__id__": 91
     },
     "_enabled": true,
     "node_panel": {
@@ -3500,20 +3514,20 @@
     "_name": "按钮_返回主页",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 83
+      "__id__": 84
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 95
+        "__id__": 96
       },
       {
-        "__id__": 96
+        "__id__": 97
       }
     ],
     "_prefab": {
-      "__id__": 97
+      "__id__": 98
     },
     "_opacity": 255,
     "_color": {
@@ -3567,7 +3581,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 94
+      "__id__": 95
     },
     "_enabled": true,
     "_materials": [
@@ -3599,7 +3613,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 94
+      "__id__": 95
     },
     "_enabled": true,
     "node_panel": {
@@ -3670,25 +3684,25 @@
     },
     "_children": [
       {
-        "__id__": 102
+        "__id__": 103
       },
       {
-        "__id__": 105
+        "__id__": 106
       },
       {
-        "__id__": 108
+        "__id__": 109
       },
       {
-        "__id__": 111
+        "__id__": 112
       },
       {
-        "__id__": 114
+        "__id__": 115
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 117
+      "__id__": 118
     },
     "_opacity": 255,
     "_color": {
@@ -3742,17 +3756,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 101
+      "__id__": 102
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 103
+        "__id__": 104
       }
     ],
     "_prefab": {
-      "__id__": 104
+      "__id__": 105
     },
     "_opacity": 255,
     "_color": {
@@ -3806,7 +3820,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 102
+      "__id__": 103
     },
     "_enabled": true,
     "_materials": [
@@ -3849,17 +3863,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 101
+      "__id__": 102
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 106
+        "__id__": 107
       }
     ],
     "_prefab": {
-      "__id__": 107
+      "__id__": 108
     },
     "_opacity": 255,
     "_color": {
@@ -3913,7 +3927,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 105
+      "__id__": 106
     },
     "_enabled": true,
     "_materials": [
@@ -3956,17 +3970,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 101
+      "__id__": 102
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 109
+        "__id__": 110
       }
     ],
     "_prefab": {
-      "__id__": 110
+      "__id__": 111
     },
     "_opacity": 255,
     "_color": {
@@ -4020,7 +4034,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 108
+      "__id__": 109
     },
     "_enabled": true,
     "_materials": [
@@ -4063,17 +4077,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 101
+      "__id__": 102
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 112
+        "__id__": 113
       }
     ],
     "_prefab": {
-      "__id__": 113
+      "__id__": 114
     },
     "_opacity": 255,
     "_color": {
@@ -4127,7 +4141,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 111
+      "__id__": 112
     },
     "_enabled": true,
     "_materials": [
@@ -4170,17 +4184,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 101
+      "__id__": 102
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 115
+        "__id__": 116
       }
     ],
     "_prefab": {
-      "__id__": 116
+      "__id__": 117
     },
     "_opacity": 255,
     "_color": {
@@ -4234,7 +4248,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 114
+      "__id__": 115
     },
     "_enabled": true,
     "_materials": [
@@ -4332,17 +4346,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 121
+        "__id__": 122
       },
       {
-        "__id__": 122
+        "__id__": 123
       },
       {
-        "__id__": 125
+        "__id__": 126
       }
     ],
     "_prefab": {
-      "__id__": 126
+      "__id__": 127
     },
     "_opacity": 255,
     "_color": {
@@ -4396,7 +4410,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 120
+      "__id__": 121
     },
     "_enabled": true,
     "_materials": [
@@ -4428,7 +4442,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 120
+      "__id__": 121
     },
     "_enabled": true,
     "node_panel": {
@@ -4437,10 +4451,10 @@
     "transition_type": 3,
     "onComplete": [
       {
-        "__id__": 123
+        "__id__": 124
       },
       {
-        "__id__": 124
+        "__id__": 125
       }
     ],
     "_id": ""
@@ -4470,7 +4484,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 120
+      "__id__": 121
     },
     "_enabled": true,
     "_defaultClip": {
@@ -4535,13 +4549,13 @@
       "__id__": 68
     },
     "node_mission": {
-      "__id__": 83
+      "__id__": 84
     },
     "anim_open_redbag": {
-      "__id__": 99
+      "__id__": 100
     },
     "btn_watch_video": {
-      "__id__": 80
+      "__id__": 81
     },
     "node_coin": {
       "__id__": 48
@@ -4553,7 +4567,7 @@
       "__id__": 65
     },
     "btn_close": {
-      "__id__": 120
+      "__id__": 121
     },
     "spr_cash_out": {
       "__id__": 21
@@ -4588,6 +4602,7 @@
       "__id__": 72
     },
     "bClickClose": false,
+    "onComplete": [],
     "_id": ""
   },
   {

assets/resources/module/reward/rewardMission.prefab

@@ -24,9 +24,6 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 130
-      },
-      {
         "__id__": 131
       },
       {
@@ -34,10 +31,13 @@
       },
       {
         "__id__": 133
+      },
+      {
+        "__id__": 134
       }
     ],
     "_prefab": {
-      "__id__": 134
+      "__id__": 135
     },
     "_opacity": 255,
     "_color": {
@@ -101,17 +101,17 @@
         "__id__": 36
       },
       {
-        "__id__": 111
+        "__id__": 112
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 128
+        "__id__": 129
       }
     ],
     "_prefab": {
-      "__id__": 129
+      "__id__": 130
     },
     "_opacity": 255,
     "_color": {
@@ -1363,17 +1363,17 @@
         "__id__": 76
       },
       {
-        "__id__": 102
+        "__id__": 103
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 109
+        "__id__": 110
       }
     ],
     "_prefab": {
-      "__id__": 110
+      "__id__": 111
     },
     "_opacity": 255,
     "_color": {
@@ -2814,9 +2814,13 @@
       }
     ],
     "_active": true,
-    "_components": [],
+    "_components": [
+      {
+        "__id__": 101
+      }
+    ],
     "_prefab": {
-      "__id__": 101
+      "__id__": 102
     },
     "_opacity": 255,
     "_color": {
@@ -3638,6 +3642,16 @@
     "sync": false
   },
   {
+    "__type__": "cc.BlockInputEvents",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 76
+    },
+    "_enabled": true,
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -3657,17 +3671,17 @@
     },
     "_children": [
       {
-        "__id__": 103
+        "__id__": 104
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 106
+        "__id__": 107
       }
     ],
     "_prefab": {
-      "__id__": 108
+      "__id__": 109
     },
     "_opacity": 255,
     "_color": {
@@ -3721,17 +3735,17 @@
     "_name": "动画",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 102
+      "__id__": 103
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 104
+        "__id__": 105
       }
     ],
     "_prefab": {
-      "__id__": 105
+      "__id__": 106
     },
     "_opacity": 255,
     "_color": {
@@ -3785,7 +3799,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 103
+      "__id__": 104
     },
     "_enabled": true,
     "_materials": [
@@ -3838,7 +3852,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 102
+      "__id__": 103
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -3847,7 +3861,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 107
+        "__id__": 108
       }
     ],
     "_N$interactable": true,
@@ -3965,25 +3979,25 @@
     },
     "_children": [
       {
-        "__id__": 112
+        "__id__": 113
       },
       {
-        "__id__": 115
+        "__id__": 116
       },
       {
-        "__id__": 118
+        "__id__": 119
       },
       {
-        "__id__": 121
+        "__id__": 122
       },
       {
-        "__id__": 124
+        "__id__": 125
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 127
+      "__id__": 128
     },
     "_opacity": 255,
     "_color": {
@@ -4037,17 +4051,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 111
+      "__id__": 112
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 113
+        "__id__": 114
       }
     ],
     "_prefab": {
-      "__id__": 114
+      "__id__": 115
     },
     "_opacity": 255,
     "_color": {
@@ -4101,7 +4115,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 112
+      "__id__": 113
     },
     "_enabled": true,
     "_materials": [
@@ -4144,17 +4158,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 111
+      "__id__": 112
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 116
+        "__id__": 117
       }
     ],
     "_prefab": {
-      "__id__": 117
+      "__id__": 118
     },
     "_opacity": 255,
     "_color": {
@@ -4208,7 +4222,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 115
+      "__id__": 116
     },
     "_enabled": true,
     "_materials": [
@@ -4251,17 +4265,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 111
+      "__id__": 112
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 119
+        "__id__": 120
       }
     ],
     "_prefab": {
-      "__id__": 120
+      "__id__": 121
     },
     "_opacity": 255,
     "_color": {
@@ -4315,7 +4329,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 118
+      "__id__": 119
     },
     "_enabled": true,
     "_materials": [
@@ -4358,17 +4372,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 111
+      "__id__": 112
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 122
+        "__id__": 123
       }
     ],
     "_prefab": {
-      "__id__": 123
+      "__id__": 124
     },
     "_opacity": 255,
     "_color": {
@@ -4422,7 +4436,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 121
+      "__id__": 122
     },
     "_enabled": true,
     "_materials": [
@@ -4465,17 +4479,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 111
+      "__id__": 112
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 125
+        "__id__": 126
       }
     ],
     "_prefab": {
-      "__id__": 126
+      "__id__": 127
     },
     "_opacity": 255,
     "_color": {
@@ -4529,7 +4543,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 124
+      "__id__": 125
     },
     "_enabled": true,
     "_materials": [
@@ -4659,10 +4673,10 @@
       "__id__": 76
     },
     "anim_open_redbag": {
-      "__id__": 109
+      "__id__": 110
     },
     "btn_watch_video": {
-      "__id__": 106
+      "__id__": 107
     },
     "node_coin": {
       "__id__": 48

assets/script/game/module/login/Login.ts

@@ -81,7 +81,7 @@ export default class Login extends cc.Component {
         //获取设备信息
         JsbSystem.getDeviceInfo();
         console.log('appversion   ', gData.appData.appVersion);
-        //获取强根版本需要sessionkey
+        //获取登录需要的sessionkey
         gData.loginData.init();
         this.checkRemoveLocalHot();
         await this.checkForceUpate();

build/jsb-link/js backups (useful for debugging)/main.index.js

@@ -2106,7 +2106,7 @@ this.appId = "wxcf31f0e54f7fefda";
 this.umengChannel = "";
 this.deviceType = "";
 this.androidVersion = "";
-this.mac = "1e:01:e4:13:b3:23,f6:60:e4:1a:b7:27";
+this.mac = "1e:03:e4:13:b3:23,f6:60:e4:1a:b7:27";
 this.machineInfo = {
 android_id: "",
 idfa: "",
@@ -8011,18 +8011,7 @@ n.Inst = this;
 mk.event.register("event_guide", this.clickGuide, this);
 };
 e.prototype.clickGuide = function(t) {
-if ("1_3" == t) {
-this.cellItemDic[0][0] && this.cellItemDic[0][0].onClick();
-this.cellItemDic[0][1] && this.cellItemDic[0][1].onClick();
-} else if ("1_4" == t) {
-this.cellItemDic[0][1] && this.cellItemDic[0][1].onClick();
-this.cellItemDic[0][2] && this.cellItemDic[0][2].onClick();
-this.cellItemDic[0][3] && this.cellItemDic[0][3].onClick();
-this.cellItemDic[0][4] && this.cellItemDic[0][4].onClick();
-} else if ("1_6" == t) {
-this.cellItemDic[1][1] && this.cellItemDic[1][1].onClick();
-this.cellItemDic[1][2] && this.cellItemDic[1][2].onClick();
-}
+"1_3" == t ? this.cellItemDic[0][0] && this.cellItemDic[0][0].onClick() : "1_5" == t && this.cellItemDic[1][1] && this.cellItemDic[1][1].onClick();
 };
 e.prototype.start = function() {
 var t = this;
@@ -8864,6 +8853,7 @@ this.initQiPaos();
 this.initInfo();
 this.autoOpenPanel();
 this.runGuideWeak();
+mk.guide.open(1);
 };
 e.prototype.update = function() {
 gData.gameData.init_coin && this.changeInfo();
@@ -8947,6 +8937,7 @@ this.nodeRedPoint.node_turnable.active = gData.turnable.redPoint();
 this.nodeRedPoint.node_blessingBag.active = gData.blessingBag.redPoint();
 this.nodeRedPoint.node_redeem.active = gData.redeem.redPoint();
 gData.gameData.init_red_point = !1;
+this.nodeRedPoint.node_redbagCash.active && mk.guide.open(2);
 };
 e.prototype.autoOpenPanel = function() {
 if (!gData.gameData.isNewPlayer()) {
@@ -9519,10 +9510,10 @@ function t() {}
 t.prototype.open = function(t) {
 this.crtGuideID = gData.gameData.getProp(o.GameProp.guideID);
 if (!cc.sys.isNative) {
-this.crtGuideID = 0;
+this.crtGuideID = 1;
 gData.gameData.setProp(o.GameProp.levelNum, 0);
 }
-if (this.crtGuideID >= 9999) mk.console.log("新手引导已做完"); else if (t >= this.crtGuideID && this.crtGuideID > 0) mk.console.log("当前引导已做过：" + t); else {
+if (this.crtGuideID >= 9999) mk.console.log("新手引导已做完"); else if (t <= this.crtGuideID && this.crtGuideID > 0) mk.console.log("当前引导已做过：" + t); else {
 gData.guideData.crtID = t;
 this.crtGuideID = t;
 mk.ui.openPanel("module/guide/guide", i.OpenActionType.normal, this.ui);
@@ -9539,6 +9530,9 @@ this.crtGuideID++;
 t.prototype.isGuideComplete = function() {
 return !this.crtGuideID || 999 === this.crtGuideID;
 };
+t.prototype.isGuiding = function() {
+return null != mk.ui.getCurOnPanel("guide");
+};
 return t;
 }();
 n.default = a;
@@ -9918,7 +9912,7 @@ if (null != n && null != o && null != i && null != a) if (0 == this.crtGuide.dis
 this.node_bg.x = this.node_bg.y = this.node_display.x = this.node_display.y = 0;
 this.node_display.width = this.node.width;
 this.node_display.height = this.node.height;
-cc.tween(this.node_display).to(.3, {
+cc.tween(this.node_display).to(.1, {
 x: n,
 y: o,
 width: i,
@@ -9934,7 +9928,7 @@ this.node_bg.x = this.node_display.x = n;
 this.node_bg.y = this.node_display.y = o;
 this.node_display.width = this.node_display.height = this.node_bg.width = this.node_bg.height = 2 * this.node.height;
 var l = this.crtGuide.display_type;
-cc.tween(this.node_display).to(.3, {
+cc.tween(this.node_display).to(.1, {
 width: l,
 height: l
 }).start();
@@ -12715,7 +12709,7 @@ var t = mk.math.random(0, this.moreGameList.normal.length - 1);
 return this.moreGameList.normal[t];
 };
 e.prototype.popMoreGamePopNode = function() {
-Math.random() <= gData.gameData.configs.ServerConfig.popMoreGame && mk.ui.openPanel("module/moreGame/moreGamePopNode");
+mk.guide.isGuiding || Math.random() <= gData.gameData.configs.ServerConfig.popMoreGame && mk.ui.openPanel("module/moreGame/moreGamePopNode");
 };
 e.prototype.popNodeGetRedBag = function() {
 return a(this, void 0, void 0, function() {
@@ -14966,6 +14960,7 @@ return r(this, void 0, void 0, function() {
 return c(this, function(e) {
 switch (e.label) {
 case 0:
+null == this.item_data && 1 == t.index && mk.event.register("event_guide", this.clickGuide.bind, this);
 return [ 4, this.initStyle(t) ];
 
 case 1:
@@ -14975,6 +14970,9 @@ return [ 2 ];
 });
 });
 };
+e.prototype.clickGuide = function(t) {
+"2_2" == t && this.clickCashOP();
+};
 e.prototype.initStyle = function(t) {
 this.item_data = t;
 this.lbl_red_value.string = "" + this.item_data.type_value;
@@ -14998,6 +14996,9 @@ this.node_unlock.active = !0;
 e.prototype.clickCashOP = function() {
 this.item_data.index > gData.redBagCash.cash_bar + 1 ? mk.tip.pop("请按顺序提现") : gData.redBagCash.cashOP();
 };
+e.prototype.onDestroy = function() {
+mk.event.remove("event_guide", this.clickGuide, this);
+};
 a([ p({
 displayName: "已领取",
 type: cc.Node
@@ -16395,7 +16396,7 @@ r.label = 4;
 
 case 4:
 a = gData.reward.data[0].rewardNum || 0;
-gData.reward.data[0].rewardType === p.RewardType.pigRmb ? this.lbl_reward_value.string = (a / 100).toFixed(2) : this.lbl_reward_value.string = "" + a;
+gData.reward.data[0].rewardType === p.RewardType.pigRmb ? this.lbl_reward_value.string = (a / 100).toFixed(2) + "元" : this.lbl_reward_value.string = "" + a;
 this.anim_open_redbag.play();
 this.node_luck.active = !1;
 this.node_mission.active = !1;

packages-hot-update/cfg.json

@@ -7,7 +7,7 @@
         "http://",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemote/"
     ],
-    "buildTime": 1624957859869,
-    "genTime": 1624957859869,
+    "buildTime": 1625021704799,
+    "genTime": 1625021704799,
     "genVersion": null
 }