update diagnostic system

优化了Debugger窗口的显示页面

Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebuggerWindow.cs

@@ -272,7 +272,7 @@ namespace YooAsset.Editor
                     packageData.ProviderInfos.Sort();
                     foreach (var providerInfo in packageData.ProviderInfos)
                     {
-                        providerInfo.DependBundleInfos.Sort();
+                        providerInfo.DependBundles.Sort();
                     }
                 }
 

Assets/YooAsset/Editor/AssetBundleDebugger/VisualViewers/DebuggerAssetListViewer.cs

@@ -13,6 +13,7 @@ namespace YooAsset.Editor
     {
         private class ProviderTableData : DefaultTableData
         {
+            public DebugPackageData PackageData;
             public DebugProviderInfo ProviderInfo;
         }
         private class DependTableData : DefaultTableData
@@ -205,7 +206,7 @@ namespace YooAsset.Editor
                 {
                     StyleColor textColor;
                     var providerTableData = data as ProviderTableData;
-                    if(providerTableData.ProviderInfo.Status == EOperationStatus.Failed.ToString())
+                    if (providerTableData.ProviderInfo.Status == EOperationStatus.Failed.ToString())
                         textColor = new StyleColor(Color.yellow);
                     else
                         textColor = new StyleColor(Color.white);
@@ -309,6 +310,7 @@ namespace YooAsset.Editor
                 foreach (var providerInfo in packageData.ProviderInfos)
                 {
                     var rowData = new ProviderTableData();
+                    rowData.PackageData = packageData;
                     rowData.ProviderInfo = providerInfo;
                     rowData.AddAssetPathCell("PackageName", packageData.PackageName);
                     rowData.AddStringValueCell("AssetPath", providerInfo.AssetPath);
@@ -368,12 +370,14 @@ namespace YooAsset.Editor
         private void OnProviderTableViewSelectionChanged(ITableData data)
         {
             var providerTableData = data as ProviderTableData;
+            DebugPackageData packageData = providerTableData.PackageData;
             DebugProviderInfo providerInfo = providerTableData.ProviderInfo;
 
             // 填充依赖数据
-            var sourceDatas = new List<ITableData>(providerInfo.DependBundleInfos.Count);
-            foreach (var dependBundleInfo in providerInfo.DependBundleInfos)
+            var sourceDatas = new List<ITableData>(providerInfo.DependBundles.Count);
+            foreach (var bundleName in providerInfo.DependBundles)
             {
+                var dependBundleInfo = packageData.GetBundleInfo(bundleName);
                 var rowData = new DependTableData();
                 rowData.BundleInfo = dependBundleInfo;
                 rowData.AddStringValueCell("DependBundles", dependBundleInfo.BundleName);

Assets/YooAsset/Editor/AssetBundleDebugger/VisualViewers/DebuggerBundleListViewer.cs

@@ -13,19 +13,24 @@ namespace YooAsset.Editor
     {
         private class BundleTableData : DefaultTableData
         {
-            public string PackageName;
+            public DebugPackageData PackageData;
             public DebugBundleInfo BundleInfo;
         }
         private class UsingTableData : DefaultTableData
         {
             public DebugProviderInfo ProviderInfo;
         }
+        private class ReferenceTableData : DefaultTableData
+        {
+            public DebugBundleInfo BundleInfo;
+        }
 
         private VisualTreeAsset _visualAsset;
         private TemplateContainer _root;
 
         private TableView _bundleTableView;
         private TableView _usingTableView;
+        private TableView _referenceTableView;
 
         private DebugReport _debugReport;
         private List<ITableData> _sourceDatas;
@@ -44,20 +49,25 @@ namespace YooAsset.Editor
             _root.style.flexGrow = 1f;
 
             // 资源包列表
-            _bundleTableView = _root.Q<TableView>("TopTableView");
+            _bundleTableView = _root.Q<TableView>("BundleTableView");
             _bundleTableView.SelectionChangedEvent = OnBundleTableViewSelectionChanged;
             CreateBundleTableViewColumns();
 
             // 使用列表
-            _usingTableView = _root.Q<TableView>("BottomTableView");
+            _usingTableView = _root.Q<TableView>("UsingTableView");
             CreateUsingTableViewColumns();
 
+            // 引用列表
+            _referenceTableView = _root.Q<TableView>("ReferenceTableView");
+            CreateReferenceTableViewColumns();
+
 #if UNITY_2020_3_OR_NEWER
             var topGroup = _root.Q<VisualElement>("TopGroup");
             var bottomGroup = _root.Q<VisualElement>("BottomGroup");
             topGroup.style.minHeight = 100;
             bottomGroup.style.minHeight = 100f;
             PanelSplitView.SplitVerticalPanel(_root, topGroup, bottomGroup);
+            PanelSplitView.SplitVerticalPanel(bottomGroup, _usingTableView, _referenceTableView);
 #endif
         }
         private void CreateBundleTableViewColumns()
@@ -269,6 +279,79 @@ namespace YooAsset.Editor
                 _usingTableView.AddColumn(column);
             }
         }
+        private void CreateReferenceTableViewColumns()
+        {
+            // BundleName
+            {
+                var columnStyle = new ColumnStyle(600, 500, 1000);
+                columnStyle.Stretchable = true;
+                columnStyle.Searchable = true;
+                columnStyle.Sortable = true;
+                var column = new TableColumn("ReferenceBundle", "Reference Bundle", columnStyle);
+                column.MakeCell = () =>
+                {
+                    var label = new Label();
+                    label.style.unityTextAlign = TextAnchor.MiddleLeft;
+                    return label;
+                };
+                column.BindCell = (VisualElement element, ITableData data, ITableCell cell) =>
+                {
+                    var infoLabel = element as Label;
+                    infoLabel.text = (string)cell.GetDisplayObject();
+                };
+                _referenceTableView.AddColumn(column);
+            }
+
+            // RefCount
+            {
+                var columnStyle = new ColumnStyle(100);
+                columnStyle.Stretchable = false;
+                columnStyle.Searchable = false;
+                columnStyle.Sortable = true;
+                var column = new TableColumn("RefCount", "Ref Count", columnStyle);
+                column.MakeCell = () =>
+                {
+                    var label = new Label();
+                    label.style.unityTextAlign = TextAnchor.MiddleLeft;
+                    return label;
+                };
+                column.BindCell = (VisualElement element, ITableData data, ITableCell cell) =>
+                {
+                    var infoLabel = element as Label;
+                    infoLabel.text = (string)cell.GetDisplayObject();
+                };
+                _referenceTableView.AddColumn(column);
+            }
+
+            // Status
+            {
+                var columnStyle = new ColumnStyle(100);
+                columnStyle.Stretchable = false;
+                columnStyle.Searchable = false;
+                columnStyle.Sortable = true;
+                var column = new TableColumn("Status", "Status", columnStyle);
+                column.MakeCell = () =>
+                {
+                    var label = new Label();
+                    label.style.unityTextAlign = TextAnchor.MiddleLeft;
+                    return label;
+                };
+                column.BindCell = (VisualElement element, ITableData data, ITableCell cell) =>
+                {
+                    StyleColor textColor;
+                    var feferenceTableData = data as ReferenceTableData;
+                    if (feferenceTableData.BundleInfo.Status == EOperationStatus.Failed)
+                        textColor = new StyleColor(Color.yellow);
+                    else
+                        textColor = new StyleColor(Color.white);
+
+                    var infoLabel = element as Label;
+                    infoLabel.text = (string)cell.GetDisplayObject();
+                    infoLabel.style.color = textColor;
+                };
+                _referenceTableView.AddColumn(column);
+            }
+        }
 
         /// <summary>
         /// 填充页面数据
@@ -280,30 +363,22 @@ namespace YooAsset.Editor
             // 清空旧数据
             _bundleTableView.ClearAll(false, true);
             _usingTableView.ClearAll(false, true);
+            _referenceTableView.ClearAll(false, true);
 
             // 填充数据源
             _sourceDatas = new List<ITableData>(1000);
             foreach (var packageData in debugReport.PackageDatas)
             {
-                var tempDic = new HashSet<string>();
-                foreach (var providerInfo in packageData.ProviderInfos)
+                foreach (var bundleInfo in packageData.BundleInfos)
                 {
-                    foreach (var bundleInfo in providerInfo.DependBundleInfos)
-                    {
-                        if (tempDic.Contains(bundleInfo.BundleName) == false)
-                        {
-                            tempDic.Add(bundleInfo.BundleName);
-
-                            var rowData = new BundleTableData();
-                            rowData.PackageName = packageData.PackageName;
-                            rowData.BundleInfo = bundleInfo;
-                            rowData.AddAssetPathCell("PackageName", packageData.PackageName);
-                            rowData.AddStringValueCell("BundleName", bundleInfo.BundleName);
-                            rowData.AddLongValueCell("RefCount", bundleInfo.RefCount);
-                            rowData.AddStringValueCell("Status", bundleInfo.Status.ToString());
-                            _sourceDatas.Add(rowData);
-                        }
-                    }
+                    var rowData = new BundleTableData();
+                    rowData.PackageData = packageData;
+                    rowData.BundleInfo = bundleInfo;
+                    rowData.AddAssetPathCell("PackageName", packageData.PackageName);
+                    rowData.AddStringValueCell("BundleName", bundleInfo.BundleName);
+                    rowData.AddLongValueCell("RefCount", bundleInfo.RefCount);
+                    rowData.AddStringValueCell("Status", bundleInfo.Status.ToString());
+                    _sourceDatas.Add(rowData);
                 }
             }
             _bundleTableView.itemsSource = _sourceDatas;
@@ -322,6 +397,8 @@ namespace YooAsset.Editor
             _bundleTableView.RebuildView();
             _usingTableView.ClearAll(false, true);
             _usingTableView.RebuildView();
+            _referenceTableView.ClearAll(false, true);
+            _referenceTableView.RebuildView();
         }
 
         /// <summary>
@@ -355,19 +432,17 @@ namespace YooAsset.Editor
         private void OnBundleTableViewSelectionChanged(ITableData data)
         {
             var bundleTableData = data as BundleTableData;
+            var packageData = bundleTableData.PackageData;
+            var selectBundleInfo = bundleTableData.BundleInfo;
 
-            // 填充依赖数据
-            var sourceDatas = new List<ITableData>(1000);
-            foreach (var packageData in _debugReport.PackageDatas)
+            // 填充UsingTableView
             {
-                if (packageData.PackageName != bundleTableData.PackageName)
-                    continue;
-
+                var sourceDatas = new List<ITableData>(1000);
                 foreach (var providerInfo in packageData.ProviderInfos)
                 {
-                    foreach (var bundleInfo in providerInfo.DependBundleInfos)
+                    foreach (var dependBundleName in providerInfo.DependBundles)
                     {
-                        if (bundleInfo.BundleName == bundleTableData.BundleInfo.BundleName)
+                        if (dependBundleName == selectBundleInfo.BundleName)
                         {
                             var rowData = new UsingTableData();
                             rowData.ProviderInfo = providerInfo;
@@ -381,9 +456,26 @@ namespace YooAsset.Editor
                         }
                     }
                 }
+                _usingTableView.itemsSource = sourceDatas;
+                _usingTableView.RebuildView();
+            }
+
+            // 填充ReferenceTableView
+            {
+                var sourceDatas = new List<ITableData>(1000);
+                foreach (string referenceBundleName in selectBundleInfo.ReferenceBundles)
+                {
+                    var bundleInfo = packageData.GetBundleInfo(referenceBundleName);
+                    var rowData = new ReferenceTableData();
+                    rowData.BundleInfo = bundleInfo;
+                    rowData.AddStringValueCell("BundleName", bundleInfo.BundleName);
+                    rowData.AddLongValueCell("RefCount", bundleInfo.RefCount);
+                    rowData.AddStringValueCell("Status", bundleInfo.Status.ToString());
+                    sourceDatas.Add(rowData);
+                }
+                _referenceTableView.itemsSource = sourceDatas;
+                _referenceTableView.RebuildView();
             }
-            _usingTableView.itemsSource = sourceDatas;
-            _usingTableView.RebuildView();
         }
     }
 }

Assets/YooAsset/Editor/AssetBundleDebugger/VisualViewers/DebuggerBundleListViewer.uxml

@@ -1,8 +1,9 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
     <ui:VisualElement name="TopGroup" style="flex-grow: 1; 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: 2px; margin-bottom: 1px; display: flex;">
-        <YooAsset.Editor.TableView name="TopTableView" />
+        <YooAsset.Editor.TableView name="BundleTableView" />
     </ui:VisualElement>
-    <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;">
-        <YooAsset.Editor.TableView name="BottomTableView" />
+    <ui:VisualElement name="BottomGroup" style="height: 400px; 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;">
+        <YooAsset.Editor.TableView name="UsingTableView" />
+        <YooAsset.Editor.TableView name="ReferenceTableView" />
     </ui:VisualElement>
 </ui:UXML>