Merge branch 'master' of http://git.mokasz.com/zouyong/team1_nc

assets/resources/data/rule_data.json

@@ -245,6 +245,9 @@
 		"a.为了给您提供更好的服务，开农场当首富及相关服务将不时更新与变化，我们会适时对本隐私政策进行修订，这些修订构成本隐私政策的一部分并具有等同于本隐私政策的效力，未经您明确同意，我们不会削减您依据当前生效的本隐私政策所应享受的权利。 ",
 		"b.本隐私政策更新后，我们会在开农场当首富发出更新版本，并在更新后的条款生效前通过适当的方式提醒您更新的内容，以便您及时了解本隐私政策的最新版本。若您继续使用我们的服务，即表示同意接受修订后的本政策并受之约束。 ",
 		"",
+		"十二.联系我们",
+		"如果您对个人信息保护问题有投诉、建议、疑问，您可以将问题发送至3569458169@qq.com，我们核查并验证您的用户身份后的3个工作日内，会尽快反馈您的投诉与举报。 ",
+		"",
 		"用户协议作弊条款 ",
 		"关于禁止作弊行为的声明 ",
 		"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.1","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"}

assets/script/game/data/HttpData.ts

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

assets/script/game/module/hotUpdate/HotUpdatePanel.ts

@@ -58,8 +58,10 @@ export default class HotUpdatePanel extends cc.Component {
         options.OnUpdateSucceed = () => {
             // this.tipsLabel.string = '更新成功';
             console.log('更新成功');
-            cc.audioEngine.stopAll();
-            cc.game.restart();
+            setTimeout(() => {
+                cc.audioEngine.stopAll();
+                cc.game.restart();
+            }, 500);
         };
         HotUpdate.init(this.manifest, options);
     }

assets/script/game/module/login/Login.ts

@@ -220,8 +220,11 @@ export default class Login extends cc.Component {
                     cc.sys.localStorage.removeItem('HotUpdateSearchPaths');
                     jsb.fileUtils.setSearchPaths(storageArr);
 
-                    cc.audioEngine.stopAll();
-                    cc.game.restart();
+                    setTimeout(() => {
+                        cc.audioEngine.stopAll();
+                        cc.game.restart();
+                    }, 500);
+                    
                 }
             }
         }

assets/script/mk/utils/LogUtil.ts

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

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.1","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"}

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

@@ -16497,8 +16497,10 @@ r.default.checkUpdate();
 };
 e.OnUpdateSucceed = function() {
 console.log("更新成功");
+setTimeout(function() {
 cc.audioEngine.stopAll();
 cc.game.restart();
+}, 500);
 };
 r.default.init(this.manifest, e);
 };
@@ -16670,7 +16672,7 @@ value: !0
 o.ServerUrl = o.HttpData = void 0;
 var n, a = function() {
 function t() {
-this.serverType = 1;
+this.serverType = 0;
 }
 t.prototype.getServerUrl = function() {
 switch (this.serverType) {
@@ -17950,7 +17952,7 @@ value: !0
 o.LogTagColor = void 0;
 var a, i = function() {
 function t() {
-this.ifShowLog = !1;
+this.ifShowLog = !0;
 this._tagChar = "...";
 this._frontChar = "    ";
 this._keyValueChar = " = ";
@@ -18716,8 +18718,10 @@ jsb.fileUtils.removeDirectory(r);
 }
 cc.sys.localStorage.removeItem("HotUpdateSearchPaths");
 jsb.fileUtils.setSearchPaths(n);
+setTimeout(function() {
 cc.audioEngine.stopAll();
 cc.game.restart();
+}, 500);
 }
 }
 }

packages-hot-update/cfg.json

@@ -1,6 +1,6 @@
 {
     "version": "1.0.1",
-    "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/",
+    "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/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/kncdsf/baseRemote/"
+        "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/",
+        "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/"
     ],
-    "buildTime": 1634638935808,
-    "genTime": 1634638935808,
+    "buildTime": 1635414126544,
+    "genTime": 1635414126544,
     "genVersion": null
 }

packages-hot-update/manifest/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.1","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"}

settings/project.json

@@ -36,6 +36,6 @@
       "enable": false
     }
   },
-  "last-module-event-record-time": 1634352566472,
+  "last-module-event-record-time": 1635390484665,
   "start-scene": "6f522a54-3e0e-404d-a06c-bec8b4307c95"
 }