Merge branch 'master' of http://git.gfggame.com:3000/gfg/client

.gitignore

@@ -29,3 +29,4 @@
 /GameClient/HybridCLRData/HotFixDlls
 /GameClient/HybridCLRData/il2cpp_plus_repo/
 /GameClient/HybridCLRData/hybridclr_repo/
+/GameClient/Assets/ResIn/Dll

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -64,7 +64,7 @@ namespace GFGGame
             ET.Log.Debug($"ptcfg \n{json}");
             var result = JsonMapper.ToObject<Result>(json);
             LauncherConfig.CDN_ROOT = result.cdnRoot;
-            CDN_ROOT = "http://10.108.64.127/";
+            //CDN_ROOT = "http://10.108.64.127/";
             LauncherConfig.loginApiUrl = result.loginApiUrl;
             LauncherConfig.logApiUrl = result.logApiUrl;
             LauncherConfig.logKey = result.logKey;

GameClient/Assets/ResIn/Dll/AOT.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8fd1a18c740608242ad09903e84c264e
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/ResIn/Dll/AOT/Game.Launcher.dll.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: a9e4d92675c1bd94a9a36c2bee177d75
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/ResIn/Dll/AOT/System.Core.dll.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 2e12718a69b79794a8988a912bf6245c
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/ResIn/Dll/AOT/System.dll.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 7eea8b28fe9a7cd42b8c075c6ca3c477
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/ResIn/Dll/AOT/ThirdParty.dll.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 5aafc59fb3bd9a64db6f970b5338e72d
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/ResIn/Dll/AOT/mscorlib.dll.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 8125e284d2c225840a70a44799df7fc4
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/ResIn/Dll/Update.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e91f5189f8e1b53409d49abeb71dfbf3
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/ResIn/Dll/Update/Game.HotUpdate.dll.bytes.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 1152c459e17c0944da9c1bf6715890e3
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: