Ver código fonte

同步资源时提交删除的文件

guodong 2 anos atrás
pai
commit
b6233d9a61

+ 46 - 0
GameClient/Assets/Editor/ArtsRes/DeleteFileHelper.cs

@@ -0,0 +1,46 @@
+using System.Collections.Generic;
+using UnityEngine;
+using GFGGame;
+using System.IO;
+using System.Text;
+using UnityEditor;
+
+namespace GFGEditor
+{
+    public class DeleteFileHelper
+    {
+        private static List<string> DeleteList = new List<string>();
+
+        public static void AddFile(string path)
+        {
+            DeleteList.Add(path);
+        }
+
+        public static void CommitDeleteFile()
+        {
+            var stringBuilder = new StringBuilder();
+            stringBuilder.AppendLine($"cd ../../../{ResPathUtil.RES_ROOT_DIR_PATH}");
+            Debug.Log("CommitDelteFile");
+            foreach (var deleteFile in DeleteList)
+            {
+                if(File.Exists(deleteFile))
+                {
+                    continue;
+                }
+                string deleteFile1 = deleteFile.Replace($"{ResPathUtil.RES_ROOT_DIR_PATH}/", "");
+                Debug.Log($"deleteFile1 {deleteFile1}");
+                stringBuilder.AppendLine($"svn rm {deleteFile1}");
+                stringBuilder.AppendLine($"svn rm {deleteFile1}.meta");
+            }
+            //stringBuilder.AppendLine("pause");
+
+            var batFileName = "removeFiles.bat";
+            var batDirPath = "Assets/Editor/Bat/";
+            var batFile = batDirPath + batFileName;
+            File.WriteAllText(batFile, stringBuilder.ToString());
+            AssetDatabase.Refresh();
+            ProcessUtil.ExcuteBat(batDirPath, batFileName);
+            DeleteList.Clear();
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Editor/ArtsRes/DeleteFileHelper.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 75286febcf975a7469a9005d3a62142f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 13 - 3
GameClient/Assets/Editor/ArtsRes/FileUtil.cs

@@ -318,7 +318,14 @@ namespace GFGEditor
                     }
 
                 }
-                if (!has) File.Delete(targetPath + fileName);
+                if (!has)
+                {
+                    var deleteFile = targetPath + fileName;
+                    File.Delete(targetPath + fileName);
+
+                    //写入删除文件脚本
+                    DeleteFileHelper.AddFile(deleteFile);
+                }
             }
             Debug.Log(targetPath + "清除完成!");
         }
@@ -339,8 +346,11 @@ namespace GFGEditor
                 string targetFilePath = targetPath + fileName;
                 if (extensionName == ".bytes" && !File.Exists(targetFilePath + includeExtensionNames[0]) && !File.Exists(targetFilePath + includeExtensionNames[1]))
                 {
-                    File.Delete(targetPath + Path.GetFileName(file));
+                    var deleteFile = targetPath + Path.GetFileName(file);
+                    File.Delete(deleteFile);
 
+                    //写入删除文件脚本
+                    DeleteFileHelper.AddFile(deleteFile);
                 }
             }
 
@@ -372,7 +382,7 @@ namespace GFGEditor
                     {
                         File.Delete(lfile);
                         //写入删除文件脚本
-
+                        DeleteFileHelper.AddFile(lfile);
                     }
                 }
                 foreach (var lDir in localDirs)

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

@@ -15,7 +15,7 @@ namespace GFGEditor
         public static string ResRootPathDressUp { get { return $"../../../gfg/{ResRootDirNameDressUp}/"; } }
 
         public static string ragule = @"^[0-9a-zA-Z_.]{1,}$";
-        public static string Md5FilePath = "Assets/Res/MD5";
+        public static string Md5FilePath = $"{ResPathUtil.RES_ROOT_DIR_PATH}/MD5";
 
         private static string[] FieldGuideIconSrcPaths { get { return new string[] { ResRootPath + "图鉴/" }; } }
         public static string FieldGuideIconTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/FieldGuide/Icon/";

+ 442 - 0
GameClient/Assets/Editor/Bat/removeFiles.bat

@@ -0,0 +1,442 @@
+cd ../../../Assets/Res
+svn rm Music/dressup.mp3
+svn rm Music/dressup.mp3.meta
+svn rm Music/zhuxian.mp3
+svn rm Music/zhuxian.mp3.meta
+svn rm Music/zx_huanle.mp3
+svn rm Music/zx_huanle.mp3.meta
+svn rm Music/zx_richang.mp3
+svn rm Music/zx_richang.mp3.meta
+svn rm Music/zx_shanggan.mp3
+svn rm Music/zx_shanggan.mp3.meta
+svn rm Sound/Card/test.mp3
+svn rm Sound/Card/test.mp3.meta
+svn rm Texture/Icon/bs_jingzhongh.png
+svn rm Texture/Icon/bs_jingzhongh.png.meta
+svn rm Texture/Icon/bs_shuizhongy.png
+svn rm Texture/Icon/bs_shuizhongy.png.meta
+svn rm Texture/Icon/dj_huayan.png
+svn rm Texture/Icon/dj_huayan.png.meta
+svn rm Texture/Icon/dj_jiyuet.png
+svn rm Texture/Icon/dj_jiyuet.png.meta
+svn rm Texture/Icon/dj_sanmiaoy.png
+svn rm Texture/Icon/dj_sanmiaoy.png.meta
+svn rm Texture/Icon/es_chuisihaitang.png
+svn rm Texture/Icon/es_chuisihaitang.png.meta
+svn rm Texture/Icon/faxing_ys.png
+svn rm Texture/Icon/faxing_ys.png.meta
+svn rm Texture/Icon/fx_chuisihaitang.png
+svn rm Texture/Icon/fx_chuisihaitang.png.meta
+svn rm Texture/Icon/fx_feifeicao.png
+svn rm Texture/Icon/fx_feifeicao.png.meta
+svn rm Texture/Icon/fx_lidong.png
+svn rm Texture/Icon/fx_lidong.png.meta
+svn rm Texture/Icon/fx_sichunf.png
+svn rm Texture/Icon/fx_sichunf.png.meta
+svn rm Texture/Icon/fx_yueguit.png
+svn rm Texture/Icon/fx_yueguit.png.meta
+svn rm Texture/Icon/hlhdjficon_1.png
+svn rm Texture/Icon/hlhdjficon_1.png.meta
+svn rm Texture/Icon/js_chuisihaitang.png
+svn rm Texture/Icon/js_chuisihaitang.png.meta
+svn rm Texture/Icon/js_yueguit.png
+svn rm Texture/Icon/js_yueguit.png.meta
+svn rm Texture/Icon/kp_jinbixie.png
+svn rm Texture/Icon/kp_jinbixie.png.meta
+svn rm Texture/Icon/kp_lanshan.png
+svn rm Texture/Icon/kp_lanshan.png.meta
+svn rm Texture/Icon/kp_memgyin.png
+svn rm Texture/Icon/kp_memgyin.png.meta
+svn rm Texture/Icon/kp_xingcijing.png
+svn rm Texture/Icon/kp_xingcijing.png.meta
+svn rm Texture/Icon/kp_yishun.png
+svn rm Texture/Icon/kp_yishun.png.meta
+svn rm Texture/Icon/kp_zuochi1.png
+svn rm Texture/Icon/kp_zuochi1.png.meta
+svn rm Texture/Icon/kp_zuochi2.png
+svn rm Texture/Icon/kp_zuochi2.png.meta
+svn rm Texture/Icon/lyq_lidong.png
+svn rm Texture/Icon/lyq_lidong.png.meta
+svn rm Texture/Icon/lyq_yunhubl.png
+svn rm Texture/Icon/lyq_yunhubl.png.meta
+svn rm Texture/Icon/lyq_yunhubx.png
+svn rm Texture/Icon/lyq_yunhubx.png.meta
+svn rm Texture/Icon/lyq_yunhuby.png
+svn rm Texture/Icon/lyq_yunhuby.png.meta
+svn rm Texture/Icon/nd_yueguit.png
+svn rm Texture/Icon/nd_yueguit.png.meta
+svn rm Texture/Icon/qt_dabai.png
+svn rm Texture/Icon/qt_dabai.png.meta
+svn rm Texture/Icon/qt_miaoe.png
+svn rm Texture/Icon/qt_miaoe.png.meta
+svn rm Texture/Icon/qt_qunxianh_1.png
+svn rm Texture/Icon/qt_qunxianh_1.png.meta
+svn rm Texture/Icon/qt_qunxianh_2.png
+svn rm Texture/Icon/qt_qunxianh_2.png.meta
+svn rm Texture/Icon/qt_qunxianh_3.png
+svn rm Texture/Icon/qt_qunxianh_3.png.meta
+svn rm Texture/Icon/scw_chuisihaitang.png
+svn rm Texture/Icon/scw_chuisihaitang.png.meta
+svn rm Texture/Icon/scw_feifeicao1.png
+svn rm Texture/Icon/scw_feifeicao1.png.meta
+svn rm Texture/Icon/scw_lidong.png
+svn rm Texture/Icon/scw_lidong.png.meta
+svn rm Texture/Icon/scw_yueguit.png
+svn rm Texture/Icon/scw_yueguit.png.meta
+svn rm Texture/Icon/sy_chuisihaitang.png
+svn rm Texture/Icon/sy_chuisihaitang.png.meta
+svn rm Texture/Icon/sy_feifeicao.png
+svn rm Texture/Icon/sy_feifeicao.png.meta
+svn rm Texture/Icon/ts_chuisihaitang.png
+svn rm Texture/Icon/ts_chuisihaitang.png.meta
+svn rm Texture/Icon/ts_feifeicao.png
+svn rm Texture/Icon/ts_feifeicao.png.meta
+svn rm Texture/Icon/ts_lidong.png
+svn rm Texture/Icon/ts_lidong.png.meta
+svn rm Texture/Icon/ts_yueguit.png
+svn rm Texture/Icon/ts_yueguit.png.meta
+svn rm Texture/Icon/ts_yuezhongg.png
+svn rm Texture/Icon/ts_yuezhongg.png.meta
+svn rm Texture/Icon/tz_feifeicao.png
+svn rm Texture/Icon/tz_feifeicao.png.meta
+svn rm Texture/Icon/tz_guyu.png
+svn rm Texture/Icon/tz_guyu.png.meta
+svn rm Texture/Icon/tz_lidong.png
+svn rm Texture/Icon/tz_lidong.png.meta
+svn rm Texture/Icon/tz_yueguit.png
+svn rm Texture/Icon/tz_yueguit.png.meta
+svn rm Texture/Icon/wt_chuisihaitang.png
+svn rm Texture/Icon/wt_chuisihaitang.png.meta
+svn rm Texture/Icon/wt_feifeicao.png
+svn rm Texture/Icon/wt_feifeicao.png.meta
+svn rm Texture/Icon/wt_lidong.png
+svn rm Texture/Icon/wt_lidong.png.meta
+svn rm Texture/Icon/wt_yueguit.png
+svn rm Texture/Icon/wt_yueguit.png.meta
+svn rm Texture/Icon/xzh_chuisihaitang.png
+svn rm Texture/Icon/xzh_chuisihaitang.png.meta
+svn rm Texture/Icon/xzh_feifeicao.png
+svn rm Texture/Icon/xzh_feifeicao.png.meta
+svn rm Texture/Icon/xzh_yueguit.png
+svn rm Texture/Icon/xzh_yueguit.png.meta
+svn rm Texture/Icon/xz_chuisihaitang.png
+svn rm Texture/Icon/xz_chuisihaitang.png.meta
+svn rm Texture/Icon/xz_lidong.png
+svn rm Texture/Icon/xz_lidong.png.meta
+svn rm Texture/Icon/xz_liurushi.png
+svn rm Texture/Icon/xz_liurushi.png.meta
+svn rm Texture/Icon/xz_shengguang.png
+svn rm Texture/Icon/xz_shengguang.png.meta
+svn rm Texture/Icon/xz_yueguit.png
+svn rm Texture/Icon/xz_yueguit.png.meta
+svn rm Texture/Icon/zr_feifeicao.png
+svn rm Texture/Icon/zr_feifeicao.png.meta
+svn rm Texture/Icon/zr_lidong.png
+svn rm Texture/Icon/zr_lidong.png.meta
+svn rm Texture/DressUp/bs_jingzhongh.png
+svn rm Texture/DressUp/bs_jingzhongh.png.meta
+svn rm Texture/DressUp/bs_shuizhongy.png
+svn rm Texture/DressUp/bs_shuizhongy.png.meta
+svn rm Texture/DressUp/bs_wenyin.png
+svn rm Texture/DressUp/bs_wenyin.png.meta
+svn rm Texture/DressUp/dj_huayan.png
+svn rm Texture/DressUp/dj_huayan.png.meta
+svn rm Texture/DressUp/dj_huayan_t.png
+svn rm Texture/DressUp/dj_huayan_t.png.meta
+svn rm Texture/DressUp/dj_jiyuet.png
+svn rm Texture/DressUp/dj_jiyuet.png.meta
+svn rm Texture/DressUp/dj_jiyuet_t.png
+svn rm Texture/DressUp/dj_jiyuet_t.png.meta
+svn rm Texture/DressUp/dj_sanmiaoy.png
+svn rm Texture/DressUp/dj_sanmiaoy.png.meta
+svn rm Texture/DressUp/dj_sanmiaoy_t.png
+svn rm Texture/DressUp/dj_sanmiaoy_t.png.meta
+svn rm Texture/DressUp/dz_jinbix.png
+svn rm Texture/DressUp/dz_jinbix.png.meta
+svn rm Texture/DressUp/fx_lidong.png
+svn rm Texture/DressUp/fx_lidong.png.meta
+svn rm Texture/DressUp/fx_xuanhe_t.png
+svn rm Texture/DressUp/fx_xuanhe_t.png.meta
+svn rm Texture/DressUp/fx_yueguit.png
+svn rm Texture/DressUp/fx_yueguit.png.meta
+svn rm Texture/DressUp/fx_yueguit_t.png
+svn rm Texture/DressUp/fx_yueguit_t.png.meta
+svn rm Texture/DressUp/jioashi_bg.jpg
+svn rm Texture/DressUp/jioashi_bg.jpg.meta
+svn rm Texture/DressUp/js_yueguit.png
+svn rm Texture/DressUp/js_yueguit.png.meta
+svn rm Texture/DressUp/js_yueguit_t.png
+svn rm Texture/DressUp/js_yueguit_t.png.meta
+svn rm Texture/DressUp/lyq_dongzhi_t.png
+svn rm Texture/DressUp/lyq_dongzhi_t.png.meta
+svn rm Texture/DressUp/lyq_lidong.png
+svn rm Texture/DressUp/lyq_lidong.png.meta
+svn rm Texture/DressUp/lyq_lidong_t.png
+svn rm Texture/DressUp/lyq_lidong_t.png.meta
+svn rm Texture/DressUp/lyq_xuanhe_t.png
+svn rm Texture/DressUp/lyq_xuanhe_t.png.meta
+svn rm Texture/DressUp/lyq_yunhubl.png
+svn rm Texture/DressUp/lyq_yunhubl.png.meta
+svn rm Texture/DressUp/lyq_yunhubx.png
+svn rm Texture/DressUp/lyq_yunhubx.png.meta
+svn rm Texture/DressUp/lyq_yunhuby.png
+svn rm Texture/DressUp/lyq_yunhuby.png.meta
+svn rm Texture/DressUp/nd_yueguit.png
+svn rm Texture/DressUp/nd_yueguit.png.meta
+svn rm Texture/DressUp/nd_yueguit_t.png
+svn rm Texture/DressUp/nd_yueguit_t.png.meta
+svn rm Texture/DressUp/qt_dabai.png
+svn rm Texture/DressUp/qt_dabai.png.meta
+svn rm Texture/DressUp/qt_miaoe.png
+svn rm Texture/DressUp/qt_miaoe.png.meta
+svn rm Texture/DressUp/qt_qunxianh2.png
+svn rm Texture/DressUp/qt_qunxianh2.png.meta
+svn rm Texture/DressUp/qt_qunxianh_1.png
+svn rm Texture/DressUp/qt_qunxianh_1.png.meta
+svn rm Texture/DressUp/qt_qunxianh_1_t.png
+svn rm Texture/DressUp/qt_qunxianh_1_t.png.meta
+svn rm Texture/DressUp/qt_qunxianh_2.png
+svn rm Texture/DressUp/qt_qunxianh_2.png.meta
+svn rm Texture/DressUp/qt_qunxianh_3.png
+svn rm Texture/DressUp/qt_qunxianh_3.png.meta
+svn rm Texture/DressUp/scw_caozhangyf_t.png
+svn rm Texture/DressUp/scw_caozhangyf_t.png.meta
+svn rm Texture/DressUp/scw_lidong.png
+svn rm Texture/DressUp/scw_lidong.png.meta
+svn rm Texture/DressUp/scw_yueguit.png
+svn rm Texture/DressUp/scw_yueguit.png.meta
+svn rm Texture/DressUp/ts_lidong.png
+svn rm Texture/DressUp/ts_lidong.png.meta
+svn rm Texture/DressUp/ts_lidong_t.png
+svn rm Texture/DressUp/ts_lidong_t.png.meta
+svn rm Texture/DressUp/ts_yueguit.png
+svn rm Texture/DressUp/ts_yueguit.png.meta
+svn rm Texture/DressUp/ts_yuezhongg.png
+svn rm Texture/DressUp/ts_yuezhongg.png.meta
+svn rm Texture/DressUp/tz_bixie.png
+svn rm Texture/DressUp/tz_bixie.png.meta
+svn rm Texture/DressUp/tz_haitang.png
+svn rm Texture/DressUp/tz_haitang.png.meta
+svn rm Texture/DressUp/tz_xuanhe.png
+svn rm Texture/DressUp/tz_xuanhe.png.meta
+svn rm Texture/DressUp/wt_lidong.png
+svn rm Texture/DressUp/wt_lidong.png.meta
+svn rm Texture/DressUp/wt_lidong_t.png
+svn rm Texture/DressUp/wt_lidong_t.png.meta
+svn rm Texture/DressUp/wt_yueguit.png
+svn rm Texture/DressUp/wt_yueguit.png.meta
+svn rm Texture/DressUp/wt_yueguit_t.png
+svn rm Texture/DressUp/wt_yueguit_t.png.meta
+svn rm Texture/DressUp/xzh_yueguit.png
+svn rm Texture/DressUp/xzh_yueguit.png.meta
+svn rm Texture/DressUp/xz_guyu.png
+svn rm Texture/DressUp/xz_guyu.png.meta
+svn rm Texture/DressUp/xz_kunwux.png
+svn rm Texture/DressUp/xz_kunwux.png.meta
+svn rm Texture/DressUp/xz_lidong.png
+svn rm Texture/DressUp/xz_lidong.png.meta
+svn rm Texture/DressUp/xz_lidong_t.png
+svn rm Texture/DressUp/xz_lidong_t.png.meta
+svn rm Texture/DressUp/xz_yueguit.png
+svn rm Texture/DressUp/xz_yueguit.png.meta
+svn rm Texture/DressUp/zr_lidong.png
+svn rm Texture/DressUp/zr_lidong.png.meta
+svn rm Texture/DressUp/bs_jingzhongh.bytes
+svn rm Texture/DressUp/bs_jingzhongh.bytes.meta
+svn rm Texture/DressUp/bs_shuizhongy.bytes
+svn rm Texture/DressUp/bs_shuizhongy.bytes.meta
+svn rm Texture/DressUp/bs_wenyin.bytes
+svn rm Texture/DressUp/bs_wenyin.bytes.meta
+svn rm Texture/DressUp/dj_huayan.bytes
+svn rm Texture/DressUp/dj_huayan.bytes.meta
+svn rm Texture/DressUp/dj_huayan_t.bytes
+svn rm Texture/DressUp/dj_huayan_t.bytes.meta
+svn rm Texture/DressUp/dj_jiyuet.bytes
+svn rm Texture/DressUp/dj_jiyuet.bytes.meta
+svn rm Texture/DressUp/dj_jiyuet_t.bytes
+svn rm Texture/DressUp/dj_jiyuet_t.bytes.meta
+svn rm Texture/DressUp/dj_sanmiaoy.bytes
+svn rm Texture/DressUp/dj_sanmiaoy.bytes.meta
+svn rm Texture/DressUp/dj_sanmiaoy_t.bytes
+svn rm Texture/DressUp/dj_sanmiaoy_t.bytes.meta
+svn rm Texture/DressUp/dz_jinbix.bytes
+svn rm Texture/DressUp/dz_jinbix.bytes.meta
+svn rm Texture/DressUp/fx_lidong.bytes
+svn rm Texture/DressUp/fx_lidong.bytes.meta
+svn rm Texture/DressUp/fx_xuanhe_t.bytes
+svn rm Texture/DressUp/fx_xuanhe_t.bytes.meta
+svn rm Texture/DressUp/fx_yueguit.bytes
+svn rm Texture/DressUp/fx_yueguit.bytes.meta
+svn rm Texture/DressUp/fx_yueguit_t.bytes
+svn rm Texture/DressUp/fx_yueguit_t.bytes.meta
+svn rm Texture/DressUp/js_yueguit.bytes
+svn rm Texture/DressUp/js_yueguit.bytes.meta
+svn rm Texture/DressUp/js_yueguit_t.bytes
+svn rm Texture/DressUp/js_yueguit_t.bytes.meta
+svn rm Texture/DressUp/lyq_dongzhi_t.bytes
+svn rm Texture/DressUp/lyq_dongzhi_t.bytes.meta
+svn rm Texture/DressUp/lyq_lidong.bytes
+svn rm Texture/DressUp/lyq_lidong.bytes.meta
+svn rm Texture/DressUp/lyq_lidong_t.bytes
+svn rm Texture/DressUp/lyq_lidong_t.bytes.meta
+svn rm Texture/DressUp/lyq_xuanhe_t.bytes
+svn rm Texture/DressUp/lyq_xuanhe_t.bytes.meta
+svn rm Texture/DressUp/lyq_yunhubl.bytes
+svn rm Texture/DressUp/lyq_yunhubl.bytes.meta
+svn rm Texture/DressUp/lyq_yunhubx.bytes
+svn rm Texture/DressUp/lyq_yunhubx.bytes.meta
+svn rm Texture/DressUp/lyq_yunhuby.bytes
+svn rm Texture/DressUp/lyq_yunhuby.bytes.meta
+svn rm Texture/DressUp/nd_yueguit.bytes
+svn rm Texture/DressUp/nd_yueguit.bytes.meta
+svn rm Texture/DressUp/nd_yueguit_t.bytes
+svn rm Texture/DressUp/nd_yueguit_t.bytes.meta
+svn rm Texture/DressUp/qt_dabai.bytes
+svn rm Texture/DressUp/qt_dabai.bytes.meta
+svn rm Texture/DressUp/qt_miaoe.bytes
+svn rm Texture/DressUp/qt_miaoe.bytes.meta
+svn rm Texture/DressUp/qt_qunxianh2.bytes
+svn rm Texture/DressUp/qt_qunxianh2.bytes.meta
+svn rm Texture/DressUp/qt_qunxianh_1.bytes
+svn rm Texture/DressUp/qt_qunxianh_1.bytes.meta
+svn rm Texture/DressUp/qt_qunxianh_1_t.bytes
+svn rm Texture/DressUp/qt_qunxianh_1_t.bytes.meta
+svn rm Texture/DressUp/qt_qunxianh_2.bytes
+svn rm Texture/DressUp/qt_qunxianh_2.bytes.meta
+svn rm Texture/DressUp/qt_qunxianh_3.bytes
+svn rm Texture/DressUp/qt_qunxianh_3.bytes.meta
+svn rm Texture/DressUp/scw_caozhangyf_t.bytes
+svn rm Texture/DressUp/scw_caozhangyf_t.bytes.meta
+svn rm Texture/DressUp/scw_lidong.bytes
+svn rm Texture/DressUp/scw_lidong.bytes.meta
+svn rm Texture/DressUp/scw_yueguit.bytes
+svn rm Texture/DressUp/scw_yueguit.bytes.meta
+svn rm Texture/DressUp/ts_lidong.bytes
+svn rm Texture/DressUp/ts_lidong.bytes.meta
+svn rm Texture/DressUp/ts_lidong_t.bytes
+svn rm Texture/DressUp/ts_lidong_t.bytes.meta
+svn rm Texture/DressUp/ts_yueguit.bytes
+svn rm Texture/DressUp/ts_yueguit.bytes.meta
+svn rm Texture/DressUp/ts_yuezhongg.bytes
+svn rm Texture/DressUp/ts_yuezhongg.bytes.meta
+svn rm Texture/DressUp/tz_bixie.bytes
+svn rm Texture/DressUp/tz_bixie.bytes.meta
+svn rm Texture/DressUp/tz_haitang.bytes
+svn rm Texture/DressUp/tz_haitang.bytes.meta
+svn rm Texture/DressUp/tz_xuanhe.bytes
+svn rm Texture/DressUp/tz_xuanhe.bytes.meta
+svn rm Texture/DressUp/wt_lidong.bytes
+svn rm Texture/DressUp/wt_lidong.bytes.meta
+svn rm Texture/DressUp/wt_lidong_t.bytes
+svn rm Texture/DressUp/wt_lidong_t.bytes.meta
+svn rm Texture/DressUp/wt_yueguit.bytes
+svn rm Texture/DressUp/wt_yueguit.bytes.meta
+svn rm Texture/DressUp/wt_yueguit_t.bytes
+svn rm Texture/DressUp/wt_yueguit_t.bytes.meta
+svn rm Texture/DressUp/xzh_yueguit.bytes
+svn rm Texture/DressUp/xzh_yueguit.bytes.meta
+svn rm Texture/DressUp/xz_guyu.bytes
+svn rm Texture/DressUp/xz_guyu.bytes.meta
+svn rm Texture/DressUp/xz_kunwux.bytes
+svn rm Texture/DressUp/xz_kunwux.bytes.meta
+svn rm Texture/DressUp/xz_lidong.bytes
+svn rm Texture/DressUp/xz_lidong.bytes.meta
+svn rm Texture/DressUp/xz_lidong_t.bytes
+svn rm Texture/DressUp/xz_lidong_t.bytes.meta
+svn rm Texture/DressUp/xz_yueguit.bytes
+svn rm Texture/DressUp/xz_yueguit.bytes.meta
+svn rm Texture/DressUp/zr_lidong.bytes
+svn rm Texture/DressUp/zr_lidong.bytes.meta
+svn rm Texture/Card/Bg/kp_caiwei.jpg
+svn rm Texture/Card/Bg/kp_caiwei.jpg.meta
+svn rm Texture/Card/Bg/kp_feiying.jpg
+svn rm Texture/Card/Bg/kp_feiying.jpg.meta
+svn rm Texture/Card/Bg/kp_gongnv.jpg
+svn rm Texture/Card/Bg/kp_gongnv.jpg.meta
+svn rm Texture/Card/Bg/kp_jinbixie.jpg
+svn rm Texture/Card/Bg/kp_jinbixie.jpg.meta
+svn rm Texture/Card/Bg/kp_lanhua.jpg
+svn rm Texture/Card/Bg/kp_lanhua.jpg.meta
+svn rm Texture/Card/Bg/kp_lanshan.jpg
+svn rm Texture/Card/Bg/kp_lanshan.jpg.meta
+svn rm Texture/Card/Bg/kp_mudan.jpg
+svn rm Texture/Card/Bg/kp_mudan.jpg.meta
+svn rm Texture/Card/Bg/kp_riyue.jpg
+svn rm Texture/Card/Bg/kp_riyue.jpg.meta
+svn rm Texture/Card/Bg/kp_shiwei.jpg
+svn rm Texture/Card/Bg/kp_shiwei.jpg.meta
+svn rm Texture/Card/Bg/kp_xiake.jpg
+svn rm Texture/Card/Bg/kp_xiake.jpg.meta
+svn rm Texture/Card/Bg/kp_xingcijing.jpg
+svn rm Texture/Card/Bg/kp_xingcijing.jpg.meta
+svn rm Texture/Card/Bg/kp_youyuan.jpg
+svn rm Texture/Card/Bg/kp_youyuan.jpg.meta
+svn rm Texture/Card/Bg/kp_zuochi1.jpg
+svn rm Texture/Card/Bg/kp_zuochi1.jpg.meta
+svn rm Texture/Card/Bg/kp_zuochi2.jpg
+svn rm Texture/Card/Bg/kp_zuochi2.jpg.meta
+svn rm Texture/Card/Card/kp_caiwei.jpg
+svn rm Texture/Card/Card/kp_caiwei.jpg.meta
+svn rm Texture/Card/Card/kp_feiying.jpg
+svn rm Texture/Card/Card/kp_feiying.jpg.meta
+svn rm Texture/Card/Card/kp_gongnv.jpg
+svn rm Texture/Card/Card/kp_gongnv.jpg.meta
+svn rm Texture/Card/Card/kp_jinbixie.jpg
+svn rm Texture/Card/Card/kp_jinbixie.jpg.meta
+svn rm Texture/Card/Card/kp_lanhua.jpg
+svn rm Texture/Card/Card/kp_lanhua.jpg.meta
+svn rm Texture/Card/Card/kp_lanshan.jpg
+svn rm Texture/Card/Card/kp_lanshan.jpg.meta
+svn rm Texture/Card/Card/kp_mudan.jpg
+svn rm Texture/Card/Card/kp_mudan.jpg.meta
+svn rm Texture/Card/Card/kp_riyue.jpg
+svn rm Texture/Card/Card/kp_riyue.jpg.meta
+svn rm Texture/Card/Card/kp_shiwei.jpg
+svn rm Texture/Card/Card/kp_shiwei.jpg.meta
+svn rm Texture/Card/Card/kp_xiake.jpg
+svn rm Texture/Card/Card/kp_xiake.jpg.meta
+svn rm Texture/Card/Card/kp_xingcijing.jpg
+svn rm Texture/Card/Card/kp_xingcijing.jpg.meta
+svn rm Texture/Card/Card/kp_youyuan.jpg
+svn rm Texture/Card/Card/kp_youyuan.jpg.meta
+svn rm Texture/Card/Card/kp_youyuan1.jpg
+svn rm Texture/Card/Card/kp_youyuan1.jpg.meta
+svn rm Texture/Card/Card/kp_zuochi1.jpg
+svn rm Texture/Card/Card/kp_zuochi1.jpg.meta
+svn rm Texture/Card/Card/kp_zuochi2.jpg
+svn rm Texture/Card/Card/kp_zuochi2.jpg.meta
+svn rm Texture/BgImg/cj_bj_2.png
+svn rm Texture/BgImg/cj_bj_2.png.meta
+svn rm Texture/BgImg/cj_bj_5.jpg
+svn rm Texture/BgImg/cj_bj_5.jpg.meta
+svn rm Texture/Travel/Role/bolangg.png
+svn rm Texture/Travel/Role/bolangg.png.meta
+svn rm Texture/Travel/Role/boshanl.png
+svn rm Texture/Travel/Role/boshanl.png.meta
+svn rm Texture/Travel/Role/changxi.png
+svn rm Texture/Travel/Role/changxi.png.meta
+svn rm Texture/Travel/Role/chuisiht.png
+svn rm Texture/Travel/Role/chuisiht.png.meta
+svn rm Texture/Travel/Role/damengdh.png
+svn rm Texture/Travel/Role/damengdh.png.meta
+svn rm Texture/Travel/Role/guosetx.png
+svn rm Texture/Travel/Role/guosetx.png.meta
+svn rm Texture/Travel/Role/jiaojiao.png
+svn rm Texture/Travel/Role/jiaojiao.png.meta
+svn rm Texture/Travel/Role/jiyuet.png
+svn rm Texture/Travel/Role/jiyuet.png.meta
+svn rm Texture/Travel/Role/qt_xiaohant.png
+svn rm Texture/Travel/Role/qt_xiaohant.png.meta
+svn rm Texture/Travel/Role/xihe.png
+svn rm Texture/Travel/Role/xihe.png.meta
+svn rm Texture/Travel/Role/yuexiazy.png
+svn rm Texture/Travel/Role/yuexiazy.png.meta
+svn rm Texture/Travel/Role/yunjingzh.png
+svn rm Texture/Travel/Role/yunjingzh.png.meta
+svn rm Texture/Travel/Role/yuxiang.png
+svn rm Texture/Travel/Role/yuxiang.png.meta
+svn rm Texture/Head/Head/grxx_123.png
+svn rm Texture/Head/Head/grxx_123.png.meta
+svn rm Texture/Head/HeadBorder/grxx_xtkk_3.png
+svn rm Texture/Head/HeadBorder/grxx_xtkk_3.png.meta
+pause

+ 7 - 0
GameClient/Assets/Editor/Bat/removeFiles.bat.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d0bac39fce4618c4d9dfda209dc44a9e
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -147,6 +147,7 @@ namespace GFGEditor
         static void CommitProject()
         {
             EditorUtility.DisplayProgressBar("进度", "正在提交项目", 1);
+            DeleteFileHelper.CommitDeleteFile();
             ProcessUtil.ExcuteBat("Assets/Editor/Bat/", "commitGame.bat");
             EditorUtility.ClearProgressBar();
         }
@@ -278,8 +279,8 @@ namespace GFGEditor
 
             FileUtil.DeleteUnnecessaryImage(ImportArtResTool.TextureTargetPath, new string[] { ImportArtResTool.EffectTextureMd5FileSaveName });
 
+            DeleteFileHelper.CommitDeleteFile();
             EditorUtility.ClearProgressBar();
-
         }
 
         [MenuItem("Tools/List Player Assemblies in Console")]

+ 17 - 13
GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -5,20 +5,24 @@ namespace GFGGame
         public const string RESIN_TXT_DIR_PATH = "Assets/ResIn/Txt";
 
         public const string FONT_DIR_PATH = "Assets/ResIn/Font";
-        public const string MUSIC_DIR_PATH = "Assets/Res/Music";
-        public const string SOUND_DIR_PATH = "Assets/Res/Sound";
-        public const string UI_DIR_PATH = "Assets/ResIn/UI";
-        public const string TEXTURE_DIR_PATH = "Assets/Res/Texture";
-        public const string PREFAB_DIR_PATH = "Assets/ResIn/Prefab";
-        public const string TEXTURE_FIGHT_DIR_PATH = "Assets/ResIn/Fight";
-        public const string CONFIG_DIR_PATH = "Assets/ResIn/Config";
-        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 static readonly string UI_DIR_PATH = "Assets/ResIn/UI";
+        public static readonly string PREFAB_DIR_PATH = "Assets/ResIn/Prefab";
+        public static readonly string TEXTURE_FIGHT_DIR_PATH = "Assets/ResIn/Fight";
+        public static readonly string CONFIG_DIR_PATH = "Assets/ResIn/Config";
 
-        public const string SQLITE_FILE_PATH = CONFIG_DIR_PATH + "/" + LauncherConfig.SQL_FILE_NAME;
+
+        public const string RES_ROOT_DIR_PATH = "Assets/Res";
+
+        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 TEXTURE_DIR_PATH = $"{RES_ROOT_DIR_PATH}/Texture";
+        public static readonly string ANIMATION_DIR_PATH = $"{RES_ROOT_DIR_PATH}/Animation";
+        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 Texture_DIR_PATH = $"{RES_ROOT_DIR_PATH}/Texture";
+
+        public  static readonly string SQLITE_FILE_PATH = CONFIG_DIR_PATH + "/" + LauncherConfig.SQL_FILE_NAME;
 
         public static string GetUIPackagePath(string res)
         {