From 7ded7eb2ff12af85c9e6016c3a91456309d4ad3a Mon Sep 17 00:00:00 2001
From: hevinci <hevinci@hotmail.com>
Date: Wed, 16 Mar 2022 00:01:23 +0800
Subject: [PATCH] Update AssetBundleDebugger

---
 .../Editor/AssetBundleDebugger/AssetBundleDebugger.uxml    | 2 +-
 .../AssetBundleDebugger/AssetBundleDebuggerWindow.cs       | 5 +++--
 .../VisualViewers/AssetListDebuggerViewer.cs               | 7 ++++---
 .../VisualViewers/AssetListDebuggerViewer.uxml             | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebugger.uxml b/Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebugger.uxml
index b0f3d16..69a6761 100644
--- a/Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebugger.uxml
+++ b/Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebugger.uxml
@@ -2,6 +2,6 @@
     <uie:Toolbar name="Toolbar" style="display: flex;">
         <uie:ToolbarButton text="Sample" display-tooltip-when-elided="true" name="SampleButton" style="width: 70px; background-color: rgb(20, 134, 171); -unity-text-align: middle-center;" />
         <uie:ToolbarMenu display-tooltip-when-elided="true" name="ShowModeMenu" text="ShowMode" style="width: 100px; flex-grow: 0;" />
-        <uie:ToolbarSearchField focusable="true" name="rSearchField" style="flex-grow: 1;" />
+        <uie:ToolbarSearchField focusable="true" name="SearchField" style="flex-grow: 1;" />
     </uie:Toolbar>
 </ui:UXML>
diff --git a/Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebuggerWindow.cs b/Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebuggerWindow.cs
index b273163..71e962b 100644
--- a/Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebuggerWindow.cs
+++ b/Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebuggerWindow.cs
@@ -25,7 +25,8 @@ namespace YooAsset.Editor
             VisualElement root = rootVisualElement;
 
             // 加载布局文件
-            string uxml = "Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebugger.uxml";
+            string rootPath = EditorTools.GetYooAssetPath();
+            string uxml = $"{rootPath}/Editor/AssetBundleDebugger/AssetBundleDebugger.uxml";
             var visualAsset = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(uxml);
             if (visualAsset == null)
             {
@@ -39,7 +40,7 @@ namespace YooAsset.Editor
             sampleBtn.clicked += SampleBtn_onClick;
 
             // 搜索栏
-            var searchField = root.Q<ToolbarPopupSearchField>("SearchField");
+            var searchField = root.Q<ToolbarSearchField>("SearchField");
             searchField.RegisterValueChangedCallback(OnSearchKeyWordChange);
 
             // 加载页面
diff --git a/Assets/YooAsset/Editor/AssetBundleDebugger/VisualViewers/AssetListDebuggerViewer.cs b/Assets/YooAsset/Editor/AssetBundleDebugger/VisualViewers/AssetListDebuggerViewer.cs
index 836a6b2..5e955d5 100644
--- a/Assets/YooAsset/Editor/AssetBundleDebugger/VisualViewers/AssetListDebuggerViewer.cs
+++ b/Assets/YooAsset/Editor/AssetBundleDebugger/VisualViewers/AssetListDebuggerViewer.cs
@@ -24,7 +24,8 @@ namespace YooAsset.Editor
 		public void InitViewer()
 		{
 			// 加载布局文件
-			string uxml = "Assets/YooAsset/Editor/AssetBundleDebugger/VisualViewers/AssetListDebuggerViewer.uxml";
+			string rootPath = EditorTools.GetYooAssetPath();
+			string uxml = $"{rootPath}/Editor/AssetBundleDebugger/VisualViewers/AssetListDebuggerViewer.uxml";
 			_visualAsset = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(uxml);
 			if (_visualAsset == null)
 			{
@@ -187,7 +188,7 @@ namespace YooAsset.Editor
 				label.style.unityTextAlign = TextAnchor.MiddleLeft;
 				label.style.marginLeft = 3f;
 				//label.style.flexGrow = 1f;
-				label.style.width = 250;
+				label.style.width = 100;
 				element.Add(label);
 			}
 
@@ -197,7 +198,7 @@ namespace YooAsset.Editor
 				label.style.unityTextAlign = TextAnchor.MiddleLeft;
 				label.style.marginLeft = 3f;
 				//label.style.flexGrow = 1f;
-				label.style.width = 150;
+				label.style.width = 120;
 				element.Add(label);
 			}
 
diff --git a/Assets/YooAsset/Editor/AssetBundleDebugger/VisualViewers/AssetListDebuggerViewer.uxml b/Assets/YooAsset/Editor/AssetBundleDebugger/VisualViewers/AssetListDebuggerViewer.uxml
index 9dd0ed7..1e3737a 100644
--- a/Assets/YooAsset/Editor/AssetBundleDebugger/VisualViewers/AssetListDebuggerViewer.uxml
+++ b/Assets/YooAsset/Editor/AssetBundleDebugger/VisualViewers/AssetListDebuggerViewer.uxml
@@ -10,7 +10,7 @@
     <ui:VisualElement name="BottomGroup" style="height: 200px; border-left-width: 1px; border-right-width: 1px; border-top-width: 1px; border-bottom-width: 1px; border-left-color: rgb(0, 0, 0); border-right-color: rgb(0, 0, 0); border-top-color: rgb(0, 0, 0); border-bottom-color: rgb(0, 0, 0); margin-left: 0; margin-right: 0; margin-top: 1px; margin-bottom: 1px; display: flex;">
         <uie:Toolbar name="BottomBar" style="height: 25px; margin-left: 1px; margin-right: 1px;">
             <uie:ToolbarButton text="Depend Bundles" display-tooltip-when-elided="true" name="BottomBar1" style="width: 280px; -unity-text-align: middle-left; flex-grow: 1;" />
-            <uie:ToolbarButton text="Version" display-tooltip-when-elided="true" name="BottomBar2" style="width: 100px; -unity-text-align: middle-left; flex-grow: 0;" />
+            <uie:ToolbarButton text="Version" display-tooltip-when-elided="true" name="BottomBar2" style="width: 100px; -unity-text-align: middle-left;" />
             <uie:ToolbarButton text="Ref Count" display-tooltip-when-elided="true" name="BottomBar3" style="width: 100px; -unity-text-align: middle-left;" />
             <uie:ToolbarButton text="Status" display-tooltip-when-elided="true" name="BottomBar4" style="width: 120px; -unity-text-align: middle-left;" />
         </uie:Toolbar>