发包

assets/resources/game/prefab/game.prefab

@@ -22469,6 +22469,9 @@
     "lbl_bankPro": {
       "__id__": 406
     },
+    "btn_safebox": {
+      "__id__": 371
+    },
     "_id": ""
   },
   {

assets/script/before/GamePlay.ts

@@ -718,9 +718,15 @@ export default class GamePlay extends cc.Component {
     /**游戏结束 */
     gameOver() {
         mk.data.setTAEventUser(1, 'video_play_time', 1);
-        mk.ad.videoAdType = VideoAdType.video_init_23;
-        gData.adData.curRedBagAdFun = AdFun.settlement;
-        mk.ui.openPanel('module/newOpenRedBag/newOpenRedBag');
+        if (mk.ui.getCurOnPanel('newOpenRedBag')) {
+            console.log('没有弹通关红包');
+            this.nextLevel();
+        }
+        else {
+            mk.ad.videoAdType = VideoAdType.video_init_23;
+            gData.adData.curRedBagAdFun = AdFun.settlement;
+            mk.ui.openPanel('module/newOpenRedBag/newOpenRedBag');
+        }
     }
 
     async checkBonusNum(cleanCellItemNum: number) {

assets/script/game/game/Game.ts

@@ -149,6 +149,9 @@ export default class Game extends cc.Component {
     @property({ displayName: '富翁银行文本', type: cc.Label })
     lbl_bankPro: cc.Label = null;
 
+    @property({ displayName: '富翁银行按钮', type: cc.Node })
+    btn_safebox: cc.Node = null;
+
     posY = 0;
     /** 是否开始增加次数倒计时 */
     private lastTimeSpan = 0;
@@ -189,6 +192,38 @@ export default class Game extends cc.Component {
         } else {
             mk.event.register("initOrderUi", this.initOrderUI.bind(this), this);
         }
+
+        let times = gData.gameData.getProp(GameProp.plantTimes);
+        console.log(`cashTimes======${times}`);
+        if (times == undefined) {
+            times = 0;
+        }
+
+        if (times < gData.gameData.showRichBankIconLimit) {
+            this.btn_safebox.active = false;
+            mk.event.register("showRichBankIcon", this.showRichBankIcon.bind(this), this);
+        }
+    }
+
+    async showRichBankIcon() {
+        this.btn_safebox.active = true;
+        mk.event.remove("showRichBankIcon", this);
+
+        if (!gData.safeDepositBoxData.currentRichBankCashTaskIndex) {
+            let response = await mk.http.sendData('newrichbank/getRichBankInfo', {});
+            if (response && response.errcode == 0) {
+                let res_data = response.data;
+                //gData.safeDepositBoxData.richBankCashAmount = res_data.richBankCashAmount;
+                gData.safeDepositBoxData.currentRichBankCashTaskIndex = res_data.currentRichBankCashTaskIndex;
+                gData.safeDepositBoxData.isStartBankTask = res_data.isStartRichBankTask;
+                //gData.safeDepositBoxData.richBankDailyVideoTimes = res_data.richBankDailyVideoTimes;
+                gData.safeDepositBoxData.richbankLoginDays = res_data.richbankLoginDays;
+                //gData.safeDepositBoxData.richBankDailyTotelVideoTimes = res_data.richBankDailyTotelVideoTimes;
+                //gData.safeDepositBoxData.richBankTotelLoginDays = res_data.richBankTotelLoginDays;
+                console.log(`currentRichBankCashTaskIndex 11======== ${res_data.currentRichBankCashTaskIndex}`);
+                console.log(`richBankDailyTotelVideoTimes 11======== ${res_data.richBankDailyTotelVideoTimes}`);
+            }
+        }
     }
 
     start() {

assets/script/game/module/newOpenRedBag/NewOpenRedBag.ts

@@ -220,7 +220,7 @@ export default class NewOpenRedBag extends cc.Component {
                     gData.reward.adData.videoRedMoney.videoRewardList = [{ rewardType: 1, rewardNum: response.data.freeRedMoney }];
 
                     gData.reward.callback = gData.harvestData.call;
-                    gData.gameData.gameStyle.doCropFlyLogic(gData.harvestData.plantID);
+                    // gData.gameData.gameStyle.doCropFlyLogic(gData.harvestData.plantID);
                     mk.ui.openPanel('module/reward/reward');
                     mk.ui.closePanel(this.node.name);
                     return;

assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATRewardVideo.ts

@@ -52,7 +52,7 @@ export class ATRewardVideo extends zgSingleton {
         console.log("ATRewardVideo ", RewardAdState[this.reawardAdState]);
         if (this.reawardAdState == RewardAdState.Loading) {
             mk.tip.pop('广告加载中，请稍后再试');
-            return;
+            // return;
         }
 
         console.log("ATRewardVideo  loadAd ", RewardAdState[this.reawardAdState]);
@@ -64,12 +64,13 @@ export class ATRewardVideo extends zgSingleton {
 
     /** 显示广告 */
     showAd() {
-        if (this.reawardAdState != RewardAdState.LoadSuccess) {
+        if (this.hasAdReady()) {
+            this.ATRewardVideoJS.showAd();
+        }
+        else if (this.reawardAdState != RewardAdState.LoadSuccess) {
             this.ifLoadShow = true;
             this.loadAd();
-            return;
         }
-        this.ATRewardVideoJS.showAd();
     }
 
     checkAdStatus() {

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

@@ -1979,14 +1979,13 @@ return this.ATRewardVideoJS.hasAdReady();
 };
 e.prototype.loadAd = function() {
 console.log("ATRewardVideo ", c[this.reawardAdState]);
-if (this.reawardAdState != c.Loading) {
+this.reawardAdState == c.Loading && mk.tip.pop("广告加载中，请稍后再试");
 console.log("ATRewardVideo  loadAd ", c[this.reawardAdState]);
 this.reawardAdState = c.Loading;
 this.ATRewardVideoJS.loadAd(gData.loginData.uin, "userDataKey");
-} else mk.tip.pop("广告加载中，请稍后再试");
 };
 e.prototype.showAd = function() {
-if (this.reawardAdState == c.LoadSuccess) this.ATRewardVideoJS.showAd(); else {
+if (this.hasAdReady()) this.ATRewardVideoJS.showAd(); else if (this.reawardAdState != c.LoadSuccess) {
 this.ifLoadShow = !0;
 this.loadAd();
 }
@@ -17697,9 +17696,14 @@ this.gameOver();
 };
 e.prototype.gameOver = function() {
 mk.data.setTAEventUser(1, "video_play_time", 1);
+if (mk.ui.getCurOnPanel("newOpenRedBag")) {
+console.log("没有弹通关红包");
+this.nextLevel();
+} else {
 mk.ad.videoAdType = f.VideoAdType.video_init_23;
 gData.adData.curRedBagAdFun = m.AdFun.settlement;
 mk.ui.openPanel("module/newOpenRedBag/newOpenRedBag");
+}
 };
 e.prototype.checkBonusNum = function(t) {
 return r(this, void 0, void 0, function() {
@@ -18054,6 +18058,7 @@ e.pro_tixian = null;
 e.lbl_cashPro = null;
 e.pro_bank = null;
 e.lbl_bankPro = null;
+e.btn_safebox = null;
 e.posY = 0;
 e.lastTimeSpan = 0;
 e.span = 0;
@@ -18088,6 +18093,40 @@ this.node_showCash.active = !1;
 this.node_showRedMoney.active = !0;
 }
 gData.gameData.playerProp.orderData ? this.initOrderUI() : mk.event.register("initOrderUi", this.initOrderUI.bind(this), this);
+var t = gData.gameData.getProp(d.GameProp.plantTimes);
+console.log("cashTimes======" + t);
+null == t && (t = 0);
+if (t < gData.gameData.showRichBankIconLimit) {
+this.btn_safebox.active = !1;
+mk.event.register("showRichBankIcon", this.showRichBankIcon.bind(this), this);
+}
+};
+e.prototype.showRichBankIcon = function() {
+return r(this, void 0, void 0, function() {
+var t, e;
+return c(this, function(a) {
+switch (a.label) {
+case 0:
+this.btn_safebox.active = !0;
+mk.event.remove("showRichBankIcon", this);
+return gData.safeDepositBoxData.currentRichBankCashTaskIndex ? [ 3, 2 ] : [ 4, mk.http.sendData("newrichbank/getRichBankInfo", {}) ];
+
+case 1:
+if ((t = a.sent()) && 0 == t.errcode) {
+e = t.data;
+gData.safeDepositBoxData.currentRichBankCashTaskIndex = e.currentRichBankCashTaskIndex;
+gData.safeDepositBoxData.isStartBankTask = e.isStartRichBankTask;
+gData.safeDepositBoxData.richbankLoginDays = e.richbankLoginDays;
+console.log("currentRichBankCashTaskIndex 11======== " + e.currentRichBankCashTaskIndex);
+console.log("richBankDailyTotelVideoTimes 11======== " + e.richBankDailyTotelVideoTimes);
+}
+a.label = 2;
+
+case 2:
+return [ 2 ];
+}
+});
+});
 };
 e.prototype.start = function() {
 this.initMusic();
@@ -19343,6 +19382,10 @@ i([ y({
 displayName: "富翁银行文本",
 type: cc.Label
 }) ], e.prototype, "lbl_bankPro", void 0);
+i([ y({
+displayName: "富翁银行按钮",
+type: cc.Node
+}) ], e.prototype, "btn_safebox", void 0);
 return i([ f ], e);
 }(cc.Component);
 a.default = m;
@@ -27322,7 +27365,6 @@ rewardType: 1,
 rewardNum: t.data.freeRedMoney
 } ];
 gData.reward.callback = gData.harvestData.call;
-gData.gameData.gameStyle.doCropFlyLogic(gData.harvestData.plantID);
 mk.ui.openPanel("module/reward/reward");
 mk.ui.closePanel(this.node.name);
 return [ 2 ];

packages-hot-update/cfg.json

@@ -12,7 +12,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/"
     ],
-    "buildTime": 1642764729927,
-    "genTime": 1642764729927,
+    "buildTime": 1642827423478,
+    "genTime": 1642827423478,
     "genVersion": null
 }