From 19e0c7b01a8f2399da48d73ff8fd5eb65d9aca09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E5=86=A0=E5=B3=B0?= <hevinci@hotmail.com>
Date: Mon, 16 Dec 2024 18:05:27 +0800
Subject: [PATCH] fix #307

---
 .../AssetBundleCollectorGroup.cs                     |  4 ++--
 .../AssetBundleCollectorWindow.cs                    |  2 +-
 .../AssetBundleCollector/CollectRules/IActiveRule.cs | 12 +++++++++++-
 .../DefaultRules/DefaultActiveRule.cs                |  4 ++--
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorGroup.cs b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorGroup.cs
index c4c5bb6e..ac96acc6 100644
--- a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorGroup.cs
+++ b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorGroup.cs
@@ -46,7 +46,7 @@ namespace YooAsset.Editor
 
             // 检测分组是否激活
             IActiveRule activeRule = AssetBundleCollectorSettingData.GetActiveRuleInstance(ActiveRuleName);
-            if (activeRule.IsActiveGroup() == false)
+            if (activeRule.IsActiveGroup(new GroupData(GroupName)) == false)
                 return;
 
             foreach (var collector in Collectors)
@@ -80,7 +80,7 @@ namespace YooAsset.Editor
 
             // 检测分组是否激活
             IActiveRule activeRule = AssetBundleCollectorSettingData.GetActiveRuleInstance(ActiveRuleName);
-            if (activeRule.IsActiveGroup() == false)
+            if (activeRule.IsActiveGroup(new GroupData(GroupName)) == false)
             {
                 return new List<CollectAssetInfo>();
             }
diff --git a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs
index 2b2b073b..d1e784e0 100644
--- a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs
+++ b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs
@@ -657,7 +657,7 @@ namespace YooAsset.Editor
 
             // 激活状态
             IActiveRule activeRule = AssetBundleCollectorSettingData.GetActiveRuleInstance(group.ActiveRuleName);
-            bool isActive = activeRule.IsActiveGroup();
+            bool isActive = activeRule.IsActiveGroup(new GroupData(group.GroupName));
             textField1.SetEnabled(isActive);
         }
         private void GroupListView_onSelectionChange(IEnumerable<object> objs)
diff --git a/Assets/YooAsset/Editor/AssetBundleCollector/CollectRules/IActiveRule.cs b/Assets/YooAsset/Editor/AssetBundleCollector/CollectRules/IActiveRule.cs
index 2691ec36..99101dbf 100644
--- a/Assets/YooAsset/Editor/AssetBundleCollector/CollectRules/IActiveRule.cs
+++ b/Assets/YooAsset/Editor/AssetBundleCollector/CollectRules/IActiveRule.cs
@@ -1,6 +1,16 @@
 
 namespace YooAsset.Editor
 {
+    public struct GroupData
+    {
+        public string GroupName;
+
+        public GroupData(string groupName)
+        {
+            GroupName = groupName;
+        }
+    }
+
     /// <summary>
     /// 资源分组激活规则接口
     /// </summary>
@@ -9,6 +19,6 @@ namespace YooAsset.Editor
         /// <summary>
         /// 是否激活分组
         /// </summary>
-        bool IsActiveGroup();
+        bool IsActiveGroup(GroupData data);
     }
 }
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleCollector/DefaultRules/DefaultActiveRule.cs b/Assets/YooAsset/Editor/AssetBundleCollector/DefaultRules/DefaultActiveRule.cs
index 2f0f103d..87b8f736 100644
--- a/Assets/YooAsset/Editor/AssetBundleCollector/DefaultRules/DefaultActiveRule.cs
+++ b/Assets/YooAsset/Editor/AssetBundleCollector/DefaultRules/DefaultActiveRule.cs
@@ -4,7 +4,7 @@ namespace YooAsset.Editor
     [DisplayName("启用分组")]
     public class EnableGroup : IActiveRule
     {
-        public bool IsActiveGroup()
+        public bool IsActiveGroup(GroupData data)
         {
             return true;
         }
@@ -13,7 +13,7 @@ namespace YooAsset.Editor
     [DisplayName("禁用分组")]
     public class DisableGroup : IActiveRule
     {
-        public bool IsActiveGroup()
+        public bool IsActiveGroup(GroupData data)
         {
             return false;
         }