guodong 1 жил өмнө
parent
commit
7247425521

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

@@ -29,6 +29,10 @@ namespace GFGEditor
         public static string MusicTargetPath = $"{ResPathUtil.MUSIC_DIR_PATH}/";
         public static string MusicMd5FileSaveName = "MusicMd5";
 
+        private static string[] VoiceSrcPaths { get { return new string[] { ResRootPath + "voice/" }; } }
+        public static string VoiceTargetPath = $"{ResPathUtil.Voice_DIR_PATH}/";
+        public static string VoiceMd5FileSaveName = "VoiceMd5";
+
         private static string[] CardMusicSrcPaths { get { return new string[] { ResRootPath + "cardMusic/Card/" }; } }
         public static string CardMusicTargetPath = $"{ResPathUtil.SOUND_DIR_PATH}/Card/";
         public static string CardMusicMd5FileSaveName = "CardMusicMd5";
@@ -150,6 +154,9 @@ namespace GFGEditor
             //音乐
             EditorUtility.DisplayProgressBar("进度", "正在导入音乐", 1);
             ImportRes(MusicSrcPaths, MusicTargetPath, MusicMd5FileSaveName);
+            //语音
+            EditorUtility.DisplayProgressBar("进度", "正在导入语音", 1);
+            ImportRes(VoiceSrcPaths, VoiceTargetPath, VoiceMd5FileSaveName);
             //词牌音乐
             EditorUtility.DisplayProgressBar("进度", "正在导入词牌音乐", 1);
             ImportRes(CardMusicSrcPaths, CardMusicTargetPath, CardMusicMd5FileSaveName);
@@ -263,7 +270,7 @@ namespace GFGEditor
             }
             foreach (string dir in sourceDirs)
             {
-                files = FileUtil.CopyFilesTo(dir, targetDir, saveName, new string[] { ".png", ".jpg", ".mp3", ".meta", ".mat", ".shader", ".tga", ".FBX"}, ragule);
+                files = FileUtil.CopyFilesTo(dir, targetDir, saveName, new string[] { ".png", ".jpg", ".mp3", ".wav", ".meta", ".mat", ".shader", ".tga", ".FBX"}, ragule);
                 foreach (var file in files)
                 {
                     Debug.LogFormat("更新{0}", file);

+ 1 - 0
GameClient/Assets/GFGAsset/AssetBundleCollectRuler.asset

@@ -21,6 +21,7 @@ MonoBehaviour:
   - Assets/Res/Texture/Card/Bg
   - Assets/Res/model
   - Assets/Res/Material
+  - Assets/Res/Voice
   PackByTopDir:
   - Assets/Res/Effect/UI
   - Assets/Res/Texture/FieldGuide

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

@@ -18,6 +18,7 @@ namespace GFGGame
 
         public static readonly string MUSIC_DIR_PATH = $"{RES_ROOT_DIR_PATH}/Music";
         public static readonly string SOUND_DIR_PATH = $"{RES_ROOT_DIR_PATH}/Sound";
+        public static readonly string Voice_DIR_PATH = $"{RES_ROOT_DIR_PATH}/Voice";
         public static readonly string VIDEO_DIR_PATH = $"{RES_ROOT_DIR_PATH}/video";
         public static readonly string TEXTURE_DIR_PATH = $"{RES_ROOT_DIR_PATH}/Texture";
         public static readonly string TEXTURE_DRESSUP_DIR_PATH = $"{TEXTURE_DIR_PATH}/DressUp";
@@ -128,6 +129,10 @@ namespace GFGGame
         {
             return $"{SOUND_DIR_PATH}/Card/{res}.{extName}";
         }
+        public static string GetVoicePath(string res, string extName = "wav")
+        {
+            return $"{Voice_DIR_PATH}/{res}.{extName}";
+        }
         public static string GetVideoPath(string res, string extName = "mp4")
         {
             return $"{VIDEO_DIR_PATH}/{res}.{extName}";