From a49cff7fa08ef128099bb6e6edc71eb3d773d3d8 Mon Sep 17 00:00:00 2001
From: zhuguoqing <zhuguoqing@kingsome.cn>
Date: Wed, 25 May 2022 18:36:54 +0800
Subject: [PATCH] change to testservrt

---
 assets/res/prefabs/NUI/UIMain.prefab | 30 ++++++++++++++--------------
 assets/scripts/BaseNet.js            |  1 +
 assets/scripts/UI/UIMain.js          |  6 +-----
 assets/scripts/UILogin.js            |  5 +++++
 4 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/assets/res/prefabs/NUI/UIMain.prefab b/assets/res/prefabs/NUI/UIMain.prefab
index cff08095..5d272bb0 100644
--- a/assets/res/prefabs/NUI/UIMain.prefab
+++ b/assets/res/prefabs/NUI/UIMain.prefab
@@ -14375,7 +14375,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 387,
+      "width": 898,
       "height": 40
     },
     "_anchorPoint": {
@@ -14385,8 +14385,8 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -40,
-      "y": -147,
+      "x": 125,
+      "y": -27,
       "z": 0
     },
     "_scale": {
@@ -14460,7 +14460,7 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -150,
+      "x": -405.5,
       "y": -1,
       "z": 0
     },
@@ -15001,7 +15001,7 @@
         "__id__": 399
       }
     ],
-    "_active": false,
+    "_active": true,
     "_level": 4,
     "_components": [
       {
@@ -15034,7 +15034,7 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": 0,
+      "x": -288.5,
       "y": -1,
       "z": 0
     },
@@ -15600,7 +15600,7 @@
         "__id__": 417
       }
     ],
-    "_active": false,
+    "_active": true,
     "_level": 4,
     "_components": [
       {
@@ -15633,7 +15633,7 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -192,
+      "x": -150,
       "y": -1,
       "z": 0
     },
@@ -16199,7 +16199,7 @@
         "__id__": 435
       }
     ],
-    "_active": false,
+    "_active": true,
     "_level": 4,
     "_components": [
       {
@@ -16229,7 +16229,7 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -133.5,
+      "x": -11.5,
       "y": -1,
       "z": 0
     },
@@ -16770,7 +16770,7 @@
         "__id__": 451
       }
     ],
-    "_active": false,
+    "_active": true,
     "_level": 4,
     "_components": [
       {
@@ -16803,7 +16803,7 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -75,
+      "x": 105.5,
       "y": -1,
       "z": 0
     },
@@ -17402,7 +17402,7 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -16.5,
+      "x": 239,
       "y": -1,
       "z": 0
     },
@@ -18077,7 +18077,7 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": 133.5,
+      "x": 389,
       "y": -1,
       "z": 0
     },
@@ -18708,7 +18708,7 @@
     "_enabled": true,
     "_layoutSize": {
       "__type__": "cc.Size",
-      "width": 387,
+      "width": 898,
       "height": 40
     },
     "_resize": 1,
diff --git a/assets/scripts/BaseNet.js b/assets/scripts/BaseNet.js
index c153296d..288d0533 100644
--- a/assets/scripts/BaseNet.js
+++ b/assets/scripts/BaseNet.js
@@ -22,6 +22,7 @@ export var allBaseNet = {
 	japan: '-z2-test.cebg.games',
 	singapore: '-z3-test.cebg.games',
 	turkey: '-z4-test.cebg.games',
+	test: '-test.kingsome.cn',
 };
 
 const netIdHash = (function () {
diff --git a/assets/scripts/UI/UIMain.js b/assets/scripts/UI/UIMain.js
index d7238327..f8dbdb54 100644
--- a/assets/scripts/UI/UIMain.js
+++ b/assets/scripts/UI/UIMain.js
@@ -221,11 +221,7 @@ cc.Class({
 		//第一次显示改名界面
 		// this.calleditname(90001);
 		// 后端说可以改名并且已经链接钱包的情况  才可以改名
-		// if (window.canrename && window.hasWallet == true) {
-		//     window.canrename = false;
-		//     this.nd_editName.active = true;
-		// }
-		if (window.canrename) {
+		if (window.canrename && window.hasWallet == true) {
 			window.canrename = false;
 			this.nd_editName.active = true;
 		}
diff --git a/assets/scripts/UILogin.js b/assets/scripts/UILogin.js
index adb16465..df43ff09 100644
--- a/assets/scripts/UILogin.js
+++ b/assets/scripts/UILogin.js
@@ -236,6 +236,7 @@ cc.Class({
 		SDKManage.init('6516');
 
 		//默认地区是美国
+
 		if (!localStorage.getItem('currentNet')) {
 			//没设置地区
 			localStorage.setItem('currentNet', allBaseNet.japan);
@@ -265,6 +266,10 @@ cc.Class({
 				this.allCountry[data];
 		}
 
+		if (cc.sys.isBrowser) {
+			localStorage.setItem('currentNet', allBaseNet.test);
+		}
+
 		getSwitch(() => {
 			if (!Config.isTest) {
 				// 非提审状态