|
@@ -32,7 +32,6 @@ namespace GFGEditor
|
|
[MenuItem("外网DEV/")]
|
|
[MenuItem("外网DEV/")]
|
|
public static void VersionTag()
|
|
public static void VersionTag()
|
|
{
|
|
{
|
|
-
|
|
|
|
}
|
|
}
|
|
#elif PT_DouYouDev
|
|
#elif PT_DouYouDev
|
|
[MenuItem("PT_DouYouDev/")]
|
|
[MenuItem("PT_DouYouDev/")]
|
|
@@ -59,12 +58,13 @@ namespace GFGEditor
|
|
|
|
|
|
}
|
|
}
|
|
#else
|
|
#else
|
|
-
|
|
|
|
[MenuItem("内网/")]
|
|
[MenuItem("内网/")]
|
|
public static void VersionTag()
|
|
public static void VersionTag()
|
|
{
|
|
{
|
|
|
|
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+#endif
|
|
[MenuItem("策划/更新并导入所有", false, (int)TOOL_MENU_PRIORITY.UpdateAndImportAll)]
|
|
[MenuItem("策划/更新并导入所有", false, (int)TOOL_MENU_PRIORITY.UpdateAndImportAll)]
|
|
static void UpdateAndImportAll()
|
|
static void UpdateAndImportAll()
|
|
{
|
|
{
|
|
@@ -146,7 +146,6 @@ namespace GFGEditor
|
|
{
|
|
{
|
|
DeleteUnnecessaryImage();
|
|
DeleteUnnecessaryImage();
|
|
}
|
|
}
|
|
-#endif
|
|
|
|
|
|
|
|
private static void UpdateProjectRes()
|
|
private static void UpdateProjectRes()
|
|
{
|
|
{
|
|
@@ -169,6 +168,7 @@ namespace GFGEditor
|
|
{
|
|
{
|
|
ProcessUtil.ExcuteBat("Assets/Editor/Bat/", "updateArtRes.bat", ImportArtResTool.ResRootDirNameDressUp);
|
|
ProcessUtil.ExcuteBat("Assets/Editor/Bat/", "updateArtRes.bat", ImportArtResTool.ResRootDirNameDressUp);
|
|
}
|
|
}
|
|
|
|
+
|
|
EditorUtility.ClearProgressBar();
|
|
EditorUtility.ClearProgressBar();
|
|
}
|
|
}
|
|
|
|
|
|
@@ -186,16 +186,25 @@ namespace GFGEditor
|
|
ProcessUtil.ExcuteBat("Assets/Editor/Bat/", "commitBundles.bat");
|
|
ProcessUtil.ExcuteBat("Assets/Editor/Bat/", "commitBundles.bat");
|
|
EditorUtility.ClearProgressBar();
|
|
EditorUtility.ClearProgressBar();
|
|
}
|
|
}
|
|
|
|
+
|
|
public static void ImportArtRes()
|
|
public static void ImportArtRes()
|
|
{
|
|
{
|
|
EditorUtility.DisplayProgressBar("进度", "正在导入美术资源", 1);
|
|
EditorUtility.DisplayProgressBar("进度", "正在导入美术资源", 1);
|
|
ImportArtResTool.Import();
|
|
ImportArtResTool.Import();
|
|
EditorUtility.ClearProgressBar();
|
|
EditorUtility.ClearProgressBar();
|
|
}
|
|
}
|
|
|
|
+
|
|
public static void ImportExcel()
|
|
public static void ImportExcel()
|
|
{
|
|
{
|
|
Log.ILog = new UnityLogger();
|
|
Log.ILog = new UnityLogger();
|
|
ET.Options.Instance = new ET.Options();
|
|
ET.Options.Instance = new ET.Options();
|
|
|
|
+ //清除缓存
|
|
|
|
+
|
|
|
|
+ if (File.Exists(ExcelConfig.excelsCacheFolderPath))
|
|
|
|
+ {
|
|
|
|
+ File.Delete(ExcelConfig.excelsCacheFolderPath);
|
|
|
|
+ }
|
|
|
|
+
|
|
EditorUtility.DisplayProgressBar("进度", "正在导入表格", 1);
|
|
EditorUtility.DisplayProgressBar("进度", "正在导入表格", 1);
|
|
SqliteController.Instance.Init(false, null);
|
|
SqliteController.Instance.Init(false, null);
|
|
SQLiteHelper.Instance.OpenConnection();
|
|
SQLiteHelper.Instance.OpenConnection();
|
|
@@ -209,6 +218,7 @@ namespace GFGEditor
|
|
{
|
|
{
|
|
Directory.CreateDirectory(ExcelConfig.configCodePath);
|
|
Directory.CreateDirectory(ExcelConfig.configCodePath);
|
|
}
|
|
}
|
|
|
|
+
|
|
if (!Directory.Exists(ExcelConfig.configArrayCodePath))
|
|
if (!Directory.Exists(ExcelConfig.configArrayCodePath))
|
|
{
|
|
{
|
|
Directory.CreateDirectory(ExcelConfig.configArrayCodePath);
|
|
Directory.CreateDirectory(ExcelConfig.configArrayCodePath);
|
|
@@ -231,6 +241,7 @@ namespace GFGEditor
|
|
EditorUtility.ClearProgressBar();
|
|
EditorUtility.ClearProgressBar();
|
|
SQLiteHelper.Instance.CloseConnection();
|
|
SQLiteHelper.Instance.CloseConnection();
|
|
}
|
|
}
|
|
|
|
+
|
|
static void UpdateAndImportArtRes()
|
|
static void UpdateAndImportArtRes()
|
|
{
|
|
{
|
|
UpdateArtRes();
|
|
UpdateArtRes();
|
|
@@ -239,7 +250,6 @@ namespace GFGEditor
|
|
|
|
|
|
static void UpdateAndImportExcel()
|
|
static void UpdateAndImportExcel()
|
|
{
|
|
{
|
|
-
|
|
|
|
UpdateExcel();
|
|
UpdateExcel();
|
|
ImportExcel();
|
|
ImportExcel();
|
|
}
|
|
}
|
|
@@ -249,6 +259,7 @@ namespace GFGEditor
|
|
{
|
|
{
|
|
ImportArtResTool.Test();
|
|
ImportArtResTool.Test();
|
|
}
|
|
}
|
|
|
|
+
|
|
[MenuItem("Tools/ImageClip/ReadImagePosition")]
|
|
[MenuItem("Tools/ImageClip/ReadImagePosition")]
|
|
public static void ReadImagePosition()
|
|
public static void ReadImagePosition()
|
|
{
|
|
{
|
|
@@ -266,51 +277,77 @@ namespace GFGEditor
|
|
{
|
|
{
|
|
EditorUtility.DisplayProgressBar("进度", "开始清除资源", 1);
|
|
EditorUtility.DisplayProgressBar("进度", "开始清除资源", 1);
|
|
|
|
|
|
- FileUtil.DeleteUnnecessaryImage(ImportArtResTool.FieldGuideIconTargetPath, new string[] { ImportArtResTool.FieldGuideIconMd5FileSaveName });
|
|
|
|
- FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ChapterGuideIconTargetPath, new string[] { ImportArtResTool.ChapterGuideIconMd5FileSaveName });
|
|
|
|
|
|
+ FileUtil.DeleteUnnecessaryImage(ImportArtResTool.FieldGuideIconTargetPath,
|
|
|
|
+ new string[] { ImportArtResTool.FieldGuideIconMd5FileSaveName });
|
|
|
|
+ FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ChapterGuideIconTargetPath,
|
|
|
|
+ new string[] { ImportArtResTool.ChapterGuideIconMd5FileSaveName });
|
|
|
|
|
|
- FileUtil.DeleteUnnecessaryImage(ImportArtResTool.MusicTargetPath, new string[] { ImportArtResTool.MusicMd5FileSaveName });
|
|
|
|
|
|
+ FileUtil.DeleteUnnecessaryImage(ImportArtResTool.MusicTargetPath,
|
|
|
|
+ new string[] { ImportArtResTool.MusicMd5FileSaveName });
|
|
|
|
|
|
- FileUtil.DeleteUnnecessaryImage(ImportArtResTool.CardMusicTargetPath, new string[] { ImportArtResTool.CardMusicMd5FileSaveName });
|
|
|
|
|
|
+ FileUtil.DeleteUnnecessaryImage(ImportArtResTool.CardMusicTargetPath,
|
|
|
|
+ new string[] { ImportArtResTool.CardMusicMd5FileSaveName });
|
|
|
|
|
|
- FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ItemIconTargetPath, new string[] { ImportArtResTool.IconMd5FileSaveName });
|
|
|
|
|
|
+ FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ItemIconTargetPath,
|
|
|
|
+ new string[] { ImportArtResTool.IconMd5FileSaveName });
|
|
|
|
|
|
- FileUtil.DeleteUnnecessaryImage(ImportArtResTool.DressUpTargetPath, new string[] { ImportArtResTool.BgMd5FileSaveName, ImportArtResTool.DressUpMd5FileSaveName });
|
|
|
|
|
|
+ FileUtil.DeleteUnnecessaryImage(ImportArtResTool.DressUpTargetPath,
|
|
|
|
+ new string[] { ImportArtResTool.BgMd5FileSaveName, ImportArtResTool.DressUpMd5FileSaveName });
|
|
|
|
|
|
- FileUtil.DeleteUnnecessaryImage(ImportArtResTool.NpcHeadTargetPath, new string[] { ImportArtResTool.NPCHeadMd5FileSaveName });
|
|
|
|
|
|
+ FileUtil.DeleteUnnecessaryImage(ImportArtResTool.NpcHeadTargetPath,
|
|
|
|
+ new string[] { ImportArtResTool.NPCHeadMd5FileSaveName });
|
|
|
|
|
|
- FileUtil.DeleteUnnecessaryImage(ImportArtResTool.NpcPicTargetPath, new string[] { ImportArtResTool.PicFMd5FileSaveName });
|
|
|
|
|
|
+ FileUtil.DeleteUnnecessaryImage(ImportArtResTool.NpcPicTargetPath,
|
|
|
|
+ new string[] { ImportArtResTool.PicFMd5FileSaveName });
|
|
|
|
|
|
- FileUtil.DeleteUnnecessaryImage(ImportArtResTool.NpcPicSTargetPath, new string[] { ImportArtResTool.PicSMd5FileSaveName });
|
|
|
|
|
|
+ FileUtil.DeleteUnnecessaryImage(ImportArtResTool.NpcPicSTargetPath,
|
|
|
|
+ new string[] { ImportArtResTool.PicSMd5FileSaveName });
|
|
|
|
|
|
- FileUtil.DeleteUnnecessaryImage(ImportArtResTool.CardBgTargetPath, new string[] { ImportArtResTool.CardBgMd5FileSaveName });
|
|
|
|
|
|
+ FileUtil.DeleteUnnecessaryImage(ImportArtResTool.CardBgTargetPath,
|
|
|
|
+ new string[] { ImportArtResTool.CardBgMd5FileSaveName });
|
|
|
|
|
|
- FileUtil.DeleteUnnecessaryImage(ImportArtResTool.CardIconTargetPath, new string[] { ImportArtResTool.CardMd5FileSaveName });
|
|
|
|
- FileUtil.DeleteUnnecessaryImage(ImportArtResTool.CardSkillTargetPath, new string[] { ImportArtResTool.CardSkillMd5FileSaveName });
|
|
|
|
|
|
+ FileUtil.DeleteUnnecessaryImage(ImportArtResTool.CardIconTargetPath,
|
|
|
|
+ new string[] { ImportArtResTool.CardMd5FileSaveName });
|
|
|
|
+ FileUtil.DeleteUnnecessaryImage(ImportArtResTool.CardSkillTargetPath,
|
|
|
|
+ new string[] { ImportArtResTool.CardSkillMd5FileSaveName });
|
|
|
|
|
|
- FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ActivityTargetPath, new string[] { ImportArtResTool.ActivityMd5FileSaveName });
|
|
|
|
- FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ActivityShow1TargetPath, new string[] { ImportArtResTool.ActivityShow1Md5FileSaveName });
|
|
|
|
|
|
+ FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ActivityTargetPath,
|
|
|
|
+ new string[] { ImportArtResTool.ActivityMd5FileSaveName });
|
|
|
|
+ FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ActivityShow1TargetPath,
|
|
|
|
+ new string[] { ImportArtResTool.ActivityShow1Md5FileSaveName });
|
|
|
|
|
|
- FileUtil.DeleteUnnecessaryImage(ImportArtResTool.PhotoGraphBorderTargetPath, new string[] { ImportArtResTool.PhotoGraphBorderMd5FileSaveName });
|
|
|
|
|
|
+ FileUtil.DeleteUnnecessaryImage(ImportArtResTool.PhotoGraphBorderTargetPath,
|
|
|
|
+ new string[] { ImportArtResTool.PhotoGraphBorderMd5FileSaveName });
|
|
|
|
|
|
- FileUtil.DeleteUnnecessaryImage(ImportArtResTool.UIBgTargetPath, new string[] { ImportArtResTool.UIBgMd5FileSaveName });
|
|
|
|
- FileUtil.DeleteUnnecessaryImage(ImportArtResTool.TravelBgTargetPath, new string[] { ImportArtResTool.TravelBgMd5FileSaveName });
|
|
|
|
- FileUtil.DeleteUnnecessaryImage(ImportArtResTool.TravelRoleTargetPath, new string[] { ImportArtResTool.TravelRoleMd5FileSaveName });
|
|
|
|
- FileUtil.DeleteUnnecessaryImage(ImportArtResTool.HeadTargetPath, new string[] { ImportArtResTool.HeadMd5FileSaveName });
|
|
|
|
- FileUtil.DeleteUnnecessaryImage(ImportArtResTool.HeadBorderTargetPath, new string[] { ImportArtResTool.HeadBorderMd5FileSaveName });
|
|
|
|
- FileUtil.DeleteUnnecessaryImage(ImportArtResTool.LeagueIconTargetPath, new string[] { ImportArtResTool.LeagueIconMd5FileSaveName });
|
|
|
|
|
|
+ FileUtil.DeleteUnnecessaryImage(ImportArtResTool.UIBgTargetPath,
|
|
|
|
+ new string[] { ImportArtResTool.UIBgMd5FileSaveName });
|
|
|
|
+ FileUtil.DeleteUnnecessaryImage(ImportArtResTool.TravelBgTargetPath,
|
|
|
|
+ new string[] { ImportArtResTool.TravelBgMd5FileSaveName });
|
|
|
|
+ FileUtil.DeleteUnnecessaryImage(ImportArtResTool.TravelRoleTargetPath,
|
|
|
|
+ new string[] { ImportArtResTool.TravelRoleMd5FileSaveName });
|
|
|
|
+ FileUtil.DeleteUnnecessaryImage(ImportArtResTool.HeadTargetPath,
|
|
|
|
+ new string[] { ImportArtResTool.HeadMd5FileSaveName });
|
|
|
|
+ FileUtil.DeleteUnnecessaryImage(ImportArtResTool.HeadBorderTargetPath,
|
|
|
|
+ new string[] { ImportArtResTool.HeadBorderMd5FileSaveName });
|
|
|
|
+ FileUtil.DeleteUnnecessaryImage(ImportArtResTool.LeagueIconTargetPath,
|
|
|
|
+ new string[] { ImportArtResTool.LeagueIconMd5FileSaveName });
|
|
|
|
|
|
- FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ActivityShow2TargetPath, new string[] { ImportArtResTool.ActivityShow2Md5FileSaveName });
|
|
|
|
|
|
+ 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.MaterialTargetPath,
|
|
|
|
+ new string[] { ImportArtResTool.EffectMaterialMd5FileSaveName });
|
|
|
|
+ FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ShaderTargetPath,
|
|
|
|
+ new string[] { ImportArtResTool.ShaderMd5FileSaveName });
|
|
// FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ModelTargetPath, new string[] { ImportArtResTool.ModelTargetPath });
|
|
// FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ModelTargetPath, new string[] { ImportArtResTool.ModelTargetPath });
|
|
|
|
|
|
- FileUtil.DeleteUnnecessaryImage(ImportArtResTool.TextureTargetPath, new string[] { ImportArtResTool.EffectTextureMd5FileSaveName });
|
|
|
|
|
|
+ FileUtil.DeleteUnnecessaryImage(ImportArtResTool.TextureTargetPath,
|
|
|
|
+ new string[] { ImportArtResTool.EffectTextureMd5FileSaveName });
|
|
|
|
+
|
|
|
|
+ FileUtil.DeleteUnnecessaryImage(ImportArtResTool.LuckyBoxTitleImgTargetPath,
|
|
|
|
+ new string[] { ImportArtResTool.LuckyBoxTitleImgMd5FileSaveName });
|
|
|
|
|
|
- FileUtil.DeleteUnnecessaryImage(ImportArtResTool.LuckyBoxTitleImgTargetPath, new string[] { ImportArtResTool.LuckyBoxTitleImgMd5FileSaveName });
|
|
|
|
|
|
|
|
-
|
|
|
|
DeleteFileHelper.TrySvnRemoveDeleteFile();
|
|
DeleteFileHelper.TrySvnRemoveDeleteFile();
|
|
EditorUtility.ClearProgressBar();
|
|
EditorUtility.ClearProgressBar();
|
|
}
|
|
}
|