wuwangdong 4 anni fa
parent
commit
ad0adeb059

File diff suppressed because it is too large
+ 0 - 0
assets/resources/module/login/hot/project.manifest


+ 1 - 1
assets/resources/module/login/hot/version.manifest

@@ -1 +1 @@
-{"version":"1.0.1","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/version.manifest"}
+{"version":"1.0.3","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/version.manifest"}

+ 1 - 1
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) {

+ 20 - 20
assets/script/game/module/login/Login.ts

@@ -71,6 +71,25 @@ export default class Login extends cc.Component {
     }
 
     update() {
+        if (!this.hasCheckPrivacy) {
+            this.hasCheckPrivacy = true
+            this.checkPrivacy()
+        }
+
+        if (!gData.loginData.passPrivacy) {
+            return;
+        }
+
+        if (!this.hasCheckPermission) {
+            this.hasCheckPermission = true;
+            //获取手机授权
+            JsbSystem.checkPermission();
+        }
+
+        if (!gData.appData.getDeviceInfoCompelete) {
+            return
+        }
+
         if (!this.hasDeviceBackInit) {
             this.hasDeviceBackInit = true;
             this.getAppVersion();
@@ -93,25 +112,6 @@ export default class Login extends cc.Component {
             return;
         }
 
-        if (!this.hasCheckPrivacy) {
-            this.hasCheckPrivacy = true
-            this.checkPrivacy()
-        }
-
-        if (!gData.loginData.passPrivacy) {
-            return;
-        }
-
-        if (!this.hasCheckPermission) {
-            this.hasCheckPermission = true;
-            //获取手机授权
-            JsbSystem.checkPermission();
-        }
-
-        if (!gData.appData.getDeviceInfoCompelete) {
-            return
-        }
-
         if (!CC_DEBUG) {
             if (gData.loginData.popIdentifySwitch) {
                 if (!this.hasCheckAnti) {
@@ -223,7 +223,7 @@ export default class Login extends cc.Component {
                     setTimeout(() => {
                         cc.audioEngine.stopAll();
                         cc.game.restart();
-                    }, 500); 
+                    }, 500);
                 }
             }
         }

+ 1 - 1
assets/script/mk/utils/LogUtil.ts

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

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


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/config.json


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

@@ -1 +1 @@
-{"version":"1.0.1","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/version.manifest"}
+{"version":"1.0.3","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/version.manifest"}

File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/native/a8/a81eb395-718d-4f3b-958c-cb871f7dd5fa.manifest


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


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

@@ -17975,7 +17975,7 @@ value: !0
 a.ServerUrl = a.HttpData = void 0;
 var o, n = function() {
 function t() {
-this.serverType = 0;
+this.serverType = 1;
 }
 t.prototype.getServerUrl = function() {
 switch (this.serverType) {
@@ -19300,7 +19300,7 @@ value: !0
 a.LogTagColor = void 0;
 var n, i = function() {
 function t() {
-this.ifShowLog = !0;
+this.ifShowLog = !1;
 this._tagChar = "...";
 this._frontChar = "    ";
 this._keyValueChar = " = ";
@@ -19954,16 +19954,6 @@ return [ 2 ];
 });
 };
 e.prototype.update = function() {
-if (!this.hasDeviceBackInit) {
-this.hasDeviceBackInit = !0;
-this.getAppVersion();
-}
-if (gData.appData.updateState == u.UpdateState.ForceUpdateFinish) {
-gData.appData.updateState = u.UpdateState.CheckHot;
-this.checkHotUpdate();
-}
-if (gData.appData.updateState != u.UpdateState.IsUpdate) {
-if (gData.appData.updateState == u.UpdateState.UpdateFinish) {
 if (!this.hasCheckPrivacy) {
 this.hasCheckPrivacy = !0;
 this.checkPrivacy();
@@ -19974,6 +19964,16 @@ this.hasCheckPermission = !0;
 l.default.checkPermission();
 }
 if (gData.appData.getDeviceInfoCompelete) {
+if (!this.hasDeviceBackInit) {
+this.hasDeviceBackInit = !0;
+this.getAppVersion();
+}
+if (gData.appData.updateState == u.UpdateState.ForceUpdateFinish) {
+gData.appData.updateState = u.UpdateState.CheckHot;
+this.checkHotUpdate();
+}
+if (gData.appData.updateState != u.UpdateState.IsUpdate) {
+if (gData.appData.updateState == u.UpdateState.UpdateFinish) {
 if (gData.loginData.popIdentifySwitch) {
 if (!this.hasCheckAnti) {
 this.hasCheckAnti = !0;
@@ -19993,13 +19993,13 @@ this.loadMain();
 gData.gameData.dataFinish = !1;
 }
 }
-}
-}
 } else {
 this.lbl_progress.node.active = !0;
 this.node_load.active = !1;
 this.setProgress(100 * gData.appData.updatePercent);
 }
+}
+}
 };
 e.prototype.loadMain = function() {
 return r(this, void 0, void 0, function() {
@@ -23901,7 +23901,7 @@ var t = this;
 this.list_data = gData.plantData.productArr;
 this.tableView.node.emit("srollview-init", this.list_data);
 gData.plantData.productIndex > 1 && cc.tween(this).delay(.2).call(function() {
-t.list_data.length > 4 && (gData.plantData.productIndex <= t.list_data.length - 4 ? t.tableView.contentMoveByIndex(gData.plantData.productIndex - 1, .2) : t.tableView.moveButtom());
+t.list_data.length > 4 && (gData.plantData.productIndex <= t.list_data.length - 4 ? t.tableView.contentMoveByIndex(gData.plantData.productIndex - 1, .2) : t.tableView.contentMoveByIndex(t.list_data.length - 4, .2, !0));
 }).start();
 };
 e.prototype.onDestroy = function() {};

+ 5 - 4
packages-hot-update/cfg.json

@@ -1,6 +1,6 @@
 {
     "version": "1.0.3",
-    "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/",
+    "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/",
     "resourceRootDir": "D:\\projects\\team1_nc\\build\\jsb-link",
     "genManifestDir": "",
     "hotAddressArray": [
@@ -9,9 +9,10 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyJsb/baseRemote/",
-        "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/"
+        "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/",
+        "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/"
     ],
-    "buildTime": 1635413152505,
-    "genTime": 1635413152505,
+    "buildTime": 1635417853674,
+    "genTime": 1635417853674,
     "genVersion": null
 }

File diff suppressed because it is too large
+ 0 - 0
packages-hot-update/manifest/project.manifest


+ 1 - 1
packages-hot-update/manifest/version.manifest

@@ -1 +1 @@
-{"version":"1.0.3","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/version.manifest"}
+{"version":"1.0.3","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/version.manifest"}

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


Some files were not shown because too many files changed in this diff