From 517830dbefebb1b0fbb955ac766102cbc6c29da0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=AC=E6=98=A5=E9=B9=8F?= Date: Wed, 4 Jun 2025 16:38:42 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssetBundleCollectorWindow.cs | 26 +++++ .../AssetBundleCollectorWindow.uxml | 96 ++++++++++--------- 2 files changed, 76 insertions(+), 46 deletions(-) diff --git a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs index 4473e2eb..af3496d7 100644 --- a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs +++ b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs @@ -18,6 +18,11 @@ namespace YooAsset.Editor window.minSize = new Vector2(800, 600); } + private VisualElement _mainContainer; + private VisualElement _searchContainer; + + private ToolbarSearchField _searchField; + private Button _saveButton; private List _collectorTypeList; private List _activeRuleList; @@ -89,6 +94,12 @@ namespace YooAsset.Editor visualAsset.CloneTree(root); + _mainContainer = root.Q("MainContainer"); + _searchContainer = root.Q("SearchContainer"); + + _searchField = root.Q("SearchField"); + _searchField.RegisterValueChangedCallback(OnSearchFieldValueChanged); + // 警示栏 _helpBoxContainer = root.Q("HelpBoxContainer"); @@ -358,6 +369,21 @@ namespace YooAsset.Editor Debug.LogError(e.ToString()); } } + + private void OnSearchFieldValueChanged(ChangeEvent evt) + { + if (string.IsNullOrEmpty(evt.newValue)) + { + _mainContainer.style.display = DisplayStyle.Flex; + _searchContainer.style.display = DisplayStyle.None; + } + else + { + _mainContainer.style.display = DisplayStyle.None; + _searchContainer.style.display = DisplayStyle.Flex; + } + } + public void OnEnable() { Undo.undoRedoPerformed += RefreshWindow; diff --git a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.uxml b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.uxml index 1f572463..4766894b 100644 --- a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.uxml +++ b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.uxml @@ -4,56 +4,60 @@ + - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + From 517f133b2179fd2dd3af377b803be4ed8d0a5c75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=AC=E6=98=A5=E9=B9=8F?= Date: Wed, 4 Jun 2025 17:55:08 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=92=8C=E6=90=9C=E7=B4=A2=E6=97=B6=E5=B1=8F=E8=94=BD=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssetBundleCollectorWindow.cs | 76 ++++++++++++--- .../AssetBundleCollectorWindow.uxml | 95 +++++++++---------- 2 files changed, 111 insertions(+), 60 deletions(-) diff --git a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs index af3496d7..4ae5784f 100644 --- a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs +++ b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs @@ -14,12 +14,19 @@ namespace YooAsset.Editor [MenuItem("YooAsset/AssetBundle Collector", false, 101)] public static void OpenWindow() { - AssetBundleCollectorWindow window = GetWindow("AssetBundle Collector", true, WindowsDefine.DockedWindowTypes); + AssetBundleCollectorWindow window = + GetWindow("AssetBundle Collector", true, WindowsDefine.DockedWindowTypes); window.minSize = new Vector2(800, 600); } - private VisualElement _mainContainer; - private VisualElement _searchContainer; + private enum EViewMode + { + Normal, + Search, + } + + private EViewMode _viewMode; + private string _searchKey; private ToolbarSearchField _searchField; @@ -52,12 +59,14 @@ namespace YooAsset.Editor private ListView _packageListView; private TextField _packageNameTxt; private TextField _packageDescTxt; + private VisualElement _packageOperationContainer; private VisualElement _groupContainer; private ListView _groupListView; private TextField _groupNameTxt; private TextField _groupDescTxt; private TextField _groupTagsTxt; + private VisualElement _groupOperationContainer; private VisualElement _collectorContainer; private ScrollView _collectorScrollView; @@ -73,6 +82,8 @@ namespace YooAsset.Editor { try { + _viewMode = EViewMode.Normal; + _collectorTypeList = new List() { $"{nameof(ECollectorType.MainAssetCollector)}", @@ -94,9 +105,6 @@ namespace YooAsset.Editor visualAsset.CloneTree(root); - _mainContainer = root.Q("MainContainer"); - _searchContainer = root.Q("SearchContainer"); - _searchField = root.Q("SearchField"); _searchField.RegisterValueChangedCallback(OnSearchFieldValueChanged); @@ -232,6 +240,7 @@ namespace YooAsset.Editor var removeBtn = packageAddContainer.Q