新增临时版本

GameClient/Assets/Editor/ToolsMenu.cs

@@ -10,6 +10,8 @@ namespace GFGEditor
 {
     public class ToolsMenu : Editor
     {
+        public static bool CommitWhenRelease = true;
+
         enum TOOL_MENU_PRIORITY
         {
             UpdateAndImportAll,
@@ -50,7 +52,10 @@ namespace GFGEditor
             EditorUtility.DisplayProgressBar("进度", "正在更新至内网", 1);
             VEngine.Editor.Builds.BuildScript.BuildCustomBundles(new string[] { "Res", "ResIn" });
             EditorUtility.ClearProgressBar();
-            CommitProject();
+            if(CommitWhenRelease)
+            {
+                CommitProject();
+            }
         }
 
         [MenuItem("策划/其它/更新项目", false, (int)TOOL_MENU_PRIORITY.UpdateProject)]
@@ -202,13 +207,17 @@ namespace GFGEditor
         [MenuItem("Tools/BuildTest/SetBundlesResTestDir")]
         public static void SetBundlesResTestDir()
         {
-            VEngine.Utility.buildPath = "Bundles1";
+            VEngine.Utility.buildPath = "Bundles_temp";
+            ImportArtResTool.ResRootDirName = "正式资源-demo1";
+            CommitWhenRelease = false;
         }
 
         [MenuItem("Tools/BuildTest/ResetBundlesResDir")]
         public static void ResetBundlesResTestDir()
         {
             VEngine.Utility.buildPath = "Bundles";
+            ImportArtResTool.ResRootDirName = "正式资源";
+            CommitWhenRelease = true;
         }
 
     }

GameClient/Assets/Editor/Xasset/Builds/PlayerBuildProcessor.cs

@@ -9,25 +9,22 @@ namespace VEngine.Editor.Builds
     {
         public void OnPostprocessBuild(BuildReport report)
         {
-            if(VEngine.Utility.buildPath != "Bundles")
+            if (VEngine.Utility.buildPath != "Bundles")
             {
                 var directory = Settings.BuildPlayerDataPath;
                 if (!Directory.Exists(directory)) return;
 
                 Directory.Delete(directory, true);
-                if (Directory.GetFiles(Application.streamingAssetsPath).Length == 0)
-                    Directory.Delete(Application.streamingAssetsPath);
             }
+            //if (Directory.GetFiles(Application.streamingAssetsPath).Length == 0)
+            //    Directory.Delete(Application.streamingAssetsPath);
         }
 
         public int callbackOrder => 0;
 
         public void OnPreprocessBuild(BuildReport report)
         {
-            if (VEngine.Utility.buildPath != "Bundles")
-            {
-                BuildScript.CopyToStreamingAssets();
-            }
+            //BuildScript.CopyToStreamingAssets();
         }
     }
 }

GameClient/Assets/Game/CSShare

@@ -1 +1 @@
-Subproject commit 7672b26a41f28101af7075414424d6c784acfba4
+Subproject commit e765ef347b09bf02ed7f24b9c49d3874adfb52bf

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -6,7 +6,7 @@ namespace GFGGame
 {
     public class LauncherConfig
     {
-        public enum EnumNetType { DEV, LOCAL }
+        public enum EnumNetType { DEV, LOCAL, TEMP }
         public static EnumNetType netType = EnumNetType.LOCAL;
         public const int HTTP_GET_TIME_OUT = 3;
         public const int HTTP_POST_TIME_OUT = 15;
@@ -28,12 +28,16 @@ namespace GFGGame
             //ÍâÍødev°æ±¾
             netType = EnumNetType.DEV;
             cfgName = "cfg_dev";
+#elif PT_TEMP
+            netType = EnumNetType.TEMP;
+            cfgName = "cfg_temp";
+            VEngine.Utility.buildPath = "Bundles_temp";
 #else
             netType = EnumNetType.LOCAL;
             string cfgName = "cfg_local";
 #endif
 
-            string url = $"http://39.99.144.134/res_dev/platform/{cfgName}.json";
+            string url = $"http://39.99.144.134/res/platform/{cfgName}.json";
             
             HttpTool.Instance.Get(url, "", (string data) => {
                 ResultHandler(data);