wuwangdong 4 سال پیش
والد
کامیت
e91f9b39e6

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
assets/resources/module/login/hot/project.manifest


+ 10 - 10
assets/script/game/game/Game.ts

@@ -1081,17 +1081,17 @@ export default class Game extends cc.Component {
             }
         }
 
-        // let data = {};
-        // let response = await mk.http.sendData('orderTask/receiveRewardCash', data);
-        // if (response.errcode != 0) {
-        //     if (response.errcode == 405) {
-        //         mk.tip.pop("今日提现额度已到上限,请明天再提现");
-        //         mk.data.sendDataEvent(DataEventId.cashLimit, "提现触发上限");
-        //     }
-        //     return null;
-        // }
+        let data = {};
+        let response = await mk.http.sendData('orderTask/receiveRewardCash', data);
+        if (response.errcode != 0) {
+            if (response.errcode == 405) {
+                mk.tip.pop("今日提现额度已到上限,请明天再提现");
+                mk.data.sendDataEvent(DataEventId.cashLimit, "提现触发上限");
+            }
+            return null;
+        }
         let addMoney = gData.gameData.playerProp.orderData.cashMoney;
-        // gData.gameData.playerProp.orderData = response.data.userOrderTaskInfo;
+        gData.gameData.playerProp.orderData = response.data.userOrderTaskInfo;
         //gData.gameData.cloneOrderData(true);
 
         //处理红包币逻辑

+ 1 - 1
build/jsb-link/assets/internal/config.json

@@ -1 +1 @@
-{"paths":{"0":["effects/builtin-2d-graphics",0],"1":["effects/builtin-2d-gray-sprite",0],"2":["effects/builtin-2d-label",0],"3":["effects/builtin-2d-spine",0],"4":["effects/builtin-2d-sprite",0],"5":["effects/builtin-3d-particle",0],"6":["effects/builtin-3d-trail",0],"7":["effects/builtin-clear-stencil",0],"8":["effects/builtin-unlit",0],"9":["materials/builtin-2d-base",1],"10":["materials/builtin-2d-graphics",1],"11":["materials/builtin-2d-gray-sprite",1],"12":["materials/builtin-2d-label",1],"13":["materials/builtin-2d-spine",1],"14":["materials/builtin-2d-sprite",1],"15":["materials/builtin-3d-particle",1],"16":["materials/builtin-3d-trail",1],"17":["materials/builtin-clear-stencil",1],"18":["materials/builtin-unlit",1]},"types":["cc.EffectAsset","cc.Material"],"uuids":["30aC+Hnw1PF4pEcoY3kUYb","14TDKXr2NJ6LjvHPops74o","f1h0LXVtJOta5JLZ1xCzfI","0ek66qC1NOQLjgYmi04HvX","28dPjdQWxEQIG3VVl1Qm6T","82migssElAGb04Ws6NimQX","2afAA24LNP4YmYiaVLiivs","c0BAyVxX9JzZy8EjFrc9DU","6dkeWRTOBGXICfYQ7JUBnG","6fgBCSDDdPMInvyNlggls2","a1U5RdJRFMFL57BdJC9H1X","3ae7efMv1CLq2ilvUY/tQi","e0LYfU5ZlNFoAB4UiRrGUG","7a/QZLET9IDreTiBfRn2PD","ecpdLyjvZBwrvm+cedCcQy","43L6CczwNM/6GGmCYEQIoH","46bU+b5fROqIXVPG6aZWWK","cffgu4qBxEqa150o1DmRAy","2aKWBXJHxKHLvrBUi2yYZQ","02delMVqdBD70a/HSD99FK","60AwGqM1dKELCGhPAR+jK6"],"scenes":{},"redirect":[],"deps":[],"packs":{"0b6c4470e":[19,3,1,4,18,6,0,11,15,16,20,8,9,13,5,10,7,17,12,14,2]},"name":"internal","importBase":"import","nativeBase":"native","debug":false,"isZip":false,"encrypted":true}
+{"paths":{"0":["effects/builtin-2d-graphics",0],"1":["effects/builtin-2d-gray-sprite",0],"2":["effects/builtin-2d-label",0],"3":["effects/builtin-2d-spine",0],"4":["effects/builtin-2d-sprite",0],"5":["effects/builtin-3d-particle",0],"6":["effects/builtin-3d-trail",0],"7":["effects/builtin-clear-stencil",0],"8":["effects/builtin-unlit",0],"9":["materials/builtin-2d-base",1],"10":["materials/builtin-2d-graphics",1],"11":["materials/builtin-2d-gray-sprite",1],"12":["materials/builtin-2d-label",1],"13":["materials/builtin-2d-spine",1],"14":["materials/builtin-2d-sprite",1],"15":["materials/builtin-3d-particle",1],"16":["materials/builtin-3d-trail",1],"17":["materials/builtin-clear-stencil",1],"18":["materials/builtin-unlit",1]},"types":["cc.EffectAsset","cc.Material"],"uuids":["30aC+Hnw1PF4pEcoY3kUYb","14TDKXr2NJ6LjvHPops74o","f1h0LXVtJOta5JLZ1xCzfI","0ek66qC1NOQLjgYmi04HvX","28dPjdQWxEQIG3VVl1Qm6T","82migssElAGb04Ws6NimQX","2afAA24LNP4YmYiaVLiivs","c0BAyVxX9JzZy8EjFrc9DU","6dkeWRTOBGXICfYQ7JUBnG","6fgBCSDDdPMInvyNlggls2","a1U5RdJRFMFL57BdJC9H1X","3ae7efMv1CLq2ilvUY/tQi","e0LYfU5ZlNFoAB4UiRrGUG","7a/QZLET9IDreTiBfRn2PD","ecpdLyjvZBwrvm+cedCcQy","43L6CczwNM/6GGmCYEQIoH","46bU+b5fROqIXVPG6aZWWK","cffgu4qBxEqa150o1DmRAy","2aKWBXJHxKHLvrBUi2yYZQ","60AwGqM1dKELCGhPAR+jK6","02delMVqdBD70a/HSD99FK"],"scenes":{},"redirect":[],"deps":[],"packs":{"0b6c4470e":[20,3,1,4,18,6,0,11,15,16,19,8,9,13,5,10,7,17,12,14,2]},"name":"internal","importBase":"import","nativeBase":"native","debug":false,"isZip":false,"encrypted":true}

BIN
build/jsb-link/assets/main/index.jsc


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
build/jsb-link/assets/resources/config.json


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
build/jsb-link/assets/resources/native/a8/a81eb395-718d-4f3b-958c-cb871f7dd5fa.manifest


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

@@ -13001,7 +13001,7 @@ Object.defineProperty(a, "__esModule", {
 value: !0
 });
 a.Fun = void 0;
-var o, n = t("./AppData"), i = t("./GameData"), r = t("./HttpData"), s = t("./LoginData"), c = t("./StorageData"), l = t("./WechatData"), p = t("./module/HelpData"), u = t("./module/TurnableData"), d = t("./module/SignData"), h = t("./module/FissionData"), f = t("./AdData"), y = t("./module/RewardData"), g = t("./module/CashNormalData"), m = t("./module/ReceiptNoticeData"), _ = t("./module/BlessingBagData"), v = t("./module/CashProData"), D = t("./module/RedBagCashData"), b = t("./module/RedCodeData"), w = t("./module/MoreGameData"), S = t("./module/SettingData"), k = t("./module/GuideData"), A = t("./module/GuideWeakData"), P = t("./ConfigData"), T = t("./module/NewCashUIData"), O = t("../../before/view/data/ADUnlockData"), I = t("../../before/view/data/PlantData"), R = t("../../before/main/FarmSystem"), C = t("../../before/view/data/HarvestData"), x = t("../../before/view/data/ADClearSickData"), N = t("../../before/main/PastureSystem"), M = t("../../before/main/FactorySystem"), F = t("./module/FarmMapData"), B = t("./module/GradeRewardData"), j = t("./module/WalletCashOutData"), L = t("./module/LineUpUIData"), E = t("./module/WarnTipData"), U = t("./module/SafeDepositBoxData"), G = function() {
+var o, n = t("./AppData"), i = t("./GameData"), r = t("./HttpData"), s = t("./LoginData"), c = t("./StorageData"), l = t("./WechatData"), p = t("./module/HelpData"), u = t("./module/TurnableData"), d = t("./module/SignData"), h = t("./module/FissionData"), f = t("./AdData"), y = t("./module/RewardData"), g = t("./module/CashNormalData"), m = t("./module/ReceiptNoticeData"), _ = t("./module/BlessingBagData"), v = t("./module/CashProData"), D = t("./module/RedBagCashData"), b = t("./module/RedCodeData"), w = t("./module/MoreGameData"), S = t("./module/SettingData"), k = t("./module/GuideData"), A = t("./module/GuideWeakData"), P = t("./ConfigData"), T = t("./module/NewCashUIData"), O = t("../../before/view/data/ADUnlockData"), I = t("../../before/view/data/PlantData"), R = t("../../before/main/FarmSystem"), C = t("../../before/view/data/HarvestData"), x = t("../../before/view/data/ADClearSickData"), N = t("../../before/main/PastureSystem"), M = t("../../before/main/FactorySystem"), F = t("./module/FarmMapData"), B = t("./module/GradeRewardData"), j = t("./module/WalletCashOutData"), E = t("./module/LineUpUIData"), L = t("./module/WarnTipData"), U = t("./module/SafeDepositBoxData"), G = function() {
 function t() {
 this.init();
 }
@@ -13040,8 +13040,8 @@ this.farmSystem = new R.FarmSystem();
 this.farmMapData = new F.FarmMapData();
 this.farmGradeData = new B.GradeRewardData();
 this.walletCashOutData = new j.WalletCashOutData();
-this.lineUpUIData = new L.LineUpUIData();
-this.warnTipData = new E.default();
+this.lineUpUIData = new E.LineUpUIData();
+this.warnTipData = new L.default();
 this.safeDepositBoxData = new U.default();
 this.moduleData = new Map();
 this.moduleData.set(o.moreGame, this.moreGame);
@@ -16055,17 +16055,31 @@ return !this.isGray;
 };
 e.prototype.getOrderReward = function() {
 return r(this, void 0, void 0, function() {
-var t;
-return s(this, function() {
+var t, e, a;
+return s(this, function(o) {
+switch (o.label) {
+case 0:
 if (cc.sys.isNative && !gData.loginData.isAuth) {
 gData.gameData.authUIType = 0;
 mk.ui.openPanel("module/authUI/authUI");
 return [ 2 ];
 }
-t = gData.gameData.playerProp.orderData.cashMoney;
+t = {};
+return [ 4, mk.http.sendData("orderTask/receiveRewardCash", t) ];
+
+case 1:
+if (0 != (e = o.sent()).errcode) {
+if (405 == e.errcode) {
+mk.tip.pop("今日提现额度已到上限,请明天再提现");
+mk.data.sendDataEvent(d.DataEventId.cashLimit, "提现触发上限");
+}
+return [ 2, null ];
+}
+a = gData.gameData.playerProp.orderData.cashMoney;
+gData.gameData.playerProp.orderData = e.data.userOrderTaskInfo;
 gData.safeDepositBoxData.setCashRecordDataLength();
 gData.cashPro.callBack = this.getRewardCallBack.bind(this);
-gData.receiptNotice.receip_rmb = t;
+gData.receiptNotice.receip_rmb = a;
 mk.ui.openPanel("module/newNotice/newNotice");
 this.node_crop.forEach(function(t) {
 t.active = !1;
@@ -16073,6 +16087,7 @@ t.active = !1;
 this.node_orderHbIcon.active = !1;
 this.node_getOrderReward.node.active = !1;
 return [ 2 ];
+}
 });
 });
 };

+ 2 - 2
packages-hot-update/cfg.json

@@ -12,7 +12,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/"
     ],
-    "buildTime": 1638501842483,
-    "genTime": 1638501842483,
+    "buildTime": 1638502115217,
+    "genTime": 1638502115217,
     "genVersion": null
 }

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
packages-hot-update/manifest/project.manifest


BIN
packages-hot-update/versions/ver_1_0.9.zip


برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است