修改导入美术资源脚本

GameClient/Assets/Editor/ArtsRes/ImagesClip/ImagesClip.cs

@@ -148,8 +148,8 @@ public class ImagesClip : MonoBehaviour
     }
     public static List<string> ReadImagePosition()
     {
-        string targetPath = ImportArtsRes.DressUpTargetPath; ;
-        string sourcePath = ImportArtsRes.DressUpTargetPath;
+        string targetPath = ImportArtResTool.DressUpTargetPath; ;
+        string sourcePath = ImportArtResTool.DressUpTargetPath;
         string[] includeExtensionNames = new string[] { ".png", ".jpg" };
         List<string> result = new List<string>();
         if (Directory.Exists(sourcePath))
@@ -209,7 +209,7 @@ public class ImagesClip : MonoBehaviour
 
     public static void WriteSourceImagesMD5(Dictionary<string, string> resMd5, string saveName)
     {
-        string savePath = Path.Combine(ImportArtsRes.Md5FilePath, saveName);
+        string savePath = Path.Combine(ImportArtResTool.Md5FilePath, saveName);
         using (var writer = new BinaryWriter(File.Open(savePath, FileMode.Create)))
         {
             ICollection keys = resMd5.Keys;
@@ -222,7 +222,7 @@ public class ImagesClip : MonoBehaviour
     }
     public static Dictionary<string, string> ReadSourceImagesMD5(string saveName)
     {
-        string savePath = Path.Combine(ImportArtsRes.Md5FilePath, saveName);
+        string savePath = Path.Combine(ImportArtResTool.Md5FilePath, saveName);
         Dictionary<string, string> resMd5 = new Dictionary<string, string>();
         try
         {

GameClient/Assets/Editor/ArtsRes/ImportArtsRes.cs → GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -7,7 +7,7 @@ using GFGGame;
 
 namespace GFGEditor
 {
-    public class ImportArtsRes
+    public class ImportArtResTool
     {
         //public static string ResRootDirName = "正式资源";
         public static string ResRootDirName = "正式资源-demo1";

GameClient/Assets/Editor/ArtsRes/ImportArtsRes.cs.meta → GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6326b3350d4ec5d47bd48e518e69820b
+guid: 686e89da39376e14c9bfbe4684090a31
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Editor/Bat/updateArtRes.bat

@@ -1,4 +1,3 @@
-cd ../../../../../../gfg/ArtProject
+echo %1
+cd ../../../../../../gfg/%1
 svn up --force --accept tc
-cd ../Õýʽ×ÊÔ´
-svn up --force --accept tc

GameClient/Assets/Editor/FileUtil.cs

@@ -244,10 +244,10 @@ namespace GFGEditor
                 DeleteUnnecessaryImageMD5(saveName);
             }
 
-            if (targetPath == ImportArtsRes.DressUpTargetPath)
+            if (targetPath == ImportArtResTool.DressUpTargetPath)
             {
-                DeleteUnnecessaryImagePos(ImportArtsRes.DressUpTargetPath);
-                DeleteUnnecessaryImageMD5(ImportArtsRes.DressUpMd5FileSaveName);
+                DeleteUnnecessaryImagePos(ImportArtResTool.DressUpTargetPath);
+                DeleteUnnecessaryImageMD5(ImportArtResTool.DressUpMd5FileSaveName);
             }
             // if (targetPath == ImportArtsRes.DressUpAnimationTargetPath || targetPath == ImportArtsRes.EffectTargetPath)
             // {

GameClient/Assets/Editor/ProcessUtil.cs

@@ -7,7 +7,7 @@ namespace GFGEditor
 {
     public class ProcessUtil
     {
-        public static void ExcuteBat(string targetDir, string fileName)
+        public static void ExcuteBat(string targetDir, string fileName, string argument = null)
         {
             Process proc = null;
             try
@@ -16,7 +16,10 @@ namespace GFGEditor
                 proc = new Process();
                 proc.StartInfo.WorkingDirectory = targetDir;
                 proc.StartInfo.FileName = fileName;
-                //proc.StartInfo.Arguments = string.Format("10");//this is argument
+                if(!string.IsNullOrEmpty(argument))
+                {
+                    proc.StartInfo.Arguments = string.Format(argument);
+                }
                 proc.StartInfo.CreateNoWindow = false;
                 proc.Start();
                 proc.WaitForExit();

GameClient/Assets/Editor/ToolsMenu.cs

@@ -71,7 +71,7 @@ namespace GFGEditor
         public static void UpdateArtRes()
         {
             EditorUtility.DisplayProgressBar("进度", "正在更新美术资源", 1);
-            ProcessUtil.ExcuteBat("Assets/Editor/Bat/", "updateArtRes.bat");
+            ProcessUtil.ExcuteBat("Assets/Editor/Bat/", "updateArtRes.bat", ImportArtResTool.ResRootDirName);
             EditorUtility.ClearProgressBar();
         }
 
@@ -135,14 +135,14 @@ namespace GFGEditor
         public static void ImportArtRes()
         {
             EditorUtility.DisplayProgressBar("进度", "正在导入美术资源", 1);
-            ImportArtsRes.Import();
+            ImportArtResTool.Import();
             EditorUtility.ClearProgressBar();
         }
 
         [MenuItem("Tools/ImageClip/ImportClipImage")]
         public static void ImportClipImage()
         {
-            ImportArtsRes.ImportClipImage();
+            ImportArtResTool.ImportClipImage();
         }
         [MenuItem("Tools/ImageClip/ReadImagePosition")]
         public static void ReadImagePosition()
@@ -152,38 +152,38 @@ namespace GFGEditor
         [MenuItem("Tools/ImageClip/DeleteUnnecessaryImagePos")]
         public static void DeleteUnnecessaryImagePos()
         {
-            FileUtil.DeleteUnnecessaryImagePos(ImportArtsRes.DressUpTargetPath);
-            FileUtil.DeleteUnnecessaryImageMD5(ImportArtsRes.DressUpMd5FileSaveName);
+            FileUtil.DeleteUnnecessaryImagePos(ImportArtResTool.DressUpTargetPath);
+            FileUtil.DeleteUnnecessaryImageMD5(ImportArtResTool.DressUpMd5FileSaveName);
         }
         [MenuItem("策划/其它/清除冗余文件")]
         public static void DeleteUnnecessaryImage()
         {
-            FileUtil.DeleteUnnecessaryImage(ImportArtsRes.DressUpTargetPath, ImportArtsRes.DressUpMd5FileSaveName);
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.DressUpTargetPath, ImportArtResTool.DressUpMd5FileSaveName);
 
-            FileUtil.DeleteUnnecessaryImage(ImportArtsRes.BgTargetPath, ImportArtsRes.BgMd5FileSaveName);
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.BgTargetPath, ImportArtResTool.BgMd5FileSaveName);
 
-            FileUtil.DeleteUnnecessaryImage(ImportArtsRes.NpcPicSTargetPath, ImportArtsRes.PicSMd5FileSaveName);
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.NpcPicSTargetPath, ImportArtResTool.PicSMd5FileSaveName);
 
-            FileUtil.DeleteUnnecessaryImage(ImportArtsRes.FieldGuideIconTargetPath, ImportArtsRes.FieldGuideIconMd5FileSaveName);
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.FieldGuideIconTargetPath, ImportArtResTool.FieldGuideIconMd5FileSaveName);
 
-            FileUtil.DeleteUnnecessaryImage(ImportArtsRes.MusicTargetPath, ImportArtsRes.MusicMd5FileSaveName);
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.MusicTargetPath, ImportArtResTool.MusicMd5FileSaveName);
 
-            FileUtil.DeleteUnnecessaryImage(ImportArtsRes.ItemIconTargetPath, ImportArtsRes.IconMd5FileSaveName);
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ItemIconTargetPath, ImportArtResTool.IconMd5FileSaveName);
 
-            FileUtil.DeleteUnnecessaryImage(ImportArtsRes.NpcHeadTargetPath, ImportArtsRes.HeadMd5FileSaveName);
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.NpcHeadTargetPath, ImportArtResTool.HeadMd5FileSaveName);
 
-            FileUtil.DeleteUnnecessaryImage(ImportArtsRes.NpcPicTargetPath, ImportArtsRes.PicFMd5FileSaveName);
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.NpcPicTargetPath, ImportArtResTool.PicFMd5FileSaveName);
 
-            FileUtil.DeleteUnnecessaryImage(ImportArtsRes.CardBgTargetPath, ImportArtsRes.CardBgMd5FileSaveName);
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.CardBgTargetPath, ImportArtResTool.CardBgMd5FileSaveName);
 
-            FileUtil.DeleteUnnecessaryImage(ImportArtsRes.CardIconTargetPath, ImportArtsRes.CardMd5FileSaveName);
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.CardIconTargetPath, ImportArtResTool.CardMd5FileSaveName);
 
             // FileUtil.DeleteUnnecessaryImage(ImportArtsRes.DressUpAnimationTargetPath);
             // FileUtil.DeleteUnnecessaryImage(ImportArtsRes.EffectTargetPath);
-            FileUtil.DeleteUnnecessaryAnimation(ImportArtsRes.DressUpAnimationTargetPath, ImportArtsRes.DressUpAnimationSrcPaths[0]);
-            FileUtil.DeleteUnnecessaryAnimation(ImportArtsRes.EffectTargetPath, ImportArtsRes.EffectSrcPaths[0]);
-            FileUtil.DeleteUnnecessaryAnimation(ImportArtsRes.MaterialTargetPath, ImportArtsRes.MaterialSrcPaths[0]);
-            FileUtil.DeleteUnnecessaryAnimation(ImportArtsRes.TextureTargetPath, ImportArtsRes.TextureSrcPaths[0]);
+            FileUtil.DeleteUnnecessaryAnimation(ImportArtResTool.DressUpAnimationTargetPath, ImportArtResTool.DressUpAnimationSrcPaths[0]);
+            FileUtil.DeleteUnnecessaryAnimation(ImportArtResTool.EffectTargetPath, ImportArtResTool.EffectSrcPaths[0]);
+            FileUtil.DeleteUnnecessaryAnimation(ImportArtResTool.MaterialTargetPath, ImportArtResTool.MaterialSrcPaths[0]);
+            FileUtil.DeleteUnnecessaryAnimation(ImportArtResTool.TextureTargetPath, ImportArtResTool.TextureSrcPaths[0]);
         }
 
         [MenuItem("Tools/List Player Assemblies in Console")]

GameClient/Assets/Game/CSShare

@@ -1 +1 @@
-Subproject commit 53d3b58a154aa050a1a3f2e2bbce5b37a9971f57
+Subproject commit 4d47f47caaec22f069d50f3c7f9cd9ee25a3d799