修复卡死

assets/script/before/GamePlay.ts

@@ -1055,7 +1055,6 @@ export default class GamePlay extends cc.Component {
 
     /**游戏结算 */
     gameCount() {
-
         let node_getPropUI = mk.ui.getCurOnPanel("GetPropUI");
         if (node_getPropUI) {
             mk.ui.closePanel("GetPropUI");

assets/script/game/module/redBagCash/RedBagCash.ts

@@ -28,8 +28,6 @@ export default class RedBagCash extends cc.Component {
     start() {
         gData.redBagCash.init_list = true;
         gData.redBagCash.initState();
-        // this.initMoney();
-        // this.initScrollView();
     }
 
     update(dt) {
@@ -88,6 +86,16 @@ export default class RedBagCash extends cc.Component {
 
     onDestroy() {
         // 是否需要打开存钱罐
+        if (gData.redBagCash.success) {
+            gData.redBagCash.success = false;
+            gData.safeDepositBoxData.creatPacketAnim(2);
+
+            let state = gData.gameData.getProp(GameProp.guideToWx);
+            if (!state) {
+                mk.guide.open(3);
+                return;
+            }
+        }
         const isOpenBankOnCloseCash = gData.gameData.getProp(GameProp.isOpenBankOnCloseCash);
         if (!isOpenBankOnCloseCash) {
             mk.ui.openPanel('module/pigBank/pigBank');
@@ -100,12 +108,4 @@ export default class RedBagCash extends cc.Component {
             GamePlay.Inst.gameCount();
         }
     }
-
-    onDisable() {
-        if (gData.redBagCash.success) {
-            gData.redBagCash.success = false;
-            gData.safeDepositBoxData.creatPacketAnim(2);
-            mk.guide.open(3);
-        }
-    }
 }

assets/script/mk/system/GuideSystem.ts

@@ -22,7 +22,7 @@ export default class GuideSystem {
                 gData.gameData.setProp(GameProp.guideToWx, 1);
                 gData.guideToWxData.init_state = true;
                 mk.ui.closeAllUI();
-                if (GamePlay.Inst.node.active) {
+                if (GamePlay.Inst.node && GamePlay.Inst.node.active) {
                     GamePlay.Inst.restart();//退出不扣体力
                     GamePlay.Inst.node.active = false;
                 }

assets/script/mk/system/UISystem.ts

@@ -123,6 +123,9 @@ export default class UISystem extends cc.Component {
         this.isPanelClosingArr.push(panelName);
 
         let node_panel = this.getCurOnPanel(panelName);
+        if (!node_panel) {
+            return;
+        }
 
         // 是否存在关闭动画
         let comp_anim = node_panel.getComponent('EffectOpenAndClose');
@@ -148,10 +151,19 @@ export default class UISystem extends cc.Component {
      */
     closeAllUI(except: string[] = ["game", "guide"]) {
         for (let panelName in this.curOnPanelDic) {
+            if (this.isPanelClosingArr.indexOf(panelName) != -1) {
+                continue;
+            }
+            this.isPanelClosingArr.push(panelName);
+
             if (except && except.length > 0 && except.indexOf(panelName) != -1) {
                 continue;
             }
             let node_panel = this.getCurOnPanel(panelName);
+            if (!node_panel) {
+                continue;
+            }
+
             let comp_anim = node_panel.getComponent('EffectOpenAndClose');
             if (comp_anim) {
                 comp_anim.hideEffect(this.destroyNode.bind(this, node_panel, panelName));

build/jsb-link/assets/resources/native/9e/9ed98385-f23f-41b7-a2bc-27a1d4ad9fd6.manifest

@@ -1 +1 @@
-{"version":"1.0.4","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote3/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote3/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote3/version.manifest"}
+{"version":"1.0.5","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote4/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote4/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote4/version.manifest"}

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

@@ -10216,7 +10216,7 @@ if (!gData.gameData.getProp(a.GameProp.guideToWx)) {
 gData.gameData.setProp(a.GameProp.guideToWx, 1);
 gData.guideToWxData.init_state = !0;
 mk.ui.closeAllUI();
-if (o.default.Inst.node.active) {
+if (o.default.Inst.node && o.default.Inst.node.active) {
 o.default.Inst.restart();
 o.default.Inst.node.active = !1;
 }
@@ -16547,6 +16547,14 @@ e = e > 1 ? Math.floor(e) : parseFloat(e.toFixed(2));
 this.lbl_rmb.string = "" + e;
 };
 e.prototype.onDestroy = function() {
+if (gData.redBagCash.success) {
+gData.redBagCash.success = !1;
+gData.safeDepositBoxData.creatPacketAnim(2);
+if (!gData.gameData.getProp(c.GameProp.guideToWx)) {
+mk.guide.open(3);
+return;
+}
+}
 if (!gData.gameData.getProp(c.GameProp.isOpenBankOnCloseCash)) {
 mk.ui.openPanel("module/pigBank/pigBank");
 gData.gameData.setProp(c.GameProp.isOpenBankOnCloseCash, 1);
@@ -16555,13 +16563,6 @@ gData.gameData.setProp(c.GameProp.isOpenBankOnCloseCash, 1);
 e.prototype.onClickClose = function() {
 r.default.Inst && r.default.Inst.ifPass && r.default.Inst.gameCount();
 };
-e.prototype.onDisable = function() {
-if (gData.redBagCash.success) {
-gData.redBagCash.success = !1;
-gData.safeDepositBoxData.creatPacketAnim(2);
-mk.guide.open(3);
-}
-};
 i([ u({
 displayName: "滚动视图",
 type: cc.ScrollView
@@ -23181,10 +23182,13 @@ e.prototype.closePanel = function(t, e) {
 void 0 === e && (e = null);
 if (-1 == this.isPanelClosingArr.indexOf(t) && this.getCurOnPanel(t)) {
 this.isPanelClosingArr.push(t);
-var n = this.getCurOnPanel(t), o = n.getComponent("EffectOpenAndClose");
+var n = this.getCurOnPanel(t);
+if (n) {
+var o = n.getComponent("EffectOpenAndClose");
 o && o.isOpenCloseEffect ? o.hideEffect(this.destroyNode.bind(this, n, t, e)) : this.destroyNode(n, t, e);
 mk.event.emit("close-panel", t);
 }
+}
 };
 e.prototype.destroyNode = function(t, e, n) {
 void 0 === n && (n = null);
@@ -23196,11 +23200,17 @@ n && n();
 };
 e.prototype.closeAllUI = function(t) {
 void 0 === t && (t = [ "game", "guide" ]);
-for (var e in this.curOnPanelDic) if (!(t && t.length > 0 && -1 != t.indexOf(e))) {
-var n = this.getCurOnPanel(e), o = n.getComponent("EffectOpenAndClose");
+for (var e in this.curOnPanelDic) if (-1 == this.isPanelClosingArr.indexOf(e)) {
+this.isPanelClosingArr.push(e);
+if (!(t && t.length > 0 && -1 != t.indexOf(e))) {
+var n = this.getCurOnPanel(e);
+if (n) {
+var o = n.getComponent("EffectOpenAndClose");
 o ? o.hideEffect(this.destroyNode.bind(this, n, e)) : this.destroyNode(n, e);
 mk.event.emit("close-panel", e);
 }
+}
+}
 mk.ad.destroyNativeAd();
 mk.ad.destoryBanner();
 };

packages-hot-update/cfg.json

@@ -16,7 +16,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote3/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote4/"
     ],
-    "buildTime": 1631364709647,
-    "genTime": 1631364709647,
+    "buildTime": 1631368862997,
+    "genTime": 1631368862997,
     "genVersion": null
 }