[FC]：领取奖励关卡不重置问题

assets/resources/module/hotUpdate/perfab.meta

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

assets/script/before/GamePlay.ts

@@ -199,7 +199,8 @@ export default class GamePlay extends cc.Component {
             this.curGetScore = score;
             this.curProgressScore = score;
             this.finalGetScore = score;
-            // console.log("score", score);
+            console.log("score", score);
+            // gData.gameData.setProp(GameProp.curTotalScore,0);
 
             this.initView();
             this.initEvent();
@@ -1036,7 +1037,7 @@ export default class GamePlay extends cc.Component {
         gData.gameData.setProp(GameProp.levelNum, ++levelNum);
 
         let node_rewardLuck = mk.ui.getCurOnPanel("rewardLuck");
-        if (node_rewardLuck) {
+        if (node_rewardLuck || this.finalGetScore >= this.targetScore) {
             return;
         }
         else {

assets/script/game/module/reward/Reward.ts

@@ -169,7 +169,8 @@ export default class Reward extends cc.Component {
                 mk.console.log("watchAD:" + success);
                 if (success) {
                     gData.adData.watchVideo(gData.reward.subType === 2 ? AdFun.checkpoint : AdFun.bubble);
-                    gData.reward.subType = null;
+                    //FC:不需要置空
+                    // gData.reward.subType = null;
                 }
             });
         }

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

@@ -8134,6 +8134,7 @@ var e = gData.gameData.getProp(y.GameProp.curTotalScore);
 t.curGetScore = e;
 t.curProgressScore = e;
 t.finalGetScore = e;
+console.log("score", e);
 t.initView();
 t.initEvent();
 t.intervalShowGuide();
@@ -8583,7 +8584,7 @@ var t = gData.gameData.getProp(y.GameProp.levelNum);
 mk.console.log("[Game]pass passLevelNum", t);
 n.Inst.ifGetPass = !0;
 gData.gameData.setProp(y.GameProp.levelNum, ++t);
-if (!mk.ui.getCurOnPanel("rewardLuck")) {
+if (!(mk.ui.getCurOnPanel("rewardLuck") || this.finalGetScore >= this.targetScore)) {
 this.gameCount();
 console.log("gData.gameData.getProp(GameProp.levelNum)", gData.gameData.getProp(y.GameProp.levelNum));
 }
@@ -10089,10 +10090,12 @@ height: u
 }
 if (null != this.crtGuide.dialog_pos && this.crtGuide.dialog_pos.length > 0) {
 r = this.crtGuide.dialog_pos.split(":");
-for (var p = this.node_dialog.getComponent(cc.Widget), d = 0; d < this.widgets.length; d++) p[this.widgets[d]] = "" == r[d] ? null : parseInt(r[d]);
+(d = this.node_dialog.getComponent(cc.Widget)).enabled = !0;
+for (var p = 0; p < this.widgets.length; p++) d[this.widgets[p]] = "" == r[p] ? null : parseInt(r[p]);
 } else {
-for (r = this.crtGuide.dialog_pos1.split(","), p = this.node_dialog.getComponent(cc.Widget), 
-d = 0; d < this.widgets.length; d++) p[this.widgets[d]] = null;
+var d;
+r = this.crtGuide.dialog_pos1.split(",");
+(d = this.node_dialog.getComponent(cc.Widget)).enabled = !1;
 this.node_dialog.x = n + parseInt(r[0]);
 this.node_dialog.y = o + parseInt(r[1]);
 }
@@ -16534,10 +16537,7 @@ e.clickNextMission();
 }
 }) : mk.ad.watchAd(function(t) {
 mk.console.log("watchAD:" + t);
-if (t) {
-gData.adData.watchVideo(2 === gData.reward.subType ? u.AdFun.checkpoint : u.AdFun.bubble);
-gData.reward.subType = null;
-}
+t && gData.adData.watchVideo(2 === gData.reward.subType ? u.AdFun.checkpoint : u.AdFun.bubble);
 });
 return [ 2 ];
 }

packages-hot-update/cfg.json

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