15.3.1

assets/resources/module/login/hot/version.manifest

@@ -1 +1 @@
-{"version":"1.0.3","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote2/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote2/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote2/version.manifest"}
+{"version":"1.0.2","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote1/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote1/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote1/version.manifest"}

assets/script/game/data/HttpData.ts

@@ -5,7 +5,7 @@
 export class HttpData {
 
     /** 服务器类型 0测试服 1正式服 2李扬服 3悍国服 */
-    public serverType: number = 0;
+    public serverType: number = 1;
 
     public getServerUrl(): string {
         switch (this.serverType) {

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

@@ -123,16 +123,11 @@ export class SignData extends Data {
             let response = await mk.http.sendData('readyCash', {});
 
             if (response.errcode != 0) {
-                if (response.errcode == 41002) {
-                    if (response.data.count) {
-                        gData.tipPanelData.openCashFailTip(response.data.count);
-                    }
-                    else {
-                        mk.tip.pop('提现排队中，多看视频优先提现');
-                    }
+                if (response.data.count) {
+                    gData.tipPanelData.openCashFailTip(response.data.count);
                 }
                 else {
-                    mk.tip.pop(response.errmsg);
+                    mk.tip.pop('提现排队中，多看视频优先提现');
                 }
                 return;
             }

assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATRewardVideo.ts

@@ -17,14 +17,14 @@ export class ATRewardVideo extends zgSingleton {
     /** 是否加载完显示 */
     public ifLoadShow: boolean = false;
     /**是否观看完毕 */
-    public ifWatchEnd: boolean = false;
+    public canGet: boolean = false;
 
     init() {
         this.ATRewardVideoJS = cc["ATRewardVideoJS"];
         this.ATRewardVideoJS.proxy = this;
         this.ATRewardVideoJS.init();
 
-        this.ifWatchEnd = false;
+        this.canGet = false;
         if (this.reawardAdState == RewardAdState.Unload) {
             this.loadAd();
         }
@@ -122,7 +122,6 @@ export class ATRewardVideo extends zgSingleton {
      */
     onRewardedVideoAdPlayEnd(placementId, callbackInfo) {
         //ATJSSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayEnd(" + placementId + ", " + callbackInfo + ")");
-        this.ifWatchEnd = true;
     }
 
     /**
@@ -149,7 +148,7 @@ export class ATRewardVideo extends zgSingleton {
 
         // ATJSSDK.printLog("AnyThinkRewardedVideoDemo::onRewardedVideoAdClosed(" + placementId + ", " + callbackInfo + ")");
 
-        if (this.ifWatchEnd) {
+        if (this.canGet) {
             ATSDKMgr.getInstance().watchVideoAdCallBack(AdPlayStateType.WatchEnd);
             mk.data.sendDataEvent(DataEventId.video_end, mk.ad.videoAdType);
         }
@@ -157,7 +156,7 @@ export class ATRewardVideo extends zgSingleton {
             ATSDKMgr.getInstance().watchVideoAdCallBack(AdPlayStateType.Cancel);
         }
 
-        this.ifWatchEnd = false;
+        this.canGet = false;
 
         this.loadAd();
     }
@@ -179,7 +178,7 @@ export class ATRewardVideo extends zgSingleton {
      */
     onReward(placementId, callbackInfo) {
         // ATJSSDK.printLog("AnyThinkRewardedVideoDemo::onReward(" + placementId + ", " + callbackInfo + ")");
-        this.ifWatchEnd = true;
+        this.canGet = true;
     }
 }
 

assets/script/mk/utils/LogUtil.ts

@@ -9,7 +9,7 @@ export default class LogUtil {
      * 是否显示Log
      * @description
      */
-    public ifShowLog: boolean = true;
+    public ifShowLog: boolean = false;
 
     /**
      * 标签符号

build/jsb-link/assets/resources/native/9e/9ed98385-f23f-41b7-a2bc-27a1d4ad9fd6.manifest

@@ -1 +1 @@
-{"version":"1.0.3","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote2/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote2/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote2/version.manifest"}
+{"version":"1.0.2","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote1/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote1/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote1/version.manifest"}

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/1786486690/libcocos2dx.iml

@@ -33,16 +33,16 @@
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/src" isTestSource="false" />
     </content>
     <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/app/EasyEliminate.iml

@@ -187,16 +187,16 @@
       <sourceFolder url="file://$MODULE_DIR$/../../../../Classes" isTestSource="false" />
     </content>
     <content url="file://$MODULE_DIR$/../../../app">
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />

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

@@ -1197,14 +1197,14 @@ function e() {
 var e = null !== t && t.apply(this, arguments) || this;
 e.reawardAdState = 0;
 e.ifLoadShow = !1;
-e.ifWatchEnd = !1;
+e.canGet = !1;
 return e;
 }
 e.prototype.init = function() {
 this.ATRewardVideoJS = cc.ATRewardVideoJS;
 this.ATRewardVideoJS.proxy = this;
 this.ATRewardVideoJS.init();
-this.ifWatchEnd = !1;
+this.canGet = !1;
 this.reawardAdState == i.Unload && this.loadAd();
 };
 e.prototype.placementID = function() {
@@ -1246,9 +1246,7 @@ gData.adData.updateData(t, n);
 mk.data.sendDataEvent(r.DataEventId.video_init, mk.ad.videoAdType);
 this.reawardAdState = i.Unload;
 };
-e.prototype.onRewardedVideoAdPlayEnd = function() {
-this.ifWatchEnd = !0;
-};
+e.prototype.onRewardedVideoAdPlayEnd = function() {};
 e.prototype.onRewardedVideoAdPlayFailed = function(t, e, n) {
 mk.console.log("AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayFailed placementId >> ", t);
 mk.console.log("AnyThinkRewardedVideoDemo::onRewardedVideoAdPlayFailed errorInfo ", e);
@@ -1258,16 +1256,16 @@ gData.adData.updateADLog(5, t, o);
 s.default.getInstance().watchVideoAdCallBack(s.AdPlayStateType.PlayFail);
 };
 e.prototype.onRewardedVideoAdClosed = function() {
-if (this.ifWatchEnd) {
+if (this.canGet) {
 s.default.getInstance().watchVideoAdCallBack(s.AdPlayStateType.WatchEnd);
 mk.data.sendDataEvent(r.DataEventId.video_end, mk.ad.videoAdType);
 } else s.default.getInstance().watchVideoAdCallBack(s.AdPlayStateType.Cancel);
-this.ifWatchEnd = !1;
+this.canGet = !1;
 this.loadAd();
 };
 e.prototype.onRewardedVideoAdPlayClicked = function() {};
 e.prototype.onReward = function() {
-this.ifWatchEnd = !0;
+this.canGet = !0;
 };
 return e;
 }(c.zgSingleton);
@@ -10946,7 +10944,7 @@ value: !0
 n.ServerUrl = n.HttpData = void 0;
 var o, a = function() {
 function t() {
-this.serverType = 0;
+this.serverType = 1;
 }
 t.prototype.getServerUrl = function() {
 switch (this.serverType) {
@@ -11527,7 +11525,7 @@ value: !0
 n.LogTagColor = void 0;
 var a, i = function() {
 function t() {
-this.ifShowLog = !0;
+this.ifShowLog = !1;
 this._tagChar = "...";
 this._frontChar = "    ";
 this._keyValueChar = " = ";
@@ -19435,7 +19433,7 @@ return [ 4, mk.http.sendData("readyCash", {}) ];
 
 case 2:
 if (0 != (n = a.sent()).errcode) {
-41002 == n.errcode ? n.data.count ? gData.tipPanelData.openCashFailTip(n.data.count) : mk.tip.pop("提现排队中，多看视频优先提现") : mk.tip.pop(n.errmsg);
+n.data.count ? gData.tipPanelData.openCashFailTip(n.data.count) : mk.tip.pop("提现排队中，多看视频优先提现");
 return [ 2 ];
 }
 0 == n.CashMode || n.CashMode;

packages-hot-update/cfg.json

@@ -1,6 +1,6 @@
 {
-    "version": "1.0.1",
-    "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote/",
+    "version": "1.0.2",
+    "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote1/",
     "resourceRootDir": "D:\\mokaszProjects\\mk_framework\\build\\jsb-link",
     "genManifestDir": "",
     "hotAddressArray": [
@@ -15,9 +15,10 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/qxbRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/lvseRemote/",
-        "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/jsbRemote/"
+        "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/jsbRemote/",
+        "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote1/"
     ],
-    "buildTime": 1630404127742,
-    "genTime": 1630404127742,
+    "buildTime": 1630550740853,
+    "genTime": 1630550740853,
     "genVersion": null
 }

packages-hot-update/manifest/version.manifest

@@ -1 +1 @@
-{"version":"1.0.1","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote/version.manifest"}
+{"version":"1.0.2","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote1/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote1/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote1/version.manifest"}