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

# Conflicts:
#	GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -71,8 +71,14 @@ namespace GFGGame
 #else
             ChannelId = 101;
 #endif
-
-            cfgUrl = "http://gfg1.obs.cn-north-4.myhuaweicloud.com/14/platform/{cfgName}.json";
+            if(cfgName == "cfg_local")
+            {
+                cfgUrl = "http://10.108.64.189:81/platform/{cfgName}.json";
+            }
+            else
+            {
+                cfgUrl = "http://gfg1.obs.cn-north-4.myhuaweicloud.com/14/platform/{cfgName}.json";
+            }
         }
 
         public static void InitPlatform(string json)