Merge remote-tracking branch 'remotes/origin/master' into dev

GameClient/Assets/Game/HotUpdate/GameConfig.cs

@@ -32,7 +32,7 @@ namespace GFGGame
             var result = JsonMapper.ToObject<Result>(json);
             LoginAddress = result.loginApiUrl;
             // LoginAddress = "http://login.gfg.com:10005";
-            //LoginAddress = "10.108.64.127:10005";//测试地址
+            //LoginAddress = "175.178.189.228:10003";//测试地址
             showGM = int.Parse(result.showGM);
             if(!string.IsNullOrEmpty(result.openTime))
             {

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -44,7 +44,7 @@ namespace GFGGame
 
         public static void InitScriptCompilation()
         {
-            launcherRootUrl = "http://cdn.wanshijing.com/";
+            launcherRootUrl = "http://gfgclient.obs.cn-north-4.myhuaweicloud.com/";
 #if PT_DEV
             //外网dev版本
             netType = EnumNetType.PUBLIC;
@@ -69,7 +69,7 @@ namespace GFGGame
 #else
             netType = EnumNetType.LOCAL;
             cfgName = "cfg_local";
-            launcherRootUrl = "http://10.108.64.189:81/";
+            //launcherRootUrl = "http://10.108.64.189:81/";
 #endif
             cfgUrl = launcherRootUrl + "platform/{cfgName}.json";
         }

GameClient/ProjectSettings/DeviceSimulatorSettings.asset

@@ -0,0 +1,6 @@
+{
+    "SystemInfoSimulation": true,
+    "ApplicationSimulation": true,
+    "SystemInfoDefaultAssembly": true,
+    "SystemInfoAssemblies": []
+}