wuwangdong 4 лет назад
Родитель
Сommit
275678437f
2 измененных файлов с 16 добавлено и 10 удалено
  1. 1 0
      assets/script/game/game/Game.ts
  2. 15 10
      assets/script/game/module/blessingBag/BlessingBag.ts

+ 1 - 0
assets/script/game/game/Game.ts

@@ -281,6 +281,7 @@ export default class Game extends cc.Component {
             this.lbl_addHb.string = "+" + add.toString();
             gData.gameData.addHb = 0;
 
+            if(add > 0)
             {
                 cc.Tween.stopAllByTarget(this.node_addHb);
                 this.node_addHb.active = true;

+ 15 - 10
assets/script/game/module/blessingBag/BlessingBag.ts

@@ -69,6 +69,11 @@ export default class BlessingBag extends cc.Component {
 
         if (gData.blessingBag.init_openRb) {
             //this.OpenRbPanel(gData.blessingBag.taskRbId, gData.blessingBag.rbNum);
+            if (cc.sys.isNative && !gData.loginData.isAuth) {
+                // JsbSystem.WxAuth();
+                mk.ui.openPanel('module/authUI/authUI');
+                return;
+            }
             gData.blessingBag.HttpCashTask();
         }
     }
@@ -111,7 +116,7 @@ export default class BlessingBag extends cc.Component {
         }
 
         this.txtRemaindAdNum.string = "<color=#FDFCF5>今日剩余次数:</c><color=#FFE533>" + data.leftVideoTimes + "</color>";
-        this.adIcon.active = data.isVideo != 1;
+        //this.adIcon.active = data.isVideo != 1;
 
         if (this.adrbArray.length < 4) {
             this.adrbArray = [];
@@ -204,12 +209,12 @@ export default class BlessingBag extends cc.Component {
         //     gData.blessingBag.addProgress();
         // } else 
         {
-            if (cc.sys.isNative && !gData.loginData.isAuth) {
-                // JsbSystem.WxAuth();
-                mk.ui.openPanel('module/authUI/authUI');
-                return;
-            }
-            //if (gData.blessingBag.videoRbData.leftVideoTimes > 0) {
+            // if (cc.sys.isNative && !gData.loginData.isAuth) {
+            //     // JsbSystem.WxAuth();
+            //     mk.ui.openPanel('module/authUI/authUI');
+            //     return;
+            // }
+            if (gData.blessingBag.videoRbData.leftVideoTimes > 0) {
             mk.ad.videoAdType = VideoAdType.video_init_15;
             mk.ad.watchAd(async (success: boolean) => {
                 mk.console.log("watchAD:" + success);
@@ -218,9 +223,9 @@ export default class BlessingBag extends cc.Component {
                     gData.blessingBag.addProgress();
                 }
             });
-            //} else {             
-            //mk.tip.pop('今日观看次数已用完');
-            //}
+            } else {             
+            mk.tip.pop('今日观看次数已用完');
+            }
         }
 
         console.log("--->You Click AdProgressBtn  ", gData.blessingBag.videoRbData);