bug修复

assets/resources/module/reward/rewardLuck.prefab

@@ -4552,6 +4552,9 @@
     "hb_star": {
       "__id__": 65
     },
+    "btn_close": {
+      "__id__": 120
+    },
     "spr_cash_out": {
       "__id__": 21
     },

assets/script/game/component/NumberAnim.ts

@@ -18,7 +18,7 @@ export default class NumberAnim extends cc.Component {
      * @param new_value 目标值
      */
     public setValue(new_value: number, toFixed: number = 0) {
-        if (!new_value) new_value = 0;
+        if (!new_value || this.targetProgress == new_value) return;
         this.toFixed = toFixed;
         this.len_target = new_value.toString().length;
         this.targetProgress = new_value;

assets/script/game/data/module/RedBagCashData.ts

@@ -61,20 +61,24 @@ export class RedBagCashData extends Data {
             mk.tip.pop(response.errmsg);
             return;
         }
+        let r_data = response.data;
+        if (r_data.CashMode == 0) {//星云打款
+        }
+        else if (r_data.CashMode == 1) {//公众号打款
+        }
         this.cash_bar++;
-        // gData.gameData.setProp(GameProp.redBag_cash_bar, this.cash_bar);
         gData.gameData.gameData.cashIndex++;
 
         // 扣除红包
-        this.sortList();
         let item_data = this.getItemDataByIndex(cash_index);
         gData.gameData.gameData.redMoney -= item_data.type_value;
-
         // 打开提现到账界面
-        gData.receiptNotice.receip_rmb = item_data.money;
+        gData.receiptNotice.receip_rmb = r_data.CashStatusList[0].amount;
         gData.cashNormal.receip_total_rmb += gData.receiptNotice.receip_rmb;
         mk.ui.openPanel('module/receiptNotice/receiptNotice');
 
+        this.sortList();
+
     }
 
     /**

assets/script/game/data/module/SignData.ts

@@ -122,11 +122,13 @@ export class SignData extends Data {
         // ]
         // gData.gameData.setProps(new_data);
         // 奖励展示
+        mk.console.logSingle('签到视频奖励：', gData.sign.adData)
         let reward_data = this.c_sign[gData.gameData.gameData.signInDay - 1];
         if (reward_data.rewardType === RewardType.redBag) {
             // 红包
             // gData.reward.data = [reward_data];// 数据列表
-            gData.reward.data = gData.reward.adData.data.videoRewardList;
+            // gData.reward.data = gData.sign.adData.videoRedMoney.videoRewardList[0];
+            gData.reward.adData = gData.sign.adData;
             mk.ui.openPanel('module/reward/reward')
         } else if (reward_data.rewardType === RewardType.rmb) {
             // 现金提现
@@ -139,7 +141,7 @@ export class SignData extends Data {
             }
 
             if (response.CashMode == 0) {//星云打款
-                const rewardNum = gData.reward.adData.data.videoRewardList[0];
+                const rewardNum = gData.sign.adData.videoRedMoney.videoRewardList[0];
                 gData.receiptNotice.receip_rmb = rewardNum;
                 gData.cashNormal.receip_total_rmb += gData.receiptNotice.receip_rmb;
                 mk.ui.openPanel('module/receiptNotice/receiptNotice');
@@ -149,7 +151,8 @@ export class SignData extends Data {
         } else if (reward_data.rewardType === RewardType.pigRmb) {
             // 金猪现金
             // gData.reward.data = [{ rewardNum: reward_data.rewardNum, rewardType: reward_data.rewardType }]
-            gData.reward.data = gData.reward.adData.data.videoRewardList;
+            // gData.reward.data = gData.sign.adData.videoRedMoney.videoRewardList[0];
+            gData.reward.adData = gData.sign.adData;
             mk.ui.openPanel('module/reward/reward');
         }
 

assets/script/game/module/receiptNotice/ReceiptNotice.ts

@@ -35,8 +35,8 @@ export default class ReceiptNotice extends cc.Component {
      * 初始化样式
      */
     private initStyle() {
-        this.lbl_receipt_rmb.string = '￥' + Math.floor(gData.receiptNotice.receip_rmb / 100) + '元';
-        this.lbl_rmb_total.string = '￥' + Math.floor(gData.cashNormal.receip_total_rmb / 100) + '元';
+        this.lbl_receipt_rmb.string = '￥' + (gData.receiptNotice.receip_rmb / 100).toFixed(2) + '元';
+        this.lbl_rmb_total.string = '￥' + (gData.cashNormal.receip_total_rmb / 100).toFixed(2) + '元';
         this.lbl_user_name.string = gData.wechatData.nickName || '';
     }
 }

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

@@ -42,6 +42,9 @@ export default class Reward extends cc.Component {
     private lbl_reward_value: cc.Label = null;
     @property({ displayName: '星星闪闪效果', type: cc.Node })
     private hb_star: cc.Node = null;
+    @property({ displayName: '关闭按钮', type: cc.Node })
+    private btn_close: cc.Node = null;
+
 
     // 底部提现相关
     @property({ displayName: 'spr提现进度', type: cc.Sprite })
@@ -184,9 +187,11 @@ export default class Reward extends cc.Component {
             gData.reward.data = gData.reward.adData.videoRedMoney.videoRewardList;
         }
         if (!gData.reward.data || !gData.reward.data.length) return;
+        this.btn_close && (this.btn_close.active = false);
         mk.audio.playEffect("rewardOpen");
         this.hb_star.active = true;
         this.hb_star.getComponent(sp.Skeleton).animation = 'animation';
+        this.hb_star.getComponent(sp.Skeleton).loop = false;
         this.cur_stage = LidType.none;
 
         // 数据排序：多条奖励，只展示红包，把红包放在首位

assets/script/game/module/setting/Setting.ts

@@ -81,6 +81,7 @@ export default class Setting extends cc.Component {
         if (!gData.loginData.isAuth) {
             mk.ui.closePanel(this.node.name);
             JsbSystem.WxAuth();
+            this.onClickClose();
         }
     }