From a618b6cf9e14c707aa3f3bbd697004b4583e5cf6 Mon Sep 17 00:00:00 2001 From: hevinci <hevinci@hotmail.com> Date: Fri, 18 Aug 2023 18:31:15 +0800 Subject: [PATCH] update asset bundle reporter --- .../VisualViewers/ReporterBundleListViewer.cs | 18 +++++++++--------- .../ReporterBundleListViewer.uxml | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterBundleListViewer.cs b/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterBundleListViewer.cs index 2e19255..577f9b7 100644 --- a/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterBundleListViewer.cs +++ b/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterBundleListViewer.cs @@ -349,24 +349,24 @@ namespace YooAsset.Editor private void FillIncludeListView(ReportBundleInfo bundleInfo) { List<ReportAssetInfo> containsList = new List<ReportAssetInfo>(); - Dictionary<string, int> tempAssetDict = new Dictionary<string, int>(); + HashSet<string> mainAssetDic = new HashSet<string>(); foreach (var assetInfo in _buildReport.AssetInfos) { if (assetInfo.MainBundleName == bundleInfo.BundleName) { - tempAssetDict.Add(assetInfo.AssetPath, 1); + mainAssetDic.Add(assetInfo.AssetPath); containsList.Add(assetInfo); - } + } } - foreach (string includeInAsset in bundleInfo.AllBuiltinAssets) + foreach (string assetPath in bundleInfo.AllBuiltinAssets) { - if (!tempAssetDict.ContainsKey(includeInAsset)) + if (mainAssetDic.Contains(assetPath) == false) { var assetInfo = new ReportAssetInfo(); - assetInfo.AssetPath = includeInAsset; + assetInfo.AssetPath = assetPath; assetInfo.AssetGUID = "--"; containsList.Add(assetInfo); - } + } } _includeListView.Clear(); @@ -396,7 +396,7 @@ namespace YooAsset.Editor label.style.unityTextAlign = TextAnchor.MiddleLeft; label.style.marginLeft = 3f; //label.style.flexGrow = 1f; - label.style.width = 200; + label.style.width = 100; element.Add(label); } @@ -423,7 +423,7 @@ namespace YooAsset.Editor // Asset Source var label3 = element.Q<Label>("Label3"); - label3.text = assetInfo.AssetGUID != "--" ? "Main Asset" : "Include Asset"; + label3.text = assetInfo.AssetGUID != "--" ? "Main Asset" : "Builtin Asset"; // GUID var label2 = element.Q<Label>("Label2"); diff --git a/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterBundleListViewer.uxml b/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterBundleListViewer.uxml index 6a2b042..943b306 100644 --- a/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterBundleListViewer.uxml +++ b/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterBundleListViewer.uxml @@ -12,7 +12,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="Include Assets" display-tooltip-when-elided="true" name="BottomBar1" style="width: 280px; -unity-text-align: middle-left; flex-grow: 1;" /> - <uie:ToolbarButton text="Asset Source" display-tooltip-when-elided="true" name="BottomBar3" style="width: 200px; -unity-text-align: middle-left;" /> + <uie:ToolbarButton text="Asset Source" display-tooltip-when-elided="true" name="BottomBar3" style="width: 100px; -unity-text-align: middle-left;" /> <uie:ToolbarButton text="GUID" display-tooltip-when-elided="true" name="BottomBar2" style="width: 280px; -unity-text-align: middle-left;" /> </uie:Toolbar> <ui:ListView focusable="true" name="BottomListView" item-height="18" virtualization-method="DynamicHeight" style="flex-grow: 1;" />