From 559ed95999e518c07d5f454044171d53c7de4d59 Mon Sep 17 00:00:00 2001
From: hevinci <hevinci@hotmail.com>
Date: Thu, 17 Aug 2023 21:53:51 +0800
Subject: [PATCH] update asset bundle collector
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

增加在配置错误的时候警示提示。
---
 .../AssetBundleCollectorWindow.cs              | 18 ++++++++++++++++++
 .../AssetBundleCollectorWindow.uxml            |  3 ++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs
index b07c152..1b4b1af 100644
--- a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs
+++ b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs
@@ -26,6 +26,7 @@ namespace YooAsset.Editor
 		private List<RuleDisplayName> _filterRuleList;
 
 		private Button _settingsButton;
+		private VisualElement _helpBoxContainer;
 		private VisualElement _setting1Container;
 		private VisualElement _setting2Container;
 		private Toggle _showPackageToogle;
@@ -34,6 +35,7 @@ namespace YooAsset.Editor
 		private Toggle _includeAssetGUIDToogle;
 		private Toggle _uniqueBundleNameToogle;
 		private Toggle _showEditorAliasToggle;
+		private HelpBox _helpBox;
 
 		private VisualElement _packageContainer;
 		private ListView _packageListView;
@@ -124,6 +126,11 @@ 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;
@@ -328,6 +335,17 @@ namespace YooAsset.Editor
 			_uniqueBundleNameToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.UniqueBundleName);
 			_showEditorAliasToggle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.ShowEditorAlias);
 
+			// 警示框
+			if(_enableAddressableToogle.value && _locationToLowerToogle.value)
+			{
+				_helpBoxContainer.style.display = DisplayStyle.Flex;
+			}
+			else
+			{
+				_helpBoxContainer.style.display = DisplayStyle.None;
+			}
+
+			// 设置栏
 			if (_showSettings)
 			{
 				_setting1Container.style.display = DisplayStyle.Flex;
diff --git a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.uxml b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.uxml
index b8cc02a..6422b67 100644
--- a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.uxml
+++ b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.uxml
@@ -1,4 +1,4 @@
-<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="True">
     <uie:Toolbar name="Toolbar" style="display: flex; flex-direction: row-reverse;">
         <ui:Button text="Save" display-tooltip-when-elided="true" name="SaveButton" style="width: 50px; background-color: rgb(56, 147, 58);" />
         <ui:Button text="导出" display-tooltip-when-elided="true" name="ExportButton" style="width: 50px; background-color: rgb(56, 147, 58);" />
@@ -6,6 +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: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;" />