签到提现到账调整

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

@@ -18,8 +18,6 @@ export class PigBankData extends Data {
     public init() {
         // 提现状态
         this.cash_enable = gData.gameData.gameData.isWithdrawable;
-        // 存款金额
-        this._cur_cash_count = gData.gameData.gameData.piggyBank;
     }
 
     /** 标志位：是否需要刷新数据 */
@@ -36,18 +34,6 @@ export class PigBankData extends Data {
         return this._cash_enable;
     }
 
-    /** 当前存款 */
-    private _cur_cash_count: number = 0;
-    set cur_cash_count(value: number) {
-        if (this._cur_cash_count != value) {
-            this._cur_cash_count = value;
-            this.init_data = true;
-        }
-    }
-    get cur_cash_count(): number {
-        return this._cur_cash_count;
-    }
-
     /** 提现最低限制 */
     public cash_min_limit: number = 0.3;
 
@@ -65,16 +51,15 @@ export class PigBankData extends Data {
         }
 
         if (response.CashMode == 0) {//星云打款
-            // mk.tip.pop('')
+            // 打开提现到账界面
+            gData.receiptNotice.receip_rmb = gData.gameData.gameData.piggyBank;
+            gData.cashNormal.receip_total_rmb += gData.receiptNotice.receip_rmb;
+            mk.ui.openPanel('module/receiptNotice/receiptNotice');
         }
         else if (response.CashMode == 1) {//公众号打款
 
         }
         this.cash_enable = 0;
         
-        // 打开提现到账界面
-        gData.receiptNotice.receip_rmb = this._cur_cash_count;
-        gData.cashNormal.receip_total_rmb += gData.receiptNotice.receip_rmb;
-        mk.ui.openPanel('module/receiptNotice/receiptNotice');
     }
 }

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

@@ -127,7 +127,7 @@ export class SignData extends Data {
     /**
      * 签到完成
      */
-    public signComplete() {
+    public async signComplete() {
         this.sign_can = 0;
         this.sign_last_bar++;
         gData.gameData.gameData.signInDay++;
@@ -147,12 +147,30 @@ export class SignData extends Data {
         // 奖励展示
         let reward_data = this.c_sign[this.sign_last_bar - 1];
         if (reward_data.rewardType === RewardType.redBag) {
+            // 红包
             gData.reward.data = [reward_data];// 数据列表
             mk.ui.openPanel('module/reward/reward')
-        } else if (reward_data.rewardType === RewardType.rmb || reward_data.rewardType === RewardType.pigRmb) {
-            gData.receiptNotice.receip_rmb = reward_data.rewardNum;
-            gData.cashNormal.receip_total_rmb += gData.receiptNotice.receip_rmb;
-            mk.ui.openPanel('module/receiptNotice/receiptNotice');
+        } else if (reward_data.rewardType === RewardType.rmb) {
+            // 陷阱提现
+            let data = {};
+            let response = await mk.http.sendRequest('readyCash', 'POST', JSON.stringify(data));
+            // let response = await mk.http.sendRequest('readyCash', 'POST', JSON.stringify(data));
+            if (response.errcode != 0) {
+                mk.tip.pop('系统异常');
+                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) {//公众号打款
+
+            }
+        } else if (reward_data.rewardType === RewardType.pigRmb) {
+            // 金猪现金
+            gData.reward.data = [{ rewardNum: reward_data.rewardNum, rewardType: reward_data.rewardType }]
+            mk.ui.openPanel('module/reward/reward');
         }
 
         // 获得奖励

assets/script/game/module/pigBank/PigBank.ts

@@ -48,7 +48,7 @@ export default class PigBank extends cc.Component {
             this.node_tip_anim.active = false;
             this.anim_btn_cash.play();
         } else {
-            if (gData.pigbank.cur_cash_count >= gData.pigbank.cash_min_limit) {
+            if (gData.gameData.gameData.piggyBank >= gData.pigbank.cash_min_limit) {
                 this.lbl_get_desc.string = '明日可提现';
             } else {
                 this.lbl_get_desc.string = '满' + gData.pigbank.cash_min_limit + '元可提';
@@ -65,7 +65,7 @@ export default class PigBank extends cc.Component {
      * - 精确到分
      */
     private initDeposit() {
-        const new_count = gData.pigbank.cur_cash_count.toFixed(2)
+        const new_count = gData.gameData.gameData.piggyBank.toFixed(2)
         this.lbl_deposit.string = new_count + '元';
     }
 

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

@@ -120,7 +120,7 @@ export default class Reward extends cc.Component {
      */
     private clickWatchVideo() {
         cc.log('看广告请求');
-        if (gData.reward.data[0] && gData.reward.data[0].rewardType === 1) {
+        if (gData.reward.data[0] && gData.reward.data[0].rewardType === RewardType.redBag) {
             // 关卡结算视频
             mk.ad.watchAd((success: boolean) => {
                 mk.console.log("watchAD:" + success);
@@ -155,7 +155,7 @@ export default class Reward extends cc.Component {
         const r_count = gData.reward.data.length;
         if (r_count >= 2) {
             for (let i = 0; i < r_count; i++) {
-                if (gData.reward.data[i].rewardType === 1) {
+                if (gData.reward.data[i].rewardType === RewardType.redBag) {
                     let new_data = gData.reward.data.splice(i, 1);
                     gData.reward.data.unshift(new_data);
                     break;

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

@@ -81,7 +81,7 @@ export default class Sign extends cc.Component {
      * 拿奖励
      */
     private getReward() {
-        let index_old = gData.sign.getItemIndexByCanSign();
+        const index_old = gData.sign.getItemIndexByCanSign();
         // 完成展示
         gData.sign.signComplete();