ソースを参照

超级领取修改

kaka 4 年 前
コミット
4fa9958535

+ 6 - 1
assets/script/before/view/data/HarvestData.ts

@@ -23,6 +23,11 @@ export default class HarvestData extends Data {
     setAdData(data) {
         mk.console.logSingle('HarvestData  addata ', this.adData);
         super.setAdData(data);
-        this.init_reward = true;
+
+        //奖励弹窗
+        gData.reward.adData = gData.harvestData.adData;
+        gData.reward.callback = gData.harvestData.call;
+        mk.ui.openPanel('module/reward/reward');
+        gData.harvestData.call = null;
     }
 }

+ 1 - 12
assets/script/before/view/ui/HarvestPanel.ts

@@ -36,27 +36,16 @@ export default class HarvestPanel extends cc.Component {
 
     public async clickSuperBtn() {
         // 看广告
+        mk.ui.closePanel('HarvestPanel');
         mk.ad.videoAdType = VideoAdType.video_init_12;
         mk.ad.watchAd(async (success: boolean) => {
             mk.console.log("watchAD:" + success);
             if (success) {
                 await gData.adData.watchVideo(AdFun.harvest);
-                mk.ui.closePanel('HarvestPanel');
             }
         });
     }
 
-    update() {
-        if (gData.harvestData.init_reward) {
-            gData.harvestData.init_reward = false;
-
-            //奖励弹窗
-            gData.reward.adData = gData.harvestData.adData;
-            gData.reward.callback = gData.harvestData.call;
-            mk.ui.openPanel('module/reward/reward');
-        }
-    }
-
     onEnable() {
         mk.ad.showBanner(BannerAdType.banner_click_6);
     }

+ 9 - 9
assets/script/game/module/newOpenRedBag/NewOpenRedBag.ts

@@ -106,15 +106,15 @@ export default class NewOpenRedBag extends cc.Component {
         }
     }
 
-    update() {
-        if (gData.harvestData.init_reward) {
-            gData.harvestData.init_reward = false;
-
-            //奖励弹窗
-            gData.reward.adData = gData.harvestData.adData;
-            mk.ui.openPanel('module/reward/reward');
-        }
-    }
+    // update() {
+    //     if (gData.harvestData.init_reward) {
+    //         gData.harvestData.init_reward = false;
+
+    //         //奖励弹窗
+    //         gData.reward.adData = gData.harvestData.adData;
+    //         mk.ui.openPanel('module/reward/reward');
+    //     }
+    // }
 
     showChangePart() {
         //this.changePart.active = true

+ 9 - 9
assets/script/game/module/speedUpUI/ProductReward2.ts

@@ -15,15 +15,15 @@ export default class ProductReward2 extends cc.Component {
         this.showChangePart();
     }
 
-    update() {
-        if (gData.harvestData.init_reward) {
-            gData.harvestData.init_reward = false;
-
-            //奖励弹窗
-            gData.reward.adData = gData.harvestData.adData;
-            mk.ui.openPanel('module/reward/reward');
-        }
-    }
+    // update() {
+    //     if (gData.harvestData.init_reward) {
+    //         gData.harvestData.init_reward = false;
+
+    //         //奖励弹窗
+    //         gData.reward.adData = gData.harvestData.adData;
+    //         mk.ui.openPanel('module/reward/reward');
+    //     }
+    // }
 
     showChangePart() {
         //this.changePart.active = true