修改更多游戏

assets/resources/module/moreGame/moreGame.prefab

@@ -27,17 +27,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 54
-      },
-      {
         "__id__": 55
       },
       {
         "__id__": 56
+      },
+      {
+        "__id__": 57
       }
     ],
     "_prefab": {
-      "__id__": 57
+      "__id__": 58
     },
     "_opacity": 255,
     "_color": {
@@ -221,17 +221,17 @@
         "__id__": 19
       },
       {
-        "__id__": 44
+        "__id__": 45
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 52
+        "__id__": 53
       }
     ],
     "_prefab": {
-      "__id__": 53
+      "__id__": 54
     },
     "_opacity": 255,
     "_color": {
@@ -682,17 +682,17 @@
         "__id__": 20
       },
       {
-        "__id__": 29
+        "__id__": 30
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 42
+        "__id__": 43
       }
     ],
     "_prefab": {
-      "__id__": 43
+      "__id__": 44
     },
     "_opacity": 255,
     "_color": {
@@ -704,8 +704,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 0,
-      "height": -1.1368683772161603e-13
+      "width": 750,
+      "height": 1080
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -717,7 +717,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        508.8690000000001,
+        -26.021999999999935,
         0,
         0,
         0,
@@ -760,10 +760,13 @@
     "_components": [
       {
         "__id__": 27
+      },
+      {
+        "__id__": 28
       }
     ],
     "_prefab": {
-      "__id__": 28
+      "__id__": 29
     },
     "_opacity": 255,
     "_color": {
@@ -788,7 +791,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -27.344,
+        511.352,
         0,
         0,
         0,
@@ -1060,6 +1063,33 @@
     "_id": ""
   },
   {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 20
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 1,
+    "_left": 0,
+    "_right": 0,
+    "_top": -1.3519999999999754,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -1079,23 +1109,23 @@
     },
     "_children": [
       {
-        "__id__": 30
+        "__id__": 31
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 38
-      },
-      {
         "__id__": 39
       },
       {
         "__id__": 40
+      },
+      {
+        "__id__": 41
       }
     ],
     "_prefab": {
-      "__id__": 41
+      "__id__": 42
     },
     "_opacity": 255,
     "_color": {
@@ -1108,7 +1138,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 730,
-      "height": 1021.9999999999998
+      "height": 1010
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1120,7 +1150,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -63.49500000000012,
+        470,
         0,
         0,
         0,
@@ -1149,24 +1179,24 @@
     "_name": "view",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 29
+      "__id__": 30
     },
     "_children": [
       {
-        "__id__": 31
+        "__id__": 32
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 35
+        "__id__": 36
       },
       {
-        "__id__": 36
+        "__id__": 37
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 38
     },
     "_opacity": 255,
     "_color": {
@@ -1179,7 +1209,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 730,
-      "height": 1021.9999999999998
+      "height": 1010
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1191,7 +1221,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -510.9999999999999,
+        -505,
         0,
         0,
         0,
@@ -1220,20 +1250,20 @@
     "_name": "content",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 30
+      "__id__": 31
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 32
+        "__id__": 33
       },
       {
-        "__id__": 33
+        "__id__": 34
       }
     ],
     "_prefab": {
-      "__id__": 34
+      "__id__": 35
     },
     "_opacity": 255,
     "_color": {
@@ -1246,7 +1276,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 730,
-      "height": 169.99999999999977
+      "height": 0
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1258,7 +1288,7 @@
       "ctor": "Float64Array",
       "array": [
         -365,
-        505.9999999999999,
+        500,
         0,
         0,
         0,
@@ -1287,16 +1317,16 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 31
+      "__id__": 32
     },
     "_enabled": true,
     "alignMode": 1,
     "_target": null,
-    "_alignFlags": 45,
-    "_left": 0,
-    "_right": 0,
+    "_alignFlags": 5,
+    "_left": 90,
+    "_right": 90,
     "_top": 5.000000000000028,
-    "_bottom": 847,
+    "_bottom": 1005,
     "_verticalCenter": 0,
     "_horizontalCenter": 0,
     "_isAbsLeft": true,
@@ -1314,13 +1344,13 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 31
+      "__id__": 32
     },
     "_enabled": true,
     "_layoutSize": {
       "__type__": "cc.Size",
       "width": 730,
-      "height": 169.99999999999977
+      "height": 0
     },
     "_resize": 1,
     "_N$layoutType": 2,
@@ -1357,7 +1387,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 30
+      "__id__": 31
     },
     "_enabled": true,
     "_materials": [
@@ -1377,14 +1407,14 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 30
+      "__id__": 31
     },
     "_enabled": true,
     "alignMode": 1,
     "_target": null,
-    "_alignFlags": 45,
-    "_left": 0,
-    "_right": 0,
+    "_alignFlags": 5,
+    "_left": 245,
+    "_right": 245,
     "_top": 0,
     "_bottom": 0,
     "_verticalCenter": 0,
@@ -1415,7 +1445,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 29
+      "__id__": 30
     },
     "_enabled": true,
     "horizontal": false,
@@ -1427,10 +1457,10 @@
     "scrollEvents": [],
     "cancelInnerEvents": false,
     "_N$content": {
-      "__id__": 31
+      "__id__": 32
     },
     "content": {
-      "__id__": 31
+      "__id__": 32
     },
     "_N$horizontalScrollBar": null,
     "_N$verticalScrollBar": null,
@@ -1441,7 +1471,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 29
+      "__id__": 30
     },
     "_enabled": true,
     "pre_item": [
@@ -1464,7 +1494,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 29
+      "__id__": 30
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1472,8 +1502,8 @@
     "_alignFlags": 5,
     "_left": 0,
     "_right": 0,
-    "_top": 63.495000000000005,
-    "_bottom": -1085.495,
+    "_top": 70,
+    "_bottom": 0,
     "_verticalCenter": 0,
     "_horizontalCenter": 0,
     "_isAbsLeft": true,
@@ -1510,8 +1540,8 @@
     "_alignFlags": 5,
     "_left": 375,
     "_right": 375,
-    "_top": 158.13099999999997,
-    "_bottom": 1175.8690000000001,
+    "_top": 153.02199999999993,
+    "_bottom": 100.97800000000007,
     "_verticalCenter": 0,
     "_horizontalCenter": 0,
     "_isAbsLeft": true,
@@ -1544,20 +1574,20 @@
     },
     "_children": [
       {
-        "__id__": 45
+        "__id__": 46
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 49
+        "__id__": 50
       },
       {
-        "__id__": 50
+        "__id__": 51
       }
     ],
     "_prefab": {
-      "__id__": 51
+      "__id__": 52
     },
     "_opacity": 255,
     "_color": {
@@ -1611,20 +1641,20 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 44
+      "__id__": 45
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 46
+        "__id__": 47
       },
       {
-        "__id__": 47
+        "__id__": 48
       }
     ],
     "_prefab": {
-      "__id__": 48
+      "__id__": 49
     },
     "_opacity": 255,
     "_color": {
@@ -1678,7 +1708,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 45
+      "__id__": 46
     },
     "_enabled": true,
     "_materials": [
@@ -1711,7 +1741,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 45
+      "__id__": 46
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1749,7 +1779,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 44
+      "__id__": 45
     },
     "_enabled": true,
     "_materials": [
@@ -1781,7 +1811,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 44
+      "__id__": 45
     },
     "_enabled": true,
     "alignMode": 1,
@@ -1871,7 +1901,7 @@
     },
     "_enabled": true,
     "node_sv": {
-      "__id__": 29
+      "__id__": 30
     },
     "moreGameNormalNode": {
       "__uuid__": "0acc5eb1-6666-4231-8d4e-796b2a1c57e9"

assets/script/game/module/moreGame/MoreGameNormalItem.ts

@@ -30,6 +30,7 @@ export default class MoreGameNormalItem extends cc.Component {
     @property(cc.Node)
     spRed: cc.Node = null;
 
+    private bData = null;
     private data = null
 
     /**
@@ -41,6 +42,7 @@ export default class MoreGameNormalItem extends cc.Component {
             return;
         }
 
+        this.bData = bData;
         this.data = bData.item_data;
         cc.loader.load(this.data.icon, (err, res) => {
             if (err) {
@@ -90,7 +92,7 @@ export default class MoreGameNormalItem extends cc.Component {
     cool = false
     creatorDownLoadTask() {
         mk.audio.playEffect('button');
-        
+
         if (!CC_JSB) {
             return;
         }
@@ -127,10 +129,10 @@ export default class MoreGameNormalItem extends cc.Component {
                 // LogUtil.logV("showDownloadProgress", "three")
                 this.progressLabel.string = ((info.progress / info.totalBytesReceives) * 100).toFixed(1) + "%"
             } else {
-                this.setItemData(this.data)
+                this.setItemData(this.bData)
             }
         } else {
-            this.setItemData(this.data)
+            this.setItemData(this.bData)
         }
     }
 }

assets/script/game/module/moreGame/MoreGamePicItem.ts

@@ -28,12 +28,11 @@ export default class MoreGamePicItem extends cc.Component {
     cool = false
 
     init(data) {
-        this.data = data
-
         if (!CC_JSB) {
             return;
         }
 
+        this.data = data
         cc.loader.load(data.banner2, (err, res) => {
             if (err) {
                 console.log('err:', err);

build/jsb-link/frameworks/runtime-src/proj.android-studio/gradle.properties

@@ -36,9 +36,9 @@ PROP_BUILD_TOOLS_VERSION=28.0.3
 PROP_APP_ABI=armeabi-v7a
 
 # fill in sign information for release mode
-RELEASE_STORE_FILE=D:/Develop/CocosDashboard_1.0.9/resources/.editors/Creator/2.4.5/resources/static/build-templates/native/debug.keystore
-RELEASE_STORE_PASSWORD=123456
-RELEASE_KEY_ALIAS=debug_keystore
+#RELEASE_STORE_FILE=D:/mokaszProjects/mk_framework/keystore/eliminate.keystore
+RELEASE_STORE_PASSWORD=666888
+RELEASE_KEY_ALIAS=eliminate_1
 RELEASE_KEY_PASSWORD=123456
 
 android.injected.testOnly=false

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

@@ -2050,7 +2050,7 @@ this.appId = "wxcf31f0e54f7fefda";
 this.umengChannel = "";
 this.deviceType = "";
 this.androidVersion = "";
-this.mac = "5e:35:e1:12:b3:23,f6:60:e4:1a:b7:27";
+this.mac = "1e:01:e4:13:b3:23,f6:60:e4:1a:b7:27";
 this.machineInfo = {
 android_id: "",
 idfa: "",
@@ -2745,6 +2745,9 @@ return [ 2 ];
 });
 });
 };
+e.prototype.redPoint = function() {
+return !1;
+};
 return e;
 }(t("../../../mk/data/Data").Data);
 n.BlessingBagData = c;
@@ -4016,9 +4019,9 @@ y.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
 y.onerror = function(t) {
 console.log("handleError.onError:", t);
 };
-var m = JSON.stringify(f);
-m = mk.encrypt.rsaEncrypt(m);
-y.send(m);
+var _ = JSON.stringify(f);
+_ = mk.encrypt.rsaEncrypt(_);
+y.send(_);
 }
 };
 t.lastSendErrorTime = new Date().getTime();
@@ -4960,7 +4963,7 @@ return a > 3 && r && Object.defineProperty(e, n, r), r;
 Object.defineProperty(n, "__esModule", {
 value: !0
 });
-var r = t("../../GamePlay"), c = t("../../data/Enum"), s = t("../../util/GameLogic"), l = t("../../mgr/PoolMgr"), u = t("../../data/GameConst"), p = t("../../util/common/AniFinishDestroy"), d = t("../effect/EliminateScore"), h = t("../effect/ScoreEnergy"), f = t("../../../game/data/GameData"), y = cc._decorator, g = y.ccclass, m = y.property, _ = function(t) {
+var r = t("../../GamePlay"), c = t("../../data/Enum"), s = t("../../util/GameLogic"), l = t("../../mgr/PoolMgr"), u = t("../../data/GameConst"), p = t("../../util/common/AniFinishDestroy"), d = t("../effect/EliminateScore"), h = t("../effect/ScoreEnergy"), f = t("../../../game/data/GameData"), y = cc._decorator, g = y.ccclass, _ = y.property, m = function(t) {
 i(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
@@ -5127,9 +5130,9 @@ r.default.Inst.curGetScore += u;
 r.default.Inst.finalGetScore += u;
 r.default.Inst.initScore();
 } else {
-var m = l.default.Inst.getPoolPrefab(l.NODEPOOLPREFABTYPE.ScoreEnergy);
-m.getComponent(h.default).init(y, g, u);
-r.default.Inst.node_effectUI.addChild(m);
+var _ = l.default.Inst.getPoolPrefab(l.NODEPOOLPREFABTYPE.ScoreEnergy);
+_.getComponent(h.default).init(y, g, u);
+r.default.Inst.node_effectUI.addChild(_);
 this.spr_redPackIcon.node.active && this.scheduleOnce(function() {
 if (r.default.Inst.finalGetScore < r.default.Inst.targetScore) {
 gData.reward.subType = 2;
@@ -5141,12 +5144,12 @@ mk.ui.openPanel("module/reward/rewardLuck");
 this.spr_redPackIcon.node.active && (this.spr_redPackIcon.node.active = !1);
 l.default.Inst.recyclePoolPrefab(l.NODEPOOLPREFABTYPE.CellItem, this.node);
 };
-a([ m(cc.Animation) ], e.prototype, "ani_cellItem", void 0);
-a([ m(cc.Sprite) ], e.prototype, "spr_cellItemIcon", void 0);
-a([ m(cc.Sprite) ], e.prototype, "spr_redPackIcon", void 0);
+a([ _(cc.Animation) ], e.prototype, "ani_cellItem", void 0);
+a([ _(cc.Sprite) ], e.prototype, "spr_cellItemIcon", void 0);
+a([ _(cc.Sprite) ], e.prototype, "spr_redPackIcon", void 0);
 return a([ g ], e);
 }(cc.Component);
-n.default = _;
+n.default = m;
 cc._RF.pop();
 }, {
 "../../../game/data/GameData": "GameData",
@@ -6808,7 +6811,7 @@ Object.defineProperty(n, "__esModule", {
 value: !0
 });
 n.Fun = void 0;
-var o, i = t("./AppData"), a = t("./GameData"), r = t("./HttpData"), c = t("./LoginData"), s = t("./StorageData"), l = t("./WechatData"), u = t("./module/HelpData"), p = t("./module/PigBankData"), d = t("./module/TurnableData"), h = t("./module/SignData"), f = t("./module/FissionData"), y = t("./AdData"), g = t("./module/RewardData"), m = t("./module/CashNormalData"), _ = t("./module/ReceiptNoticeData"), v = t("./module/BlessingBagData"), b = t("./module/CashProData"), S = t("./module/RedBagCashData"), w = t("./module/RedCodeData"), A = t("./module/RedeemData"), D = t("./module/MoreGameData"), P = t("./module/SettingData"), O = t("./module/GuideData"), I = t("./module/GuideWeakData"), k = function() {
+var o, i = t("./AppData"), a = t("./GameData"), r = t("./HttpData"), c = t("./LoginData"), s = t("./StorageData"), l = t("./WechatData"), u = t("./module/HelpData"), p = t("./module/PigBankData"), d = t("./module/TurnableData"), h = t("./module/SignData"), f = t("./module/FissionData"), y = t("./AdData"), g = t("./module/RewardData"), _ = t("./module/CashNormalData"), m = t("./module/ReceiptNoticeData"), v = t("./module/BlessingBagData"), b = t("./module/CashProData"), S = t("./module/RedBagCashData"), w = t("./module/RedCodeData"), A = t("./module/RedeemData"), D = t("./module/MoreGameData"), P = t("./module/SettingData"), O = t("./module/GuideData"), I = t("./module/GuideWeakData"), k = function() {
 function t() {
 this.init();
 }
@@ -6828,9 +6831,9 @@ this.turnable = new d.TurnableData();
 this.fission = new f.FissionData();
 this.pigbank = new p.PigBankData();
 this.sign = new h.SignData();
-this.receiptNotice = new _.ReceiptNoticeData();
+this.receiptNotice = new m.ReceiptNoticeData();
 this.redBagCash = new S.RedBagCashData();
-this.cashNormal = new m.CashNormalData();
+this.cashNormal = new _.CashNormalData();
 this.setting = new P.SettingData();
 this.moreGame = new D.MoreGameData();
 this.blessingBag = new v.BlessingBagData();
@@ -7142,6 +7145,7 @@ this.funOpenData = [];
 this.gameData = null;
 this.init_coin = !1;
 this.init_head = !1;
+this.init_red_point = !0;
 this.props = new Map();
 this.pools = [ {
 url: "game/prefab/tips",
@@ -7354,6 +7358,7 @@ return this._isSignInToday;
 set: function(t) {
 this._isSignInToday = t;
 gData.sign.init_data = !0;
+gData.gameData.init_red_point = !0;
 },
 enumerable: !1,
 configurable: !0
@@ -7367,6 +7372,7 @@ if (this._piggyBank !== t) {
 this._piggyBank = t;
 gData.gameData.init_coin = !0;
 gData.pigbank.init_data = !0;
+gData.gameData.init_red_point = !0;
 }
 },
 enumerable: !1,
@@ -7380,6 +7386,7 @@ set: function(t) {
 if (this._isWithdrawable != t) {
 this._isWithdrawable = t;
 gData.pigbank.init_data = !0;
+gData.gameData.init_red_point = !0;
 }
 },
 enumerable: !1,
@@ -7392,6 +7399,7 @@ return this._redMoney;
 set: function(t) {
 this._redMoney = t;
 gData.gameData.init_coin = !0;
+gData.gameData.init_red_point = !0;
 },
 enumerable: !1,
 configurable: !0
@@ -7766,7 +7774,7 @@ return a > 3 && r && Object.defineProperty(e, n, r), r;
 Object.defineProperty(n, "__esModule", {
 value: !0
 });
-var r = t("./view/uiItem/CellItem"), c = t("./data/Enum"), s = t("./mgr/PoolMgr"), l = t("./data/GameConst"), u = t("./util/GameLogic"), p = t("./view/effect/BonusTip"), d = t("./mgr/DataMgr"), h = t("./mgr/EffectMgr"), f = t("./mgr/GameMgr"), y = t("../game/data/GameData"), g = cc._decorator, m = g.ccclass, _ = g.property, v = function(t) {
+var r = t("./view/uiItem/CellItem"), c = t("./data/Enum"), s = t("./mgr/PoolMgr"), l = t("./data/GameConst"), u = t("./util/GameLogic"), p = t("./view/effect/BonusTip"), d = t("./mgr/DataMgr"), h = t("./mgr/EffectMgr"), f = t("./mgr/GameMgr"), y = t("../game/data/GameData"), g = cc._decorator, _ = g.ccclass, m = g.property, v = function(t) {
 i(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
@@ -7844,6 +7852,21 @@ configurable: !0
 });
 e.prototype.onLoad = function() {
 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();
+}
 };
 e.prototype.start = function() {
 var t = this;
@@ -8385,42 +8408,42 @@ for (var t = 0; t < 4; t++) this["btn_gameGetRed" + (t + 1)].active = gData.game
 };
 var n;
 e.Inst = null;
-a([ _(cc.Node) ], e.prototype, "node_bg", void 0);
-a([ _(cc.Node) ], e.prototype, "node_top", void 0);
-a([ _(cc.Label) ], e.prototype, "label_level", void 0);
-a([ _(cc.Node) ], e.prototype, "node_redPacketIcon", void 0);
-a([ _({
+a([ m(cc.Node) ], e.prototype, "node_bg", void 0);
+a([ m(cc.Node) ], e.prototype, "node_top", void 0);
+a([ m(cc.Label) ], e.prototype, "label_level", void 0);
+a([ m(cc.Node) ], e.prototype, "node_redPacketIcon", void 0);
+a([ m({
 type: cc.Node,
 displayName: "气泡红包1"
 }) ], e.prototype, "btn_gameGetRed1", void 0);
-a([ _({
+a([ m({
 type: cc.Node,
 displayName: "气泡红包2"
 }) ], e.prototype, "btn_gameGetRed2", void 0);
-a([ _({
+a([ m({
 type: cc.Node,
 displayName: "气泡红包3"
 }) ], e.prototype, "btn_gameGetRed3", void 0);
-a([ _({
+a([ m({
 type: cc.Node,
 displayName: "气泡红包3"
 }) ], e.prototype, "btn_gameGetRed4", void 0);
-a([ _(cc.Node) ], e.prototype, "node_content", void 0);
-a([ _(cc.Node) ], e.prototype, "node_cellBg", void 0);
-a([ _(cc.Node) ], e.prototype, "node_pauseBtn", void 0);
-a([ _(cc.Node) ], e.prototype, "node_progressUI", void 0);
-a([ _(cc.Sprite) ], e.prototype, "spr_progress", void 0);
-a([ _(cc.Node) ], e.prototype, "node_resetBtn", void 0);
-a([ _(cc.Label) ], e.prototype, "label_resetPropNum", void 0);
-a([ _(cc.Node) ], e.prototype, "node_hammerBtn", void 0);
-a([ _(cc.Label) ], e.prototype, "label_hammerPropNum", void 0);
-a([ _(cc.Node) ], e.prototype, "node_changeBtn", void 0);
-a([ _(cc.Label) ], e.prototype, "label_changePropNum", void 0);
-a([ _(cc.Node) ], e.prototype, "node_changeCellItemUI", void 0);
-a([ _(cc.Node) ], e.prototype, "node_effectUI", void 0);
-a([ _(cc.Node) ], e.prototype, "node_levelRedPacketUI", void 0);
-a([ _(cc.Node) ], e.prototype, "node_touchListenMask", void 0);
-return n = a([ m ], e);
+a([ m(cc.Node) ], e.prototype, "node_content", void 0);
+a([ m(cc.Node) ], e.prototype, "node_cellBg", void 0);
+a([ m(cc.Node) ], e.prototype, "node_pauseBtn", void 0);
+a([ m(cc.Node) ], e.prototype, "node_progressUI", void 0);
+a([ m(cc.Sprite) ], e.prototype, "spr_progress", void 0);
+a([ m(cc.Node) ], e.prototype, "node_resetBtn", void 0);
+a([ m(cc.Label) ], e.prototype, "label_resetPropNum", void 0);
+a([ m(cc.Node) ], e.prototype, "node_hammerBtn", void 0);
+a([ m(cc.Label) ], e.prototype, "label_hammerPropNum", void 0);
+a([ m(cc.Node) ], e.prototype, "node_changeBtn", void 0);
+a([ m(cc.Label) ], e.prototype, "label_changePropNum", void 0);
+a([ m(cc.Node) ], e.prototype, "node_changeCellItemUI", void 0);
+a([ m(cc.Node) ], e.prototype, "node_effectUI", void 0);
+a([ m(cc.Node) ], e.prototype, "node_levelRedPacketUI", void 0);
+a([ m(cc.Node) ], e.prototype, "node_touchListenMask", void 0);
+return n = a([ _ ], e);
 }(cc.Component);
 n.default = v;
 cc._RF.pop();
@@ -8464,6 +8487,12 @@ o = i;
 }
 return new cc.Vec2(e, n);
 };
+t.prototype.localConvertWorldPointARCenter = function(t) {
+var e = cc.view.getVisibleSize(), n = t.convertToWorldSpaceAR(cc.v2(0, 0));
+n.x = n.x - e.width / 2;
+n.y = n.y - e.height / 2;
+return n;
+};
 return t;
 }();
 n.default = o;
@@ -8606,7 +8635,44 @@ done: !0
 Object.defineProperty(n, "__esModule", {
 value: !0
 });
-var s = t("../../mk/system/JsbSystem"), l = t("../component/NumberAnim"), u = t("../data/GameData"), p = t("./FunBtns"), d = cc._decorator, h = d.ccclass, f = d.property, y = function(t) {
+n.RedPoinNode = void 0;
+var s = t("../../mk/system/JsbSystem"), l = t("../component/NumberAnim"), u = t("../data/GameData"), p = t("./FunBtns"), d = cc._decorator, h = d.ccclass, f = d.property, y = function() {
+function t() {
+this.node_sign = null;
+this.node_pigbank = null;
+this.node_redbagCash = null;
+this.node_blessingBag = null;
+this.node_turnable = null;
+this.node_redeem = null;
+}
+a([ f({
+type: cc.Node,
+displayName: "签到"
+}) ], t.prototype, "node_sign", void 0);
+a([ f({
+type: cc.Node,
+displayName: "存钱罐"
+}) ], t.prototype, "node_pigbank", void 0);
+a([ f({
+type: cc.Node,
+displayName: "红包提现"
+}) ], t.prototype, "node_redbagCash", void 0);
+a([ f({
+type: cc.Node,
+displayName: "福袋"
+}) ], t.prototype, "node_blessingBag", void 0);
+a([ f({
+type: cc.Node,
+displayName: "转盘"
+}) ], t.prototype, "node_turnable", void 0);
+a([ f({
+type: cc.Node,
+displayName: "福利礼包"
+}) ], t.prototype, "node_redeem", void 0);
+return a([ h("RedPoinNode") ], t);
+}();
+n.RedPoinNode = y;
+var g = function(t) {
 i(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
@@ -8624,6 +8690,7 @@ e.btn_start = null;
 e.icon_hb = null;
 e.icon_zb = null;
 e.node_top_ui = null;
+e.nodeRedPoint = null;
 return e;
 }
 e.prototype.onLoad = function() {
@@ -8642,6 +8709,7 @@ mk.guide.open(1);
 e.prototype.update = function() {
 gData.gameData.init_coin && this.changeInfo();
 gData.gameData.init_head && this.initHead();
+gData.gameData.init_red_point && this.initRedPoint();
 };
 e.prototype.lateUpdate = function() {
 gData.gameData.init_head = !1;
@@ -8712,6 +8780,15 @@ return [ 2 ];
 });
 });
 };
+e.prototype.initRedPoint = function() {
+this.nodeRedPoint.node_sign.active = gData.sign.redPoint();
+this.nodeRedPoint.node_pigbank.active = gData.pigbank.redPoint();
+this.nodeRedPoint.node_redbagCash.active = gData.redBagCash.redPoint();
+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;
+};
 e.prototype.autoOpenPanel = function() {
 if (!gData.gameData.isNewPlayer()) {
 mk.ui.openPanel("module/pigBank/pigBank");
@@ -8786,9 +8863,13 @@ a([ f({
 type: cc.Node,
 displayName: "顶部ui组"
 }) ], e.prototype, "node_top_ui", void 0);
+a([ f({
+type: y,
+displayName: "红点组"
+}) ], e.prototype, "nodeRedPoint", void 0);
 return a([ h ], e);
 }(cc.Component);
-n.default = y;
+n.default = g;
 cc._RF.pop();
 }, {
 "../../mk/system/JsbSystem": "JsbSystem",
@@ -9246,7 +9327,7 @@ r.dialog_alignment = c.dialogAlignment;
 r.display_rect = c.displayRect;
 r.click_rect = c.clickRect;
 r.finger = c.finger;
-r.lag_next = parseInt(c.lagNext);
+r.lag_next = parseFloat(c.lagNext);
 if (o != r.id) {
 this.data.set(o, n);
 n = [];
@@ -9274,14 +9355,18 @@ cc._RF.push(e, "ccad7HVXppOw6s55udVONoH", "GuideSystem");
 Object.defineProperty(n, "__esModule", {
 value: !0
 });
-var o = t("../../game/data/GameData"), i = function() {
+var o = t("../../game/data/GameData"), i = t("./UISystem"), a = function() {
 function t() {}
 t.prototype.open = function(t) {
 this.crtGuideID = gData.gameData.getProp(o.GameProp.guideID);
+if (!cc.sys.isNative) {
+this.crtGuideID = 0;
+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 {
 gData.guideData.crtID = t;
 this.crtGuideID = t;
-mk.ui.openPanel("module/guide/guide");
+mk.ui.openPanel("module/guide/guide", i.OpenActionType.normal, this.ui);
 this.setGuideID(this.crtGuideID++);
 }
 };
@@ -9297,10 +9382,11 @@ return !this.crtGuideID || 999 === this.crtGuideID;
 };
 return t;
 }();
-n.default = i;
+n.default = a;
 cc._RF.pop();
 }, {
-"../../game/data/GameData": "GameData"
+"../../game/data/GameData": "GameData",
+"./UISystem": "UISystem"
 } ],
 GuideVO: [ function(t, e, n) {
 "use strict";
@@ -9435,12 +9521,17 @@ onTouchCancelled: null
 });
 this._eventManager.addListener(this._touchListener, this.node);
 };
-e.prototype.onTouchStart = function() {
-return !0;
+e.prototype.onTouchStart = function(t) {
+var e = t.getLocation(), n = this.node.parent.convertToNodeSpaceAR(new cc.Vec2(e.x, e.y));
+return this.pointInPoly(n, this.node);
 };
 e.prototype.onTouchEnded = function(t) {
 this.onClickCall(t);
 };
+e.prototype.pointInPoly = function(t, e) {
+var n = e.getPosition();
+return t.x >= n.x - this.node.width / 2 && t.x <= n.x + this.node.width / 2 && t.y >= n.y - this.node.height / 2 && t.y <= n.y + this.node.height / 2;
+};
 e.prototype.onDestroy = function() {
 this._eventManager.removeListener(this._touchListener, this.node);
 mk.event.remove("close-panel", this.onClosePanel, this);
@@ -9600,10 +9691,17 @@ e.node_head = null;
 e.node_person = null;
 e.rich_dialog = null;
 e.widgets = [ "top", "bottom", "left", "right", "verticalCenter", "horizontalCenter" ];
+e._eventManager = cc.internal.eventManager;
 return e;
 }
 e.prototype.onLoad = function() {};
-e.prototype.start = function() {};
+e.prototype.start = function() {
+if (null != gData.guideData.crtID) {
+this.guides = gData.guideData.getGuidesByID(gData.guideData.crtID);
+this.crtStep = -1;
+this.nextStep();
+} else this.node.destroy();
+};
 e.prototype.nextStep = function() {
 this.crtStep++;
 this.crtGuide = this.guides[this.crtStep];
@@ -9612,28 +9710,34 @@ this.updateGuide();
 e.prototype.updateGuide = function() {
 var t = this;
 if (null == this.crtGuide) this.close(); else {
+this.node_bg.opacity = 180;
 this.node_finger.opacity = 255;
 this.node_dialog.opacity = 255;
 this.targetNode = null;
-this.event_name = null;
+this.event_data = null;
+this.ifThrough = !0;
 var e = [ null, null, null, null ], n = e[0], o = e[1], i = e[2], a = e[3];
-if ("all" == this.crtGuide.click_rect) {
-this.node_display.width = this.node_display.height = 0;
-this.node_click.x = 0;
-this.node_click.y = 0;
-this.node_click.width = this.node.width;
-this.node_click.height = this.node.height;
-} else if (-1 != this.crtGuide.click_rect.indexOf("event")) {
-this.event_name = "event_guide_" + this.crtGuide.id + "_" + this.crtStep;
+if ("all" == this.crtGuide.click_rect || -1 != this.crtGuide.click_rect.indexOf("event")) {
+if (0 == this.crtGuide.display_rect.length) this.node_display.width = this.node_display.height = 0; else {
 var r = this.crtGuide.display_rect.split(":");
 n = parseInt(r[0]);
 o = parseInt(r[1]);
 i = parseInt(r[2]);
 a = parseInt(r[3]);
+}
+if ("all" == this.crtGuide.click_rect) {
+this.node_click.x = 0;
+this.node_click.y = 0;
+this.node_click.width = this.node.width;
+this.node_click.height = this.node.height;
+this.ifThrough = !1;
+} else {
+this.event_data = this.crtGuide.id + "_" + (this.crtStep + 1);
 this.node_click.x = n;
 this.node_click.y = o;
 this.node_click.width = i;
 this.node_click.height = a;
+}
 } else {
 this.targetNode = cc.find("Canvas/" + this.crtGuide.click_rect);
 i = this.targetNode.width;
@@ -9648,7 +9752,11 @@ s.component = "Guide";
 s.handler = "clickNodeClick";
 this.targetNode.getComponent(cc.Button).clickEvents.push(s);
 }
-null != n && null != o && null != i && null != a && cc.tween(this.node_display).to(.3, {
+if (null != n && null != o && null != i && null != a) {
+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, {
 x: n,
 y: o,
 width: i,
@@ -9659,6 +9767,7 @@ t.node_bg.x = -t.node_display.x;
 t.node_bg.y = -t.node_display.y;
 }
 }).start();
+}
 if (null != this.crtGuide.dialog_pos && this.crtGuide.dialog_pos.length > 0) {
 r = this.crtGuide.dialog_pos.split(":");
 for (var l = this.node_dialog.getComponent(cc.Widget), u = 0; u < this.widgets.length; u++) l[this.widgets[u]] = "" == r[u] ? null : parseInt(r[u]);
@@ -9690,10 +9799,11 @@ return r(this, void 0, void 0, function() {
 return c(this, function(t) {
 switch (t.label) {
 case 0:
+mk.audio.playEffect("button");
 cc.Tween.stopAllByTarget(this.node_display);
 console.log("clickNodeClick");
 this.targetNode && this.targetNode.getComponent(cc.Button).clickEvents.pop();
-this.event_name && mk.event.emit(this.event_name);
+this.event_data && mk.event.emit("event_guide", this.event_data);
 this.reset();
 return this.crtGuide.lag_next > 0 ? [ 4, mk.time.WaitForSeconds(this.crtGuide.lag_next) ] : [ 3, 2 ];
 
@@ -9709,9 +9819,11 @@ return [ 2 ];
 });
 };
 e.prototype.reset = function() {
-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;
@@ -9721,6 +9833,37 @@ e.prototype.close = function() {
 mk.guide.close();
 this.node.destroy();
 };
+e.prototype.initTouch = function() {
+var t = cc.EventListener;
+this._touchListener = t.create({
+event: t.TOUCH_ONE_BY_ONE,
+swallowTouches: !1,
+owner: this.node_click,
+mask: null,
+onTouchBegan: this.onTouchStart.bind(this),
+onTouchMoved: null,
+onTouchEnded: this.onTouchEnded.bind(this),
+onTouchCancelled: null
+});
+this._eventManager.addListener(this._touchListener, this.node_click);
+};
+e.prototype.onTouchStart = function(t) {
+if (this.ifThrough) {
+var e = t.getLocation(), n = this.node.parent.convertToNodeSpaceAR(new cc.Vec2(e.x, e.y));
+return this.pointInPoly(n, this.node_click);
+}
+return !1;
+};
+e.prototype.pointInPoly = function(t, e) {
+var n = e.getPosition();
+return t.x >= n.x - this.node_click.width / 2 && t.x <= n.x + this.node_click.width / 2 && t.y >= n.y - this.node_click.height / 2 && t.y <= n.y + this.node_click.height / 2;
+};
+e.prototype.onTouchEnded = function() {
+this.clickNodeClick();
+};
+e.prototype.onDestroy = function() {
+this._eventManager.removeListener(this._touchListener, this.node_click);
+};
 a([ u({
 type: cc.Node,
 displayName: "显示区域"
@@ -11226,7 +11369,7 @@ if (gData.appData.getDeviceInfoCompelete) {
 this.login();
 gData.appData.getDeviceInfoCompelete = !1;
 } else if (gData.gameData.dataFinish) {
-gData.gameData.isNewPlayer() ? mk.ui.openPanel("module/agreementTip/agreementTip") : mk.ui.openPanel("game/prefab/game");
+gData.gameData.isNewPlayer() ? mk.ui.openPanel("module/login/agreementTip") : mk.ui.openPanel("game/prefab/game");
 gData.gameData.dataFinish = !1;
 }
 } else gData.loginData.loadLocalRes();
@@ -11253,6 +11396,7 @@ return [ 4, this.checkHotUpdate() ];
 
 case 2:
 e.sent();
+mk.audio.init();
 return [ 2 ];
 }
 });
@@ -11409,7 +11553,7 @@ cc._RF.push(e, "f0038hKHC9Nf5+ipaUV9rc5", "MKSystem");
 Object.defineProperty(n, "__esModule", {
 value: !0
 });
-var o = t("../sdk/BuglySDK"), i = t("../utils/FileUtil"), a = t("../utils/TimeUtil"), r = t("./DataSystem"), c = t("./HttpSystem"), s = t("../utils/LoadResUtil"), l = t("../utils/LogUtil"), u = t("../utils/EncryptUtil"), p = t("../utils/GameUtil"), d = t("../utils/StorageUtil"), h = t("./TimerSystem"), f = t("./EventSystem"), y = t("../utils/MathUtil"), g = t("./AdSystem"), m = t("./JsbSystem"), _ = t("../sdk/ad/toppon/AnyThinkAdsMgr/ATSDKMgr"), v = t("./AudioSystem"), b = t("./PoolSystem"), S = t("../utils/TweenUtil"), w = t("./GuideSystem"), A = t("../utils/StringUtil"), D = function() {
+var o = t("../sdk/BuglySDK"), i = t("../utils/FileUtil"), a = t("../utils/TimeUtil"), r = t("./DataSystem"), c = t("./HttpSystem"), s = t("../utils/LoadResUtil"), l = t("../utils/LogUtil"), u = t("../utils/EncryptUtil"), p = t("../utils/GameUtil"), d = t("../utils/StorageUtil"), h = t("./TimerSystem"), f = t("./EventSystem"), y = t("../utils/MathUtil"), g = t("./AdSystem"), _ = t("./JsbSystem"), m = t("../sdk/ad/toppon/AnyThinkAdsMgr/ATSDKMgr"), v = t("./AudioSystem"), b = t("./PoolSystem"), S = t("../utils/TweenUtil"), w = t("./GuideSystem"), A = t("../utils/StringUtil"), D = function() {
 function t() {}
 Object.defineProperty(t.prototype, "time", {
 get: function() {
@@ -11497,14 +11641,14 @@ configurable: !0
 });
 Object.defineProperty(t.prototype, "ad", {
 get: function() {
-return this._ad || (this._ad = new g.default(_.default.getInstance()));
+return this._ad || (this._ad = new g.default(m.default.getInstance()));
 },
 enumerable: !1,
 configurable: !0
 });
 Object.defineProperty(t.prototype, "jsb", {
 get: function() {
-return this._jsb || (this._jsb = new m.default());
+return this._jsb || (this._jsb = new _.default());
 },
 enumerable: !1,
 configurable: !0
@@ -11633,17 +11777,21 @@ return a > 3 && r && Object.defineProperty(e, n, r), r;
 Object.defineProperty(n, "__esModule", {
 value: !0
 });
-var r = cc._decorator, c = r.ccclass, s = (r.property, function(t) {
+var r = cc._decorator, c = r.ccclass, s = r.property, l = function(t) {
 i(e, t);
 function e() {
-return null !== t && t.apply(this, arguments) || this;
+var e = null !== t && t.apply(this, arguments) || this;
+e.node_guide = null;
+return e;
 }
 e.prototype.start = function() {
 mk.ui.openPanel("module/login/login");
+mk.guide.ui = this.node_guide;
 };
+a([ s(cc.Node) ], e.prototype, "node_guide", void 0);
 return a([ c ], e);
-}(cc.Component));
-n.default = s;
+}(cc.Component);
+n.default = l;
 cc._RF.pop();
 }, {} ],
 MathUtil: [ function(t, e, n) {
@@ -12593,6 +12741,7 @@ e.btnOpen = null;
 e.labName = null;
 e.labDes = null;
 e.spRed = null;
+e.bData = null;
 e.data = null;
 e.cool = !1;
 return e;
@@ -12601,8 +12750,9 @@ e.prototype.setItemData = function(t) {
 return r(this, void 0, void 0, function() {
 var e = this;
 return c(this, function() {
+this.bData = t;
 this.data = t.item_data;
-cc.sys.os != cc.sys.OS_WINDOWS && cc.loader.load(this.data.icon, function(t, n) {
+cc.loader.load(this.data.icon, function(t, n) {
 if (t) console.log("err:", t); else if (cc.isValid(e.iconNode)) {
 var o = n;
 e.iconNode.spriteFrame = new cc.SpriteFrame(o);
@@ -12646,7 +12796,7 @@ t.showDownloadProgress();
 };
 e.prototype.showDownloadProgress = function() {
 var t = gData.moreGame.getTaskInfo(this.data.nebulaAppId);
-null != t && t.progress >= 0 ? this.progressLabel.string = (t.progress / t.totalBytesReceives * 100).toFixed(1) + "%" : this.setItemData(this.data);
+null != t && t.progress >= 0 ? this.progressLabel.string = (t.progress / t.totalBytesReceives * 100).toFixed(1) + "%" : this.setItemData(this.bData);
 };
 a([ p(cc.Sprite) ], e.prototype, "iconNode", void 0);
 a([ p(cc.Label) ], e.prototype, "progressLabel", void 0);
@@ -12703,7 +12853,7 @@ return e;
 e.prototype.init = function(t) {
 var e = this;
 this.data = t;
-cc.sys.os != cc.sys.OS_WINDOWS && cc.loader.load(t.banner2, function(t, n) {
+cc.loader.load(t.banner2, function(t, n) {
 if (t) console.log("err:", t); else if (e.banner) {
 var o = n;
 e.banner.spriteFrame = new cc.SpriteFrame(o);
@@ -12712,13 +12862,16 @@ e.banner.spriteFrame = new cc.SpriteFrame(o);
 this.spPro.node.active = !1;
 this.btnStart.active = !1;
 this.labPro.string = "";
-if (r.default.ifCanStartGame(t.packageName, !1)) {
+if (1 == t.appType) if (r.default.ifCanStartGame(t.packageName, !1)) {
 this.spRed.active = !1;
 this.btnStart.active = !0;
 } else if (r.default.isFileExist(t.nebulaAppId + ".apk")) {
 this.spRed.active = !1;
 this.btnStart.active = !0;
-} else this.spRed.active = !0;
+} else this.spRed.active = !0; else if (2 == t.appType) {
+this.spRed.active = !1;
+this.btnStart.active = !0;
+}
 };
 e.prototype.creatorDownLoadTask = function() {
 var t = this;
@@ -12727,9 +12880,9 @@ this.cool = !0;
 this.scheduleOnce(function() {
 t.cool = !1;
 }, 3);
-null != gData.moreGame.createNewTask(this.data) && this.schedule(function() {
+1 == this.data.appType ? null != gData.moreGame.createNewTask(this.data) && this.schedule(function() {
 t.showDownloadProgress();
-}, .5);
+}, .5) : 2 == this.data.appType && cc.sys.openURL(this.data.recommendLink);
 }
 };
 e.prototype.showDownloadProgress = function() {
@@ -12801,7 +12954,7 @@ e.prototype.init = function() {
 var t = this;
 this.data = gData.moreGame.getRandomNormal();
 if (this.data) {
-cc.sys.os != cc.sys.OS_WINDOWS && cc.loader.load(this.data.icon, function(e, n) {
+cc.loader.load(this.data.icon, function(e, n) {
 if (e) console.log("err:", e); else {
 var o = n;
 t.icon.spriteFrame = new cc.SpriteFrame(o);
@@ -12814,7 +12967,7 @@ e.prototype.creatorDownLoadTask = function() {
 mk.audio.playEffect("button");
 if (!this.cool) {
 this.cool = !0;
-cc.sys.isNative && !r.default.ifCanStartGame(this.data.packageName, !0) && gData.moreGame.createNewTask(this.data);
+1 == this.data.appType ? r.default.ifCanStartGame(this.data.packageName, !0) || gData.moreGame.createNewTask(this.data) : 2 == this.data.appType && cc.sys.openURL(this.data.recommendLink);
 gData.moreGame.popNodeGetRedBag();
 }
 };
@@ -13345,7 +13498,9 @@ e.init_data = !0;
 e.cash_min_limit = .3;
 return e;
 }
-e.prototype.init = function() {};
+e.prototype.init = function() {
+this.cash_min_limit = gData.gameData.configs.ServerConfig.PiggyBankCashMoney;
+};
 e.prototype.cashOP = function() {
 return a(this, void 0, void 0, function() {
 var t;
@@ -13371,6 +13526,9 @@ return [ 2 ];
 });
 });
 };
+e.prototype.redPoint = function() {
+return !!gData.gameData.gameData.isWithdrawable && gData.gameData.gameData.piggyBank >= this.cash_min_limit;
+};
 return e;
 }(t("../../../mk/data/Data").Data);
 n.PigBankData = c;
@@ -14331,7 +14489,7 @@ function e() {
 var e = null !== t && t.apply(this, arguments) || this;
 e.init_list = !1;
 e.c_data = [];
-e._cash_bar = 0;
+e._cash_bar = 1;
 return e;
 }
 e.prototype.init = function() {
@@ -14375,8 +14533,11 @@ return [ 4, mk.http.sendData("cashUsual", e) ];
 case 1:
 if (0 != (n = a.sent()).errcode) {
 mk.tip.pop(n.errmsg);
+mk.console.logSingle("提现index", t);
+mk.console.logSingle("提现错误内容：", n);
 return [ 2 ];
 }
+cc.log("红包提现成功");
 0 == (o = n.data).CashMode || o.CashMode;
 this.cash_bar++;
 gData.gameData.gameData.cashIndex++;
@@ -14394,7 +14555,7 @@ return [ 2 ];
 };
 e.prototype.sortList = function() {
 for (var t = this.c_data.length, e = 0, n = 0; n < t; n++) {
-if (this.c_data[e].index <= gData.redBagCash.cash_bar) {
+if (this.c_data[e].index < gData.redBagCash.cash_bar) {
 var o = this.c_data.splice(e, 1);
 this.c_data.push(o[0]);
 e--;
@@ -14423,6 +14584,10 @@ this.c_data.push(n);
 }
 this.init_list = !0;
 };
+e.prototype.redPoint = function() {
+for (var t = gData.gameData.gameData.redMoney, e = this.c_data.length, n = 0; n < e; n++) if (!(this.c_data[n].index < gData.redBagCash.cash_bar) && t >= this.c_data[n].type_value) return !0;
+return !1;
+};
 return e;
 }(c.Data);
 n.RedBagCashData = l;
@@ -14602,7 +14767,7 @@ this.lbl_red_value.string = "" + this.item_data.type_value;
 var e = this.item_data.money / 100;
 e = e > 1 ? e : parseFloat(e.toFixed(2));
 this.lbl_rmb_value.string = e + "元";
-if (this.item_data.index <= gData.redBagCash.cash_bar) {
+if (this.item_data.index < gData.redBagCash.cash_bar) {
 this.node_none.active = !0;
 this.node_lock.active = !1;
 this.node_unlock.active = !1;
@@ -14617,10 +14782,7 @@ this.node_unlock.active = !1;
 }
 };
 e.prototype.clickCashOP = function() {
-if (this.item_data.index > gData.redBagCash.cash_bar + 1) mk.tip.pop("请按顺序提现"); else {
-gData.redBagCash.cashOP();
-cc.log("红包现成功");
-}
+this.item_data.index > gData.redBagCash.cash_bar + 1 ? mk.tip.pop("请按顺序提现") : gData.redBagCash.cashOP();
 };
 a([ u({
 displayName: "已领取",
@@ -15362,6 +15524,9 @@ return [ 2, e ];
 });
 });
 };
+e.prototype.redPoint = function() {
+return !1;
+};
 return e;
 }(t("../../../mk/data/Data").Data);
 n.default = c;
@@ -17220,6 +17385,9 @@ if (a === s.RewardState.unlock) return n;
 }
 return t;
 };
+e.prototype.redPoint = function() {
+return !gData.gameData.gameData.isSignInToday && this.haveSignDay();
+};
 return e;
 }(c.Data);
 n.SignData = l;
@@ -19182,6 +19350,9 @@ mk.console.log("watchAD:" + t);
 t && gData.adData.watchVideo(s.AdFun.turntable);
 });
 };
+e.prototype.redPoint = function() {
+return !1;
+};
 return e;
 }(c.Data);
 n.TurnableData = u;
@@ -20022,39 +20193,40 @@ mk.ui = this;
 e.prototype.start = function() {
 this.panelParent || (this.panelParent = this.node);
 };
-e.prototype.openPanel = function(t, e) {
+e.prototype.openPanel = function(t, e, n) {
 void 0 === e && (e = r.normal);
-var n = t.split("/"), o = n[n.length - 1], i = this;
-if (!i.isPanelOpening && !i.getCurOnPanel(o)) {
-i.isPanelOpening = !0;
-return new Promise(function(n, a) {
+void 0 === n && (n = null);
+var o = t.split("/"), i = o[o.length - 1], a = this;
+if (!a.isPanelOpening && !a.getCurOnPanel(i)) {
+a.isPanelOpening = !0;
+return new Promise(function(o, c) {
 mk.loader.load("" + t, cc.Prefab).then(function(t) {
-i.isPanelOpening = !1;
-var a = cc.instantiate(t);
-i.curOnPanelDic[o] = a;
-i.panelParent && (i.panelParent = i.node);
-if (i.panelParent) {
-i.panelParent.addChild(a);
+a.isPanelOpening = !1;
+var c = cc.instantiate(t);
+a.curOnPanelDic[i] = c;
+a.panelParent && (a.panelParent = a.node);
+if (a.panelParent) {
+n ? c.parent = n : a.panelParent.addChild(c);
 switch (e) {
 case r.normal:
 break;
 
 case r.closeLast:
-i.lastOpenPanelName && i.closePanel(i.lastOpenPanelName);
+a.lastOpenPanelName && a.closePanel(a.lastOpenPanelName);
 break;
 
 case r.closeOther:
-for (var c = Object.keys(i.curOnPanelDic).filter(function() {}), s = 0; s < c.length; s++) {
-var l = c[s];
-i.closePanel(l);
+for (var s = Object.keys(a.curOnPanelDic).filter(function() {}), l = 0; l < s.length; l++) {
+var u = s[l];
+a.closePanel(u);
 }
 }
-i.lastOpenPanelName = o;
-n(a);
+a.lastOpenPanelName = i;
+o(c);
 } else console.error("[UISystem] UI的父节点panelParent为null,请检查脚本挂载情况");
 }).catch(function(t) {
-i.isPanelOpening = !1;
-a(t);
+a.isPanelOpening = !1;
+c(t);
 });
 });
 }
@@ -20827,26 +20999,26 @@ var c = t[s = i + r];
 t[s] = 16711935 & (c << 8 | c >>> 24) | 4278255360 & (c << 24 | c >>> 8);
 }
 r = this._hash.words;
-var s = t[i + 0], l = (c = t[i + 1], t[i + 2]), p = t[i + 3], d = t[i + 4], h = t[i + 5], f = t[i + 6], y = t[i + 7], g = t[i + 8], m = t[i + 9], _ = t[i + 10], v = t[i + 11], b = t[i + 12], S = t[i + 13], w = t[i + 14], A = t[i + 15], D = e(D = r[0], I = r[1], O = r[2], P = r[3], s, 7, u[0]), P = e(P, D, I, O, c, 12, u[1]), O = e(O, P, D, I, l, 17, u[2]), I = e(I, O, P, D, p, 22, u[3]);
+var s = t[i + 0], l = (c = t[i + 1], t[i + 2]), p = t[i + 3], d = t[i + 4], h = t[i + 5], f = t[i + 6], y = t[i + 7], g = t[i + 8], _ = t[i + 9], m = t[i + 10], v = t[i + 11], b = t[i + 12], S = t[i + 13], w = t[i + 14], A = t[i + 15], D = e(D = r[0], I = r[1], O = r[2], P = r[3], s, 7, u[0]), P = e(P, D, I, O, c, 12, u[1]), O = e(O, P, D, I, l, 17, u[2]), I = e(I, O, P, D, p, 22, u[3]);
 D = e(D, I, O, P, d, 7, u[4]), P = e(P, D, I, O, h, 12, u[5]), O = e(O, P, D, I, f, 17, u[6]), 
-I = e(I, O, P, D, y, 22, u[7]), D = e(D, I, O, P, g, 7, u[8]), P = e(P, D, I, O, m, 12, u[9]), 
-O = e(O, P, D, I, _, 17, u[10]), I = e(I, O, P, D, v, 22, u[11]), D = e(D, I, O, P, b, 7, u[12]), 
+I = e(I, O, P, D, y, 22, u[7]), D = e(D, I, O, P, g, 7, u[8]), P = e(P, D, I, O, _, 12, u[9]), 
+O = e(O, P, D, I, m, 17, u[10]), I = e(I, O, P, D, v, 22, u[11]), D = e(D, I, O, P, b, 7, u[12]), 
 P = e(P, D, I, O, S, 12, u[13]), O = e(O, P, D, I, w, 17, u[14]), D = n(D, I = e(I, O, P, D, A, 22, u[15]), O, P, c, 5, u[16]), 
 P = n(P, D, I, O, f, 9, u[17]), O = n(O, P, D, I, v, 14, u[18]), I = n(I, O, P, D, s, 20, u[19]), 
-D = n(D, I, O, P, h, 5, u[20]), P = n(P, D, I, O, _, 9, u[21]), O = n(O, P, D, I, A, 14, u[22]), 
-I = n(I, O, P, D, d, 20, u[23]), D = n(D, I, O, P, m, 5, u[24]), P = n(P, D, I, O, w, 9, u[25]), 
+D = n(D, I, O, P, h, 5, u[20]), P = n(P, D, I, O, m, 9, u[21]), O = n(O, P, D, I, A, 14, u[22]), 
+I = n(I, O, P, D, d, 20, u[23]), D = n(D, I, O, P, _, 5, u[24]), P = n(P, D, I, O, w, 9, u[25]), 
 O = n(O, P, D, I, p, 14, u[26]), I = n(I, O, P, D, g, 20, u[27]), D = n(D, I, O, P, S, 5, u[28]), 
 P = n(P, D, I, O, l, 9, u[29]), O = n(O, P, D, I, y, 14, u[30]), D = o(D, I = n(I, O, P, D, b, 20, u[31]), O, P, h, 4, u[32]), 
 P = o(P, D, I, O, g, 11, u[33]), O = o(O, P, D, I, v, 16, u[34]), I = o(I, O, P, D, w, 23, u[35]), 
 D = o(D, I, O, P, c, 4, u[36]), P = o(P, D, I, O, d, 11, u[37]), O = o(O, P, D, I, y, 16, u[38]), 
-I = o(I, O, P, D, _, 23, u[39]), D = o(D, I, O, P, S, 4, u[40]), P = o(P, D, I, O, s, 11, u[41]), 
-O = o(O, P, D, I, p, 16, u[42]), I = o(I, O, P, D, f, 23, u[43]), D = o(D, I, O, P, m, 4, u[44]), 
+I = o(I, O, P, D, m, 23, u[39]), D = o(D, I, O, P, S, 4, u[40]), P = o(P, D, I, O, s, 11, u[41]), 
+O = o(O, P, D, I, p, 16, u[42]), I = o(I, O, P, D, f, 23, u[43]), D = o(D, I, O, P, _, 4, u[44]), 
 P = o(P, D, I, O, b, 11, u[45]), O = o(O, P, D, I, A, 16, u[46]), D = a(D, I = o(I, O, P, D, l, 23, u[47]), O, P, s, 6, u[48]), 
 P = a(P, D, I, O, y, 10, u[49]), O = a(O, P, D, I, w, 15, u[50]), I = a(I, O, P, D, h, 21, u[51]), 
-D = a(D, I, O, P, b, 6, u[52]), P = a(P, D, I, O, p, 10, u[53]), O = a(O, P, D, I, _, 15, u[54]), 
+D = a(D, I, O, P, b, 6, u[52]), P = a(P, D, I, O, p, 10, u[53]), O = a(O, P, D, I, m, 15, u[54]), 
 I = a(I, O, P, D, c, 21, u[55]), D = a(D, I, O, P, g, 6, u[56]), P = a(P, D, I, O, A, 10, u[57]), 
 O = a(O, P, D, I, f, 15, u[58]), I = a(I, O, P, D, S, 21, u[59]), D = a(D, I, O, P, d, 6, u[60]), 
-P = a(P, D, I, O, v, 10, u[61]), O = a(O, P, D, I, l, 15, u[62]), I = a(I, O, P, D, m, 21, u[63]);
+P = a(P, D, I, O, v, 10, u[61]), O = a(O, P, D, I, l, 15, u[62]), I = a(I, O, P, D, _, 21, u[63]);
 r[0] = r[0] + D | 0;
 r[1] = r[1] + I | 0;
 r[2] = r[2] + O | 0;
@@ -21102,22 +21274,22 @@ return d.decrypt.call(this, t, e, n.key, o);
 }();
 (function() {
 for (var t = i, e = t.lib.BlockCipher, n = t.algo, o = [], a = [], r = [], c = [], s = [], l = [], u = [], p = [], d = [], h = [], f = [], y = 0; 256 > y; y++) f[y] = 128 > y ? y << 1 : y << 1 ^ 283;
-var g = 0, m = 0;
+var g = 0, _ = 0;
 for (y = 0; 256 > y; y++) {
-var _ = (_ = m ^ m << 1 ^ m << 2 ^ m << 3 ^ m << 4) >>> 8 ^ 255 & _ ^ 99;
-o[g] = _;
-a[_] = g;
-var v = f[g], b = f[v], S = f[b], w = 257 * f[_] ^ 16843008 * _;
+var m = (m = _ ^ _ << 1 ^ _ << 2 ^ _ << 3 ^ _ << 4) >>> 8 ^ 255 & m ^ 99;
+o[g] = m;
+a[m] = g;
+var v = f[g], b = f[v], S = f[b], w = 257 * f[m] ^ 16843008 * m;
 r[g] = w << 24 | w >>> 8;
 c[g] = w << 16 | w >>> 16;
 s[g] = w << 8 | w >>> 24;
 l[g] = w;
 w = 16843009 * S ^ 65537 * b ^ 257 * v ^ 16843008 * g;
-u[_] = w << 24 | w >>> 8;
-p[_] = w << 16 | w >>> 16;
-d[_] = w << 8 | w >>> 24;
-h[_] = w;
-g ? (g = v ^ f[f[f[S ^ v]]], m ^= f[f[m]]) : g = m = 1;
+u[m] = w << 24 | w >>> 8;
+p[m] = w << 16 | w >>> 16;
+d[m] = w << 8 | w >>> 24;
+h[m] = w;
+g ? (g = v ^ f[f[f[S ^ v]]], _ ^= f[f[_]]) : g = _ = 1;
 }
 var A = [ 0, 1, 2, 4, 8, 16, 32, 64, 128, 27, 54 ];
 n = n.AES = e.extend({
@@ -21145,17 +21317,17 @@ t[e + 3] = n;
 },
 _doCryptBlock: function(t, e, n, o, i, a, r, c) {
 for (var s = this._nRounds, l = t[e] ^ n[0], u = t[e + 1] ^ n[1], p = t[e + 2] ^ n[2], d = t[e + 3] ^ n[3], h = 4, f = 1; f < s; f++) {
-var y = o[l >>> 24] ^ i[u >>> 16 & 255] ^ a[p >>> 8 & 255] ^ r[255 & d] ^ n[h++], g = o[u >>> 24] ^ i[p >>> 16 & 255] ^ a[d >>> 8 & 255] ^ r[255 & l] ^ n[h++], m = o[p >>> 24] ^ i[d >>> 16 & 255] ^ a[l >>> 8 & 255] ^ r[255 & u] ^ n[h++];
+var y = o[l >>> 24] ^ i[u >>> 16 & 255] ^ a[p >>> 8 & 255] ^ r[255 & d] ^ n[h++], g = o[u >>> 24] ^ i[p >>> 16 & 255] ^ a[d >>> 8 & 255] ^ r[255 & l] ^ n[h++], _ = o[p >>> 24] ^ i[d >>> 16 & 255] ^ a[l >>> 8 & 255] ^ r[255 & u] ^ n[h++];
 d = o[d >>> 24] ^ i[l >>> 16 & 255] ^ a[u >>> 8 & 255] ^ r[255 & p] ^ n[h++], l = y, 
-u = g, p = m;
+u = g, p = _;
 }
 y = (c[l >>> 24] << 24 | c[u >>> 16 & 255] << 16 | c[p >>> 8 & 255] << 8 | c[255 & d]) ^ n[h++];
 g = (c[u >>> 24] << 24 | c[p >>> 16 & 255] << 16 | c[d >>> 8 & 255] << 8 | c[255 & l]) ^ n[h++];
-m = (c[p >>> 24] << 24 | c[d >>> 16 & 255] << 16 | c[l >>> 8 & 255] << 8 | c[255 & u]) ^ n[h++];
+_ = (c[p >>> 24] << 24 | c[d >>> 16 & 255] << 16 | c[l >>> 8 & 255] << 8 | c[255 & u]) ^ n[h++];
 d = (c[d >>> 24] << 24 | c[l >>> 16 & 255] << 16 | c[u >>> 8 & 255] << 8 | c[255 & p]) ^ n[h++];
 t[e] = y;
 t[e + 1] = g;
-t[e + 2] = m;
+t[e + 2] = _;
 t[e + 3] = d;
 },
 keySize: 8
@@ -21729,9 +21901,9 @@ function i(t, e) {
 t[e >> 5] |= 128 << 24 - e % 32;
 t[15 + (e + 64 >> 9 << 4)] = e;
 for (var n = Array(80), o = 1732584193, i = -271733879, l = -1732584194, u = 271733878, p = -1009589776, d = 0; d < t.length; d += 16) {
-for (var h = o, f = i, y = l, g = u, m = p, _ = 0; _ < 80; _++) {
-n[_] = _ < 16 ? t[d + _] : s(n[_ - 3] ^ n[_ - 8] ^ n[_ - 14] ^ n[_ - 16], 1);
-var v = c(c(s(o, 5), a(_, i, l, u)), c(c(p, n[_]), r(_)));
+for (var h = o, f = i, y = l, g = u, _ = p, m = 0; m < 80; m++) {
+n[m] = m < 16 ? t[d + m] : s(n[m - 3] ^ n[m - 8] ^ n[m - 14] ^ n[m - 16], 1);
+var v = c(c(s(o, 5), a(m, i, l, u)), c(c(p, n[m]), r(m)));
 p = u;
 u = l;
 l = s(i, 30);
@@ -21742,7 +21914,7 @@ o = c(o, h);
 i = c(i, f);
 l = c(l, y);
 u = c(u, g);
-p = c(p, m);
+p = c(p, _);
 }
 return Array(o, i, l, u, p);
 }

packages-hot-update/cfg.json

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