Merge branch 'master' of http://git.mokasz.com/zouyong/mk_framework

assets/resources/module/receiptNotice/receiptNotice.prefab

@@ -1073,8 +1073,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "￥3.00元",
-    "_N$string": "￥3.00元",
+    "_string": "￥0.00元",
+    "_N$string": "￥0.00元",
     "_fontSize": 90,
     "_lineHeight": 90,
     "_enableWrapText": true,
@@ -1681,7 +1681,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 156.38,
+      "width": 143.16,
       "height": 45.36
     },
     "_anchorPoint": {
@@ -1733,8 +1733,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "￥15.00元",
-    "_N$string": "￥15.00元",
+    "_string": "￥0.00元",
+    "_N$string": "￥0.00元",
     "_fontSize": 36,
     "_lineHeight": 36,
     "_enableWrapText": true,
@@ -1951,6 +1951,7 @@
     },
     "_enabled": true,
     "panel_name": "module/cashNormal/cashNormal",
+    "bool_Auth": false,
     "open_type": 0,
     "transition_type": 3,
     "onComplete": [],
@@ -2321,6 +2322,7 @@
     },
     "design_block_node": null,
     "bClickClose": false,
+    "onComplete": [],
     "_id": ""
   },
   {

assets/resources/module/reward/rewardLuck.prefab

@@ -27,9 +27,6 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 126
-      },
-      {
         "__id__": 127
       },
       {
@@ -37,10 +34,13 @@
       },
       {
         "__id__": 129
+      },
+      {
+        "__id__": 130
       }
     ],
     "_prefab": {
-      "__id__": 130
+      "__id__": 131
     },
     "_opacity": 255,
     "_color": {
@@ -4338,11 +4338,11 @@
         "__id__": 122
       },
       {
-        "__id__": 124
+        "__id__": 125
       }
     ],
     "_prefab": {
-      "__id__": 125
+      "__id__": 126
     },
     "_opacity": 255,
     "_color": {
@@ -4438,6 +4438,9 @@
     "onComplete": [
       {
         "__id__": 123
+      },
+      {
+        "__id__": 124
       }
     ],
     "_id": ""
@@ -4453,6 +4456,16 @@
     "customEventData": ""
   },
   {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "43f3akkA71HA76UhTj/R19X",
+    "handler": "clickGetReward",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.Animation",
     "_name": "",
     "_objFlags": 0,
@@ -4539,6 +4552,9 @@
     "hb_star": {
       "__id__": 65
     },
+    "btn_close": {
+      "__id__": 120
+    },
     "spr_cash_out": {
       "__id__": 21
     },

assets/resources/module/sign/sign.prefab

@@ -36,11 +36,11 @@
         "__id__": 51
       },
       {
-        "__id__": 52
+        "__id__": 53
       }
     ],
     "_prefab": {
-      "__id__": 53
+      "__id__": 54
     },
     "_opacity": 255,
     "_color": {
@@ -212,7 +212,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        39.963,
+        152.918,
         0,
         0,
         0,
@@ -326,7 +326,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        35,
+        147.955,
         0,
         0,
         0,
@@ -620,7 +620,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        374.498,
+        487.453,
         0,
         0,
         0,
@@ -834,7 +834,7 @@
       "ctor": "Float64Array",
       "array": [
         295.698,
-        -377.921,
+        -264.966,
         0,
         0,
         0,
@@ -941,7 +941,7 @@
       "ctor": "Float64Array",
       "array": [
         295.698,
-        -379.526,
+        -266.571,
         0,
         0,
         0,
@@ -1074,7 +1074,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -431.993,
+        -319.038,
         0,
         0,
         0,
@@ -1587,7 +1587,7 @@
       "ctor": "Float64Array",
       "array": [
         303.19,
-        464.26,
+        577.215,
         0,
         0,
         0,
@@ -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/NumberAnim.ts

@@ -18,6 +18,7 @@ export default class NumberAnim extends cc.Component {
      * @param new_value 目标值
      */
     public setValue(new_value: number, toFixed: number = 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/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,11 +200,11 @@ export class GameData {
  */
 export enum GameProp {
     /** -------------------- 通用玩家数据 ------------------------- */
-    /** 是否新手 */
+    /** 是否新手 0新手 1老手 */
     newPlayer = 1,
     /** 当前新手引导步骤 */
     guideID = 2,
-    /** 需要自动弹界面 每天一次 除首次 表示今日是否要自动开 1自动开 2不自动开 其他不处理*/
+    /** 需要自动弹界面 每次登录都弹 除首次 表示今日是否要自动开 1自动开 2不自动开 其他不处理*/
     isAutoOpenPanel = 3,
     /** 关闭常规提现时需要自动开存钱罐 每天一次 表示今日有没有开过 */
     isOpenBankOnCloseCash = 4,
@@ -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/CashProData.ts

@@ -46,6 +46,7 @@ export default class CashProData extends Data {
                 }
                 break;
         }
+        gData.cashNormal.getRecord();// 请求新的提现记录
     }
 }
 

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

@@ -1,4 +1,5 @@
 import { Data } from "../../../mk/data/Data";
+import GuideVO from "../../module/guide/GuideVO";
 
 /**
  * @description 新手引导
@@ -52,26 +53,4 @@ export class GuideData {
         return this.data.get(id);
     }
 
-}
-export class GuideVO {
-    /** 大步骤 */
-    id: number;
-    /** 大步骤中的小步 */
-    step: number;
-    /** 触发方式 1固定 2等级 3任务 4关卡 5功能开启 */
-    trigger: number;
-    /** 触发条件的数据 如当trigger是关卡时关卡时，为触发关卡 */
-    tr_num: number;
-    /** 1头像 2形象 */
-    tr_form: number;
-    /** 对话内容 */
-    dialog: string;
-    /** 透明点击区域（与click_node不共存） */
-    display_rect: string;
-    /** 点击组件名字（必须在代码中预先设置） */
-    click_rect: string;
-    /** 手指位置 */
-    finger: string;
-    /** 下个时间 */
-    lag_next: 0;
 }

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

@@ -29,9 +29,7 @@ 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));
+        let response = await mk.http.sendData('piggyBankCash', {});
         if (response.errcode != 0) {
             mk.tip.pop('系统异常');
             return;
@@ -47,6 +45,7 @@ export class PigBankData extends Data {
 
         }
         gData.gameData.gameData.isWithdrawable = 0;
-        
+        gData.cashNormal.getRecord();// 请求新的提现记录
+
     }
 }

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

@@ -61,20 +61,25 @@ 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();
+        gData.cashNormal.getRecord();// 请求新的提现记录
+
     }
 
     /**

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

@@ -33,11 +33,15 @@ export class RewardData extends Data {
         const i_count = gData.reward.data.length;
         for (let i = 0; i < i_count; i++) {
             if (gData.reward.data[i].rewardType == RewardType.redBag) {
-                gData.gameData.gameData.redMoney += gData.reward.data[i].rewardNum;
+                if (gData.reward.data[i].rewardNum) {
+                    gData.gameData.gameData.redMoney += gData.reward.data[i].rewardNum;
+                }
             } else if (gData.reward.data[i].rewardType == RewardType.rmb) {
                 // ?
             } else if (gData.reward.data[i].rewardType == RewardType.pigRmb) {
-                gData.gameData.gameData.piggyBank += gData.reward.data[i].rewardNum;
+                if (gData.reward.data[i].rewardNum) {
+                    gData.gameData.gameData.piggyBank += gData.reward.data[i].rewardNum;
+                }
             }
         }
         gData.reward.data = [];
@@ -48,6 +52,7 @@ export class RewardData extends Data {
         let is_add_money = true;
         const i_count = gData.reward.data.length;
         for (let i = 0; i < i_count; i++) {
+            if (gData.reward.data[i].rewardType === RewardType.rmb) continue;
             let start_node_pos = new cc.Vec2(0, -300);
             mk.fly.PlayCoinAnim(gData.reward.data[i].rewardType, 10, start_node_pos, '', () => {
                 is_add_money && this.addReward();

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

@@ -106,6 +106,7 @@ export class SignData extends Data {
      * 签到完成
      */
     public async signComplete() {
+        cc.log('签到奖励', gData.sign.adData)
         gData.gameData.gameData.signInDay++;
         gData.gameData.gameData.isSignInToday = 1;
         // // 自定义状态
@@ -124,28 +125,36 @@ export class SignData extends Data {
         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 = [reward_data];// 数据列表
+            // 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) {
+            const adData = gData.sign.adData;// adData下一帧被清空，此处需要保存数据
+
             // 现金提现
-            let data = {};
-            let response = await mk.http.sendRequest('readyCash', 'POST', JSON.stringify(data));
             // let response = await mk.http.sendRequest('readyCash', 'POST', JSON.stringify(data));
+            let response = await mk.http.sendData('readyCash', {});
+
             if (response.errcode != 0) {
                 mk.tip.pop('系统异常');
-                return;
+                // return;
             }
 
             if (response.CashMode == 0) {//星云打款
-                gData.receiptNotice.receip_rmb = reward_data.rewardNum;
-                gData.cashNormal.receip_total_rmb += gData.receiptNotice.receip_rmb;
-                mk.ui.openPanel('module/receiptNotice/receiptNotice');
             } else if (response.CashMode == 1) {//公众号打款
-
             }
+
+            const rewardNum = Math.round(adData.videoRedMoney.videoRewardList[0].rewardNum * 100);
+            gData.receiptNotice.receip_rmb = rewardNum;
+            gData.cashNormal.receip_total_rmb += gData.receiptNotice.receip_rmb;
+            mk.ui.openPanel('module/receiptNotice/receiptNotice');
+            gData.cashNormal.getRecord();// 请求新的提现记录
         } else if (reward_data.rewardType === RewardType.pigRmb) {
             // 金猪现金
-            gData.reward.data = [{ rewardNum: reward_data.rewardNum, rewardType: reward_data.rewardType }]
+            // gData.reward.data = [{ rewardNum: reward_data.rewardNum, rewardType: reward_data.rewardType }]
+            // gData.reward.data = gData.sign.adData.data.videoRewardList[0];
+            gData.reward.adData = gData.sign.adData;
             mk.ui.openPanel('module/reward/reward');
         }
 
@@ -162,7 +171,7 @@ export class SignData extends Data {
         for (let i = 0; i < l_count; i++) {
             const i_count = this.list_data[i].length;
             for (let j = 0; j < i_count; j++) {
-                let state = this.getStateByDay(this.list_data[i][j].loginDay);
+                let state = this.getStateByDay(this.list_data[i][j].id);
                 if (gData.gameData.gameData.isSignInToday == 0) {
                     if (state === RewardState.unlock) {
                         index = i;

assets/script/game/game/Game.ts

@@ -1,4 +1,5 @@
 import JsbSystem from "../../mk/system/JsbSystem";
+import NumberAnim from "../component/NumberAnim";
 import { GameProp } from "../data/GameData";
 import FunBtns from "./FunBtns";
 
@@ -52,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() {
@@ -107,10 +108,13 @@ export default class Game extends cc.Component {
     }
 
     private changeInfo() {
-        this.lbl_redMoney.node.getComponent('NumberAnim').setValue(gData.gameData.gameData.redMoney);
+        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(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;
     }
 
@@ -124,11 +128,8 @@ export default class Game extends cc.Component {
      * - isAutoOpenPanel 1自动开 2不自动开 其他不处理
      */
     private autoOpenPanel() {
-        const isAutoOpenPanel = gData.gameData.getProp(GameProp.isAutoOpenPanel);
-        if (isAutoOpenPanel == 1) {
+        if (!gData.gameData.isNewPlayer()) {
             mk.ui.openPanel('module/pigBank/pigBank');
-        } else if (isAutoOpenPanel != 2) {
-            // 未定义，给初始值
             gData.gameData.setProp(GameProp.isAutoOpenPanel, 1)
         }
     }

assets/script/game/module/blessingBag/BlessingBag.ts

@@ -292,6 +292,7 @@ export default class BlessingBag extends cc.Component {
             if (response && response.data.code == 1) {
                 //弹红包码界面
                 this.CheckCashRedCode();
+                gData.cashNormal.getRecord();// 请求新的提现记录
             } else {
                 mk.tip.pop('请先完成提现任务');
             }

assets/script/game/module/guide/Guide.ts

@@ -1,4 +1,4 @@
-import { GuideVO } from "../../data/module/GuideData";
+import GuideVO from "./GuideVO";
 
 /**
  * @description 新手引导

assets/script/game/module/guide/GuideVO.ts

@@ -0,0 +1,22 @@
+export default class GuideVO {
+    /** 大步骤 */
+    id: number;
+    /** 大步骤中的小步 */
+    step: number;
+    /** 触发方式 1固定 2等级 3任务 4关卡 5功能开启 */
+    trigger: number;
+    /** 触发条件的数据 如当trigger是关卡时关卡时，为触发关卡 */
+    tr_num: number;
+    /** 1头像 2形象 */
+    tr_form: number;
+    /** 对话内容 */
+    dialog: string;
+    /** 透明点击区域（与click_node不共存） */
+    display_rect: string;
+    /** 点击组件名字（必须在代码中预先设置） */
+    click_rect: string;
+    /** 手指位置 */
+    finger: string;
+    /** 下个时间 */
+    lag_next: 0;
+}

assets/script/game/module/guide/GuideVO.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "c9ea3570-a4f9-476b-ae99-517cab3051ac",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/game/module/guideWeak/GuideWeak.ts

@@ -17,6 +17,7 @@ export default class GuideWeak extends cc.Component {
         if (!gData.guideWeakData.data_config.triggerTime) return;
         if (gData.guideWeakData.cur_guide_id) return;
         if (!mk.guide.isGuideComplete()) return;
+        if (gData.gameData.gameStyle.node.parent.childrenCount > 1) return;
 
         gData.guideWeakData.silent_time += dt;
         if (gData.guideWeakData.silent_time >= gData.guideWeakData.data_config.triggerTime) {

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,8 +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;
 
         // 数据排序：多条奖励，只展示红包，把红包放在首位
@@ -210,8 +216,12 @@ export default class Reward extends cc.Component {
             // this.node_redBag.active = false;
             // this.node_pig.active = true;
         }
-        let rewardNum = gData.reward.data[0].rewardNum || 0;
-        this.lbl_reward_value.string = `${rewardNum}`;
+        let rewardNum: number = gData.reward.data[0].rewardNum || 0;
+        if (gData.reward.data[0].rewardType === RewardType.pigRmb) {
+            this.lbl_reward_value.string = (rewardNum / 100).toFixed(2);
+        } else {
+            this.lbl_reward_value.string = `${rewardNum}`;
+        }
 
         // 动画
         this.anim_open_redbag.play();

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

@@ -36,7 +36,7 @@ export default class Setting extends cc.Component {
     private async initData() {
         console.log("=== gData.wechatData.unionid", gData.wechatData.unionid);
         console.log("=== gData.wechatData.nickName", gData.wechatData.nickName);
-        this.lbl_id.string = "ID:" + gData.wechatData.unionid;
+        this.lbl_id.string = "ID:" + mk.string.getNewLimitStr(gData.wechatData.unionid, 10);// 14 
         this.lbl_nickname.string = gData.wechatData.nickName;
         let music = "module/setting/texture/" + (mk.audio.getSwitchMusic() ? "on" : "off");
         let effect = "module/setting/texture/" + (mk.audio.getSwitchEffect() ? "on" : "off");
@@ -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();
         }
     }
 
@@ -97,7 +98,7 @@ export default class Setting extends cc.Component {
     }
 
     onClickClose() {
-       mk.ad.destroyNativeAd();
-       mk.ad.checkShowInterByChance();
+        mk.ad.destroyNativeAd();
+        mk.ad.checkShowInterByChance();
     }
 }

assets/script/game/module/sign/SignIconItem.ts

@@ -50,7 +50,7 @@ export default class SignIconItem extends cc.Component {
             this.node.active = false;
             return
         }
-        this.lbl_day.string = '第' + this.icon_data.loginDay + '天';
+        this.lbl_day.string = '第' + this.icon_data.id + '天';
         if (this.icon_data.rewardType == RewardType.rmb || this.icon_data.rewardType == RewardType.pigRmb) {
             this.node_cash.active = true;
             this.node_redbag.active = false;
@@ -62,7 +62,7 @@ export default class SignIconItem extends cc.Component {
         }
 
         // 状态样式
-        let state = gData.sign.getStateByDay(this.icon_data.loginDay);
+        let state = gData.sign.getStateByDay(this.icon_data.id);
         if (state == RewardState.none) {
             this.node_mask.active = true;
             this.node_gou.active = true;

assets/script/mk/system/MKSystem.ts

@@ -21,6 +21,7 @@ import PoolSystem from "./PoolSystem";
 import TweenUtil from "../utils/TweenUtil";
 import FlySystem from "./FlySystem";
 import GuideSystem from "./GuideSystem";
+import StringUtil from "../utils/StringUtil";
 
 /**
  * @description mk系统
@@ -64,6 +65,10 @@ class MKSystem {
     public get math(): MathUtil {
         return this._math || (this._math = new MathUtil());
     }
+    private _string: StringUtil;
+    public get string(): StringUtil {
+        return this._string || (this._string = new StringUtil());
+    }
     private _tween: TweenUtil;
     public get tween(): TweenUtil {
         return this._tween || (this._tween = new TweenUtil())

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) {