bug修复

assets/resources/module/sign/sign.prefab

@@ -36,11 +36,11 @@
         "__id__": 51
       },
       {
-        "__id__": 52
+        "__id__": 53
       }
     ],
     "_prefab": {
-      "__id__": 53
+      "__id__": 54
     },
     "_opacity": 255,
     "_color": {
@@ -1813,9 +1813,24 @@
       "__id__": 3
     },
     "bClickClose": true,
+    "onComplete": [
+      {
+        "__id__": 52
+      }
+    ],
     "_id": ""
   },
   {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "92c1epESLhJSLrId9Dkn6Wd",
+    "handler": "onClickClose",
+    "customEventData": ""
+  },
+  {
     "__type__": "ac053zwqaRD6IJmTlQWmefZ",
     "_name": "",
     "_objFlags": 0,

assets/script/game/component/BtnClosePanel.ts

@@ -32,7 +32,6 @@ export default class BtnClosePanel extends cc.Component {
         if (this.block_click) return;
         if (this.node_panel) {
             mk.ui.closePanel(this.node_panel.name);
-            mk.event.emit('close-panel', this.node_panel.name);
         }
         const c_count = this.onComplete.length;
         for (let i = 0; i < c_count; i++) {

assets/script/game/component/UIBG.ts

@@ -13,6 +13,8 @@ export default class UIBG extends cc.Component {
     private design_block_node: cc.Node = null!;
     @property({ displayName: '点击关闭' })
     private bClickClose: boolean = false;
+    @property({ displayName: '完成回调', tooltip: "面板打开完成后触发", type: cc.Component.EventHandler })
+    public onComplete: cc.Component.EventHandler[] = [];
 
     /** 背景节点 */
     private node_bg: cc.Node = null;
@@ -43,6 +45,10 @@ export default class UIBG extends cc.Component {
 
     private onClickClose() {
         mk.ui.closePanel(this.node.name);
+        const c_count = this.onComplete.length;
+        for (let i = 0; i < c_count; i++) {
+            if (this.onComplete[i].handler) this.onComplete[i].emit([])
+        }
     }
     /**
      * 创建背景蒙版 by 绘图组件

assets/script/game/data/GameData.ts

@@ -200,7 +200,7 @@ export class GameData {
  */
 export enum GameProp {
     /** -------------------- 通用玩家数据 ------------------------- */
-    /** 是否新手 */
+    /** 是否新手 0新手 1老手 */
     newPlayer = 1,
     /** 当前新手引导步骤 */
     guideID = 2,
@@ -258,6 +258,7 @@ class PlayerProp {
     private _piggyBank: number = 0;
     /** 存钱罐存款 */
     set piggyBank(value: number) {
+        if (this._piggyBank === value) return;
         this._piggyBank = value;
         gData.gameData.init_coin = true;
         gData.pigbank.init_data = true;
@@ -307,6 +308,7 @@ class PlayerProp {
     _signInDay = 0;
     /** 累计签到次数 客户端理解 上次签到天数 */
     set signInDay(value: number) {
+        if (this._signInDay === value) return;
         this._signInDay = value;
         gData.sign.init_data = true;
     }

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

@@ -94,5 +94,6 @@ export default class GuideWeakData {
         blessingBag: 5,
         sign: 6,
         redBagCash: 7,
+        rewardLuck: 8,
     }
 }

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

@@ -31,7 +31,6 @@ export class PigBankData extends Data {
     public async cashOP() {
         let data = {};
         let response = await mk.http.sendRequest('piggyBankCash', 'POST', JSON.stringify(data));
-        // let response = await mk.http.sendRequest('readyCash', 'POST', JSON.stringify(data));
         if (response.errcode != 0) {
             mk.tip.pop('系统异常');
             return;

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

@@ -122,7 +122,6 @@ 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) {
             // 红包
@@ -141,17 +140,16 @@ export class SignData extends Data {
             }
 
             if (response.CashMode == 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');
             } else if (response.CashMode == 1) {//公众号打款
-
             }
+            const rewardNum = gData.sign.adData.data.videoRedMoney.videoRewardList[0].rewardNum;
+            gData.receiptNotice.receip_rmb = rewardNum;
+            gData.cashNormal.receip_total_rmb += gData.receiptNotice.receip_rmb;
+            mk.ui.openPanel('module/receiptNotice/receiptNotice');
         } else if (reward_data.rewardType === RewardType.pigRmb) {
             // 金猪现金
             // gData.reward.data = [{ rewardNum: reward_data.rewardNum, rewardType: reward_data.rewardType }]
-            // gData.reward.data = gData.sign.adData.videoRedMoney.videoRewardList[0];
+            // gData.reward.data = gData.sign.adData.data.videoRewardList[0];
             gData.reward.adData = gData.sign.adData;
             mk.ui.openPanel('module/reward/reward');
         }

assets/script/game/game/Game.ts

@@ -53,10 +53,10 @@ export default class Game extends cc.Component {
         this.autoOpenPanel();
         this.runGuideWeak();
 
-        // if(gData.gameData.isNewPlayer()){
-        //     this.initGuide();
-        //     gData.gameData.setProp(GameProp.newPlayer,0);
-        // }
+        if (gData.gameData.isNewPlayer()) {
+            this.initGuide();
+            gData.gameData.setProp(GameProp.newPlayer, 1);
+        }
     }
 
     private initGuide() {
@@ -110,8 +110,11 @@ export default class Game extends cc.Component {
     private changeInfo() {
         this.lbl_redMoney.node.getComponent(NumberAnim).setValue(gData.gameData.gameData.redMoney);
         // this.lbl_rmb.node.getComponent('NumberAnim').setValue(gData.gameData.gameData.piggyBank);
+
         const new_count = gData.gameData.gameData.piggyBank / 100;
-        this.lbl_rmb.node.getComponent(NumberAnim).setValue(parseFloat(new_count.toFixed(2)), 2);
+        if (new_count != 0 && this.lbl_rmb.string != new_count.toFixed(2)) {
+            this.lbl_rmb.node.getComponent(NumberAnim).setValue(parseFloat(new_count.toFixed(2)), 2);
+        }
         gData.gameData.init_coin = false;
     }
 

assets/script/mk/system/UISystem.ts

@@ -122,6 +122,7 @@ export default class UISystem extends cc.Component {
         } else {
             this.destroyNode(node_panel, panelName, callBack);
         }
+        mk.event.emit('close-panel', panelName);
     }
 
     private destroyNode(node_panel, panelName, callBack) {