导资源

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

@@ -211,6 +211,7 @@ public class ImagesClip : MonoBehaviour
     public static void WriteSourceImagesMD5(Dictionary<string, string> resMd5, string saveName)
     {
         string savePath = Path.Combine(ImportArtResTool.Md5FilePath, saveName);
+        Debug.Log("savePath:" + savePath + "    saveName:" + saveName);
         using (var writer = new BinaryWriter(File.Open(savePath, FileMode.Create)))
         {
             ICollection keys = resMd5.Keys;

GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -104,6 +104,9 @@ namespace GFGEditor
         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[] ModelSrcPaths { get { return new string[] { ResRootPath + $"ArtProject/{ResPathUtil.Model_DIR_PATH}/" }; } }
+        public static string ModelTargetPath = $"{ResPathUtil.Model_DIR_PATH}/";
+        public static string ModelMd5FileSaveName = "ModelMd5";
 
 
         public static string[] TextureSrcPaths { get { return new string[] { ResRootPath + $"ArtProject/{ResPathUtil.Texture_DIR_PATH}/Effect/" }; } }
@@ -208,6 +211,9 @@ namespace GFGEditor
             //Shader
             EditorUtility.DisplayProgressBar("进度", "正在导入Shader", 1);
             ImportRes(ShaderSrcPaths, ShaderTargetPath, ShaderMd5FileSaveName);
+            //model
+            EditorUtility.DisplayProgressBar("进度", "正在导入Mhader", 1);
+            ImportRes(ModelSrcPaths, ModelTargetPath, ModelMd5FileSaveName);
 
             //图片
             EditorUtility.DisplayProgressBar("进度", "正在导入特效图片", 1);
@@ -239,7 +245,7 @@ namespace GFGEditor
             }
             foreach (string dir in sourceDirs)
             {
-                files = FileUtil.CopyFilesTo(dir, targetDir, saveName, new string[] { ".png", ".jpg", ".mp3", ".meta", ".mat", ".shader", ".tga" }, ragule);
+                files = FileUtil.CopyFilesTo(dir, targetDir, saveName, new string[] { ".png", ".jpg", ".mp3", ".meta", ".mat", ".shader", ".tga", ".FBX" }, ragule);
                 foreach (var file in files)
                 {
                     Debug.LogFormat("更新{0}", file);

GameClient/Assets/Editor/ToolsMenu.cs

@@ -283,6 +283,7 @@ namespace GFGEditor
 
             FileUtil.DeleteUnnecessaryImage(ImportArtResTool.MaterialTargetPath, new string[] { ImportArtResTool.EffectMaterialMd5FileSaveName });
             FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ShaderTargetPath, new string[] { ImportArtResTool.ShaderMd5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ModelTargetPath, new string[] { ImportArtResTool.ModelTargetPath });
 
             FileUtil.DeleteUnnecessaryImage(ImportArtResTool.TextureTargetPath, new string[] { ImportArtResTool.EffectTextureMd5FileSaveName });
 

GameClient/Assets/Game/HotUpdate/Data/FightDataManager.cs

@@ -77,7 +77,7 @@ namespace GFGGame
                 StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_AUTO_PLAY, _autoPlay == true ? 1 : 0).Coroutine();
             }
         }
-        public int maxFightSpeed = 4;
+        public int maxFightSpeed = 2;
         private int _fightSpeed = 1;
         public int fightSpeed
         {

GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -20,9 +20,10 @@ namespace GFGGame
         public static readonly string EFFECT_DIR_PATH = $"{RES_ROOT_DIR_PATH}/Effect";
         public static readonly string Material_DIR_PATH = $"{RES_ROOT_DIR_PATH}/Material";
         public static readonly string Shader_DIR_PATH = $"{RES_ROOT_DIR_PATH}/Shader";
+        public static readonly string Model_DIR_PATH = $"{RES_ROOT_DIR_PATH}/model";
         public static readonly string Texture_DIR_PATH = $"{RES_ROOT_DIR_PATH}/Texture";
 
-        public  static readonly string SQLITE_FILE_PATH = CONFIG_DIR_PATH + "/" + LauncherConfig.SQL_FILE_NAME;
+        public static readonly string SQLITE_FILE_PATH = CONFIG_DIR_PATH + "/" + LauncherConfig.SQL_FILE_NAME;
 
         public static string GetUIPackagePath(string res)
         {