Jelajahi Sumber

签到存钱罐提现修复

薛鸿潇 5 tahun lalu
induk
melakukan
d1cff97515

+ 7 - 5
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": ""
   },
   {

+ 2 - 3
assets/script/game/data/module/PigBankData.ts

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

+ 1 - 0
assets/script/game/data/module/RewardData.ts

@@ -52,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();

+ 8 - 4
assets/script/game/data/module/SignData.ts

@@ -130,18 +130,22 @@ export class SignData extends Data {
             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) {//星云打款
             } else if (response.CashMode == 1) {//公众号打款
             }
-            const rewardNum = gData.sign.adData.data.videoRedMoney.videoRewardList[0].rewardNum;
+
+            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');

+ 6 - 2
assets/script/game/module/reward/Reward.ts

@@ -216,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();

+ 1 - 1
assets/script/game/module/sign/Sign.ts

@@ -74,7 +74,7 @@ export default class Sign extends cc.Component {
         if (gData.sign.c_sign[index_old].rewardType === RewardType.rmb) {
             if (!gData.loginData.isAuth) {
                 JsbSystem.WxAuth();
-                // return;
+                return;
             }
         }
         // 看广告