浏览代码

新增动画导入目录

zhaoyang 3 年之前
父节点
当前提交
48f3beda9f

+ 13 - 1
GameClient/Assets/Editor/ArtsRes/ImportArtsRes.cs

@@ -65,9 +65,15 @@ namespace GFGEditor
         public static string DressUpAnimationTargetPath = $"{ResPathUtil.ANIMATION_DIR_PATH}/";
         public static string DressUpAnimationTargetPath = $"{ResPathUtil.ANIMATION_DIR_PATH}/";
 
 
 
 
-        private static string[] EffectSrcPaths = new string[] { $"../../../gfg/ArtProject/{ResPathUtil.EFFECT_DIR_PATH}/" };
+        public static string[] EffectSrcPaths = new string[] { $"../../../gfg/ArtProject/{ResPathUtil.EFFECT_DIR_PATH}/" };
         public static string EffectTargetPath = $"{ResPathUtil.EFFECT_DIR_PATH}/";
         public static string EffectTargetPath = $"{ResPathUtil.EFFECT_DIR_PATH}/";
 
 
+        public static string[] MaterialSrcPaths = new string[] { $"../../../gfg/ArtProject/{ResPathUtil.Material_DIR_PATH}/" };
+        public static string MaterialTargetPath = $"{ResPathUtil.Material_DIR_PATH}/";
+
+        public static string[] TextureSrcPaths = new string[] { $"../../../gfg/ArtProject/{ResPathUtil.Texture_DIR_PATH}/" };
+        public static string TextureTargetPath = $"{ResPathUtil.Texture_DIR_PATH}/";
+
 
 
 
 
         public static void Import()
         public static void Import()
@@ -105,6 +111,12 @@ namespace GFGEditor
             //特效
             //特效
             EditorUtility.DisplayProgressBar("进度", "正在导入特效动画", 1);
             EditorUtility.DisplayProgressBar("进度", "正在导入特效动画", 1);
             ImportFileAndDir(EffectSrcPaths, EffectTargetPath);
             ImportFileAndDir(EffectSrcPaths, EffectTargetPath);
+            //材质
+            EditorUtility.DisplayProgressBar("进度", "正在导入特效材质", 1);
+            ImportFileAndDir(MaterialSrcPaths, MaterialTargetPath);
+            //图片
+            EditorUtility.DisplayProgressBar("进度", "正在导入特效图片", 1);
+            ImportFileAndDir(TextureSrcPaths, TextureTargetPath);
 
 
             //NPC对话立绘
             //NPC对话立绘
             EditorUtility.DisplayProgressBar("进度", "正在导入NPC对话立绘", 1);
             EditorUtility.DisplayProgressBar("进度", "正在导入NPC对话立绘", 1);

+ 5 - 5
GameClient/Assets/Editor/FileUtil.cs

@@ -249,11 +249,11 @@ namespace GFGEditor
                 DeleteUnnecessaryImagePos(ImportArtsRes.DressUpTargetPath);
                 DeleteUnnecessaryImagePos(ImportArtsRes.DressUpTargetPath);
                 DeleteUnnecessaryImageMD5(ImportArtsRes.DressUpMd5FileSaveName);
                 DeleteUnnecessaryImageMD5(ImportArtsRes.DressUpMd5FileSaveName);
             }
             }
-            if (targetPath == ImportArtsRes.DressUpAnimationTargetPath || targetPath == ImportArtsRes.EffectTargetPath)
-            {
-                DeleteUnnecessaryAnimation(ImportArtsRes.DressUpAnimationTargetPath, ImportArtsRes.DressUpAnimationSrcPaths[0]);
-                Debug.Log("动画清除完成");
-            }
+            // if (targetPath == ImportArtsRes.DressUpAnimationTargetPath || targetPath == ImportArtsRes.EffectTargetPath)
+            // {
+            //     DeleteUnnecessaryAnimation(ImportArtsRes.DressUpAnimationTargetPath, ImportArtsRes.DressUpAnimationSrcPaths[0]);
+            //     Debug.Log("动画清除完成");
+            // }
         }
         }
 
 
         //清除无资源的Md5数据
         //清除无资源的Md5数据

+ 6 - 2
GameClient/Assets/Editor/ToolsMenu.cs

@@ -226,8 +226,12 @@ namespace GFGEditor
 
 
             FileUtil.DeleteUnnecessaryImage(ImportArtsRes.CardIconTargetPath, ImportArtsRes.CardMd5FileSaveName);
             FileUtil.DeleteUnnecessaryImage(ImportArtsRes.CardIconTargetPath, ImportArtsRes.CardMd5FileSaveName);
 
 
-            FileUtil.DeleteUnnecessaryImage(ImportArtsRes.DressUpAnimationTargetPath);
-            FileUtil.DeleteUnnecessaryImage(ImportArtsRes.EffectTargetPath);
+            // 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]);
         }
         }
 
 
         [MenuItem("Tools/List Player Assemblies in Console")]
         [MenuItem("Tools/List Player Assemblies in Console")]

+ 2 - 0
GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -13,6 +13,8 @@ namespace GFGGame
         public const string CONFIG_DIR_PATH = "Assets/Res/Config";
         public const string CONFIG_DIR_PATH = "Assets/Res/Config";
         public const string ANIMATION_DIR_PATH = "Assets/Res/Animation";
         public const string ANIMATION_DIR_PATH = "Assets/Res/Animation";
         public const string EFFECT_DIR_PATH = "Assets/Res/Effect";
         public const string EFFECT_DIR_PATH = "Assets/Res/Effect";
+        public const string Material_DIR_PATH = "Assets/Res/Material";
+        public const string Texture_DIR_PATH = "Assets/Res/Texture";
 
 
         public const string SQLITE_FILE_PATH = CONFIG_DIR_PATH + "/" + LauncherConfig.SQL_FILE_NAME;
         public const string SQLITE_FILE_PATH = CONFIG_DIR_PATH + "/" + LauncherConfig.SQL_FILE_NAME;