From d2d6d2ad14ecb6b02aedec630ff83fdd6c98b61a Mon Sep 17 00:00:00 2001
From: hevinci <hevinci@hotmail.com>
Date: Sat, 9 Apr 2022 12:02:02 +0800
Subject: [PATCH] Update AssetBundleGrouper
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

优化了资源分组配置保存策略
---
 .../AssetBundleGrouperSettingData.cs          | 39 ++++++++++++-------
 .../AssetBundleGrouperWindow.cs               |  9 ++++-
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/Assets/YooAsset/Editor/AssetBundleGrouper/AssetBundleGrouperSettingData.cs b/Assets/YooAsset/Editor/AssetBundleGrouper/AssetBundleGrouperSettingData.cs
index a367ff9..43c8ca5 100644
--- a/Assets/YooAsset/Editor/AssetBundleGrouper/AssetBundleGrouperSettingData.cs
+++ b/Assets/YooAsset/Editor/AssetBundleGrouper/AssetBundleGrouperSettingData.cs
@@ -14,6 +14,11 @@ namespace YooAsset.Editor
 		private static readonly Dictionary<string, System.Type> _cacheFilterRuleTypes = new Dictionary<string, System.Type>();
 		private static readonly Dictionary<string, IFilterRule> _cacheFilterRuleInstance = new Dictionary<string, IFilterRule>();
 
+		/// <summary>
+		/// 配置数据是否被修改
+		/// </summary>
+		public static bool IsDirty { private set; get; } = false;
+
 
 		private static AssetBundleGrouperSetting _setting = null;
 		public static AssetBundleGrouperSetting Setting
@@ -147,8 +152,10 @@ namespace YooAsset.Editor
 		{
 			if (Setting != null)
 			{
+				IsDirty = false;
 				EditorUtility.SetDirty(Setting);
 				AssetDatabase.SaveAssets();
+				Debug.Log($"{nameof(AssetBundleGrouperSetting)}.asset is saved!");
 			}
 		}
 
@@ -202,42 +209,42 @@ namespace YooAsset.Editor
 		// 着色器编辑相关
 		public static void ModifyShader(bool isCollectAllShaders, string shadersBundleName)
 		{
-			if (string.IsNullOrEmpty(shadersBundleName))
-				return;
 			Setting.AutoCollectShaders = isCollectAllShaders;
 			Setting.ShadersBundleName = shadersBundleName;
-			SaveFile();
+			IsDirty = true;
 		}
 
 		// 资源分组编辑相关
-		public static void CreateGrouper(string grouperName, string grouperDesc, string assetTags, bool saveFile = true)
+		public static void CreateGrouper(string grouperName, string grouperDesc, string assetTags)
 		{
 			AssetBundleGrouper grouper = new AssetBundleGrouper();
 			grouper.GrouperName = grouperName;
 			grouper.GrouperDesc = grouperDesc;
 			grouper.AssetTags = assetTags;
 			Setting.Groupers.Add(grouper);
-
-			if (saveFile)
-				SaveFile();
+			IsDirty = true;
 		}
 		public static void RemoveGrouper(AssetBundleGrouper grouper)
 		{
 			if (Setting.Groupers.Remove(grouper))
 			{
-				SaveFile();
+				IsDirty = true;
+			}
+			else
+			{
+				Debug.LogWarning($"Failed remove grouper : {grouper.GrouperName}");
 			}
 		}
 		public static void ModifyGrouper(AssetBundleGrouper grouper)
 		{
 			if (grouper != null)
 			{
-				SaveFile();
+				IsDirty = true;
 			}
 		}
 
 		// 资源收集器编辑相关
-		public static void CreateCollector(AssetBundleGrouper grouper, string collectPath, string packRuleName, string filterRuleName, bool notWriteToAssetList, bool saveFile = true)
+		public static void CreateCollector(AssetBundleGrouper grouper, string collectPath, string packRuleName, string filterRuleName, bool notWriteToAssetList)
 		{
 			AssetBundleCollector collector = new AssetBundleCollector();
 			collector.CollectPath = collectPath;
@@ -245,22 +252,24 @@ namespace YooAsset.Editor
 			collector.FilterRuleName = filterRuleName;
 			collector.NotWriteToAssetList = notWriteToAssetList;
 			grouper.Collectors.Add(collector);
-
-			if (saveFile)
-				SaveFile();
+			IsDirty = true;
 		}
 		public static void RemoveCollector(AssetBundleGrouper grouper, AssetBundleCollector collector)
 		{
 			if (grouper.Collectors.Remove(collector))
 			{
-				SaveFile();
+				IsDirty = true;
+			}
+			else
+			{
+				Debug.LogWarning($"Failed remove collector : {collector.CollectPath}");
 			}
 		}
 		public static void ModifyCollector(AssetBundleGrouper grouper, AssetBundleCollector collector)
 		{
 			if (grouper != null && collector != null)
 			{
-				SaveFile();
+				IsDirty = true;
 			}
 		}
 	}
diff --git a/Assets/YooAsset/Editor/AssetBundleGrouper/AssetBundleGrouperWindow.cs b/Assets/YooAsset/Editor/AssetBundleGrouper/AssetBundleGrouperWindow.cs
index 312764f..274b084 100644
--- a/Assets/YooAsset/Editor/AssetBundleGrouper/AssetBundleGrouperWindow.cs
+++ b/Assets/YooAsset/Editor/AssetBundleGrouper/AssetBundleGrouperWindow.cs
@@ -152,7 +152,12 @@ namespace YooAsset.Editor
 				Debug.LogError(e.ToString());
 			}
 		}
-		
+		public void OnDestroy()
+		{
+			if (AssetBundleGrouperSettingData.IsDirty)
+				AssetBundleGrouperSettingData.SaveFile();
+		}
+
 		// 刷新窗体
 		private void RefreshWindow()
 		{
@@ -222,7 +227,7 @@ namespace YooAsset.Editor
 		}
 		private void AddGrouperBtn_clicked()
 		{
-			AssetBundleGrouperSettingData.CreateGrouper("Default Grouper", string.Empty, string.Empty, true);
+			AssetBundleGrouperSettingData.CreateGrouper("Default Grouper", string.Empty, string.Empty);
 			FillGrouperViewData();
 		}
 		private void RemoveGrouperBtn_clicked()