Update CHANGELOG.md

报告浏览窗口支持排序

Assets/UniTask.YooAsset~/OperationHandleBaseExtensions.cs

@@ -0,0 +1,167 @@
+using System;
+using YooAsset;
+using static Cysharp.Threading.Tasks.Internal.Error;
+
+namespace Cysharp.Threading.Tasks
+{
+    public static class OperationHandleBaseExtensions
+    {
+        public static UniTask.Awaiter GetAwaiter(this OperationHandleBase handle)
+        {
+            return ToUniTask(handle).GetAwaiter();
+        }
+
+        public static UniTask ToUniTask(this OperationHandleBase handle,
+                                        IProgress<float>         progress = null,
+                                        PlayerLoopTiming         timing   = PlayerLoopTiming.Update)
+        {
+            ThrowArgumentNullException(handle, nameof(handle));
+
+            if(!handle.IsValid)
+            {
+                return UniTask.CompletedTask;
+            }
+
+            return new UniTask(
+                OperationHandleBaserConfiguredSource.Create(
+                    handle,
+                    timing,
+                    progress,
+                    out var token
+                ),
+                token
+            );
+        }
+
+        sealed class OperationHandleBaserConfiguredSource : IUniTaskSource,
+                                                            IPlayerLoopItem,
+                                                            ITaskPoolNode<OperationHandleBaserConfiguredSource>
+        {
+            private static TaskPool<OperationHandleBaserConfiguredSource> pool;
+
+            private OperationHandleBaserConfiguredSource nextNode;
+
+            public ref OperationHandleBaserConfiguredSource NextNode => ref nextNode;
+
+            static OperationHandleBaserConfiguredSource()
+            {
+                TaskPool.RegisterSizeGetter(typeof(OperationHandleBaserConfiguredSource), () => pool.Size);
+            }
+
+            private readonly Action<OperationHandleBase>            continuationAction;
+            private          OperationHandleBase                    handle;
+            private          IProgress<float>                       progress;
+            private          bool                                   completed;
+            private          UniTaskCompletionSourceCore<AsyncUnit> core;
+
+            OperationHandleBaserConfiguredSource() { continuationAction = Continuation; }
+
+            public static IUniTaskSource Create(OperationHandleBase handle,
+                                                PlayerLoopTiming    timing,
+                                                IProgress<float>    progress,
+                                                out short           token)
+            {
+                if(!pool.TryPop(out var result))
+                {
+                    result = new OperationHandleBaserConfiguredSource();
+                }
+
+                result.handle    = handle;
+                result.progress  = progress;
+                result.completed = false;
+                TaskTracker.TrackActiveTask(result, 3);
+
+                if(progress is not null)
+                {
+                    PlayerLoopHelper.AddAction(timing, result);
+                }
+
+                switch(handle)
+                {
+                    case AssetOperationHandle asset_handle:
+                        asset_handle.Completed += result.continuationAction;
+                        break;
+                    case SceneOperationHandle scene_handle:
+                        scene_handle.Completed += result.continuationAction;
+                        break;
+                    case SubAssetsOperationHandle sub_asset_handle:
+                        sub_asset_handle.Completed += result.continuationAction;
+                        break;
+                }
+
+                token = result.core.Version;
+
+                return result;
+            }
+
+            private void Continuation(OperationHandleBase _)
+            {
+                switch(handle)
+                {
+                    case AssetOperationHandle asset_handle:
+                        asset_handle.Completed -= continuationAction;
+                        break;
+                    case SceneOperationHandle scene_handle:
+                        scene_handle.Completed -= continuationAction;
+                        break;
+                    case SubAssetsOperationHandle sub_asset_handle:
+                        sub_asset_handle.Completed -= continuationAction;
+                        break;
+                }
+
+                if(completed)
+                {
+                    TryReturn();
+                }
+                else
+                {
+                    completed = true;
+                    if(handle.Status == EOperationStatus.Failed)
+                    {
+                        core.TrySetException(new Exception(handle.LastError));
+                    }
+                    else
+                    {
+                        core.TrySetResult(AsyncUnit.Default);
+                    }
+                }
+            }
+
+            bool TryReturn()
+            {
+                TaskTracker.RemoveTracking(this);
+                core.Reset();
+                handle   = default;
+                progress = default;
+                return pool.TryPush(this);
+            }
+
+            public UniTaskStatus GetStatus(short token) => core.GetStatus(token);
+
+            public void OnCompleted(Action<object> continuation, object state, short token)
+            {
+                core.OnCompleted(continuation, state, token);
+            }
+
+            public void GetResult(short token) { core.GetResult(token); }
+
+            public UniTaskStatus UnsafeGetStatus() => core.UnsafeGetStatus();
+
+            public bool MoveNext()
+            {
+                if(completed)
+                {
+                    TryReturn();
+                    return false;
+                }
+
+                if(handle.IsValid)
+                {
+                    progress?.Report(handle.Progress);
+                }
+
+                return true;
+            }
+        }
+    }
+}

Assets/UniTask.YooAsset~/OperationHandleBaseExtensions.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e1c9a3a6de2246bf88547a6b59b99b9f
+timeCreated: 1650851321

Assets/UniTask.YooAsset~/README.md

@@ -0,0 +1,19 @@
+# UniTask 扩展
+
+[仓库链接](https://github.com/Cysharp/UniTask) 
+- 请去下载对应的源码，并删除此目录最后的波浪线
+- 在 UniTask `_InternalVisibleTo.cs` 文件中增加 `[assembly: InternalsVisibleTo("UniTask.YooAsset")]` 后即可使用
+
+## 代码示例
+
+```csharp
+var handle = YooAssets.LoadAssetAsync<GameObject>("Assets/Res/Prefabs/TestImg.prefab");
+
+await handle.ToUniTask();
+
+var obj = handle.AssetObject as GameObject;
+var go  = Instantiate(obj, transform);
+
+go.transform.localPosition = Vector3.zero;
+go.transform.localScale    = Vector3.one;
+```

Assets/UniTask.YooAsset~/UniTask.YooAsset.asmdef

@@ -0,0 +1,17 @@
+{
+    "name": "UniTask.YooAsset",
+    "rootNamespace": "",
+    "references": [
+        "GUID:e34a5702dd353724aa315fb8011f08c3",
+        "GUID:f51ebe6a0ceec4240a699833d6309b23"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

Assets/UniTask.YooAsset~/UniTask.YooAsset.asmdef.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: cf4f1d4730c114c48ab680458e5a2455
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/YooAsset/CHANGELOG.md

@@ -1,6 +1,106 @@
 # CHANGELOG
 
-All notable changes to this package will be documented in this file.   
+All notable changes to this package will be documented in this file.
+
+## [1.0.7] - 2022-05-04
+
+### Fixed
+
+- 修复了异步操作系统的Task再次等待无效的问题。
+
+### Changed
+
+- YooAssets.LoadRawFileAsync()方法重新命名为YooAssets.GetRawFileAsync()
+- YooAssetSetting文件夹支持了全路径搜索定位。
+- 优化了打包的核心逻辑，对依赖资源进行自动划分，以及支持设置依赖资源收集器。
+- 初始化的时候，删除验证失败的资源文件。
+- 构建报告浏览窗口支持排序功能。
+- 着色器变种收集工具支持了配置缓存。
+
+### Added
+
+- 支持可寻址资源定位系统，包括编辑器和运行时环境。
+- 增加快速构建模式，用于EditorPlayMode完美模拟线上环境。
+- 增加了Window Dock功能，已打开的界面会自动停靠在一个窗体下。
+- 增加一个新的打包规则：PackTopDirectory。
+- 增加获取资源信息的方法。
+  ```c#
+  public static AssetInfo[] GetAssetInfos(string tag)
+  ```
+- 增加补丁下载器下载全部资源的方法。
+  ```c#
+  public static PatchDownloaderOperation CreatePatchDownloader(int downloadingMaxNumber, int failedTryAgain)
+  ```
+- 增加指定资源版本的资源更新下载方法。
+  ```c#
+  public static UpdatePackageOperation UpdatePackageAsync(int resourceVersion, int timeout = 60)
+  ```
+
+### Removed
+
+- 移除了自动释放资源的初始化参数。
+
+## [1.0.6] - 2022-04-26
+
+### Fixed
+
+- 修复工具界面显示异常在Unity2021版本下。
+
+### Changed
+
+- 操作句柄支持错误信息查询。
+- 支持UniTask异步操作库。
+- 优化类型搜索方式，改为全域搜索类型。
+- AssetBundleGrouper窗口添加和移除Grouper支持操作回退。
+
+## [1.0.5] - 2022-04-22
+
+### Fixed
+
+- 修复了非主动收集的着色器没有打进统一的着色器资源包的问题。
+- 修复了单个收集的资源对象没有设置依赖资源列表的问题。
+- 修复Task异步加载一直等待的问题。
+
+### Changed
+
+- 资源打包的过滤文件列表增加cginc格式。
+- 增加编辑器扩展的支持，第三方实现YooAsset插件。
+- 优化原生文件加载逻辑，支持离线运行模式和编辑器运行模式。
+- 优化场景卸载逻辑，在加载新的主场景的时候自动卸载已经加载的所有场景。
+- 支持演练构建模式，在不生成资源包的情况下快速构建查看结果。
+- 新增调试信息，出生场景和出生时间。
+
+## [1.0.4] - 2022-04-18
+
+### Fixed
+
+- 修复资源清单附加版本之后引发的一个流程错误。
+- 修复原生文件拷贝目录不存导致的加载失败。
+
+### Changed
+
+- 在编辑器下检测资源路径是否合法并警告。
+- 完善原生文件异步加载接口。
+
+## [1.0.3] - 2022-04-14
+
+### Fixed
+
+- 修复了AssetBundleDebugger窗口的BundleView视口下，Using列表显示不完整的问题。
+- 修复了AssetBundleDebugger窗口的BundleView视口下，Bundle列表内元素重复的问题。
+- 修复了特殊情况下依赖的资源包列表里包含主资源包的问题。
+
+### Changed
+
+- 实例化GameObject的时候，如果没有传递坐标和角度则使用默认值。
+- 优化了资源分组配置保存策略，修改为窗口关闭时保存。
+- 简化了资源版本概念，降低学习成本，统一了CDN上的目录结构。
+- 资源定位接口扩展，方便开发可寻址资产定位功能。
+
+### Added
+
+- 离线运行模式支持WEBGL平台。
+- 保留构建窗口界面的配置数据。
 
 ## [1.0.2] - 2022-04-07
 
@@ -11,7 +111,7 @@ All notable changes to this package will be documented in this file.
 
 ### Changed
 
-- StreamingAssets目录下增加了用于存放打包资源的总文件夹
+- StreamingAssets目录下增加了用于存放打包资源的总文件夹。
 
 ## [1.0.1] - 2022-04-07
 

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilder.cs

@@ -26,7 +26,12 @@ namespace YooAsset.Editor
 			public BuildParametersContext(BuildParameters parameters)
 			{
 				Parameters = parameters;
+
 				PipelineOutputDirectory = AssetBundleBuilderHelper.MakePipelineOutputDirectory(parameters.OutputRoot, parameters.BuildTarget);
+				if (parameters.BuildMode == EBuildMode.DryRunBuild)
+					PipelineOutputDirectory += $"_{EBuildMode.DryRunBuild}";
+				else if(parameters.BuildMode == EBuildMode.FastRunBuild)
+					PipelineOutputDirectory += $"_{EBuildMode.FastRunBuild}";
 			}
 
 			/// <summary>
@@ -48,12 +53,23 @@ namespace YooAsset.Editor
 				BuildAssetBundleOptions opt = BuildAssetBundleOptions.None;
 				opt |= BuildAssetBundleOptions.StrictMode; //Do not allow the build to succeed if any errors are reporting during it.
 
+				if (Parameters.BuildMode == EBuildMode.FastRunBuild)
+				{
+					throw new Exception("Should never get here !");
+				}
+
+				if (Parameters.BuildMode == EBuildMode.DryRunBuild)
+				{
+					opt |= BuildAssetBundleOptions.DryRunBuild;
+					return opt;
+				}
+
 				if (Parameters.CompressOption == ECompressOption.Uncompressed)
 					opt |= BuildAssetBundleOptions.UncompressedAssetBundle;
 				else if (Parameters.CompressOption == ECompressOption.LZ4)
 					opt |= BuildAssetBundleOptions.ChunkBasedCompression;
 
-				if (Parameters.ForceRebuild)
+				if (Parameters.BuildMode == EBuildMode.ForceRebuild)
 					opt |= BuildAssetBundleOptions.ForceRebuildAssetBundle; //Force rebuild the asset bundles
 				if (Parameters.AppendHash)
 					opt |= BuildAssetBundleOptions.AppendHashToAssetBundleName; //Append the hash to the assetBundle name
@@ -107,7 +123,8 @@ namespace YooAsset.Editor
 			{
 				new TaskPrepare(), //前期准备工作
 				new TaskGetBuildMap(), //获取构建列表
-				new TaskBuilding(), //开始执行构建			
+				new TaskBuilding(), //开始执行构建
+				new TaskVerifyBuildResult(), //验证构建结果
 				new TaskEncryption(), //加密资源文件
 				new TaskCreatePatchManifest(), //创建清单文件
 				new TaskCreateReport(), //创建报告文件
@@ -115,11 +132,16 @@ namespace YooAsset.Editor
 				new TaskCopyBuildinFiles(), //拷贝内置文件
 			};
 
+			if (buildParameters.BuildMode == EBuildMode.FastRunBuild)
+				BuildRunner.EnableLog = false;
+			else
+				BuildRunner.EnableLog = true;
+
 			bool succeed = BuildRunner.Run(pipeline, _buildContext);
 			if (succeed)
-				Debug.Log($"构建成功！");
+				Debug.Log($"{buildParameters.BuildMode}模式构建成功！");
 			else
-				Debug.LogWarning($"构建失败！");
+				Debug.LogWarning($"{buildParameters.BuildMode}模式构建失败！");
 			return succeed;
 		}
 	}

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderHelper.cs

@@ -117,11 +117,11 @@ namespace YooAsset.Editor
 
 
 		/// <summary>
-		/// 从输出目录加载补丁清单文件
+		/// 加载补丁清单文件
 		/// </summary>
-		internal static PatchManifest LoadPatchManifestFile(string fileDirectory)
+		internal static PatchManifest LoadPatchManifestFile(string fileDirectory, int resourceVersion)
 		{
-			string filePath = $"{fileDirectory}/{YooAssetSettingsData.Setting.PatchManifestFileName}";
+			string filePath = $"{fileDirectory}/{YooAssetSettingsData.GetPatchManifestFileName(resourceVersion)}";
 			if (File.Exists(filePath) == false)
 			{
 				throw new System.Exception($"Not found patch manifest file : {filePath}");
@@ -130,5 +130,16 @@ namespace YooAsset.Editor
 			string jsonData = FileUtility.ReadFile(filePath);
 			return PatchManifest.Deserialize(jsonData);
 		}
+
+		/// <summary>
+		/// 获取旧的补丁清单
+		/// </summary>
+		internal static PatchManifest GetOldPatchManifest(string pipelineOutputDirectory)
+		{
+			string staticVersionFilePath = $"{pipelineOutputDirectory}/{YooAssetSettings.VersionFileName}";
+			string staticVersionContent = FileUtility.ReadFile(staticVersionFilePath);
+			int staticVersion = int.Parse(staticVersionContent);
+			return LoadPatchManifestFile(pipelineOutputDirectory, staticVersion);
+		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSetting.cs

@@ -0,0 +1,38 @@
+using System;
+using UnityEngine;
+
+namespace YooAsset.Editor
+{
+	public class AssetBundleBuilderSetting : ScriptableObject
+	{
+		/// <summary>
+		/// 构建版本号
+		/// </summary>
+		public int BuildVersion = 0;
+
+		/// <summary>
+		/// 构建模式
+		/// </summary>
+		public EBuildMode BuildMode = EBuildMode.ForceRebuild;
+
+		/// <summary>
+		/// 内置资源标签
+		/// </summary>
+		public string BuildTags = string.Empty;
+
+		/// <summary>
+		/// 压缩方式
+		/// </summary>
+		public ECompressOption CompressOption = ECompressOption.LZ4;
+
+		/// <summary>
+		/// 加密类名称
+		/// </summary>
+		public string EncyptionClassName = string.Empty;
+
+		/// <summary>
+		/// 附加后缀格式
+		/// </summary>
+		public bool AppendExtension = false;
+	}
+}

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSetting.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 09788b4733bab2d4792fdd5d28e7653c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSettingData.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+	public class AssetBundleBuilderSettingData
+	{
+		private static AssetBundleBuilderSetting _setting = null;
+		public static AssetBundleBuilderSetting Setting
+		{
+			get
+			{
+				if (_setting == null)
+					LoadSettingData();
+				return _setting;
+			}
+		}
+
+		/// <summary>
+		/// 加载配置文件
+		/// </summary>
+		private static void LoadSettingData()
+		{
+			// 加载配置文件
+			string settingFilePath = $"{EditorTools.GetYooAssetSettingPath()}/{nameof(AssetBundleBuilderSetting)}.asset";
+			_setting = AssetDatabase.LoadAssetAtPath<AssetBundleBuilderSetting>(settingFilePath);
+			if (_setting == null)
+			{
+				Debug.LogWarning($"Create new {nameof(AssetBundleBuilderSetting)}.asset : {settingFilePath}");
+				_setting = ScriptableObject.CreateInstance<AssetBundleBuilderSetting>();
+				EditorTools.CreateFileDirectory(settingFilePath);
+				AssetDatabase.CreateAsset(Setting, settingFilePath);
+				AssetDatabase.SaveAssets();
+				AssetDatabase.Refresh();
+			}
+			else
+			{
+				Debug.Log($"Load {nameof(AssetBundleBuilderSetting)}.asset ok");
+			}
+		}
+
+		/// <summary>
+		/// 存储文件
+		/// </summary>
+		public static void SaveFile()
+		{
+			if (Setting != null)
+			{
+				EditorUtility.SetDirty(Setting);
+				AssetDatabase.SaveAssets();
+				Debug.Log($"{nameof(AssetBundleBuilderSetting)}.asset is saved!");
+			}
+		}
+	}
+}

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSettingData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 24698266f028e4a47bb88f091fd64547
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs

@@ -14,8 +14,7 @@ namespace YooAsset.Editor
 		[MenuItem("YooAsset/AssetBundle Builder", false, 102)]
 		public static void ShowExample()
 		{
-			AssetBundleBuilderWindow window = GetWindow<AssetBundleBuilderWindow>();
-			window.titleContent = new GUIContent("资源包构建工具");
+			AssetBundleBuilderWindow window = GetWindow<AssetBundleBuilderWindow>("资源包构建工具", true, EditorDefine.DockedWindowTypes);
 			window.minSize = new Vector2(800, 600);
 		}
 
@@ -23,21 +22,20 @@ namespace YooAsset.Editor
 		private List<Type> _encryptionServicesClassTypes;
 		private List<string> _encryptionServicesClassNames;
 
-		private TextField _buildOutputTxt;
+		private TextField _buildOutputField;
 		private IntegerField _buildVersionField;
-		private EnumField _compressionField;
+		private EnumField _buildModeField;
+		private TextField _buildTagsField;
 		private PopupField<string> _encryptionField;
+		private EnumField _compressionField;
 		private Toggle _appendExtensionToggle;
-		private Toggle _forceRebuildToggle;
-		private TextField _buildTagsTxt;
-
 
 		public void CreateGUI()
 		{
 			VisualElement root = this.rootVisualElement;
 
 			// 加载布局文件
-			string rootPath = EditorTools.GetYooAssetPath();
+			string rootPath = EditorTools.GetYooAssetSourcePath();
 			string uxml = $"{rootPath}/Editor/AssetBundleBuilder/{nameof(AssetBundleBuilderWindow)}.uxml";
 			var visualAsset = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(uxml);
 			if (visualAsset == null)
@@ -56,28 +54,49 @@ namespace YooAsset.Editor
 				// 输出目录
 				string defaultOutputRoot = AssetBundleBuilderHelper.GetDefaultOutputRoot();
 				string pipelineOutputDirectory = AssetBundleBuilderHelper.MakePipelineOutputDirectory(defaultOutputRoot, _buildTarget);
-				_buildOutputTxt = root.Q<TextField>("BuildOutput");
-				_buildOutputTxt.SetValueWithoutNotify(pipelineOutputDirectory);
-				_buildOutputTxt.SetEnabled(false);
+				_buildOutputField = root.Q<TextField>("BuildOutput");
+				_buildOutputField.SetValueWithoutNotify(pipelineOutputDirectory);
+				_buildOutputField.SetEnabled(false);
 
 				// 构建版本
-				var appVersion = new Version(Application.version);
 				_buildVersionField = root.Q<IntegerField>("BuildVersion");
-				_buildVersionField.SetValueWithoutNotify(appVersion.Revision);
+				_buildVersionField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.BuildVersion);
+				_buildVersionField.RegisterValueChangedCallback(evt =>
+				{
+					AssetBundleBuilderSettingData.Setting.BuildVersion = _buildVersionField.value;
+				});
 
-				// 压缩方式
-				_compressionField = root.Q<EnumField>("Compression");
-				_compressionField.Init(ECompressOption.LZ4);
-				_compressionField.SetValueWithoutNotify(ECompressOption.LZ4);
-				_compressionField.style.width = 300;
+				// 构建模式
+				_buildModeField = root.Q<EnumField>("BuildMode");
+				_buildModeField.Init(AssetBundleBuilderSettingData.Setting.BuildMode);
+				_buildModeField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.BuildMode);
+				_buildModeField.style.width = 300;
+				_buildModeField.RegisterValueChangedCallback(evt =>
+				{
+					AssetBundleBuilderSettingData.Setting.BuildMode = (EBuildMode)_buildModeField.value;
+					RefreshWindow();
+				});
+
+				// 内置资源标签
+				_buildTagsField = root.Q<TextField>("BuildinTags");
+				_buildTagsField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.BuildTags);
+				_buildTagsField.RegisterValueChangedCallback(evt =>
+				{
+					AssetBundleBuilderSettingData.Setting.BuildTags = _buildTagsField.value;
+				});
 
 				// 加密方法
 				var encryptionContainer = root.Q("EncryptionContainer");
 				if (_encryptionServicesClassNames.Count > 0)
 				{
-					_encryptionField = new PopupField<string>(_encryptionServicesClassNames, 0);
+					int defaultIndex = GetEncryptionDefaultIndex(AssetBundleBuilderSettingData.Setting.EncyptionClassName);
+					_encryptionField = new PopupField<string>(_encryptionServicesClassNames, defaultIndex);
 					_encryptionField.label = "Encryption";
 					_encryptionField.style.width = 300;
+					_encryptionField.RegisterValueChangedCallback(evt =>
+					{
+						AssetBundleBuilderSettingData.Setting.EncyptionClassName = _encryptionField.value;
+					});
 					encryptionContainer.Add(_encryptionField);
 				}
 				else
@@ -88,46 +107,52 @@ namespace YooAsset.Editor
 					encryptionContainer.Add(_encryptionField);
 				}
 
-				// 附加后缀格式
-				_appendExtensionToggle = root.Q<Toggle>("AppendExtension");
-
-				// 强制构建
-				_forceRebuildToggle = root.Q<Toggle>("ForceRebuild");
-				_forceRebuildToggle.SetValueWithoutNotify(true);
-				_forceRebuildToggle.RegisterValueChangedCallback(evt =>
+				// 压缩方式
+				_compressionField = root.Q<EnumField>("Compression");
+				_compressionField.Init(AssetBundleBuilderSettingData.Setting.CompressOption);
+				_compressionField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.CompressOption);
+				_compressionField.style.width = 300;	
+				_compressionField.RegisterValueChangedCallback(evt =>
 				{
-					_buildTagsTxt.SetEnabled(_forceRebuildToggle.value);
+					AssetBundleBuilderSettingData.Setting.CompressOption = (ECompressOption)_compressionField.value;
 				});
 
-				// 内置标签
-				_buildTagsTxt = root.Q<TextField>("BuildinTags");
-				_buildTagsTxt.SetEnabled(_forceRebuildToggle.value);
+				// 附加后缀格式
+				_appendExtensionToggle = root.Q<Toggle>("AppendExtension");
+				_appendExtensionToggle.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.AppendExtension);
+				_appendExtensionToggle.RegisterValueChangedCallback(evt =>
+				{
+					AssetBundleBuilderSettingData.Setting.AppendExtension = _appendExtensionToggle.value;
+				});
 
 				// 构建按钮
 				var buildButton = root.Q<Button>("Build");
 				buildButton.clicked += BuildButton_clicked; ;
+
+				RefreshWindow();
 			}
 			catch (Exception e)
 			{
 				Debug.LogError(e.ToString());
 			}
 		}
+		public void OnDestroy()
+		{
+			AssetBundleBuilderSettingData.SaveFile();
+		}
 
+		private void RefreshWindow()
+		{
+			bool enableElement = AssetBundleBuilderSettingData.Setting.BuildMode == EBuildMode.ForceRebuild;
+			_buildTagsField.SetEnabled(enableElement);
+			_encryptionField.SetEnabled(enableElement);
+			_compressionField.SetEnabled(enableElement);
+			_appendExtensionToggle.SetEnabled(enableElement);
+		}
 		private void BuildButton_clicked()
 		{
-			string title;
-			string content;
-			if (_forceRebuildToggle.value)
-			{
-				title = "警告";
-				content = "确定开始强制构建吗，这样会删除所有已有构建的文件";
-			}
-			else
-			{
-				title = "提示";
-				content = "确定开始增量构建吗";
-			}
-			if (EditorUtility.DisplayDialog(title, content, "Yes", "No"))
+			var buildMode = AssetBundleBuilderSettingData.Setting.BuildMode;
+			if (EditorUtility.DisplayDialog("提示", $"通过构建模式【{buildMode}】来构建！", "Yes", "No"))
 			{
 				EditorTools.ClearUnityConsole();
 				EditorApplication.delayCall += ExecuteBuild;
@@ -145,32 +170,39 @@ namespace YooAsset.Editor
 		{
 			string defaultOutputRoot = AssetBundleBuilderHelper.GetDefaultOutputRoot();
 			BuildParameters buildParameters = new BuildParameters();
-			buildParameters.VerifyBuildingResult = true;
 			buildParameters.OutputRoot = defaultOutputRoot;
 			buildParameters.BuildTarget = _buildTarget;
+			buildParameters.BuildMode = (EBuildMode)_buildModeField.value;
 			buildParameters.BuildVersion = _buildVersionField.value;
-			buildParameters.CompressOption = (ECompressOption)_compressionField.value;
+			buildParameters.BuildinTags = _buildTagsField.value;
+			buildParameters.VerifyBuildingResult = true;
+			buildParameters.EnableAddressable = AssetBundleGrouperSettingData.Setting.EnableAddressable;
 			buildParameters.AppendFileExtension = _appendExtensionToggle.value;
 			buildParameters.EncryptionServices = CreateEncryptionServicesInstance();
-			buildParameters.ForceRebuild = _forceRebuildToggle.value;
-			buildParameters.BuildinTags = _buildTagsTxt.value;
+			buildParameters.CompressOption = (ECompressOption)_compressionField.value;
 
 			AssetBundleBuilder builder = new AssetBundleBuilder();
 			builder.Run(buildParameters);
 		}
 
-		/// <summary>
-		/// 获取加密类的类型列表
-		/// </summary>
+		// 加密类相关
+		private int GetEncryptionDefaultIndex(string className)
+		{
+			for (int index = 0; index < _encryptionServicesClassNames.Count; index++)
+			{
+				if (_encryptionServicesClassNames[index] == className)
+				{
+					return index;
+				}
+			}
+			return 0;
+		}
 		private List<Type> GetEncryptionServicesClassTypes()
 		{
-			List<Type> classTypes = AssemblyUtility.GetAssignableTypes(AssemblyUtility.UnityDefaultAssemblyEditorName, typeof(IEncryptionServices));
+			TypeCache.TypeCollection collection = TypeCache.GetTypesDerivedFrom<IEncryptionServices>();
+			List<Type> classTypes = collection.ToList();
 			return classTypes;
 		}
-
-		/// <summary>
-		/// 创建加密类的实例
-		/// </summary>
 		private IEncryptionServices CreateEncryptionServicesInstance()
 		{
 			if (_encryptionField.index < 0)

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.uxml

@@ -3,10 +3,10 @@
     <ui:VisualElement name="BuildContainer">
         <ui:TextField picking-mode="Ignore" label="Build Output" name="BuildOutput" />
         <uie:IntegerField label="Build Version" value="0" name="BuildVersion" />
-        <uie:EnumField label="Compression" value="Center" name="Compression" />
+        <uie:EnumField label="Build Mode" name="BuildMode" />
         <ui:VisualElement name="EncryptionContainer" style="height: 24px;" />
+        <uie:EnumField label="Compression" value="Center" name="Compression" />
         <ui:Toggle label="Append Extension" name="AppendExtension" style="height: 15px;" />
-        <ui:Toggle label="Force Rebuild" name="ForceRebuild" />
         <ui:TextField picking-mode="Ignore" label="Buildin Tags" name="BuildinTags" />
         <ui:Button text="构建" display-tooltip-when-elided="true" name="Build" style="height: 50px; background-color: rgb(40, 106, 42); margin-top: 10px;" />
     </ui:VisualElement>

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleRuntimeBuilder.cs

@@ -0,0 +1,45 @@
+using System;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+	public static class AssetBundleRuntimeBuilder
+	{
+		private static string _manifestFilePath = string.Empty;
+
+		/// <summary>
+		/// 快速模式构建
+		/// </summary>
+		public static void FastBuild()
+		{
+			string defaultOutputRoot = AssetBundleBuilderHelper.GetDefaultOutputRoot();
+			BuildParameters buildParameters = new BuildParameters();
+			buildParameters.OutputRoot = defaultOutputRoot;
+			buildParameters.BuildTarget = EditorUserBuildSettings.activeBuildTarget;
+			buildParameters.BuildMode = EBuildMode.FastRunBuild;
+			buildParameters.BuildVersion = AssetBundleBuilderSettingData.Setting.BuildVersion;
+			buildParameters.BuildinTags = AssetBundleBuilderSettingData.Setting.BuildTags;
+			buildParameters.EnableAddressable = AssetBundleGrouperSettingData.Setting.EnableAddressable;
+
+			AssetBundleBuilder builder = new AssetBundleBuilder();
+			bool buildResult = builder.Run(buildParameters);
+			if (buildResult)
+			{
+				string pipelineOutputDirectory = AssetBundleBuilderHelper.MakePipelineOutputDirectory(buildParameters.OutputRoot, buildParameters.BuildTarget);
+				_manifestFilePath = $"{pipelineOutputDirectory}_{EBuildMode.FastRunBuild}/{YooAssetSettingsData.GetPatchManifestFileName(buildParameters.BuildVersion)}";
+			}
+			else
+			{
+				_manifestFilePath = null;
+			}
+		}
+		
+		/// <summary>
+		/// 获取构建的补丁清单文件路径
+		/// </summary>
+		public static string GetPatchManifestFilePath()
+		{
+			return _manifestFilePath;
+		}
+	}
+}

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleRuntimeBuilder.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f94918fa1ea63c34fa0e49fdad4119cf
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/YooAsset/Editor/AssetBundleBuilder/BuildAssetInfo.cs

@@ -1,15 +1,25 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace YooAsset.Editor
 {
 	public class BuildAssetInfo
 	{
+		private string _mainBundleName;
+		private string _shareBundleName;
+		private readonly HashSet<string> _referenceBundleNames = new HashSet<string>();
+
 		/// <summary>
-		/// 资源包名称
+		/// 收集器类型
 		/// </summary>
-		public string BundleName { private set; get; }
+		public ECollectorType CollectorType { private set; get; }
+
+		/// <summary>
+		/// 可寻址地址
+		/// </summary>
+		public string Address { private set; get; }
 
 		/// <summary>
 		/// 资源路径
@@ -22,19 +32,9 @@ namespace YooAsset.Editor
 		public bool IsRawAsset { private set; get; }
 
 		/// <summary>
-		/// 不写入资源列表
+		/// 是否为着色器资源
 		/// </summary>
-		public bool NotWriteToAssetList { private set; get; }
-
-		/// <summary>
-		/// 是否为主动收集资源
-		/// </summary>
-		public bool IsCollectAsset { private set; get; }
-
-		/// <summary>
-		/// 被依赖次数
-		/// </summary>
-		public int DependCount = 0;
+		public bool IsShaderAsset { private set; get; }
 
 		/// <summary>
 		/// 资源分类标签列表
@@ -48,21 +48,35 @@ namespace YooAsset.Editor
 		public List<BuildAssetInfo> AllDependAssetInfos { private set; get; }
 
 
-		public BuildAssetInfo(string assetPath, bool isRawAsset, bool notWriteToAssetList)
+		public BuildAssetInfo(ECollectorType collectorType, string mainBundleName, string address, string assetPath, bool isRawAsset)
 		{
+			_mainBundleName = mainBundleName;
+			CollectorType = collectorType;
+			Address = address;
 			AssetPath = assetPath;
 			IsRawAsset = isRawAsset;
-			NotWriteToAssetList = notWriteToAssetList;
-			IsCollectAsset = true;
+
+			System.Type assetType = UnityEditor.AssetDatabase.GetMainAssetTypeAtPath(assetPath);
+			if (assetType == typeof(UnityEngine.Shader))
+				IsShaderAsset = true;
+			else
+				IsShaderAsset = false;
 		}
-		public BuildAssetInfo(string assetPath)
+		public BuildAssetInfo(ECollectorType collectorType, string assetPath)
 		{
+			CollectorType = collectorType;
+			Address = string.Empty;
 			AssetPath = assetPath;
 			IsRawAsset = false;
-			NotWriteToAssetList = true;
-			IsCollectAsset = false;
+
+			System.Type assetType = UnityEditor.AssetDatabase.GetMainAssetTypeAtPath(assetPath);
+			if (assetType == typeof(UnityEngine.Shader))
+				IsShaderAsset = true;
+			else
+				IsShaderAsset = false;
 		}
 
+
 		/// <summary>
 		/// 设置所有依赖的资源
 		/// </summary>
@@ -74,17 +88,6 @@ namespace YooAsset.Editor
 			AllDependAssetInfos = dependAssetInfos;
 		}
 
-		/// <summary>
-		/// 设置资源包名称
-		/// </summary>
-		public void SetBundleName(string bundleName)
-		{
-			if (string.IsNullOrEmpty(BundleName) == false)
-				throw new System.Exception("Should never get here !");
-
-			BundleName = bundleName;	
-		}
-
 		/// <summary>
 		/// 添加资源分类标签
 		/// </summary>
@@ -92,30 +95,91 @@ namespace YooAsset.Editor
 		{
 			foreach (var tag in tags)
 			{
-				AddAssetTag(tag);
+				if (AssetTags.Contains(tag) == false)
+				{
+					AssetTags.Add(tag);
+				}
 			}
 		}
 
 		/// <summary>
-		/// 添加资源分类标签
+		/// 资源包名是否存在
 		/// </summary>
-		public void  AddAssetTag(string tag)
+		public bool HasBundleName()
 		{
-			if (AssetTags.Contains(tag) == false)
-			{
-				AssetTags.Add(tag);
-			}
-		}
-
-		/// <summary>
-		/// 资源包名称是否有效
-		/// </summary>
-		public bool BundleNameIsValid()
-		{
-			if (string.IsNullOrEmpty(BundleName))
+			string bundleName = GetBundleName();
+			if (string.IsNullOrEmpty(bundleName))
 				return false;
 			else
 				return true;
 		}
+
+		/// <summary>
+		/// 获取资源包名称
+		/// </summary>
+		public string GetBundleName()
+		{
+			if (CollectorType == ECollectorType.None)
+				return _shareBundleName;
+			else
+				return _mainBundleName;
+		}
+
+		/// <summary>
+		/// 添加关联的资源包名称
+		/// </summary>
+		public void AddReferenceBundleName(string bundleName)
+		{
+			if (string.IsNullOrEmpty(bundleName))
+				throw new Exception("Should never get here !");
+
+			if (_referenceBundleNames.Contains(bundleName) == false)
+				_referenceBundleNames.Add(bundleName);
+		}
+
+		/// <summary>
+		/// 计算主资源或共享资源的完整包名
+		/// </summary>
+		public void CalculateFullBundleName()
+		{
+			if (CollectorType == ECollectorType.None)
+			{
+				if (IsRawAsset)
+					throw new Exception("Should never get here !");
+
+				if (AssetBundleGrouperSettingData.Setting.AutoCollectShaders)
+				{
+					if (IsShaderAsset)
+					{
+						string shareBundleName = $"{AssetBundleGrouperSettingData.Setting.ShadersBundleName}.{YooAssetSettingsData.Setting.AssetBundleFileVariant}";
+						_shareBundleName = EditorTools.GetRegularPath(shareBundleName).ToLower();
+						return;
+					}
+				}
+
+				if (_referenceBundleNames.Count > 1)
+				{
+					var bundleNameList = _referenceBundleNames.ToList();
+					bundleNameList.Sort();
+					string combineName = string.Join("|", bundleNameList);
+					var combineNameHash = HashUtility.StringSHA1(combineName);
+					var shareBundleName = $"share_{combineNameHash}.{YooAssetSettingsData.Setting.AssetBundleFileVariant}";
+					_shareBundleName = EditorTools.GetRegularPath(shareBundleName).ToLower();
+				}
+			}
+			else
+			{
+				if (IsRawAsset)
+				{
+					string mainBundleName = $"{_mainBundleName}.{YooAssetSettingsData.Setting.RawFileVariant}";
+					_mainBundleName = EditorTools.GetRegularPath(mainBundleName).ToLower();
+				}
+				else
+				{
+					string mainBundleName = $"{_mainBundleName}.{YooAssetSettingsData.Setting.AssetBundleFileVariant}";
+					_mainBundleName = EditorTools.GetRegularPath(mainBundleName).ToLower(); ;
+				}
+			}
+		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildBundleInfo.cs

@@ -105,7 +105,7 @@ namespace YooAsset.Editor
 		/// </summary>
 		public BuildAssetInfo[] GetAllPatchAssetInfos()
 		{
-			return BuildinAssets.Where(t => t.IsCollectAsset && t.NotWriteToAssetList == false).ToArray();
+			return BuildinAssets.Where(t => t.CollectorType == ECollectorType.MainAssetCollector).ToArray();
 		}
 
 		/// <summary>

Assets/YooAsset/Editor/AssetBundleBuilder/BuildMapContext.cs

@@ -25,13 +25,17 @@ namespace YooAsset.Editor
 		/// </summary>
 		public void PackAsset(BuildAssetInfo assetInfo)
 		{
-			if (TryGetBundleInfo(assetInfo.BundleName, out BuildBundleInfo bundleInfo))
+			string bundleName = assetInfo.GetBundleName();
+			if (string.IsNullOrEmpty(bundleName))
+				throw new Exception("Should never get here !");
+
+			if (TryGetBundleInfo(bundleName, out BuildBundleInfo bundleInfo))
 			{
 				bundleInfo.PackAsset(assetInfo);
 			}
 			else
 			{
-				BuildBundleInfo newBundleInfo = new BuildBundleInfo(assetInfo.BundleName);
+				BuildBundleInfo newBundleInfo = new BuildBundleInfo(bundleName);
 				newBundleInfo.PackAsset(assetInfo);
 				BundleInfos.Add(newBundleInfo);
 			}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildMapCreater.cs

@@ -0,0 +1,134 @@
+using System;
+using System.Linq;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset.Editor
+{
+	public static class BuildMapCreater
+	{
+		/// <summary>
+		/// 执行资源构建上下文
+		/// </summary>
+		public static BuildMapContext CreateBuildMap()
+		{
+			BuildMapContext context = new BuildMapContext();
+			Dictionary<string, BuildAssetInfo> buildAssetDic = new Dictionary<string, BuildAssetInfo>(1000);
+
+			// 1. 检测配置合法性
+			AssetBundleGrouperSettingData.Setting.CheckConfigError();
+
+			// 2. 获取所有主动收集的资源
+			List<CollectAssetInfo> allCollectAssets = AssetBundleGrouperSettingData.Setting.GetAllCollectAssets();
+
+			// 3. 剔除未被引用的依赖资源
+			List<CollectAssetInfo> removeDependList = new List<CollectAssetInfo>();
+			foreach (var collectAssetInfo in allCollectAssets)
+			{
+				if (collectAssetInfo.CollectorType == ECollectorType.DependAssetCollector)
+				{
+					if (IsRemoveDependAsset(allCollectAssets, collectAssetInfo.AssetPath))
+						removeDependList.Add(collectAssetInfo);
+				}
+			}
+			foreach (var removeValue in removeDependList)
+			{
+				allCollectAssets.Remove(removeValue);
+			}
+
+			// 4. 录入主动收集的资源
+			foreach (var collectAssetInfo in allCollectAssets)
+			{
+				if (buildAssetDic.ContainsKey(collectAssetInfo.AssetPath) == false)
+				{
+					var buildAssetInfo = new BuildAssetInfo(collectAssetInfo.CollectorType, collectAssetInfo.BundleName, collectAssetInfo.Address, collectAssetInfo.AssetPath, collectAssetInfo.IsRawAsset);
+					buildAssetInfo.AddAssetTags(collectAssetInfo.AssetTags);
+					buildAssetDic.Add(collectAssetInfo.AssetPath, buildAssetInfo);
+				}
+				else
+				{
+					throw new Exception($"Should never get here !");
+				}
+			}
+
+			// 5. 录入相关依赖的资源
+			foreach (var collectAssetInfo in allCollectAssets)
+			{
+				foreach (var dependAssetPath in collectAssetInfo.DependAssets)
+				{
+					if (buildAssetDic.ContainsKey(dependAssetPath))
+					{
+						buildAssetDic[dependAssetPath].AddAssetTags(collectAssetInfo.AssetTags);
+						buildAssetDic[dependAssetPath].AddReferenceBundleName(collectAssetInfo.BundleName);
+					}
+					else
+					{
+						var buildAssetInfo = new BuildAssetInfo(ECollectorType.None, dependAssetPath);
+						buildAssetInfo.AddAssetTags(collectAssetInfo.AssetTags);
+						buildAssetInfo.AddReferenceBundleName(collectAssetInfo.BundleName);
+						buildAssetDic.Add(dependAssetPath, buildAssetInfo);
+					}
+				}
+			}
+			context.AssetFileCount = buildAssetDic.Count;
+
+			// 6. 填充主动收集资源的依赖列表
+			foreach (var collectAssetInfo in allCollectAssets)
+			{
+				var dependAssetInfos = new List<BuildAssetInfo>(collectAssetInfo.DependAssets.Count);
+				foreach (var dependAssetPath in collectAssetInfo.DependAssets)
+				{
+					if (buildAssetDic.TryGetValue(dependAssetPath, out BuildAssetInfo value))
+						dependAssetInfos.Add(value);
+					else
+						throw new Exception("Should never get here !");
+				}
+				buildAssetDic[collectAssetInfo.AssetPath].SetAllDependAssetInfos(dependAssetInfos);
+			}
+
+			// 7. 计算完整的资源包名
+			foreach (KeyValuePair<string, BuildAssetInfo> pair in buildAssetDic)
+			{
+				pair.Value.CalculateFullBundleName();
+			}
+
+			// 8. 移除未参与构建的资源
+			List<BuildAssetInfo> removeBuildList = new List<BuildAssetInfo>();
+			foreach (KeyValuePair<string, BuildAssetInfo> pair in buildAssetDic)
+			{
+				var buildAssetInfo = pair.Value;
+				if (buildAssetInfo.HasBundleName() == false)
+					removeBuildList.Add(buildAssetInfo);
+			}
+			foreach (var removeValue in removeBuildList)
+			{
+				buildAssetDic.Remove(removeValue.AssetPath);
+			}
+
+			// 9. 构建资源包
+			var allBuildinAssets = buildAssetDic.Values.ToList();
+			if (allBuildinAssets.Count == 0)
+				throw new Exception("构建的资源列表不能为空");
+			foreach (var assetInfo in allBuildinAssets)
+			{
+				context.PackAsset(assetInfo);
+			}
+			return context;
+		}
+		private static bool IsRemoveDependAsset(List<CollectAssetInfo> allCollectAssets, string dependAssetPath)
+		{
+			foreach (var collectAssetInfo in allCollectAssets)
+			{
+				var collectorType = collectAssetInfo.CollectorType;
+				if (collectorType == ECollectorType.MainAssetCollector || collectorType == ECollectorType.StaticAssetCollector)
+				{
+					if (collectAssetInfo.DependAssets.Contains(dependAssetPath))
+						return false;
+				}
+			}
+
+			BuildRunner.Log($"发现未被依赖的资源并自动移除 : {dependAssetPath}");
+			return true;
+		}
+	}
+}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildMapHelper.cs

@@ -1,113 +0,0 @@
-using System;
-using System.Linq;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace YooAsset.Editor
-{
-	public static class BuildMapHelper
-	{
-		/// <summary>
-		/// 执行资源构建上下文
-		/// </summary>
-		public static BuildMapContext SetupBuildMap()
-		{
-			BuildMapContext context = new BuildMapContext();
-			Dictionary<string, BuildAssetInfo> buildAssetDic = new Dictionary<string, BuildAssetInfo>();
-
-			// 0. 检测配置合法性
-			AssetBundleGrouperSettingData.Setting.CheckConfigError();
-
-			// 1. 获取主动收集的资源
-			List<CollectAssetInfo> collectAssetInfos = AssetBundleGrouperSettingData.Setting.GetAllCollectAssets();
-
-			// 2. 录入主动收集的资源
-			foreach (var collectAssetInfo in collectAssetInfos)
-			{
-				if (buildAssetDic.ContainsKey(collectAssetInfo.AssetPath) == false)
-				{
-					var buildAssetInfo = new BuildAssetInfo(collectAssetInfo.AssetPath, collectAssetInfo.IsRawAsset, collectAssetInfo.NotWriteToAssetList);	
-					buildAssetInfo.SetBundleName(collectAssetInfo.BundleName);
-					buildAssetInfo.AddAssetTags(collectAssetInfo.AssetTags);
-					buildAssetDic.Add(collectAssetInfo.AssetPath, buildAssetInfo);
-				}
-				else
-				{
-					throw new Exception($"Should never get here !");
-				}
-			}
-
-			// 3. 录入并分析依赖资源
-			foreach (var collectAssetInfo in collectAssetInfos)
-			{
-				foreach (var dependAssetPath in collectAssetInfo.DependAssets)
-				{
-					if (buildAssetDic.ContainsKey(dependAssetPath))
-					{
-						buildAssetDic[dependAssetPath].DependCount++;
-						buildAssetDic[dependAssetPath].AddAssetTags(collectAssetInfo.AssetTags);
-					}
-					else
-					{
-						var buildAssetInfo = new BuildAssetInfo(dependAssetPath);
-						buildAssetInfo.AddAssetTags(collectAssetInfo.AssetTags);
-						buildAssetDic.Add(dependAssetPath, buildAssetInfo);
-					}
-				}
-			}
-			context.AssetFileCount = buildAssetDic.Count;
-
-			// 4. 设置主动收集资源的依赖列表
-			foreach (var collectAssetInfo in collectAssetInfos)
-			{
-				var dependAssetInfos = new List<BuildAssetInfo>(collectAssetInfo.DependAssets.Count);
-				foreach (var dependAssetPath in collectAssetInfo.DependAssets)
-				{
-					if (buildAssetDic.TryGetValue(dependAssetPath, out BuildAssetInfo value))
-						dependAssetInfos.Add(value);
-					else
-						throw new Exception("Should never get here !");
-				}
-				buildAssetDic[collectAssetInfo.AssetPath].SetAllDependAssetInfos(dependAssetInfos);
-			}
-
-			// 5. 移除零依赖的资源
-			List<BuildAssetInfo> removeList = new List<BuildAssetInfo>();
-			foreach (KeyValuePair<string, BuildAssetInfo> pair in buildAssetDic)
-			{
-				var buildAssetInfo = pair.Value;
-				if (buildAssetInfo.IsCollectAsset)
-					continue;
-				if (buildAssetInfo.DependCount == 0)
-					removeList.Add(buildAssetInfo);
-			}
-			foreach (var removeValue in removeList)
-			{
-				buildAssetDic.Remove(removeValue.AssetPath);
-			}
-
-			// 6. 设置未命名的资源包
-			IPackRule defaultPackRule = new PackDirectory();
-			foreach (KeyValuePair<string, BuildAssetInfo> pair in buildAssetDic)
-			{
-				var buildAssetInfo = pair.Value;
-				if (buildAssetInfo.BundleNameIsValid() == false)
-				{
-					string bundleName = defaultPackRule.GetBundleName(new PackRuleData(buildAssetInfo.AssetPath));
-					bundleName =  AssetBundleCollector.RevisedBundleName(bundleName, false);	
-					buildAssetInfo.SetBundleName(bundleName);	
-				}
-			}
-
-			// 7. 构建资源包
-			var allBuildAssets = buildAssetDic.Values.ToList();
-			if (allBuildAssets.Count == 0)
-				throw new Exception("构建的资源列表不能为空");
-			foreach (var assetInfo in allBuildAssets)
-			{
-				context.PackAsset(assetInfo);
-			}
-			return context;
-		}
-	}
-}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs

@@ -9,11 +9,6 @@ namespace YooAsset.Editor
 	/// </summary>
 	public class BuildParameters
 	{
-		/// <summary>
-		/// 验证构建结果
-		/// </summary>
-		public bool VerifyBuildingResult = false;
-
 		/// <summary>
 		/// 输出的根目录
 		/// </summary>
@@ -24,11 +19,33 @@ namespace YooAsset.Editor
 		/// </summary>
 		public BuildTarget BuildTarget;
 
+		/// <summary>
+		/// 构建模式
+		/// </summary>
+		public EBuildMode BuildMode;
+
 		/// <summary>
 		/// 构建的版本（资源版本号）
 		/// </summary>
 		public int BuildVersion;
 
+		/// <summary>
+		/// 内置资源的标记列表
+		/// 注意：分号为分隔符
+		/// </summary>
+		public string BuildinTags;
+
+
+		/// <summary>
+		/// 验证构建结果
+		/// </summary>
+		public bool VerifyBuildingResult = false;
+
+		/// <summary>
+		/// 启用可寻址资源定位
+		/// </summary>
+		public bool EnableAddressable = false;
+
 		/// <summary>
 		/// 启用自动分包机制
 		/// 说明：自动分包机制可以实现资源零冗余
@@ -40,27 +57,16 @@ namespace YooAsset.Editor
 		/// </summary>
 		public bool AppendFileExtension = false;
 
+
 		/// <summary>
 		/// 加密类
 		/// </summary>
-		public IEncryptionServices EncryptionServices;
-
-
-		/// <summary>
-		/// 强制重新构建整个项目，如果为FALSE则是增量打包
-		/// </summary>
-		public bool ForceRebuild;
-
-		/// <summary>
-		/// 内置资源的标记列表
-		/// 注意：分号为分隔符
-		/// </summary>
-		public string BuildinTags;
+		public IEncryptionServices EncryptionServices = null;
 
 		/// <summary>
 		/// 压缩选项
 		/// </summary>
-		public ECompressOption CompressOption;
+		public ECompressOption CompressOption = ECompressOption.Uncompressed;
 
 		/// <summary>
 		/// 文件名附加上哈希值

Assets/YooAsset/Editor/AssetBundleBuilder/BuildReport/ReportAssetInfo.cs

@@ -7,15 +7,31 @@ namespace YooAsset.Editor
 	[Serializable]
 	public class ReportAssetInfo
 	{
+		/// <summary>
+		/// 可寻址地址
+		/// </summary>
+		public string Address;
+
 		/// <summary>
 		/// 资源路径
 		/// </summary>
 		public string AssetPath;
 
+		/// <summary>
+		/// 资源GUID
+		/// 说明：Meta文件记录的GUID
+		/// </summary>
+		public string AssetGUID;
+		
 		/// <summary>
 		/// 所属资源包名称
 		/// </summary>
-		public string MainBundle;
+		public string MainBundleName;
+
+		/// <summary>
+		/// 所属资源包的大小
+		/// </summary>
+		public long MainBundleSize;
 		
 		/// <summary>
 		/// 依赖的资源包名称列表

Assets/YooAsset/Editor/AssetBundleBuilder/BuildReport/ReportBundleInfo.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Collections;
 using System.Collections.Generic;
 
@@ -27,11 +28,6 @@ namespace YooAsset.Editor
 		/// </summary>
 		public long SizeBytes;
 
-		/// <summary>
-		/// 文件版本
-		/// </summary>
-		public int Version;
-
 		/// <summary>
 		/// Tags
 		/// </summary>
@@ -41,5 +37,13 @@ namespace YooAsset.Editor
 		/// Flags
 		/// </summary>
 		public int Flags;
+
+		public string GetTagsString()
+		{
+			if (Tags != null)
+				return String.Join(";", Tags);
+			else
+				return string.Empty;
+		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildReport/ReportSummary.cs

@@ -28,11 +28,26 @@ namespace YooAsset.Editor
 		/// </summary>
 		public BuildTarget BuildTarget;
 
+		/// <summary>
+		/// 构建模式
+		/// </summary>
+		public EBuildMode BuildMode;
+
 		/// <summary>
 		/// 构建版本
 		/// </summary>
 		public int BuildVersion;
 
+		/// <summary>
+		/// 内置资源标签
+		/// </summary>
+		public string BuildinTags;
+
+		/// <summary>
+		/// 启用可寻址资源定位
+		/// </summary>
+		public bool EnableAddressable;
+
 		/// <summary>
 		/// 启用自动分包机制
 		/// </summary>
@@ -59,8 +74,6 @@ namespace YooAsset.Editor
 		public string EncryptionServicesClassName;
 
 		// 构建参数
-		public bool ForceRebuild;
-		public string BuildinTags;
 		public ECompressOption CompressOption;
 		public bool AppendHash;
 		public bool DisableWriteTypeTree;

Assets/YooAsset/Editor/AssetBundleBuilder/BuildSystem/BuildRunner.cs

@@ -1,12 +1,15 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Reflection;
 using UnityEngine;
 
 namespace YooAsset.Editor
 {
 	public class BuildRunner
 	{
+		public static bool EnableLog = true;
+
 		/// <summary>
 		/// 执行构建流程
 		/// </summary>
@@ -24,11 +27,14 @@ namespace YooAsset.Editor
 				IBuildTask task = pipeline[i];
 				try
 				{
+					var taskAttribute = task.GetType().GetCustomAttribute<TaskAttribute>();
+					Log($"---------------------------------------->{taskAttribute.Desc}");
 					task.Run(context);
 				}
 				catch (Exception e)
 				{
-					Debug.LogError($"Build task {task.GetType().Name} failed : {e}");
+					Debug.LogError($"Build task {task.GetType().Name} failed !");
+					Debug.LogError($"Build error : {e}");
 					succeed = false;
 					break;
 				}
@@ -37,5 +43,16 @@ namespace YooAsset.Editor
 			// 返回运行结果
 			return succeed;
 		}
+
+		/// <summary>
+		/// 普通日志输出
+		/// </summary>
+		public static void Log(string info)
+		{
+			if (EnableLog)
+			{
+				UnityEngine.Debug.Log(info);
+			}	
+		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildSystem/TaskAttribute.cs

@@ -0,0 +1,14 @@
+using System;
+
+namespace YooAsset.Editor
+{
+	[AttributeUsage(AttributeTargets.Class)]
+	public class TaskAttribute : Attribute
+	{
+		public string Desc;
+		public TaskAttribute(string desc)
+		{
+			Desc = desc;
+		}
+	}
+}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildSystem/TaskAttribute.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 35749e57d9a3da84aa60c348bc6bbe9d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskBuilding.cs

@@ -8,6 +8,7 @@ using UnityEngine;
 
 namespace YooAsset.Editor
 {
+	[TaskAttribute("资源构建内容打包")]
 	public class TaskBuilding : IBuildTask
 	{
 		public class UnityManifestContext : IContextObject
@@ -20,175 +21,45 @@ namespace YooAsset.Editor
 			var buildParametersContext = context.GetContextObject<AssetBundleBuilder.BuildParametersContext>();
 			var buildMapContext = context.GetContextObject<BuildMapContext>();
 
-			Debug.Log($"开始构建......");
+			// 快速构建模式下跳过引擎构建
+			var buildMode = buildParametersContext.Parameters.BuildMode;
+			if (buildMode == EBuildMode.FastRunBuild)
+				return;
+
 			BuildAssetBundleOptions opt = buildParametersContext.GetPipelineBuildOptions();
 			AssetBundleManifest unityManifest = BuildPipeline.BuildAssetBundles(buildParametersContext.PipelineOutputDirectory, buildMapContext.GetPipelineBuilds(), opt, buildParametersContext.Parameters.BuildTarget);
 			if (unityManifest == null)
 				throw new Exception("构建过程中发生错误！");
 
+			BuildRunner.Log("Unity引擎打包成功！");
 			UnityManifestContext unityManifestContext = new UnityManifestContext();
 			unityManifestContext.UnityManifest = unityManifest;
 			context.SetContextObject(unityManifestContext);
 
 			// 拷贝原生文件
+			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
+			{
+				CopyRawBundle(buildMapContext, buildParametersContext);
+			}
+		}
+
+		/// <summary>
+		/// 拷贝原生文件
+		/// </summary>
+		private void CopyRawBundle(BuildMapContext buildMapContext, AssetBundleBuilder.BuildParametersContext buildParametersContext)
+		{
 			foreach (var bundleInfo in buildMapContext.BundleInfos)
 			{
 				if (bundleInfo.IsRawFile)
 				{
 					string dest = $"{buildParametersContext.PipelineOutputDirectory}/{bundleInfo.BundleName}";
-					foreach(var buildAsset in bundleInfo.BuildinAssets)
+					foreach (var buildAsset in bundleInfo.BuildinAssets)
 					{
-						if(buildAsset.IsRawAsset)
+						if (buildAsset.IsRawAsset)
 							EditorTools.CopyFile(buildAsset.AssetPath, dest, true);
 					}
 				}
 			}
-
-			// 验证构建结果
-			if (buildParametersContext.Parameters.VerifyBuildingResult)
-			{
-				VerifyingBuildingResult(context, unityManifest);
-			}
-		}
-
-		/// <summary>
-		/// 验证构建结果
-		/// </summary>
-		private void VerifyingBuildingResult(BuildContext context, AssetBundleManifest unityManifest)
-		{
-			var buildParameters = context.GetContextObject<AssetBundleBuilder.BuildParametersContext>();
-			var buildMapContext = context.GetContextObject<BuildMapContext>();
-			string[] buildedBundles = unityManifest.GetAllAssetBundles();
-
-			// 1. 过滤掉原生Bundle
-			List<BuildBundleInfo> expectBundles = new List<BuildBundleInfo>(buildedBundles.Length);
-			foreach(var bundleInfo in buildMapContext.BundleInfos)
-			{
-				if (bundleInfo.IsRawFile == false)
-					expectBundles.Add(bundleInfo);
-			}
-
-			// 2. 验证数量		
-			if (buildedBundles.Length != expectBundles.Count)
-			{
-				Debug.LogWarning($"构建过程中可能存在无效的资源，导致和预期构建的Bundle数量不一致！");
-			}
-
-			// 3. 正向验证Bundle
-			foreach (var bundleName in buildedBundles)
-			{
-				if (buildMapContext.IsContainsBundle(bundleName) == false)
-				{
-					throw new Exception($"Should never get here !");
-				}
-			}
-
-			// 4. 反向验证Bundle
-			bool isPass = true;
-			foreach (var expectBundle in expectBundles)
-			{
-				bool isMatch = false;
-				foreach (var buildedBundle in buildedBundles)
-				{
-					if (buildedBundle == expectBundle.BundleName)
-					{
-						isMatch = true;
-						break;
-					}
-				}
-				if (isMatch == false)
-				{
-					isPass = false;
-					Debug.LogWarning($"没有找到预期构建的Bundle文件 : {expectBundle.BundleName}");
-				}
-			}
-			if(isPass == false)
-			{
-				throw new Exception("构建结果验证没有通过，请参考警告日志！");
-			}
-
-			// 5. 验证Asset
-			int progressValue = 0;
-			foreach (var buildedBundle in buildedBundles)
-			{
-				string filePath = $"{buildParameters.PipelineOutputDirectory}/{buildedBundle}";
-				string[] allBuildinAssetPaths = GetAssetBundleAllAssets(filePath);
-				string[] expectBuildinAssetPaths = buildMapContext.GetBuildinAssetPaths(buildedBundle);
-				if (expectBuildinAssetPaths.Length != allBuildinAssetPaths.Length)
-				{
-					Debug.LogWarning($"构建的Bundle文件内的资源对象数量和预期不匹配 : {buildedBundle}");
-					isPass = false;
-					continue;
-				}
-
-				foreach (var buildinAssetPath in allBuildinAssetPaths)
-				{
-					var guid = AssetDatabase.AssetPathToGUID(buildinAssetPath);
-					if (string.IsNullOrEmpty(guid))
-					{
-						Debug.LogWarning($"无效的资源路径，请检查路径是否带有特殊符号或中文：{buildinAssetPath}");
-						isPass = false;
-						continue;
-					}
-
-					bool isMatch = false;
-					foreach (var exceptBuildAssetPath in expectBuildinAssetPaths)
-					{
-						var guidExcept = AssetDatabase.AssetPathToGUID(exceptBuildAssetPath);
-						if (guid == guidExcept)
-						{
-							isMatch = true;
-							break;
-						}
-					}
-					if (isMatch == false)
-					{
-						Debug.LogWarning($"在构建的Bundle文件里发现了没有匹配的资源对象：{buildinAssetPath}");
-						isPass = false;
-						continue;
-					}
-				}
-
-				EditorTools.DisplayProgressBar("验证构建结果", ++progressValue, buildedBundles.Length);
-			}
-			EditorTools.ClearProgressBar();
-			if (isPass == false)
-			{
-				throw new Exception("构建结果验证没有通过，请参考警告日志！");
-			}
-
-			// 卸载所有加载的Bundle
-			Debug.Log("构建结果验证成功！");
-		}
-
-		/// <summary>
-		/// 解析.manifest文件并获取资源列表
-		/// </summary>
-		private string[] GetAssetBundleAllAssets(string filePath)
-		{
-			string manifestFilePath = $"{filePath}.manifest";
-			List<string> assetLines = new List<string>();
-			using (StreamReader reader = File.OpenText(manifestFilePath))
-			{
-				string content;
-				bool findTarget = false;
-				while (null != (content = reader.ReadLine()))
-				{
-					if (content.StartsWith("Dependencies:"))
-						break;
-					if (findTarget == false && content.StartsWith("Assets:"))
-						findTarget = true;
-					if (findTarget)
-					{
-						if (content.StartsWith("- "))
-						{
-							string assetPath = content.TrimStart("- ".ToCharArray());
-							assetLines.Add(assetPath);
-						}
-					}
-				}
-			}
-			return assetLines.ToArray();
 		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCopyBuildinFiles.cs

@@ -6,30 +6,27 @@ using UnityEngine;
 
 namespace YooAsset.Editor
 {
-	/// <summary>
-	/// 拷贝内置文件到StreamingAssets
-	/// </summary>
+	[TaskAttribute("拷贝内置文件到流目录")]
 	public class TaskCopyBuildinFiles : IBuildTask
 	{
 		void IBuildTask.Run(BuildContext context)
 		{
 			// 注意：我们只有在强制重建的时候才会拷贝
 			var buildParameters = context.GetContextObject<AssetBundleBuilder.BuildParametersContext>();
-			if(buildParameters.Parameters.ForceRebuild)
+			if (buildParameters.Parameters.BuildMode == EBuildMode.ForceRebuild)
 			{
 				// 清空流目录
 				AssetBundleBuilderHelper.ClearStreamingAssetsFolder();
 
 				// 拷贝内置文件
-				var pipelineOutputDirectory = buildParameters.PipelineOutputDirectory;
-				CopyBuildinFilesToStreaming(pipelineOutputDirectory);
+				CopyBuildinFilesToStreaming(buildParameters.PipelineOutputDirectory, buildParameters.Parameters.BuildVersion);
 			}
 		}
 
-		private void CopyBuildinFilesToStreaming(string pipelineOutputDirectory)
+		private void CopyBuildinFilesToStreaming(string pipelineOutputDirectory, int buildVersion)
 		{
 			// 加载补丁清单
-			PatchManifest patchManifest = AssetBundleBuilderHelper.LoadPatchManifestFile(pipelineOutputDirectory);
+			PatchManifest patchManifest = AssetBundleBuilderHelper.LoadPatchManifestFile(pipelineOutputDirectory, buildVersion);
 
 			// 拷贝文件列表
 			foreach (var patchBundle in patchManifest.BundleList)
@@ -39,26 +36,33 @@ namespace YooAsset.Editor
 
 				string sourcePath = $"{pipelineOutputDirectory}/{patchBundle.BundleName}";
 				string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsFolderPath()}/{patchBundle.Hash}";
-				Debug.Log($"拷贝内置文件到流目录：{patchBundle.BundleName}");
 				EditorTools.CopyFile(sourcePath, destPath, true);
 			}
 
 			// 拷贝清单文件
 			{
-				string sourcePath = $"{pipelineOutputDirectory}/{YooAssetSettingsData.Setting.PatchManifestFileName}";
-				string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsFolderPath()}/{YooAssetSettingsData.Setting.PatchManifestFileName}";
+				string sourcePath = $"{pipelineOutputDirectory}/{YooAssetSettingsData.GetPatchManifestFileName(buildVersion)}";
+				string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsFolderPath()}/{YooAssetSettingsData.GetPatchManifestFileName(buildVersion)}";
 				EditorTools.CopyFile(sourcePath, destPath, true);
 			}
 
 			// 拷贝清单哈希文件
 			{
-				string sourcePath = $"{pipelineOutputDirectory}/{YooAssetSettingsData.Setting.PatchManifestHashFileName}";
-				string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsFolderPath()}/{YooAssetSettingsData.Setting.PatchManifestHashFileName}";
+				string sourcePath = $"{pipelineOutputDirectory}/{YooAssetSettingsData.GetPatchManifestHashFileName(buildVersion)}";
+				string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsFolderPath()}/{YooAssetSettingsData.GetPatchManifestHashFileName(buildVersion)}";
+				EditorTools.CopyFile(sourcePath, destPath, true);
+			}
+
+			// 拷贝静态版本文件
+			{
+				string sourcePath = $"{pipelineOutputDirectory}/{YooAssetSettings.VersionFileName}";
+				string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsFolderPath()}/{YooAssetSettings.VersionFileName}";
 				EditorTools.CopyFile(sourcePath, destPath, true);
 			}
 
 			// 刷新目录
 			AssetDatabase.Refresh();
+			BuildRunner.Log($"内置文件拷贝完成：{AssetBundleBuilderHelper.GetStreamingAssetsFolderPath()}");
 		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreatePatchManifest.cs

@@ -5,9 +5,7 @@ using System.Collections.Generic;
 
 namespace YooAsset.Editor
 {
-	/// <summary>
-	/// 创建补丁清单文件
-	/// </summary>
+	[TaskAttribute("创建补丁清单文件")]
 	public class TaskCreatePatchManifest : IBuildTask
 	{
 		void IBuildTask.Run(BuildContext context)
@@ -24,23 +22,32 @@ namespace YooAsset.Editor
 		private void CreatePatchManifestFile(AssetBundleBuilder.BuildParametersContext buildParameters,
 			BuildMapContext buildMapContext, TaskEncryption.EncryptionContext encryptionContext)
 		{
+			int resourceVersion = buildParameters.Parameters.BuildVersion;
+
 			// 创建新补丁清单
 			PatchManifest patchManifest = new PatchManifest();
+			patchManifest.EnableAddressable = buildParameters.Parameters.EnableAddressable;
 			patchManifest.ResourceVersion = buildParameters.Parameters.BuildVersion;
 			patchManifest.BuildinTags = buildParameters.Parameters.BuildinTags;
 			patchManifest.BundleList = GetAllPatchBundle(buildParameters, buildMapContext, encryptionContext);
-			patchManifest.AssetList = GetAllPatchAsset(buildMapContext, patchManifest);
+			patchManifest.AssetList = GetAllPatchAsset(buildParameters, buildMapContext, patchManifest);
 
 			// 创建补丁清单文件
-			string manifestFilePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.Setting.PatchManifestFileName}";
-			UnityEngine.Debug.Log($"创建补丁清单文件：{manifestFilePath}");
+			string manifestFilePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.GetPatchManifestFileName(resourceVersion)}";
+			BuildRunner.Log($"创建补丁清单文件：{manifestFilePath}");
 			PatchManifest.Serialize(manifestFilePath, patchManifest);
 
 			// 创建补丁清单哈希文件
-			string manifestHashFilePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.Setting.PatchManifestHashFileName}";
+			string manifestHashFilePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.GetPatchManifestHashFileName(resourceVersion)}";
 			string manifestHash = HashUtility.FileMD5(manifestFilePath);
-			UnityEngine.Debug.Log($"创建补丁清单哈希文件：{manifestHashFilePath}");
+			BuildRunner.Log($"创建补丁清单哈希文件：{manifestHashFilePath}");
 			FileUtility.CreateFile(manifestHashFilePath, manifestHash);
+
+			// 创建静态版本文件
+			string staticVersionFilePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettings.VersionFileName}";
+			string staticVersion = resourceVersion.ToString();
+			BuildRunner.Log($"创建静态版本文件：{staticVersionFilePath}");
+			FileUtility.CreateFile(staticVersionFilePath, staticVersion);
 		}
 
 		/// <summary>
@@ -54,21 +61,15 @@ namespace YooAsset.Editor
 			// 内置标记列表
 			List<string> buildinTags = buildParameters.Parameters.GetBuildinTags();
 
-			// 加载旧补丁清单
-			PatchManifest oldPatchManifest = null;
-			if (buildParameters.Parameters.ForceRebuild == false)
-			{
-				oldPatchManifest = AssetBundleBuilderHelper.LoadPatchManifestFile(buildParameters.PipelineOutputDirectory);
-			}
-
+			var buildMode = buildParameters.Parameters.BuildMode;
+			bool standardBuild = buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild;
 			foreach (var bundleInfo in buildMapContext.BundleInfos)
 			{
 				var bundleName = bundleInfo.BundleName;
 				string filePath = $"{buildParameters.PipelineOutputDirectory}/{bundleName}";
-				string hash = HashUtility.FileMD5(filePath);
-				string crc = HashUtility.FileCRC32(filePath);
-				long size = FileUtility.GetFileSize(filePath);
-				int version = buildParameters.Parameters.BuildVersion;
+				string hash = GetFileHash(filePath, standardBuild);
+				string crc32 = GetFileCRC(filePath, standardBuild);
+				long size = GetFileSize(filePath, standardBuild);
 				string[] tags = buildMapContext.GetAssetTags(bundleName);
 				bool isEncrypted = encryptionContext.IsEncryptFile(bundleName);
 				bool isBuildin = IsBuildinBundle(tags, buildinTags);
@@ -80,14 +81,7 @@ namespace YooAsset.Editor
 					hash += bundleInfo.GetAppendExtension();
 				}
 
-				// 注意：如果文件没有变化使用旧版本号
-				if (oldPatchManifest != null && oldPatchManifest.Bundles.TryGetValue(bundleName, out PatchBundle value))
-				{
-					if (value.Hash == hash)
-						version = value.Version;
-				}
-
-				PatchBundle patchBundle = new PatchBundle(bundleName, hash, crc, size, version, tags);
+				PatchBundle patchBundle = new PatchBundle(bundleName, hash, crc32, size, tags);
 				patchBundle.SetFlagsValue(isEncrypted, isBuildin, isRawFile);
 				result.Add(patchBundle);
 			}
@@ -107,11 +101,33 @@ namespace YooAsset.Editor
 			}
 			return false;
 		}
+		private string GetFileHash(string filePath, bool standardBuild)
+		{
+			if (standardBuild)
+				return HashUtility.FileMD5(filePath);
+			else
+				return "00000000000000000000000000000000"; //32位
+		}
+		private string GetFileCRC(string filePath, bool standardBuild)
+		{
+			if (standardBuild)
+				return HashUtility.FileCRC32(filePath);
+			else
+				return "00000000"; //8位
+		}
+		private long GetFileSize(string filePath, bool standardBuild)
+		{
+			if (standardBuild)
+				return FileUtility.GetFileSize(filePath);
+			else
+				return 0;
+		}
 
 		/// <summary>
 		/// 获取资源列表
 		/// </summary>
-		private List<PatchAsset> GetAllPatchAsset(BuildMapContext buildMapContext, PatchManifest patchManifest)
+		private List<PatchAsset> GetAllPatchAsset(AssetBundleBuilder.BuildParametersContext buildParameters,
+			BuildMapContext buildMapContext, PatchManifest patchManifest)
 		{
 			List<PatchAsset> result = new List<PatchAsset>(1000);
 			foreach (var bundleInfo in buildMapContext.BundleInfos)
@@ -120,24 +136,32 @@ namespace YooAsset.Editor
 				foreach (var assetInfo in assetInfos)
 				{
 					PatchAsset patchAsset = new PatchAsset();
+					if (buildParameters.Parameters.EnableAddressable)
+						patchAsset.Address = assetInfo.Address;
+					else
+						patchAsset.Address = string.Empty;
 					patchAsset.AssetPath = assetInfo.AssetPath;
-					patchAsset.BundleID = GetAssetBundleID(assetInfo.BundleName, patchManifest);
-					patchAsset.DependIDs = GetAssetBundleDependIDs(assetInfo, patchManifest);
+					patchAsset.BundleID = GetAssetBundleID(assetInfo.GetBundleName(), patchManifest);
+					patchAsset.DependIDs = GetAssetBundleDependIDs(patchAsset.BundleID, assetInfo, patchManifest);
 					result.Add(patchAsset);
 				}
 			}
 			return result;
 		}
-		private int[] GetAssetBundleDependIDs(BuildAssetInfo assetInfo, PatchManifest patchManifest)
+		private int[] GetAssetBundleDependIDs(int mainBundleID, BuildAssetInfo assetInfo, PatchManifest patchManifest)
 		{
 			List<int> result = new List<int>();
 			foreach (var dependAssetInfo in assetInfo.AllDependAssetInfos)
 			{
-				if (dependAssetInfo.BundleNameIsValid() == false)
-					continue;
-				int bundleID = GetAssetBundleID(dependAssetInfo.BundleName, patchManifest);
-				if (result.Contains(bundleID) == false)
-					result.Add(bundleID);
+				if (dependAssetInfo.HasBundleName())
+				{
+					int bundleID = GetAssetBundleID(dependAssetInfo.GetBundleName(), patchManifest);
+					if (mainBundleID != bundleID)
+					{
+						if (result.Contains(bundleID) == false)
+							result.Add(bundleID);
+					}
+				}
 			}
 			return result.ToArray();
 		}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreatePatchPackage.cs

@@ -3,15 +3,17 @@ using System.Collections.Generic;
 
 namespace YooAsset.Editor
 {
-	/// <summary>
-	/// 制作补丁包
-	/// </summary>
+	[TaskAttribute("制作补丁包")]
 	public class TaskCreatePatchPackage : IBuildTask
 	{
 		void IBuildTask.Run(BuildContext context)
 		{
 			var buildParameters = context.GetContextObject<AssetBundleBuilder.BuildParametersContext>();
-			CopyPatchFiles(buildParameters);
+			var buildMode = buildParameters.Parameters.BuildMode;
+			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
+			{
+				CopyPatchFiles(buildParameters);
+			}
 		}
 
 		/// <summary>
@@ -19,31 +21,37 @@ namespace YooAsset.Editor
 		/// </summary>
 		private void CopyPatchFiles(AssetBundleBuilder.BuildParametersContext buildParameters)
 		{
+			int resourceVersion = buildParameters.Parameters.BuildVersion;
 			string packageDirectory = buildParameters.GetPackageDirectory();
-			UnityEngine.Debug.Log($"开始拷贝补丁文件到补丁包目录：{packageDirectory}");
+			BuildRunner.Log($"开始拷贝补丁文件到补丁包目录：{packageDirectory}");
 
 			// 拷贝Report文件
 			{
-				string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettings.ReportFileName}";
-				string destPath = $"{packageDirectory}/{YooAssetSettings.ReportFileName}";
+				string reportFileName = YooAssetSettingsData.GetReportFileName(buildParameters.Parameters.BuildVersion);
+				string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{reportFileName}";
+				string destPath = $"{packageDirectory}/{reportFileName}";
 				EditorTools.CopyFile(sourcePath, destPath, true);
-				UnityEngine.Debug.Log($"拷贝Report文件到：{destPath}");
 			}
 
-			// 拷贝PatchManifest文件
+			// 拷贝补丁清单文件
 			{
-				string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.Setting.PatchManifestFileName}";
-				string destPath = $"{packageDirectory}/{YooAssetSettingsData.Setting.PatchManifestFileName}";
+				string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.GetPatchManifestFileName(resourceVersion)}";
+				string destPath = $"{packageDirectory}/{YooAssetSettingsData.GetPatchManifestFileName(resourceVersion)}";
 				EditorTools.CopyFile(sourcePath, destPath, true);
-				UnityEngine.Debug.Log($"拷贝PatchManifest文件到：{destPath}");
 			}
 
-			// 拷贝PatchManifest哈希文件
+			// 拷贝补丁清单哈希文件
 			{
-				string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.Setting.PatchManifestHashFileName}";
-				string destPath = $"{packageDirectory}/{YooAssetSettingsData.Setting.PatchManifestHashFileName}";
+				string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.GetPatchManifestHashFileName(resourceVersion)}";
+				string destPath = $"{packageDirectory}/{YooAssetSettingsData.GetPatchManifestHashFileName(resourceVersion)}";
+				EditorTools.CopyFile(sourcePath, destPath, true);
+			}
+
+			// 拷贝静态版本文件
+			{
+				string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettings.VersionFileName}";
+				string destPath = $"{packageDirectory}/{YooAssetSettings.VersionFileName}";
 				EditorTools.CopyFile(sourcePath, destPath, true);
-				UnityEngine.Debug.Log($"拷贝PatchManifest哈希文件到：{destPath}");
 			}
 
 			// 拷贝UnityManifest序列化文件
@@ -51,7 +59,6 @@ namespace YooAsset.Editor
 				string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.Setting.UnityManifestFileName}";
 				string destPath = $"{packageDirectory}/{YooAssetSettingsData.Setting.UnityManifestFileName}";
 				EditorTools.CopyFile(sourcePath, destPath, true);
-				UnityEngine.Debug.Log($"拷贝UnityManifest文件到：{destPath}");
 			}
 
 			// 拷贝UnityManifest文本文件
@@ -62,20 +69,15 @@ namespace YooAsset.Editor
 			}
 
 			// 拷贝所有补丁文件
-			// 注意：拷贝的补丁文件都是需要玩家热更新的文件
 			int progressValue = 0;
-			PatchManifest patchManifest = AssetBundleBuilderHelper.LoadPatchManifestFile(buildParameters.PipelineOutputDirectory);
+			PatchManifest patchManifest = AssetBundleBuilderHelper.LoadPatchManifestFile(buildParameters.PipelineOutputDirectory, buildParameters.Parameters.BuildVersion);
 			int patchFileTotalCount = patchManifest.BundleList.Count;
 			foreach (var patchBundle in patchManifest.BundleList)
 			{
-				if (patchBundle.Version == buildParameters.Parameters.BuildVersion)
-				{
-					string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{patchBundle.BundleName}";
-					string destPath = $"{packageDirectory}/{patchBundle.Hash}";
-					EditorTools.CopyFile(sourcePath, destPath, true);
-					UnityEngine.Debug.Log($"拷贝补丁文件到补丁包：{patchBundle.BundleName}");
-					EditorTools.DisplayProgressBar("拷贝补丁文件", ++progressValue, patchFileTotalCount);
-				}
+				string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{patchBundle.BundleName}";
+				string destPath = $"{packageDirectory}/{patchBundle.Hash}";
+				EditorTools.CopyFile(sourcePath, destPath, true);
+				EditorTools.DisplayProgressBar("拷贝补丁文件", ++progressValue, patchFileTotalCount);
 			}
 			EditorTools.ClearProgressBar();
 		}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreateReport.cs

@@ -1,12 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using UnityEditor;
 
 namespace YooAsset.Editor
 {
-	/// <summary>
-	/// 创建报告文件
-	/// </summary>
+	[TaskAttribute("创建构建报告文件")]
 	public class TaskCreateReport : IBuildTask
 	{
 		void IBuildTask.Run(BuildContext context)
@@ -18,7 +17,7 @@ namespace YooAsset.Editor
 
 		private void CreateReportFile(AssetBundleBuilder.BuildParametersContext buildParameters, BuildMapContext buildMapContext)
 		{
-			PatchManifest patchManifest = AssetBundleBuilderHelper.LoadPatchManifestFile(buildParameters.PipelineOutputDirectory);
+			PatchManifest patchManifest = AssetBundleBuilderHelper.LoadPatchManifestFile(buildParameters.PipelineOutputDirectory, buildParameters.Parameters.BuildVersion);
 			BuildReport buildReport = new BuildReport();
 			buildParameters.StopWatch();
 
@@ -28,17 +27,18 @@ namespace YooAsset.Editor
 				buildReport.Summary.BuildTime = DateTime.Now.ToString();
 				buildReport.Summary.BuildSeconds = buildParameters.GetBuildingSeconds();
 				buildReport.Summary.BuildTarget = buildParameters.Parameters.BuildTarget;
+				buildReport.Summary.BuildMode = buildParameters.Parameters.BuildMode;
 				buildReport.Summary.BuildVersion = buildParameters.Parameters.BuildVersion;
+				buildReport.Summary.BuildinTags = buildParameters.Parameters.BuildinTags;
+				buildReport.Summary.EnableAddressable = buildParameters.Parameters.EnableAddressable;
 				buildReport.Summary.EnableAutoCollect = buildParameters.Parameters.EnableAutoCollect;
 				buildReport.Summary.AppendFileExtension = buildParameters.Parameters.AppendFileExtension;
 				buildReport.Summary.AutoCollectShaders = AssetBundleGrouperSettingData.Setting.AutoCollectShaders;
 				buildReport.Summary.ShadersBundleName = AssetBundleGrouperSettingData.Setting.ShadersBundleName;
 				buildReport.Summary.EncryptionServicesClassName = buildParameters.Parameters.EncryptionServices == null ?
 					"null" : buildParameters.Parameters.EncryptionServices.GetType().FullName;
-				
+
 				// 构建参数
-				buildReport.Summary.ForceRebuild = buildParameters.Parameters.ForceRebuild;
-				buildReport.Summary.BuildinTags = buildParameters.Parameters.BuildinTags;
 				buildReport.Summary.CompressOption = buildParameters.Parameters.CompressOption;
 				buildReport.Summary.AppendHash = buildParameters.Parameters.AppendHash;
 				buildReport.Summary.DisableWriteTypeTree = buildParameters.Parameters.DisableWriteTypeTree;
@@ -63,8 +63,11 @@ namespace YooAsset.Editor
 			{
 				var mainBundle = patchManifest.BundleList[patchAsset.BundleID];
 				ReportAssetInfo reportAssetInfo = new ReportAssetInfo();
+				reportAssetInfo.Address = patchAsset.Address;
 				reportAssetInfo.AssetPath = patchAsset.AssetPath;
-				reportAssetInfo.MainBundle = mainBundle.BundleName;
+				reportAssetInfo.AssetGUID = AssetDatabase.AssetPathToGUID(patchAsset.AssetPath);
+				reportAssetInfo.MainBundleName = mainBundle.BundleName;
+				reportAssetInfo.MainBundleSize = mainBundle.SizeBytes;
 				reportAssetInfo.DependBundles = GetDependBundles(patchManifest, patchAsset);
 				reportAssetInfo.DependAssets = GetDependAssets(buildMapContext, mainBundle.BundleName, patchAsset.AssetPath);
 				buildReport.AssetInfos.Add(reportAssetInfo);
@@ -79,19 +82,19 @@ namespace YooAsset.Editor
 				reportBundleInfo.Hash = patchBundle.Hash;
 				reportBundleInfo.CRC = patchBundle.CRC;
 				reportBundleInfo.SizeBytes = patchBundle.SizeBytes;
-				reportBundleInfo.Version = patchBundle.Version;
 				reportBundleInfo.Tags = patchBundle.Tags;
 				reportBundleInfo.Flags = patchBundle.Flags;
 				buildReport.BundleInfos.Add(reportBundleInfo);
 			}
 
 			// 删除旧文件
-			string filePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettings.ReportFileName}";
+			string filePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.GetReportFileName(buildParameters.Parameters.BuildVersion)}";
 			if (File.Exists(filePath))
 				File.Delete(filePath);
 
 			// 序列化文件
 			BuildReport.Serialize(filePath, buildReport);
+			BuildRunner.Log($"资源构建报告文件创建完成：{filePath}");
 		}
 
 		/// <summary>

Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskEncryption.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 
 namespace YooAsset.Editor
 {
+	[TaskAttribute("资源包加密")]
 	public class TaskEncryption : IBuildTask
 	{
 		public class EncryptionContext : IContextObject
@@ -26,9 +27,19 @@ namespace YooAsset.Editor
 			var buildParameters = context.GetContextObject<AssetBundleBuilder.BuildParametersContext>();
 			var buildMapContext = context.GetContextObject<BuildMapContext>();
 
-			EncryptionContext encryptionContext = new EncryptionContext();
-			encryptionContext.EncryptList = EncryptFiles(buildParameters, buildMapContext);
-			context.SetContextObject(encryptionContext);
+			var buildMode = buildParameters.Parameters.BuildMode;
+			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
+			{
+				EncryptionContext encryptionContext = new EncryptionContext();
+				encryptionContext.EncryptList = EncryptFiles(buildParameters, buildMapContext);
+				context.SetContextObject(encryptionContext);
+			}
+			else
+			{
+				EncryptionContext encryptionContext = new EncryptionContext();
+				encryptionContext.EncryptList = new List<string>();
+				context.SetContextObject(encryptionContext);
+			}
 		}
 
 		/// <summary>
@@ -45,7 +56,6 @@ namespace YooAsset.Editor
 			if (encryptionServices == null)
 				return encryptList;
 
-			UnityEngine.Debug.Log($"开始加密资源文件");
 			int progressValue = 0;
 			foreach (var bundleInfo in buildMapContext.BundleInfos)
 			{
@@ -66,7 +76,7 @@ namespace YooAsset.Editor
 					{
 						byte[] bytes = encryptionServices.Encrypt(fileData);
 						File.WriteAllBytes(filePath, bytes);
-						UnityEngine.Debug.Log($"文件加密完成：{filePath}");
+						BuildRunner.Log($"文件加密完成：{filePath}");
 					}
 				}
 
@@ -75,6 +85,8 @@ namespace YooAsset.Editor
 			}
 			EditorTools.ClearProgressBar();
 
+			if(encryptList.Count == 0)
+				UnityEngine.Debug.LogWarning($"没有发现需要加密的文件！");
 			return encryptList;
 		}
 	}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskGetBuildMap.cs

@@ -7,12 +7,14 @@ using UnityEditor;
 
 namespace YooAsset.Editor
 {
+	[TaskAttribute("获取资源构建内容")]
 	public class TaskGetBuildMap : IBuildTask
 	{
 		void IBuildTask.Run(BuildContext context)
 		{
-			var buildMapContext = BuildMapHelper.SetupBuildMap();
+			var buildMapContext = BuildMapCreater.CreateBuildMap();
 			context.SetContextObject(buildMapContext);
+			BuildRunner.Log("构建内容准备完毕！");
 
 			// 检测构建结果
 			CheckBuildMapContent(buildMapContext);
@@ -30,7 +32,7 @@ namespace YooAsset.Editor
 				if (isRawFile)
 				{
 					if (bundleInfo.BuildinAssets.Count != 1)
-						throw new Exception("The bundle does not support multiple raw asset : {bundleInfo.BundleName}");
+						throw new Exception($"The bundle does not support multiple raw asset : {bundleInfo.BundleName}");
 					continue;
 				}
 

Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskPrepare.cs

@@ -6,6 +6,7 @@ using UnityEditor;
 
 namespace YooAsset.Editor
 {
+	[TaskAttribute("资源构建准备工作")]
 	public class TaskPrepare : IBuildTask
 	{
 		void IBuildTask.Run(BuildContext context)
@@ -26,7 +27,8 @@ namespace YooAsset.Editor
 				throw new Exception("输出目录不能为空");
 
 			// 增量更新时候的必要检测
-			if (buildParameters.Parameters.ForceRebuild == false)
+			var buildMode = buildParameters.Parameters.BuildMode;
+			if (buildMode == EBuildMode.IncrementalBuild)
 			{
 				// 检测历史版本是否存在
 				if (AssetBundleBuilderHelper.HasAnyPackageVersion(buildParameters.Parameters.BuildTarget, buildParameters.Parameters.OutputRoot) == false)
@@ -43,26 +45,26 @@ namespace YooAsset.Editor
 					throw new Exception($"补丁包已经存在：{packageDirectory}");
 
 				// 检测内置资源分类标签是否一致
-				PatchManifest oldPatchManifest = AssetBundleBuilderHelper.LoadPatchManifestFile(buildParameters.PipelineOutputDirectory);
+				var oldPatchManifest = AssetBundleBuilderHelper.GetOldPatchManifest(buildParameters.PipelineOutputDirectory);
 				if (buildParameters.Parameters.BuildinTags != oldPatchManifest.BuildinTags)
 					throw new Exception($"增量更新时内置资源标签必须一致：{buildParameters.Parameters.BuildinTags} != {oldPatchManifest.BuildinTags}");
 			}
 
 			// 如果是强制重建
-			if (buildParameters.Parameters.ForceRebuild)
+			if (buildMode == EBuildMode.ForceRebuild)
 			{
 				// 删除平台总目录
 				string platformDirectory = $"{buildParameters.Parameters.OutputRoot}/{buildParameters.Parameters.BuildTarget}";
 				if (EditorTools.DeleteDirectory(platformDirectory))
 				{
-					UnityEngine.Debug.Log($"删除平台总目录：{platformDirectory}");
+					BuildRunner.Log($"删除平台总目录：{platformDirectory}");
 				}
 			}
 
 			// 如果输出目录不存在
 			if (EditorTools.CreateDirectory(buildParameters.PipelineOutputDirectory))
 			{
-				UnityEngine.Debug.Log($"创建输出目录：{buildParameters.PipelineOutputDirectory}");
+				BuildRunner.Log($"创建输出目录：{buildParameters.PipelineOutputDirectory}");
 			}
 		}
 	}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskVerifyBuildResult.cs

@@ -0,0 +1,174 @@
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("验证构建结果")]
+	public class TaskVerifyBuildResult : IBuildTask
+	{
+		void IBuildTask.Run(BuildContext context)
+		{
+			var buildParametersContext = context.GetContextObject<AssetBundleBuilder.BuildParametersContext>();
+			
+			// 快速构建模式下跳过验证
+			if (buildParametersContext.Parameters.BuildMode == EBuildMode.FastRunBuild)
+				return;
+
+			// 验证构建结果
+			if (buildParametersContext.Parameters.VerifyBuildingResult)
+			{
+				var unityManifestContext = context.GetContextObject<TaskBuilding.UnityManifestContext>();
+				VerifyingBuildingResult(context, unityManifestContext.UnityManifest);
+			}
+		}
+
+		/// <summary>
+		/// 验证构建结果
+		/// </summary>
+		private void VerifyingBuildingResult(BuildContext context, AssetBundleManifest unityManifest)
+		{
+			var buildParameters = context.GetContextObject<AssetBundleBuilder.BuildParametersContext>();
+			var buildMapContext = context.GetContextObject<BuildMapContext>();
+			string[] buildedBundles = unityManifest.GetAllAssetBundles();
+
+			// 1. 过滤掉原生Bundle
+			List<BuildBundleInfo> expectBundles = new List<BuildBundleInfo>(buildedBundles.Length);
+			foreach(var bundleInfo in buildMapContext.BundleInfos)
+			{
+				if (bundleInfo.IsRawFile == false)
+					expectBundles.Add(bundleInfo);
+			}
+
+			// 2. 验证数量		
+			if (buildedBundles.Length != expectBundles.Count)
+			{
+				Debug.LogWarning($"构建过程中可能存在无效的资源，导致和预期构建的Bundle数量不一致！");
+			}
+
+			// 3. 正向验证Bundle
+			foreach (var bundleName in buildedBundles)
+			{
+				if (buildMapContext.IsContainsBundle(bundleName) == false)
+				{
+					throw new Exception($"Should never get here !");
+				}
+			}
+
+			// 4. 反向验证Bundle
+			bool isPass = true;
+			foreach (var expectBundle in expectBundles)
+			{
+				bool isMatch = false;
+				foreach (var buildedBundle in buildedBundles)
+				{
+					if (buildedBundle == expectBundle.BundleName)
+					{
+						isMatch = true;
+						break;
+					}
+				}
+				if (isMatch == false)
+				{
+					isPass = false;
+					Debug.LogWarning($"没有找到预期构建的Bundle文件 : {expectBundle.BundleName}");
+				}
+			}
+			if(isPass == false)
+			{
+				throw new Exception("构建结果验证没有通过，请参考警告日志！");
+			}
+
+			// 5. 验证Asset
+			var buildMode = buildParameters.Parameters.BuildMode;
+			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
+			{
+				int progressValue = 0;
+				foreach (var buildedBundle in buildedBundles)
+				{
+					string filePath = $"{buildParameters.PipelineOutputDirectory}/{buildedBundle}";
+					string[] allBuildinAssetPaths = GetAssetBundleAllAssets(filePath);
+					string[] expectBuildinAssetPaths = buildMapContext.GetBuildinAssetPaths(buildedBundle);
+					if (expectBuildinAssetPaths.Length != allBuildinAssetPaths.Length)
+					{
+						Debug.LogWarning($"构建的Bundle文件内的资源对象数量和预期不匹配 : {buildedBundle}");
+						isPass = false;
+						continue;
+					}
+
+					foreach (var buildinAssetPath in allBuildinAssetPaths)
+					{
+						var guid = AssetDatabase.AssetPathToGUID(buildinAssetPath);
+						if (string.IsNullOrEmpty(guid))
+						{
+							Debug.LogWarning($"无效的资源路径，请检查路径是否带有特殊符号或中文：{buildinAssetPath}");
+							isPass = false;
+							continue;
+						}
+
+						bool isMatch = false;
+						foreach (var exceptBuildAssetPath in expectBuildinAssetPaths)
+						{
+							var guidExcept = AssetDatabase.AssetPathToGUID(exceptBuildAssetPath);
+							if (guid == guidExcept)
+							{
+								isMatch = true;
+								break;
+							}
+						}
+						if (isMatch == false)
+						{
+							Debug.LogWarning($"在构建的Bundle文件里发现了没有匹配的资源对象：{buildinAssetPath}");
+							isPass = false;
+							continue;
+						}
+					}
+
+					EditorTools.DisplayProgressBar("验证构建结果", ++progressValue, buildedBundles.Length);
+				}
+				EditorTools.ClearProgressBar();
+				if (isPass == false)
+				{
+					throw new Exception("构建结果验证没有通过，请参考警告日志！");
+				}
+			}
+
+			// 卸载所有加载的Bundle
+			BuildRunner.Log("构建结果验证成功！");
+		}
+
+		/// <summary>
+		/// 解析.manifest文件并获取资源列表
+		/// </summary>
+		private string[] GetAssetBundleAllAssets(string filePath)
+		{
+			string manifestFilePath = $"{filePath}.manifest";
+			List<string> assetLines = new List<string>();
+			using (StreamReader reader = File.OpenText(manifestFilePath))
+			{
+				string content;
+				bool findTarget = false;
+				while (null != (content = reader.ReadLine()))
+				{
+					if (content.StartsWith("Dependencies:"))
+						break;
+					if (findTarget == false && content.StartsWith("Assets:"))
+						findTarget = true;
+					if (findTarget)
+					{
+						if (content.StartsWith("- "))
+						{
+							string assetPath = content.TrimStart("- ".ToCharArray());
+							assetLines.Add(assetPath);
+						}
+					}
+				}
+			}
+			return assetLines.ToArray();
+		}
+	}
+}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskVerifyBuildResult.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b883ac0c3c25e8143847a9326e2961cf
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/YooAsset/Editor/AssetBundleBuilder/EBuildMode.cs

@@ -0,0 +1,29 @@
+
+namespace YooAsset.Editor
+{
+	/// <summary>
+	/// 资源包流水线的构建模式
+	/// </summary>
+	public enum EBuildMode
+	{
+		/// <summary>
+		/// 强制重建模式
+		/// </summary>
+		ForceRebuild,
+
+		/// <summary>
+		/// 增量构建模式
+		/// </summary>
+		IncrementalBuild,
+
+		/// <summary>
+		/// 快速构建模式
+		/// </summary>
+		FastRunBuild,
+
+		/// <summary>
+		/// 演练构建模式
+		/// </summary>
+		DryRunBuild,
+	}
+}

Assets/YooAsset/Editor/AssetBundleBuilder/EBuildMode.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0b6f2523a865e454d8fa3f48a2852d5a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebuggerWindow.cs

@@ -11,8 +11,7 @@ namespace YooAsset.Editor
         [MenuItem("YooAsset/AssetBundle Debugger", false, 104)]
         public static void ShowExample()
         {
-            AssetBundleDebuggerWindow wnd = GetWindow<AssetBundleDebuggerWindow>();
-            wnd.titleContent = new GUIContent("资源包调试工具");
+            AssetBundleDebuggerWindow wnd = GetWindow<AssetBundleDebuggerWindow>("资源包调试工具", true, EditorDefine.DockedWindowTypes);
             wnd.minSize = new Vector2(800, 600);
         }
 
@@ -51,7 +50,7 @@ namespace YooAsset.Editor
             VisualElement root = rootVisualElement;
 
             // 加载布局文件
-            string rootPath = EditorTools.GetYooAssetPath();
+            string rootPath = EditorTools.GetYooAssetSourcePath();
             string uxml = $"{rootPath}/Editor/AssetBundleDebugger/{nameof(AssetBundleDebuggerWindow)}.uxml";
             var visualAsset = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(uxml);
             if (visualAsset == null)

Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebuggerWindow.uxml

@@ -1,7 +1,7 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
     <uie:Toolbar name="Toolbar" style="display: flex;">
-        <uie:ToolbarButton text="刷新" display-tooltip-when-elided="true" name="SampleButton" style="width: 70px; background-color: rgb(15, 118, 31); -unity-text-align: middle-center; border-top-left-radius: 2px; border-bottom-left-radius: 2px; border-top-right-radius: 2px; border-bottom-right-radius: 2px; border-left-width: 1px; border-right-width: 1px;" />
         <uie:ToolbarMenu display-tooltip-when-elided="true" name="ViewModeMenu" text="ViewMode" style="width: 100px; flex-grow: 0;" />
         <uie:ToolbarSearchField focusable="true" name="SearchField" style="flex-grow: 1;" />
+        <uie:ToolbarButton text="刷新" display-tooltip-when-elided="true" name="SampleButton" style="width: 70px; background-color: rgb(15, 118, 31); -unity-text-align: middle-center; border-top-left-radius: 2px; border-bottom-left-radius: 2px; border-top-right-radius: 2px; border-bottom-right-radius: 2px; border-left-width: 1px; border-right-width: 1px;" />
     </uie:Toolbar>
 </ui:UXML>

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

@@ -24,7 +24,7 @@ namespace YooAsset.Editor
 		public void InitViewer()
 		{
 			// 加载布局文件
-			string rootPath = EditorTools.GetYooAssetPath();
+			string rootPath = EditorTools.GetYooAssetSourcePath();
 			string uxml = $"{rootPath}/Editor/AssetBundleDebugger/VisualViewers/{nameof(AssetListDebuggerViewer)}.uxml";
 			_visualAsset = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(uxml);
 			if (_visualAsset == null)
@@ -58,7 +58,9 @@ namespace YooAsset.Editor
 		{
 			_debugReport = debugReport;
 			_assetListView.Clear();
+			_assetListView.ClearSelection();
 			_assetListView.itemsSource = FilterViewItems(debugReport, searchKeyWord);
+			_assetListView.Rebuild();
 		}
 		private List<DebugProviderInfo> FilterViewItems(DebugReport debugReport, string searchKeyWord)
 		{
@@ -114,7 +116,7 @@ namespace YooAsset.Editor
 				label.style.unityTextAlign = TextAnchor.MiddleLeft;
 				label.style.marginLeft = 3f;
 				//label.style.flexGrow = 1f;
-				label.style.width = 100;
+				label.style.width = 150;
 				element.Add(label);
 			}
 
@@ -124,6 +126,26 @@ namespace YooAsset.Editor
 				label.style.unityTextAlign = TextAnchor.MiddleLeft;
 				label.style.marginLeft = 3f;
 				//label.style.flexGrow = 1f;
+				label.style.width = 150;
+				element.Add(label);
+			}
+
+			{
+				var label = new Label();
+				label.name = "Label4";
+				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 = "Label5";
+				label.style.unityTextAlign = TextAnchor.MiddleLeft;
+				label.style.marginLeft = 3f;
+				//label.style.flexGrow = 1f;
 				label.style.width = 120;
 				element.Add(label);
 			}
@@ -139,9 +161,17 @@ namespace YooAsset.Editor
 			var label1 = element.Q<Label>("Label1");
 			label1.text = providerInfo.AssetPath;
 
-			// Ref Count
+			// Spawn Scene
 			var label2 = element.Q<Label>("Label2");
-			label2.text = providerInfo.RefCount.ToString();
+			label2.text = providerInfo.SpawnScene;
+
+			// Spawn Time
+			var label3 = element.Q<Label>("Label3");
+			label3.text = providerInfo.SpawnTime;
+
+			// Ref Count
+			var label4 = element.Q<Label>("Label4");
+			label4.text = providerInfo.RefCount.ToString();
 
 			// Status
 			StyleColor textColor;
@@ -149,9 +179,9 @@ namespace YooAsset.Editor
 				textColor = new StyleColor(Color.yellow);
 			else
 				textColor = label1.style.color;
-			var label3 = element.Q<Label>("Label3");
-			label3.text = providerInfo.Status.ToString();
-			label3.style.color = textColor;
+			var label5 = element.Q<Label>("Label5");
+			label5.text = providerInfo.Status.ToString();
+			label5.style.color = textColor;
 		}
 		private void AssetListView_onSelectionChange(IEnumerable<object> objs)
 		{
@@ -178,16 +208,6 @@ namespace YooAsset.Editor
 				element.Add(label);
 			}
 
-			{
-				var label = new Label();
-				label.name = "Label2";
-				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 = "Label3";
@@ -219,10 +239,6 @@ namespace YooAsset.Editor
 			var label1 = element.Q<Label>("Label1");
 			label1.text = bundleInfo.BundleName;
 
-			// Version
-			var label2 = element.Q<Label>("Label2");
-			label2.text = bundleInfo.Version.ToString();
-
 			// Ref Count
 			var label3 = element.Q<Label>("Label3");
 			label3.text = bundleInfo.RefCount.ToString();
@@ -236,6 +252,7 @@ namespace YooAsset.Editor
 			_dependListView.Clear();
 			_dependListView.ClearSelection();
 			_dependListView.itemsSource = providerInfo.BundleInfos;
+			_dependListView.Rebuild();
 		}
 	}
 }

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

@@ -2,18 +2,19 @@
     <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;">
         <uie:Toolbar name="TopBar" style="height: 25px; margin-left: 1px; margin-right: 1px;">
             <uie:ToolbarButton text="Asset Path" display-tooltip-when-elided="true" name="TopBar1" style="width: 280px; -unity-text-align: middle-left; flex-grow: 1;" />
-            <uie:ToolbarButton text="Ref Count" display-tooltip-when-elided="true" name="TopBar2" style="width: 100px; -unity-text-align: middle-left; flex-grow: 0;" />
-            <uie:ToolbarButton text="Status" display-tooltip-when-elided="true" name="TopBar3" style="width: 120px; -unity-text-align: middle-left;" />
+            <uie:ToolbarButton text="Spawn Scene" display-tooltip-when-elided="true" name="TopBar2" style="width: 150px; -unity-text-align: middle-left; flex-grow: 0;" />
+            <uie:ToolbarButton text="Spawn Time" display-tooltip-when-elided="true" name="TopBar3" style="width: 150px; -unity-text-align: middle-left; flex-grow: 0;" />
+            <uie:ToolbarButton text="Ref Count" display-tooltip-when-elided="true" name="TopBar4" style="width: 100px; -unity-text-align: middle-left; flex-grow: 0;" />
+            <uie:ToolbarButton text="Status" display-tooltip-when-elided="true" name="TopBar5" style="width: 120px; -unity-text-align: middle-left;" />
         </uie:Toolbar>
-        <ui:ListView focusable="true" name="TopListView" item-height="18" style="flex-grow: 1;" />
+        <ui:ListView focusable="true" name="TopListView" item-height="18" virtualization-method="DynamicHeight" style="flex-grow: 1;" />
     </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;">
         <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;" />
             <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>
-        <ui:ListView focusable="true" name="BottomListView" item-height="18" style="flex-grow: 1;" />
+        <ui:ListView focusable="true" name="BottomListView" item-height="18" virtualization-method="DynamicHeight" style="flex-grow: 1;" />
     </ui:VisualElement>
 </ui:UXML>

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

@@ -15,7 +15,7 @@ namespace YooAsset.Editor
 		private TemplateContainer _root;
 
 		private ListView _bundleListView;
-		private ListView _includeListView;
+		private ListView _usingListView;
 		private DebugReport _debugReport;
 
 		/// <summary>
@@ -24,7 +24,7 @@ namespace YooAsset.Editor
 		public void InitViewer()
 		{
 			// 加载布局文件
-			string rootPath = EditorTools.GetYooAssetPath();
+			string rootPath = EditorTools.GetYooAssetSourcePath();
 			string uxml = $"{rootPath}/Editor/AssetBundleDebugger/VisualViewers/{nameof(BundleListDebuggerViewer)}.uxml";
 			_visualAsset = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(uxml);
 			if (_visualAsset == null)
@@ -35,7 +35,7 @@ namespace YooAsset.Editor
 			_root = _visualAsset.CloneTree();
 			_root.style.flexGrow = 1f;
 
-			// 资源列表
+			// 资源包列表
 			_bundleListView = _root.Q<ListView>("TopListView");
 			_bundleListView.makeItem = MakeAssetListViewItem;
 			_bundleListView.bindItem = BindAssetListViewItem;
@@ -45,10 +45,10 @@ namespace YooAsset.Editor
 #else
 			_bundleListView.onSelectionChanged += BundleListView_onSelectionChange;
 #endif
-			// 依赖列表
-			_includeListView = _root.Q<ListView>("BottomListView");
-			_includeListView.makeItem = MakeIncludeListViewItem;
-			_includeListView.bindItem = BindIncludeListViewItem;
+			// 使用列表
+			_usingListView = _root.Q<ListView>("BottomListView");
+			_usingListView.makeItem = MakeIncludeListViewItem;
+			_usingListView.bindItem = BindIncludeListViewItem;
 		}
 
 		/// <summary>
@@ -58,24 +58,27 @@ namespace YooAsset.Editor
 		{
 			_debugReport = debugReport;
 			_bundleListView.Clear();
+			_bundleListView.ClearSelection();
 			_bundleListView.itemsSource = FilterViewItems(debugReport, searchKeyWord);
+			_bundleListView.Rebuild();
 		}
 		private List<DebugBundleInfo> FilterViewItems(DebugReport debugReport, string searchKeyWord)
 		{
-			var result = new List<DebugBundleInfo>(debugReport.ProviderInfos.Count);
+			Dictionary<string, DebugBundleInfo> result = new Dictionary<string, DebugBundleInfo>(debugReport.ProviderInfos.Count);
 			foreach (var providerInfo in debugReport.ProviderInfos)
 			{
-				foreach(var bundleInfo in providerInfo.BundleInfos)
+				foreach (var bundleInfo in providerInfo.BundleInfos)
 				{
 					if (string.IsNullOrEmpty(searchKeyWord) == false)
 					{
 						if (bundleInfo.BundleName.Contains(searchKeyWord) == false)
 							continue;
 					}
-					result.Add(bundleInfo);
+					if (result.ContainsKey(bundleInfo.BundleName) == false)
+						result.Add(bundleInfo.BundleName, bundleInfo);
 				}
 			}
-			return result;
+			return result.Values.ToList();
 		}
 
 		/// <summary>
@@ -94,7 +97,7 @@ namespace YooAsset.Editor
 			_root.RemoveFromHierarchy();
 		}
 
-		
+
 		// 顶部列表相关
 		private VisualElement MakeAssetListViewItem()
 		{
@@ -111,16 +114,6 @@ namespace YooAsset.Editor
 				element.Add(label);
 			}
 
-			{
-				var label = new Label();
-				label.name = "Label2";
-				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 = "Label3";
@@ -152,17 +145,13 @@ namespace YooAsset.Editor
 			var label1 = element.Q<Label>("Label1");
 			label1.text = bundleInfo.BundleName;
 
-			// Version
-			var label2 = element.Q<Label>("Label2");
-			label2.text = bundleInfo.Version.ToString();
-
 			// Ref Count
 			var label3 = element.Q<Label>("Label3");
 			label3.text = bundleInfo.RefCount.ToString();
 
 			// Status
 			StyleColor textColor;
-			if (bundleInfo.Status == AssetBundleLoader.EStatus.Fail)
+			if (bundleInfo.Status == AssetBundleLoaderBase.EStatus.Failed)
 				textColor = new StyleColor(Color.yellow);
 			else
 				textColor = label1.style.color;
@@ -175,7 +164,7 @@ namespace YooAsset.Editor
 			foreach (var item in objs)
 			{
 				DebugBundleInfo bundleInfo = item as DebugBundleInfo;
-				FillIncludeListView(bundleInfo);
+				FillUsingListView(bundleInfo.BundleName);
 			}
 		}
 
@@ -201,7 +190,7 @@ namespace YooAsset.Editor
 				label.style.unityTextAlign = TextAnchor.MiddleLeft;
 				label.style.marginLeft = 3f;
 				//label.style.flexGrow = 1f;
-				label.style.width = 100;
+				label.style.width = 150;
 				element.Add(label);
 			}
 
@@ -211,41 +200,76 @@ namespace YooAsset.Editor
 				label.style.unityTextAlign = TextAnchor.MiddleLeft;
 				label.style.marginLeft = 3f;
 				//label.style.flexGrow = 1f;
+				label.style.width = 150;
+				element.Add(label);
+			}
+
+			{
+				var label = new Label();
+				label.name = "Label4";
+				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 = "Label5";
+				label.style.unityTextAlign = TextAnchor.MiddleLeft;
+				label.style.marginLeft = 3f;
+				//label.style.flexGrow = 1f;
+				label.style.width = 120;
+				element.Add(label);
+			}
+
 			return element;
 		}
 		private void BindIncludeListViewItem(VisualElement element, int index)
 		{
-			List<DebugProviderInfo> providers = _includeListView.itemsSource as List<DebugProviderInfo>;
+			List<DebugProviderInfo> providers = _usingListView.itemsSource as List<DebugProviderInfo>;
 			DebugProviderInfo providerInfo = providers[index];
 
 			// Asset Path
 			var label1 = element.Q<Label>("Label1");
 			label1.text = providerInfo.AssetPath;
 
-			// Ref Count
+			// Spawn Scene
 			var label2 = element.Q<Label>("Label2");
-			label2.text = providerInfo.RefCount.ToString();
+			label2.text = providerInfo.SpawnScene;
+
+			// Spawn Time
+			var label3 = element.Q<Label>("Label3");
+			label3.text = providerInfo.SpawnTime;
+
+			// Ref Count
+			var label4 = element.Q<Label>("Label4");
+			label4.text = providerInfo.RefCount.ToString();
 
 			// Status
-			var label3 = element.Q<Label>("Label3");
-			label3.text = providerInfo.Status.ToString();
+			var label5 = element.Q<Label>("Label5");
+			label5.text = providerInfo.Status.ToString();
 		}
-		private void FillIncludeListView(DebugBundleInfo bundleInfo)
-		{
-			_includeListView.Clear();
-			_includeListView.ClearSelection();
-
-			List<DebugProviderInfo> source = new List<DebugProviderInfo>();		
-			foreach(var providerInfo in _debugReport.ProviderInfos)
+		private void FillUsingListView(string bundleName)
+		{	
+			List<DebugProviderInfo> source = new List<DebugProviderInfo>();
+			foreach (var providerInfo in _debugReport.ProviderInfos)
 			{
-				if (providerInfo.BundleInfos.Contains(bundleInfo))
-					source.Add(providerInfo);
+				foreach (var bundleInfo in providerInfo.BundleInfos)
+				{
+					if (bundleInfo.BundleName == bundleName)
+					{
+						source.Add(providerInfo);
+						continue;
+					}
+				}
 			}
-			_includeListView.itemsSource = source;
+
+			_usingListView.Clear();
+			_usingListView.ClearSelection();
+			_usingListView.itemsSource = source;
+			_usingListView.Rebuild();
 		}
 	}
 }

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

@@ -2,18 +2,19 @@
     <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;">
         <uie:Toolbar name="TopBar" style="height: 25px; margin-left: 1px; margin-right: 1px;">
             <uie:ToolbarButton text="Bundle Name" display-tooltip-when-elided="true" name="TopBar1" style="width: 280px; -unity-text-align: middle-left; flex-grow: 1;" />
-            <uie:ToolbarButton text="Version" display-tooltip-when-elided="true" name="TopBar2" style="width: 100px; -unity-text-align: middle-left;" />
             <uie:ToolbarButton text="Ref Count" display-tooltip-when-elided="true" name="TopBar3" style="width: 100px; -unity-text-align: middle-left;" />
             <uie:ToolbarButton text="Status" display-tooltip-when-elided="true" name="TopBar4" style="width: 120px; -unity-text-align: middle-left;" />
         </uie:Toolbar>
-        <ui:ListView focusable="true" name="TopListView" item-height="18" style="flex-grow: 1;" />
+        <ui:ListView focusable="true" name="TopListView" item-height="18" virtualization-method="DynamicHeight" style="flex-grow: 1;" />
     </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;">
         <uie:Toolbar name="BottomBar" style="height: 25px; margin-left: 1px; margin-right: 1px;">
             <uie:ToolbarButton text="Using Assets" display-tooltip-when-elided="true" name="BottomBar1" style="width: 280px; -unity-text-align: middle-left; flex-grow: 1;" />
-            <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:ToolbarButton text="Spawn Scene" display-tooltip-when-elided="true" name="BottomBar2" style="width: 150px; -unity-text-align: middle-left;" />
+            <uie:ToolbarButton text="Spawn Time" display-tooltip-when-elided="true" name="BottomBar3" style="width: 150px; -unity-text-align: middle-left;" />
+            <uie:ToolbarButton text="Ref Count" display-tooltip-when-elided="true" name="BottomBar4" style="width: 100px; -unity-text-align: middle-left;" />
+            <uie:ToolbarButton text="Status" display-tooltip-when-elided="true" name="BottomBar5" style="width: 120px; -unity-text-align: middle-left;" />
         </uie:Toolbar>
-        <ui:ListView focusable="true" name="BottomListView" item-height="18" style="flex-grow: 1;" />
+        <ui:ListView focusable="true" name="BottomListView" item-height="18" virtualization-method="DynamicHeight" style="flex-grow: 1;" />
     </ui:VisualElement>
 </ui:UXML>

Assets/YooAsset/Editor/AssetBundleGrouper/AssetBundleCollector.cs

@@ -14,20 +14,25 @@ namespace YooAsset.Editor
 		/// </summary>
 		public string CollectPath = string.Empty;
 
+		/// <summary>
+		/// 收集器类型
+		/// </summary>
+		public ECollectorType CollectorType = ECollectorType.MainAssetCollector;
+
+		/// <summary>
+		/// 寻址规则类名
+		/// </summary>
+		public string AddressRuleName = nameof(AddressByFileName);
+
 		/// <summary>
 		/// 打包规则类名
 		/// </summary>
-		public string PackRuleName = string.Empty;
+		public string PackRuleName = nameof(PackDirectory);
 
 		/// <summary>
 		/// 过滤规则类名
 		/// </summary>
-		public string FilterRuleName = string.Empty;
-
-		/// <summary>
-		/// 不写入资源列表
-		/// </summary>
-		public bool NotWriteToAssetList = false;
+		public string FilterRuleName = nameof(CollectAll);
 
 		/// <summary>
 		/// 资源分类标签
@@ -35,6 +40,29 @@ namespace YooAsset.Editor
 		public string AssetTags = string.Empty;
 
 
+		/// <summary>
+		/// 收集器是否有效
+		/// </summary>
+		public bool IsValid()
+		{
+			if (AssetDatabase.LoadAssetAtPath<UnityEngine.Object>(CollectPath) == null)
+				return false;
+
+			if (CollectorType == ECollectorType.None)
+				return false;
+
+			if (AssetBundleGrouperSettingData.HasAddressRuleName(AddressRuleName) == false)
+				return false;
+
+			if (AssetBundleGrouperSettingData.HasPackRuleName(PackRuleName) == false)
+				return false;
+
+			if (AssetBundleGrouperSettingData.HasFilterRuleName(FilterRuleName) == false)
+				return false;
+
+			return true;
+		}
+
 		/// <summary>
 		/// 检测配置错误
 		/// </summary>
@@ -43,11 +71,17 @@ namespace YooAsset.Editor
 			if (AssetDatabase.LoadAssetAtPath<UnityEngine.Object>(CollectPath) == null)
 				throw new Exception($"Invalid collect path : {CollectPath}");
 
+			if (CollectorType == ECollectorType.None)
+				throw new Exception($"{nameof(ECollectorType)}.{ECollectorType.None} is invalid in collector : {CollectPath}");
+
 			if (AssetBundleGrouperSettingData.HasPackRuleName(PackRuleName) == false)
-				throw new Exception($"Invalid {nameof(IPackRule)} class type : {PackRuleName}");
+				throw new Exception($"Invalid {nameof(IPackRule)} class type : {PackRuleName} in collector : {CollectPath}");
 
 			if (AssetBundleGrouperSettingData.HasFilterRuleName(FilterRuleName) == false)
-				throw new Exception($"Invalid {nameof(IFilterRule)} class type : {FilterRuleName}");
+				throw new Exception($"Invalid {nameof(IFilterRule)} class type : {FilterRuleName} in collector : {CollectPath}");
+
+			if (AssetBundleGrouperSettingData.HasAddressRuleName(AddressRuleName) == false)
+				throw new Exception($"Invalid {nameof(IAddressRule)} class type : {AddressRuleName} in collector : {CollectPath}");
 		}
 
 		/// <summary>
@@ -58,47 +92,62 @@ namespace YooAsset.Editor
 			Dictionary<string, CollectAssetInfo> result = new Dictionary<string, CollectAssetInfo>(1000);
 			bool isRawAsset = PackRuleName == nameof(PackRawFile);
 
-			// 如果是文件夹
+			// 检测原生资源包的收集器类型
+			if (isRawAsset && CollectorType != ECollectorType.MainAssetCollector)
+				throw new Exception($"The raw file must be set to {nameof(ECollectorType)}.{ECollectorType.MainAssetCollector} : {CollectPath}");
+
+			if (string.IsNullOrEmpty(CollectPath))
+				throw new Exception($"The collect path is null or empty in grouper : {grouper.GrouperName}");
+
+			// 收集打包资源
 			if (AssetDatabase.IsValidFolder(CollectPath))
 			{
 				string collectDirectory = CollectPath;
 				string[] findAssets = EditorTools.FindAssets(EAssetSearchType.All, collectDirectory);
 				foreach (string assetPath in findAssets)
 				{
-					if (IsValidateAsset(assetPath) == false)
-						continue;
-					if (IsCollectAsset(assetPath) == false)
-						continue;
-					if (result.ContainsKey(assetPath) == false)
+					if (IsValidateAsset(assetPath) && IsCollectAsset(assetPath))
 					{
-						string bundleName = GetBundleName(grouper, assetPath, isRawAsset);
-						List<string> assetTags = GetAssetTags(grouper);
-						var collectAssetInfo = new CollectAssetInfo(bundleName, assetPath, assetTags, isRawAsset, NotWriteToAssetList);
-						collectAssetInfo.DependAssets = GetAllDependencies(assetPath);
-						result.Add(assetPath, collectAssetInfo);
-					}
-					else
-					{
-						throw new Exception($"The collecting asset file is existed : {assetPath} in collector : {CollectPath}");
+						if (result.ContainsKey(assetPath) == false)
+						{
+							var collectAssetInfo = CreateCollectAssetInfo(grouper, assetPath, isRawAsset);
+							result.Add(assetPath, collectAssetInfo);
+						}
+						else
+						{
+							throw new Exception($"The collecting asset file is existed : {assetPath} in collector : {CollectPath}");
+						}
 					}
 				}
 			}
 			else
 			{
 				string assetPath = CollectPath;
-				if (result.ContainsKey(assetPath) == false)
+				if (IsValidateAsset(assetPath) && IsCollectAsset(assetPath))
 				{
-					if (isRawAsset && NotWriteToAssetList)
-						UnityEngine.Debug.LogWarning($"Are you sure raw file are not write to asset list : {assetPath}");
-
-					string bundleName = GetBundleName(grouper, assetPath, isRawAsset);
-					List<string> assetTags = GetAssetTags(grouper);
-					var collectAssetInfo = new CollectAssetInfo(bundleName, assetPath, assetTags, isRawAsset, NotWriteToAssetList);
+					var collectAssetInfo = CreateCollectAssetInfo(grouper, assetPath, isRawAsset);
 					result.Add(assetPath, collectAssetInfo);
 				}
 				else
 				{
-					throw new Exception($"The collecting asset file is existed : {assetPath} in collector : {CollectPath}");
+					throw new Exception($"The collecting single asset file is invalid : {assetPath} in collector : {CollectPath}");
+				}
+			}
+
+			// 检测可寻址地址是否重复
+			if (AssetBundleGrouperSettingData.Setting.EnableAddressable)
+			{
+				HashSet<string> adressTemper = new HashSet<string>();
+				foreach (var collectInfoPair in result)
+				{
+					if (collectInfoPair.Value.CollectorType == ECollectorType.MainAssetCollector)
+					{
+						string address = collectInfoPair.Value.Address;
+						if (adressTemper.Contains(address) == false)
+							adressTemper.Add(address);
+						else
+							throw new Exception($"The address is existed : {address} in collector : {CollectPath}");
+					}
 				}
 			}
 
@@ -106,6 +155,15 @@ namespace YooAsset.Editor
 			return result.Values.ToList();
 		}
 
+		private CollectAssetInfo CreateCollectAssetInfo(AssetBundleGrouper grouper, string assetPath, bool isRawAsset)
+		{
+			string address = GetAddress(grouper, assetPath);
+			string bundleName = GetBundleName(grouper, assetPath);
+			List<string> assetTags = GetAssetTags(grouper);
+			CollectAssetInfo collectAssetInfo = new CollectAssetInfo(CollectorType, bundleName, address, assetPath, assetTags, isRawAsset);
+			collectAssetInfo.DependAssets = GetAllDependencies(assetPath);
+			return collectAssetInfo;
+		}
 		private bool IsValidateAsset(string assetPath)
 		{
 			if (assetPath.StartsWith("Assets/") == false && assetPath.StartsWith("Packages/") == false)
@@ -120,7 +178,7 @@ namespace YooAsset.Editor
 				return false;
 
 			string ext = System.IO.Path.GetExtension(assetPath);
-			if (ext == "" || ext == ".dll" || ext == ".cs" || ext == ".js" || ext == ".boo" || ext == ".meta")
+			if (ext == "" || ext == ".dll" || ext == ".cs" || ext == ".js" || ext == ".boo" || ext == ".meta" || ext == ".cginc")
 				return false;
 
 			return true;
@@ -139,16 +197,25 @@ namespace YooAsset.Editor
 			IFilterRule filterRuleInstance = AssetBundleGrouperSettingData.GetFilterRuleInstance(FilterRuleName);
 			return filterRuleInstance.IsCollectAsset(new FilterRuleData(assetPath));
 		}
-		private string GetBundleName(AssetBundleGrouper grouper, string assetPath, bool isRawAsset)
+		private string GetAddress(AssetBundleGrouper grouper, string assetPath)
 		{
-			// 如果收集全路径着色器
+			if (CollectorType != ECollectorType.MainAssetCollector)
+				return string.Empty;
+
+			IAddressRule addressRuleInstance = AssetBundleGrouperSettingData.GetAddressRuleInstance(AddressRuleName);
+			string adressValue = addressRuleInstance.GetAssetAddress(new AddressRuleData(assetPath, CollectPath, grouper.GrouperName));
+			return adressValue;
+		}
+		private string GetBundleName(AssetBundleGrouper grouper, string assetPath)
+		{
+			// 如果自动收集所有的着色器
 			if (AssetBundleGrouperSettingData.Setting.AutoCollectShaders)
 			{
 				System.Type assetType = AssetDatabase.GetMainAssetTypeAtPath(assetPath);
 				if (assetType == typeof(UnityEngine.Shader))
 				{
 					string bundleName = AssetBundleGrouperSettingData.Setting.ShadersBundleName;
-					return RevisedBundleName(bundleName, false);
+					return EditorTools.GetRegularPath(bundleName).ToLower();
 				}
 			}
 
@@ -156,7 +223,7 @@ namespace YooAsset.Editor
 			{
 				IPackRule packRuleInstance = AssetBundleGrouperSettingData.GetPackRuleInstance(PackRuleName);
 				string bundleName = packRuleInstance.GetBundleName(new PackRuleData(assetPath, CollectPath, grouper.GrouperName));
-				return RevisedBundleName(bundleName, isRawAsset);
+				return EditorTools.GetRegularPath(bundleName).ToLower();
 			}
 		}
 		private List<string> GetAssetTags(AssetBundleGrouper grouper)
@@ -181,23 +248,5 @@ namespace YooAsset.Editor
 			}
 			return result;
 		}
-
-
-		/// <summary>
-		/// 修正资源包名
-		/// </summary>
-		public static string RevisedBundleName(string bundleName, bool isRawBundle)
-		{
-			if (isRawBundle)
-			{
-				string fullName = $"{bundleName}.{YooAssetSettingsData.Setting.RawFileVariant}";
-				return EditorTools.GetRegularPath(fullName).ToLower();
-			}
-			else
-			{
-				string fullName = $"{bundleName}.{YooAssetSettingsData.Setting.AssetBundleFileVariant}";
-				return EditorTools.GetRegularPath(fullName).ToLower(); ;
-			}
-		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleGrouper/AssetBundleGrouper.cs

@@ -36,7 +36,7 @@ namespace YooAsset.Editor
 		/// </summary>
 		public void CheckConfigError()
 		{
-			foreach(var collector in Collectors)
+			foreach (var collector in Collectors)
 			{
 				collector.CheckConfigError();
 			}
@@ -48,21 +48,38 @@ namespace YooAsset.Editor
 		public List<CollectAssetInfo> GetAllCollectAssets()
 		{
 			Dictionary<string, CollectAssetInfo> result = new Dictionary<string, CollectAssetInfo>(10000);
-			foreach(var collector in Collectors)
+
+			// 收集打包资源
+			foreach (var collector in Collectors)
 			{
 				var temper = collector.GetAllCollectAssets(this);
-				foreach(var assetInfo in temper)
+				foreach (var assetInfo in temper)
 				{
-					if(result.ContainsKey(assetInfo.AssetPath) == false)
-					{
+					if (result.ContainsKey(assetInfo.AssetPath) == false)
 						result.Add(assetInfo.AssetPath, assetInfo);
-					}
 					else
-					{
 						throw new Exception($"The collecting asset file is existed : {assetInfo.AssetPath} in grouper : {GrouperName}");
+				}
+			}
+
+			// 检测可寻址地址是否重复
+			if (AssetBundleGrouperSettingData.Setting.EnableAddressable)
+			{
+				HashSet<string> adressTemper = new HashSet<string>();
+				foreach (var collectInfoPair in result)
+				{
+					if (collectInfoPair.Value.CollectorType == ECollectorType.MainAssetCollector)
+					{
+						string address = collectInfoPair.Value.Address;
+						if (adressTemper.Contains(address) == false)
+							adressTemper.Add(address);
+						else
+							throw new Exception($"The address is existed : {address} in grouper : {GrouperName}");
 					}
 				}
 			}
+
+			// 返回列表
 			return result.Values.ToList();
 		}
 	}

Assets/YooAsset/Editor/AssetBundleGrouper/AssetBundleGrouperConfig.cs

@@ -17,13 +17,13 @@ namespace YooAsset.Editor
 		public const string XmlGrouperName = "GrouperName";
 		public const string XmlGrouperDesc = "GrouperDesc";
 		public const string XmlCollector = "Collector";
-		public const string XmlDirectory = "CollectPath";
+		public const string XmlCollectPath = "CollectPath";
+		public const string XmlCollectorType = "CollectType";
+		public const string XmlAddressRule = "AddressRule";
 		public const string XmlPackRule = "PackRule";
 		public const string XmlFilterRule = "FilterRule";
-		public const string XmlNotWriteToAssetList = "NotWriteToAssetList";
 		public const string XmlAssetTags = "AssetTags";
-
-
+		
 		/// <summary>
 		/// 导入XML配置表
 		/// </summary>
@@ -80,22 +80,25 @@ namespace YooAsset.Editor
 				foreach (var collectorNode in collectorNodeList)
 				{
 					XmlElement collectorElement = collectorNode as XmlElement;
-					if (collectorElement.HasAttribute(XmlDirectory) == false)
-						throw new Exception($"Not found attribute {XmlDirectory} in {XmlCollector}");
+					if (collectorElement.HasAttribute(XmlCollectPath) == false)
+						throw new Exception($"Not found attribute {XmlCollectPath} in {XmlCollector}");
+					if (collectorElement.HasAttribute(XmlCollectorType) == false)
+						throw new Exception($"Not found attribute {XmlCollectorType} in {XmlCollector}");
+					if (collectorElement.HasAttribute(XmlAddressRule) == false)
+						throw new Exception($"Not found attribute {XmlAddressRule} in {XmlCollector}");
 					if (collectorElement.HasAttribute(XmlPackRule) == false)
 						throw new Exception($"Not found attribute {XmlPackRule} in {XmlCollector}");
 					if (collectorElement.HasAttribute(XmlFilterRule) == false)
 						throw new Exception($"Not found attribute {XmlFilterRule} in {XmlCollector}");
-					if (collectorElement.HasAttribute(XmlNotWriteToAssetList) == false)
-						throw new Exception($"Not found attribute {XmlNotWriteToAssetList} in {XmlCollector}");
 					if (collectorElement.HasAttribute(XmlAssetTags) == false)
 						throw new Exception($"Not found attribute {XmlAssetTags} in {XmlCollector}");
 
 					AssetBundleCollector collector = new AssetBundleCollector();
-					collector.CollectPath = collectorElement.GetAttribute(XmlDirectory);
+					collector.CollectPath = collectorElement.GetAttribute(XmlCollectPath);
+					collector.CollectorType = StringUtility.NameToEnum<ECollectorType>(collectorElement.GetAttribute(XmlCollectorType));
+					collector.AddressRuleName = collectorElement.GetAttribute(XmlAddressRule);
 					collector.PackRuleName = collectorElement.GetAttribute(XmlPackRule);
 					collector.FilterRuleName = collectorElement.GetAttribute(XmlFilterRule);
-					collector.NotWriteToAssetList = collectorElement.GetAttribute(XmlNotWriteToAssetList) == "True" ? true : false;
 					collector.AssetTags = collectorElement.GetAttribute(XmlAssetTags); ;
 					grouper.Collectors.Add(collector);
 				}
@@ -145,10 +148,11 @@ namespace YooAsset.Editor
 				foreach (var collector in grouper.Collectors)
 				{
 					var collectorElement = xmlDoc.CreateElement(XmlCollector);
-					collectorElement.SetAttribute(XmlDirectory, collector.CollectPath);
+					collectorElement.SetAttribute(XmlCollectPath, collector.CollectPath);
+					collectorElement.SetAttribute(XmlCollectorType, collector.CollectorType.ToString());
+					collectorElement.SetAttribute(XmlAddressRule, collector.AddressRuleName);
 					collectorElement.SetAttribute(XmlPackRule, collector.PackRuleName);
 					collectorElement.SetAttribute(XmlFilterRule, collector.FilterRuleName);
-					collectorElement.SetAttribute(XmlNotWriteToAssetList, collector.NotWriteToAssetList.ToString());
 					collectorElement.SetAttribute(XmlAssetTags, collector.AssetTags);
 					grouperElement.AppendChild(collectorElement);
 				}

Assets/YooAsset/Editor/AssetBundleGrouper/AssetBundleGrouperSetting.cs

@@ -8,6 +8,11 @@ namespace YooAsset.Editor
 {
 	public class AssetBundleGrouperSetting : ScriptableObject
 	{
+		/// <summary>
+		/// 是否启用可寻址资源定位
+		/// </summary>
+		public bool EnableAddressable = false;
+
 		/// <summary>
 		/// 自动收集着色器
 		/// </summary>
@@ -41,21 +46,38 @@ namespace YooAsset.Editor
 		public List<CollectAssetInfo> GetAllCollectAssets()
 		{
 			Dictionary<string, CollectAssetInfo> result = new Dictionary<string, CollectAssetInfo>(10000);
+
+			// 收集打包资源
 			foreach (var grouper in Groupers)
 			{
 				var temper = grouper.GetAllCollectAssets();
 				foreach (var assetInfo in temper)
 				{
 					if (result.ContainsKey(assetInfo.AssetPath) == false)
-					{
 						result.Add(assetInfo.AssetPath, assetInfo);
-					}
 					else
+						throw new Exception($"The collecting asset file is existed : {assetInfo.AssetPath} in grouper setting.");
+				}
+			}
+
+			// 检测可寻址地址是否重复
+			if (EnableAddressable)
+			{
+				HashSet<string> adressTemper = new HashSet<string>();
+				foreach (var collectInfoPair in result)
+				{
+					if (collectInfoPair.Value.CollectorType == ECollectorType.MainAssetCollector)
 					{
-						throw new Exception($"The collecting asset file is existed : {assetInfo.AssetPath}");
+						string address = collectInfoPair.Value.Address;
+						if (adressTemper.Contains(address) == false)
+							adressTemper.Add(address);
+						else
+							throw new Exception($"The address is existed : {address} in grouper setting.");
 					}
 				}
 			}
+
+			// 返回列表
 			return result.Values.ToList();
 		}
 	}

Assets/YooAsset/Editor/AssetBundleGrouper/AssetBundleGrouperSettingData.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
 using UnityEditor;
 
@@ -8,12 +9,20 @@ namespace YooAsset.Editor
 {
 	public class AssetBundleGrouperSettingData
 	{
+		private static readonly Dictionary<string, System.Type> _cacheAddressRuleTypes = new Dictionary<string, System.Type>();
+		private static readonly Dictionary<string, IAddressRule> _cacheAddressRuleInstance = new Dictionary<string, IAddressRule>();
+
 		private static readonly Dictionary<string, System.Type> _cachePackRuleTypes = new Dictionary<string, System.Type>();
 		private static readonly Dictionary<string, IPackRule> _cachePackRuleInstance = new Dictionary<string, IPackRule>();
 
 		private static readonly Dictionary<string, System.Type> _cacheFilterRuleTypes = new Dictionary<string, System.Type>();
 		private static readonly Dictionary<string, IFilterRule> _cacheFilterRuleInstance = new Dictionary<string, IFilterRule>();
 
+		/// <summary>
+		/// 配置数据是否被修改
+		/// </summary>
+		public static bool IsDirty { private set; get; } = false;
+
 
 		private static AssetBundleGrouperSetting _setting = null;
 		public static AssetBundleGrouperSetting Setting
@@ -26,6 +35,18 @@ namespace YooAsset.Editor
 			}
 		}
 
+		public static List<string> GetAddressRuleNames()
+		{
+			if (_setting == null)
+				LoadSettingData();
+
+			List<string> names = new List<string>();
+			foreach (var pair in _cacheAddressRuleTypes)
+			{
+				names.Add(pair.Key);
+			}
+			return names;
+		}
 		public static List<string> GetPackRuleNames()
 		{
 			if (_setting == null)
@@ -50,6 +71,15 @@ namespace YooAsset.Editor
 			}
 			return names;
 		}
+		public static bool HasAddressRuleName(string ruleName)
+		{
+			foreach (var pair in _cacheAddressRuleTypes)
+			{
+				if (pair.Key == ruleName)
+					return true;
+			}
+			return false;
+		}
 		public static bool HasPackRuleName(string ruleName)
 		{
 			foreach (var pair in _cachePackRuleTypes)
@@ -69,19 +99,21 @@ namespace YooAsset.Editor
 			return false;
 		}
 
+
 		/// <summary>
 		/// 加载配置文件
 		/// </summary>
 		private static void LoadSettingData()
 		{
 			// 加载配置文件
-			_setting = AssetDatabase.LoadAssetAtPath<AssetBundleGrouperSetting>(EditorDefine.AssetBundleGrouperSettingFilePath);
+			string settingFilePath = $"{EditorTools.GetYooAssetSettingPath()}/{nameof(AssetBundleGrouperSetting)}.asset";
+			_setting = AssetDatabase.LoadAssetAtPath<AssetBundleGrouperSetting>(settingFilePath);
 			if (_setting == null)
 			{
-				Debug.LogWarning($"Create new {nameof(AssetBundleGrouperSetting)}.asset : {EditorDefine.AssetBundleGrouperSettingFilePath}");
+				Debug.LogWarning($"Create new {nameof(AssetBundleGrouperSetting)}.asset : {settingFilePath}");
 				_setting = ScriptableObject.CreateInstance<AssetBundleGrouperSetting>();
-				EditorTools.CreateFileDirectory(EditorDefine.AssetBundleGrouperSettingFilePath);
-				AssetDatabase.CreateAsset(Setting, EditorDefine.AssetBundleGrouperSettingFilePath);
+				EditorTools.CreateFileDirectory(settingFilePath);
+				AssetDatabase.CreateAsset(Setting, settingFilePath);
 				AssetDatabase.SaveAssets();
 				AssetDatabase.Refresh();
 			}
@@ -101,11 +133,14 @@ namespace YooAsset.Editor
 				{
 					typeof(PackSeparately),
 					typeof(PackDirectory),
+					typeof(PackTopDirectory),
 					typeof(PackCollector),
 					typeof(PackGrouper),
 					typeof(PackRawFile),
 				};
-				var customTypes = AssemblyUtility.GetAssignableTypes(AssemblyUtility.UnityDefaultAssemblyEditorName, typeof(IPackRule));
+
+				TypeCache.TypeCollection collection = TypeCache.GetTypesDerivedFrom<IPackRule>();
+				var customTypes = collection.ToList();
 				types.AddRange(customTypes);
 				for (int i = 0; i < types.Count; i++)
 				{
@@ -129,7 +164,9 @@ namespace YooAsset.Editor
 					typeof(CollectPrefab),
 					typeof(CollectSprite)
 				};
-				var customTypes = AssemblyUtility.GetAssignableTypes(AssemblyUtility.UnityDefaultAssemblyEditorName, typeof(IFilterRule));
+
+				TypeCache.TypeCollection collection = TypeCache.GetTypesDerivedFrom<IFilterRule>();
+				var customTypes = collection.ToList();
 				types.AddRange(customTypes);
 				for (int i = 0; i < types.Count; i++)
 				{
@@ -138,6 +175,31 @@ namespace YooAsset.Editor
 						_cacheFilterRuleTypes.Add(type.Name, type);
 				}
 			}
+
+			// IAddressRule
+			{
+				// 清空缓存集合
+				_cacheAddressRuleTypes.Clear();
+				_cacheAddressRuleInstance.Clear();
+
+				// 获取所有类型
+				List<Type> types = new List<Type>(100)
+				{
+					typeof(AddressByFileName),
+					typeof(AddressByCollectorAndFileName),
+					typeof(AddressByGrouperAndFileName)
+				};
+
+				TypeCache.TypeCollection collection = TypeCache.GetTypesDerivedFrom<IAddressRule>();
+				var customTypes = collection.ToList();
+				types.AddRange(customTypes);
+				for (int i = 0; i < types.Count; i++)
+				{
+					Type type = types[i];
+					if (_cacheAddressRuleTypes.ContainsKey(type.Name) == false)
+						_cacheAddressRuleTypes.Add(type.Name, type);
+				}
+			}
 		}
 
 		/// <summary>
@@ -147,8 +209,10 @@ namespace YooAsset.Editor
 		{
 			if (Setting != null)
 			{
+				IsDirty = false;
 				EditorUtility.SetDirty(Setting);
 				AssetDatabase.SaveAssets();
+				Debug.Log($"{nameof(AssetBundleGrouperSetting)}.asset is saved!");
 			}
 		}
 
@@ -164,6 +228,23 @@ namespace YooAsset.Editor
 		}
 
 		// 实例类相关
+		public static IAddressRule GetAddressRuleInstance(string ruleName)
+		{
+			if (_cacheAddressRuleInstance.TryGetValue(ruleName, out IAddressRule instance))
+				return instance;
+
+			// 如果不存在创建类的实例
+			if (_cacheAddressRuleTypes.TryGetValue(ruleName, out Type type))
+			{
+				instance = (IAddressRule)Activator.CreateInstance(type);
+				_cacheAddressRuleInstance.Add(ruleName, instance);
+				return instance;
+			}
+			else
+			{
+				throw new Exception($"{nameof(IAddressRule)}类型无效：{ruleName}");
+			}
+		}
 		public static IPackRule GetPackRuleInstance(string ruleName)
 		{
 			if (_cachePackRuleInstance.TryGetValue(ruleName, out IPackRule instance))
@@ -199,68 +280,72 @@ namespace YooAsset.Editor
 			}
 		}
 
+		// 可寻址编辑相关
+		public static void ModifyAddressable(bool enableAddressable)
+		{
+			Setting.EnableAddressable = enableAddressable;
+			IsDirty = true;
+		}
+
 		// 着色器编辑相关
 		public static void ModifyShader(bool isCollectAllShaders, string shadersBundleName)
 		{
-			if (string.IsNullOrEmpty(shadersBundleName))
-				return;
 			Setting.AutoCollectShaders = isCollectAllShaders;
 			Setting.ShadersBundleName = shadersBundleName;
-			SaveFile();
+			IsDirty = true;
 		}
 
 		// 资源分组编辑相关
-		public static void CreateGrouper(string grouperName, string grouperDesc, string assetTags, bool saveFile = true)
+		public static void CreateGrouper(string grouperName)
 		{
 			AssetBundleGrouper grouper = new AssetBundleGrouper();
 			grouper.GrouperName = grouperName;
-			grouper.GrouperDesc = grouperDesc;
-			grouper.AssetTags = assetTags;
 			Setting.Groupers.Add(grouper);
-
-			if (saveFile)
-				SaveFile();
+			IsDirty = true;
 		}
 		public static void RemoveGrouper(AssetBundleGrouper grouper)
 		{
 			if (Setting.Groupers.Remove(grouper))
 			{
-				SaveFile();
+				IsDirty = true;
+			}
+			else
+			{
+				Debug.LogWarning($"Failed remove grouper : {grouper.GrouperName}");
 			}
 		}
 		public static void ModifyGrouper(AssetBundleGrouper grouper)
 		{
 			if (grouper != null)
 			{
-				SaveFile();
+				IsDirty = true;
 			}
 		}
 
 		// 资源收集器编辑相关
-		public static void CreateCollector(AssetBundleGrouper grouper, string collectPath, string packRuleName, string filterRuleName, bool notWriteToAssetList, bool saveFile = true)
+		public static void CreateCollector(AssetBundleGrouper grouper, string collectPath)
 		{
 			AssetBundleCollector collector = new AssetBundleCollector();
 			collector.CollectPath = collectPath;
-			collector.PackRuleName = packRuleName;
-			collector.FilterRuleName = filterRuleName;
-			collector.NotWriteToAssetList = notWriteToAssetList;
 			grouper.Collectors.Add(collector);
-
-			if (saveFile)
-				SaveFile();
+			IsDirty = true;
 		}
 		public static void RemoveCollector(AssetBundleGrouper grouper, AssetBundleCollector collector)
 		{
 			if (grouper.Collectors.Remove(collector))
 			{
-				SaveFile();
+				IsDirty = true;
+			}
+			else
+			{
+				Debug.LogWarning($"Failed remove collector : {collector.CollectPath}");
 			}
 		}
 		public static void ModifyCollector(AssetBundleGrouper grouper, AssetBundleCollector collector)
 		{
 			if (grouper != null && collector != null)
 			{
-				SaveFile();
+				IsDirty = true;
 			}
 		}
 	}

Assets/YooAsset/Editor/AssetBundleGrouper/AssetBundleGrouperWindow.cs

@@ -14,15 +14,17 @@ namespace YooAsset.Editor
 		[MenuItem("YooAsset/AssetBundle Grouper", false, 101)]
 		public static void ShowExample()
 		{
-			AssetBundleGrouperWindow window = GetWindow<AssetBundleGrouperWindow>();
-			window.titleContent = new GUIContent("资源包分组工具");
+			AssetBundleGrouperWindow window = GetWindow<AssetBundleGrouperWindow>("资源包分组工具", true, EditorDefine.DockedWindowTypes);
 			window.minSize = new Vector2(800, 600);
 		}
 
+		private List<string> _collectorTypeList;
+		private List<string> _addressRuleList;
 		private List<string> _packRuleList;
 		private List<string> _filterRuleList;
 		private ListView _grouperListView;
-		private ListView _collectorListView;
+		private ScrollView _collectorScrollView;
+		private Toggle _enableAddressableToogle;
 		private Toggle _autoCollectShaderToogle;
 		private TextField _shaderBundleNameTxt;
 		private TextField _grouperNameTxt;
@@ -32,13 +34,23 @@ namespace YooAsset.Editor
 
 		public void CreateGUI()
 		{
+			Undo.undoRedoPerformed -= RefreshWindow;
+			Undo.undoRedoPerformed += RefreshWindow;
+
 			VisualElement root = this.rootVisualElement;
 
+			_collectorTypeList = new List<string>()
+			{
+				$"{nameof(ECollectorType.MainAssetCollector)}",
+				$"{nameof(ECollectorType.StaticAssetCollector)}",
+				$"{nameof(ECollectorType.DependAssetCollector)}"
+			};
+			_addressRuleList = AssetBundleGrouperSettingData.GetAddressRuleNames();
 			_packRuleList = AssetBundleGrouperSettingData.GetPackRuleNames();
 			_filterRuleList = AssetBundleGrouperSettingData.GetFilterRuleNames();
 
 			// 加载布局文件
-			string rootPath = EditorTools.GetYooAssetPath();
+			string rootPath = EditorTools.GetYooAssetSourcePath();
 			string uxml = $"{rootPath}/Editor/AssetBundleGrouper/{nameof(AssetBundleGrouperWindow)}.uxml";
 			var visualAsset = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(uxml);
 			if (visualAsset == null)
@@ -56,12 +68,17 @@ namespace YooAsset.Editor
 				var importBtn = root.Q<Button>("ImportButton");
 				importBtn.clicked += ImportBtn_clicked;
 
-				// 着色器相关
+				// 公共设置相关
+				_enableAddressableToogle = root.Q<Toggle>("EnableAddressable");
+				_enableAddressableToogle.RegisterValueChangedCallback(evt =>
+				{
+					AssetBundleGrouperSettingData.ModifyAddressable(evt.newValue);
+				});
 				_autoCollectShaderToogle = root.Q<Toggle>("AutoCollectShader");
 				_autoCollectShaderToogle.RegisterValueChangedCallback(evt =>
 				{
 					AssetBundleGrouperSettingData.ModifyShader(evt.newValue, _shaderBundleNameTxt.value);
-					_shaderBundleNameTxt.SetEnabled(evt.newValue);	
+					_shaderBundleNameTxt.SetEnabled(evt.newValue);
 				});
 				_shaderBundleNameTxt = root.Q<TextField>("ShaderBundleName");
 				_shaderBundleNameTxt.RegisterValueChangedCallback(evt =>
@@ -91,7 +108,7 @@ namespace YooAsset.Editor
 				// 分组容器
 				_grouperContainer = root.Q("GrouperContainer");
 
-				// 分组信息相关
+				// 分组名称
 				_grouperNameTxt = root.Q<TextField>("GrouperName");
 				_grouperNameTxt.RegisterValueChangedCallback(evt =>
 				{
@@ -103,6 +120,7 @@ namespace YooAsset.Editor
 					}
 				});
 
+				// 分组备注
 				_grouperDescTxt = root.Q<TextField>("GrouperDesc");
 				_grouperDescTxt.RegisterValueChangedCallback(evt =>
 				{
@@ -114,6 +132,7 @@ namespace YooAsset.Editor
 					}
 				});
 
+				// 分组的资源标签
 				_grouperAssetTagsTxt = root.Q<TextField>("GrouperAssetTags");
 				_grouperAssetTagsTxt.RegisterValueChangedCallback(evt =>
 				{
@@ -126,22 +145,15 @@ namespace YooAsset.Editor
 				});
 
 				// 收集列表相关
-				_collectorListView = root.Q<ListView>("CollectorListView");
-				_collectorListView.makeItem = MakeCollectorListViewItem;
-				_collectorListView.bindItem = BindCollectorListViewItem;
-#if UNITY_2020_1_OR_NEWER
-				_collectorListView.onSelectionChange += CollectorListView_onSelectionChange;
-#else
-				_collectorListView.onSelectionChanged += CollectorListView_onSelectionChange;
-#endif
+				_collectorScrollView = root.Q<ScrollView>("CollectorScrollView");
+				_collectorScrollView.style.height = new Length(100, LengthUnit.Percent);
+				_collectorScrollView.viewDataKey = "scrollView";
 
-				// 收集添加删除按钮
+				// 收集器创建按钮
 				var collectorAddContainer = root.Q("CollectorAddContainer");
 				{
 					var addBtn = collectorAddContainer.Q<Button>("AddBtn");
 					addBtn.clicked += AddCollectorBtn_clicked;
-					var removeBtn = collectorAddContainer.Q<Button>("RemoveBtn");
-					removeBtn.clicked += RemoveCollectorBtn_clicked;
 				}
 
 				// 刷新窗体
@@ -152,10 +164,15 @@ namespace YooAsset.Editor
 				Debug.LogError(e.ToString());
 			}
 		}
-		
-		// 刷新窗体
+		public void OnDestroy()
+		{
+			if (AssetBundleGrouperSettingData.IsDirty)
+				AssetBundleGrouperSettingData.SaveFile();
+		}
+
 		private void RefreshWindow()
 		{
+			_enableAddressableToogle.SetValueWithoutNotify(AssetBundleGrouperSettingData.Setting.EnableAddressable);
 			_autoCollectShaderToogle.SetValueWithoutNotify(AssetBundleGrouperSettingData.Setting.AutoCollectShaders);
 			_shaderBundleNameTxt.SetEnabled(AssetBundleGrouperSettingData.Setting.AutoCollectShaders);
 			_shaderBundleNameTxt.SetValueWithoutNotify(AssetBundleGrouperSettingData.Setting.ShadersBundleName);
@@ -163,8 +180,6 @@ namespace YooAsset.Editor
 
 			FillGrouperViewData();
 		}
-
-		// 导入导出按钮
 		private void ExportBtn_clicked()
 		{
 			string resultPath = EditorTools.OpenFolderPanel("Export XML", "Assets/");
@@ -189,6 +204,7 @@ namespace YooAsset.Editor
 			_grouperListView.Clear();
 			_grouperListView.ClearSelection();
 			_grouperListView.itemsSource = AssetBundleGrouperSettingData.Setting.Groupers;
+			_grouperListView.Rebuild();
 		}
 		private VisualElement MakeGrouperListViewItem()
 		{
@@ -222,7 +238,8 @@ namespace YooAsset.Editor
 		}
 		private void AddGrouperBtn_clicked()
 		{
-			AssetBundleGrouperSettingData.CreateGrouper("Default Grouper", string.Empty, string.Empty, true);
+			Undo.RecordObject(AssetBundleGrouperSettingData.Setting, "YooAsset AddGrouper");
+			AssetBundleGrouperSettingData.CreateGrouper("Default Grouper");
 			FillGrouperViewData();
 		}
 		private void RemoveGrouperBtn_clicked()
@@ -231,6 +248,8 @@ namespace YooAsset.Editor
 			if (selectGrouper == null)
 				return;
 
+			Undo.RecordObject(AssetBundleGrouperSettingData.Setting, "YooAsset RemoveGrouper");
+
 			AssetBundleGrouperSettingData.RemoveGrouper(selectGrouper);
 			FillGrouperViewData();
 		}
@@ -246,13 +265,18 @@ namespace YooAsset.Editor
 			}
 
 			_grouperContainer.visible = true;
-			_collectorListView.Clear();
-			_collectorListView.ClearSelection();
-			_collectorListView.itemsSource = selectGrouper.Collectors;
-
 			_grouperNameTxt.SetValueWithoutNotify(selectGrouper.GrouperName);
 			_grouperDescTxt.SetValueWithoutNotify(selectGrouper.GrouperDesc);
 			_grouperAssetTagsTxt.SetValueWithoutNotify(selectGrouper.AssetTags);
+
+			// 填充数据
+			_collectorScrollView.Clear();
+			for (int i = 0; i < selectGrouper.Collectors.Count; i++)
+			{
+				VisualElement element = MakeCollectorListViewItem();
+				BindCollectorListViewItem(element, i);
+				_collectorScrollView.Add(element);
+			}
 		}
 		private VisualElement MakeCollectorListViewItem()
 		{
@@ -266,49 +290,69 @@ namespace YooAsset.Editor
 			elementBottom.style.flexDirection = FlexDirection.Row;
 			element.Add(elementBottom);
 
+			VisualElement elementFoldout = new VisualElement();
+			elementFoldout.style.flexDirection = FlexDirection.Row;
+			element.Add(elementFoldout);
+
+			VisualElement elementSpace = new VisualElement();
+			elementSpace.style.flexDirection = FlexDirection.Column;
+			element.Add(elementSpace);
+
 			// Top VisualElement
+			{
+				var button = new Button();
+				button.name = "Button1";
+				button.text = "-";
+				button.style.unityTextAlign = TextAnchor.MiddleCenter;
+				button.style.flexGrow = 0f;
+				elementTop.Add(button);
+			}
 			{
 				var objectField = new ObjectField();
 				objectField.name = "ObjectField1";
-				objectField.label = "Collect Path";
+				objectField.label = "Collector";
 				objectField.objectType = typeof(UnityEngine.Object);
 				objectField.style.unityTextAlign = TextAnchor.MiddleLeft;
 				objectField.style.flexGrow = 1f;
 				elementTop.Add(objectField);
 				var label = objectField.Q<Label>();
-				label.style.minWidth = 80;
+				label.style.minWidth = 63;
 			}
 
 			// Bottom VisualElement
 			{
 				var label = new Label();
-				label.style.width = 80;
+				label.style.width = 90;
 				elementBottom.Add(label);
 			}
 			{
-				var popupField = new PopupField<string>(_packRuleList, 0);
-				popupField.name = "PopupField1";
+				var popupField = new PopupField<string>(_collectorTypeList, 0);
+				popupField.name = "PopupField0";
 				popupField.style.unityTextAlign = TextAnchor.MiddleLeft;
 				popupField.style.width = 150;
 				elementBottom.Add(popupField);
 			}
+			if (_enableAddressableToogle.value)
 			{
-				var popupField = new PopupField<string>(_filterRuleList, 0);
+				var popupField = new PopupField<string>(_addressRuleList, 0);
+				popupField.name = "PopupField1";
+				popupField.style.unityTextAlign = TextAnchor.MiddleLeft;
+				popupField.style.width = 200;
+				elementBottom.Add(popupField);
+			}
+			{
+				var popupField = new PopupField<string>(_packRuleList, 0);
 				popupField.name = "PopupField2";
 				popupField.style.unityTextAlign = TextAnchor.MiddleLeft;
 				popupField.style.width = 150;
 				elementBottom.Add(popupField);
 			}
 			{
-				var toggle = new Toggle();
-				toggle.name = "Toggle1";
-				toggle.label = "NotWriteToAssetList";
-				toggle.style.unityTextAlign = TextAnchor.MiddleLeft;
-				toggle.style.width = 150;
-				toggle.style.marginLeft = 20;
-				elementBottom.Add(toggle);
-				var label = toggle.Q<Label>();
-				label.style.minWidth = 130;
+				var popupField = new PopupField<string>(_filterRuleList, 0);
+				popupField.name = "PopupField3";
+				popupField.style.unityTextAlign = TextAnchor.MiddleLeft;
+				popupField.style.width = 150;
+				elementBottom.Add(popupField);
 			}
 			{
 				var textField = new TextField();
@@ -322,6 +366,27 @@ namespace YooAsset.Editor
 				label.style.minWidth = 40;
 			}
 
+			// Foldout VisualElement
+			{
+				var label = new Label();
+				label.style.width = 90;
+				elementFoldout.Add(label);
+			}
+			{
+				var foldout = new Foldout();
+				foldout.name = "Foldout1";
+				foldout.value = false;
+				foldout.text = "Main Assets";
+				elementFoldout.Add(foldout);
+			}
+
+			// Space VisualElement
+			{
+				var label = new Label();
+				label.style.height = 10;
+				elementSpace.Add(label);
+			}
+
 			return element;
 		}
 		private void BindCollectorListViewItem(VisualElement element, int index)
@@ -335,7 +400,18 @@ namespace YooAsset.Editor
 			if (collectObject != null)
 				collectObject.name = collector.CollectPath;
 
-			// Collect Path
+			// Foldout
+			var foldout = element.Q<Foldout>("Foldout1");
+			RefreshFoldout(foldout, selectGrouper, collector);
+
+			// Remove Button
+			var removeBtn = element.Q<Button>("Button1");
+			removeBtn.clicked += () =>
+			{
+				RemoveCollectorBtn_clicked(collector);
+			};
+
+			// Collector Path
 			var objectField1 = element.Q<ObjectField>("ObjectField1");
 			objectField1.SetValueWithoutNotify(collectObject);
 			objectField1.RegisterValueChangedCallback(evt =>
@@ -343,33 +419,50 @@ namespace YooAsset.Editor
 				collector.CollectPath = AssetDatabase.GetAssetPath(evt.newValue);
 				objectField1.value.name = collector.CollectPath;
 				AssetBundleGrouperSettingData.ModifyCollector(selectGrouper, collector);
+				RefreshFoldout(foldout, selectGrouper, collector);
 			});
 
-			// Pack Rule
+			// Collector Type
+			var popupField0 = element.Q<PopupField<string>>("PopupField0");
+			popupField0.index = GetCollectorTypeIndex(collector.CollectorType.ToString());
+			popupField0.RegisterValueChangedCallback(evt =>
+			{
+				collector.CollectorType = StringUtility.NameToEnum<ECollectorType>(evt.newValue);
+				AssetBundleGrouperSettingData.ModifyCollector(selectGrouper, collector);
+				RefreshFoldout(foldout, selectGrouper, collector);
+			});
+
+			// Address Rule
 			var popupField1 = element.Q<PopupField<string>>("PopupField1");
-			popupField1.index = GetPackRuleIndex(collector.PackRuleName);
-			popupField1.RegisterValueChangedCallback(evt =>
+			if (popupField1 != null)
+			{
+				popupField1.index = GetAddressRuleIndex(collector.AddressRuleName);
+				popupField1.RegisterValueChangedCallback(evt =>
+				{
+					collector.AddressRuleName = evt.newValue;
+					AssetBundleGrouperSettingData.ModifyCollector(selectGrouper, collector);
+					RefreshFoldout(foldout, selectGrouper, collector);
+				});
+			}
+
+			// Pack Rule
+			var popupField2 = element.Q<PopupField<string>>("PopupField2");
+			popupField2.index = GetPackRuleIndex(collector.PackRuleName);
+			popupField2.RegisterValueChangedCallback(evt =>
 			{
 				collector.PackRuleName = evt.newValue;
 				AssetBundleGrouperSettingData.ModifyCollector(selectGrouper, collector);
+				RefreshFoldout(foldout, selectGrouper, collector);
 			});
 
 			// Filter Rule
-			var popupField2 = element.Q<PopupField<string>>("PopupField2");
-			popupField2.index = GetFilterRuleIndex(collector.FilterRuleName);
-			popupField2.RegisterValueChangedCallback(evt =>
+			var popupField3 = element.Q<PopupField<string>>("PopupField3");
+			popupField3.index = GetFilterRuleIndex(collector.FilterRuleName);
+			popupField3.RegisterValueChangedCallback(evt =>
 			{
 				collector.FilterRuleName = evt.newValue;
 				AssetBundleGrouperSettingData.ModifyCollector(selectGrouper, collector);
-			});
-
-			// NotWriteToAssetList
-			var toggle1 = element.Q<Toggle>("Toggle1");
-			toggle1.SetValueWithoutNotify(collector.NotWriteToAssetList);
-			toggle1.RegisterValueChangedCallback(evt =>
-			{
-				collector.NotWriteToAssetList = evt.newValue;
-				AssetBundleGrouperSettingData.ModifyCollector(selectGrouper, collector);
+				RefreshFoldout(foldout, selectGrouper, collector);
 			});
 
 			// Tags
@@ -381,8 +474,56 @@ namespace YooAsset.Editor
 				AssetBundleGrouperSettingData.ModifyCollector(selectGrouper, collector);
 			});
 		}
-		private void CollectorListView_onSelectionChange(IEnumerable<object> objs)
+		private void RefreshFoldout(Foldout foldout, AssetBundleGrouper grouper, AssetBundleCollector collector)
 		{
+			// 清空旧元素
+			foldout.Clear();
+
+			if (collector.IsValid() == false)
+			{
+				Debug.LogWarning($"The collector is invalid : {collector.CollectPath} in grouper : {grouper.GrouperName}");
+				return;
+			}
+
+			if (collector.CollectorType == ECollectorType.MainAssetCollector || collector.CollectorType == ECollectorType.StaticAssetCollector)
+			{
+				List<CollectAssetInfo> collectAssetInfos = null;
+
+				try
+				{
+					collectAssetInfos = collector.GetAllCollectAssets(grouper);
+				}
+				catch (System.Exception e)
+				{
+					Debug.LogError(e.ToString());
+				}
+
+				if (collectAssetInfos != null)
+				{
+					foreach (var collectAssetInfo in collectAssetInfos)
+					{
+						VisualElement elementRow = new VisualElement();
+						elementRow.style.flexDirection = FlexDirection.Row;
+						foldout.Add(elementRow);
+
+						string showInfo = collectAssetInfo.AssetPath;
+						if (_enableAddressableToogle.value)
+						{
+							IAddressRule instance = AssetBundleGrouperSettingData.GetAddressRuleInstance(collector.AddressRuleName);
+							AddressRuleData ruleData = new AddressRuleData(collectAssetInfo.AssetPath, collector.CollectPath, grouper.GrouperName);
+							string addressValue = instance.GetAssetAddress(ruleData);
+							showInfo = $"[{addressValue}] {showInfo}";
+						}
+
+						var label = new Label();
+						label.text = showInfo;
+						label.style.width = 300;
+						label.style.marginLeft = 0;
+						label.style.flexGrow = 1;
+						elementRow.Add(label);
+					}
+				}
+			}
 		}
 		private void AddCollectorBtn_clicked()
 		{
@@ -390,37 +531,52 @@ namespace YooAsset.Editor
 			if (selectGrouper == null)
 				return;
 
-			AssetBundleGrouperSettingData.CreateCollector(selectGrouper, string.Empty, nameof(PackDirectory), nameof(CollectAll), false);
+			AssetBundleGrouperSettingData.CreateCollector(selectGrouper, string.Empty);
 			FillCollectorViewData();
 		}
-		private void RemoveCollectorBtn_clicked()
+		private void RemoveCollectorBtn_clicked(AssetBundleCollector selectCollector)
 		{
 			var selectGrouper = _grouperListView.selectedItem as AssetBundleGrouper;
 			if (selectGrouper == null)
 				return;
-
-			var selectCollector = _collectorListView.selectedItem as AssetBundleCollector;
 			if (selectCollector == null)
 				return;
-
 			AssetBundleGrouperSettingData.RemoveCollector(selectGrouper, selectCollector);
 			FillCollectorViewData();
 		}
 
-		private int GetPackRuleIndex(string packRuleName)
+		private int GetCollectorTypeIndex(string typeName)
 		{
-			for (int i = 0; i < _packRuleList.Count; i++)
+			for (int i = 0; i < _collectorTypeList.Count; i++)
 			{
-				if (_packRuleList[i] == packRuleName)
+				if (_collectorTypeList[i] == typeName)
 					return i;
 			}
 			return 0;
 		}
-		private int GetFilterRuleIndex(string filterRuleName)
+		private int GetAddressRuleIndex(string ruleName)
+		{
+			for (int i = 0; i < _addressRuleList.Count; i++)
+			{
+				if (_addressRuleList[i] == ruleName)
+					return i;
+			}
+			return 0;
+		}
+		private int GetPackRuleIndex(string ruleName)
+		{
+			for (int i = 0; i < _packRuleList.Count; i++)
+			{
+				if (_packRuleList[i] == ruleName)
+					return i;
+			}
+			return 0;
+		}
+		private int GetFilterRuleIndex(string ruleName)
 		{
 			for (int i = 0; i < _filterRuleList.Count; i++)
 			{
-				if (_filterRuleList[i] == filterRuleName)
+				if (_filterRuleList[i] == ruleName)
 					return i;
 			}
 			return 0;

Assets/YooAsset/Editor/AssetBundleGrouper/AssetBundleGrouperWindow.uxml

@@ -1,19 +1,19 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
-    <uie:Toolbar name="Toolbar" style="display: flex;">
-        <uie:ToolbarSearchField focusable="true" name="SearchField" style="width: 300px; flex-grow: 1;" />
+    <uie:Toolbar name="Toolbar" style="display: flex; flex-direction: row-reverse;">
         <ui:Button text="导出" display-tooltip-when-elided="true" name="ExportButton" style="width: 50px; background-color: rgb(56, 147, 58);" />
         <ui:Button text="导入" display-tooltip-when-elided="true" name="ImportButton" style="width: 50px; background-color: rgb(56, 147, 58);" />
     </uie:Toolbar>
     <ui:VisualElement name="ContentContainer" style="flex-grow: 1; flex-direction: row;">
         <ui:VisualElement name="LeftContainer" style="width: 200px; flex-grow: 0; background-color: rgb(67, 67, 67); border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">
-            <ui:ListView focusable="true" name="GrouperListView" item-height="20" style="flex-grow: 1;" />
+            <ui:ListView focusable="true" name="GrouperListView" item-height="20" virtualization-method="DynamicHeight" style="flex-grow: 1;" />
             <ui:VisualElement name="GrouperAddContainer" style="height: 20px; flex-direction: row; justify-content: center;">
                 <ui:Button text=" - " display-tooltip-when-elided="true" name="RemoveBtn" />
                 <ui:Button text=" + " display-tooltip-when-elided="true" name="AddBtn" />
             </ui:VisualElement>
         </ui:VisualElement>
         <ui:VisualElement name="RightContainer" style="flex-direction: column; flex-grow: 1;">
-            <ui:VisualElement name="ShaderContainer" style="height: 30px; background-color: rgb(67, 67, 67); flex-direction: row; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">
+            <ui:VisualElement name="PublicContainer" style="height: 30px; background-color: rgb(67, 67, 67); flex-direction: row; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">
+                <ui:Toggle label="Enable Addressable" name="EnableAddressable" style="width: 196px; -unity-text-align: middle-left;" />
                 <ui:Toggle label="Auto Collect Shaders" name="AutoCollectShader" style="width: 196px; -unity-text-align: middle-left;" />
                 <ui:TextField picking-mode="Ignore" label="Shader Bundle Name" name="ShaderBundleName" style="flex-grow: 1; -unity-text-align: middle-left;" />
             </ui:VisualElement>
@@ -22,10 +22,9 @@
                 <ui:TextField picking-mode="Ignore" label="Grouper Desc" name="GrouperDesc" />
                 <ui:TextField picking-mode="Ignore" label="Grouper Asset Tags" name="GrouperAssetTags" />
                 <ui:VisualElement name="CollectorAddContainer" style="height: 20px; flex-direction: row-reverse;">
-                    <ui:Button text=" - " display-tooltip-when-elided="true" name="RemoveBtn" />
-                    <ui:Button text=" + " display-tooltip-when-elided="true" name="AddBtn" />
+                    <ui:Button text="[ + ]" display-tooltip-when-elided="true" name="AddBtn" />
                 </ui:VisualElement>
-                <ui:ListView focusable="true" name="CollectorListView" item-height="50" style="flex-grow: 1;" />
+                <ui:ScrollView name="CollectorScrollView" style="flex-grow: 1;" />
             </ui:VisualElement>
         </ui:VisualElement>
     </ui:VisualElement>

Assets/YooAsset/Editor/AssetBundleGrouper/CollectAssetInfo.cs

@@ -5,11 +5,21 @@ namespace YooAsset.Editor
 {
 	public class CollectAssetInfo
 	{
+		/// <summary>
+		/// 收集器类型
+		/// </summary>
+		public ECollectorType CollectorType { private set; get; }
+
 		/// <summary>
 		/// 资源包名称
 		/// </summary>
 		public string BundleName { private set; get; }
 
+		/// <summary>
+		/// 可寻址地址
+		/// </summary>
+		public string Address { private set; get; }
+
 		/// <summary>
 		/// 资源路径
 		/// </summary>
@@ -25,32 +35,20 @@ namespace YooAsset.Editor
 		/// </summary>
 		public bool IsRawAsset { private set; get; }
 
-		/// <summary>
-		/// 不写入资源列表
-		/// </summary>
-		public bool NotWriteToAssetList { private set; get; }
-
 		/// <summary>
 		/// 依赖的资源列表
 		/// </summary>
 		public List<string> DependAssets = new List<string>();
 
 
-		public CollectAssetInfo(string bundleName, string assetPath, List<string> assetTags, bool isRawAsset, bool notWriteToAssetList)
+		public CollectAssetInfo(ECollectorType collectorType, string bundleName, string address, string assetPath, List<string> assetTags, bool isRawAsset)
 		{
+			CollectorType = collectorType;
 			BundleName = bundleName;
+			Address = address;
 			AssetPath = assetPath;
 			AssetTags = assetTags;
 			IsRawAsset = isRawAsset;
-			NotWriteToAssetList = notWriteToAssetList;
-		}
-		public CollectAssetInfo(string assetPath, List<string> assetTags, bool isRawAsset, bool notWriteToAssetList)
-		{
-			BundleName = string.Empty;
-			AssetPath = assetPath;
-			AssetTags = assetTags;
-			IsRawAsset = isRawAsset;
-			NotWriteToAssetList = notWriteToAssetList;
 		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleGrouper/DefaultAddressRule.cs

@@ -0,0 +1,40 @@
+using System.IO;
+
+namespace YooAsset.Editor
+{
+	/// <summary>
+	/// 以文件名为定位地址
+	/// </summary>
+	public class AddressByFileName : IAddressRule
+	{
+		string IAddressRule.GetAssetAddress(AddressRuleData data)
+		{
+			return Path.GetFileNameWithoutExtension(data.AssetPath);
+		}
+	}
+
+	/// <summary>
+	/// 以组名+文件名为定位地址
+	/// </summary>
+	public class AddressByGrouperAndFileName : IAddressRule
+	{
+		string IAddressRule.GetAssetAddress(AddressRuleData data)
+		{
+			string fileName = Path.GetFileNameWithoutExtension(data.AssetPath);
+			return $"{data.GrouperName}_{fileName}";
+		}
+	}
+
+	/// <summary>
+	/// 以收集器名+文件名为定位地址
+	/// </summary>
+	public class AddressByCollectorAndFileName : IAddressRule
+	{
+		string IAddressRule.GetAssetAddress(AddressRuleData data)
+		{
+			string fileName = Path.GetFileNameWithoutExtension(data.AssetPath);
+			string collectorName = Path.GetFileNameWithoutExtension(data.CollectPath);
+			return $"{collectorName}_{fileName}";
+		}
+	}
+}

Assets/YooAsset/Editor/AssetBundleGrouper/DefaultAddressRule.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6df37bfd87103a54ca60c0c467a5f33b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/YooAsset/Editor/AssetBundleGrouper/DefaultPackRule.cs

@@ -7,30 +7,64 @@ namespace YooAsset.Editor
 	/// <summary>
 	/// 以文件路径作为资源包名
 	/// 注意：每个文件独自打资源包
+	/// 例如：收集器路径为 "Assets/UIPanel"
+	/// 例如："Assets/UIPanel/Shop/Image/backgroud.png" --> "assets/uipanel/shop/image/backgroud.bundle"
+	/// 例如："Assets/UIPanel/Shop/View/main.prefab" --> "assets/uipanel/shop/view/main.bundle"
 	/// </summary>
 	public class PackSeparately : IPackRule
 	{
 		string IPackRule.GetBundleName(PackRuleData data)
 		{
-			return StringUtility.RemoveExtension(data.AssetPath); //"Assets/Config/test.txt" --> "Assets/Config/test"
+			return StringUtility.RemoveExtension(data.AssetPath);
 		}
 	}
 
 	/// <summary>
 	/// 以父类文件夹路径作为资源包名
 	/// 注意：文件夹下所有文件打进一个资源包
+	/// 例如：收集器路径为 "Assets/UIPanel"
+	/// 例如："Assets/UIPanel/Shop/Image/backgroud.png" --> "assets/uipanel/shop/image.bundle"
+	/// 例如："Assets/UIPanel/Shop/View/main.prefab" --> "assets/uipanel/shop/view.bundle"
 	/// </summary>
 	public class PackDirectory : IPackRule
 	{
 		string IPackRule.GetBundleName(PackRuleData data)
 		{
-			return Path.GetDirectoryName(data.AssetPath); //"Assets/Config/test.txt" --> "Assets/Config"
+			return Path.GetDirectoryName(data.AssetPath);
+		}
+	}
+
+	/// <summary>
+	/// 以收集器路径下顶级文件夹为资源包名
+	/// 注意：文件夹下所有文件打进一个资源包
+	/// 例如：收集器路径为 "Assets/UIPanel"
+	/// 例如："Assets/UIPanel/Shop/Image/backgroud.png" --> "assets/uipanel/shop.bundle"
+	/// 例如："Assets/UIPanel/Shop/View/main.prefab" --> "assets/uipanel/shop.bundle"
+	/// </summary>
+	public class PackTopDirectory : IPackRule
+	{
+		string IPackRule.GetBundleName(PackRuleData data)
+		{
+			string assetPath = data.AssetPath.Replace(data.CollectPath, string.Empty);
+			assetPath = assetPath.TrimStart('/');
+			string[] splits = assetPath.Split('/');
+			if (splits.Length > 0)
+			{
+				if (Path.HasExtension(splits[0]))
+					throw new Exception($"Not found root directory : {assetPath}");
+				string bundleName = $"{data.CollectPath}/{splits[0]}";
+				return bundleName;
+			}
+			else
+			{
+				throw new Exception($"Not found root directory : {assetPath}");
+			}
 		}
 	}
 
 	/// <summary>
 	/// 以收集器路径作为资源包名
-	/// 注意：收集器下所有文件打进一个资源包
+	/// 注意：收集的所有文件打进一个资源包
 	/// </summary>
 	public class PackCollector : IPackRule
 	{
@@ -42,7 +76,7 @@ namespace YooAsset.Editor
 
 	/// <summary>
 	/// 以分组名称作为资源包名
-	/// 注意：分组内所有文件打进一个资源包
+	/// 注意：收集的所有文件打进一个资源包
 	/// </summary>
 	public class PackGrouper : IPackRule
 	{

Assets/YooAsset/Editor/AssetBundleGrouper/ECollectorType.cs

@@ -0,0 +1,29 @@
+using System;
+
+namespace YooAsset.Editor
+{
+	[Serializable]
+	public enum ECollectorType
+	{
+		/// <summary>
+		/// 收集参与打包的主资源对象，并写入到资源清单的资源列表里（可以通过代码加载）。
+		/// </summary>
+		MainAssetCollector,
+
+		/// <summary>
+		/// 收集参与打包的主资源对象，但不写入到资源清单的资源列表里（无法通过代码加载）。
+		/// </summary>
+		StaticAssetCollector,
+
+		/// <summary>
+		/// 收集参与打包的依赖资源对象，但不写入到资源清单的资源列表里（无法通过代码加载）。
+		/// 注意：如果依赖资源对象没有被主资源对象引用，则不参与打包构建。
+		/// </summary>
+		DependAssetCollector,
+
+		/// <summary>
+		/// 该收集器类型不能被设置
+		/// </summary>
+		None,
+	}
+}

Assets/YooAsset/Editor/AssetBundleGrouper/ECollectorType.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4bbef9cb5c1a40b41a28a65df3449abe
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/YooAsset/Editor/AssetBundleGrouper/IAddressRule.cs

@@ -0,0 +1,25 @@
+
+namespace YooAsset.Editor
+{
+	public struct AddressRuleData
+	{
+		public string AssetPath;
+		public string CollectPath;
+		public string GrouperName;
+
+		public AddressRuleData(string assetPath, string collectPath, string grouperName)
+		{
+			AssetPath = assetPath;
+			CollectPath = collectPath;
+			GrouperName = grouperName;
+		}
+	}
+
+	/// <summary>
+	/// 寻址规则接口
+	/// </summary>
+	public interface IAddressRule
+	{
+		string GetAssetAddress(AddressRuleData data);
+	}
+}

Assets/YooAsset/Editor/AssetBundleGrouper/IAddressRule.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 426a4ff47699b6844946329f54a89128
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/YooAsset/Editor/AssetBundleReporter/AssetBundleReporterWindow.cs

@@ -11,8 +11,7 @@ namespace YooAsset.Editor
 		[MenuItem("YooAsset/AssetBundle Reporter", false, 103)]
 		public static void ShowExample()
 		{
-			AssetBundleReporterWindow window = GetWindow<AssetBundleReporterWindow>();
-			window.titleContent = new GUIContent("资源包报告工具");
+			AssetBundleReporterWindow window = GetWindow<AssetBundleReporterWindow>("资源包报告工具", true, EditorDefine.DockedWindowTypes);
 			window.minSize = new Vector2(800, 600);
 		}
 
@@ -52,7 +51,7 @@ namespace YooAsset.Editor
 			VisualElement root = this.rootVisualElement;
 
 			// 加载布局文件
-			string rootPath = EditorTools.GetYooAssetPath();
+			string rootPath = EditorTools.GetYooAssetSourcePath();
 			string uxml = $"{rootPath}/Editor/AssetBundleReporter/{nameof(AssetBundleReporterWindow)}.uxml";
 			var visualAsset = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(uxml);
 			if (visualAsset == null)

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

@@ -1,5 +1,5 @@
 #if UNITY_2019_4_OR_NEWER
-using System.IO;
+using System;
 using System.Linq;
 using System.Collections.Generic;
 using UnityEditor;
@@ -11,18 +11,26 @@ namespace YooAsset.Editor
 {
 	internal class AssetListReporterViewer
 	{
+		private enum ESortMode
+		{
+			AssetPath,
+			BundleName
+		}
+
 		private VisualTreeAsset _visualAsset;
 		private TemplateContainer _root;
 
 		private ToolbarButton _topBar1;
 		private ToolbarButton _topBar2;
-		private ToolbarButton _topBar3;
 		private ToolbarButton _bottomBar1;
-		private ToolbarButton _bottomBar2;
-		private ToolbarButton _bottomBar3;
 		private ListView _assetListView;
 		private ListView _dependListView;
+
 		private BuildReport _buildReport;
+		private string _searchKeyWord;
+		private ESortMode _sortMode = ESortMode.AssetPath;
+		private bool _descendingSort = false;
+
 
 		/// <summary>
 		/// 初始化页面
@@ -30,7 +38,7 @@ namespace YooAsset.Editor
 		public void InitViewer()
 		{
 			// 加载布局文件
-			string rootPath = EditorTools.GetYooAssetPath();
+			string rootPath = EditorTools.GetYooAssetSourcePath();
 			string uxml = $"{rootPath}/Editor/AssetBundleReporter/VisualViewers/{nameof(AssetListReporterViewer)}.uxml";
 			_visualAsset = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(uxml);
 			if (_visualAsset == null)
@@ -38,36 +46,40 @@ namespace YooAsset.Editor
 				Debug.LogError($"Not found {nameof(AssetListReporterViewer)}.uxml : {uxml}");
 				return;
 			}
-			_root = _visualAsset.CloneTree();
-			_root.style.flexGrow = 1f;
 
-			// 顶部按钮栏
-			_topBar1 = _root.Q<ToolbarButton>("TopBar1");
-			_topBar2 = _root.Q<ToolbarButton>("TopBar2");
-			_topBar3 = _root.Q<ToolbarButton>("TopBar3");
-			_topBar1.clicked += TopBar1_clicked;
-			_topBar2.clicked += TopBar2_clicked;
-			_topBar3.clicked += TopBar3_clicked;
+			try
+			{
+				_root = _visualAsset.CloneTree();
+				_root.style.flexGrow = 1f;
 
-			// 底部按钮栏
-			_bottomBar1 = _root.Q<ToolbarButton>("BottomBar1");
-			_bottomBar2 = _root.Q<ToolbarButton>("BottomBar2");
-			_bottomBar3 = _root.Q<ToolbarButton>("BottomBar3");
-			
-			// 资源列表
-			_assetListView = _root.Q<ListView>("TopListView");
-			_assetListView.makeItem = MakeAssetListViewItem;
-			_assetListView.bindItem = BindAssetListViewItem;
+				// 顶部按钮栏
+				_topBar1 = _root.Q<ToolbarButton>("TopBar1");
+				_topBar2 = _root.Q<ToolbarButton>("TopBar2");
+				_topBar1.clicked += TopBar1_clicked;
+				_topBar2.clicked += TopBar2_clicked;
 
+				// 底部按钮栏
+				_bottomBar1 = _root.Q<ToolbarButton>("BottomBar1");
+
+				// 资源列表
+				_assetListView = _root.Q<ListView>("TopListView");
+				_assetListView.makeItem = MakeAssetListViewItem;
+				_assetListView.bindItem = BindAssetListViewItem;
 #if UNITY_2020_1_OR_NEWER
-			_assetListView.onSelectionChange += AssetListView_onSelectionChange;
+				_assetListView.onSelectionChange += AssetListView_onSelectionChange;
 #else
-			_assetListView.onSelectionChanged += AssetListView_onSelectionChange;
+				_assetListView.onSelectionChanged += AssetListView_onSelectionChange;
 #endif
-			// 依赖列表
-			_dependListView = _root.Q<ListView>("BottomListView");
-			_dependListView.makeItem = MakeDependListViewItem;
-			_dependListView.bindItem = BindDependListViewItem;
+
+				// 依赖列表
+				_dependListView = _root.Q<ListView>("BottomListView");
+				_dependListView.makeItem = MakeDependListViewItem;
+				_dependListView.bindItem = BindDependListViewItem;
+			}
+			catch (Exception e)
+			{
+				Debug.LogError(e.ToString());
+			}
 		}
 
 		/// <summary>
@@ -76,23 +88,76 @@ namespace YooAsset.Editor
 		public void FillViewData(BuildReport buildReport, string searchKeyWord)
 		{
 			_buildReport = buildReport;
-			_assetListView.Clear();
-			_assetListView.itemsSource = FilterViewItems(buildReport, searchKeyWord);
-			_topBar1.text = $"Asset Path ({_assetListView.itemsSource.Count})";
+			_searchKeyWord = searchKeyWord;
+			RefreshView();
 		}
-		private List<ReportAssetInfo> FilterViewItems(BuildReport buildReport, string searchKeyWord)
+		private void RefreshView()
 		{
-			List<ReportAssetInfo> result = new List<ReportAssetInfo>(buildReport.AssetInfos.Count);
-			foreach (var assetInfo in buildReport.AssetInfos)
+			_assetListView.Clear();
+			_assetListView.ClearSelection();
+			_assetListView.itemsSource = FilterAndSortViewItems();
+			_assetListView.Rebuild();
+			RefreshSortingSymbol();
+		}
+		private List<ReportAssetInfo> FilterAndSortViewItems()
+		{
+			List<ReportAssetInfo> result = new List<ReportAssetInfo>(_buildReport.AssetInfos.Count);
+
+			// 过滤列表
+			foreach (var assetInfo in _buildReport.AssetInfos)
 			{
-				if(string.IsNullOrEmpty(searchKeyWord) == false)
+				if (string.IsNullOrEmpty(_searchKeyWord) == false)
 				{
-					if (assetInfo.AssetPath.Contains(searchKeyWord) == false)
-						continue;					
+					if (assetInfo.AssetPath.Contains(_searchKeyWord) == false)
+						continue;
 				}
 				result.Add(assetInfo);
 			}
-			return result;
+
+			// 排序列表
+			if (_sortMode == ESortMode.AssetPath)
+			{
+				if (_descendingSort)
+					return result.OrderByDescending(a => a.AssetPath).ToList();
+				else
+					return result.OrderBy(a => a.AssetPath).ToList();
+			}
+			else if (_sortMode == ESortMode.BundleName)
+			{
+				if (_descendingSort)
+					return result.OrderByDescending(a => a.MainBundleName).ToList();
+				else
+					return result.OrderBy(a => a.MainBundleName).ToList();
+			}
+			else
+			{
+				throw new System.NotImplementedException();
+			}
+		}
+		private void RefreshSortingSymbol()
+		{
+			// 刷新符号
+			_topBar1.text = $"Asset Path ({_assetListView.itemsSource.Count})";
+			_topBar2.text = "Main Bundle";
+
+			if (_sortMode == ESortMode.AssetPath)
+			{
+				if (_descendingSort)
+					_topBar1.text = $"Asset Path ({_assetListView.itemsSource.Count}) ↓";
+				else
+					_topBar1.text = $"Asset Path ({_assetListView.itemsSource.Count}) ↑";
+			}
+			else if (_sortMode == ESortMode.BundleName)
+			{
+				if (_descendingSort)
+					_topBar2.text = "Main Bundle ↓";
+				else
+					_topBar2.text = "Main Bundle ↑";
+			}
+			else
+			{
+				throw new System.NotImplementedException();
+			}
 		}
 
 		/// <summary>
@@ -133,18 +198,8 @@ namespace YooAsset.Editor
 				label.name = "Label2";
 				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 = "Label3";
-				label.style.unityTextAlign = TextAnchor.MiddleLeft;
-				label.style.marginLeft = 3f;
 				label.style.flexGrow = 1f;
-				label.style.width = 145;
+				label.style.width = 150;
 				element.Add(label);
 			}
 
@@ -154,19 +209,15 @@ namespace YooAsset.Editor
 		{
 			var sourceData = _assetListView.itemsSource as List<ReportAssetInfo>;
 			var assetInfo = sourceData[index];
-			var bundleInfo = _buildReport.GetBundleInfo(assetInfo.MainBundle);
+			var bundleInfo = _buildReport.GetBundleInfo(assetInfo.MainBundleName);
 
 			// Asset Path
 			var label1 = element.Q<Label>("Label1");
 			label1.text = assetInfo.AssetPath;
 
-			// Size
-			var label2 = element.Q<Label>("Label2");
-			label2.text = GetAssetFileSize(assetInfo.AssetPath);
-
 			// Main Bundle
-			var label3 = element.Q<Label>("Label3");
-			label3.text = bundleInfo.BundleName;
+			var label2 = element.Q<Label>("Label2");
+			label2.text = bundleInfo.BundleName;
 		}
 		private void AssetListView_onSelectionChange(IEnumerable<object> objs)
 		{
@@ -177,22 +228,41 @@ namespace YooAsset.Editor
 			}
 		}
 		private void TopBar1_clicked()
-		{		
+		{
+			if (_sortMode != ESortMode.AssetPath)
+			{
+				_sortMode = ESortMode.AssetPath;
+				_descendingSort = false;
+				RefreshView();
+			}
+			else
+			{
+				_descendingSort = !_descendingSort;
+				RefreshView();
+			}
 		}
 		private void TopBar2_clicked()
 		{
-		}
-		private void TopBar3_clicked()
-		{
+			if (_sortMode != ESortMode.BundleName)
+			{
+				_sortMode = ESortMode.BundleName;
+				_descendingSort = false;
+				RefreshView();
+			}
+			else
+			{
+				_descendingSort = !_descendingSort;
+				RefreshView();
+			}
 		}
 
 		// 依赖列表相关
 		private void FillDependListView(ReportAssetInfo assetInfo)
 		{
 			List<ReportBundleInfo> bundles = new List<ReportBundleInfo>();
-			var mainBundle = _buildReport.GetBundleInfo(assetInfo.MainBundle);
+			var mainBundle = _buildReport.GetBundleInfo(assetInfo.MainBundleName);
 			bundles.Add(mainBundle);
-			foreach(string dependBundleName in assetInfo.DependBundles)
+			foreach (string dependBundleName in assetInfo.DependBundles)
 			{
 				var dependBundle = _buildReport.GetBundleInfo(dependBundleName);
 				bundles.Add(dependBundle);
@@ -201,6 +271,7 @@ namespace YooAsset.Editor
 			_dependListView.Clear();
 			_dependListView.ClearSelection();
 			_dependListView.itemsSource = bundles;
+			_dependListView.Rebuild();
 			_bottomBar1.text = $"Depend Bundles ({bundles.Count})";
 		}
 		private VisualElement MakeDependListViewItem()
@@ -234,7 +305,7 @@ namespace YooAsset.Editor
 				label.style.unityTextAlign = TextAnchor.MiddleLeft;
 				label.style.marginLeft = 3f;
 				//label.style.flexGrow = 1f;
-				label.style.width = 250;
+				label.style.width = 280;
 				element.Add(label);
 			}
 
@@ -257,15 +328,6 @@ namespace YooAsset.Editor
 			var label3 = element.Q<Label>("Label3");
 			label3.text = bundleInfo.Hash;
 		}
-
-		private string GetAssetFileSize(string assetPath)
-		{
-			string fullPath = EditorTools.GetProjectPath() + "/" + assetPath;
-			if (File.Exists(fullPath) == false)
-				return "unknown";
-			else
-				return (EditorTools.GetFileSize(fullPath) / 1024f).ToString("f1") + " KB";
-		}
 	}
 }
 #endif

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

@@ -2,17 +2,16 @@
     <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;">
         <uie:Toolbar name="TopBar" style="height: 25px; margin-left: 1px; margin-right: 1px;">
             <uie:ToolbarButton text="Asset Path" display-tooltip-when-elided="true" name="TopBar1" style="width: 280px; -unity-text-align: middle-left; flex-grow: 1;" />
-            <uie:ToolbarButton text="Size" display-tooltip-when-elided="true" name="TopBar2" style="width: 100px; -unity-text-align: middle-left; flex-grow: 0;" />
-            <uie:ToolbarButton text="Main Bundle" display-tooltip-when-elided="true" name="TopBar3" style="width: 145px; -unity-text-align: middle-left; flex-grow: 1;" />
+            <uie:ToolbarButton text="Main Bundle" display-tooltip-when-elided="true" name="TopBar2" style="width: 145px; -unity-text-align: middle-left; flex-grow: 1;" />
         </uie:Toolbar>
-        <ui:ListView focusable="true" name="TopListView" item-height="18" style="flex-grow: 1;" />
+        <ui:ListView focusable="true" name="TopListView" item-height="18" virtualization-method="DynamicHeight" style="flex-grow: 1;" />
     </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;">
         <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="Size" display-tooltip-when-elided="true" name="BottomBar2" style="width: 100px; -unity-text-align: middle-left; flex-grow: 0;" />
-            <uie:ToolbarButton text="Hash" display-tooltip-when-elided="true" name="BottomBar3" style="width: 250px; -unity-text-align: middle-left;" />
+            <uie:ToolbarButton text="Hash" display-tooltip-when-elided="true" name="BottomBar3" style="width: 280px; -unity-text-align: middle-left;" />
         </uie:Toolbar>
-        <ui:ListView focusable="true" name="BottomListView" item-height="18" style="flex-grow: 1;" />
+        <ui:ListView focusable="true" name="BottomListView" item-height="18" virtualization-method="DynamicHeight" style="flex-grow: 1;" />
     </ui:VisualElement>
 </ui:UXML>

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

@@ -1,4 +1,5 @@
 #if UNITY_2019_4_OR_NEWER
+using System;
 using System.IO;
 using System.Linq;
 using System.Collections.Generic;
@@ -11,6 +12,13 @@ namespace YooAsset.Editor
 {
 	internal class BundleListReporterViewer
 	{
+		private enum ESortMode
+		{
+			BundleName,
+			BundleSize,
+			BundleTags
+		}
+
 		private VisualTreeAsset _visualAsset;
 		private TemplateContainer _root;
 
@@ -18,13 +26,15 @@ namespace YooAsset.Editor
 		private ToolbarButton _topBar2;
 		private ToolbarButton _topBar3;
 		private ToolbarButton _topBar4;
-		private ToolbarButton _topBar5;
 		private ToolbarButton _bottomBar1;
-		private ToolbarButton _bottomBar2;
-		private ToolbarButton _bottomBar3;
 		private ListView _bundleListView;
 		private ListView _includeListView;
+
 		private BuildReport _buildReport;
+		private string _searchKeyWord;
+		private ESortMode _sortMode = ESortMode.BundleName;
+		private bool _descendingSort = false;
+
 
 		/// <summary>
 		/// 初始化页面
@@ -32,7 +42,7 @@ namespace YooAsset.Editor
 		public void InitViewer()
 		{
 			// 加载布局文件
-			string rootPath = EditorTools.GetYooAssetPath();
+			string rootPath = EditorTools.GetYooAssetSourcePath();
 			string uxml = $"{rootPath}/Editor/AssetBundleReporter/VisualViewers/{nameof(BundleListReporterViewer)}.uxml";
 			_visualAsset = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(uxml);
 			if (_visualAsset == null)
@@ -40,35 +50,44 @@ namespace YooAsset.Editor
 				Debug.LogError($"Not found {nameof(BundleListReporterViewer)}.uxml : {uxml}");
 				return;
 			}
-			_root = _visualAsset.CloneTree();
-			_root.style.flexGrow = 1f;
 
-			// 顶部按钮栏
-			_topBar1 = _root.Q<ToolbarButton>("TopBar1");
-			_topBar2 = _root.Q<ToolbarButton>("TopBar2");
-			_topBar3 = _root.Q<ToolbarButton>("TopBar3");
-			_topBar4 = _root.Q<ToolbarButton>("TopBar4");
-			_topBar5 = _root.Q<ToolbarButton>("TopBar5");
+			try
+			{
+				_root = _visualAsset.CloneTree();
+				_root.style.flexGrow = 1f;
 
-			// 底部按钮栏
-			_bottomBar1 = _root.Q<ToolbarButton>("BottomBar1");
-			_bottomBar2 = _root.Q<ToolbarButton>("BottomBar2");
-			_bottomBar3 = _root.Q<ToolbarButton>("BottomBar3");
+				// 顶部按钮栏
+				_topBar1 = _root.Q<ToolbarButton>("TopBar1");
+				_topBar2 = _root.Q<ToolbarButton>("TopBar2");
+				_topBar3 = _root.Q<ToolbarButton>("TopBar3");
+				_topBar4 = _root.Q<ToolbarButton>("TopBar4");
+				_topBar1.clicked += TopBar1_clicked;
+				_topBar2.clicked += TopBar2_clicked;
+				_topBar3.clicked += TopBar3_clicked;
+				_topBar4.clicked += TopBar4_clicked;
 
-			// 资源包列表
-			_bundleListView = _root.Q<ListView>("TopListView");
-			_bundleListView.makeItem = MakeBundleListViewItem;
-			_bundleListView.bindItem = BindBundleListViewItem;
+				// 底部按钮栏
+				_bottomBar1 = _root.Q<ToolbarButton>("BottomBar1");
+
+				// 资源包列表
+				_bundleListView = _root.Q<ListView>("TopListView");
+				_bundleListView.makeItem = MakeBundleListViewItem;
+				_bundleListView.bindItem = BindBundleListViewItem;
 #if UNITY_2020_1_OR_NEWER
-			_bundleListView.onSelectionChange += BundleListView_onSelectionChange;
+				_bundleListView.onSelectionChange += BundleListView_onSelectionChange;
 #else
-			_bundleListView.onSelectionChanged += BundleListView_onSelectionChange;
+				_bundleListView.onSelectionChanged += BundleListView_onSelectionChange;
 #endif
 
-			// 包含列表
-			_includeListView = _root.Q<ListView>("BottomListView");
-			_includeListView.makeItem = MakeIncludeListViewItem;
-			_includeListView.bindItem = BindIncludeListViewItem;
+				// 包含列表
+				_includeListView = _root.Q<ListView>("BottomListView");
+				_includeListView.makeItem = MakeIncludeListViewItem;
+				_includeListView.bindItem = BindIncludeListViewItem;
+			}
+			catch (Exception e)
+			{
+				Debug.LogError(e.ToString());
+			}
 		}
 
 		/// <summary>
@@ -77,23 +96,92 @@ namespace YooAsset.Editor
 		public void FillViewData(BuildReport buildReport, string searchKeyWord)
 		{
 			_buildReport = buildReport;
-			_bundleListView.Clear();
-			_bundleListView.itemsSource = FilterViewItems(buildReport, searchKeyWord);
-			_topBar1.text = $"Bundle Name ({_bundleListView.itemsSource.Count})";
+			_searchKeyWord = searchKeyWord;
+			RefreshView();
 		}
-		private List<ReportBundleInfo> FilterViewItems(BuildReport buildReport, string searchKeyWord)
+		private void RefreshView()
 		{
-			List<ReportBundleInfo> result = new List<ReportBundleInfo>(buildReport.BundleInfos.Count);
-			foreach (var bundleInfo in buildReport.BundleInfos)
+			_bundleListView.Clear();
+			_bundleListView.ClearSelection();
+			_bundleListView.itemsSource = FilterAndSortViewItems();
+			_bundleListView.Rebuild();
+			RefreshSortingSymbol();
+		}
+		private List<ReportBundleInfo> FilterAndSortViewItems()
+		{
+			List<ReportBundleInfo> result = new List<ReportBundleInfo>(_buildReport.BundleInfos.Count);
+
+			// 过滤列表
+			foreach (var bundleInfo in _buildReport.BundleInfos)
 			{
-				if (string.IsNullOrEmpty(searchKeyWord) == false)
+				if (string.IsNullOrEmpty(_searchKeyWord) == false)
 				{
-					if (bundleInfo.BundleName.Contains(searchKeyWord) == false)
+					if (bundleInfo.BundleName.Contains(_searchKeyWord) == false)
 						continue;
 				}
 				result.Add(bundleInfo);
 			}
-			return result;
+
+			// 排序列表
+			if (_sortMode == ESortMode.BundleName)
+			{
+				if (_descendingSort)
+					return result.OrderByDescending(a => a.BundleName).ToList();
+				else
+					return result.OrderBy(a => a.BundleName).ToList();
+			}
+			else if (_sortMode == ESortMode.BundleSize)
+			{
+				if (_descendingSort)
+					return result.OrderByDescending(a => a.SizeBytes).ToList();
+				else
+					return result.OrderBy(a => a.SizeBytes).ToList();
+			}
+			else if (_sortMode == ESortMode.BundleTags)
+			{
+				if(_descendingSort)
+					return result.OrderByDescending(a => a.GetTagsString()).ToList();
+				else
+					return result.OrderBy(a => a.GetTagsString()).ToList();
+			}
+			else
+			{
+				throw new System.NotImplementedException();
+			}
+		}
+		private void RefreshSortingSymbol()
+		{
+			// 刷新符号
+			_topBar1.text = $"Bundle Name ({_bundleListView.itemsSource.Count})";
+			_topBar2.text = "Size";
+			_topBar3.text = "Hash";
+			_topBar4.text = "Tags";
+
+			if (_sortMode == ESortMode.BundleName)
+			{
+				if (_descendingSort)
+					_topBar1.text = $"Bundle Name ({_bundleListView.itemsSource.Count}) ↓";
+				else
+					_topBar1.text = $"Bundle Name ({_bundleListView.itemsSource.Count}) ↑";
+			}
+			else if (_sortMode == ESortMode.BundleSize)
+			{
+				if (_descendingSort)
+					_topBar2.text = "Size ↓";
+				else
+					_topBar2.text = "Size ↑";
+			}
+			else if(_sortMode == ESortMode.BundleTags)
+			{
+				if (_descendingSort)
+					_topBar4.text = "Tags ↓";
+				else
+					_topBar4.text = "Tags ↑";
+			}
+			else
+			{
+				throw new System.NotImplementedException();
+			}
 		}
 
 		/// <summary>
@@ -145,17 +233,7 @@ namespace YooAsset.Editor
 				label.style.unityTextAlign = TextAnchor.MiddleLeft;
 				label.style.marginLeft = 3f;
 				//label.style.flexGrow = 1f;
-				label.style.width = 250;
-				element.Add(label);
-			}
-
-			{
-				var label = new Label();
-				label.name = "Label4";
-				label.style.unityTextAlign = TextAnchor.MiddleLeft;
-				label.style.marginLeft = 3f;
-				//label.style.flexGrow = 1f;
-				label.style.width = 60;
+				label.style.width = 280;
 				element.Add(label);
 			}
 
@@ -188,13 +266,9 @@ namespace YooAsset.Editor
 			var label3 = element.Q<Label>("Label3");
 			label3.text = bundleInfo.Hash;
 
-			// Version
-			var label4 = element.Q<Label>("Label4");
-			label4.text = bundleInfo.Version.ToString();
-
 			// Tags
 			var label5 = element.Q<Label>("Label5");
-			label5.text = GetTagsString(bundleInfo.Tags);
+			label5.text = bundleInfo.GetTagsString();
 		}
 		private void BundleListView_onSelectionChange(IEnumerable<object> objs)
 		{
@@ -204,20 +278,66 @@ namespace YooAsset.Editor
 				FillIncludeListView(bundleInfo);
 			}
 		}
+		private void TopBar1_clicked()
+		{
+			if (_sortMode != ESortMode.BundleName)
+			{
+				_sortMode = ESortMode.BundleName;
+				_descendingSort = false;
+				RefreshView();
+			}
+			else
+			{
+				_descendingSort = !_descendingSort;
+				RefreshView();
+			}
+		}
+		private void TopBar2_clicked()
+		{
+			if (_sortMode != ESortMode.BundleSize)
+			{
+				_sortMode = ESortMode.BundleSize;
+				_descendingSort = false;
+				RefreshView();
+			}
+			else
+			{
+				_descendingSort = !_descendingSort;
+				RefreshView();
+			}
+		}
+		private void TopBar3_clicked()
+		{
+		}
+		private void TopBar4_clicked()
+		{
+			if (_sortMode != ESortMode.BundleTags)
+			{
+				_sortMode = ESortMode.BundleTags;
+				_descendingSort = false;
+				RefreshView();
+			}
+			else
+			{
+				_descendingSort = !_descendingSort;
+				RefreshView();
+			}
+		}
 
 		// 底部列表相关
 		private void FillIncludeListView(ReportBundleInfo bundleInfo)
 		{
-			List<string> containsList = new List<string>();
+			List<ReportAssetInfo> containsList = new List<ReportAssetInfo>();
 			foreach (var assetInfo in _buildReport.AssetInfos)
 			{
-				if (assetInfo.MainBundle == bundleInfo.BundleName)
-					containsList.Add(assetInfo.AssetPath);
+				if (assetInfo.MainBundleName == bundleInfo.BundleName)
+					containsList.Add(assetInfo);
 			}
 
 			_includeListView.Clear();
 			_includeListView.ClearSelection();
 			_includeListView.itemsSource = containsList;
+			_includeListView.Rebuild();
 			_bottomBar1.text = $"Include Assets ({containsList.Count})";
 		}
 		private VisualElement MakeIncludeListViewItem()
@@ -240,18 +360,8 @@ namespace YooAsset.Editor
 				label.name = "Label2";
 				label.style.unityTextAlign = TextAnchor.MiddleLeft;
 				label.style.marginLeft = 3f;
-				//assetSizeLabel.style.flexGrow = 1f;
-				label.style.width = 100;
-				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 = 250;
+				label.style.width = 280;
 				element.Add(label);
 			}
 
@@ -259,42 +369,16 @@ namespace YooAsset.Editor
 		}
 		private void BindIncludeListViewItem(VisualElement element, int index)
 		{
-			List<string> containsList = _includeListView.itemsSource as List<string>;
-			string assetPath = containsList[index];
+			List<ReportAssetInfo> containsList = _includeListView.itemsSource as List<ReportAssetInfo>;
+			ReportAssetInfo assetInfo = containsList[index];
 
 			// Asset Path
 			var label1 = element.Q<Label>("Label1");
-			label1.text = assetPath;
-
-			// Size
-			var label2 = element.Q<Label>("Label2");
-			label2.text = GetAssetFileSize(assetPath);
+			label1.text = assetInfo.AssetPath;
 
 			// GUID
-			var label3 = element.Q<Label>("Label3");
-			label3.text = AssetDatabase.AssetPathToGUID(assetPath);
-		}
-		
-		private string GetAssetFileSize(string assetPath)
-		{
-			string fullPath = EditorTools.GetProjectPath() + "/" + assetPath;
-			if (File.Exists(fullPath) == false)
-				return "unknown";
-			else
-				return (EditorTools.GetFileSize(fullPath) / 1024f).ToString("f1") + " KB";
-		}
-		private string GetTagsString(string[] tags)
-		{
-			string result = string.Empty;
-			if (tags != null)
-			{
-				for (int i = 0; i < tags.Length; i++)
-				{
-					result += tags[i];
-					result += ";";
-				}
-			}
-			return result;
+			var label2 = element.Q<Label>("Label2");
+			label2.text = assetInfo.AssetGUID;
 		}
 	}
 }

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

@@ -4,19 +4,17 @@
             <uie:Toolbar name="TopBar" style="height: 25px; margin-left: 1px; margin-right: 1px;">
                 <uie:ToolbarButton text="Bundle Name" display-tooltip-when-elided="true" name="TopBar1" style="width: 280px; -unity-text-align: middle-left; flex-grow: 1;" />
                 <uie:ToolbarButton text="Size" display-tooltip-when-elided="true" name="TopBar2" style="width: 100px; -unity-text-align: middle-left; flex-grow: 0;" />
-                <uie:ToolbarButton text="Hash" display-tooltip-when-elided="true" name="TopBar3" style="width: 250px; -unity-text-align: middle-left;" />
-                <uie:ToolbarButton text="Version" display-tooltip-when-elided="true" name="TopBar4" style="width: 60px; -unity-text-align: middle-left;" />
-                <uie:ToolbarButton text="Tags" display-tooltip-when-elided="true" name="TopBar5" style="width: 80px; -unity-text-align: middle-left; flex-grow: 1;" />
+                <uie:ToolbarButton text="Hash" display-tooltip-when-elided="true" name="TopBar3" style="width: 280px; -unity-text-align: middle-left;" />
+                <uie:ToolbarButton text="Tags" display-tooltip-when-elided="true" name="TopBar4" style="width: 80px; -unity-text-align: middle-left; flex-grow: 1;" />
             </uie:Toolbar>
-            <ui:ListView focusable="true" name="TopListView" item-height="18" style="flex-grow: 1;" />
+            <ui:ListView focusable="true" name="TopListView" item-height="18" virtualization-method="DynamicHeight" style="flex-grow: 1;" />
         </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;">
             <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="Size" display-tooltip-when-elided="true" name="BottomBar2" style="width: 100px; -unity-text-align: middle-left;" />
-                <uie:ToolbarButton text="GUID" display-tooltip-when-elided="true" name="BottomBar3" style="width: 250px; -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" style="flex-grow: 1;" />
+            <ui:ListView focusable="true" name="BottomListView" item-height="18" virtualization-method="DynamicHeight" style="flex-grow: 1;" />
         </ui:VisualElement>
     </ui:VisualElement>
 </ui:UXML>

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

@@ -37,7 +37,7 @@ namespace YooAsset.Editor
 		public void InitViewer()
 		{
 			// 加载布局文件
-			string rootPath = EditorTools.GetYooAssetPath();
+			string rootPath = EditorTools.GetYooAssetSourcePath();
 			string uxml = $"{rootPath}/Editor/AssetBundleReporter/VisualViewers/{nameof(SummaryReporterViewer)}.uxml";
 			_visualAsset = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(uxml);
 			if (_visualAsset == null)
@@ -60,14 +60,17 @@ namespace YooAsset.Editor
 		public void FillViewData(BuildReport buildReport)
 		{
 			_buildReport = buildReport;
-			_listView.Clear();
+			
 			_items.Clear();
-
 			_items.Add(new ItemWrapper("引擎版本", buildReport.Summary.UnityVersion));
 			_items.Add(new ItemWrapper("构建时间", buildReport.Summary.BuildTime));
 			_items.Add(new ItemWrapper("构建耗时", $"{buildReport.Summary.BuildSeconds}秒"));
 			_items.Add(new ItemWrapper("构建平台", $"{buildReport.Summary.BuildTarget}"));
+			_items.Add(new ItemWrapper("构建模式", $"{buildReport.Summary.BuildMode}"));
 			_items.Add(new ItemWrapper("构建版本", $"{buildReport.Summary.BuildVersion}"));
+			_items.Add(new ItemWrapper("内置资源标签", $"{buildReport.Summary.BuildinTags}"));
+
+			_items.Add(new ItemWrapper("启用可寻址资源定位", $"{buildReport.Summary.EnableAddressable}"));
 			_items.Add(new ItemWrapper("启用自动分包机制", $"{buildReport.Summary.EnableAutoCollect}"));
 			_items.Add(new ItemWrapper("追加文件扩展名", $"{buildReport.Summary.AppendFileExtension}"));
 			_items.Add(new ItemWrapper("自动收集着色器", $"{buildReport.Summary.AutoCollectShaders}"));
@@ -76,8 +79,6 @@ namespace YooAsset.Editor
 
 			_items.Add(new ItemWrapper(string.Empty, string.Empty));
 			_items.Add(new ItemWrapper("构建参数", string.Empty));
-			_items.Add(new ItemWrapper("ForceRebuild", $"{buildReport.Summary.ForceRebuild}"));
-			_items.Add(new ItemWrapper("BuildinTags", $"{buildReport.Summary.BuildinTags}"));
 			_items.Add(new ItemWrapper("CompressOption", $"{buildReport.Summary.CompressOption}"));
 			_items.Add(new ItemWrapper("AppendHash", $"{buildReport.Summary.AppendHash}"));
 			_items.Add(new ItemWrapper("DisableWriteTypeTree", $"{buildReport.Summary.DisableWriteTypeTree}"));
@@ -96,7 +97,10 @@ namespace YooAsset.Editor
 			_items.Add(new ItemWrapper("原生资源包总数", $"{buildReport.Summary.RawBundleTotalCount}"));
 			_items.Add(new ItemWrapper("原生资源包总大小", ConvertSize(buildReport.Summary.RawBundleTotalSize)));
 
+			_listView.Clear();
+			_listView.ClearSelection();
 			_listView.itemsSource = _items;
+			_listView.Rebuild();
 		}
 
 		/// <summary>

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

@@ -4,6 +4,6 @@
             <uie:ToolbarButton text="概览" display-tooltip-when-elided="true" name="TopBar1" style="width: 200px; -unity-text-align: middle-left; flex-grow: 0;" />
             <uie:ToolbarButton text="参数" display-tooltip-when-elided="true" name="TopBar2" style="width: 150px; -unity-text-align: middle-left; flex-grow: 1;" />
         </uie:Toolbar>
-        <ui:ListView focusable="true" name="ListView" item-height="18" style="flex-grow: 1;" />
+        <ui:ListView focusable="true" name="ListView" item-height="18" virtualization-method="DynamicHeight" style="flex-grow: 1;" />
     </ui:VisualElement>
 </ui:UXML>

Assets/YooAsset/Editor/EditorDefine.cs

@@ -1,17 +1,13 @@
-
+using System;
+
 namespace YooAsset.Editor
 {
 	public class EditorDefine
 	{
 		/// <summary>
-		/// 资源包收集工具的配置文件存储路径
+		/// 停靠窗口类型集合
 		/// </summary>
-		public const string AssetBundleCollectorSettingFilePath = "Assets/YooAssetSetting/AssetBundleCollectorSetting.asset";
-
-		/// <summary>
-		/// 资源包分组工具的配置文件存储路径
-		/// </summary>
-		public const string AssetBundleGrouperSettingFilePath = "Assets/YooAssetSetting/AssetBundleGrouperSetting.asset";
+		public static readonly Type[] DockedWindowTypes = { typeof(AssetBundleBuilderWindow), typeof(AssetBundleGrouperWindow), typeof(AssetBundleDebuggerWindow), typeof(AssetBundleReporterWindow)};
 	}
 
 	/// <summary>
@@ -43,16 +39,16 @@ namespace YooAsset.Editor
 	/// </summary>
 	public enum EAssetFileExtension
 	{
-		prefab, //预制体
-		unity, //场景
-		fbx, //模型
-		anim, //动画
-		controller, //控制器
-		png, //图片
-		jpg, //图片
-		mat, //材质球
-		shader, //着色器
-		ttf, //字体
-		cs, //脚本
+		prefab,
+		unity,
+		fbx,
+		anim,
+		controller,
+		png,
+		jpg,
+		mat,
+		shader,
+		ttf,
+		cs,
 	}
 }

Assets/YooAsset/Editor/EditorExtension.cs

@@ -1,6 +1,7 @@
-#if UNITY_2019_4
+
 namespace YooAsset.Editor
 {
+#if UNITY_2019
 	public static partial class UnityEngine_UIElements_ListView_Extension
 	{
 		public static void ClearSelection(this UnityEngine.UIElements.ListView o)
@@ -8,5 +9,15 @@ namespace YooAsset.Editor
 			o.selectedIndex = -1;
 		}
 	}
-}
-#endif
+#endif
+
+#if UNITY_2019 || UNITY_2020
+	public static partial class UnityEngine_UIElements_ListView_Extension
+	{
+		public static void Rebuild(this UnityEngine.UIElements.ListView o)
+		{
+			o.Refresh();
+		}
+	}
+#endif
+}

Assets/YooAsset/Editor/EditorTools.cs

@@ -412,7 +412,8 @@ namespace YooAsset.Editor
 		#endregion
 
 		#region 路径
-		private static string YooAssetPath;
+		private static string YooAssetSourcePath;
+		private static string YooAssetSettingPath;
 
 		/// <summary>
 		/// 获取规范的路径
@@ -423,27 +424,30 @@ namespace YooAsset.Editor
 		}
 
 		/// <summary>
-		/// 获取资源框架目录路径
+		/// 获取资源框架源码路径
 		/// </summary>
-		public static string GetYooAssetPath()
+		public static string GetYooAssetSourcePath()
 		{
-			if (string.IsNullOrEmpty(YooAssetPath) == false)
-				return YooAssetPath;
+			if (string.IsNullOrEmpty(YooAssetSourcePath) == false)
+			{
+				if (Directory.Exists(YooAssetSourcePath))
+					return YooAssetSourcePath;
+			}
 
 			// 从Pakcages目录下搜索
-			string packagesPath = ("Packages/com.tuyoogame.yooasset/README.md");
+			string packagesPath = "Packages/com.tuyoogame.yooasset/README.md";
 			var obj = AssetDatabase.LoadAssetAtPath(packagesPath, typeof(TextAsset));
 			if (obj != null)
 			{
-				YooAssetPath = "Packages/com.tuyoogame.yooasset/";
-				return YooAssetPath;
+				YooAssetSourcePath = "Packages/com.tuyoogame.yooasset/";
+				return YooAssetSourcePath;
 			}
 
 			// 从Assets目录下搜索
 			string[] allDirectorys = Directory.GetDirectories(Application.dataPath, "YooAsset", SearchOption.AllDirectories);
 			if (allDirectorys.Length == 0)
 			{
-				Debug.LogError("Not found YooAsset Package !");
+				Debug.LogError("Not found YooAsset package !");
 				return string.Empty;
 			}
 
@@ -463,8 +467,37 @@ namespace YooAsset.Editor
 				return string.Empty;
 			}
 
-			YooAssetPath = AbsolutePathToAssetPath(targetDirectory);
-			return YooAssetPath;
+			YooAssetSourcePath = AbsolutePathToAssetPath(targetDirectory);
+			return YooAssetSourcePath;
+		}
+
+		/// <summary>
+		/// 获取资源框架配置路径
+		/// </summary>
+		public static string GetYooAssetSettingPath()
+		{
+			if (string.IsNullOrEmpty(YooAssetSettingPath) == false)
+			{
+				if (Directory.Exists(YooAssetSettingPath))
+					return YooAssetSettingPath;
+			}
+
+			// 从Assets目录下搜索
+			string[] allDirectorys = Directory.GetDirectories(Application.dataPath, "YooAssetSetting", SearchOption.AllDirectories);
+			if (allDirectorys.Length == 0)
+			{
+				YooAssetSettingPath = "Assets/YooAssetSetting";
+				return YooAssetSettingPath;
+			}
+
+			string targetDirectory = allDirectorys[0];
+			if (allDirectorys.Length != 1)
+			{
+				Debug.LogError("Found multiple YooAssetSetting folder !");
+			}
+
+			YooAssetSettingPath = AbsolutePathToAssetPath(targetDirectory);
+			return YooAssetSettingPath;
 		}
 
 		/// <summary>
@@ -582,19 +615,5 @@ namespace YooAsset.Editor
 				return content.Substring(startIndex + key.Length);
 		}
 		#endregion
-
-		#region 玩家偏好
-		// 枚举
-		public static void PlayerSetEnum<T>(string key, T value)
-		{
-			string enumName = value.ToString();
-			EditorPrefs.SetString(key, enumName);
-		}
-		public static T PlayerGetEnum<T>(string key, T defaultValue)
-		{
-			string enumName = EditorPrefs.GetString(key, defaultValue.ToString());
-			return StringUtility.NameToEnum<T>(enumName);
-		}
-		#endregion
 	}
 }

Assets/YooAsset/Editor/ShaderVariantCollector/ShaderVariantCollectorSetting.cs

@@ -0,0 +1,12 @@
+using UnityEngine;
+
+namespace YooAsset.Editor
+{
+	public class ShaderVariantCollectorSetting : ScriptableObject
+	{
+		/// <summary>
+		/// 文件存储路径
+		/// </summary>
+		public string SavePath = "Assets/MyShaderVariants.shadervariants";
+	}
+}

Assets/YooAsset/Editor/ShaderVariantCollector/ShaderVariantCollectorSetting.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 44454e58a49818040a1aef5799e71b30
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/YooAsset/Editor/ShaderVariantCollector/ShaderVariantCollectorSettingData.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+	public class ShaderVariantCollectorSettingData
+	{
+		private static ShaderVariantCollectorSetting _setting = null;
+		public static ShaderVariantCollectorSetting Setting
+		{
+			get
+			{
+				if (_setting == null)
+					LoadSettingData();
+				return _setting;
+			}
+		}
+
+		/// <summary>
+		/// 加载配置文件
+		/// </summary>
+		private static void LoadSettingData()
+		{
+			// 加载配置文件
+			string settingFilePath = $"{EditorTools.GetYooAssetSettingPath()}/{nameof(ShaderVariantCollectorSetting)}.asset";
+			_setting = AssetDatabase.LoadAssetAtPath<ShaderVariantCollectorSetting>(settingFilePath);
+			if (_setting == null)
+			{
+				Debug.LogWarning($"Create new {nameof(ShaderVariantCollectorSetting)}.asset : {settingFilePath}");
+				_setting = ScriptableObject.CreateInstance<ShaderVariantCollectorSetting>();
+				EditorTools.CreateFileDirectory(settingFilePath);
+				AssetDatabase.CreateAsset(Setting, settingFilePath);
+				AssetDatabase.SaveAssets();
+				AssetDatabase.Refresh();
+			}
+			else
+			{
+				Debug.Log($"Load {nameof(ShaderVariantCollectorSetting)}.asset ok");
+			}
+		}
+
+		/// <summary>
+		/// 存储文件
+		/// </summary>
+		public static void SaveFile()
+		{
+			if (Setting != null)
+			{
+				EditorUtility.SetDirty(Setting);
+				AssetDatabase.SaveAssets();
+				Debug.Log($"{nameof(ShaderVariantCollectorSetting)}.asset is saved!");
+			}
+		}
+	}
+}

Assets/YooAsset/Editor/ShaderVariantCollector/ShaderVariantCollectorSettingData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b3043e89ff35bd346b268c0e8d460067
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/YooAsset/Editor/ShaderVariantCollector/ShaderVariantCollectorWindow.cs

@@ -12,19 +12,18 @@ namespace YooAsset.Editor
 		{
 			if (_thisInstance == null)
 			{
-				_thisInstance = EditorWindow.GetWindow(typeof(ShaderVariantCollectionWindow), false, "着色器变种收集工具", true) as ShaderVariantCollectionWindow;
+				_thisInstance = GetWindow<ShaderVariantCollectionWindow>("着色器变种收集工具");
 				_thisInstance.minSize = new Vector2(800, 600);
 			}
 			_thisInstance.Show();
 		}
 
-		private string _saveFilePath = "Assets/MyShaderVariants.shadervariants";
 		private ShaderVariantCollection _selectSVC;
 
 		private void OnGUI()
 		{
 			EditorGUILayout.Space();
-			_saveFilePath = EditorGUILayout.TextField("收集文件保存路径", _saveFilePath);
+			ShaderVariantCollectorSettingData.Setting.SavePath = EditorGUILayout.TextField("收集文件保存路径", ShaderVariantCollectorSettingData.Setting.SavePath);
 
 			int currentShaderCount = ShaderVariantCollector.GetCurrentShaderVariantCollectionShaderCount();
 			int currentVariantCount = ShaderVariantCollector.GetCurrentShaderVariantCollectionVariantCount();
@@ -35,7 +34,7 @@ namespace YooAsset.Editor
 			EditorGUILayout.Space();
 			if (GUILayout.Button("搜集变种", GUILayout.MaxWidth(80)))
 			{
-				ShaderVariantCollector.Run(_saveFilePath);
+				ShaderVariantCollector.Run(ShaderVariantCollectorSettingData.Setting.SavePath);
 			}
 
 			// 查询
@@ -54,5 +53,9 @@ namespace YooAsset.Editor
 				EditorGUILayout.LabelField($"VariantCount : {_selectSVC.variantCount}");
 			}
 		}
+		private void OnDestroy()
+		{
+			ShaderVariantCollectorSettingData.SaveFile();
+		}
 	}
 }

Assets/YooAsset/Runtime/AssetSystem/AssetSystem.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.IO;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 
@@ -8,9 +9,10 @@ namespace YooAsset
 {
 	internal static class AssetSystem
 	{
-		private static readonly List<AssetBundleLoader> _loaders = new List<AssetBundleLoader>(1000);
+		private static readonly List<AssetBundleLoaderBase> _loaders = new List<AssetBundleLoaderBase>(1000);
 		private static readonly List<ProviderBase> _providers = new List<ProviderBase>(1000);
-
+		private static readonly Dictionary<string, SceneOperationHandle> _sceneHandles = new Dictionary<string, SceneOperationHandle>(100);
+		
 		/// <summary>
 		/// 在编辑器下模拟运行
 		/// </summary>
@@ -81,7 +83,7 @@ namespace YooAsset
 				{
 					if (_providers[i].CanDestroy())
 					{
-						_providers[i].Destory();
+						_providers[i].Destroy();
 						_providers.RemoveAt(i);
 					}
 				}
@@ -90,12 +92,12 @@ namespace YooAsset
 			{
 				for (int i = _loaders.Count - 1; i >= 0; i--)
 				{
-					AssetBundleLoader loader = _loaders[i];
+					AssetBundleLoaderBase loader = _loaders[i];
 					loader.TryDestroyAllProviders();
 				}
 				for (int i = _loaders.Count - 1; i >= 0; i--)
 				{
-					AssetBundleLoader loader = _loaders[i];
+					AssetBundleLoaderBase loader = _loaders[i];
 					if (loader.CanDestroy())
 					{
 						loader.Destroy(false);
@@ -112,7 +114,7 @@ namespace YooAsset
 		{
 			foreach (var provider in _providers)
 			{
-				provider.Destory();
+				provider.Destroy();
 			}
 			_providers.Clear();
 
@@ -127,23 +129,21 @@ namespace YooAsset
 		}
 
 
-		/// <summary>
-		/// 异步加载原生文件
-		/// </summary>
-		public static RawFileOperation LoadRawFileAsync(string assetPath, string savePath)
-		{
-			string bundleName = BundleServices.GetBundleName(assetPath);
-			BundleInfo bundleInfo = BundleServices.GetBundleInfo(bundleName);
-			RawFileOperation operation = new RawFileOperation(bundleInfo, savePath);
-			OperationSystem.ProcessOperaiton(operation);
-			return operation;
-		}
-
 		/// <summary>
 		/// 异步加载场景
 		/// </summary>
 		public static SceneOperationHandle LoadSceneAsync(string scenePath, LoadSceneMode sceneMode, bool activateOnLoad, int priority)
 		{
+			// 注意：场景句柄永远保持唯一
+			if (_sceneHandles.ContainsKey(scenePath))
+				return _sceneHandles[scenePath];
+
+			// 如果加载的是主场景，则卸载所有缓存的场景
+			if (sceneMode == LoadSceneMode.Single)
+			{
+				UnloadAllScene();
+			}
+
 			ProviderBase provider = TryGetProvider(scenePath);
 			if (provider == null)
 			{
@@ -151,9 +151,13 @@ namespace YooAsset
 					provider = new DatabaseSceneProvider(scenePath, sceneMode, activateOnLoad, priority);
 				else
 					provider = new BundledSceneProvider(scenePath, sceneMode, activateOnLoad, priority);
+				provider.InitSpawnDebugInfo();
 				_providers.Add(provider);
 			}
-			return provider.CreateHandle() as SceneOperationHandle;
+
+			var handle = provider.CreateHandle() as SceneOperationHandle;
+			_sceneHandles.Add(scenePath, handle);
+			return handle;
 		}
 
 		/// <summary>
@@ -168,6 +172,7 @@ namespace YooAsset
 					provider = new DatabaseAssetProvider(assetPath, assetType);
 				else
 					provider = new BundledAssetProvider(assetPath, assetType);
+				provider.InitSpawnDebugInfo();
 				_providers.Add(provider);
 			}
 			return provider.CreateHandle() as AssetOperationHandle;
@@ -185,28 +190,71 @@ namespace YooAsset
 					provider = new DatabaseSubAssetsProvider(assetPath, assetType);
 				else
 					provider = new BundledSubAssetsProvider(assetPath, assetType);
+				provider.InitSpawnDebugInfo();
 				_providers.Add(provider);
 			}
 			return provider.CreateHandle() as SubAssetsOperationHandle;
 		}
 
 
-		internal static AssetBundleLoader CreateOwnerAssetBundleLoader(string assetPath)
+		internal static void UnloadSubScene(ProviderBase provider)
+		{
+			string scenePath = provider.AssetPath;
+			if (_sceneHandles.ContainsKey(scenePath) == false)
+				throw new Exception("Should never get here !");
+
+			// 释放子场景句柄
+			_sceneHandles[scenePath].ReleaseInternal();
+			_sceneHandles.Remove(scenePath);
+
+			// 卸载未被使用的资源（包括场景）
+			AssetSystem.UnloadUnusedAssets();
+
+			// 检验子场景是否销毁
+			if (provider.IsDestroyed == false)
+			{
+				throw new Exception("Should never get here !");
+			}
+		}
+		internal static void UnloadAllScene()
+		{
+			// 释放所有场景句柄
+			foreach (var valuePair in _sceneHandles)
+			{
+				valuePair.Value.ReleaseInternal();
+			}
+			_sceneHandles.Clear();
+
+			// 卸载未被使用的资源（包括场景）
+			AssetSystem.UnloadUnusedAssets();
+
+			// 检验所有场景是否销毁
+			foreach (var provider in _providers)
+			{
+				if (provider.IsSceneProvider())
+				{
+					if (provider.IsDestroyed == false)
+						throw new Exception("Should never get here !");
+				}
+			}
+		}
+
+		internal static AssetBundleLoaderBase CreateOwnerAssetBundleLoader(string assetPath)
 		{
 			string bundleName = BundleServices.GetBundleName(assetPath);
 			BundleInfo bundleInfo = BundleServices.GetBundleInfo(bundleName);
 			return CreateAssetBundleLoaderInternal(bundleInfo);
 		}
-		internal static List<AssetBundleLoader> CreateDependAssetBundleLoaders(string assetPath)
+		internal static List<AssetBundleLoaderBase> CreateDependAssetBundleLoaders(string assetPath)
 		{
-			List<AssetBundleLoader> result = new List<AssetBundleLoader>();
+			List<AssetBundleLoaderBase> result = new List<AssetBundleLoaderBase>();
 			string[] depends = BundleServices.GetAllDependencies(assetPath);
 			if (depends != null)
 			{
 				foreach (var dependBundleName in depends)
 				{
 					BundleInfo dependBundleInfo = BundleServices.GetBundleInfo(dependBundleName);
-					AssetBundleLoader dependLoader = CreateAssetBundleLoaderInternal(dependBundleInfo);
+					AssetBundleLoaderBase dependLoader = CreateAssetBundleLoaderInternal(dependBundleInfo);
 					result.Add(dependLoader);
 				}
 			}
@@ -220,24 +268,29 @@ namespace YooAsset
 			}
 		}
 
-		private static AssetBundleLoader CreateAssetBundleLoaderInternal(BundleInfo bundleInfo)
+		private static AssetBundleLoaderBase CreateAssetBundleLoaderInternal(BundleInfo bundleInfo)
 		{
 			// 如果加载器已经存在
-			AssetBundleLoader loader = TryGetAssetBundleLoader(bundleInfo.BundleName);
+			AssetBundleLoaderBase loader = TryGetAssetBundleLoader(bundleInfo.BundleName);
 			if (loader != null)
 				return loader;
 
 			// 新增下载需求
-			loader = new AssetBundleLoader(bundleInfo);
+#if UNITY_WEBGL
+			loader = new AssetBundleWebLoader(bundleInfo);
+#else
+			loader = new AssetBundleFileLoader(bundleInfo);
+#endif
+
 			_loaders.Add(loader);
 			return loader;
 		}
-		private static AssetBundleLoader TryGetAssetBundleLoader(string bundleName)
+		private static AssetBundleLoaderBase TryGetAssetBundleLoader(string bundleName)
 		{
-			AssetBundleLoader loader = null;
+			AssetBundleLoaderBase loader = null;
 			for (int i = 0; i < _loaders.Count; i++)
 			{
-				AssetBundleLoader temp = _loaders[i];
+				AssetBundleLoaderBase temp = _loaders[i];
 				if (temp.BundleFileInfo.BundleName.Equals(bundleName))
 				{
 					loader = temp;
@@ -261,6 +314,7 @@ namespace YooAsset
 			return provider;
 		}
 
+
 		#region 调试专属方法
 		internal static void GetDebugReport(DebugReport report)
 		{
@@ -272,6 +326,8 @@ namespace YooAsset
 			{
 				DebugProviderInfo providerInfo = new DebugProviderInfo();
 				providerInfo.AssetPath = provider.AssetPath;
+				providerInfo.SpawnScene = provider.SpawnScene;
+				providerInfo.SpawnTime = provider.SpawnTime;
 				providerInfo.RefCount = provider.RefCount;
 				providerInfo.Status = provider.Status;
 				providerInfo.BundleInfos.Clear();

Assets/YooAsset/Runtime/AssetSystem/Handles/AssetOperationHandle.cs

@@ -2,7 +2,7 @@
 
 namespace YooAsset
 {
-	public class AssetOperationHandle : OperationHandleBase
+	public sealed class AssetOperationHandle : OperationHandleBase
 	{
 		private System.Action<AssetOperationHandle> _callback;
 
@@ -23,7 +23,7 @@ namespace YooAsset
 			{
 				if (IsValid == false)
 					throw new System.Exception($"{nameof(AssetOperationHandle)} is invalid");
-				if (_provider.IsDone)
+				if (Provider.IsDone)
 					value.Invoke(this);
 				else
 					_callback += value;
@@ -45,7 +45,7 @@ namespace YooAsset
 			{
 				if (IsValid == false)
 					return null;
-				return _provider.AssetObject;
+				return Provider.AssetObject;
 			}
 		}
 
@@ -56,7 +56,7 @@ namespace YooAsset
 		{
 			if (IsValid == false)
 				return;
-			_provider.WaitForAsyncComplete();
+			Provider.WaitForAsyncComplete();
 		}
 
 		/// <summary>
@@ -75,7 +75,7 @@ namespace YooAsset
 		/// <returns></returns>
 		public GameObject InstantiateSync(Transform parent = null)
 		{
-			return InstantiateSync(Vector3.zero, Quaternion.identity, parent);
+			return InstantiateSyncInternal(Vector3.zero, Quaternion.identity, parent, false);
 		}
 
 		/// <summary>
@@ -86,15 +86,7 @@ namespace YooAsset
 		/// <param name="parent">父类对象</param>
 		public GameObject InstantiateSync(Vector3 position, Quaternion rotation, Transform parent = null)
 		{
-			if (IsValid == false)
-				return null;
-			if (_provider.AssetObject == null)
-				return null;
-
-			if (parent == null)
-				return UnityEngine.Object.Instantiate(_provider.AssetObject as GameObject, position, rotation);
-			else
-				return UnityEngine.Object.Instantiate(_provider.AssetObject as GameObject, position, rotation, parent);
+			return InstantiateSyncInternal(position, rotation, parent, true);
 		}
 
 		/// <summary>
@@ -103,7 +95,7 @@ namespace YooAsset
 		/// <param name="parent">父类对象</param>
 		public InstantiateOperation InstantiateAsync(Transform parent = null)
 		{
-			return InstantiateAsync(Vector3.zero, Quaternion.identity, parent);
+			return InstantiateAsyncInternal(Vector3.zero, Quaternion.identity, parent, false);
 		}
 
 		/// <summary>
@@ -114,7 +106,35 @@ namespace YooAsset
 		/// <param name="parent">父类对象</param>
 		public InstantiateOperation InstantiateAsync(Vector3 position, Quaternion rotation, Transform parent = null)
 		{
-			InstantiateOperation operation = new InstantiateOperation(this, position, rotation, parent);
+			return InstantiateAsyncInternal(position, rotation, parent, true);
+		}
+
+
+		private GameObject InstantiateSyncInternal(Vector3 position, Quaternion rotation, Transform parent, bool setPositionRotation)
+		{
+			if (IsValid == false)
+				return null;
+			if (Provider.AssetObject == null)
+				return null;
+
+			if (setPositionRotation)
+			{
+				if (parent == null)
+					return UnityEngine.Object.Instantiate(Provider.AssetObject as GameObject, position, rotation);
+				else
+					return UnityEngine.Object.Instantiate(Provider.AssetObject as GameObject, position, rotation, parent);
+			}
+			else
+			{
+				if (parent == null)
+					return UnityEngine.Object.Instantiate(Provider.AssetObject as GameObject);
+				else
+					return UnityEngine.Object.Instantiate(Provider.AssetObject as GameObject, parent);
+			}
+		}
+		private InstantiateOperation InstantiateAsyncInternal(Vector3 position, Quaternion rotation, Transform parent, bool setPositionRotation)
+		{
+			InstantiateOperation operation = new InstantiateOperation(this, position, rotation, parent, setPositionRotation);
 			OperationSystem.ProcessOperaiton(operation);
 			return operation;
 		}

Assets/YooAsset/Runtime/AssetSystem/Handles/OperationHandleBase.cs

@@ -4,11 +4,13 @@ namespace YooAsset
 {
 	public abstract class OperationHandleBase : IEnumerator
 	{
-		internal ProviderBase _provider { private set; get; }
-		
+		private readonly string _cachedAssetPath;
+		internal ProviderBase Provider { private set; get; }
+
 		internal OperationHandleBase(ProviderBase provider)
 		{
-			_provider = provider;
+			Provider = provider;
+			_cachedAssetPath = provider.AssetPath;
 		}
 		internal abstract void InvokeCallback();
 
@@ -21,15 +23,28 @@ namespace YooAsset
 			{
 				if (IsValid == false)
 					return EOperationStatus.None;
-				if (_provider.Status == ProviderBase.EStatus.Fail)
+				if (Provider.Status == ProviderBase.EStatus.Fail)
 					return EOperationStatus.Failed;
-				else if (_provider.Status == ProviderBase.EStatus.Success)
+				else if (Provider.Status == ProviderBase.EStatus.Success)
 					return EOperationStatus.Succeed;
 				else
 					return EOperationStatus.None;
 			}
 		}
 
+		/// <summary>
+		/// 最近的错误信息
+		/// </summary>
+		public string LastError
+		{
+			get
+			{
+				if (IsValid == false)
+					return string.Empty;
+				return Provider.LastError;
+			}
+		}
+
 		/// <summary>
 		/// 加载进度
 		/// </summary>
@@ -39,7 +54,7 @@ namespace YooAsset
 			{
 				if (IsValid == false)
 					return 0;
-				return _provider.Progress;
+				return Provider.Progress;
 			}
 		}
 
@@ -52,7 +67,7 @@ namespace YooAsset
 			{
 				if (IsValid == false)
 					return false;
-				return _provider.IsDone;
+				return Provider.IsDone;
 			}
 		}
 
@@ -63,7 +78,18 @@ namespace YooAsset
 		{
 			get
 			{
-				return _provider != null && _provider.IsDestroyed == false;
+				if (Provider != null && Provider.IsDestroyed == false)
+				{
+					return true;
+				}
+				else
+				{
+					if (Provider == null)
+						YooLogger.Warning($"Operation handle is released : {_cachedAssetPath}");
+					else if (Provider.IsDestroyed)
+						YooLogger.Warning($"Provider is destroyed : {_cachedAssetPath}");
+					return false;
+				}
 			}
 		}
 
@@ -74,17 +100,17 @@ namespace YooAsset
 		{
 			if (IsValid == false)
 				return;
-			_provider.ReleaseHandle(this);
-			_provider = null;
+			Provider.ReleaseHandle(this);
+			Provider = null;
 		}
 
 		#region 异步操作相关
 		/// <summary>
 		/// 异步操作任务
 		/// </summary>
-		public System.Threading.Tasks.Task<object> Task
+		public System.Threading.Tasks.Task Task
 		{
-			get { return _provider.Task; }
+			get { return Provider.Task; }
 		}
 
 		// 协程相关
@@ -97,7 +123,7 @@ namespace YooAsset
 		}
 		object IEnumerator.Current
 		{
-			get { return _provider; }
+			get { return Provider; }
 		}
 		#endregion
 	}

Assets/YooAsset/Runtime/AssetSystem/Handles/SceneOperationHandle.cs

@@ -23,7 +23,7 @@ namespace YooAsset
 			{
 				if (IsValid == false)
 					throw new System.Exception($"{nameof(SceneOperationHandle)} is invalid");
-				if (_provider.IsDone)
+				if (Provider.IsDone)
 					value.Invoke(this);
 				else
 					_callback += value;
@@ -45,7 +45,7 @@ namespace YooAsset
 			{
 				if (IsValid == false)
 					return new Scene();
-				return _provider.SceneObject;
+				return Provider.SceneObject;
 			}
 		}
 
@@ -69,10 +69,35 @@ namespace YooAsset
 		}
 
 		/// <summary>
-		/// 异步卸载场景
+		/// 是否为主场景
+		/// </summary>
+		public bool IsMainScene()
+		{
+			if (IsValid == false)
+				return false;
+
+			if (Provider is DatabaseSceneProvider)
+			{
+				var temp = Provider as DatabaseSceneProvider;
+				return temp.SceneMode == LoadSceneMode.Single;
+			}
+			else if (Provider is BundledSceneProvider)
+			{
+				var temp = Provider as BundledSceneProvider;
+				return temp.SceneMode == LoadSceneMode.Single;
+			}
+			else
+			{
+				throw new System.NotImplementedException();
+			}
+		}
+
+		/// <summary>
+		/// 异步卸载子场景
 		/// </summary>
 		public UnloadSceneOperation UnloadAsync()
 		{
+			// 如果句柄无效
 			if (IsValid == false)
 			{
 				string error = $"{nameof(SceneOperationHandle)} is invalid.";
@@ -81,54 +106,23 @@ namespace YooAsset
 				return operation;
 			}
 
-			ProviderBase provider = _provider;
-
-			// 释放场景句柄
-			ReleaseInternal();
-
-			// 卸载未被使用的资源（包括场景）
-			AssetSystem.UnloadUnusedAssets();
-
-			// 返回场景卸载异步操作类
-			if (provider.IsDestroyed == false)
+			// 如果是主场景
+			if (IsMainScene())
 			{
-				YooLogger.Warning($"Scene can not unload. The provider not destroyed : {provider.AssetPath}");
-				var operation = new UnloadSceneOperation();
+				string error = $"Cannot unload main scene. Use {nameof(YooAssets.LoadSceneAsync)} method to change the main scene !";
+				YooLogger.Error(error);
+				var operation = new UnloadSceneOperation(error);
 				OperationSystem.ProcessOperaiton(operation);
 				return operation;
 			}
-			else
-			{
-				if (IsAdditiveScene(provider))
-				{
-					var operation = new UnloadSceneOperation(provider.SceneObject);
-					OperationSystem.ProcessOperaiton(operation);
-					return operation;
-				}
-				else
-				{
-					var operation = new UnloadSceneOperation();
-					OperationSystem.ProcessOperaiton(operation);
-					return operation;
-				}
-			}
-		}
 
-		private bool IsAdditiveScene(ProviderBase provider)
-		{
-			if (provider is DatabaseSceneProvider)
+			// 卸载子场景
+			Scene sceneObject = SceneObject;
+			AssetSystem.UnloadSubScene(Provider);
 			{
-				var temp = provider as DatabaseSceneProvider;
-				return temp.SceneMode == LoadSceneMode.Additive;
-			}
-			else if (provider is BundledSceneProvider)
-			{
-				var temp = provider as BundledSceneProvider;
-				return temp.SceneMode == LoadSceneMode.Additive;
-			}
-			else
-			{
-				throw new System.NotImplementedException();
+				var operation = new UnloadSceneOperation(sceneObject);
+				OperationSystem.ProcessOperaiton(operation);
+				return operation;
 			}
 		}
 	}

Assets/YooAsset/Runtime/AssetSystem/Handles/SubAssetsOperationHandle.cs

@@ -1,7 +1,7 @@
 
 namespace YooAsset
 {
-	public class SubAssetsOperationHandle : OperationHandleBase
+	public sealed class SubAssetsOperationHandle : OperationHandleBase
 	{
 		private System.Action<SubAssetsOperationHandle> _callback;
 
@@ -22,7 +22,7 @@ namespace YooAsset
 			{
 				if (IsValid == false)
 					throw new System.Exception($"{nameof(SubAssetsOperationHandle)} is invalid");
-				if (_provider.IsDone)
+				if (Provider.IsDone)
 					value.Invoke(this);
 				else
 					_callback += value;
@@ -44,7 +44,7 @@ namespace YooAsset
 			{
 				if (IsValid == false)
 					return null;
-				return _provider.AllAssetObjects;
+				return Provider.AllAssetObjects;
 			}
 		}
 
@@ -55,7 +55,7 @@ namespace YooAsset
 		{
 			if (IsValid == false)
 				return;
-			_provider.WaitForAsyncComplete();
+			Provider.WaitForAsyncComplete();
 		}
 
 		/// <summary>
@@ -77,7 +77,7 @@ namespace YooAsset
 			if (IsValid == false)
 				return null;
 
-			foreach (var asset in _provider.AllAssetObjects)
+			foreach (var asset in Provider.AllAssetObjects)
 			{
 				if (asset.name == assetName)
 					return asset as TObject;

Assets/YooAsset/Runtime/AssetSystem/Loader/AssetBundleFileLoader.cs

@@ -0,0 +1,200 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace YooAsset
+{
+	internal sealed class AssetBundleFileLoader : AssetBundleLoaderBase
+	{
+		private enum ESteps
+		{
+			None = 0,
+			Download,
+			CheckDownload,
+			LoadFile,
+			CheckFile,
+			Done,
+		}
+
+		private ESteps _steps = ESteps.None;
+		private string _fileLoadPath;
+		private bool _isWaitForAsyncComplete = false;
+		private bool _isShowWaitForAsyncError = false;
+		private DownloaderBase _downloader;
+		private AssetBundleCreateRequest _cacheRequest;
+
+
+		public AssetBundleFileLoader(BundleInfo bundleInfo) : base(bundleInfo)
+		{
+		}
+
+		/// <summary>
+		/// 轮询更新
+		/// </summary>
+		public override void Update()
+		{
+			if (_steps == ESteps.Done)
+				return;
+
+			if (_steps == ESteps.None)
+			{
+				if (BundleFileInfo.LoadMode == BundleInfo.ELoadMode.None)
+				{
+					_steps = ESteps.Done;
+					Status = EStatus.Failed;
+					LastError = $"Invalid load mode : {BundleFileInfo.BundleName}";
+					YooLogger.Error(LastError);
+				}
+				else if (BundleFileInfo.LoadMode == BundleInfo.ELoadMode.LoadFromRemote)
+				{
+					_steps = ESteps.Download;
+					_fileLoadPath = BundleFileInfo.GetCacheLoadPath();
+				}
+				else if (BundleFileInfo.LoadMode == BundleInfo.ELoadMode.LoadFromStreaming)
+				{
+					_steps = ESteps.LoadFile;
+					_fileLoadPath = BundleFileInfo.GetStreamingLoadPath();
+				}
+				else if (BundleFileInfo.LoadMode == BundleInfo.ELoadMode.LoadFromCache)
+				{
+					_steps = ESteps.LoadFile;
+					_fileLoadPath = BundleFileInfo.GetCacheLoadPath();
+				}
+				else
+				{
+					throw new System.NotImplementedException(BundleFileInfo.LoadMode.ToString());
+				}
+			}
+
+			// 1. 从服务器下载
+			if (_steps == ESteps.Download)
+			{
+				int failedTryAgain = int.MaxValue;
+				_downloader = DownloadSystem.BeginDownload(BundleFileInfo, failedTryAgain);
+				_steps = ESteps.CheckDownload;
+			}
+
+			// 2. 检测服务器下载结果
+			if (_steps == ESteps.CheckDownload)
+			{
+				if (_downloader.IsDone() == false)
+					return;
+
+				if (_downloader.HasError())
+				{
+					_steps = ESteps.Done;
+					Status = EStatus.Failed;
+					LastError = _downloader.GetLastError();
+				}
+				else
+				{
+					_steps = ESteps.LoadFile;
+				}
+			}
+
+			// 3. 加载AssetBundle
+			if (_steps == ESteps.LoadFile)
+			{
+#if UNITY_EDITOR
+				// 注意：Unity2017.4编辑器模式下，如果AssetBundle文件不存在会导致编辑器崩溃，这里做了预判。
+				if (System.IO.File.Exists(_fileLoadPath) == false)
+				{
+					_steps = ESteps.Done;
+					Status = EStatus.Failed;
+					LastError = $"Not found assetBundle file : {_fileLoadPath}";
+					YooLogger.Error(LastError);
+					return;
+				}
+#endif
+
+				// Load assetBundle file
+				if (BundleFileInfo.IsEncrypted)
+				{
+					if (AssetSystem.DecryptionServices == null)
+						throw new Exception($"{nameof(AssetBundleFileLoader)} need {nameof(IDecryptionServices)} : {BundleFileInfo.BundleName}");
+
+					ulong offset = AssetSystem.DecryptionServices.GetFileOffset(BundleFileInfo);
+					if (_isWaitForAsyncComplete)
+						CacheBundle = AssetBundle.LoadFromFile(_fileLoadPath, 0, offset);
+					else
+						_cacheRequest = AssetBundle.LoadFromFileAsync(_fileLoadPath, 0, offset);
+				}
+				else
+				{
+					if (_isWaitForAsyncComplete)
+						CacheBundle = AssetBundle.LoadFromFile(_fileLoadPath);
+					else
+						_cacheRequest = AssetBundle.LoadFromFileAsync(_fileLoadPath);
+				}
+				_steps = ESteps.CheckFile;
+			}
+
+			// 4. 检测AssetBundle加载结果
+			if (_steps == ESteps.CheckFile)
+			{
+				if (_cacheRequest != null)
+				{
+					if (_isWaitForAsyncComplete)
+					{
+						// 强制挂起主线程（注意：该操作会很耗时）
+						YooLogger.Warning("Suspend the main thread to load unity bundle.");
+						CacheBundle = _cacheRequest.assetBundle;
+					}
+					else
+					{
+						if (_cacheRequest.isDone == false)
+							return;
+						CacheBundle = _cacheRequest.assetBundle;
+					}
+				}
+
+				// Check error			
+				if (CacheBundle == null)
+				{
+					_steps = ESteps.Done;
+					Status = EStatus.Failed;
+					LastError = $"Failed to load assetBundle : {BundleFileInfo.BundleName}";
+					YooLogger.Error(LastError);
+				}
+				else
+				{
+					_steps = ESteps.Done;
+					Status = EStatus.Succeed;
+				}
+			}
+		}
+
+		/// <summary>
+		/// 主线程等待异步操作完毕
+		/// </summary>
+		public override void WaitForAsyncComplete()
+		{
+			_isWaitForAsyncComplete = true;
+
+			int frame = 1000;
+			while (true)
+			{
+				// 保险机制
+				// 注意：如果需要从WEB端下载资源，可能会触发保险机制！
+				frame--;
+				if (frame == 0)
+				{
+					if (_isShowWaitForAsyncError == false)
+					{
+						_isShowWaitForAsyncError = true;
+						YooLogger.Error($"WaitForAsyncComplete failed ! BundleName : {BundleFileInfo.BundleName} States : {Status}");
+					}
+					break;
+				}
+
+				// 驱动流程
+				Update();
+
+				// 完成后退出
+				if (IsDone())
+					break;
+			}
+		}
+	}
+}

Assets/YooAsset/Runtime/AssetSystem/Loader/AssetBundleLoader.cs

@@ -1,301 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace YooAsset
-{
-	internal class AssetBundleLoader
-	{
-		public enum EStatus
-		{
-			None = 0,
-			Download,
-			CheckDownload,
-			LoadFile,
-			CheckFile,
-			Success,
-			Fail,
-		}
-
-		/// <summary>
-		/// 资源包文件信息
-		/// </summary>
-		public BundleInfo BundleFileInfo { private set; get; }
-
-		/// <summary>
-		/// 引用计数
-		/// </summary>
-		public int RefCount { private set; get; }
-
-		/// <summary>
-		/// 加载状态
-		/// </summary>
-		public EStatus Status { private set; get; }
-
-		/// <summary>
-		/// 是否已经销毁
-		/// </summary>
-		public bool IsDestroyed { private set; get; } = false;
-
-		private readonly List<ProviderBase> _providers = new List<ProviderBase>(100);
-		private bool _isWaitForAsyncComplete = false;
-		private bool _isShowWaitForAsyncError = false;
-		private DownloaderBase _downloader;
-		private AssetBundleCreateRequest _cacheRequest;
-		internal AssetBundle CacheBundle { private set; get; }
-
-
-		public AssetBundleLoader(BundleInfo bundleInfo)
-		{
-			BundleFileInfo = bundleInfo;
-			RefCount = 0;
-			Status = EStatus.None;
-		}
-
-		/// <summary>
-		/// 添加附属的资源提供者
-		/// </summary>
-		public void AddProvider(ProviderBase provider)
-		{
-			if (_providers.Contains(provider) == false)
-				_providers.Add(provider);
-		}
-
-		/// <summary>
-		/// 引用（引用计数递加）
-		/// </summary>
-		public void Reference()
-		{
-			RefCount++;
-		}
-
-		/// <summary>
-		/// 释放（引用计数递减）
-		/// </summary>
-		public void Release()
-		{
-			RefCount--;
-		}
-
-		/// <summary>
-		/// 轮询更新
-		/// </summary>
-		public void Update()
-		{
-			// 如果资源文件加载完毕
-			if (IsDone())
-				return;
-
-			if (Status == EStatus.None)
-			{
-				// 检测加载地址是否为空
-				if (string.IsNullOrEmpty(BundleFileInfo.LocalPath))
-				{
-					Status = EStatus.Fail;
-					return;
-				}
-
-				if (string.IsNullOrEmpty(BundleFileInfo.RemoteMainURL))
-					Status = EStatus.LoadFile;
-				else
-					Status = EStatus.Download;
-			}
-
-			// 1. 从服务器下载
-			if (Status == EStatus.Download)
-			{
-				int failedTryAgain = int.MaxValue;
-				_downloader = DownloadSystem.BeginDownload(BundleFileInfo, failedTryAgain);
-				Status = EStatus.CheckDownload;
-			}
-
-			// 2. 检测服务器下载结果
-			if (Status == EStatus.CheckDownload)
-			{
-				if (_downloader.IsDone() == false)
-					return;
-
-				if (_downloader.HasError())
-				{
-					_downloader.ReportError();
-					Status = EStatus.Fail;
-				}
-				else
-				{
-					Status = EStatus.LoadFile;
-				}
-			}
-
-			// 3. 加载AssetBundle
-			if (Status == EStatus.LoadFile)
-			{
-#if UNITY_EDITOR
-				// 注意：Unity2017.4编辑器模式下，如果AssetBundle文件不存在会导致编辑器崩溃，这里做了预判。
-				if (System.IO.File.Exists(BundleFileInfo.LocalPath) == false)
-				{
-					YooLogger.Warning($"Not found assetBundle file : {BundleFileInfo.LocalPath}");
-					Status = EStatus.Fail;
-					return;
-				}
-#endif
-
-				// Load assetBundle file
-				if (BundleFileInfo.IsEncrypted)
-				{
-					if (AssetSystem.DecryptionServices == null)
-						throw new Exception($"{nameof(AssetBundleLoader)} need IDecryptServices : {BundleFileInfo.BundleName}");
-
-					ulong offset = AssetSystem.DecryptionServices.GetFileOffset(BundleFileInfo);
-					if (_isWaitForAsyncComplete)
-						CacheBundle = AssetBundle.LoadFromFile(BundleFileInfo.LocalPath, 0, offset);
-					else
-						_cacheRequest = AssetBundle.LoadFromFileAsync(BundleFileInfo.LocalPath, 0, offset);
-				}
-				else
-				{
-					if (_isWaitForAsyncComplete)
-						CacheBundle = AssetBundle.LoadFromFile(BundleFileInfo.LocalPath);
-					else
-						_cacheRequest = AssetBundle.LoadFromFileAsync(BundleFileInfo.LocalPath);
-				}
-				Status = EStatus.CheckFile;
-			}
-
-			// 4. 检测AssetBundle加载结果
-			if (Status == EStatus.CheckFile)
-			{
-				if (_cacheRequest != null)
-				{
-					if (_isWaitForAsyncComplete)
-					{
-						// 强制挂起主线程（注意：该操作会很耗时）
-						YooLogger.Warning("Suspend the main thread to load unity bundle.");
-						CacheBundle = _cacheRequest.assetBundle;
-					}
-					else
-					{
-						if (_cacheRequest.isDone == false)
-							return;
-						CacheBundle = _cacheRequest.assetBundle;
-					}
-				}
-
-				// Check error
-				if (CacheBundle == null)
-				{
-					YooLogger.Error($"Failed to load assetBundle file : {BundleFileInfo.BundleName}");
-					Status = EStatus.Fail;
-				}
-				else
-				{
-					Status = EStatus.Success;
-				}
-			}
-		}
-
-		/// <summary>
-		/// 销毁
-		/// </summary>
-		public void Destroy(bool forceDestroy)
-		{
-			IsDestroyed = true;
-
-			// Check fatal
-			if (forceDestroy == false)
-			{
-				if (RefCount > 0)
-					throw new Exception($"Bundle file loader ref is not zero : {BundleFileInfo.BundleName}");
-				if (IsDone() == false)
-					throw new Exception($"Bundle file loader is not done : {BundleFileInfo.BundleName}");
-			}
-
-			if (CacheBundle != null)
-			{
-				CacheBundle.Unload(true);
-				CacheBundle = null;
-			}
-		}
-
-		/// <summary>
-		/// 是否完毕（无论成功或失败）
-		/// </summary>
-		public bool IsDone()
-		{
-			return Status == EStatus.Success || Status == EStatus.Fail;
-		}
-
-		/// <summary>
-		/// 是否可以销毁
-		/// </summary>
-		public bool CanDestroy()
-		{
-			if (IsDone() == false)
-				return false;
-
-			return RefCount <= 0;
-		}
-
-		/// <summary>
-		/// 在满足条件的前提下，销毁所有资源提供者
-		/// </summary>
-		public void TryDestroyAllProviders()
-		{
-			if (IsDone() == false)
-				return;
-
-			// 注意：必须等待所有Provider可以销毁的时候，才可以释放Bundle文件。
-			foreach (var provider in _providers)
-			{
-				if (provider.CanDestroy() == false)
-					return;
-			}
-
-			// 除了自己没有其它引用
-			if (RefCount > _providers.Count)
-				return;
-
-			// 销毁所有Providers
-			foreach (var provider in _providers)
-			{
-				provider.Destory();
-			}
-
-			// 从列表里移除Providers
-			AssetSystem.RemoveBundleProviders(_providers);
-			_providers.Clear();
-		}
-
-		/// <summary>
-		/// 主线程等待异步操作完毕
-		/// </summary>
-		public void WaitForAsyncComplete()
-		{
-			_isWaitForAsyncComplete = true;
-
-			int frame = 1000;
-			while (true)
-			{
-				// 保险机制
-				// 注意：如果需要从WEB端下载资源，可能会触发保险机制！
-				frame--;
-				if (frame == 0)
-				{
-					if (_isShowWaitForAsyncError == false)
-					{
-						_isShowWaitForAsyncError = true;
-						YooLogger.Error($"WaitForAsyncComplete failed ! BundleName : {BundleFileInfo.BundleName} States : {Status}");
-					}
-					break;
-				}
-
-				// 驱动流程
-				Update();
-
-				// 完成后退出
-				if (IsDone())
-					break;
-			}
-		}
-	}
-}

Assets/YooAsset/Runtime/AssetSystem/Loader/AssetBundleLoaderBase.cs

@@ -0,0 +1,160 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace YooAsset
+{
+	internal abstract class AssetBundleLoaderBase
+	{
+		public enum EStatus
+		{
+			None = 0,
+			Succeed,
+			Failed
+		}
+
+		/// <summary>
+		/// 资源包文件信息
+		/// </summary>
+		public BundleInfo BundleFileInfo { private set; get; }
+
+		/// <summary>
+		/// 引用计数
+		/// </summary>
+		public int RefCount { private set; get; }
+
+		/// <summary>
+		/// 加载状态
+		/// </summary>
+		public EStatus Status { protected set; get; }
+
+		/// <summary>
+		/// 最近的错误信息
+		/// </summary>
+		public string LastError { protected set; get; }
+
+		/// <summary>
+		/// 是否已经销毁
+		/// </summary>
+		public bool IsDestroyed { private set; get; } = false;
+
+		private readonly List<ProviderBase> _providers = new List<ProviderBase>(100);
+		internal AssetBundle CacheBundle { set; get; }
+
+
+		public AssetBundleLoaderBase(BundleInfo bundleInfo)
+		{
+			BundleFileInfo = bundleInfo;
+			RefCount = 0;
+			Status = EStatus.None;
+		}
+
+		/// <summary>
+		/// 添加附属的资源提供者
+		/// </summary>
+		public void AddProvider(ProviderBase provider)
+		{
+			if (_providers.Contains(provider) == false)
+				_providers.Add(provider);
+		}
+
+		/// <summary>
+		/// 引用（引用计数递加）
+		/// </summary>
+		public void Reference()
+		{
+			RefCount++;
+		}
+
+		/// <summary>
+		/// 释放（引用计数递减）
+		/// </summary>
+		public void Release()
+		{
+			RefCount--;
+		}
+
+		/// <summary>
+		/// 轮询更新
+		/// </summary>
+		public abstract void Update();
+	
+		/// <summary>
+		/// 销毁
+		/// </summary>
+		public void Destroy(bool forceDestroy)
+		{
+			IsDestroyed = true;
+
+			// Check fatal
+			if (forceDestroy == false)
+			{
+				if (RefCount > 0)
+					throw new Exception($"Bundle file loader ref is not zero : {BundleFileInfo.BundleName}");
+				if (IsDone() == false)
+					throw new Exception($"Bundle file loader is not done : {BundleFileInfo.BundleName}");
+			}
+
+			if (CacheBundle != null)
+			{
+				CacheBundle.Unload(true);
+				CacheBundle = null;
+			}
+		}
+
+		/// <summary>
+		/// 是否完毕（无论成功或失败）
+		/// </summary>
+		public bool IsDone()
+		{
+			return Status == EStatus.Succeed || Status == EStatus.Failed;
+		}
+
+		/// <summary>
+		/// 是否可以销毁
+		/// </summary>
+		public bool CanDestroy()
+		{
+			if (IsDone() == false)
+				return false;
+
+			return RefCount <= 0;
+		}
+
+		/// <summary>
+		/// 在满足条件的前提下，销毁所有资源提供者
+		/// </summary>
+		public void TryDestroyAllProviders()
+		{
+			if (IsDone() == false)
+				return;
+
+			// 注意：必须等待所有Provider可以销毁的时候，才可以释放Bundle文件。
+			foreach (var provider in _providers)
+			{
+				if (provider.CanDestroy() == false)
+					return;
+			}
+
+			// 除了自己没有其它引用
+			if (RefCount > _providers.Count)
+				return;
+
+			// 销毁所有Providers
+			foreach (var provider in _providers)
+			{
+				provider.Destroy();
+			}
+
+			// 从列表里移除Providers
+			AssetSystem.RemoveBundleProviders(_providers);
+			_providers.Clear();
+		}
+
+		/// <summary>
+		/// 主线程等待异步操作完毕
+		/// </summary>
+		public abstract void WaitForAsyncComplete();
+	}
+}

Assets/YooAsset/Runtime/AssetSystem/Loader/AssetBundleLoaderBase.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b8aaabc43e74af14d8eb3c7c85e19cda
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/YooAsset/Runtime/AssetSystem/Loader/AssetBundleWebLoader.cs

@@ -0,0 +1,122 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Networking;
+
+namespace YooAsset
+{
+	internal sealed class AssetBundleWebLoader : AssetBundleLoaderBase
+	{
+		private enum ESteps
+		{
+			None = 0,
+			LoadFile,
+			CheckFile,
+			TryLoad,
+			Done,
+		}
+
+		private ESteps _steps = ESteps.None;
+		private float _tryTimer = 0;
+		private string _webURL;
+		private UnityWebRequest _webRequest;
+
+
+		public AssetBundleWebLoader(BundleInfo bundleInfo) : base(bundleInfo)
+		{
+		}
+
+		/// <summary>
+		/// 轮询更新
+		/// </summary>
+		public override void Update()
+		{
+			if (_steps == ESteps.Done)
+				return;
+
+			if (_steps == ESteps.None)
+			{
+				if (BundleFileInfo.LoadMode == BundleInfo.ELoadMode.None)
+				{
+					_steps = ESteps.Done;
+					Status = EStatus.Failed;
+					LastError = $"Invalid load mode : {BundleFileInfo.BundleName}";
+					YooLogger.Error(LastError);
+				}
+				else if (BundleFileInfo.LoadMode == BundleInfo.ELoadMode.LoadFromStreaming)
+				{
+					_steps = ESteps.LoadFile;
+					_webURL = BundleFileInfo.GetStreamingLoadPath();
+				}
+				else
+				{
+					throw new System.NotImplementedException(BundleFileInfo.LoadMode.ToString());
+				}
+			}
+
+			// 1. 从服务器或缓存中获取AssetBundle文件
+			if (_steps == ESteps.LoadFile)
+			{
+				string hash = StringUtility.RemoveExtension(BundleFileInfo.Hash);
+				_webRequest = UnityWebRequestAssetBundle.GetAssetBundle(_webURL, Hash128.Parse(hash));
+				_webRequest.SendWebRequest();
+				_steps = ESteps.CheckFile;
+			}
+
+			// 2. 检测获取的AssetBundle文件
+			if (_steps == ESteps.CheckFile)
+			{
+				if (_webRequest.isDone == false)
+					return;
+
+#if UNITY_2020_1_OR_NEWER
+				if (_webRequest.result != UnityWebRequest.Result.Success)
+#else
+				if (_webRequest.isNetworkError || _webRequest.isHttpError)
+#endif
+				{
+					YooLogger.Warning($"Failed to get asset bundle form web : {_webURL} Error : {_webRequest.error}");
+					_steps = ESteps.TryLoad;
+					_tryTimer = 0;
+				}
+				else
+				{
+					CacheBundle = DownloadHandlerAssetBundle.GetContent(_webRequest);
+					if (CacheBundle == null)
+					{
+						_steps = ESteps.Done;
+						Status = EStatus.Failed;
+						LastError = $"AssetBundle file is invalid : {BundleFileInfo.BundleName}";
+						YooLogger.Error(LastError);
+					}
+					else
+					{
+						_steps = ESteps.Done;
+						Status = EStatus.Succeed;
+					}
+				}
+			}
+
+			// 3. 如果获取失败，重新尝试
+			if (_steps == ESteps.TryLoad)
+			{
+				_tryTimer += Time.unscaledDeltaTime;
+				if (_tryTimer > 1f)
+				{
+					_webRequest.Dispose();
+					_webRequest = null;
+					_steps = ESteps.LoadFile;
+				}
+			}
+		}
+
+		/// <summary>
+		/// 主线程等待异步操作完毕
+		/// </summary>
+		public override void WaitForAsyncComplete()
+		{
+			throw new System.NotImplementedException($"WebGL platform not support {nameof(WaitForAsyncComplete)}");
+		}
+	}
+}

Assets/YooAsset/Runtime/AssetSystem/Loader/AssetBundleWebLoader.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: bd1ad395c62c5804589ec9b267ea0484
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/YooAsset/Runtime/AssetSystem/Loader/DependAssetBundleGrouper.cs

@@ -9,7 +9,8 @@ namespace YooAsset
 		/// <summary>
 		/// 依赖的资源包加载器列表
 		/// </summary>
-		private readonly List<AssetBundleLoader> _dependBundles;
+		private readonly List<AssetBundleLoaderBase> _dependBundles;
+
 
 		public DependAssetBundleGrouper(string assetPath)
 		{
@@ -29,6 +30,36 @@ namespace YooAsset
 			return true;
 		}
 
+		/// <summary>
+		/// 依赖资源包是否全部加载成功
+		/// </summary>
+		public bool IsSucceed()
+		{
+			foreach (var loader in _dependBundles)
+			{
+				if (loader.Status != AssetBundleLoaderBase.EStatus.Succeed)
+				{
+					return false;
+				}
+			}
+			return true;
+		}
+
+		/// <summary>
+		/// 获取某个加载失败的资源包错误信息
+		/// </summary>
+		public string GetLastError()
+		{
+			foreach (var loader in _dependBundles)
+			{
+				if (loader.Status != AssetBundleLoaderBase.EStatus.Succeed)
+				{
+					return loader.LastError;
+				}
+			}
+			return string.Empty;
+		}
+
 		/// <summary>
 		/// 主线程等待异步操作完毕
 		/// </summary>
@@ -72,7 +103,6 @@ namespace YooAsset
 			{
 				var bundleInfo = new DebugBundleInfo();
 				bundleInfo.BundleName = loader.BundleFileInfo.BundleName;
-				bundleInfo.Version = loader.BundleFileInfo.Version;
 				bundleInfo.RefCount = loader.RefCount;
 				bundleInfo.Status = loader.Status;
 				output.Add(bundleInfo);

Assets/YooAsset/Runtime/AssetSystem/Operations/InstantiateOperation.cs

@@ -2,7 +2,7 @@
 
 namespace YooAsset
 {
-	public class InstantiateOperation : AsyncOperationBase
+	public sealed class InstantiateOperation : AsyncOperationBase
 	{
 		private enum ESteps
 		{
@@ -15,6 +15,7 @@ namespace YooAsset
 		private readonly Vector3 _position;
 		private readonly Quaternion _rotation;
 		private readonly Transform _parent;
+		private readonly bool _setPositionRotation;
 		private ESteps _steps = ESteps.None;
 
 		/// <summary>
@@ -23,12 +24,13 @@ namespace YooAsset
 		public GameObject Result = null;
 
 
-		internal InstantiateOperation(AssetOperationHandle handle, Vector3 position, Quaternion rotation, Transform parent)
+		internal InstantiateOperation(AssetOperationHandle handle, Vector3 position, Quaternion rotation, Transform parent, bool setPositionRotation)
 		{
 			_handle = handle;
 			_position = position;
 			_rotation = rotation;
 			_parent = parent;
+			_setPositionRotation = setPositionRotation;
 		}
 		internal override void Start()
 		{
@@ -46,18 +48,31 @@ namespace YooAsset
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Failed;
 					Error = $"{nameof(AssetOperationHandle)} is invalid.";
+					return;
 				}
+
 				if (_handle.AssetObject == null)
 				{
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Failed;
 					Error = $"{nameof(AssetOperationHandle.AssetObject)} is null.";
+					return;
 				}
 
-				if (_parent == null)
-					Result = Object.Instantiate(_handle.AssetObject as GameObject, _position, _rotation);
+				if(_setPositionRotation)
+				{
+					if (_parent == null)
+						Result = Object.Instantiate(_handle.AssetObject as GameObject, _position, _rotation);
+					else
+						Result = Object.Instantiate(_handle.AssetObject as GameObject, _position, _rotation, _parent);
+				}
 				else
-					Result = Object.Instantiate(_handle.AssetObject as GameObject, _position, _rotation, _parent);
+				{
+					if (_parent == null)
+						Result = Object.Instantiate(_handle.AssetObject as GameObject);
+					else
+						Result = Object.Instantiate(_handle.AssetObject as GameObject, _parent);
+				}
 
 				_steps = ESteps.Done;
 				Status = EOperationStatus.Succeed;

Assets/YooAsset/Runtime/AssetSystem/Operations/RawFileOperation.cs

@@ -2,39 +2,70 @@
 
 namespace YooAsset
 {
-	public class RawFileOperation : AsyncOperationBase
+	/// <summary>
+	/// 原生文件操作
+	/// </summary>
+	public abstract class RawFileOperation : AsyncOperationBase
+	{
+		protected readonly BundleInfo _bundleInfo;
+
+		/// <summary>
+		/// 原生文件的拷贝路径
+		/// </summary>
+		public string CopyPath { private set; get; }
+
+
+		internal RawFileOperation(BundleInfo bundleInfo, string copyPath)
+		{
+			_bundleInfo = bundleInfo;
+			CopyPath = copyPath;
+		}
+
+		/// <summary>
+		/// 原生文件的缓存路径
+		/// </summary>
+		public abstract string GetCachePath();
+
+		/// <summary>
+		/// 获取原生文件的二进制数据
+		/// </summary>
+		public byte[] LoadFileData()
+		{
+			string filePath = GetCachePath();
+			if (File.Exists(filePath) == false)
+				return null;
+			return File.ReadAllBytes(filePath);
+		}
+
+		/// <summary>
+		/// 获取原生文件的文本数据
+		/// </summary>
+		public string LoadFileText()
+		{
+			string filePath = GetCachePath();
+			if (File.Exists(filePath) == false)
+				return string.Empty;
+			return File.ReadAllText(filePath, System.Text.Encoding.UTF8);
+		}
+	}
+
+	/// <summary>
+	/// 编辑器下模拟运行的原生文件操作
+	/// </summary>
+	internal sealed class EditorPlayModeRawFileOperation : RawFileOperation
 	{
 		private enum ESteps
 		{
 			None,
 			Prepare,
-			DownloadFromWeb,
-			CheckDownloadFromWeb,
-			CheckFile,
-			DownloadFromApk,
-			CheckDownloadFromApk,
+			CheckAndCopyFile,
 			Done,
 		}
 
-		private readonly BundleInfo _bundleInfo;
-		private readonly string _savePath;
 		private ESteps _steps = ESteps.None;
-		private DownloaderBase _downloader;
-		private UnityWebFileRequester _fileRequester;
 
-		/// <summary>
-		/// 原生文件的存储路径
-		/// </summary>
-		public string SavePath
+		internal EditorPlayModeRawFileOperation(BundleInfo bundleInfo, string copyPath) : base(bundleInfo, copyPath)
 		{
-			get { return _savePath; }
-		}
-
-
-		internal RawFileOperation(BundleInfo bundleInfo, string savePath)
-		{
-			_bundleInfo = bundleInfo;
-			_savePath = savePath;
 		}
 		internal override void Start()
 		{
@@ -48,19 +79,250 @@ namespace YooAsset
 			// 1. 准备工作
 			if (_steps == ESteps.Prepare)
 			{
-				// 检测加载地址是否为空
-				if (string.IsNullOrEmpty(_bundleInfo.LocalPath))
+				if (_bundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromEditor)
+				{
+					_steps = ESteps.CheckAndCopyFile;
+					return; // 模拟实现异步操作
+				}
+				else
+				{
+					throw new System.NotImplementedException(_bundleInfo.LoadMode.ToString());
+				}
+			}
+
+			// 2. 检测并拷贝原生文件
+			if (_steps == ESteps.CheckAndCopyFile)
+			{
+				// 如果不需要保存文件
+				if (string.IsNullOrEmpty(CopyPath))
 				{
 					_steps = ESteps.Done;
-					Status = EOperationStatus.Failed;
-					Error = "Local path is null or empty.";
+					Status = EOperationStatus.Succeed;
 					return;
 				}
 
-				if (string.IsNullOrEmpty(_bundleInfo.RemoteMainURL))
-					_steps = ESteps.CheckFile;
+				// 如果原生文件已经存在，则将其删除
+				if (File.Exists(CopyPath))
+				{
+					File.Delete(CopyPath);
+				}
+
+				try
+				{
+					FileUtility.CreateFileDirectory(CopyPath);
+					File.Copy(GetCachePath(), CopyPath, true);
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Succeed;
+				}
+				catch (System.Exception e)
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = e.ToString();
+				}
+			}
+		}
+
+		/// <summary>
+		/// 原生文件的缓存路径
+		/// </summary>
+		public override string GetCachePath()
+		{
+			if (_bundleInfo == null)
+				return string.Empty;
+			return _bundleInfo.EditorAssetPath;
+		}
+	}
+
+	/// <summary>
+	/// 离线模式的原生文件操作
+	/// </summary>
+	internal sealed class OfflinePlayModeRawFileOperation : RawFileOperation
+	{
+		private enum ESteps
+		{
+			None,
+			Prepare,
+			DownloadFromApk,
+			CheckDownloadFromApk,
+			CheckAndCopyFile,
+			Done,
+		}
+
+		private ESteps _steps = ESteps.None;
+		private UnityWebFileRequester _fileRequester;
+
+		public OfflinePlayModeRawFileOperation(BundleInfo bundleInfo, string copyPath) : base(bundleInfo, copyPath)
+		{
+		}
+		internal override void Start()
+		{
+			_steps = ESteps.Prepare;
+		}
+		internal override void Update()
+		{
+			if (_steps == ESteps.None || _steps == ESteps.Done)
+				return;
+
+			// 1. 准备工作
+			if (_steps == ESteps.Prepare)
+			{
+				if (_bundleInfo.LoadMode == BundleInfo.ELoadMode.None)
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = $"Bundle info is invalid : {_bundleInfo.BundleName}";
+				}
+				else if (_bundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromStreaming)
+				{
+					_steps = ESteps.DownloadFromApk;
+				}
 				else
+				{
+					throw new System.NotImplementedException(_bundleInfo.LoadMode.ToString());
+				}
+			}
+
+			// 2. 从APK拷贝文件
+			if (_steps == ESteps.DownloadFromApk)
+			{
+				string downloadURL = PathHelper.ConvertToWWWPath(_bundleInfo.GetStreamingLoadPath());
+				_fileRequester = new UnityWebFileRequester();
+				_fileRequester.SendRequest(downloadURL, GetCachePath());
+				_steps = ESteps.CheckDownloadFromApk;
+			}
+
+			// 3. 检测APK拷贝文件结果
+			if (_steps == ESteps.CheckDownloadFromApk)
+			{
+				if (_fileRequester.IsDone() == false)
+					return;
+
+				if (_fileRequester.HasError())
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = _fileRequester.GetError();
+				}
+				else
+				{
+					_steps = ESteps.CheckAndCopyFile;
+				}
+				_fileRequester.Dispose();
+			}
+
+			// 4. 检测并拷贝原生文件
+			if (_steps == ESteps.CheckAndCopyFile)
+			{
+				// 如果不需要保存文件
+				if (string.IsNullOrEmpty(CopyPath))
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Succeed;
+					return;
+				}
+
+				// 如果原生文件已经存在，则验证其完整性
+				if (File.Exists(CopyPath))
+				{
+					bool result = DownloadSystem.CheckContentIntegrity(CopyPath, _bundleInfo.SizeBytes, _bundleInfo.CRC);
+					if (result)
+					{
+						_steps = ESteps.Done;
+						Status = EOperationStatus.Succeed;
+						return;
+					}
+					else
+					{
+						File.Delete(CopyPath);
+					}
+				}
+
+				try
+				{
+					FileUtility.CreateFileDirectory(CopyPath);
+					File.Copy(GetCachePath(), CopyPath, true);
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Succeed;
+				}
+				catch (System.Exception e)
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = e.ToString();
+				}
+			}
+		}
+
+		/// <summary>
+		/// 原生文件的缓存路径
+		/// </summary>
+		public override string GetCachePath()
+		{
+			if (_bundleInfo == null)
+				return string.Empty;
+			return _bundleInfo.GetCacheLoadPath();
+		}
+	}
+
+	/// <summary>
+	/// 网络模式的原生文件操作
+	/// </summary>
+	internal sealed class HostPlayModeRawFileOperation : RawFileOperation
+	{
+		private enum ESteps
+		{
+			None,
+			Prepare,
+			DownloadFromWeb,
+			CheckDownloadFromWeb,
+			DownloadFromApk,
+			CheckDownloadFromApk,
+			CheckAndCopyFile,
+			Done,
+		}
+
+		private ESteps _steps = ESteps.None;
+		private DownloaderBase _downloader;
+		private UnityWebFileRequester _fileRequester;
+
+		internal HostPlayModeRawFileOperation(BundleInfo bundleInfo, string copyPath) : base(bundleInfo, copyPath)
+		{
+		}
+		internal override void Start()
+		{
+			_steps = ESteps.Prepare;
+		}
+		internal override void Update()
+		{
+			if (_steps == ESteps.None || _steps == ESteps.Done)
+				return;
+
+			// 1. 准备工作
+			if (_steps == ESteps.Prepare)
+			{
+				if (_bundleInfo.LoadMode == BundleInfo.ELoadMode.None)
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = $"Bundle info is invalid : {_bundleInfo.BundleName}";
+				}
+				else if (_bundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromRemote)
+				{
 					_steps = ESteps.DownloadFromWeb;
+				}
+				else if (_bundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromStreaming)
+				{
+					_steps = ESteps.DownloadFromApk;
+				}
+				else if (_bundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromCache)
+				{
+					_steps = ESteps.CheckAndCopyFile;
+				}
+				else
+				{
+					throw new System.NotImplementedException(_bundleInfo.LoadMode.ToString());
+				}
 			}
 
 			// 2. 从服务器下载
@@ -85,65 +347,20 @@ namespace YooAsset
 				}
 				else
 				{
-					// 注意：当文件更新之后，需要删除旧文件			
-					if (File.Exists(_savePath))
-						File.Delete(_savePath);
-					_steps = ESteps.CheckFile;
+					_steps = ESteps.CheckAndCopyFile;
 				}
 			}
 
-			// 4. 检测文件
-			if (_steps == ESteps.CheckFile)
-			{
-				// 注意：如果原生文件已经存在，则验证其完整性
-				if (File.Exists(_savePath))
-				{
-					bool result = DownloadSystem.CheckContentIntegrity(_savePath, _bundleInfo.SizeBytes, _bundleInfo.CRC);
-					if (result)
-					{
-						_steps = ESteps.Done;
-						Status = EOperationStatus.Succeed;
-						return;
-					}
-					else
-					{
-						File.Delete(_savePath);
-					}
-				}
-
-				if (_bundleInfo.IsBuildinJarFile())
-				{
-					_steps = ESteps.DownloadFromApk;
-				}
-				else
-				{
-					try
-					{
-						File.Copy(_bundleInfo.LocalPath, _savePath, true);
-					}
-					catch (System.Exception e)
-					{
-						_steps = ESteps.Done;
-						Status = EOperationStatus.Failed;
-						Error = e.ToString();
-						return;
-					}
-
-					_steps = ESteps.Done;
-					Status = EOperationStatus.Succeed;
-				}
-			}
-
-			// 5. 从APK拷贝文件
+			// 4. 从APK拷贝文件
 			if (_steps == ESteps.DownloadFromApk)
 			{
-				string downloadURL = PathHelper.ConvertToWWWPath(_bundleInfo.LocalPath);
+				string downloadURL = PathHelper.ConvertToWWWPath(_bundleInfo.GetStreamingLoadPath());
 				_fileRequester = new UnityWebFileRequester();
-				_fileRequester.SendRequest(downloadURL, _savePath);
+				_fileRequester.SendRequest(downloadURL, GetCachePath());
 				_steps = ESteps.CheckDownloadFromApk;
 			}
 
-			// 6. 检测APK拷贝文件结果
+			// 5. 检测APK拷贝文件结果
 			if (_steps == ESteps.CheckDownloadFromApk)
 			{
 				if (_fileRequester.IsDone() == false)
@@ -157,32 +374,62 @@ namespace YooAsset
 				}
 				else
 				{
+					_steps = ESteps.CheckAndCopyFile;
+				}
+				_fileRequester.Dispose();
+			}
+
+			// 6. 检测并拷贝原生文件
+			if (_steps == ESteps.CheckAndCopyFile)
+			{
+				// 如果不需要保存文件
+				if (string.IsNullOrEmpty(CopyPath))
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Succeed;
+					return;
+				}
+
+				// 如果原生文件已经存在，则验证其完整性
+				if (File.Exists(CopyPath))
+				{
+					bool result = DownloadSystem.CheckContentIntegrity(CopyPath, _bundleInfo.SizeBytes, _bundleInfo.CRC);
+					if (result)
+					{
+						_steps = ESteps.Done;
+						Status = EOperationStatus.Succeed;
+						return;
+					}
+					else
+					{
+						File.Delete(CopyPath);
+					}
+				}
+
+				try
+				{
+					FileUtility.CreateFileDirectory(CopyPath);
+					File.Copy(GetCachePath(), CopyPath, true);
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Succeed;
 				}
-
-				_fileRequester.Dispose();
+				catch (System.Exception e)
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = e.ToString();
+				}
 			}
 		}
 
 		/// <summary>
-		/// 获取原生文件的二进制数据
+		/// 原生文件的缓存路径
 		/// </summary>
-		public byte[] GetFileData()
+		public override string GetCachePath()
 		{
-			if (File.Exists(_savePath) == false)
-				return null;
-			return File.ReadAllBytes(_savePath);
-		}
-
-		/// <summary>
-		/// 获取原生文件的文本数据
-		/// </summary>
-		public string GetFileText()
-		{
-			if (File.Exists(_savePath) == false)
+			if (_bundleInfo == null)
 				return string.Empty;
-			return File.ReadAllText(_savePath, System.Text.Encoding.UTF8);
+			return _bundleInfo.GetCacheLoadPath();
 		}
 	}
 }

Assets/YooAsset/Runtime/AssetSystem/Operations/UnloadSceneOperation.cs

@@ -6,13 +6,12 @@ namespace YooAsset
 	/// <summary>
 	/// 场景卸载异步操作类
 	/// </summary>
-	public class UnloadSceneOperation : AsyncOperationBase
+	public sealed class UnloadSceneOperation : AsyncOperationBase
 	{
 		private enum EFlag
 		{
 			Normal,
 			Error,
-			Skip,
 		}
 		private enum ESteps
 		{
@@ -40,10 +39,6 @@ namespace YooAsset
 			}
 		}
 
-		internal UnloadSceneOperation()
-		{
-			_flag = EFlag.Skip;
-		}
 		internal UnloadSceneOperation(string error)
 		{
 			_flag = EFlag.Error;
@@ -60,11 +55,6 @@ namespace YooAsset
 			{
 				_steps = ESteps.UnLoad;
 			}
-			else if (_flag == EFlag.Skip)
-			{
-				_steps = ESteps.Done;
-				Status = EOperationStatus.Succeed;
-			}
 			else if (_flag == EFlag.Error)
 			{
 				_steps = ESteps.Done;

Assets/YooAsset/Runtime/AssetSystem/Provider/BundledAssetProvider.cs

@@ -45,15 +45,23 @@ namespace YooAsset
 				if (OwnerBundle.IsDone() == false)
 					return;
 
-				if (OwnerBundle.CacheBundle == null)
+				if (DependBundles.IsSucceed() == false)
 				{
 					Status = EStatus.Fail;
+					LastError = DependBundles.GetLastError();
 					InvokeCompletion();
+					return;
 				}
-				else
+
+				if (OwnerBundle.Status != AssetBundleLoaderBase.EStatus.Succeed)
 				{
-					Status = EStatus.Loading;
+					Status = EStatus.Fail;
+					LastError = OwnerBundle.LastError;
+					InvokeCompletion();
+					return;
 				}
+
+				Status = EStatus.Loading;
 			}
 
 			// 2. 加载资源对象
@@ -97,7 +105,10 @@ namespace YooAsset
 
 				Status = AssetObject == null ? EStatus.Fail : EStatus.Success;
 				if (Status == EStatus.Fail)
-					YooLogger.Warning($"Failed to load asset : {AssetName} from bundle : {OwnerBundle.BundleFileInfo.BundleName}");
+				{
+					LastError = $"Failed to load asset : {AssetName} from bundle : {OwnerBundle.BundleFileInfo.BundleName}";
+					YooLogger.Error(LastError);
+				}
 				InvokeCompletion();
 			}
 		}

Assets/YooAsset/Runtime/AssetSystem/Provider/BundledProvider.cs

@@ -5,7 +5,7 @@ namespace YooAsset
 {
     internal abstract class BundledProvider : ProviderBase
     {
-		protected AssetBundleLoader OwnerBundle { private set; get; }
+		protected AssetBundleLoaderBase OwnerBundle { private set; get; }
 		protected DependAssetBundleGrouper DependBundles { private set; get; }
 
 		public BundledProvider(string assetPath, System.Type assetType) : base(assetPath, assetType)
@@ -16,9 +16,9 @@ namespace YooAsset
 			DependBundles = new DependAssetBundleGrouper(assetPath);
 			DependBundles.Reference();
 		}
-		public override void Destory()
+		public override void Destroy()
 		{
-			base.Destory();
+			base.Destroy();
 
 			// 释放资源包
 			if (OwnerBundle != null)
@@ -40,7 +40,6 @@ namespace YooAsset
 		{
 			var bundleInfo = new DebugBundleInfo();
 			bundleInfo.BundleName = OwnerBundle.BundleFileInfo.BundleName;
-			bundleInfo.Version = OwnerBundle.BundleFileInfo.Version;
 			bundleInfo.RefCount = OwnerBundle.RefCount;
 			bundleInfo.Status = OwnerBundle.Status;
 			output.Add(bundleInfo);

Assets/YooAsset/Runtime/AssetSystem/Provider/BundledSceneProvider.cs

@@ -8,6 +8,7 @@ namespace YooAsset
 	internal sealed class BundledSceneProvider : BundledProvider
 	{
 		public readonly LoadSceneMode SceneMode;
+		private readonly string _sceneName;
 		private readonly bool _activateOnLoad;
 		private readonly int _priority;
 		private AsyncOperation _asyncOp;
@@ -25,6 +26,7 @@ namespace YooAsset
 			: base(scenePath, null)
 		{
 			SceneMode = sceneMode;
+			_sceneName = System.IO.Path.GetFileNameWithoutExtension(scenePath);
 			_activateOnLoad = activateOnLoad;
 			_priority = priority;
 		}
@@ -46,21 +48,29 @@ namespace YooAsset
 				if (OwnerBundle.IsDone() == false)
 					return;
 
-				if (OwnerBundle.CacheBundle == null)
+				if (DependBundles.IsSucceed() == false)
 				{
 					Status = EStatus.Fail;
+					LastError = DependBundles.GetLastError();
 					InvokeCompletion();
+					return;
 				}
-				else
+
+				if (OwnerBundle.Status != AssetBundleLoaderBase.EStatus.Succeed)
 				{
-					Status = EStatus.Loading;
+					Status = EStatus.Fail;
+					LastError = OwnerBundle.LastError;
+					InvokeCompletion();
+					return;
 				}
+
+				Status = EStatus.Loading;
 			}
 
 			// 2. 加载场景
 			if (Status == EStatus.Loading)
 			{
-				_asyncOp = SceneManager.LoadSceneAsync(AssetName, SceneMode);
+				_asyncOp = SceneManager.LoadSceneAsync(_sceneName, SceneMode);
 				if (_asyncOp != null)
 				{
 					_asyncOp.allowSceneActivation = true;
@@ -69,8 +79,9 @@ namespace YooAsset
 				}
 				else
 				{
-					YooLogger.Warning($"Failed to load scene : {AssetName}");
 					Status = EStatus.Fail;
+					LastError = $"Failed to load scene : {_sceneName}";
+					YooLogger.Error(LastError);
 					InvokeCompletion();
 				}
 			}
@@ -80,11 +91,16 @@ namespace YooAsset
 			{
 				if (_asyncOp.isDone)
 				{
-					SceneObject = SceneManager.GetSceneByName(AssetName);
+					SceneObject = SceneManager.GetSceneByName(_sceneName);
 					if (SceneObject.IsValid() && _activateOnLoad)
 						SceneManager.SetActiveScene(SceneObject);
 
 					Status = SceneObject.IsValid() ? EStatus.Success : EStatus.Fail;
+					if(Status == EStatus.Fail)
+					{
+						LastError = $"The load scene is invalid : {AssetPath}";
+						YooLogger.Error(LastError);
+					}
 					InvokeCompletion();
 				}
 			}

Assets/YooAsset/Runtime/AssetSystem/Provider/BundledSubAssetsProvider.cs

@@ -45,15 +45,23 @@ namespace YooAsset
 				if (OwnerBundle.IsDone() == false)
 					return;
 
-				if (OwnerBundle.CacheBundle == null)
+				if (DependBundles.IsSucceed() == false)
 				{
 					Status = EStatus.Fail;
+					LastError = DependBundles.GetLastError();
 					InvokeCompletion();
+					return;
 				}
-				else
+
+				if (OwnerBundle.Status != AssetBundleLoaderBase.EStatus.Succeed)
 				{
-					Status = EStatus.Loading;
+					Status = EStatus.Fail;
+					LastError = OwnerBundle.LastError;
+					InvokeCompletion();
+					return;
 				}
+
+				Status = EStatus.Loading;
 			}
 
 			// 2. 加载资源对象
@@ -97,7 +105,10 @@ namespace YooAsset
 
 				Status = AllAssetObjects == null ? EStatus.Fail : EStatus.Success;
 				if (Status == EStatus.Fail)
-					YooLogger.Warning($"Failed to load sub assets : {AssetName} from bundle : {OwnerBundle.BundleFileInfo.BundleName}");
+				{
+					LastError = $"Failed to load sub assets : {AssetName} from bundle : {OwnerBundle.BundleFileInfo.BundleName}";
+					YooLogger.Error(LastError);
+				}
 				InvokeCompletion();
 			}
 		}

Assets/YooAsset/Runtime/AssetSystem/Provider/DatabaseAssetProvider.cs

@@ -34,6 +34,8 @@ namespace YooAsset
 				if (string.IsNullOrEmpty(guid))
 				{
 					Status = EStatus.Fail;
+					LastError = $"Not found asset : {AssetPath}";
+					YooLogger.Error(LastError);
 					InvokeCompletion();
 					return;
 				}
@@ -41,7 +43,7 @@ namespace YooAsset
 				{
 					Status = EStatus.Loading;
 				}
-			
+
 				// 注意：模拟异步加载效果提前返回
 				if (IsWaitForAsyncComplete == false)
 					return;
@@ -59,7 +61,10 @@ namespace YooAsset
 			{
 				Status = AssetObject == null ? EStatus.Fail : EStatus.Success;
 				if (Status == EStatus.Fail)
-					YooLogger.Warning($"Failed to load asset object : {AssetPath}");
+				{
+					LastError = $"Failed to load asset object : {AssetPath}";
+					YooLogger.Error(LastError);
+				}
 				InvokeCompletion();
 			}
 #endif

Assets/YooAsset/Runtime/AssetSystem/Provider/DatabaseSceneProvider.cs

@@ -51,8 +51,9 @@ namespace YooAsset
 				}
 				else
 				{
-					YooLogger.Warning($"Failed to load scene : {AssetName}");
 					Status = EStatus.Fail;
+					LastError = $"Failed to load scene : {AssetPath}";
+					YooLogger.Error(LastError);
 					InvokeCompletion();
 				}
 			}
@@ -67,6 +68,11 @@ namespace YooAsset
 						SceneManager.SetActiveScene(SceneObject);
 
 					Status = SceneObject.IsValid() ? EStatus.Success : EStatus.Fail;
+					if (Status == EStatus.Fail)
+					{
+						LastError = $"The load scene is invalid : {AssetPath}";
+						YooLogger.Error(LastError);
+					}
 					InvokeCompletion();
 				}
 			}

Assets/YooAsset/Runtime/AssetSystem/Provider/DatabaseSubAssetsProvider.cs

@@ -34,6 +34,8 @@ namespace YooAsset
 				if (string.IsNullOrEmpty(guid))
 				{
 					Status = EStatus.Fail;
+					LastError = $"Not found asset : {AssetPath}";
+					YooLogger.Error(LastError);
 					InvokeCompletion();
 					return;
 				}
@@ -73,7 +75,10 @@ namespace YooAsset
 			{
 				Status = AllAssetObjects == null ? EStatus.Fail : EStatus.Success;
 				if (Status == EStatus.Fail)
-					YooLogger.Warning($"Failed to load sub assets : {AssetName}");
+				{
+					LastError = $"Failed to load sub assets : {nameof(AssetType)} in {AssetPath}";
+					YooLogger.Error(LastError);
+				}
 				InvokeCompletion();
 			}
 #endif