zhaoyang 2 лет назад
Родитель
Сommit
5428bc5ddb

+ 8 - 1
GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -101,6 +101,10 @@ namespace GFGEditor
         public static string MaterialTargetPath = $"{ResPathUtil.Material_DIR_PATH}/Effect/";
         public static string EffectMaterialMd5FileSaveName = "EffectMaterialMd5";
 
+        public static string[] ShaderSrcPaths { get { return new string[] { ResRootPath + $"ArtProject/{ResPathUtil.Shader_DIR_PATH}/" }; } }
+        public static string ShaderTargetPath = $"{ResPathUtil.Shader_DIR_PATH}/";
+        public static string ShaderMd5FileSaveName = "ShaderMd5";
+
 
         public static string[] TextureSrcPaths { get { return new string[] { ResRootPath + $"ArtProject/{ResPathUtil.Texture_DIR_PATH}/Effect/" }; } }
         public static string TextureTargetPath = $"{ResPathUtil.Texture_DIR_PATH}/Effect/";
@@ -201,6 +205,9 @@ namespace GFGEditor
             //材质
             EditorUtility.DisplayProgressBar("进度", "正在导入特效材质", 1);
             ImportRes(MaterialSrcPaths, MaterialTargetPath, EffectMaterialMd5FileSaveName);
+            //Shader
+            EditorUtility.DisplayProgressBar("进度", "正在导入Shader", 1);
+            ImportRes(ShaderSrcPaths, ShaderTargetPath, ShaderMd5FileSaveName);
 
             //图片
             EditorUtility.DisplayProgressBar("进度", "正在导入特效图片", 1);
@@ -232,7 +239,7 @@ namespace GFGEditor
             }
             foreach (string dir in sourceDirs)
             {
-                files = FileUtil.CopyFilesTo(dir, targetDir, saveName, new string[] { ".png", ".jpg", ".mp3", ".meta", ".mat" }, ragule);
+                files = FileUtil.CopyFilesTo(dir, targetDir, saveName, new string[] { ".png", ".jpg", ".mp3", ".meta", ".mat", ".shader" }, ragule);
                 foreach (var file in files)
                 {
                     Debug.LogFormat("更新{0}", file);

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

@@ -39,7 +39,7 @@ namespace GFGEditor
         [MenuItem("内网/")]
         public static void VersionTag()
         {
-            
+
         }
         [MenuItem("策划/更新并导入所有", false, (int)TOOL_MENU_PRIORITY.UpdateAndImportAll)]
         static void UpdateAndImportAll()
@@ -234,7 +234,7 @@ namespace GFGEditor
         //     FileUtil.DeleteUnnecessaryImagePos(ImportArtResTool.DressUpTargetPath);
         //     FileUtil.DeleteUnnecessaryImageMD5(new string[] { ImportArtResTool.DressUpMd5FileSaveName });
         // }
-        
+
 
         public static void DeleteUnnecessaryImage()
         {
@@ -274,6 +274,7 @@ namespace GFGEditor
             FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ActivityShow2TargetPath, new string[] { ImportArtResTool.ActivityShow2Md5FileSaveName });
 
             FileUtil.DeleteUnnecessaryImage(ImportArtResTool.MaterialTargetPath, new string[] { ImportArtResTool.EffectMaterialMd5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ShaderTargetPath, new string[] { ImportArtResTool.ShaderMd5FileSaveName });
 
             FileUtil.DeleteUnnecessaryImage(ImportArtResTool.TextureTargetPath, new string[] { ImportArtResTool.EffectTextureMd5FileSaveName });
 

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

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