Merge branch 'master' of http://10.108.64.190:3000/gfg/client

# Conflicts:
#	GameClient/Assets/StreamingAssets/build_info

GameClient/Assets/Editor/BuildEditor/BuildDllHelper.cs

@@ -21,6 +21,10 @@ namespace GFGEditor
 
             string hotfixDllSrcDir = SettingsUtil.GetHotUpdateDllsOutputDirByTarget(target);
             string hotfixAssembliesDstDir = LauncherConfig.DllDirHotfix;
+            if (!Directory.Exists(LauncherConfig.DllDirHotfix))
+            {
+                Directory.CreateDirectory(LauncherConfig.DllDirHotfix);
+            }
             foreach (var dll in SettingsUtil.HotUpdateAssemblyFiles)
             {
                 string dllPath = $"{hotfixDllSrcDir}/{dll}";
@@ -36,6 +40,10 @@ namespace GFGEditor
             var target = EditorUserBuildSettings.activeBuildTarget;
             string aotAssembliesSrcDir = SettingsUtil.GetAssembliesPostIl2CppStripDir(target);
             string aotAssembliesDstDir = LauncherConfig.DllDirAOT;
+            if(!Directory.Exists(LauncherConfig.DllDirAOT))
+            {
+                Directory.CreateDirectory(LauncherConfig.DllDirAOT);
+            }
 
             foreach (var dll in HotUpdateCodeLoader.AOTMetaAssemblyNames)
             {

GameClient/ProjectSettings/ProjectSettings.asset

@@ -145,7 +145,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.3
+  bundleVersion: 1.4
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0