From a5900b5f99a7dc7609920973ceeaa7321ed61bc9 Mon Sep 17 00:00:00 2001 From: YGP Date: Thu, 27 Jul 2023 16:04:59 +0800 Subject: [PATCH 1/3] ignore --- .gitignore | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index bd1e002..da5069c 100644 --- a/.gitignore +++ b/.gitignore @@ -10,8 +10,23 @@ /[Ll]ogs/ /[Mm]emoryCaptures/ + + +/Bundles/ +/ProjectSettings/ +/App/ +/yoo/ +/Assets/StreamingAssets +/Assets/StreamingAssets.meta +/Assets/Samples +/Assets/Samples.meta +/Packages +/UserSettings + + + # Asset meta data should only be ignored when the corresponding asset is also ignored -!/[Aa]ssets/**/*.meta + # Uncomment this line if you wish to ignore the asset store tools plugin # /[Aa]ssets/AssetStoreTools* From ef231e213e34471a85ae6ff9dbbc4915d4b90833 Mon Sep 17 00:00:00 2001 From: YGP Date: Thu, 27 Jul 2023 16:06:09 +0800 Subject: [PATCH 2/3] modify bundleViewer func --- .../VisualViewers/ReporterBundleListViewer.cs | 58 ++++++++++++++----- .../ReporterBundleListViewer.cs.meta | 2 +- .../ReporterBundleListViewer.uxml | 1 + .../ReporterBundleListViewer.uxml.meta | 2 +- 4 files changed, 46 insertions(+), 17 deletions(-) diff --git a/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterBundleListViewer.cs b/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterBundleListViewer.cs index 18ddfcc..bcc7dee 100644 --- a/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterBundleListViewer.cs +++ b/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterBundleListViewer.cs @@ -12,29 +12,29 @@ namespace YooAsset.Editor { internal class ReporterBundleListViewer { - private enum ESortMode + protected enum ESortMode { BundleName, BundleSize, BundleTags } - private VisualTreeAsset _visualAsset; - private TemplateContainer _root; + protected VisualTreeAsset _visualAsset; + protected TemplateContainer _root; - private ToolbarButton _topBar1; - private ToolbarButton _topBar2; - private ToolbarButton _topBar3; - private ToolbarButton _topBar5; - private ToolbarButton _bottomBar1; - private ListView _bundleListView; - private ListView _includeListView; + protected ToolbarButton _topBar1; + protected ToolbarButton _topBar2; + protected ToolbarButton _topBar3; + protected ToolbarButton _topBar5; + protected ToolbarButton _bottomBar1; + protected ListView _bundleListView; + protected ListView _includeListView; - private BuildReport _buildReport; - private string _reportFilePath; - private string _searchKeyWord; - private ESortMode _sortMode = ESortMode.BundleName; - private bool _descendingSort = false; + protected BuildReport _buildReport; + protected string _reportFilePath; + protected string _searchKeyWord; + protected ESortMode _sortMode = ESortMode.BundleName; + protected bool _descendingSort = false; /// /// 初始化页面 @@ -349,10 +349,24 @@ namespace YooAsset.Editor private void FillIncludeListView(ReportBundleInfo bundleInfo) { List containsList = new List(); + Dictionary tempAssetDict = new Dictionary(); foreach (var assetInfo in _buildReport.AssetInfos) { if (assetInfo.MainBundleName == bundleInfo.BundleName) + { + tempAssetDict.Add(assetInfo.AssetPath, 1); containsList.Add(assetInfo); + } + } + foreach (string includeInAsset in bundleInfo.AllBuiltinAssets) + { + if (!tempAssetDict.ContainsKey(includeInAsset)) + { + var assetInfo = new ReportAssetInfo(); + assetInfo.AssetPath = includeInAsset; + assetInfo.AssetGUID = "--"; + containsList.Add(assetInfo); + } } _includeListView.Clear(); @@ -376,6 +390,16 @@ namespace YooAsset.Editor element.Add(label); } + { + var label = new Label(); + label.name = "Label3"; + label.style.unityTextAlign = TextAnchor.MiddleLeft; + label.style.marginLeft = 3f; + //label.style.flexGrow = 1f; + label.style.width = 200; + element.Add(label); + } + { var label = new Label(); label.name = "Label2"; @@ -397,6 +421,10 @@ namespace YooAsset.Editor var label1 = element.Q