.gitignore

@@ -10,23 +10,8 @@
 /[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*

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollector.cs

@@ -340,12 +340,10 @@ namespace YooAsset.Editor
 			List<string> result = new List<string>(depends.Length);
 			foreach (string assetPath in depends)
 			{
-				// 注意：排除主资源对象
-				if (assetPath == mainAssetPath)
-					continue;
-
 				if (IsValidateAsset(assetPath, false))
 				{
+					// 注意：排除主资源对象
+					if (assetPath != mainAssetPath)
 						result.Add(assetPath);
 				}
 			}

Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterBundleListViewer.cs

@@ -349,25 +349,11 @@ namespace YooAsset.Editor
 		private void FillIncludeListView(ReportBundleInfo bundleInfo)
 		{
 			List<ReportAssetInfo> containsList = new List<ReportAssetInfo>();
-			HashSet<string> mainAssetDic = new HashSet<string>();
 			foreach (var assetInfo in _buildReport.AssetInfos)
 			{
 				if (assetInfo.MainBundleName == bundleInfo.BundleName)
-				{
-					mainAssetDic.Add(assetInfo.AssetPath);
 					containsList.Add(assetInfo);
 			}
-			}
-			foreach (string assetPath in bundleInfo.AllBuiltinAssets)
-			{
-				if (mainAssetDic.Contains(assetPath) == false)
-				{
-					var assetInfo = new ReportAssetInfo();
-					assetInfo.AssetPath = assetPath;
-					assetInfo.AssetGUID = "--";
-					containsList.Add(assetInfo);
-				}
-			}
 
 			_includeListView.Clear();
 			_includeListView.ClearSelection();
@@ -390,16 +376,6 @@ 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 = 100;
-				element.Add(label);
-			}
-
 			{
 				var label = new Label();
 				label.name = "Label2";
@@ -421,10 +397,6 @@ namespace YooAsset.Editor
 			var label1 = element.Q<Label>("Label1");
 			label1.text = assetInfo.AssetPath;
 
-			// Asset Source
-			var label3 = element.Q<Label>("Label3");
-			label3.text = assetInfo.AssetGUID != "--" ? "Main Asset" : "Builtin Asset";
-
 			// GUID
 			var label2 = element.Q<Label>("Label2");
 			label2.text = assetInfo.AssetGUID;

Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterBundleListViewer.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8875000dff445624da4d6a2d6ef2f446
+guid: a0319abb8eae03b4b88e8f900fe2276c
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterBundleListViewer.uxml

@@ -12,7 +12,6 @@
     <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: 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;" />

Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterBundleListViewer.uxml.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: cf2a9340bb457594d9bc1f80b84a89f6
+guid: 56d6dbe0d65ce334a8996beb19612989
 ScriptedImporter:
   internalIDToNameTable: []
   externalObjects: {}