From 95782c8aba1148dab042bbc9bc40b6d228ee2c03 Mon Sep 17 00:00:00 2001
From: hevinci <hevinci@hotmail.com>
Date: Thu, 17 Aug 2023 22:13:31 +0800
Subject: [PATCH] update asset bundle collector

---
 .../AssetBundleCollectorWindow.cs             | 24 +++++++++++--------
 .../AssetBundleCollectorWindow.uxml           |  2 +-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs
index 1b4b1af..7648054 100644
--- a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs
+++ b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs
@@ -35,7 +35,6 @@ namespace YooAsset.Editor
 		private Toggle _includeAssetGUIDToogle;
 		private Toggle _uniqueBundleNameToogle;
 		private Toggle _showEditorAliasToggle;
-		private HelpBox _helpBox;
 
 		private VisualElement _packageContainer;
 		private ListView _packageListView;
@@ -84,6 +83,9 @@ namespace YooAsset.Editor
 
 				visualAsset.CloneTree(root);
 
+				// 警示栏
+				_helpBoxContainer = root.Q("HelpBoxContainer");
+
 				// 公共设置相关
 				_settingsButton = root.Q<Button>("SettingsButton");
 				_settingsButton.clicked += SettingsBtn_clicked;
@@ -126,11 +128,6 @@ namespace YooAsset.Editor
 					RefreshWindow();
 				});
 
-				// 警示栏
-				_helpBox = new HelpBox("无法同时开启[Enable Addressable]选项和[Location To Lower]选项", HelpBoxMessageType.Error);
-				_helpBoxContainer = root.Q("HelpBoxContainer");
-				_helpBoxContainer.Add(_helpBox);
-
 				// 配置修复按钮
 				var fixBtn = root.Q<Button>("FixButton");
 				fixBtn.clicked += FixBtn_clicked;
@@ -336,14 +333,21 @@ namespace YooAsset.Editor
 			_showEditorAliasToggle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.ShowEditorAlias);
 
 			// 警示框
-			if(_enableAddressableToogle.value && _locationToLowerToogle.value)
+			_helpBoxContainer.Clear();
+			if (_enableAddressableToogle.value && _locationToLowerToogle.value)
 			{
+				var helpBox = new HelpBox("无法同时开启[Enable Addressable]选项和[Location To Lower]选项", HelpBoxMessageType.Error);
+				_helpBoxContainer.Add(helpBox);
+			}
+			if (AssetBundleCollectorSettingData.Setting.Packages.Count > 1 && _uniqueBundleNameToogle.value == false)
+			{
+				var helpBox = new HelpBox("检测到当前配置存在多个Package，建议开启[Unique Bundle Name]选项", HelpBoxMessageType.Warning);
+				_helpBoxContainer.Add(helpBox);
+			}
+			if (_helpBoxContainer.childCount > 0)
 				_helpBoxContainer.style.display = DisplayStyle.Flex;
-			}
 			else
-			{
 				_helpBoxContainer.style.display = DisplayStyle.None;
-			}
 
 			// 设置栏
 			if (_showSettings)
diff --git a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.uxml b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.uxml
index 6422b67..c57b2de 100644
--- a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.uxml
+++ b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.uxml
@@ -6,7 +6,7 @@
         <ui:Button text="修复" display-tooltip-when-elided="true" name="FixButton" style="width: 50px; background-color: rgb(56, 147, 58);" />
     </uie:Toolbar>
     <ui:VisualElement name="PublicContainer" style="background-color: rgb(79, 79, 79); flex-direction: column; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">
-        <ui:VisualElement name="HelpBoxContainer" style="height: 36px;" />
+        <ui:VisualElement name="HelpBoxContainer" style="flex-grow: 1;" />
         <ui:Button text="Settings" display-tooltip-when-elided="true" name="SettingsButton" />
         <ui:VisualElement name="PublicContainer1" style="flex-direction: row; flex-wrap: nowrap; height: 28px;">
             <ui:Toggle label="Show Packages" name="ShowPackages" style="width: 196px; -unity-text-align: middle-left;" />