Merge branch 'master' of https://e.coding.net/shenyou-gfg/gfgclient/client

GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -10,8 +10,9 @@ namespace GFGEditor
     public class ImportArtResTool
     {
         public static string ResRootDirName = "正式资源";
-        //public static string ResRootDirName = "正式资源-demo1";
+        public static string ResRootDirNameDressUp = "正式资源";
         public static string ResRootPath { get { return $"../../../gfg/{ResRootDirName}/"; } }
+        public static string ResRootPathDressUp { get { return $"../../../gfg/{ResRootDirNameDressUp}/"; } }
 
         public static string ragule = @"^[0-9a-zA-Z_]{1,}$";
         public static string Md5FilePath = "Assets/MD5";
@@ -31,7 +32,7 @@ namespace GFGEditor
         public static string IconMd5FileSaveName = "IconMd5";
 
 
-        private static string[] DressUpSrcPaths { get { return new string[] { ResRootPath + "suit/" }; } }
+        private static string[] DressUpSrcPaths { get { return new string[] { ResRootPathDressUp + "suit/" }; } }
         public static string DressUpTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/DressUp/";
         public static string DressUpMd5FileSaveName = "DressUpMd5";
 
@@ -50,7 +51,7 @@ namespace GFGEditor
         public static string PicSMd5FileSaveName = "PicSMd5";
 
 
-        private static string[] BgSrcPaths { get { return new string[] { ResRootPath + "scene/" }; } }
+        private static string[] BgSrcPaths { get { return new string[] { ResRootPathDressUp + "scene/" }; } }
         public static string BgTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/DressUp/";
         public static string BgMd5FileSaveName = "BgMd5";
 
@@ -65,7 +66,7 @@ namespace GFGEditor
         public static string CardMd5FileSaveName = "CardMd5";
 
 
-        public static string[] DressUpAnimationSrcPaths { get { return new string[] { ResRootPath + $"ArtProject/{ResPathUtil.ANIMATION_DIR_PATH}/" }; } }
+        public static string[] DressUpAnimationSrcPaths { get { return new string[] { ResRootPathDressUp + $"ArtProject/{ResPathUtil.ANIMATION_DIR_PATH}/" }; } }
         public static string DressUpAnimationTargetPath = $"{ResPathUtil.ANIMATION_DIR_PATH}/";
 
 

GameClient/Assets/Editor/ToolsMenu.cs

@@ -77,6 +77,11 @@ namespace GFGEditor
         {
             EditorUtility.DisplayProgressBar("进度", "正在更新美术资源", 1);
             ProcessUtil.ExcuteBat("Assets/Editor/Bat/", "updateArtRes.bat", ImportArtResTool.ResRootDirName);
+            //如果换装目录跟其他资源目录不一致，那么要再次更新换装目录
+            if(ImportArtResTool.ResRootDirNameDressUp != ImportArtResTool.ResRootDirName)
+            {
+                ProcessUtil.ExcuteBat("Assets/Editor/Bat/", "updateArtRes.bat", ImportArtResTool.ResRootDirNameDressUp);
+            }
             EditorUtility.ClearProgressBar();
         }
 
@@ -191,7 +196,7 @@ namespace GFGEditor
             FileUtil.DeleteUnnecessaryAnimation(ImportArtResTool.TextureTargetPath, ImportArtResTool.TextureSrcPaths[0]);
         }
 
-        [MenuItem("策划/其它/清除冗余动画")]
+        //[MenuItem("策划/其它/清除冗余动画")]
         public static void DeleteUnnecessaryAni()
         {
             FileUtil.DeleteUnnecessaryAnimation(ImportArtResTool.DressUpAnimationTargetPath, ImportArtResTool.DressUpAnimationSrcPaths[0]);
@@ -216,7 +221,7 @@ namespace GFGEditor
         public static void SetBundlesResTestDir()
         {
             VEngine.Utility.buildPath = "Bundles_temp";
-            ImportArtResTool.ResRootDirName = "正式资源-demo1";
+            ImportArtResTool.ResRootDirNameDressUp = "正式资源-demo1";
             CommitWhenRelease = false;
         }
 
@@ -224,7 +229,7 @@ namespace GFGEditor
         public static void ResetBundlesResTestDir()
         {
             VEngine.Utility.buildPath = "Bundles";
-            ImportArtResTool.ResRootDirName = "正式资源";
+            ImportArtResTool.ResRootDirNameDressUp = "正式资源";
             CommitWhenRelease = true;
         }
 

GameClient/Assets/Game/Launcher/Net/Http/HttpTool.cs

@@ -42,7 +42,7 @@ namespace GFGGame
         public IEnumerator PostRequest(string prefixUrl, string methodName, string jsonString, Action<string> callback)
         {
             string url = prefixUrl + methodName;
-            // Debug.Log(string.Format("post url:{0} postData:{1}", url, jsonString));
+             Debug.Log(string.Format("post url:{0} postData:{1}", url, jsonString));
             using (UnityWebRequest webRequest = new UnityWebRequest(url, "POST"))
             {
                 byte[] bodyRaw = Encoding.UTF8.GetBytes(jsonString);
@@ -74,7 +74,7 @@ namespace GFGGame
             }
             else
             {
-                // Debug.Log("from server " + webRequest.downloadHandler.text + "\nby " + tag);
+                 Debug.Log("from server " + webRequest.downloadHandler.text + "\nby " + tag);
                 paramCallback = webRequest.downloadHandler.text;
                 //paramCallback = System.Text.Encoding.UTF8.GetString(webRequest.downloadHandler.data, 3, webRequest.downloadHandler.data.Length - 3);
                 callback?.Invoke(paramCallback);