修复福袋排队

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

@@ -85,8 +85,16 @@ export class BlessingBagData extends Data {
     async HttpCashBig() {
         let data = {};
         let response = await mk.http.sendData('redMoneyVideoCash', data);
-
+        mk.console.logSingle('redMoneyVideoCash  ', response);
+        
         if (response.errcode != 0) {
+            if (response.data.count) {
+                gData.tipPanelData.openCashFailTip(response.data.count);
+            }
+            else {
+                mk.tip.pop('提现排队中，多看视频优先提现');
+            }
+            gData.cashPro.init_fail = true;
             return null;
         }
 
@@ -103,8 +111,16 @@ export class BlessingBagData extends Data {
     async HttpCashTask() {
         let data = { redMoneyId: this.taskRbId };
         let response = await mk.http.sendData('tuCaoRedMoney/gearCash', data);
-
+        mk.console.logSingle('gearCash  ', response);
         if (response.errcode != 0) {
+            if (response.data.count) {
+                gData.tipPanelData.openCashFailTip(response.data.count);
+            }
+            else {
+                mk.tip.pop('提现排队中，多看视频优先提现');
+            }
+            gData.cashPro.init_fail = true;
+
             return null;
         }
 

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

@@ -33,15 +33,6 @@ export default class CashProData extends Data {
                     gData.cashPro.init_success = true;
                     mk.data.sendDataEvent(DataEventId.fudaiFunction, `视频红包大额提现第${gData.blessingBag.taskRbId}档领取成功`)
                 }
-                else {
-                    if (response.data.count) {
-                        gData.tipPanelData.openCashFailTip(response.data.count);
-                    }
-                    else {
-                        mk.tip.pop('提现排队中，多看视频优先提现');
-                    }
-                    gData.cashPro.init_fail = true;
-                }
                 break;
             case cashProType.blessing_taskCash:
                 response = await gData.blessingBag.HttpCashTask();
@@ -50,15 +41,6 @@ export default class CashProData extends Data {
                     gData.cashPro.init_success = true;
                     mk.data.sendDataEvent(DataEventId.fudaiFunction, `视频红包第${gData.blessingBag.taskRbId}档领取成功`)
                 }
-                else {
-                    if (response.data.count) {
-                        gData.tipPanelData.openCashFailTip(response.data.count);
-                    }
-                    else {
-                        mk.tip.pop('提现排队中，多看视频优先提现');
-                    }
-                    gData.cashPro.init_fail = true;
-                }
                 break;
         }
         gData.cashNormal.getRecord();// 请求新的提现记录

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/gradle.properties

@@ -11,6 +11,6 @@ WX_APP_ID="wxcf31f0e54f7fefda"; //微信appidUM_CHANNEL
 MY_APP_NAME=\u5929\u5929\u7231\u6d88\u6d88
 PACKAGE_NAME=com.aries.qsllx.mz
 VERSION_NAME=1.3.1
-VERSION_CODE=2
+VERSION_CODE=1000
 TOPON="a60cac090a6eb0,66b742dd0e502b64d783d9c66a9d30c4,b60cac0e43c0e1,b60cac0e4892fa,b60cac0e4d08e8,b60cac0e5754fc,b60cac0e524313,b6113813b876a1"; //巨量渠道topon的 AppId,AppSecreate,激励视频,插屏,信息流,开屏,banner,全屏插屏
 APP_CONFIG_CODE="1.3.1"

build/jsb-link/js backups (useful for debugging)/main.index.js

@@ -3196,7 +3196,13 @@ t = {};
 return [ 4, mk.http.sendData("redMoneyVideoCash", t) ];
 
 case 1:
-if (0 != (e = n.sent()).errcode) return [ 2, null ];
+e = n.sent();
+mk.console.logSingle("redMoneyVideoCash  ", e);
+if (0 != e.errcode) {
+e.data.count ? gData.tipPanelData.openCashFailTip(e.data.count) : mk.tip.pop("提现排队中，多看视频优先提现");
+gData.cashPro.init_fail = !0;
+return [ 2, null ];
+}
 this.isPlayAniUpdate = !1;
 this.videoRbData = e.data.UserRedMoneyInfo;
 return [ 2, e ];
@@ -3216,7 +3222,13 @@ redMoneyId: this.taskRbId
 return [ 4, mk.http.sendData("tuCaoRedMoney/gearCash", t) ];
 
 case 1:
-if (0 != (e = o.sent()).errcode) return [ 2, null ];
+e = o.sent();
+mk.console.logSingle("gearCash  ", e);
+if (0 != e.errcode) {
+e.data.count ? gData.tipPanelData.openCashFailTip(e.data.count) : mk.tip.pop("提现排队中，多看视频优先提现");
+gData.cashPro.init_fail = !0;
+return [ 2, null ];
+}
 this.isPlayAniUpdate = !1;
 this.videoRbData = e.data.UserRedMoneyInfo;
 n = Math.round(100 * gData.blessingBag.taskRbNum);
@@ -5314,9 +5326,6 @@ case 2:
 if ((t = e.sent()) && 1 == t.data.code) {
 gData.cashPro.init_success = !0;
 mk.data.sendDataEvent(l.DataEventId.fudaiFunction, "视频红包大额提现第" + gData.blessingBag.taskRbId + "档领取成功");
-} else {
-t.data.count ? gData.tipPanelData.openCashFailTip(t.data.count) : mk.tip.pop("提现排队中，多看视频优先提现");
-gData.cashPro.init_fail = !0;
 }
 return [ 3, 5 ];
 
@@ -5327,9 +5336,6 @@ case 4:
 if ((t = e.sent()) && 1 == t.data.code) {
 gData.cashPro.init_success = !0;
 mk.data.sendDataEvent(l.DataEventId.fudaiFunction, "视频红包第" + gData.blessingBag.taskRbId + "档领取成功");
-} else {
-t.data.count ? gData.tipPanelData.openCashFailTip(t.data.count) : mk.tip.pop("提现排队中，多看视频优先提现");
-gData.cashPro.init_fail = !0;
 }
 return [ 3, 5 ];
 

packages-hot-update/cfg.json

@@ -15,7 +15,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote2/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote3/"
     ],
-    "buildTime": 1630566857961,
-    "genTime": 1630566857961,
+    "buildTime": 1630577693383,
+    "genTime": 1630577693383,
     "genVersion": null
 }