wuwangdong 4 лет назад
Родитель
Сommit
ba7251fcdb

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
assets/resources/module/login/hot/project.manifest


+ 11 - 12
assets/script/game/game/Game.ts

@@ -1081,24 +1081,24 @@ 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);
 
         //处理红包币逻辑
         // gData.reward.adData = { videoRedMoney: { videoRewardList: null } };
         // gData.reward.adData.videoRedMoney.videoRewardList = [{ rewardType: 1, rewardNum: addMoney }]
         // mk.ui.openPanel('module/reward/reward');
-
+        gData.safeDepositBoxData.setCashRecordDataLength();
         //处理提现逻辑
         gData.cashPro.callBack = this.getRewardCallBack.bind(this);
         gData.receiptNotice.receip_rmb = addMoney;
@@ -1136,7 +1136,6 @@ export default class Game extends cc.Component {
         gData.gameData.init_order = true;
         gData.gameData.checkTaskFinishUnLock();
         gData.gameData.richBankTeachTag = true;
-        gData.safeDepositBoxData.setCashRecordDataLength();
         gData.safeDepositBoxData.updateQipao();
         gData.cashNormal.getRecord();
 

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


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
build/jsb-link/assets/resources/config.json


BIN
build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser


+ 5 - 0
build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/jarRepositories.xml

@@ -91,5 +91,10 @@
       <option name="name" value="maven" />
       <option name="url" value="http://developer.huawei.com/repo/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://maven.aliyun.com/repository/public/" />
+    </remote-repository>
   </component>
 </project>

+ 4 - 2
build/jsb-link/frameworks/runtime-src/proj.android-studio/build.gradle

@@ -7,8 +7,9 @@ buildscript {
         jcenter()
         mavenCentral()
         repositories {
-            maven {url 'http://developer.huawei.com/repo/'}
+            maven {url 'https://maven.aliyun.com/repository/public/'}
         }
+        maven {url 'http://developer.huawei.com/repo/'}
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.3.3'
@@ -29,8 +30,9 @@ allprojects {
             dirs 'libs'
         }
         repositories {
-            maven {url 'http://developer.huawei.com/repo/'}
+            maven {url 'https://maven.aliyun.com/repository/public/'}
         }
+        maven {url 'http://developer.huawei.com/repo/'}
     }
 }
 

+ 8 - 23
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"), E = t("./module/LineUpUIData"), L = 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"), L = t("./module/LineUpUIData"), E = 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 E.LineUpUIData();
-this.warnTipData = new L.default();
+this.lineUpUIData = new L.LineUpUIData();
+this.warnTipData = new E.default();
 this.safeDepositBoxData = new U.default();
 this.moduleData = new Map();
 this.moduleData.set(o.moreGame, this.moreGame);
@@ -16055,30 +16055,17 @@ return !this.isGray;
 };
 e.prototype.getOrderReward = function() {
 return r(this, void 0, void 0, function() {
-var t, e, a;
-return s(this, function(o) {
-switch (o.label) {
-case 0:
+var t;
+return s(this, function() {
 if (cc.sys.isNative && !gData.loginData.isAuth) {
 gData.gameData.authUIType = 0;
 mk.ui.openPanel("module/authUI/authUI");
 return [ 2 ];
 }
-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;
+t = gData.gameData.playerProp.orderData.cashMoney;
+gData.safeDepositBoxData.setCashRecordDataLength();
 gData.cashPro.callBack = this.getRewardCallBack.bind(this);
-gData.receiptNotice.receip_rmb = a;
+gData.receiptNotice.receip_rmb = t;
 mk.ui.openPanel("module/newNotice/newNotice");
 this.node_crop.forEach(function(t) {
 t.active = !1;
@@ -16086,7 +16073,6 @@ t.active = !1;
 this.node_orderHbIcon.active = !1;
 this.node_getOrderReward.node.active = !1;
 return [ 2 ];
-}
 });
 });
 };
@@ -16112,7 +16098,6 @@ this.showTips();
 gData.gameData.init_order = !0;
 gData.gameData.checkTaskFinishUnLock();
 gData.gameData.richBankTeachTag = !0;
-gData.safeDepositBoxData.setCashRecordDataLength();
 gData.safeDepositBoxData.updateQipao();
 gData.cashNormal.getRecord();
 if (this.isStopFarm) {

+ 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": 1638444316034,
-    "genTime": 1638444316034,
+    "buildTime": 1638501842483,
+    "genTime": 1638501842483,
     "genVersion": null
 }

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
packages-hot-update/manifest/project.manifest


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


Некоторые файлы не были показаны из-за большого количества измененных файлов