Update CHANGELOG.md

修复断点续传统计不准确的问题。

Assets/UniTask.YooAsset~/README.md

@@ -1,19 +0,0 @@
-# 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/YooAsset/CHANGELOG.md

@@ -2,6 +2,294 @@
 
 All notable changes to this package will be documented in this file.
 
+## [1.3.1] - 2022-10-18
+
+### Fixed
+
+- 修复了原生文件每次获取都重复拷贝的问题。
+- 修复了断点续传下载字节数统计不准确的问题。
+
+### Added
+
+- 所有下载相关方法增加超时判断参数。
+
+- 新增首包资源文件拷贝选项。
+
+  ```c#
+  public class BuildParameters
+  {
+      /// <summary>
+      /// 拷贝内置资源选项
+      /// </summary>
+      public ECopyBuildinFileOption CopyBuildinFileOption = ECopyBuildinFileOption.None;
+  
+      /// <summary>
+      /// 拷贝内置资源的标签
+      /// </summary>
+      public string CopyBuildinFileTags = string.Empty;  
+  }
+  ```
+
+- 新增资源包初始化查询字段。
+
+  ```c#
+  public class AssetsPackage
+  {
+      /// <summary>
+      /// 初始化状态
+      /// </summary>
+      public EOperationStatus InitializeStatus
+  }
+  ```
+
+- 增加获取人类可读的版本信息。
+
+  ````c#
+  public class AssetsPackage
+  {
+      /// <summary>
+      /// 获取人类可读的版本信息
+      /// </summary>
+      public string GetHumanReadableVersion()
+  }
+  ````
+
+- 新增资源缓存清理方法。
+
+  ```c#
+  public static class YooAssets
+  {
+      /// <summary>
+      /// 清理未使用的缓存文件
+      /// </summary>
+      public static ClearUnusedCacheFilesOperation ClearUnusedCacheFiles()  
+  }
+  ```
+
+- 异步操作类新增繁忙查询方法。
+
+  ````c#
+  public abstract class GameAsyncOperation
+  {
+      /// <summary>
+      /// 异步操作系统是否繁忙
+      /// </summary>
+      protected bool IsBusy() 
+  }
+  ````
+
+### Removed
+
+- 移除了AssetsPackage.IsInitialized()方法。
+- 移除了YooAssets.ClearAllCacheFiles()方法。
+
+### Changed
+
+- YooAssetsPackage类重名为AssetsPackage
+
+## [1.3.0-preview] - 2022-10-08
+
+该预览版本提供了分布式构建的功能，用于解决分工程或分内容构建的问题。
+
+### Added
+
+- 新增方法设置异步系统的每帧允许运行的最大时间切片。
+
+  ```c#
+  /// <summary>
+  /// 设置异步系统的每帧允许运行的最大时间切片（单位：毫秒）
+  /// </summary>
+  public static void SetOperationSystemMaxTimeSlice(long milliseconds)
+  ```
+
+- 新增方法设置缓存系统的已经缓存文件的校验等级。
+
+  ```c#
+  /// <summary>
+  /// 设置缓存系统的已经缓存文件的校验等级
+  /// </summary>
+  public static void SetCacheSystemCachedFileVerifyLevel(EVerifyLevel verifyLevel)
+  ```
+
+- 新增方法设置下载系统的断点续传功能的文件大小。
+
+  ````C#
+  /// <summary>
+  /// 启用下载系统的断点续传功能的文件大小
+  /// </summary>
+  public static void SetDownloadSystemBreakpointResumeFileSize(int fileBytes)
+  ````
+
+### Removed
+
+- 移除了资源版本号相关概念的代码。
+- 移除了TaskCopyBuildinFiles节点在构建流程里。
+- 移除了YooAssets.ClearUnusedCacheFiles()方法。
+- 移除了初始化参数 InitializeParameters.ClearCacheOnDirty
+- 移除了初始化参数 InitializeParameters.OperationSystemMaxTimeSlice
+- 移除了初始化参数 InitializeParameters.BreakpointResumeFileSize
+- 移除了初始化参数 InitializeParameters.VerifyLevel
+
+## [1.2.4] - 2022-09-22
+
+### Fixed
+
+- 修复了加密文件下载验证失败的问题。
+- 修复了可编程构建管线下模拟构建模式报错的问题。
+
+### Changed
+
+- 可编程构建管线强制使用增量构建模式。
+- 移除了对Gizmos资源的打包限制。
+- AssetBundleCollector窗口增加配置表修复功能。
+
+## [1.2.3] - 2022-09-09
+
+### Fixed
+
+- 修复了资源收集器无法识别.bank音频文件格式。
+
+### Changed
+
+- **HostPlayMode正式支持WebGL平台。**
+- AssetBundleCollector里的着色器收集选项已经移除，现在必定收集。
+- AssetBundleCollector修改了默认的打包规则类。
+- AssetBundleBuilder现在构建结果增加补丁包目录。
+- 更新了UniTask的Sample。
+- 优化了缓存系统的代码结构。
+- 使用了新的断点续传下载器。
+
+### Added
+
+- 增加清理缓存资源的异步操作类。
+
+````c#
+/// <summary>
+/// 清空未被使用的缓存文件
+/// </summary>
+public static ClearUnusedCacheFilesOperation ClearUnusedCacheFiles();
+````
+
+## [1.2.2] - 2022-07-31
+
+### Fixed
+
+- 修复了加载多个相同的子场景而无法全部卸载的问题。
+
+### Changed
+
+- ShaderVariantCollecor支持在CI上调用运行。
+
+- 资源补丁清单增加文件版本校验功能。
+
+- AssetBundleBuilder现在构建结果可以查询构建失败信息。
+
+- AssetBundleBuilder现在资源包文件名称样式提供选择功能。
+
+  ````c#
+  class BuildParameters
+  {
+      /// <summary>
+      /// 补丁文件名称的样式
+      /// </summary>
+      public EOutputNameStyle OutputNameStyle;
+  }
+  ````
+
+### Added
+
+- 增加获取资源信息新方法。
+
+  ````c#
+  /// <summary>
+  /// 获取资源信息
+  /// </summary>
+  /// <param name="location">资源的定位地址</param>
+  public static AssetInfo GetAssetInfo(string location);
+  ````
+
+## [1.2.1] - 2022-07-23
+
+### Fixed
+
+- (#25)修复了资源文件不存在返回的handle无法完成的问题。
+- (#26)修复多个场景打进一个AB包时，卸载子场景时抛出异常。
+
+### Changed
+
+- 构建报告里增加主资源总数的统计。
+- 资源构建系统里修改了内置构建管线的构建结果验证逻辑，移除了对中文路径的检测。
+- 资源构建系统里移除了对增量更新初次无法构建的限制。
+- 优化了缓存验证逻辑，不期望删除断点续传的资源文件。
+- 资源构建系统里SBP构建参数增加了缓存服务器的地址和端口。
+
+## [1.2.0] - 2022-07-18
+
+### Fixed
+
+- 修复了ShaderVariantCollection刷新不及时问题。
+
+### Changed
+
+- 资源收集忽略了Gizmos资源文件。
+- 解密服务接口增加解密文件信息参数。
+- 资源收集窗体增加配置保存按钮。
+- 资源构建窗体增加配置保存按钮。
+
+### Added
+
+- 资源构建模块增加了可编程构建管线(SBP)的支持，开发者可以在内置构建管线和可编程构建管线之间自由选择，零修改成本。
+
+## [1.1.1] - 2022-07-07
+
+### Fixed
+
+- 修复了AssetBundleDebugger窗口，View下拉页签切换无效的问题。
+- 修复了在Unity2020.3版本下UniTask在真机上的一个IL2CPP相关的错误。
+
+### Changed
+
+- 优化了AssetBundleDebugger窗口，增加了帧数显示以及回放功能。
+- 优化了AssetBundleBuilder的代码结构。
+- 增强了YooAssets.GetRawFileAsync()方法的容错。
+
+### Added
+
+- 新增了OperationHandleBase.GetAssetInfo()方法。
+
+  ````c#
+  /// <summary>
+  /// 获取资源信息
+  /// </summary>
+  public AssetInfo GetAssetInfo();
+  ````
+
+- 新增了AssetOperationHandle.GetAssetObjet<TAsset>()方法。
+
+  ````c#
+  /// <summary>
+  /// 获取资源对象
+  /// </summary>
+  /// <typeparam name="TAsset">资源类型</typeparam>
+  public TAsset GetAssetObjet<TAsset>()；
+  ````
+
+- 新增了弱联网情况下加载补丁清单方法。
+
+  ````c#
+  /// <summary>
+  /// 弱联网情况下加载补丁清单
+  /// 注意：当指定版本内容验证失败后会返回失败。
+  /// </summary>
+  /// <param name="resourceVersion">指定的资源版本</param>
+  public static UpdateManifestOperation WeaklyUpdateManifestAsync(int resourceVersion)；
+  ````
+
+### Removed
+
+- 离线运行模式（OfflinePlayMode）下移除了资内置资源解压相关逻辑。
+- 移除了初始化参数：AutoReleaseGameObjectHandle及相关代码逻辑。
+
 ## [1.1.0] - 2022-06-23
 
 ### Fixed

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilder.cs

@@ -8,135 +8,95 @@ namespace YooAsset.Editor
 {
 	public class AssetBundleBuilder
 	{
-		public class BuildParametersContext : IContextObject
-		{
-			private readonly System.Diagnostics.Stopwatch _buildWatch = new System.Diagnostics.Stopwatch();
-
-			/// <summary>
-			/// 构建参数
-			/// </summary>
-			public BuildParameters Parameters { private set; get; }
-
-			/// <summary>
-			/// 构建管线的输出目录
-			/// </summary>
-			public string PipelineOutputDirectory { private set; get; }
-
-
-			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.SimulateBuild)
-					PipelineOutputDirectory += $"_{EBuildMode.SimulateBuild}";
-			}
-
-			/// <summary>
-			/// 获取本次构建的补丁目录
-			/// </summary>
-			public string GetPackageDirectory()
-			{
-				return $"{Parameters.OutputRoot}/{Parameters.BuildTarget}/{Parameters.BuildVersion}";
-			}
-
-			/// <summary>
-			/// 获取构建选项
-			/// </summary>
-			public BuildAssetBundleOptions GetPipelineBuildOptions()
-			{
-				// For the new build system, unity always need BuildAssetBundleOptions.CollectDependencies and BuildAssetBundleOptions.DeterministicAssetBundle
-				// 除非设置ForceRebuildAssetBundle标记，否则会进行增量打包
-
-				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.SimulateBuild)
-					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.BuildMode == EBuildMode.ForceRebuild)
-					opt |= BuildAssetBundleOptions.ForceRebuildAssetBundle; //Force rebuild the asset bundles
-				if (Parameters.DisableWriteTypeTree)
-					opt |= BuildAssetBundleOptions.DisableWriteTypeTree; //Do not include type information within the asset bundle (don't write type tree).
-				if (Parameters.IgnoreTypeTreeChanges)
-					opt |= BuildAssetBundleOptions.IgnoreTypeTreeChanges; //Ignore the type tree changes when doing the incremental build check.
-
-				opt |= BuildAssetBundleOptions.DisableLoadAssetByFileName; //Disables Asset Bundle LoadAsset by file name.
-				opt |= BuildAssetBundleOptions.DisableLoadAssetByFileNameWithExtension; //Disables Asset Bundle LoadAsset by file name with extension.			
-
-				return opt;
-			}
-
-			/// <summary>
-			/// 获取构建的耗时（单位：秒）
-			/// </summary>
-			public float GetBuildingSeconds()
-			{
-				float seconds = _buildWatch.ElapsedMilliseconds / 1000f;
-				return seconds;
-			}
-			public void BeginWatch()
-			{
-				_buildWatch.Start();
-			}
-			public void StopWatch()
-			{
-				_buildWatch.Stop();
-			}
-		}
-
 		private readonly BuildContext _buildContext = new BuildContext();
 
 		/// <summary>
 		/// 开始构建
 		/// </summary>
-		public bool Run(BuildParameters buildParameters)
+		public BuildResult Run(BuildParameters buildParameters)
 		{
 			// 清空旧数据
 			_buildContext.ClearAllContext();
 
+			// 检测构建参数是否为空
+			if (buildParameters == null)
+				throw new Exception($"{nameof(buildParameters)} is null !");
+
+			// 检测可编程构建管线参数
+			if (buildParameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
+			{
+				if (buildParameters.SBPParameters == null)
+					throw new Exception($"{nameof(BuildParameters.SBPParameters)} is null !");
+
+				if (buildParameters.BuildMode == EBuildMode.DryRunBuild)
+					throw new Exception($"{nameof(EBuildPipeline.ScriptableBuildPipeline)} not support {nameof(EBuildMode.DryRunBuild)} build mode !");
+
+				if (buildParameters.BuildMode == EBuildMode.ForceRebuild)
+					throw new Exception($"{nameof(EBuildPipeline.ScriptableBuildPipeline)} not support {nameof(EBuildMode.ForceRebuild)} build mode !");
+			}
+
 			// 构建参数
 			var buildParametersContext = new BuildParametersContext(buildParameters);
 			_buildContext.SetContextObject(buildParametersContext);
 
-			// 执行构建流程
-			List<IBuildTask> pipeline = new List<IBuildTask>
-			{
-				new TaskPrepare(), //前期准备工作
-				new TaskGetBuildMap(), //获取构建列表
-				new TaskBuilding(), //开始执行构建
-				new TaskVerifyBuildResult(), //验证构建结果
-				new TaskEncryption(), //加密资源文件
-				new TaskCreatePatchManifest(), //创建清单文件
-				new TaskCreateReport(), //创建报告文件
-				new TaskCreatePatchPackage(), //制作补丁包
-				new TaskCopyBuildinFiles(), //拷贝内置文件
-			};
-
+			// 是否显示LOG
 			if (buildParameters.BuildMode == EBuildMode.SimulateBuild)
 				BuildRunner.EnableLog = false;
 			else
 				BuildRunner.EnableLog = true;
 
-			bool succeed = BuildRunner.Run(pipeline, _buildContext);
-			if (succeed)
-				Debug.Log($"{buildParameters.BuildMode} pipeline build succeed !");
+			// 创建构建节点
+			List<IBuildTask> pipeline;
+			if (buildParameters.BuildPipeline == EBuildPipeline.BuiltinBuildPipeline)
+			{
+				pipeline = new List<IBuildTask>
+				{
+					new TaskPrepare(), //前期准备工作
+					new TaskGetBuildMap(), //获取构建列表
+					new TaskBuilding(), //开始执行构建
+					new TaskVerifyBuildResult(), //验证构建结果
+					new TaskEncryption(), //加密资源文件
+					new TaskCreatePatchManifest(), //创建清单文件
+					new TaskCreateReport(), //创建报告文件
+					new TaskCreatePatchPackage(), //制作补丁包
+					new TaskCopyBuildinFiles(), //拷贝内置文件
+				};
+			}
+			else if (buildParameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
+			{
+				pipeline = new List<IBuildTask>
+				{
+					new TaskPrepare(), //前期准备工作
+					new TaskGetBuildMap(), //获取构建列表
+					new TaskBuilding_SBP(), //开始执行构建
+					new TaskVerifyBuildResult_SBP(), //验证构建结果
+					new TaskEncryption(), //加密资源文件
+					new TaskCreatePatchManifest(), //创建清单文件
+					new TaskCreateReport(), //创建报告文件
+					new TaskCreatePatchPackage(), //制作补丁包
+					new TaskCopyBuildinFiles(), //拷贝内置文件
+				};
+			}
 			else
+			{
+				throw new NotImplementedException();
+			}
+
+			// 执行构建流程
+			var buildResult = BuildRunner.Run(pipeline, _buildContext);
+			if (buildResult.Success)
+			{
+				buildResult.OutputPackageCRC = buildParametersContext.OutputPackageCRC;
+				buildResult.OutputPackageDirectory = buildParametersContext.GetPackageOutputDirectory();
+				Debug.Log($"{buildParameters.BuildMode} pipeline build succeed !");
+			}
+			else
+			{
 				Debug.LogWarning($"{buildParameters.BuildMode} pipeline build failed !");
-			return succeed;
+				Debug.LogError($"Build task failed : {buildResult.FailedTask}");
+				Debug.LogError($"Build task error : {buildResult.FailedInfo}");
+			}
+			return buildResult;
 		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderHelper.cs

@@ -22,15 +22,7 @@ namespace YooAsset.Editor
 		/// </summary>
 		public static string GetStreamingAssetsFolderPath()
 		{
-			return $"{Application.dataPath}/StreamingAssets/YooAssets/";
-		}
-
-		/// <summary>
-		/// 获取构建管线的输出目录
-		/// </summary>
-		public static string MakePipelineOutputDirectory(string outputRoot, BuildTarget buildTarget)
-		{
-			return $"{outputRoot}/{buildTarget}/{YooAssetSettingsData.Setting.UnityManifestFileName}";
+			return $"{Application.dataPath}/StreamingAssets/{YooAssetSettings.StreamingAssetsBuildinFolder}/";
 		}
 
 		/// <summary>
@@ -67,61 +59,25 @@ namespace YooAsset.Editor
 			}
 		}
 
-
 		/// <summary>
-		/// 获取所有补丁包版本列表
-		/// 注意：列表会按照版本号从小到大排序
+		/// 获取构建管线的输出目录
 		/// </summary>
-		private static List<int> GetPackageVersionList(BuildTarget buildTarget, string outputRoot)
+		public static string MakePipelineOutputDirectory(string outputRoot, string buildPackage, BuildTarget buildTarget, EBuildMode buildMode)
 		{
-			List<int> versionList = new List<int>();
-
-			string parentPath = $"{outputRoot}/{buildTarget}";
-			if (Directory.Exists(parentPath) == false)
-				return versionList;
-
-			// 获取所有补丁包文件夹
-			string[] allFolders = Directory.GetDirectories(parentPath);
-			for (int i = 0; i < allFolders.Length; i++)
-			{
-				string folderName = Path.GetFileNameWithoutExtension(allFolders[i]);
-				if (int.TryParse(folderName, out int version))
-					versionList.Add(version);
-			}
-
-			// 从小到大排序
-			versionList.Sort();
-			return versionList;
+			string result = $"{outputRoot}/{buildPackage}/{buildTarget}/{YooAssetSettings.OutputFolderName}";
+			if (buildMode == EBuildMode.DryRunBuild)
+				result += $"_{EBuildMode.DryRunBuild}";
+			else if (buildMode == EBuildMode.SimulateBuild)
+				result += $"_{EBuildMode.SimulateBuild}";
+			return result;
 		}
 
-		/// <summary>
-		/// 获取当前最大的补丁包版本号
-		/// </summary>
-		/// <returns>如果没有任何补丁版本，那么返回-1</returns>
-		public static int GetMaxPackageVersion(BuildTarget buildTarget, string outputRoot)
-		{
-			List<int> versionList = GetPackageVersionList(buildTarget, outputRoot);
-			if (versionList.Count == 0)
-				return -1;
-			return versionList[versionList.Count - 1];
-		}
-
-		/// <summary>
-		/// 是否存在任何补丁包版本
-		/// </summary>
-		public static bool HasAnyPackageVersion(BuildTarget buildTarget, string outputRoot)
-		{
-			List<int> versionList = GetPackageVersionList(buildTarget, outputRoot);
-			return versionList.Count > 0;
-		}
-
-
 		/// <summary>
 		/// 加载补丁清单文件
 		/// </summary>
-		internal static PatchManifest LoadPatchManifestFile(string fileDirectory, int resourceVersion)
+		internal static PatchManifest LoadPatchManifestFile(string fileDirectory, string packageName, string packageCRC)
 		{
-			string filePath = $"{fileDirectory}/{YooAssetSettingsData.GetPatchManifestFileName(resourceVersion)}";
+			string filePath = $"{fileDirectory}/{YooAssetSettingsData.GetPatchManifestFileName(packageName, packageCRC)}";
 			if (File.Exists(filePath) == false)
 			{
 				throw new System.Exception($"Not found patch manifest file : {filePath}");
@@ -130,16 +86,5 @@ 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

@@ -6,9 +6,9 @@ namespace YooAsset.Editor
 	public class AssetBundleBuilderSetting : ScriptableObject
 	{
 		/// <summary>
-		/// 构建版本号
+		/// 构建管线
 		/// </summary>
-		public int BuildVersion = 0;
+		public EBuildPipeline BuildPipeline = EBuildPipeline.BuiltinBuildPipeline;
 
 		/// <summary>
 		/// 构建模式
@@ -16,23 +16,33 @@ namespace YooAsset.Editor
 		public EBuildMode BuildMode = EBuildMode.ForceRebuild;
 
 		/// <summary>
-		/// 内置资源标签（首包资源标签）
+		/// 构建的包裹名称
 		/// </summary>
-		public string BuildTags = string.Empty;
+		public string BuildPackage = string.Empty;
 
 		/// <summary>
 		/// 压缩方式
 		/// </summary>
 		public ECompressOption CompressOption = ECompressOption.LZ4;
 
+		/// <summary>
+		/// 输出文件名称样式
+		/// </summary>
+		public EOutputNameStyle OutputNameStyle = EOutputNameStyle.HashName;
+
+		/// <summary>
+		/// 首包资源文件的拷贝方式
+		/// </summary>
+		public ECopyBuildinFileOption CopyBuildinFileOption = ECopyBuildinFileOption.None;
+
+		/// <summary>
+		/// 首包资源文件的标签集合
+		/// </summary>
+		public string CopyBuildinFileTags = string.Empty;
+
 		/// <summary>
 		/// 加密类名称
 		/// </summary>
 		public string EncyptionClassName = string.Empty;
-
-		/// <summary>
-		/// 附加后缀格式
-		/// </summary>
-		public bool AppendExtension = false;
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSettingData.cs

@@ -19,6 +19,11 @@ namespace YooAsset.Editor
 			}
 		}
 
+		/// <summary>
+		/// 配置数据是否被修改
+		/// </summary>
+		public static bool IsDirty { set; get; } = false;
+
 		/// <summary>
 		/// 加载配置文件
 		/// </summary>
@@ -34,6 +39,7 @@ namespace YooAsset.Editor
 		{
 			if (Setting != null)
 			{
+				IsDirty = false;
 				EditorUtility.SetDirty(Setting);
 				AssetDatabase.SaveAssets();
 				Debug.Log($"{nameof(AssetBundleBuilderSetting)}.asset is saved!");

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs

@@ -21,14 +21,18 @@ namespace YooAsset.Editor
 		private BuildTarget _buildTarget;
 		private List<Type> _encryptionServicesClassTypes;
 		private List<string> _encryptionServicesClassNames;
+		private List<string> _buildPackageNames;
 
+		private Button _saveButton;
 		private TextField _buildOutputField;
-		private IntegerField _buildVersionField;
+		private EnumField _buildPipelineField;
 		private EnumField _buildModeField;
-		private TextField _buildinTagsField;
+		private PopupField<string> _buildPackageField;
 		private PopupField<string> _encryptionField;
 		private EnumField _compressionField;
-		private Toggle _appendExtensionToggle;
+		private EnumField _outputNameStyleField;
+		private EnumField _copyBuildinFileOptionField;
+		private TextField _copyBuildinFileTagsField;
 
 		public void CreateGUI()
 		{
@@ -43,54 +47,84 @@ namespace YooAsset.Editor
 
 				visualAsset.CloneTree(root);
 
+				// 配置保存按钮
+				_saveButton = root.Q<Button>("SaveButton");
+				_saveButton.clicked += SaveBtn_clicked;
+
+				// 构建平台
 				_buildTarget = EditorUserBuildSettings.activeBuildTarget;
+
+				// 包裹名称列表
+				_buildPackageNames = GetBuildPackageNames();
+
+				// 加密服务类
 				_encryptionServicesClassTypes = GetEncryptionServicesClassTypes();
 				_encryptionServicesClassNames = _encryptionServicesClassTypes.Select(t => t.FullName).ToList();
 
 				// 输出目录
 				string defaultOutputRoot = AssetBundleBuilderHelper.GetDefaultOutputRoot();
-				string pipelineOutputDirectory = AssetBundleBuilderHelper.MakePipelineOutputDirectory(defaultOutputRoot, _buildTarget);
 				_buildOutputField = root.Q<TextField>("BuildOutput");
-				_buildOutputField.SetValueWithoutNotify(pipelineOutputDirectory);
+				_buildOutputField.SetValueWithoutNotify(defaultOutputRoot);
 				_buildOutputField.SetEnabled(false);
 
-				// 构建版本
-				_buildVersionField = root.Q<IntegerField>("BuildVersion");
-				_buildVersionField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.BuildVersion);
-				_buildVersionField.RegisterValueChangedCallback(evt =>
+				// 构建管线
+				_buildPipelineField = root.Q<EnumField>("BuildPipeline");
+				_buildPipelineField.Init(AssetBundleBuilderSettingData.Setting.BuildPipeline);
+				_buildPipelineField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.BuildPipeline);
+				_buildPipelineField.style.width = 350;
+				_buildPipelineField.RegisterValueChangedCallback(evt =>
 				{
-					AssetBundleBuilderSettingData.Setting.BuildVersion = _buildVersionField.value;
+					AssetBundleBuilderSettingData.IsDirty = true;
+					AssetBundleBuilderSettingData.Setting.BuildPipeline = (EBuildPipeline)_buildPipelineField.value;
+					RefreshWindow();
 				});
 
 				// 构建模式
 				_buildModeField = root.Q<EnumField>("BuildMode");
 				_buildModeField.Init(AssetBundleBuilderSettingData.Setting.BuildMode);
 				_buildModeField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.BuildMode);
-				_buildModeField.style.width = 300;
+				_buildModeField.style.width = 350;
 				_buildModeField.RegisterValueChangedCallback(evt =>
 				{
+					AssetBundleBuilderSettingData.IsDirty = true;
 					AssetBundleBuilderSettingData.Setting.BuildMode = (EBuildMode)_buildModeField.value;
 					RefreshWindow();
 				});
 
-				// 内置资源标签
-				_buildinTagsField = root.Q<TextField>("BuildinTags");
-				_buildinTagsField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.BuildTags);
-				_buildinTagsField.RegisterValueChangedCallback(evt =>
+				// 构建包裹
+				var buildPackageContainer = root.Q("BuildPackageContainer");
+				if (_buildPackageNames.Count > 0)
 				{
-					AssetBundleBuilderSettingData.Setting.BuildTags = _buildinTagsField.value;
-				});
+					int defaultIndex = GetDefaultPackageIndex(AssetBundleBuilderSettingData.Setting.BuildPackage);
+					_buildPackageField = new PopupField<string>(_buildPackageNames, defaultIndex);
+					_buildPackageField.label = "Build Package";
+					_buildPackageField.style.width = 350;
+					_buildPackageField.RegisterValueChangedCallback(evt =>
+					{
+						AssetBundleBuilderSettingData.IsDirty = true;
+						AssetBundleBuilderSettingData.Setting.BuildPackage = _buildPackageField.value;
+					});
+					buildPackageContainer.Add(_buildPackageField);
+				}
+				else
+				{
+					_buildPackageField = new PopupField<string>();
+					_buildPackageField.label = "Build Package";
+					_buildPackageField.style.width = 350;
+					buildPackageContainer.Add(_buildPackageField);
+				}
 
 				// 加密方法
 				var encryptionContainer = root.Q("EncryptionContainer");
 				if (_encryptionServicesClassNames.Count > 0)
 				{
-					int defaultIndex = GetEncryptionDefaultIndex(AssetBundleBuilderSettingData.Setting.EncyptionClassName);
+					int defaultIndex = GetDefaultEncryptionIndex(AssetBundleBuilderSettingData.Setting.EncyptionClassName);
 					_encryptionField = new PopupField<string>(_encryptionServicesClassNames, defaultIndex);
 					_encryptionField.label = "Encryption";
-					_encryptionField.style.width = 300;
+					_encryptionField.style.width = 350;
 					_encryptionField.RegisterValueChangedCallback(evt =>
 					{
+						AssetBundleBuilderSettingData.IsDirty = true;
 						AssetBundleBuilderSettingData.Setting.EncyptionClassName = _encryptionField.value;
 					});
 					encryptionContainer.Add(_encryptionField);
@@ -99,26 +133,51 @@ namespace YooAsset.Editor
 				{
 					_encryptionField = new PopupField<string>();
 					_encryptionField.label = "Encryption";
-					_encryptionField.style.width = 300;
+					_encryptionField.style.width = 350;
 					encryptionContainer.Add(_encryptionField);
 				}
 
-				// 压缩方式
+				// 压缩方式选项
 				_compressionField = root.Q<EnumField>("Compression");
 				_compressionField.Init(AssetBundleBuilderSettingData.Setting.CompressOption);
 				_compressionField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.CompressOption);
-				_compressionField.style.width = 300;
+				_compressionField.style.width = 350;
 				_compressionField.RegisterValueChangedCallback(evt =>
 				{
+					AssetBundleBuilderSettingData.IsDirty = true;
 					AssetBundleBuilderSettingData.Setting.CompressOption = (ECompressOption)_compressionField.value;
 				});
 
-				// 附加后缀格式
-				_appendExtensionToggle = root.Q<Toggle>("AppendExtension");
-				_appendExtensionToggle.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.AppendExtension);
-				_appendExtensionToggle.RegisterValueChangedCallback(evt =>
+				// 输出文件名称样式
+				_outputNameStyleField = root.Q<EnumField>("OutputNameStyle");
+				_outputNameStyleField.Init(AssetBundleBuilderSettingData.Setting.OutputNameStyle);
+				_outputNameStyleField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.OutputNameStyle);
+				_outputNameStyleField.style.width = 350;
+				_outputNameStyleField.RegisterValueChangedCallback(evt =>
 				{
-					AssetBundleBuilderSettingData.Setting.AppendExtension = _appendExtensionToggle.value;
+					AssetBundleBuilderSettingData.IsDirty = true;
+					AssetBundleBuilderSettingData.Setting.OutputNameStyle = (EOutputNameStyle)_outputNameStyleField.value;
+				});
+
+				// 首包文件拷贝选项
+				_copyBuildinFileOptionField = root.Q<EnumField>("CopyBuildinFileOption");
+				_copyBuildinFileOptionField.Init(AssetBundleBuilderSettingData.Setting.CopyBuildinFileOption);
+				_copyBuildinFileOptionField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.CopyBuildinFileOption);
+				_copyBuildinFileOptionField.style.width = 350;
+				_copyBuildinFileOptionField.RegisterValueChangedCallback(evt =>
+				{
+					AssetBundleBuilderSettingData.IsDirty = true;
+					AssetBundleBuilderSettingData.Setting.CopyBuildinFileOption = (ECopyBuildinFileOption)_copyBuildinFileOptionField.value;
+					RefreshWindow();
+				});
+
+				// 首包文件的资源标签
+				_copyBuildinFileTagsField = root.Q<TextField>("CopyBuildinFileTags");
+				_copyBuildinFileTagsField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.CopyBuildinFileTags);
+				_copyBuildinFileTagsField.RegisterValueChangedCallback(evt =>
+				{
+					AssetBundleBuilderSettingData.IsDirty = true;
+					AssetBundleBuilderSettingData.Setting.CopyBuildinFileTags = _copyBuildinFileTagsField.value;
 				});
 
 				// 构建按钮
@@ -134,17 +193,42 @@ namespace YooAsset.Editor
 		}
 		public void OnDestroy()
 		{
-			AssetBundleBuilderSettingData.SaveFile();
+			if (AssetBundleBuilderSettingData.IsDirty)
+				AssetBundleBuilderSettingData.SaveFile();
+		}
+		public void Update()
+		{
+			if (_saveButton != null)
+			{
+				if (AssetBundleBuilderSettingData.IsDirty)
+				{
+					if (_saveButton.enabledSelf == false)
+						_saveButton.SetEnabled(true);
+				}
+				else
+				{
+					if (_saveButton.enabledSelf)
+						_saveButton.SetEnabled(false);
+				}
+			}
 		}
 
 		private void RefreshWindow()
 		{
 			var buildMode = AssetBundleBuilderSettingData.Setting.BuildMode;
+			var copyOption = AssetBundleBuilderSettingData.Setting.CopyBuildinFileOption;
 			bool enableElement = buildMode == EBuildMode.ForceRebuild;
-			_buildinTagsField.SetEnabled(enableElement);
+			bool tagsFiledVisible = copyOption == ECopyBuildinFileOption.ClearAndCopyByTags || copyOption == ECopyBuildinFileOption.OnlyCopyByTags;
 			_encryptionField.SetEnabled(enableElement);
 			_compressionField.SetEnabled(enableElement);
-			_appendExtensionToggle.SetEnabled(enableElement);
+			_outputNameStyleField.SetEnabled(enableElement);
+			_copyBuildinFileOptionField.SetEnabled(enableElement);
+			_copyBuildinFileTagsField.SetEnabled(enableElement);
+			_copyBuildinFileTagsField.visible = tagsFiledVisible;
+		}
+		private void SaveBtn_clicked()
+		{
+			AssetBundleBuilderSettingData.SaveFile();
 		}
 		private void BuildButton_clicked()
 		{
@@ -165,32 +249,62 @@ namespace YooAsset.Editor
 		/// </summary>
 		private void ExecuteBuild()
 		{
-			var buildMode = (EBuildMode)_buildModeField.value;
-
 			string defaultOutputRoot = AssetBundleBuilderHelper.GetDefaultOutputRoot();
 			BuildParameters buildParameters = new BuildParameters();
 			buildParameters.OutputRoot = defaultOutputRoot;
 			buildParameters.BuildTarget = _buildTarget;
-			buildParameters.BuildMode = buildMode;
-			buildParameters.BuildVersion = _buildVersionField.value;
-			buildParameters.BuildinTags = _buildinTagsField.value;
+			buildParameters.BuildPipeline = AssetBundleBuilderSettingData.Setting.BuildPipeline;
+			buildParameters.BuildMode = AssetBundleBuilderSettingData.Setting.BuildMode;
+			buildParameters.BuildPackage = AssetBundleBuilderSettingData.Setting.BuildPackage;
 			buildParameters.VerifyBuildingResult = true;
 			buildParameters.EnableAddressable = AssetBundleCollectorSettingData.Setting.EnableAddressable;
-			buildParameters.AppendFileExtension = _appendExtensionToggle.value;
-			buildParameters.CopyBuildinTagFiles = buildMode == EBuildMode.ForceRebuild;
 			buildParameters.EncryptionServices = CreateEncryptionServicesInstance();
-			buildParameters.CompressOption = (ECompressOption)_compressionField.value;
+			buildParameters.CompressOption = AssetBundleBuilderSettingData.Setting.CompressOption;
+			buildParameters.OutputNameStyle = AssetBundleBuilderSettingData.Setting.OutputNameStyle;
+			buildParameters.CopyBuildinFileOption = AssetBundleBuilderSettingData.Setting.CopyBuildinFileOption;
+			buildParameters.CopyBuildinFileTags = AssetBundleBuilderSettingData.Setting.CopyBuildinFileTags;
 
-			AssetBundleBuilder builder = new AssetBundleBuilder();
-			bool succeed = builder.Run(buildParameters);
-			if (succeed)
+			if (AssetBundleBuilderSettingData.Setting.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
 			{
-				EditorUtility.RevealInFinder($"{buildParameters.OutputRoot}/{buildParameters.BuildTarget}/{buildParameters.BuildVersion}");
+				buildParameters.SBPParameters = new BuildParameters.SBPBuildParameters();
+				buildParameters.SBPParameters.WriteLinkXML = true;
+			}
+
+			var builder = new AssetBundleBuilder();
+			var buildResult = builder.Run(buildParameters);
+			if (buildResult.Success)
+			{
+				EditorUtility.RevealInFinder(buildResult.OutputPackageDirectory);
 			}
 		}
 
+		// 构建包裹相关
+		private int GetDefaultPackageIndex(string packageName)
+		{
+			for (int index = 0; index < _buildPackageNames.Count; index++)
+			{
+				if (_buildPackageNames[index] == packageName)
+				{
+					return index;
+				}
+			}
+
+			AssetBundleBuilderSettingData.IsDirty = true;
+			AssetBundleBuilderSettingData.Setting.BuildPackage = _buildPackageNames[0];
+			return 0;
+		}
+		private List<string> GetBuildPackageNames()
+		{
+			List<string> result = new List<string>();
+			foreach (var package in AssetBundleCollectorSettingData.Setting.Packages)
+			{
+				result.Add(package.PackageName);
+			}
+			return result;
+		}
+
 		// 加密类相关
-		private int GetEncryptionDefaultIndex(string className)
+		private int GetDefaultEncryptionIndex(string className)
 		{
 			for (int index = 0; index < _encryptionServicesClassNames.Count; index++)
 			{
@@ -199,6 +313,9 @@ namespace YooAsset.Editor
 					return index;
 				}
 			}
+
+			AssetBundleBuilderSettingData.IsDirty = true;
+			AssetBundleBuilderSettingData.Setting.EncyptionClassName = _encryptionServicesClassNames[0];
 			return 0;
 		}
 		private List<Type> GetEncryptionServicesClassTypes()

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.uxml

@@ -1,13 +1,17 @@
 <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:Toolbar name="Toolbar" style="display: flex; flex-direction: row-reverse;">
+        <ui:Button text="Save" display-tooltip-when-elided="true" name="SaveButton" style="background-color: rgb(56, 147, 58);" />
+    </uie:Toolbar>
     <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="Build Pipeline" name="BuildPipeline" />
         <uie:EnumField label="Build Mode" name="BuildMode" />
+        <ui:VisualElement name="BuildPackageContainer" style="height: 24px;" />
         <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:TextField picking-mode="Ignore" label="Buildin Tags" name="BuildinTags" />
+        <uie:EnumField label="Output Name Style" value="Center" name="OutputNameStyle" />
+        <uie:EnumField label="Copy Buildin File Option" value="Center" name="CopyBuildinFileOption" />
+        <ui:TextField picking-mode="Ignore" label="Copy Buildin File Tags" name="CopyBuildinFileTags" />
         <ui:Button text="构建" display-tooltip-when-elided="true" name="Build" style="height: 50px; background-color: rgb(40, 106, 42); margin-top: 10px;" />
     </ui:VisualElement>
 </ui:UXML>

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleSimulateBuilder.cs

@@ -4,40 +4,32 @@ namespace YooAsset.Editor
 {
 	public static class AssetBundleSimulateBuilder
 	{
-		private static string _manifestFilePath = string.Empty;
-
 		/// <summary>
 		/// 模拟构建
 		/// </summary>
-		public static void SimulateBuild()
+		public static string SimulateBuild(string packageName)
 		{
 			string defaultOutputRoot = AssetBundleBuilderHelper.GetDefaultOutputRoot();
 			BuildParameters buildParameters = new BuildParameters();
 			buildParameters.OutputRoot = defaultOutputRoot;
 			buildParameters.BuildTarget = EditorUserBuildSettings.activeBuildTarget;
 			buildParameters.BuildMode = EBuildMode.SimulateBuild;
-			buildParameters.BuildVersion = 999;
+			buildParameters.BuildPackage = packageName;
 			buildParameters.EnableAddressable = AssetBundleCollectorSettingData.Setting.EnableAddressable;
 
 			AssetBundleBuilder builder = new AssetBundleBuilder();
-			bool buildResult = builder.Run(buildParameters);
-			if (buildResult)
+			var buildResult = builder.Run(buildParameters);
+			if (buildResult.Success)
 			{
-				string pipelineOutputDirectory = AssetBundleBuilderHelper.MakePipelineOutputDirectory(buildParameters.OutputRoot, buildParameters.BuildTarget);
-				_manifestFilePath = $"{pipelineOutputDirectory}_{EBuildMode.SimulateBuild}/{YooAssetSettingsData.GetPatchManifestFileName(buildParameters.BuildVersion)}";
+				string pipelineOutputDirectory = AssetBundleBuilderHelper.MakePipelineOutputDirectory(buildParameters.OutputRoot, buildParameters.BuildPackage, buildParameters.BuildTarget, buildParameters.BuildMode);
+				string manifestFileName = YooAssetSettingsData.GetPatchManifestFileName(buildParameters.BuildPackage, buildResult.OutputPackageCRC);
+				string manifestFilePath = $"{pipelineOutputDirectory}/{manifestFileName}";
+				return manifestFilePath;
 			}
 			else
 			{
-				_manifestFilePath = null;
+				return null;
 			}
 		}
-		
-		/// <summary>
-		/// 获取构建的补丁清单路径
-		/// </summary>
-		public static string GetPatchManifestPath()
-		{
-			return _manifestFilePath;
-		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildAssetInfo.cs

@@ -63,7 +63,7 @@ namespace YooAsset.Editor
 			IsRawAsset = isRawAsset;
 
 			System.Type assetType = UnityEditor.AssetDatabase.GetMainAssetTypeAtPath(assetPath);
-			if (assetType == typeof(UnityEngine.Shader))
+			if (assetType == typeof(UnityEngine.Shader) || assetType == typeof(UnityEngine.ShaderVariantCollection))
 				IsShaderAsset = true;
 			else
 				IsShaderAsset = false;
@@ -76,7 +76,7 @@ namespace YooAsset.Editor
 			IsRawAsset = false;
 
 			System.Type assetType = UnityEditor.AssetDatabase.GetMainAssetTypeAtPath(assetPath);
-			if (assetType == typeof(UnityEngine.Shader))
+			if (assetType == typeof(UnityEngine.Shader) || assetType == typeof(UnityEngine.ShaderVariantCollection))
 				IsShaderAsset = true;
 			else
 				IsShaderAsset = false;
@@ -112,7 +112,7 @@ namespace YooAsset.Editor
 				}
 			}
 		}
-		
+
 		/// <summary>
 		/// 添加资源包的分类标签
 		/// 说明：传染算法统计到的分类标签
@@ -173,14 +173,11 @@ namespace YooAsset.Editor
 				if (IsRawAsset)
 					throw new Exception("Should never get here !");
 
-				if (AssetBundleCollectorSettingData.Setting.AutoCollectShaders)
+				if (IsShaderAsset)
 				{
-					if (IsShaderAsset)
-					{
-						string shareBundleName = $"{AssetBundleCollectorSettingData.Setting.ShadersBundleName}.{YooAssetSettingsData.Setting.AssetBundleFileVariant}";
-						_shareBundleName = EditorTools.GetRegularPath(shareBundleName).ToLower();
-						return;
-					}
+					string shareBundleName = YooAssetSettingsData.GetUnityShadersBundleFullName();
+					_shareBundleName = EditorTools.GetRegularPath(shareBundleName).ToLower();
+					return;
 				}
 
 				if (_referenceBundleNames.Count > 1)

Assets/YooAsset/Editor/AssetBundleBuilder/BuildBundleInfo.cs

@@ -35,6 +35,11 @@ namespace YooAsset.Editor
 			}
 		}
 
+		/// <summary>
+		/// 构建内容哈希值
+		/// </summary>
+		public string ContentHash { set; get; } = "00000000000000000000000000000000"; //32位
+
 
 		public BuildBundleInfo(string bundleName)
 		{
@@ -84,14 +89,6 @@ namespace YooAsset.Editor
 			return result.ToArray();
 		}
 
-		/// <summary>
-		/// 获取文件的扩展名
-		/// </summary>
-		public string GetAppendExtension()
-		{
-			return System.IO.Path.GetExtension(BundleName);
-		}
-
 		/// <summary>
 		/// 获取构建的资源路径列表
 		/// </summary>

Assets/YooAsset/Editor/AssetBundleBuilder/BuildMapCreater.cs

@@ -10,7 +10,7 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 执行资源构建上下文
 		/// </summary>
-		public static BuildMapContext CreateBuildMap(EBuildMode buildMode)
+		public static BuildMapContext CreateBuildMap(EBuildMode buildMode, string packageName)
 		{
 			BuildMapContext context = new BuildMapContext();
 			Dictionary<string, BuildAssetInfo> buildAssetDic = new Dictionary<string, BuildAssetInfo>(1000);
@@ -19,7 +19,7 @@ namespace YooAsset.Editor
 			AssetBundleCollectorSettingData.Setting.CheckConfigError();
 
 			// 2. 获取所有收集器收集的资源
-			List<CollectAssetInfo> allCollectAssets = AssetBundleCollectorSettingData.Setting.GetAllCollectAssets(buildMode);
+			List<CollectAssetInfo> allCollectAssets = AssetBundleCollectorSettingData.Setting.GetPackageAssets(buildMode, packageName);
 
 			// 3. 剔除未被引用的依赖资源
 			List<CollectAssetInfo> removeDependList = new List<CollectAssetInfo>();

Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs

@@ -9,6 +9,33 @@ namespace YooAsset.Editor
 	/// </summary>
 	public class BuildParameters
 	{
+		/// <summary>
+		/// SBP构建参数
+		/// </summary>
+		public class SBPBuildParameters
+		{
+			/// <summary>
+			/// 生成代码防裁剪配置
+			/// </summary>
+			public bool WriteLinkXML = true;
+
+			/// <summary>
+			/// 缓存服务器地址
+			/// </summary>
+			public string CacheServerHost;
+
+			/// <summary>
+			/// 缓存服务器端口
+			/// </summary>
+			public int CacheServerPort;
+		}
+
+		/// <summary>
+		/// 可编程构建管线的参数
+		/// </summary>
+		public SBPBuildParameters SBPParameters;
+
+
 		/// <summary>
 		/// 输出的根目录
 		/// </summary>
@@ -19,21 +46,25 @@ namespace YooAsset.Editor
 		/// </summary>
 		public BuildTarget BuildTarget;
 
+		/// <summary>
+		/// 构建管线
+		/// </summary>
+		public EBuildPipeline BuildPipeline;
+
 		/// <summary>
 		/// 构建模式
 		/// </summary>
 		public EBuildMode BuildMode;
 
 		/// <summary>
-		/// 构建的版本（资源版本号）
+		/// 构建的Package名称
 		/// </summary>
-		public int BuildVersion;
+		public string BuildPackage;
 
 		/// <summary>
-		/// 内置资源标签集合（首包资源标签）
-		/// 注意：分号为分隔符
+		/// 人类可读的版本信息
 		/// </summary>
-		public string BuildinTags;
+		public string HumanReadableVersion;
 
 
 		/// <summary>
@@ -46,22 +77,26 @@ namespace YooAsset.Editor
 		/// </summary>
 		public bool EnableAddressable = false;
 
-		/// <summary>
-		/// 追加文件扩展名
-		/// </summary>
-		public bool AppendFileExtension = false;
-
-		/// <summary>
-		/// 拷贝内置资源文件到StreamingAssets目录（首包资源文件）
-		/// </summary>
-		public bool CopyBuildinTagFiles = false;
-
-
 		/// <summary>
 		/// 加密类
 		/// </summary>
 		public IEncryptionServices EncryptionServices = null;
 
+		/// <summary>
+		/// 补丁文件名称的样式
+		/// </summary>
+		public EOutputNameStyle OutputNameStyle = EOutputNameStyle.HashName;
+
+		/// <summary>
+		/// 拷贝内置资源选项
+		/// </summary>
+		public ECopyBuildinFileOption CopyBuildinFileOption = ECopyBuildinFileOption.None;
+
+		/// <summary>
+		/// 拷贝内置资源的标签
+		/// </summary>
+		public string CopyBuildinFileTags = string.Empty;
+
 		/// <summary>
 		/// 压缩选项
 		/// </summary>
@@ -76,14 +111,5 @@ namespace YooAsset.Editor
 		/// 忽略类型树变化
 		/// </summary>
 		public bool IgnoreTypeTreeChanges = true;
-
-
-		/// <summary>
-		/// 获取内置资源标签列表（首包资源标签）
-		/// </summary>
-		public List<string> GetBuildinTags()
-		{
-			return StringUtility.StringToStringList(BuildinTags, ';');
-		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildParametersContext.cs

@@ -0,0 +1,156 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+	public class BuildParametersContext : IContextObject
+	{
+		private readonly System.Diagnostics.Stopwatch _buildWatch = new System.Diagnostics.Stopwatch();
+
+		private string _pipelineOutputDirectory = string.Empty;
+		private string _packageOutputDirectory = string.Empty;
+		private string _outputPackageCRC = string.Empty;
+
+		/// <summary>
+		/// 构建参数
+		/// </summary>
+		public BuildParameters Parameters { private set; get; }
+
+		/// <summary>
+		/// 构建输出的包裹清单哈希值
+		/// </summary>
+		public string OutputPackageCRC
+		{
+			get
+			{
+				if (string.IsNullOrEmpty(_outputPackageCRC))
+					throw new Exception("Output package file CRC32 is empty !");
+				return _outputPackageCRC;
+			}
+			set
+			{
+				_outputPackageCRC = value;
+			}
+		}
+
+
+		public BuildParametersContext(BuildParameters parameters)
+		{
+			Parameters = parameters;
+		}
+
+		/// <summary>
+		/// 获取构建管线的输出目录
+		/// </summary>
+		/// <returns></returns>
+		public string GetPipelineOutputDirectory()
+		{
+			if (string.IsNullOrEmpty(_pipelineOutputDirectory))
+			{
+				_pipelineOutputDirectory = AssetBundleBuilderHelper.MakePipelineOutputDirectory(Parameters.OutputRoot, Parameters.BuildPackage, Parameters.BuildTarget, Parameters.BuildMode);
+			}
+			return _pipelineOutputDirectory;
+		}
+
+		/// <summary>
+		/// 获取本次构建的补丁目录
+		/// </summary>
+		public string GetPackageOutputDirectory()
+		{
+			if (string.IsNullOrEmpty(_packageOutputDirectory))
+			{
+				_packageOutputDirectory = $"{Parameters.OutputRoot}/{Parameters.BuildPackage}/{Parameters.BuildTarget}/{OutputPackageCRC}";
+			}
+			return _packageOutputDirectory;
+		}
+
+		/// <summary>
+		/// 获取内置构建管线的构建选项
+		/// </summary>
+		public BuildAssetBundleOptions GetPipelineBuildOptions()
+		{
+			// For the new build system, unity always need BuildAssetBundleOptions.CollectDependencies and BuildAssetBundleOptions.DeterministicAssetBundle
+			// 除非设置ForceRebuildAssetBundle标记，否则会进行增量打包
+
+			if (Parameters.BuildMode == EBuildMode.SimulateBuild)
+				throw new Exception("Should never get here !");
+
+			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.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.BuildMode == EBuildMode.ForceRebuild)
+				opt |= BuildAssetBundleOptions.ForceRebuildAssetBundle; //Force rebuild the asset bundles
+			if (Parameters.DisableWriteTypeTree)
+				opt |= BuildAssetBundleOptions.DisableWriteTypeTree; //Do not include type information within the asset bundle (don't write type tree).
+			if (Parameters.IgnoreTypeTreeChanges)
+				opt |= BuildAssetBundleOptions.IgnoreTypeTreeChanges; //Ignore the type tree changes when doing the incremental build check.
+
+			opt |= BuildAssetBundleOptions.DisableLoadAssetByFileName; //Disables Asset Bundle LoadAsset by file name.
+			opt |= BuildAssetBundleOptions.DisableLoadAssetByFileNameWithExtension; //Disables Asset Bundle LoadAsset by file name with extension.			
+
+			return opt;
+		}
+
+		/// <summary>
+		/// 获取可编程构建管线的构建参数
+		/// </summary>
+		public UnityEditor.Build.Pipeline.BundleBuildParameters GetSBPBuildParameters()
+		{
+			if (Parameters.BuildMode == EBuildMode.SimulateBuild)
+				throw new Exception("Should never get here !");
+
+			var targetGroup = BuildPipeline.GetBuildTargetGroup(Parameters.BuildTarget);
+			var pipelineOutputDirectory = GetPipelineOutputDirectory();
+			var buildParams = new UnityEditor.Build.Pipeline.BundleBuildParameters(Parameters.BuildTarget, targetGroup, pipelineOutputDirectory);
+
+			if (Parameters.CompressOption == ECompressOption.Uncompressed)
+				buildParams.BundleCompression = UnityEngine.BuildCompression.Uncompressed;
+			else if (Parameters.CompressOption == ECompressOption.LZMA)
+				buildParams.BundleCompression = UnityEngine.BuildCompression.LZMA;
+			else if (Parameters.CompressOption == ECompressOption.LZ4)
+				buildParams.BundleCompression = UnityEngine.BuildCompression.LZ4;
+			else
+				throw new System.NotImplementedException(Parameters.CompressOption.ToString());
+
+			if (Parameters.DisableWriteTypeTree)
+				buildParams.ContentBuildFlags |= UnityEditor.Build.Content.ContentBuildFlags.DisableWriteTypeTree;
+
+			buildParams.UseCache = true;
+			buildParams.CacheServerHost = Parameters.SBPParameters.CacheServerHost;
+			buildParams.CacheServerPort = Parameters.SBPParameters.CacheServerPort;
+			buildParams.WriteLinkXML = Parameters.SBPParameters.WriteLinkXML;
+
+			return buildParams;
+		}
+
+		/// <summary>
+		/// 获取构建的耗时（单位：秒）
+		/// </summary>
+		public float GetBuildingSeconds()
+		{
+			float seconds = _buildWatch.ElapsedMilliseconds / 1000f;
+			return seconds;
+		}
+		public void BeginWatch()
+		{
+			_buildWatch.Start();
+		}
+		public void StopWatch()
+		{
+			_buildWatch.Stop();
+		}
+	}
+}

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 057a358d2d0c92b47add59dac8bef783
+guid: b84510feab7cbe44a9b6d8ef0b3f559c
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -29,19 +29,24 @@ namespace YooAsset.Editor
 		public string BundleName;
 
 		/// <summary>
-		/// 哈希值
+		/// 文件名称
 		/// </summary>
-		public string Hash;
+		public string FileName;
+
+		/// <summary>
+		/// 文件哈希值
+		/// </summary>
+		public string FileHash;
 
 		/// <summary>
 		/// 文件校验码
 		/// </summary>
-		public string CRC;
+		public string FileCRC;
 
 		/// <summary>
 		/// 文件大小（字节数）
 		/// </summary>
-		public long SizeBytes;
+		public long FileSize;
 
 		/// <summary>
 		/// Tags

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

@@ -8,6 +8,11 @@ namespace YooAsset.Editor
 	[Serializable]
 	public class ReportSummary
 	{
+		/// <summary>
+		/// YooAsset版本
+		/// </summary>
+		public string YooVersion;
+
 		/// <summary>
 		/// 引擎版本
 		/// </summary>
@@ -16,7 +21,7 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 构建时间
 		/// </summary>
-		public string BuildTime;
+		public string BuildDate;
 		
 		/// <summary>
 		/// 构建耗时（单位：秒）
@@ -28,62 +33,42 @@ namespace YooAsset.Editor
 		/// </summary>
 		public BuildTarget BuildTarget;
 
+		/// <summary>
+		/// 构建管线
+		/// </summary>
+		public EBuildPipeline BuildPipeline;
+
 		/// <summary>
 		/// 构建模式
 		/// </summary>
 		public EBuildMode BuildMode;
 
 		/// <summary>
-		/// 构建版本
+		/// 构建包裹
 		/// </summary>
-		public int BuildVersion;
-
-		/// <summary>
-		/// 内置资源标签
-		/// </summary>
-		public string BuildinTags;
+		public string BuildPackage;
 
 		/// <summary>
 		/// 启用可寻址资源定位
 		/// </summary>
 		public bool EnableAddressable;
 
-		/// <summary>
-		/// 追加文件扩展名
-		/// </summary>
-		public bool AppendFileExtension;
-
-		/// <summary>
-		/// 拷贝内置资源文件
-		/// </summary>
-		public bool CopyBuildinTagFiles;
-
-		/// <summary>
-		/// 自动收集着色器
-		/// </summary>
-		public bool AutoCollectShaders;
-
-		/// <summary>
-		/// 自动收集的着色器资源包名称
-		/// </summary>
-		public string ShadersBundleName;
-
 		/// <summary>
 		/// 加密服务类名称
 		/// </summary>
 		public string EncryptionServicesClassName;
 
 		// 构建参数
+		public EOutputNameStyle OutputNameStyle;
 		public ECompressOption CompressOption;
 		public bool DisableWriteTypeTree;
 		public bool IgnoreTypeTreeChanges;
 
 		// 构建结果
 		public int AssetFileTotalCount;
+		public int MainAssetTotalCount;
 		public int AllBundleTotalCount;
 		public long AllBundleTotalSize;
-		public int BuildinBundleTotalCount;
-		public long BuildinBundleTotalSize;
 		public int EncryptedBundleTotalCount;
 		public long EncryptedBundleTotalSize;
 		public int RawBundleTotalCount;

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

@@ -0,0 +1,34 @@
+
+namespace YooAsset.Editor
+{
+    /// <summary>
+    /// 构建结果
+    /// </summary>
+    public class BuildResult
+    {
+        /// <summary>
+        /// 构建是否成功
+        /// </summary>
+        public bool Success;
+
+        /// <summary>
+        /// 构建失败的任务
+        /// </summary>
+        public string FailedTask;
+
+        /// <summary>
+        /// 构建失败的信息
+        /// </summary>
+        public string FailedInfo;
+
+        /// <summary>
+        /// 输出的补丁包目录
+        /// </summary>
+        public string OutputPackageDirectory;
+
+        /// <summary>
+        /// 输出的包裹清单哈希值
+        /// </summary>
+        public string OutputPackageCRC;
+    }
+}

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 37a7daecdb1361140b44ba4724e8866e
+guid: e0855c4b5eaa26942bd7ad177fe3c288
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -14,34 +14,35 @@ namespace YooAsset.Editor
 		/// 执行构建流程
 		/// </summary>
 		/// <returns>如果成功返回TRUE，否则返回FALSE</returns>
-		public static bool Run(List<IBuildTask> pipeline, BuildContext context)
+		public static BuildResult Run(List<IBuildTask> pipeline, BuildContext context)
 		{
 			if (pipeline == null)
 				throw new ArgumentNullException("pipeline");
 			if (context == null)
 				throw new ArgumentNullException("context");
 
-			bool succeed = true;
+			BuildResult buildResult = new BuildResult();
+			buildResult.Success = true;
 			for (int i = 0; i < pipeline.Count; i++)
 			{
 				IBuildTask task = pipeline[i];
 				try
 				{
 					var taskAttribute = task.GetType().GetCustomAttribute<TaskAttribute>();
-					Log($"---------------------------------------->{taskAttribute.Desc}");
+					Log($"---------------------------------------->{taskAttribute.Desc}<---------------------------------------");
 					task.Run(context);
 				}
 				catch (Exception e)
 				{
-					Debug.LogError($"Build task {task.GetType().Name} failed !");
-					Debug.LogError($"Build error : {e}");
-					succeed = false;
+					buildResult.FailedTask = task.GetType().Name;
+					buildResult.FailedInfo = e.ToString();
+					buildResult.Success = false;
 					break;
 				}
 			}
 
 			// 返回运行结果
-			return succeed;
+			return buildResult;
 		}
 
 		/// <summary>

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

@@ -0,0 +1,52 @@
+using System;
+using System.Linq;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor.Build.Pipeline;
+using UnityEditor.Build.Pipeline.Interfaces;
+
+namespace UnityEditor.Build.Pipeline.Tasks
+{
+	public static class SBPBuildTasks
+	{
+		public static IList<IBuildTask> Create(string builtInShaderBundleName)
+		{
+			var buildTasks = new List<IBuildTask>();
+			
+			// Setup
+			buildTasks.Add(new SwitchToBuildPlatform());
+			buildTasks.Add(new RebuildSpriteAtlasCache());
+
+			// Player Scripts
+			buildTasks.Add(new BuildPlayerScripts());
+			buildTasks.Add(new PostScriptsCallback());
+
+			// Dependency
+			buildTasks.Add(new CalculateSceneDependencyData());
+#if UNITY_2019_3_OR_NEWER
+			buildTasks.Add(new CalculateCustomDependencyData());
+#endif
+			buildTasks.Add(new CalculateAssetDependencyData());
+			buildTasks.Add(new StripUnusedSpriteSources());
+			buildTasks.Add(new CreateBuiltInShadersBundle(builtInShaderBundleName));
+			buildTasks.Add(new PostDependencyCallback());
+
+			// Packing
+			buildTasks.Add(new GenerateBundlePacking());
+			buildTasks.Add(new UpdateBundleObjectLayout());
+			buildTasks.Add(new GenerateBundleCommands());
+			buildTasks.Add(new GenerateSubAssetPathMaps());
+			buildTasks.Add(new GenerateBundleMaps());
+			buildTasks.Add(new PostPackingCallback());
+
+			// Writing
+			buildTasks.Add(new WriteSerializedFiles());
+			buildTasks.Add(new ArchiveAndCompressBundles());
+			buildTasks.Add(new AppendBundleHash());
+			buildTasks.Add(new GenerateLinkXml());
+			buildTasks.Add(new PostWritingCallback());
+
+			return buildTasks;
+		}
+	}
+}

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 03baa90d8f534834c9c31d469a507f66
+guid: f38422f6a64300243af6b4fbf84644ba
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.IO;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEditor;
@@ -11,14 +10,14 @@ namespace YooAsset.Editor
 	[TaskAttribute("资源构建内容打包")]
 	public class TaskBuilding : IBuildTask
 	{
-		public class UnityManifestContext : IContextObject
+		public class BuildResultContext : IContextObject
 		{
 			public AssetBundleManifest UnityManifest;
 		}
 
 		void IBuildTask.Run(BuildContext context)
 		{
-			var buildParametersContext = context.GetContextObject<AssetBundleBuilder.BuildParametersContext>();
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
 			var buildMapContext = context.GetContextObject<BuildMapContext>();
 
 			// 模拟构建模式下跳过引擎构建
@@ -26,33 +25,42 @@ namespace YooAsset.Editor
 			if (buildMode == EBuildMode.SimulateBuild)
 				return;
 
-			BuildAssetBundleOptions opt = buildParametersContext.GetPipelineBuildOptions();
-			AssetBundleManifest unityManifest = BuildPipeline.BuildAssetBundles(buildParametersContext.PipelineOutputDirectory, buildMapContext.GetPipelineBuilds(), opt, buildParametersContext.Parameters.BuildTarget);
-			if (unityManifest == null)
+			string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
+			BuildAssetBundleOptions buildOptions = buildParametersContext.GetPipelineBuildOptions();
+			AssetBundleManifest buildResults = BuildPipeline.BuildAssetBundles(pipelineOutputDirectory, buildMapContext.GetPipelineBuilds(), buildOptions, buildParametersContext.Parameters.BuildTarget);
+			if (buildResults == null)
 				throw new Exception("构建过程中发生错误！");
 
-			BuildRunner.Log("Unity引擎打包成功！");
-			UnityManifestContext unityManifestContext = new UnityManifestContext();
-			unityManifestContext.UnityManifest = unityManifest;
-			context.SetContextObject(unityManifestContext);
+			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
+			{
+				string unityOutputManifestFilePath = $"{buildParametersContext.GetPipelineOutputDirectory()}/{YooAssetSettings.OutputFolderName}";
+				if(System.IO.File.Exists(unityOutputManifestFilePath) == false)
+					throw new Exception("构建过程中发生严重错误！请查阅上下文日志！");
+			}
+
+			BuildRunner.Log("Unity引擎打包成功！");
+			BuildResultContext buildResultContext = new BuildResultContext();
+			buildResultContext.UnityManifest = buildResults;
+			context.SetContextObject(buildResultContext);
 
-			// 拷贝原生文件
 			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
 			{
 				CopyRawBundle(buildMapContext, buildParametersContext);
+				UpdateBuildBundleInfo(buildMapContext, buildParametersContext, buildResultContext);
 			}
 		}
 
 		/// <summary>
 		/// 拷贝原生文件
 		/// </summary>
-		private void CopyRawBundle(BuildMapContext buildMapContext, AssetBundleBuilder.BuildParametersContext buildParametersContext)
+		private void CopyRawBundle(BuildMapContext buildMapContext, BuildParametersContext buildParametersContext)
 		{
+			string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
 			foreach (var bundleInfo in buildMapContext.BundleInfos)
 			{
 				if (bundleInfo.IsRawFile)
 				{
-					string dest = $"{buildParametersContext.PipelineOutputDirectory}/{bundleInfo.BundleName}";
+					string dest = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}";
 					foreach (var buildAsset in bundleInfo.BuildinAssets)
 					{
 						if (buildAsset.IsRawAsset)
@@ -61,5 +69,29 @@ namespace YooAsset.Editor
 				}
 			}
 		}
+
+		/// <summary>
+		/// 更新构建结果
+		/// </summary>
+		private void UpdateBuildBundleInfo(BuildMapContext buildMapContext, BuildParametersContext buildParametersContext, BuildResultContext buildResult)
+		{
+			string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
+			foreach (var bundleInfo in buildMapContext.BundleInfos)
+			{
+				if (bundleInfo.IsRawFile)
+				{
+					string filePath = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}";
+					bundleInfo.ContentHash = HashUtility.FileMD5(filePath);
+				}
+				else
+				{
+					var hash = buildResult.UnityManifest.GetAssetBundleHash(bundleInfo.BundleName);
+					if (hash.isValid)
+						bundleInfo.ContentHash = hash.ToString();
+					else
+						throw new Exception($"Not found bundle in build result : {bundleInfo.BundleName}");
+				}
+			}
+		}
 	}
 }

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

@@ -0,0 +1,100 @@
+using System;
+using System.Linq;
+using System.Collections;
+using System.Collections.Generic;
+
+using UnityEditor.Build.Pipeline;
+using UnityEditor.Build.Pipeline.Interfaces;
+using UnityEditor.Build.Pipeline.Tasks;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("资源构建内容打包")]
+	public class TaskBuilding_SBP : IBuildTask
+	{
+		public class BuildResultContext : IContextObject
+		{
+			public IBundleBuildResults Results;
+		}
+
+		void IBuildTask.Run(BuildContext context)
+		{
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			var buildMapContext = context.GetContextObject<BuildMapContext>();
+
+			// 模拟构建模式下跳过引擎构建
+			var buildMode = buildParametersContext.Parameters.BuildMode;
+			if (buildMode == EBuildMode.SimulateBuild)
+				return;
+
+			// 构建内容
+			var buildContent = new BundleBuildContent(buildMapContext.GetPipelineBuilds());
+
+			// 开始构建
+			IBundleBuildResults buildResults;
+			var buildParameters = buildParametersContext.GetSBPBuildParameters();
+			var shadersBunldeName = YooAssetSettingsData.GetUnityShadersBundleFullName();
+			var taskList = SBPBuildTasks.Create(shadersBunldeName);
+			ReturnCode exitCode = ContentPipeline.BuildAssetBundles(buildParameters, buildContent, out buildResults, taskList);
+			if (exitCode < 0)
+			{
+				throw new Exception($"构建过程中发生错误 : {exitCode}");
+			}
+
+			BuildRunner.Log("Unity引擎打包成功！");
+			BuildResultContext buildResultContext = new BuildResultContext();
+			buildResultContext.Results = buildResults;
+			context.SetContextObject(buildResultContext);
+
+			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
+			{
+				CopyRawBundle(buildMapContext, buildParametersContext);
+				UpdateBuildBundleInfo(buildMapContext, buildParametersContext, buildResultContext);
+			}
+		}
+
+		/// <summary>
+		/// 拷贝原生文件
+		/// </summary>
+		private void CopyRawBundle(BuildMapContext buildMapContext, BuildParametersContext buildParametersContext)
+		{
+			string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
+			foreach (var bundleInfo in buildMapContext.BundleInfos)
+			{
+				if (bundleInfo.IsRawFile)
+				{
+					string dest = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}";
+					foreach (var buildAsset in bundleInfo.BuildinAssets)
+					{
+						if (buildAsset.IsRawAsset)
+							EditorTools.CopyFile(buildAsset.AssetPath, dest, true);
+					}
+				}
+			}
+		}
+
+		/// <summary>
+		/// 更新构建结果
+		/// </summary>
+		private void UpdateBuildBundleInfo(BuildMapContext buildMapContext, BuildParametersContext buildParametersContext, BuildResultContext buildResult)
+		{
+			string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
+			foreach (var bundleInfo in buildMapContext.BundleInfos)
+			{
+				if (bundleInfo.IsRawFile)
+				{
+					string filePath = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}";
+					bundleInfo.ContentHash = HashUtility.FileMD5(filePath);
+				}
+				else
+				{
+					// 注意：当资源包的依赖列表发生变化的时候，ContentHash也会发生变化！
+					if (buildResult.Results.BundleInfos.TryGetValue(bundleInfo.BundleName, out var value))
+						bundleInfo.ContentHash = value.Hash.ToString();
+					else
+						throw new Exception($"Not found bundle in build result : {bundleInfo.BundleName}");
+				}
+			}
+		}
+	}
+}

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

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

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

@@ -11,58 +11,77 @@ namespace YooAsset.Editor
 	{
 		void IBuildTask.Run(BuildContext context)
 		{
-			// 注意：我们只有在强制重建的时候才会拷贝
-			var buildParameters = context.GetContextObject<AssetBundleBuilder.BuildParametersContext>();
-			if (buildParameters.Parameters.CopyBuildinTagFiles)
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			if (buildParametersContext.Parameters.CopyBuildinFileOption != ECopyBuildinFileOption.None)
 			{
-				// 清空流目录
-				AssetBundleBuilderHelper.ClearStreamingAssetsFolder();
-
-				// 拷贝内置文件
-				CopyBuildinFilesToStreaming(buildParameters.PipelineOutputDirectory, buildParameters.Parameters.BuildVersion);
+				CopyBuildinFilesToStreaming(buildParametersContext);
 			}
 		}
 
-		private void CopyBuildinFilesToStreaming(string pipelineOutputDirectory, int buildVersion)
+		/// <summary>
+		/// 拷贝首包资源文件
+		/// </summary>
+		private void CopyBuildinFilesToStreaming(BuildParametersContext buildParametersContext)
 		{
+			ECopyBuildinFileOption option = buildParametersContext.Parameters.CopyBuildinFileOption;
+			string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
+			string streamingAssetsDirectory = AssetBundleBuilderHelper.GetStreamingAssetsFolderPath();
+			string buildPackageName = buildParametersContext.Parameters.BuildPackage;
+			string outputPackageCRC = buildParametersContext.OutputPackageCRC;
+
 			// 加载补丁清单
-			PatchManifest patchManifest = AssetBundleBuilderHelper.LoadPatchManifestFile(pipelineOutputDirectory, buildVersion);
+			PatchManifest patchManifest = AssetBundleBuilderHelper.LoadPatchManifestFile(packageOutputDirectory, buildPackageName, outputPackageCRC);
 
-			// 拷贝文件列表
-			foreach (var patchBundle in patchManifest.BundleList)
+			// 清空流目录
+			if (option == ECopyBuildinFileOption.ClearAndCopyAll || option == ECopyBuildinFileOption.ClearAndCopyByTags)
 			{
-				if (patchBundle.IsBuildin == false)
-					continue;
-
-				string sourcePath = $"{pipelineOutputDirectory}/{patchBundle.BundleName}";
-				string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsFolderPath()}/{patchBundle.Hash}";
-				EditorTools.CopyFile(sourcePath, destPath, true);
+				AssetBundleBuilderHelper.ClearStreamingAssetsFolder();
 			}
 
-			// 拷贝清单文件
+			// 拷贝补丁清单文件
 			{
-				string sourcePath = $"{pipelineOutputDirectory}/{YooAssetSettingsData.GetPatchManifestFileName(buildVersion)}";
-				string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsFolderPath()}/{YooAssetSettingsData.GetPatchManifestFileName(buildVersion)}";
-				EditorTools.CopyFile(sourcePath, destPath, true);
-			}
-
-			// 拷贝清单哈希文件
-			{
-				string sourcePath = $"{pipelineOutputDirectory}/{YooAssetSettingsData.GetPatchManifestHashFileName(buildVersion)}";
-				string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsFolderPath()}/{YooAssetSettingsData.GetPatchManifestHashFileName(buildVersion)}";
+				string manifestFileName = YooAssetSettingsData.GetPatchManifestFileName(buildPackageName, outputPackageCRC);
+				string sourcePath = $"{packageOutputDirectory}/{manifestFileName}";
+				string destPath = $"{streamingAssetsDirectory}/{manifestFileName}";
 				EditorTools.CopyFile(sourcePath, destPath, true);
 			}
 
 			// 拷贝静态版本文件
 			{
-				string sourcePath = $"{pipelineOutputDirectory}/{YooAssetSettings.VersionFileName}";
-				string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsFolderPath()}/{YooAssetSettings.VersionFileName}";
+				string versionFileName = YooAssetSettingsData.GetStaticVersionFileName(buildPackageName);
+				string sourcePath = $"{packageOutputDirectory}/{versionFileName}";
+				string destPath = $"{streamingAssetsDirectory}/{versionFileName}";
 				EditorTools.CopyFile(sourcePath, destPath, true);
 			}
 
+			// 拷贝文件列表（所有文件）
+			if (option == ECopyBuildinFileOption.ClearAndCopyAll || option == ECopyBuildinFileOption.OnlyCopyAll)
+			{		
+				foreach (var patchBundle in patchManifest.BundleList)
+				{
+					string sourcePath = $"{packageOutputDirectory}/{patchBundle.FileName}";
+					string destPath = $"{streamingAssetsDirectory}/{patchBundle.FileName}";
+					EditorTools.CopyFile(sourcePath, destPath, true);
+				}
+			}
+
+			// 拷贝文件列表（带标签的文件）
+			if (option == ECopyBuildinFileOption.ClearAndCopyByTags || option == ECopyBuildinFileOption.OnlyCopyByTags)
+			{
+				string[] tags = buildParametersContext.Parameters.CopyBuildinFileTags.Split(';');
+				foreach (var patchBundle in patchManifest.BundleList)
+				{
+					if (patchBundle.HasTag(tags) == false)
+						continue;
+					string sourcePath = $"{packageOutputDirectory}/{patchBundle.FileName}";
+					string destPath = $"{streamingAssetsDirectory}/{patchBundle.FileName}";
+					EditorTools.CopyFile(sourcePath, destPath, true);
+				}
+			}
+
 			// 刷新目录
 			AssetDatabase.Refresh();
-			BuildRunner.Log($"内置文件拷贝完成：{AssetBundleBuilderHelper.GetStreamingAssetsFolderPath()}");
+			BuildRunner.Log($"内置文件拷贝完成：{streamingAssetsDirectory}");
 		}
 	}
 }

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

@@ -1,8 +1,11 @@
 using System;
-using System.IO;
+using System.Linq;
 using System.Collections;
 using System.Collections.Generic;
 
+using UnityEditor.Build.Pipeline;
+using UnityEditor.Build.Pipeline.Interfaces;
+
 namespace YooAsset.Editor
 {
 	[TaskAttribute("创建补丁清单文件")]
@@ -10,123 +13,121 @@ namespace YooAsset.Editor
 	{
 		void IBuildTask.Run(BuildContext context)
 		{
-			var buildParameters = context.GetContextObject<AssetBundleBuilder.BuildParametersContext>();
-			var encryptionContext = context.GetContextObject<TaskEncryption.EncryptionContext>();
-			var buildMapContext = context.GetContextObject<BuildMapContext>();
-			CreatePatchManifestFile(buildParameters, buildMapContext, encryptionContext);
+			CreatePatchManifestFile(context);
 		}
 
 		/// <summary>
 		/// 创建补丁清单文件到输出目录
 		/// </summary>
-		private void CreatePatchManifestFile(AssetBundleBuilder.BuildParametersContext buildParameters,
-			BuildMapContext buildMapContext, TaskEncryption.EncryptionContext encryptionContext)
+		private void CreatePatchManifestFile(BuildContext context)
 		{
-			int resourceVersion = buildParameters.Parameters.BuildVersion;
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			var buildParameters = buildParametersContext.Parameters;
+			string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
 
 			// 创建新补丁清单
 			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(buildParameters, buildMapContext, patchManifest);
+			patchManifest.FileVersion = YooAssetSettings.PatchManifestFileVersion;
+			patchManifest.EnableAddressable = buildParameters.EnableAddressable;
+			patchManifest.OutputNameStyle = (int)buildParameters.OutputNameStyle;
+			patchManifest.PackageName = buildParameters.BuildPackage;
+			patchManifest.HumanReadableVersion = buildParameters.HumanReadableVersion;
+			patchManifest.BundleList = GetAllPatchBundle(context);
+			patchManifest.AssetList = GetAllPatchAsset(context, patchManifest);
+
+			// 更新Unity内置资源包的引用关系
+			if (buildParameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
+			{
+				if(buildParameters.BuildMode == EBuildMode.IncrementalBuild)
+				{
+					var buildResultContext = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
+					UpdateBuiltInBundleReference(patchManifest, buildResultContext.Results);
+				}
+			}
 
 			// 创建补丁清单文件
-			string manifestFilePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.GetPatchManifestFileName(resourceVersion)}";
-			BuildRunner.Log($"创建补丁清单文件：{manifestFilePath}");
-			PatchManifest.Serialize(manifestFilePath, patchManifest);
+			string manifestFileTempName = YooAssetSettingsData.GetPatchManifestTempFileName(buildParameters.BuildPackage);
+			string manifestFileTempPath = $"{pipelineOutputDirectory}/{manifestFileTempName}";
+			BuildRunner.Log($"创建补丁清单文件：{manifestFileTempPath}");
+			PatchManifest.Serialize(manifestFileTempPath, patchManifest);
 
-			// 创建补丁清单哈希文件
-			string manifestHashFilePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.GetPatchManifestHashFileName(resourceVersion)}";
-			string manifestHash = HashUtility.FileMD5(manifestFilePath);
-			BuildRunner.Log($"创建补丁清单哈希文件：{manifestHashFilePath}");
-			FileUtility.CreateFile(manifestHashFilePath, manifestHash);
+			// 计算补丁清单文件的CRC32
+			buildParametersContext.OutputPackageCRC = HashUtility.FileCRC32(manifestFileTempPath);
+
+			// 补丁清单文件重命名
+			string manifestFileName = YooAssetSettingsData.GetPatchManifestFileName(buildParameters.BuildPackage, buildParametersContext.OutputPackageCRC);
+			string manifestFilePath = $"{pipelineOutputDirectory}/{manifestFileName}";
+			EditorTools.FileMoveTo(manifestFileTempPath, manifestFilePath);
 
 			// 创建静态版本文件
-			string staticVersionFilePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettings.VersionFileName}";
-			string staticVersion = resourceVersion.ToString();
+			string staticVersionFileName = YooAssetSettingsData.GetStaticVersionFileName(buildParameters.BuildPackage);
+			string staticVersionFilePath = $"{pipelineOutputDirectory}/{staticVersionFileName}";
 			BuildRunner.Log($"创建静态版本文件：{staticVersionFilePath}");
-			FileUtility.CreateFile(staticVersionFilePath, staticVersion);
+			FileUtility.CreateFile(staticVersionFilePath, buildParametersContext.OutputPackageCRC);
 		}
 
 		/// <summary>
 		/// 获取资源包列表
 		/// </summary>
-		private List<PatchBundle> GetAllPatchBundle(AssetBundleBuilder.BuildParametersContext buildParameters,
-			BuildMapContext buildMapContext, TaskEncryption.EncryptionContext encryptionContext)
+		private List<PatchBundle> GetAllPatchBundle(BuildContext context)
 		{
-			List<PatchBundle> result = new List<PatchBundle>(1000);
+			var buildParameters = context.GetContextObject<BuildParametersContext>();
+			var buildMapContext = context.GetContextObject<BuildMapContext>();
+			var encryptionContext = context.GetContextObject<TaskEncryption.EncryptionContext>();
 
-			List<string> buildinTags = buildParameters.Parameters.GetBuildinTags();
-			var buildMode = buildParameters.Parameters.BuildMode;
-			bool standardBuild = buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild;
+			List<PatchBundle> result = new List<PatchBundle>(1000);
 			foreach (var bundleInfo in buildMapContext.BundleInfos)
 			{
 				var bundleName = bundleInfo.BundleName;
-				string filePath = $"{buildParameters.PipelineOutputDirectory}/{bundleName}";
-				string hash = GetFileHash(filePath, standardBuild);
-				string crc32 = GetFileCRC(filePath, standardBuild);
-				long size = GetFileSize(filePath, standardBuild);
+				string fileHash = GetBundleFileHash(bundleInfo, buildParameters);
+				string fileCRC = GetBundleFileCRC(bundleInfo, buildParameters);
+				long fileSize = GetBundleFileSize(bundleInfo, buildParameters);
 				string[] tags = buildMapContext.GetBundleTags(bundleName);
 				bool isEncrypted = encryptionContext.IsEncryptFile(bundleName);
-				bool isBuildin = IsBuildinBundle(tags, buildinTags);
 				bool isRawFile = bundleInfo.IsRawFile;
 
-				// 附加文件扩展名
-				if (buildParameters.Parameters.AppendFileExtension)
-				{
-					hash += bundleInfo.GetAppendExtension();
-				}
-
-				PatchBundle patchBundle = new PatchBundle(bundleName, hash, crc32, size, tags);
-				patchBundle.SetFlagsValue(isEncrypted, isBuildin, isRawFile);
+				PatchBundle patchBundle = new PatchBundle(bundleName, fileHash, fileCRC, fileSize, tags);
+				patchBundle.SetFlagsValue(isRawFile, isEncrypted);
 				result.Add(patchBundle);
 			}
-
 			return result;
 		}
-		private bool IsBuildinBundle(string[] bundleTags, List<string> buildinTags)
+		private string GetBundleFileHash(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
 		{
-			// 注意：没有任何分类标签的Bundle文件默认为内置文件
-			if (bundleTags.Length == 0)
-				return true;
-
-			foreach (var tag in bundleTags)
-			{
-				if (buildinTags.Contains(tag))
-					return true;
-			}
-			return false;
-		}
-		private string GetFileHash(string filePath, bool standardBuild)
-		{
-			if (standardBuild)
-				return HashUtility.FileMD5(filePath);
-			else
+			var buildMode = buildParametersContext.Parameters.BuildMode;
+			if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild)
 				return "00000000000000000000000000000000"; //32位
+
+			string filePath = $"{buildParametersContext.GetPipelineOutputDirectory()}/{bundleInfo.BundleName}";
+			return HashUtility.FileMD5(filePath);
 		}
-		private string GetFileCRC(string filePath, bool standardBuild)
+		private string GetBundleFileCRC(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
 		{
-			if (standardBuild)
-				return HashUtility.FileCRC32(filePath);
-			else
+			var buildMode = buildParametersContext.Parameters.BuildMode;
+			if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild)
 				return "00000000"; //8位
+
+			string filePath = $"{buildParametersContext.GetPipelineOutputDirectory()}/{bundleInfo.BundleName}";
+			return HashUtility.FileCRC32(filePath);
 		}
-		private long GetFileSize(string filePath, bool standardBuild)
+		private long GetBundleFileSize(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
 		{
-			if (standardBuild)
-				return FileUtility.GetFileSize(filePath);
-			else
+			var buildMode = buildParametersContext.Parameters.BuildMode;
+			if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild)
 				return 0;
+
+			string filePath = $"{buildParametersContext.GetPipelineOutputDirectory()}/{bundleInfo.BundleName}";
+			return FileUtility.GetFileSize(filePath);
 		}
 
 		/// <summary>
 		/// 获取资源列表
 		/// </summary>
-		private List<PatchAsset> GetAllPatchAsset(AssetBundleBuilder.BuildParametersContext buildParameters,
-			BuildMapContext buildMapContext, PatchManifest patchManifest)
+		private List<PatchAsset> GetAllPatchAsset(BuildContext context, PatchManifest patchManifest)
 		{
+			var buildParameters = context.GetContextObject<BuildParametersContext>();
+			var buildMapContext = context.GetContextObject<BuildMapContext>();
+
 			List<PatchAsset> result = new List<PatchAsset>(1000);
 			foreach (var bundleInfo in buildMapContext.BundleInfos)
 			{
@@ -173,5 +174,52 @@ namespace YooAsset.Editor
 			}
 			throw new Exception($"Not found bundle name : {bundleName}");
 		}
+
+		/// <summary>
+		/// 更新Unity内置资源包的引用关系
+		/// </summary>
+		private void UpdateBuiltInBundleReference(PatchManifest patchManifest, IBundleBuildResults buildResults)
+		{
+			// 获取所有依赖着色器资源包的资源包列表
+			string shadersBunldeName = YooAssetSettingsData.GetUnityShadersBundleFullName();
+			List<string> shaderBundleReferenceList = new List<string>();
+			foreach (var valuePair in buildResults.BundleInfos)
+			{
+				if (valuePair.Value.Dependencies.Any(t => t == shadersBunldeName))
+					shaderBundleReferenceList.Add(valuePair.Key);
+			}
+
+			// 获取着色器资源包索引
+			Predicate<PatchBundle> predicate = new Predicate<PatchBundle>(s => s.BundleName == shadersBunldeName);
+			int shaderBundleId = patchManifest.BundleList.FindIndex(predicate);
+			if (shaderBundleId == -1)
+				throw new Exception("没有发现着色器资源包！");
+
+			// 检测依赖交集并更新依赖ID
+			foreach (var patchAsset in patchManifest.AssetList)
+			{
+				List<string> dependBundles = GetPatchAssetAllDependBundles(patchManifest, patchAsset);
+				List<string> conflictAssetPathList = dependBundles.Intersect(shaderBundleReferenceList).ToList();
+				if (conflictAssetPathList.Count > 0)
+				{
+					List<int> newDependIDs = new List<int>(patchAsset.DependIDs);
+					if (newDependIDs.Contains(shaderBundleId) == false)
+						newDependIDs.Add(shaderBundleId);
+					patchAsset.DependIDs = newDependIDs.ToArray();
+				}
+			}
+		}
+		private List<string> GetPatchAssetAllDependBundles(PatchManifest patchManifest, PatchAsset patchAsset)
+		{
+			List<string> result = new List<string>();
+			string mainBundle = patchManifest.BundleList[patchAsset.BundleID].BundleName;
+			result.Add(mainBundle);
+			foreach (var dependID in patchAsset.DependIDs)
+			{
+				string dependBundle = patchManifest.BundleList[dependID].BundleName;
+				result.Add(dependBundle);
+			}
+			return result;
+		}
 	}
 }

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

@@ -8,7 +8,7 @@ namespace YooAsset.Editor
 	{
 		void IBuildTask.Run(BuildContext context)
 		{
-			var buildParameters = context.GetContextObject<AssetBundleBuilder.BuildParametersContext>();
+			var buildParameters = context.GetContextObject<BuildParametersContext>();
 			var buildMode = buildParameters.Parameters.BuildMode;
 			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
 			{
@@ -19,63 +19,79 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 拷贝补丁文件到补丁包目录
 		/// </summary>
-		private void CopyPatchFiles(AssetBundleBuilder.BuildParametersContext buildParameters)
+		private void CopyPatchFiles(BuildParametersContext buildParametersContext)
 		{
-			int resourceVersion = buildParameters.Parameters.BuildVersion;
-			string packageDirectory = buildParameters.GetPackageDirectory();
-			BuildRunner.Log($"开始拷贝补丁文件到补丁包目录：{packageDirectory}");
+			var buildParameters = buildParametersContext.Parameters;
+			string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
+			string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
+			BuildRunner.Log($"开始拷贝补丁文件到补丁包目录：{packageOutputDirectory}");
 
 			// 拷贝Report文件
 			{
-				string reportFileName = YooAssetSettingsData.GetReportFileName(buildParameters.Parameters.BuildVersion);
-				string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{reportFileName}";
-				string destPath = $"{packageDirectory}/{reportFileName}";
+				string reportFileName = YooAssetSettingsData.GetReportFileName(buildParameters.BuildPackage, buildParametersContext.OutputPackageCRC);
+				string sourcePath = $"{pipelineOutputDirectory}/{reportFileName}";
+				string destPath = $"{packageOutputDirectory}/{reportFileName}";
 				EditorTools.CopyFile(sourcePath, destPath, true);
 			}
 
 			// 拷贝补丁清单文件
 			{
-				string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.GetPatchManifestFileName(resourceVersion)}";
-				string destPath = $"{packageDirectory}/{YooAssetSettingsData.GetPatchManifestFileName(resourceVersion)}";
-				EditorTools.CopyFile(sourcePath, destPath, true);
-			}
-
-			// 拷贝补丁清单哈希文件
-			{
-				string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.GetPatchManifestHashFileName(resourceVersion)}";
-				string destPath = $"{packageDirectory}/{YooAssetSettingsData.GetPatchManifestHashFileName(resourceVersion)}";
+				string manifestFileName = YooAssetSettingsData.GetPatchManifestFileName(buildParameters.BuildPackage, buildParametersContext.OutputPackageCRC);
+				string sourcePath = $"{pipelineOutputDirectory}/{manifestFileName}";
+				string destPath = $"{packageOutputDirectory}/{manifestFileName}";
 				EditorTools.CopyFile(sourcePath, destPath, true);
 			}
 
 			// 拷贝静态版本文件
 			{
-				string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettings.VersionFileName}";
-				string destPath = $"{packageDirectory}/{YooAssetSettings.VersionFileName}";
+				string versionFileName = YooAssetSettingsData.GetStaticVersionFileName(buildParameters.BuildPackage);
+				string sourcePath = $"{pipelineOutputDirectory}/{versionFileName}";
+				string destPath = $"{packageOutputDirectory}/{versionFileName}";
 				EditorTools.CopyFile(sourcePath, destPath, true);
 			}
 
-			// 拷贝UnityManifest序列化文件
+			if (buildParameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
 			{
-				string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.Setting.UnityManifestFileName}";
-				string destPath = $"{packageDirectory}/{YooAssetSettingsData.Setting.UnityManifestFileName}";
-				EditorTools.CopyFile(sourcePath, destPath, true);
-			}
+				// 拷贝构建日志
+				{
+					string sourcePath = $"{pipelineOutputDirectory}/buildlogtep.json";
+					string destPath = $"{packageOutputDirectory}/buildlogtep.json";
+					EditorTools.CopyFile(sourcePath, destPath, true);
+				}
 
-			// 拷贝UnityManifest文本文件
+				// 拷贝代码防裁剪配置
+				if (buildParameters.SBPParameters.WriteLinkXML)
+				{
+					string sourcePath = $"{pipelineOutputDirectory}/link.xml";
+					string destPath = $"{packageOutputDirectory}/link.xml";
+					EditorTools.CopyFile(sourcePath, destPath, true);
+				}
+			}
+			else
 			{
-				string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.Setting.UnityManifestFileName}.manifest";
-				string destPath = $"{packageDirectory}/{YooAssetSettingsData.Setting.UnityManifestFileName}.manifest";
-				EditorTools.CopyFile(sourcePath, destPath, true);
+				// 拷贝UnityManifest序列化文件
+				{
+					string sourcePath = $"{pipelineOutputDirectory}/{YooAssetSettings.OutputFolderName}";
+					string destPath = $"{packageOutputDirectory}/{YooAssetSettings.OutputFolderName}";
+					EditorTools.CopyFile(sourcePath, destPath, true);
+				}
+
+				// 拷贝UnityManifest文本文件
+				{
+					string sourcePath = $"{pipelineOutputDirectory}/{YooAssetSettings.OutputFolderName}.manifest";
+					string destPath = $"{packageOutputDirectory}/{YooAssetSettings.OutputFolderName}.manifest";
+					EditorTools.CopyFile(sourcePath, destPath, true);
+				}
 			}
 
 			// 拷贝所有补丁文件
 			int progressValue = 0;
-			PatchManifest patchManifest = AssetBundleBuilderHelper.LoadPatchManifestFile(buildParameters.PipelineOutputDirectory, buildParameters.Parameters.BuildVersion);
+			PatchManifest patchManifest = AssetBundleBuilderHelper.LoadPatchManifestFile(pipelineOutputDirectory, buildParameters.BuildPackage, buildParametersContext.OutputPackageCRC);
 			int patchFileTotalCount = patchManifest.BundleList.Count;
 			foreach (var patchBundle in patchManifest.BundleList)
 			{
-				string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{patchBundle.BundleName}";
-				string destPath = $"{packageDirectory}/{patchBundle.Hash}";
+				string sourcePath = $"{pipelineOutputDirectory}/{patchBundle.BundleName}";
+				string destPath = $"{packageOutputDirectory}/{patchBundle.FileName}";
 				EditorTools.CopyFile(sourcePath, destPath, true);
 				EditorTools.DisplayProgressBar("拷贝补丁文件", ++progressValue, patchFileTotalCount);
 			}

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

@@ -10,7 +10,7 @@ namespace YooAsset.Editor
 	{
 		void IBuildTask.Run(BuildContext context)
 		{
-			var buildParameters = context.GetContextObject<AssetBundleBuilder.BuildParametersContext>();
+			var buildParameters = context.GetContextObject<BuildParametersContext>();
 			var buildMapContext = context.GetContextObject<BuildMapContext>();
 			buildParameters.StopWatch();
 
@@ -19,46 +19,48 @@ namespace YooAsset.Editor
 			{
 				CreateReportFile(buildParameters, buildMapContext);
 			}
-			else
-			{
-				float buildSeconds = buildParameters.GetBuildingSeconds();
-				BuildRunner.Info($"Build time consuming {buildSeconds} seconds.");
-			}
+
+			float buildSeconds = buildParameters.GetBuildingSeconds();
+			BuildRunner.Info($"Build time consuming {buildSeconds} seconds.");
 		}
 
-		private void CreateReportFile(AssetBundleBuilder.BuildParametersContext buildParameters, BuildMapContext buildMapContext)
+		private void CreateReportFile(BuildParametersContext buildParametersContext, BuildMapContext buildMapContext)
 		{
-			PatchManifest patchManifest = AssetBundleBuilderHelper.LoadPatchManifestFile(buildParameters.PipelineOutputDirectory, buildParameters.Parameters.BuildVersion);
-			BuildReport buildReport = new BuildReport();		
+			var buildParameters = buildParametersContext.Parameters;
+
+			string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
+			PatchManifest patchManifest = AssetBundleBuilderHelper.LoadPatchManifestFile(pipelineOutputDirectory, buildParameters.BuildPackage, buildParametersContext.OutputPackageCRC);
+			BuildReport buildReport = new BuildReport();
 
 			// 概述信息
 			{
+#if UNITY_2019_4_OR_NEWER
+				UnityEditor.PackageManager.PackageInfo packageInfo = UnityEditor.PackageManager.PackageInfo.FindForAssembly(typeof(BuildReport).Assembly);
+				if (packageInfo != null)
+					buildReport.Summary.YooVersion = packageInfo.version;
+#endif
 				buildReport.Summary.UnityVersion = UnityEngine.Application.unityVersion;
-				buildReport.Summary.BuildTime = DateTime.Now.ToString();
-				buildReport.Summary.BuildSeconds = (int)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.AppendFileExtension = buildParameters.Parameters.AppendFileExtension;
-				buildReport.Summary.CopyBuildinTagFiles = buildParameters.Parameters.CopyBuildinTagFiles;
-				buildReport.Summary.AutoCollectShaders = AssetBundleCollectorSettingData.Setting.AutoCollectShaders;
-				buildReport.Summary.ShadersBundleName = AssetBundleCollectorSettingData.Setting.ShadersBundleName;
-				buildReport.Summary.EncryptionServicesClassName = buildParameters.Parameters.EncryptionServices == null ?
-					"null" : buildParameters.Parameters.EncryptionServices.GetType().FullName;
+				buildReport.Summary.BuildDate = DateTime.Now.ToString();
+				buildReport.Summary.BuildSeconds = (int)buildParametersContext.GetBuildingSeconds();
+				buildReport.Summary.BuildTarget = buildParameters.BuildTarget;
+				buildReport.Summary.BuildPipeline = buildParameters.BuildPipeline;
+				buildReport.Summary.BuildMode = buildParameters.BuildMode;
+				buildReport.Summary.BuildPackage = buildParameters.BuildPackage;
+				buildReport.Summary.EnableAddressable = buildParameters.EnableAddressable;
+				buildReport.Summary.EncryptionServicesClassName = buildParameters.EncryptionServices == null ?
+					"null" : buildParameters.EncryptionServices.GetType().FullName;
 
 				// 构建参数
-				buildReport.Summary.CompressOption = buildParameters.Parameters.CompressOption;
-				buildReport.Summary.DisableWriteTypeTree = buildParameters.Parameters.DisableWriteTypeTree;
-				buildReport.Summary.IgnoreTypeTreeChanges = buildParameters.Parameters.IgnoreTypeTreeChanges;
+				buildReport.Summary.OutputNameStyle = buildParameters.OutputNameStyle;
+				buildReport.Summary.CompressOption = buildParameters.CompressOption;
+				buildReport.Summary.DisableWriteTypeTree = buildParameters.DisableWriteTypeTree;
+				buildReport.Summary.IgnoreTypeTreeChanges = buildParameters.IgnoreTypeTreeChanges;
 
 				// 构建结果
 				buildReport.Summary.AssetFileTotalCount = buildMapContext.AssetFileCount;
+				buildReport.Summary.MainAssetTotalCount = GetMainAssetCount(patchManifest);
 				buildReport.Summary.AllBundleTotalCount = GetAllBundleCount(patchManifest);
 				buildReport.Summary.AllBundleTotalSize = GetAllBundleSize(patchManifest);
-				buildReport.Summary.BuildinBundleTotalCount = GetBuildinBundleCount(patchManifest);
-				buildReport.Summary.BuildinBundleTotalSize = GetBuildinBundleSize(patchManifest);
 				buildReport.Summary.EncryptedBundleTotalCount = GetEncryptedBundleCount(patchManifest);
 				buildReport.Summary.EncryptedBundleTotalSize = GetEncryptedBundleSize(patchManifest);
 				buildReport.Summary.RawBundleTotalCount = GetRawBundleCount(patchManifest);
@@ -76,7 +78,7 @@ namespace YooAsset.Editor
 				reportAssetInfo.AssetTags = patchAsset.AssetTags;
 				reportAssetInfo.AssetGUID = AssetDatabase.AssetPathToGUID(patchAsset.AssetPath);
 				reportAssetInfo.MainBundleName = mainBundle.BundleName;
-				reportAssetInfo.MainBundleSize = mainBundle.SizeBytes;
+				reportAssetInfo.MainBundleSize = mainBundle.FileSize;
 				reportAssetInfo.DependBundles = GetDependBundles(patchManifest, patchAsset);
 				reportAssetInfo.DependAssets = GetDependAssets(buildMapContext, mainBundle.BundleName, patchAsset.AssetPath);
 				buildReport.AssetInfos.Add(reportAssetInfo);
@@ -88,16 +90,18 @@ namespace YooAsset.Editor
 			{
 				ReportBundleInfo reportBundleInfo = new ReportBundleInfo();
 				reportBundleInfo.BundleName = patchBundle.BundleName;
-				reportBundleInfo.Hash = patchBundle.Hash;
-				reportBundleInfo.CRC = patchBundle.CRC;
-				reportBundleInfo.SizeBytes = patchBundle.SizeBytes;
+				reportBundleInfo.FileName = patchBundle.FileName;
+				reportBundleInfo.FileHash = patchBundle.FileHash;
+				reportBundleInfo.FileCRC = patchBundle.FileCRC;
+				reportBundleInfo.FileSize = patchBundle.FileSize;
 				reportBundleInfo.Tags = patchBundle.Tags;
 				reportBundleInfo.Flags = patchBundle.Flags;
 				buildReport.BundleInfos.Add(reportBundleInfo);
 			}
 
 			// 删除旧文件
-			string filePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.GetReportFileName(buildParameters.Parameters.BuildVersion)}";
+			string fileName = YooAssetSettingsData.GetReportFileName(buildParameters.BuildPackage, buildParametersContext.OutputPackageCRC);
+			string filePath = $"{pipelineOutputDirectory}/{fileName}";
 			if (File.Exists(filePath))
 				File.Delete(filePath);
 
@@ -153,6 +157,10 @@ namespace YooAsset.Editor
 			return result;
 		}
 
+		private int GetMainAssetCount(PatchManifest patchManifest)
+		{
+			return patchManifest.AssetList.Count;
+		}
 		private int GetAllBundleCount(PatchManifest patchManifest)
 		{
 			return patchManifest.BundleList.Count;
@@ -162,27 +170,7 @@ namespace YooAsset.Editor
 			long fileBytes = 0;
 			foreach (var patchBundle in patchManifest.BundleList)
 			{
-				fileBytes += patchBundle.SizeBytes;
-			}
-			return fileBytes;
-		}
-		private int GetBuildinBundleCount(PatchManifest patchManifest)
-		{
-			int fileCount = 0;
-			foreach (var patchBundle in patchManifest.BundleList)
-			{
-				if (patchBundle.IsBuildin)
-					fileCount++;
-			}
-			return fileCount;
-		}
-		private long GetBuildinBundleSize(PatchManifest patchManifest)
-		{
-			long fileBytes = 0;
-			foreach (var patchBundle in patchManifest.BundleList)
-			{
-				if (patchBundle.IsBuildin)
-					fileBytes += patchBundle.SizeBytes;
+				fileBytes += patchBundle.FileSize;
 			}
 			return fileBytes;
 		}
@@ -202,7 +190,7 @@ namespace YooAsset.Editor
 			foreach (var patchBundle in patchManifest.BundleList)
 			{
 				if (patchBundle.IsEncrypted)
-					fileBytes += patchBundle.SizeBytes;
+					fileBytes += patchBundle.FileSize;
 			}
 			return fileBytes;
 		}
@@ -222,7 +210,7 @@ namespace YooAsset.Editor
 			foreach (var patchBundle in patchManifest.BundleList)
 			{
 				if (patchBundle.IsRawFile)
-					fileBytes += patchBundle.SizeBytes;
+					fileBytes += patchBundle.FileSize;
 			}
 			return fileBytes;
 		}

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

@@ -24,7 +24,7 @@ namespace YooAsset.Editor
 
 		void IBuildTask.Run(BuildContext context)
 		{
-			var buildParameters = context.GetContextObject<AssetBundleBuilder.BuildParametersContext>();
+			var buildParameters = context.GetContextObject<BuildParametersContext>();
 			var buildMapContext = context.GetContextObject<BuildMapContext>();
 
 			var buildMode = buildParameters.Parameters.BuildMode;
@@ -45,9 +45,9 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 加密文件
 		/// </summary>
-		private List<string> EncryptFiles(AssetBundleBuilder.BuildParametersContext buildParameters, BuildMapContext buildMapContext)
+		private List<string> EncryptFiles(BuildParametersContext buildParametersContext, BuildMapContext buildMapContext)
 		{
-			var encryptionServices = buildParameters.Parameters.EncryptionServices;
+			var encryptionServices = buildParametersContext.Parameters.EncryptionServices;
 
 			// 加密资源列表
 			List<string> encryptList = new List<string>();
@@ -57,6 +57,7 @@ namespace YooAsset.Editor
 				return encryptList;
 
 			int progressValue = 0;
+			string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
 			foreach (var bundleInfo in buildMapContext.BundleInfos)
 			{
 				if (encryptionServices.Check(bundleInfo.BundleName))
@@ -70,7 +71,7 @@ namespace YooAsset.Editor
 					encryptList.Add(bundleInfo.BundleName);
 
 					// 注意：通过判断文件合法性，规避重复加密一个文件
-					string filePath = $"{buildParameters.PipelineOutputDirectory}/{bundleInfo.BundleName}";
+					string filePath = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}";
 					byte[] fileData = File.ReadAllBytes(filePath);
 					if (EditorTools.CheckBundleFileValid(fileData))
 					{

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

@@ -12,8 +12,8 @@ namespace YooAsset.Editor
 	{
 		void IBuildTask.Run(BuildContext context)
 		{
-			var buildParametersContext = context.GetContextObject<AssetBundleBuilder.BuildParametersContext>();
-			var buildMapContext = BuildMapCreater.CreateBuildMap(buildParametersContext.Parameters.BuildMode);
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			var buildMapContext = BuildMapCreater.CreateBuildMap(buildParametersContext.Parameters.BuildMode, buildParametersContext.Parameters.BuildPackage);
 			context.SetContextObject(buildMapContext);
 			BuildRunner.Log("构建内容准备完毕！");
 

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

@@ -11,50 +11,43 @@ namespace YooAsset.Editor
 	{
 		void IBuildTask.Run(BuildContext context)
 		{
-			var buildParameters = context.GetContextObject<AssetBundleBuilder.BuildParametersContext>();
-			buildParameters.BeginWatch();
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			buildParametersContext.BeginWatch();
 
-			// 检测构建平台是否合法
-			if (buildParameters.Parameters.BuildTarget == BuildTarget.NoTarget)
+			var buildParameters = buildParametersContext.Parameters;
+
+			// 检测构建参数合法性
+			if (buildParameters.BuildTarget == BuildTarget.NoTarget)
 				throw new Exception("请选择目标平台");
+			if (string.IsNullOrEmpty(buildParameters.BuildPackage))
+				throw new Exception("包裹名称不能为空");
 
-			// 检测构建版本是否合法
-			if (buildParameters.Parameters.BuildVersion <= 0)
-				throw new Exception("请先设置版本号");
-
-			// 检测输出目录是否为空
-			if (string.IsNullOrEmpty(buildParameters.PipelineOutputDirectory))
-				throw new Exception("输出目录不能为空");
-
-			// 增量更新时候的必要检测
-			var buildMode = buildParameters.Parameters.BuildMode;
-			if (buildMode == EBuildMode.IncrementalBuild)
+			if (buildParameters.BuildMode != EBuildMode.SimulateBuild)
 			{
-				// 检测历史版本是否存在
-				if (AssetBundleBuilderHelper.HasAnyPackageVersion(buildParameters.Parameters.BuildTarget, buildParameters.Parameters.OutputRoot) == false)
-					throw new Exception("没有发现任何历史版本，请尝试强制重建");
+				// 检测当前是否正在构建资源包
+				if (BuildPipeline.isBuildingPlayer)
+					throw new Exception("当前正在构建资源包，请结束后再试");
 
-				// 检测构建版本是否合法
-				int maxPackageVersion = AssetBundleBuilderHelper.GetMaxPackageVersion(buildParameters.Parameters.BuildTarget, buildParameters.Parameters.OutputRoot);
-				if (buildParameters.Parameters.BuildVersion <= maxPackageVersion)
-					throw new Exception("构建版本不能小于历史版本");
+				// 检测是否有未保存场景
+				if (EditorTools.HasDirtyScenes())
+					throw new Exception("检测到未保存的场景文件");
 
-				// 检测补丁包是否已经存在
-				string packageDirectory = buildParameters.GetPackageDirectory();
-				if (Directory.Exists(packageDirectory))
-					throw new Exception($"补丁包已经存在：{packageDirectory}");
+				// 检测首包资源标签
+				if (buildParameters.CopyBuildinFileOption == ECopyBuildinFileOption.ClearAndCopyByTags
+					|| buildParameters.CopyBuildinFileOption == ECopyBuildinFileOption.OnlyCopyByTags)
+				{
+					if (string.IsNullOrEmpty(buildParameters.CopyBuildinFileTags))
+						throw new Exception("首包资源标签不能为空！");
+				}
 
-				// 检测内置资源分类标签是否一致
-				var oldPatchManifest = AssetBundleBuilderHelper.GetOldPatchManifest(buildParameters.PipelineOutputDirectory);
-				if (buildParameters.Parameters.BuildinTags != oldPatchManifest.BuildinTags)
-					throw new Exception($"增量更新时内置资源标签必须一致：{buildParameters.Parameters.BuildinTags} != {oldPatchManifest.BuildinTags}");
+				// 保存改动的资源
+				AssetDatabase.SaveAssets();
 			}
 
-			// 如果是强制重建
-			if (buildMode == EBuildMode.ForceRebuild)
+			if (buildParameters.BuildMode == EBuildMode.ForceRebuild)
 			{
 				// 删除平台总目录
-				string platformDirectory = $"{buildParameters.Parameters.OutputRoot}/{buildParameters.Parameters.BuildTarget}";
+				string platformDirectory = $"{buildParameters.OutputRoot}/{buildParameters.BuildPackage}/{buildParameters.BuildTarget}";
 				if (EditorTools.DeleteDirectory(platformDirectory))
 				{
 					BuildRunner.Log($"删除平台总目录：{platformDirectory}");
@@ -62,9 +55,10 @@ namespace YooAsset.Editor
 			}
 
 			// 如果输出目录不存在
-			if (EditorTools.CreateDirectory(buildParameters.PipelineOutputDirectory))
+			string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
+			if (EditorTools.CreateDirectory(pipelineOutputDirectory))
 			{
-				BuildRunner.Log($"创建输出目录：{buildParameters.PipelineOutputDirectory}");
+				BuildRunner.Log($"创建输出目录：{pipelineOutputDirectory}");
 			}
 		}
 	}

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

@@ -13,8 +13,8 @@ namespace YooAsset.Editor
 	{
 		void IBuildTask.Run(BuildContext context)
 		{
-			var buildParametersContext = context.GetContextObject<AssetBundleBuilder.BuildParametersContext>();
-			
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+
 			// 模拟构建模式下跳过验证
 			if (buildParametersContext.Parameters.BuildMode == EBuildMode.SimulateBuild)
 				return;
@@ -22,8 +22,8 @@ namespace YooAsset.Editor
 			// 验证构建结果
 			if (buildParametersContext.Parameters.VerifyBuildingResult)
 			{
-				var unityManifestContext = context.GetContextObject<TaskBuilding.UnityManifestContext>();
-				VerifyingBuildingResult(context, unityManifestContext.UnityManifest);
+				var buildResultContext = context.GetContextObject<TaskBuilding.BuildResultContext>();
+				VerifyingBuildingResult(context, buildResultContext.UnityManifest);
 			}
 		}
 
@@ -32,112 +32,73 @@ namespace YooAsset.Editor
 		/// </summary>
 		private void VerifyingBuildingResult(BuildContext context, AssetBundleManifest unityManifest)
 		{
-			var buildParameters = context.GetContextObject<AssetBundleBuilder.BuildParametersContext>();
+			var buildParametersContext = context.GetContextObject<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);
-			}
+			string[] mapBundles = buildMapContext.BundleInfos.Where(t => t.IsRawFile == false).Select(t => t.BundleName).ToArray();
 
-			// 2. 验证数量		
-			if (buildedBundles.Length != expectBundles.Count)
+			// 2. 验证Bundle
+			List<string> exceptBundleList1 = buildedBundles.Except(mapBundles).ToList();
+			if (exceptBundleList1.Count > 0)
 			{
-				Debug.LogWarning($"构建过程中可能存在无效的资源，导致和预期构建的Bundle数量不一致！");
-			}
-
-			// 3. 正向验证Bundle
-			foreach (var bundleName in buildedBundles)
-			{
-				if (buildMapContext.IsContainsBundle(bundleName) == false)
+				foreach (var exceptBundle in exceptBundleList1)
 				{
-					throw new Exception($"Should never get here !");
+					Debug.LogWarning($"差异资源包: {exceptBundle}");
 				}
+				throw new System.Exception("存在差异资源包！请查看警告信息！");
 			}
 
-			// 4. 反向验证Bundle
+			// 3. 验证Bundle
+			List<string> exceptBundleList2 = mapBundles.Except(buildedBundles).ToList();
+			if (exceptBundleList2.Count > 0)
+			{
+				foreach (var exceptBundle in exceptBundleList2)
+				{
+					Debug.LogWarning($"差异资源包: {exceptBundle}");
+				}
+				throw new System.Exception("存在差异资源包！请查看警告信息！");
+			}
+
+			// 4. 验证Asset
 			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;
+			var buildMode = buildParametersContext.Parameters.BuildMode;
 			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
 			{
 				int progressValue = 0;
+				string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
 				foreach (var buildedBundle in buildedBundles)
 				{
-					string filePath = $"{buildParameters.PipelineOutputDirectory}/{buildedBundle}";
-					string[] allBuildinAssetPaths = GetAssetBundleAllAssets(filePath);
-					string[] expectBuildinAssetPaths = buildMapContext.GetBuildinAssetPaths(buildedBundle);
-					if (expectBuildinAssetPaths.Length != allBuildinAssetPaths.Length)
+					string filePath = $"{pipelineOutputDirectory}/{buildedBundle}";
+					string[] buildedAssetPaths = GetAssetBundleAllAssets(filePath);
+					string[] mapAssetPaths = buildMapContext.GetBuildinAssetPaths(buildedBundle);
+					if (mapAssetPaths.Length != buildedAssetPaths.Length)
 					{
 						Debug.LogWarning($"构建的Bundle文件内的资源对象数量和预期不匹配 : {buildedBundle}");
+						var exceptAssetList1 = mapAssetPaths.Except(buildedAssetPaths).ToList();
+						foreach (var excpetAsset in exceptAssetList1)
+						{
+							Debug.LogWarning($"构建失败的资源对象路径为 : {excpetAsset}");
+						}
+						var exceptAssetList2 = buildedAssetPaths.Except(mapAssetPaths).ToList();
+						foreach (var excpetAsset in exceptAssetList2)
+						{
+							Debug.LogWarning($"构建失败的资源对象路径为 : {excpetAsset}");
+						}
 						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("构建结果验证成功！");
 		}
 

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

@@ -0,0 +1,68 @@
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+using UnityEditor.Build.Pipeline.Interfaces;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("验证构建结果")]
+	public class TaskVerifyBuildResult_SBP : IBuildTask
+	{
+		void IBuildTask.Run(BuildContext context)
+		{
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+
+			// 模拟构建模式下跳过验证
+			if (buildParametersContext.Parameters.BuildMode == EBuildMode.SimulateBuild)
+				return;
+
+			// 验证构建结果
+			if (buildParametersContext.Parameters.VerifyBuildingResult)
+			{
+				var buildResultContext = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
+				VerifyingBuildingResult(context, buildResultContext.Results);
+			}
+		}
+
+		/// <summary>
+		/// 验证构建结果
+		/// </summary>
+		private void VerifyingBuildingResult(BuildContext context, IBundleBuildResults buildResults)
+		{
+			var buildParameters = context.GetContextObject<BuildParametersContext>();
+			var buildMapContext = context.GetContextObject<BuildMapContext>();
+			List<string> buildedBundles = buildResults.BundleInfos.Keys.ToList();
+
+			// 1. 过滤掉原生Bundle
+			List<string> expectBundles = buildMapContext.BundleInfos.Where(t => t.IsRawFile == false).Select(t => t.BundleName).ToList();
+
+			// 2. 验证Bundle
+			List<string> exceptBundleList1 = buildedBundles.Except(expectBundles).ToList();
+			if (exceptBundleList1.Count > 0)
+			{
+				foreach (var exceptBundle in exceptBundleList1)
+				{
+					Debug.LogWarning($"差异资源包: {exceptBundle}");
+				}
+				throw new System.Exception("存在差异资源包！请查看警告信息！");
+			}
+
+			// 3. 验证Bundle
+			List<string> exceptBundleList2 = expectBundles.Except(buildedBundles).ToList();
+			if (exceptBundleList2.Count > 0)
+			{
+				foreach (var exceptBundle in exceptBundleList2)
+				{
+					Debug.LogWarning($"差异资源包: {exceptBundle}");
+				}
+				throw new System.Exception("存在差异资源包！请查看警告信息！");
+			}
+
+			BuildRunner.Log("构建结果验证成功！");
+		}
+	}
+}

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

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

Assets/YooAsset/Editor/AssetBundleBuilder/EBuildPipeline.cs

@@ -0,0 +1,19 @@
+
+namespace YooAsset.Editor
+{
+	/// <summary>
+	/// 构建管线类型
+	/// </summary>
+	public enum EBuildPipeline
+	{
+		/// <summary>
+		/// 传统内置构建管线
+		/// </summary>
+		BuiltinBuildPipeline,
+		
+		/// <summary>
+		/// 可编程构建管线
+		/// </summary>
+		ScriptableBuildPipeline,
+	}
+}

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

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

Assets/YooAsset/Editor/AssetBundleBuilder/ECopyBuildinFileOption.cs

@@ -0,0 +1,34 @@
+
+namespace YooAsset.Editor
+{
+	/// <summary>
+	/// 首包资源文件的拷贝方式
+	/// </summary>
+	public enum ECopyBuildinFileOption
+	{
+		/// <summary>
+		/// 不拷贝任何文件
+		/// </summary>
+		None = 0,
+
+		/// <summary>
+		/// 先清空已有文件，然后拷贝所有文件
+		/// </summary>
+		ClearAndCopyAll,
+
+		/// <summary>
+		/// 先清空已有文件，然后按照资源标签拷贝文件
+		/// </summary>
+		ClearAndCopyByTags,
+
+		/// <summary>
+		/// 不清空已有文件，直接拷贝所有文件
+		/// </summary>
+		OnlyCopyAll,
+
+		/// <summary>
+		/// 不清空已有文件，直接按照资源标签拷贝文件
+		/// </summary>
+		OnlyCopyByTags,
+	}
+}

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

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

Assets/YooAsset/Editor/AssetBundleBuilder/EOutputNameStyle.cs

@@ -0,0 +1,29 @@
+
+namespace YooAsset.Editor
+{
+	/// <summary>
+	/// 输出文件名称的样式
+	/// </summary>
+	public enum EOutputNameStyle
+	{
+		/// <summary>
+		/// 000000000000000f000000000000000
+		/// </summary>
+		HashName = 1,
+
+		/// <summary>
+		/// 000000000000000f000000000000000.bundle
+		/// </summary>
+		HashName_Extension = 2,
+
+		/// <summary>
+		/// bundle_name_000000000000000f000000000000000
+		/// </summary>
+		BundleName_HashName = 3,
+
+		/// <summary>
+		/// bundle_name_000000000000000f000000000000000.bundle
+		/// </summary>
+		BundleName_HashName_Extension = 4,
+	}
+}

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

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

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollector.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using UnityEditor;
+using UnityEngine;
 
 namespace YooAsset.Editor
 {
@@ -14,6 +15,11 @@ namespace YooAsset.Editor
 		/// </summary>
 		public string CollectPath = string.Empty;
 
+		/// <summary>
+		/// 收集器的GUID
+		/// </summary>
+		public string CollectorGUID = string.Empty;
+
 		/// <summary>
 		/// 收集器类型
 		/// </summary>
@@ -68,7 +74,8 @@ namespace YooAsset.Editor
 		/// </summary>
 		public void CheckConfigError()
 		{
-			if (AssetDatabase.LoadAssetAtPath<UnityEngine.Object>(CollectPath) == null)
+			string assetGUID = AssetDatabase.AssetPathToGUID(CollectPath);
+			if (string.IsNullOrEmpty(assetGUID))
 				throw new Exception($"Invalid collect path : {CollectPath}");
 
 			if (CollectorType == ECollectorType.None)
@@ -84,10 +91,48 @@ namespace YooAsset.Editor
 				throw new Exception($"Invalid {nameof(IAddressRule)} class type : {AddressRuleName} in collector : {CollectPath}");
 		}
 
+		/// <summary>
+		/// 修复配置错误
+		/// </summary>
+		public bool FixConfigError()
+		{
+			bool isFixed = false;
+
+			if (string.IsNullOrEmpty(CollectorGUID) == false)
+			{
+				string convertAssetPath = AssetDatabase.GUIDToAssetPath(CollectorGUID);
+				if (string.IsNullOrEmpty(convertAssetPath))
+				{
+					Debug.LogWarning($"Collector GUID {CollectorGUID} is invalid and has been auto removed !");
+					CollectorGUID = string.Empty;
+					isFixed = true;
+				}
+				else
+				{
+					if (CollectPath != convertAssetPath)
+					{
+						CollectPath = convertAssetPath;
+						isFixed = true;
+						Debug.LogWarning($"Fix collect path : {CollectPath} -> {convertAssetPath}");
+					}
+				}
+			}
+
+			/*
+			string convertGUID = AssetDatabase.AssetPathToGUID(CollectPath);
+			if(string.IsNullOrEmpty(convertGUID) == false)
+			{
+				CollectorGUID = convertGUID;
+			}
+			*/
+
+			return isFixed;
+		}
+
 		/// <summary>
 		/// 获取打包收集的资源文件
 		/// </summary>
-		public List<CollectAssetInfo> GetAllCollectAssets(EBuildMode buildMode, AssetBundleCollectorGroup group)
+		public List<CollectAssetInfo> GetAllCollectAssets(EBuildMode buildMode, bool enableAddressable, AssetBundleCollectorGroup group)
 		{
 			// 注意：模拟构建模式下只收集主资源
 			if (buildMode == EBuildMode.SimulateBuild)
@@ -142,7 +187,7 @@ namespace YooAsset.Editor
 			}
 
 			// 检测可寻址地址是否重复
-			if (AssetBundleCollectorSettingData.Setting.EnableAddressable)
+			if (enableAddressable)
 			{
 				HashSet<string> adressTemper = new HashSet<string>();
 				foreach (var collectInfoPair in result)
@@ -180,31 +225,49 @@ namespace YooAsset.Editor
 		private bool IsValidateAsset(string assetPath)
 		{
 			if (assetPath.StartsWith("Assets/") == false && assetPath.StartsWith("Packages/") == false)
+			{
+				UnityEngine.Debug.LogError($"Invalid asset path : {assetPath}");
 				return false;
+			}
 
+			// 忽略文件夹
 			if (AssetDatabase.IsValidFolder(assetPath))
 				return false;
 
-			// 注意：忽略编辑器下的类型资源
+			// 忽略编辑器下的类型资源
 			Type type = AssetDatabase.GetMainAssetTypeAtPath(assetPath);
 			if (type == typeof(LightingDataAsset))
 				return false;
 
-			string ext = System.IO.Path.GetExtension(assetPath);
-			if (ext == "" || ext == ".dll" || ext == ".cs" || ext == ".js" || ext == ".boo" || ext == ".meta" || ext == ".cginc")
+			// 忽略Unity无法识别的无效文件
+			/*
+			if (type == typeof(UnityEditor.DefaultAsset))
+			{
+				UnityEngine.Debug.LogWarning($"Cannot pack default asset : {assetPath}");
+				return false;
+			}
+			*/
+
+			string fileExtension = System.IO.Path.GetExtension(assetPath);
+			if (IsIgnoreFile(fileExtension))
 				return false;
 
 			return true;
 		}
-		private bool IsCollectAsset(string assetPath)
+		private bool IsIgnoreFile(string fileExtension)
 		{
-			// 如果收集全路径着色器
-			if (AssetBundleCollectorSettingData.Setting.AutoCollectShaders)
+			foreach (var extension in YooAssetSettings.IgnoreFileExtensions)
 			{
-				Type assetType = AssetDatabase.GetMainAssetTypeAtPath(assetPath);
-				if (assetType == typeof(UnityEngine.Shader))
+				if (extension == fileExtension)
 					return true;
 			}
+			return false;
+		}
+		private bool IsCollectAsset(string assetPath)
+		{
+			Type assetType = AssetDatabase.GetMainAssetTypeAtPath(assetPath);
+			if (assetType == typeof(UnityEngine.Shader) || assetType == typeof(UnityEngine.ShaderVariantCollection))
+				return true;
 
 			// 根据规则设置过滤资源文件
 			IFilterRule filterRuleInstance = AssetBundleCollectorSettingData.GetFilterRuleInstance(FilterRuleName);
@@ -221,23 +284,14 @@ namespace YooAsset.Editor
 		}
 		private string GetBundleName(AssetBundleCollectorGroup group, string assetPath)
 		{
-			// 如果自动收集所有的着色器
-			if (AssetBundleCollectorSettingData.Setting.AutoCollectShaders)
-			{
-				System.Type assetType = AssetDatabase.GetMainAssetTypeAtPath(assetPath);
-				if (assetType == typeof(UnityEngine.Shader))
-				{
-					string bundleName = AssetBundleCollectorSettingData.Setting.ShadersBundleName;
-					return EditorTools.GetRegularPath(bundleName).ToLower();
-				}
-			}
+			System.Type assetType = AssetDatabase.GetMainAssetTypeAtPath(assetPath);
+			if (assetType == typeof(UnityEngine.Shader) || assetType == typeof(UnityEngine.ShaderVariantCollection))
+				return EditorTools.GetRegularPath(YooAssetSettings.UnityShadersBundleName).ToLower();
 
 			// 根据规则设置获取资源包名称
-			{
-				IPackRule packRuleInstance = AssetBundleCollectorSettingData.GetPackRuleInstance(PackRuleName);
-				string bundleName = packRuleInstance.GetBundleName(new PackRuleData(assetPath, CollectPath, group.GroupName));
-				return EditorTools.GetRegularPath(bundleName).ToLower();
-			}
+			IPackRule packRuleInstance = AssetBundleCollectorSettingData.GetPackRuleInstance(PackRuleName);
+			string bundleName = packRuleInstance.GetBundleName(new PackRuleData(assetPath, CollectPath, group.GroupName));
+			return EditorTools.GetRegularPath(bundleName).ToLower();
 		}
 		private List<string> GetAssetTags(AssetBundleCollectorGroup group)
 		{

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorConfig.cs

@@ -10,24 +10,30 @@ namespace YooAsset.Editor
 {
 	public class AssetBundleCollectorConfig
 	{
-		public const string ConfigVersion = "1.0";
+		public const string ConfigVersion = "2.0";
 
 		public const string XmlVersion = "Version";
 		public const string XmlCommon = "Common";
 		public const string XmlEnableAddressable = "AutoAddressable";
-		public const string XmlAutoCollectShader = "AutoCollectShader";
-		public const string XmlShaderBundleName = "ShaderBundleName";
+		public const string XmlShowPackageView = "ShowPackageView";
+
+		public const string XmlPackage = "Package";
+		public const string XmlPackageName = "PackageName";
+		public const string XmlPackageDesc = "PackageDesc";
+
 		public const string XmlGroup = "Group";
 		public const string XmlGroupName = "GroupName";
 		public const string XmlGroupDesc = "GroupDesc";
+
 		public const string XmlCollector = "Collector";
 		public const string XmlCollectPath = "CollectPath";
+		public const string XmlCollectorGUID = "CollectGUID";
 		public const string XmlCollectorType = "CollectType";
 		public const string XmlAddressRule = "AddressRule";
 		public const string XmlPackRule = "PackRule";
 		public const string XmlFilterRule = "FilterRule";
 		public const string XmlAssetTags = "AssetTags";
-		
+
 		/// <summary>
 		/// 导入XML配置表
 		/// </summary>
@@ -40,91 +46,108 @@ namespace YooAsset.Editor
 				throw new Exception($"Only support xml : {filePath}");
 
 			// 加载配置文件
-			XmlDocument xml = new XmlDocument();
-			xml.Load(filePath);
-			XmlElement root = xml.DocumentElement;
+			XmlDocument xmlDoc = new XmlDocument();
+			xmlDoc.Load(filePath);
+			XmlElement root = xmlDoc.DocumentElement;
 
 			// 读取配置版本
 			string configVersion = root.GetAttribute(XmlVersion);
-			if(configVersion != ConfigVersion)
+			if (configVersion != ConfigVersion)
 			{
-				throw new Exception($"The config version is invalid : {configVersion}");
+				if (UpdateXmlConfig(xmlDoc) == false)
+					throw new Exception($"The config version update failed : {configVersion} -> {ConfigVersion}");
+				else
+					Debug.Log($"The config version update succeed : {configVersion} -> {ConfigVersion}");
 			}
 
 			// 读取公共配置
 			bool enableAddressable = false;
-			bool autoCollectShaders = false;
-			string shaderBundleName = string.Empty;
+			bool showPackageView = false;
 			var commonNodeList = root.GetElementsByTagName(XmlCommon);
 			if (commonNodeList.Count > 0)
 			{
 				XmlElement commonElement = commonNodeList[0] as XmlElement;
 				if (commonElement.HasAttribute(XmlEnableAddressable) == false)
 					throw new Exception($"Not found attribute {XmlEnableAddressable} in {XmlCommon}");
-				if (commonElement.HasAttribute(XmlAutoCollectShader) == false)
-					throw new Exception($"Not found attribute {XmlAutoCollectShader} in {XmlCommon}");
-				if (commonElement.HasAttribute(XmlShaderBundleName) == false)
-					throw new Exception($"Not found attribute {XmlShaderBundleName} in {XmlCommon}");
+				if (commonElement.HasAttribute(XmlShowPackageView) == false)
+					throw new Exception($"Not found attribute {XmlShowPackageView} in {XmlCommon}");
 
 				enableAddressable = commonElement.GetAttribute(XmlEnableAddressable) == "True" ? true : false;
-				autoCollectShaders = commonElement.GetAttribute(XmlAutoCollectShader) == "True" ? true : false;
-				shaderBundleName = commonElement.GetAttribute(XmlShaderBundleName);
+				showPackageView = commonElement.GetAttribute(XmlShowPackageView) == "True" ? true : false;
 			}
 
-			// 读取分组配置
-			List<AssetBundleCollectorGroup> groupTemper = new List<AssetBundleCollectorGroup>();
-			var groupNodeList = root.GetElementsByTagName(XmlGroup);
-			foreach (var groupNode in groupNodeList)
+			// 读取包裹配置
+			List<AssetBundleCollectorPackage> packages = new List<AssetBundleCollectorPackage>();
+			var packageNodeList = root.GetElementsByTagName(XmlPackage);
+			foreach (var packageNode in packageNodeList)
 			{
-				XmlElement groupElement = groupNode as XmlElement;
-				if (groupElement.HasAttribute(XmlGroupName) == false)
-					throw new Exception($"Not found attribute {XmlGroupName} in {XmlGroup}");
-				if (groupElement.HasAttribute(XmlGroupDesc) == false)
-					throw new Exception($"Not found attribute {XmlGroupDesc} in {XmlGroup}");
-				if (groupElement.HasAttribute(XmlAssetTags) == false)
-					throw new Exception($"Not found attribute {XmlAssetTags} in {XmlGroup}");
+				XmlElement packageElement = packageNode as XmlElement;
+				if (packageElement.HasAttribute(XmlPackageName) == false)
+					throw new Exception($"Not found attribute {XmlPackageName} in {XmlPackage}");
+				if (packageElement.HasAttribute(XmlPackageDesc) == false)
+					throw new Exception($"Not found attribute {XmlPackageDesc} in {XmlPackage}");
 
-				AssetBundleCollectorGroup group = new AssetBundleCollectorGroup();
-				group.GroupName = groupElement.GetAttribute(XmlGroupName);
-				group.GroupDesc = groupElement.GetAttribute(XmlGroupDesc);
-				group.AssetTags = groupElement.GetAttribute(XmlAssetTags);
-				groupTemper.Add(group);
+				AssetBundleCollectorPackage package = new AssetBundleCollectorPackage();
+				package.PackageName = packageElement.GetAttribute(XmlPackageName);
+				package.PackageDesc = packageElement.GetAttribute(XmlPackageDesc);
+				packages.Add(package);
 
-				// 读取收集器配置
-				var collectorNodeList = groupElement.GetElementsByTagName(XmlCollector);
-				foreach (var collectorNode in collectorNodeList)
+				// 读取分组配置
+				var groupNodeList = packageElement.GetElementsByTagName(XmlGroup);
+				foreach (var groupNode in groupNodeList)
 				{
-					XmlElement collectorElement = collectorNode as XmlElement;
-					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(XmlAssetTags) == false)
-						throw new Exception($"Not found attribute {XmlAssetTags} in {XmlCollector}");
+					XmlElement groupElement = groupNode as XmlElement;
+					if (groupElement.HasAttribute(XmlGroupName) == false)
+						throw new Exception($"Not found attribute {XmlGroupName} in {XmlGroup}");
+					if (groupElement.HasAttribute(XmlGroupDesc) == false)
+						throw new Exception($"Not found attribute {XmlGroupDesc} in {XmlGroup}");
+					if (groupElement.HasAttribute(XmlAssetTags) == false)
+						throw new Exception($"Not found attribute {XmlAssetTags} in {XmlGroup}");
 
-					AssetBundleCollector collector = new AssetBundleCollector();
-					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.AssetTags = collectorElement.GetAttribute(XmlAssetTags); ;
-					group.Collectors.Add(collector);
+					AssetBundleCollectorGroup group = new AssetBundleCollectorGroup();
+					group.GroupName = groupElement.GetAttribute(XmlGroupName);
+					group.GroupDesc = groupElement.GetAttribute(XmlGroupDesc);
+					group.AssetTags = groupElement.GetAttribute(XmlAssetTags);
+					package.Groups.Add(group);
+
+					// 读取收集器配置
+					var collectorNodeList = groupElement.GetElementsByTagName(XmlCollector);
+					foreach (var collectorNode in collectorNodeList)
+					{
+						XmlElement collectorElement = collectorNode as XmlElement;
+						if (collectorElement.HasAttribute(XmlCollectPath) == false)
+							throw new Exception($"Not found attribute {XmlCollectPath} in {XmlCollector}");
+						if (collectorElement.HasAttribute(XmlCollectorGUID) == false)
+							throw new Exception($"Not found attribute {XmlCollectorGUID} 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(XmlAssetTags) == false)
+							throw new Exception($"Not found attribute {XmlAssetTags} in {XmlCollector}");
+
+						AssetBundleCollector collector = new AssetBundleCollector();
+						collector.CollectPath = collectorElement.GetAttribute(XmlCollectPath);
+						collector.CollectorGUID = collectorElement.GetAttribute(XmlCollectorGUID);
+						collector.CollectorType = StringUtility.NameToEnum<ECollectorType>(collectorElement.GetAttribute(XmlCollectorType));
+						collector.AddressRuleName = collectorElement.GetAttribute(XmlAddressRule);
+						collector.PackRuleName = collectorElement.GetAttribute(XmlPackRule);
+						collector.FilterRuleName = collectorElement.GetAttribute(XmlFilterRule);
+						collector.AssetTags = collectorElement.GetAttribute(XmlAssetTags);
+						group.Collectors.Add(collector);
+					}
 				}
 			}
 
 			// 保存配置数据
 			AssetBundleCollectorSettingData.ClearAll();
 			AssetBundleCollectorSettingData.Setting.EnableAddressable = enableAddressable;
-			AssetBundleCollectorSettingData.Setting.AutoCollectShaders = autoCollectShaders;
-			AssetBundleCollectorSettingData.Setting.ShadersBundleName = shaderBundleName;
-			AssetBundleCollectorSettingData.Setting.Groups.AddRange(groupTemper);
+			AssetBundleCollectorSettingData.Setting.ShowPackageView = showPackageView;
+			AssetBundleCollectorSettingData.Setting.Packages.AddRange(packages);
 			AssetBundleCollectorSettingData.SaveFile();
 			Debug.Log($"导入配置完毕！");
 		}
@@ -152,30 +175,39 @@ namespace YooAsset.Editor
 			// 设置公共配置
 			var commonElement = xmlDoc.CreateElement(XmlCommon);
 			commonElement.SetAttribute(XmlEnableAddressable, AssetBundleCollectorSettingData.Setting.EnableAddressable.ToString());
-			commonElement.SetAttribute(XmlAutoCollectShader, AssetBundleCollectorSettingData.Setting.AutoCollectShaders.ToString());
-			commonElement.SetAttribute(XmlShaderBundleName, AssetBundleCollectorSettingData.Setting.ShadersBundleName);
+			commonElement.SetAttribute(XmlShowPackageView, AssetBundleCollectorSettingData.Setting.ShowPackageView.ToString());
 			root.AppendChild(commonElement);
 
-			// 设置分组配置
-			foreach (var group in AssetBundleCollectorSettingData.Setting.Groups)
+			// 设置Package配置
+			foreach (var package in AssetBundleCollectorSettingData.Setting.Packages)
 			{
-				var groupElement = xmlDoc.CreateElement(XmlGroup);
-				groupElement.SetAttribute(XmlGroupName, group.GroupName);
-				groupElement.SetAttribute(XmlGroupDesc, group.GroupDesc);
-				groupElement.SetAttribute(XmlAssetTags, group.AssetTags);
-				root.AppendChild(groupElement);
+				var packageElement = xmlDoc.CreateElement(XmlPackage);
+				packageElement.SetAttribute(XmlPackageName, package.PackageName);
+				packageElement.SetAttribute(XmlPackageDesc, package.PackageDesc);
+				root.AppendChild(packageElement);
 
-				// 设置收集器配置
-				foreach (var collector in group.Collectors)
+				// 设置分组配置
+				foreach (var group in package.Groups)
 				{
-					var collectorElement = xmlDoc.CreateElement(XmlCollector);
-					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(XmlAssetTags, collector.AssetTags);
-					groupElement.AppendChild(collectorElement);
+					var groupElement = xmlDoc.CreateElement(XmlGroup);
+					groupElement.SetAttribute(XmlGroupName, group.GroupName);
+					groupElement.SetAttribute(XmlGroupDesc, group.GroupDesc);
+					groupElement.SetAttribute(XmlAssetTags, group.AssetTags);
+					packageElement.AppendChild(groupElement);
+
+					// 设置收集器配置
+					foreach (var collector in group.Collectors)
+					{
+						var collectorElement = xmlDoc.CreateElement(XmlCollector);
+						collectorElement.SetAttribute(XmlCollectPath, collector.CollectPath);
+						collectorElement.SetAttribute(XmlCollectorGUID, collector.CollectorGUID);
+						collectorElement.SetAttribute(XmlCollectorType, collector.CollectorType.ToString());
+						collectorElement.SetAttribute(XmlAddressRule, collector.AddressRuleName);
+						collectorElement.SetAttribute(XmlPackRule, collector.PackRuleName);
+						collectorElement.SetAttribute(XmlFilterRule, collector.FilterRuleName);
+						collectorElement.SetAttribute(XmlAssetTags, collector.AssetTags);
+						groupElement.AppendChild(collectorElement);
+					}
 				}
 			}
 
@@ -183,5 +215,65 @@ namespace YooAsset.Editor
 			xmlDoc.Save(savePath);
 			Debug.Log($"导出配置完毕！");
 		}
+
+		/// <summary>
+		/// 升级XML配置表
+		/// </summary>
+		private static bool UpdateXmlConfig(XmlDocument xmlDoc)
+		{
+			XmlElement root = xmlDoc.DocumentElement;
+			string configVersion = root.GetAttribute(XmlVersion);
+			if (configVersion == ConfigVersion)
+				return true;
+
+			// 1.0 -> 2.0
+			if (configVersion == "1.0")
+			{
+				// 添加公共元素属性
+				var commonNodeList = root.GetElementsByTagName(XmlCommon);
+				if (commonNodeList.Count > 0)
+				{
+					XmlElement commonElement = commonNodeList[0] as XmlElement;
+					if (commonElement.HasAttribute(XmlShowPackageView) == false)
+						commonElement.SetAttribute(XmlShowPackageView, "False");
+				}
+
+				// 添加包裹元素
+				var packageElement = xmlDoc.CreateElement(XmlPackage);
+				packageElement.SetAttribute(XmlPackageName, "DefaultPackage");
+				packageElement.SetAttribute(XmlPackageDesc, string.Empty);
+				root.AppendChild(packageElement);
+
+				// 获取所有分组元素
+				var groupNodeList = root.GetElementsByTagName(XmlGroup);
+				List<XmlElement> temper = new List<XmlElement>(groupNodeList.Count);
+				foreach (var groupNode in groupNodeList)
+				{
+					XmlElement groupElement = groupNode as XmlElement;
+					var collectorNodeList = groupElement.GetElementsByTagName(XmlCollector);
+					foreach (var collectorNode in collectorNodeList)
+					{
+						XmlElement collectorElement = collectorNode as XmlElement;
+						if (collectorElement.HasAttribute(XmlCollectorGUID) == false)
+							collectorElement.SetAttribute(XmlCollectorGUID, string.Empty);
+					}
+					temper.Add(groupElement);
+				}
+
+				// 将分组元素转移至包裹元素下
+				foreach (var groupElement in temper)
+				{
+					root.RemoveChild(groupElement);
+					packageElement.AppendChild(groupElement);
+				}
+
+				// 更新版本
+				root.SetAttribute(XmlVersion, "2.0");
+
+				return UpdateXmlConfig(xmlDoc);
+			}
+
+			return false;
+		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorGroup.cs

@@ -50,10 +50,26 @@ namespace YooAsset.Editor
 			}
 		}
 
+		/// <summary>
+		/// 修复配置错误
+		/// </summary>
+		public bool FixConfigError()
+		{
+			bool isFixed = false;
+			foreach (var collector in Collectors)
+			{
+				if (collector.FixConfigError())
+				{
+					isFixed = true;
+				}
+			}
+			return isFixed;
+		}
+
 		/// <summary>
 		/// 获取打包收集的资源文件
 		/// </summary>
-		public List<CollectAssetInfo> GetAllCollectAssets(EBuildMode buildMode)
+		public List<CollectAssetInfo> GetAllCollectAssets(EBuildMode buildMode, bool enableAddressable)
 		{
 			Dictionary<string, CollectAssetInfo> result = new Dictionary<string, CollectAssetInfo>(10000);
 
@@ -67,7 +83,7 @@ namespace YooAsset.Editor
 			// 收集打包资源
 			foreach (var collector in Collectors)
 			{
-				var temper = collector.GetAllCollectAssets(buildMode, this);
+				var temper = collector.GetAllCollectAssets(buildMode, enableAddressable, this);
 				foreach (var assetInfo in temper)
 				{
 					if (result.ContainsKey(assetInfo.AssetPath) == false)
@@ -78,7 +94,7 @@ namespace YooAsset.Editor
 			}
 
 			// 检测可寻址地址是否重复
-			if (AssetBundleCollectorSettingData.Setting.EnableAddressable)
+			if (enableAddressable)
 			{
 				HashSet<string> adressTemper = new HashSet<string>();
 				foreach (var collectInfoPair in result)

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorPackage.cs

@@ -0,0 +1,125 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+	[Serializable]
+	public class AssetBundleCollectorPackage
+	{
+		/// <summary>
+		/// 包裹名称
+		/// </summary>
+		public string PackageName = string.Empty;
+
+		/// <summary>
+		/// 包裹描述
+		/// </summary>
+		public string PackageDesc = string.Empty;
+
+		/// <summary>
+		/// 分组列表
+		/// </summary>
+		public List<AssetBundleCollectorGroup> Groups = new List<AssetBundleCollectorGroup>();
+
+
+		/// <summary>
+		/// 检测配置错误
+		/// </summary>
+		public void CheckConfigError()
+		{
+			foreach (var group in Groups)
+			{
+				group.CheckConfigError();
+			}
+		}
+
+		/// <summary>
+		/// 修复配置错误
+		/// </summary>
+		public bool FixConfigError()
+		{
+			bool isFixed = false;
+			foreach (var group in Groups)
+			{
+				if (group.FixConfigError())
+				{
+					isFixed = true;
+				}
+			}
+			return isFixed;
+		}
+
+		/// <summary>
+		/// 获取打包收集的资源文件
+		/// </summary>
+		public List<CollectAssetInfo> GetAllCollectAssets(EBuildMode buildMode, bool enableAddressable)
+		{
+			Dictionary<string, CollectAssetInfo> result = new Dictionary<string, CollectAssetInfo>(10000);
+
+			// 收集打包资源
+			foreach (var group in Groups)
+			{
+				var temper = group.GetAllCollectAssets(buildMode, enableAddressable);
+				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}");
+				}
+			}
+
+			// 检测可寻址地址是否重复
+			if (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}");
+					}
+				}
+			}
+
+			// 返回列表
+			return result.Values.ToList();
+		}
+
+		/// <summary>
+		/// 获取所有的资源标签
+		/// </summary>
+		public List<string> GetAllTags()
+		{
+			HashSet<string> result = new HashSet<string>();
+			foreach (var group in Groups)
+			{
+				List<string> groupTags = StringUtility.StringToStringList(group.AssetTags, ';');
+				foreach (var tag in groupTags)
+				{
+					if (result.Contains(tag) == false)
+						result.Add(tag);
+				}
+
+				foreach (var collector in group.Collectors)
+				{
+					List<string> collectorTags = StringUtility.StringToStringList(collector.AssetTags, ';');
+					foreach (var tag in collectorTags)
+					{
+						if (result.Contains(tag) == false)
+							result.Add(tag);
+					}
+				}
+			}
+			return result.ToList();
+		}
+	}
+}

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorPackage.cs.meta

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

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSetting.cs

@@ -8,77 +8,105 @@ namespace YooAsset.Editor
 {
 	public class AssetBundleCollectorSetting : ScriptableObject
 	{
+		/// <summary>
+		/// 是否显示包裹视图
+		/// </summary>
+		public bool ShowPackageView = false;
+
 		/// <summary>
 		/// 是否启用可寻址资源定位
 		/// </summary>
 		public bool EnableAddressable = false;
 
 		/// <summary>
-		/// 自动收集着色器
+		/// 包裹列表
 		/// </summary>
-		public bool AutoCollectShaders = true;
+		public List<AssetBundleCollectorPackage> Packages = new List<AssetBundleCollectorPackage>();
+
 
 		/// <summary>
-		/// 自动收集的着色器资源包名称
+		/// 清空所有数据
 		/// </summary>
-		public string ShadersBundleName = "myshaders";
-
-		/// <summary>
-		/// 分组列表
-		/// </summary>
-		public List<AssetBundleCollectorGroup> Groups = new List<AssetBundleCollectorGroup>();
-
+		public void ClearAll()
+		{
+			EnableAddressable = false;
+			Packages.Clear();
+		}
 
 		/// <summary>
 		/// 检测配置错误
 		/// </summary>
 		public void CheckConfigError()
 		{
-			foreach (var group in Groups)
+			foreach (var package in Packages)
 			{
-				group.CheckConfigError();
+				package.CheckConfigError();
 			}
 		}
 
 		/// <summary>
-		/// 获取打包收集的资源文件
+		/// 修复配置错误
 		/// </summary>
-		public List<CollectAssetInfo> GetAllCollectAssets(EBuildMode buildMode)
+		public bool FixConfigError()
 		{
-			Dictionary<string, CollectAssetInfo> result = new Dictionary<string, CollectAssetInfo>(10000);
-
-			// 收集打包资源
-			foreach (var group in Groups)
+			bool isFixed = false;
+			foreach (var package in Packages)
 			{
-				var temper = group.GetAllCollectAssets(buildMode);
-				foreach (var assetInfo in temper)
+				if (package.FixConfigError())
 				{
-					if (result.ContainsKey(assetInfo.AssetPath) == false)
-						result.Add(assetInfo.AssetPath, assetInfo);
-					else
-						throw new Exception($"The collecting asset file is existed : {assetInfo.AssetPath} in group setting.");
+					isFixed = true;
+				}
+			}
+			return isFixed;
+		}
+
+		/// <summary>
+		/// 获取所有的资源标签
+		/// </summary>
+		public List<string> GetPackageAllTags(string packageName)
+		{
+			foreach (var package in Packages)
+			{
+				if (package.PackageName == packageName)
+				{
+					return package.GetAllTags();
 				}
 			}
 
-			// 检测可寻址地址是否重复
-			if (EnableAddressable)
+			Debug.LogWarning($"Not found package : {packageName}");
+			return new List<string>();
+		}
+		
+		/// <summary>
+		/// 获取包裹收集的资源文件
+		/// </summary>
+		public List<CollectAssetInfo> GetPackageAssets(EBuildMode buildMode, string packageName)
+		{
+			if (string.IsNullOrEmpty(packageName))
+				throw new Exception("Build Package name is null or mepty !");
+
+			foreach (var package in Packages)
 			{
-				HashSet<string> adressTemper = new HashSet<string>();
-				foreach (var collectInfoPair in result)
+				if (package.PackageName == packageName)
 				{
-					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 group setting.");
-					}
+					return package.GetAllCollectAssets(buildMode, EnableAddressable);
 				}
 			}
+			throw new Exception($"Not found collector pacakge : {packageName}");
+		}
 
-			// 返回列表
-			return result.Values.ToList();
+		/// <summary>
+		/// 获取所有包裹收集的资源文件
+		/// </summary>
+		public List<CollectAssetInfo> GetAllPackageAssets(EBuildMode buildMode)
+		{
+			List<CollectAssetInfo> result = new List<CollectAssetInfo>(1000);
+			foreach (var package in Packages)
+			{
+				var temper = package.GetAllCollectAssets(buildMode, EnableAddressable);
+				result.AddRange(temper);
+			}
+			return result;
 		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSettingData.cs

@@ -232,7 +232,7 @@ namespace YooAsset.Editor
 		}
 
 		/// <summary>
-		/// 存储文件
+		/// 存储配置文件
 		/// </summary>
 		public static void SaveFile()
 		{
@@ -245,14 +245,24 @@ namespace YooAsset.Editor
 			}
 		}
 
+		/// <summary>
+		/// 修复配置文件
+		/// </summary>
+		public static void FixFile()
+		{
+			bool isFixed = Setting.FixConfigError();
+			if (isFixed)
+			{
+				IsDirty = true;
+			}
+		}
+
 		/// <summary>
 		/// 清空所有数据
 		/// </summary>
 		public static void ClearAll()
 		{
-			Setting.AutoCollectShaders = false;
-			Setting.ShadersBundleName = string.Empty;
-			Setting.Groups.Clear();
+			Setting.ClearAll();
 			SaveFile();
 		}
 
@@ -326,32 +336,56 @@ namespace YooAsset.Editor
 			}
 		}
 
-		// 可寻址编辑相关
+		// 公共参数编辑相关
+		public static void ModifyPackageView(bool showPackageView)
+		{
+			Setting.ShowPackageView = showPackageView;
+			IsDirty = true;
+		}
 		public static void ModifyAddressable(bool enableAddressable)
 		{
 			Setting.EnableAddressable = enableAddressable;
 			IsDirty = true;
 		}
 
-		// 着色器编辑相关
-		public static void ModifyShader(bool isCollectAllShaders, string shadersBundleName)
+		// 资源包裹编辑相关
+		public static void CreatePackage(string packageName)
 		{
-			Setting.AutoCollectShaders = isCollectAllShaders;
-			Setting.ShadersBundleName = shadersBundleName;
+			AssetBundleCollectorPackage package = new AssetBundleCollectorPackage();
+			package.PackageName = packageName;
+			Setting.Packages.Add(package);
 			IsDirty = true;
 		}
+		public static void RemovePackage(AssetBundleCollectorPackage package)
+		{
+			if (Setting.Packages.Remove(package))
+			{
+				IsDirty = true;
+			}
+			else
+			{
+				Debug.LogWarning($"Failed remove package : {package.PackageName}");
+			}
+		}
+		public static void ModifyPackage(AssetBundleCollectorPackage package)
+		{
+			if (package != null)
+			{
+				IsDirty = true;
+			}
+		}
 
 		// 资源分组编辑相关
-		public static void CreateGroup(string groupName)
+		public static void CreateGroup(AssetBundleCollectorPackage package, string groupName)
 		{
 			AssetBundleCollectorGroup group = new AssetBundleCollectorGroup();
 			group.GroupName = groupName;
-			Setting.Groups.Add(group);
+			package.Groups.Add(group);
 			IsDirty = true;
 		}
-		public static void RemoveGroup(AssetBundleCollectorGroup group)
+		public static void RemoveGroup(AssetBundleCollectorPackage package, AssetBundleCollectorGroup group)
 		{
-			if (Setting.Groups.Remove(group))
+			if (package.Groups.Remove(group))
 			{
 				IsDirty = true;
 			}
@@ -360,19 +394,17 @@ namespace YooAsset.Editor
 				Debug.LogWarning($"Failed remove group : {group.GroupName}");
 			}
 		}
-		public static void ModifyGroup(AssetBundleCollectorGroup group)
+		public static void ModifyGroup(AssetBundleCollectorPackage package, AssetBundleCollectorGroup group)
 		{
-			if (group != null)
+			if (package != null && group != null)
 			{
 				IsDirty = true;
 			}
 		}
 
 		// 资源收集器编辑相关
-		public static void CreateCollector(AssetBundleCollectorGroup group, string collectPath)
+		public static void CreateCollector(AssetBundleCollectorGroup group, AssetBundleCollector collector)
 		{
-			AssetBundleCollector collector = new AssetBundleCollector();
-			collector.CollectPath = collectPath;
 			group.Collectors.Add(collector);
 			IsDirty = true;
 		}
@@ -394,5 +426,14 @@ namespace YooAsset.Editor
 				IsDirty = true;
 			}
 		}
+
+		/// <summary>
+		/// 获取所有的资源标签
+		/// </summary>
+		public static string GetPackageAllTags(string packageName)
+		{
+			var allTags = Setting.GetPackageAllTags(packageName);
+			return string.Join(";", allTags);
+		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs

@@ -18,22 +18,33 @@ namespace YooAsset.Editor
 			window.minSize = new Vector2(800, 600);
 		}
 
+		private Button _saveButton;
 		private List<string> _collectorTypeList;
 		private List<string> _activeRuleList;
 		private List<string> _addressRuleList;
 		private List<string> _packRuleList;
 		private List<string> _filterRuleList;
-		private ListView _groupListView;
-		private ScrollView _collectorScrollView;
-		private PopupField<string> _activeRulePopupField;
+		
+		private Toggle _showPackageToogle;
 		private Toggle _enableAddressableToogle;
-		private Toggle _autoCollectShaderToogle;
-		private TextField _shaderBundleNameTxt;
+
+		private VisualElement _packageContainer;
+		private ListView _packageListView;
+		private TextField _packageNameTxt;
+		private TextField _packageDescTxt;
+
+		private VisualElement _groupContainer;
+		private ListView _groupListView;
 		private TextField _groupNameTxt;
 		private TextField _groupDescTxt;
 		private TextField _groupAssetTagsTxt;
-		private VisualElement _groupContainer;
-		private string _lastModifyGroup = string.Empty;
+
+		private VisualElement _collectorContainer;
+		private ScrollView _collectorScrollView;
+		private PopupField<string> _activeRulePopupField;
+
+		private int _lastModifyPackageIndex = 0;
+		private int _lastModifyGroupIndex = 0;
 
 
 		public void CreateGUI()
@@ -63,29 +74,78 @@ namespace YooAsset.Editor
 
 				visualAsset.CloneTree(root);
 
-				// 导入导出按钮
-				var exportBtn = root.Q<Button>("ExportButton");
-				exportBtn.clicked += ExportBtn_clicked;
-				var importBtn = root.Q<Button>("ImportButton");
-				importBtn.clicked += ImportBtn_clicked;
-
 				// 公共设置相关
+				_showPackageToogle = root.Q<Toggle>("ShowPackages");
+				_showPackageToogle.RegisterValueChangedCallback(evt =>
+				{
+					AssetBundleCollectorSettingData.ModifyPackageView(evt.newValue);
+					RefreshWindow();
+				});
 				_enableAddressableToogle = root.Q<Toggle>("EnableAddressable");
 				_enableAddressableToogle.RegisterValueChangedCallback(evt =>
 				{
 					AssetBundleCollectorSettingData.ModifyAddressable(evt.newValue);
 					RefreshWindow();
 				});
-				_autoCollectShaderToogle = root.Q<Toggle>("AutoCollectShader");
-				_autoCollectShaderToogle.RegisterValueChangedCallback(evt =>
+
+				// 配置修复按钮
+				var fixBtn = root.Q<Button>("FixButton");
+				fixBtn.clicked += FixBtn_clicked;
+
+				// 导入导出按钮
+				var exportBtn = root.Q<Button>("ExportButton");
+				exportBtn.clicked += ExportBtn_clicked;
+				var importBtn = root.Q<Button>("ImportButton");
+				importBtn.clicked += ImportBtn_clicked;
+
+				// 配置保存按钮
+				_saveButton = root.Q<Button>("SaveButton");
+				_saveButton.clicked += SaveBtn_clicked;
+
+				// 包裹容器
+				_packageContainer = root.Q("PackageContainer");
+
+				// 包裹列表相关
+				_packageListView = root.Q<ListView>("PackageListView");
+				_packageListView.makeItem = MakePackageListViewItem;
+				_packageListView.bindItem = BindPackageListViewItem;
+#if UNITY_2020_1_OR_NEWER
+				_packageListView.onSelectionChange += PackageListView_onSelectionChange;
+#else
+				_packageListView.onSelectionChanged += PackageListView_onSelectionChange;
+#endif
+
+				// 包裹添加删除按钮
+				var packageAddContainer = root.Q("PackageAddContainer");
 				{
-					AssetBundleCollectorSettingData.ModifyShader(evt.newValue, _shaderBundleNameTxt.value);
-					_shaderBundleNameTxt.SetEnabled(evt.newValue);
+					var addBtn = packageAddContainer.Q<Button>("AddBtn");
+					addBtn.clicked += AddPackageBtn_clicked;
+					var removeBtn = packageAddContainer.Q<Button>("RemoveBtn");
+					removeBtn.clicked += RemovePackageBtn_clicked;
+				}
+
+				// 包裹名称
+				_packageNameTxt = root.Q<TextField>("PackageName");
+				_packageNameTxt.RegisterValueChangedCallback(evt =>
+				{
+					var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
+					if (selectPackage != null)
+					{
+						selectPackage.PackageName = evt.newValue;
+						AssetBundleCollectorSettingData.ModifyPackage(selectPackage);
+					}
 				});
-				_shaderBundleNameTxt = root.Q<TextField>("ShaderBundleName");
-				_shaderBundleNameTxt.RegisterValueChangedCallback(evt =>
+
+				// 包裹备注
+				_packageDescTxt = root.Q<TextField>("PackageDesc");
+				_packageDescTxt.RegisterValueChangedCallback(evt =>
 				{
-					AssetBundleCollectorSettingData.ModifyShader(_autoCollectShaderToogle.value, evt.newValue);
+					var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
+					if (selectPackage != null)
+					{
+						selectPackage.PackageDesc = evt.newValue;
+						AssetBundleCollectorSettingData.ModifyPackage(selectPackage);
+					}
 				});
 
 				// 分组列表相关
@@ -114,11 +174,12 @@ namespace YooAsset.Editor
 				_groupNameTxt = root.Q<TextField>("GroupName");
 				_groupNameTxt.RegisterValueChangedCallback(evt =>
 				{
+					var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
 					var selectGroup = _groupListView.selectedItem as AssetBundleCollectorGroup;
-					if (selectGroup != null)
+					if (selectPackage != null && selectGroup != null)
 					{
 						selectGroup.GroupName = evt.newValue;
-						AssetBundleCollectorSettingData.ModifyGroup(selectGroup);
+						AssetBundleCollectorSettingData.ModifyGroup(selectPackage, selectGroup);
 					}
 				});
 
@@ -126,11 +187,12 @@ namespace YooAsset.Editor
 				_groupDescTxt = root.Q<TextField>("GroupDesc");
 				_groupDescTxt.RegisterValueChangedCallback(evt =>
 				{
+					var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
 					var selectGroup = _groupListView.selectedItem as AssetBundleCollectorGroup;
-					if (selectGroup != null)
+					if (selectPackage != null && selectGroup != null)
 					{
 						selectGroup.GroupDesc = evt.newValue;
-						AssetBundleCollectorSettingData.ModifyGroup(selectGroup);
+						AssetBundleCollectorSettingData.ModifyGroup(selectPackage, selectGroup);
 					}
 				});
 
@@ -138,14 +200,18 @@ namespace YooAsset.Editor
 				_groupAssetTagsTxt = root.Q<TextField>("GroupAssetTags");
 				_groupAssetTagsTxt.RegisterValueChangedCallback(evt =>
 				{
+					var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
 					var selectGroup = _groupListView.selectedItem as AssetBundleCollectorGroup;
-					if (selectGroup != null)
+					if (selectPackage != null && selectGroup != null)
 					{
 						selectGroup.AssetTags = evt.newValue;
-						AssetBundleCollectorSettingData.ModifyGroup(selectGroup);
+						AssetBundleCollectorSettingData.ModifyGroup(selectPackage, selectGroup);
 					}
 				});
 
+				// 收集列表容器
+				_collectorContainer = root.Q("CollectorContainer");
+
 				// 收集列表相关
 				_collectorScrollView = root.Q<ScrollView>("CollectorScrollView");
 				_collectorScrollView.style.height = new Length(100, LengthUnit.Percent);
@@ -167,11 +233,12 @@ namespace YooAsset.Editor
 					activeRuleContainer.Add(_activeRulePopupField);
 					_activeRulePopupField.RegisterValueChangedCallback(evt =>
 					{
+						var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
 						var selectGroup = _groupListView.selectedItem as AssetBundleCollectorGroup;
-						if (selectGroup != null)
+						if (selectPackage != null && selectGroup != null)
 						{
 							selectGroup.ActiveRuleName = evt.newValue;
-							AssetBundleCollectorSettingData.ModifyGroup(selectGroup);
+							AssetBundleCollectorSettingData.ModifyGroup(selectPackage, selectGroup);
 							FillGroupViewData();
 						}
 					});
@@ -193,16 +260,35 @@ namespace YooAsset.Editor
 			if (AssetBundleCollectorSettingData.IsDirty)
 				AssetBundleCollectorSettingData.SaveFile();
 		}
+		public void Update()
+		{
+			if (_saveButton != null)
+			{
+				if (AssetBundleCollectorSettingData.IsDirty)
+				{
+					if (_saveButton.enabledSelf == false)
+						_saveButton.SetEnabled(true);
+				}
+				else
+				{
+					if (_saveButton.enabledSelf)
+						_saveButton.SetEnabled(false);
+				}
+			}
+		}
 
 		private void RefreshWindow()
 		{
+			_showPackageToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.ShowPackageView);
 			_enableAddressableToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.EnableAddressable);
-			_autoCollectShaderToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.AutoCollectShaders);
-			_shaderBundleNameTxt.SetEnabled(AssetBundleCollectorSettingData.Setting.AutoCollectShaders);
-			_shaderBundleNameTxt.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.ShadersBundleName);
 			_groupContainer.visible = false;
+			_collectorContainer.visible = false;
 
-			FillGroupViewData();
+			FillPackageViewData();
+		}
+		private void FixBtn_clicked()
+		{
+			AssetBundleCollectorSettingData.FixFile();
 		}
 		private void ExportBtn_clicked()
 		{
@@ -221,23 +307,102 @@ namespace YooAsset.Editor
 				RefreshWindow();
 			}
 		}
+		private void SaveBtn_clicked()
+		{
+			AssetBundleCollectorSettingData.SaveFile();
+		}
+
+		// 包裹列表相关
+		private void FillPackageViewData()
+		{
+			_packageListView.Clear();
+			_packageListView.ClearSelection();
+			_packageListView.itemsSource = AssetBundleCollectorSettingData.Setting.Packages;
+			_packageListView.Rebuild();
+
+			if (_lastModifyPackageIndex >= 0 && _lastModifyPackageIndex < _packageListView.itemsSource.Count)
+			{
+				_packageListView.selectedIndex = _lastModifyPackageIndex;
+			}
+			
+			if (_showPackageToogle.value)
+				_packageContainer.style.display = DisplayStyle.Flex;
+			else
+				_packageContainer.style.display = DisplayStyle.None;
+		}
+		private VisualElement MakePackageListViewItem()
+		{
+			VisualElement element = new VisualElement();
+
+			{
+				var label = new Label();
+				label.name = "Label1";
+				label.style.unityTextAlign = TextAnchor.MiddleLeft;
+				label.style.flexGrow = 1f;
+				label.style.height = 20f;
+				element.Add(label);
+			}
+
+			return element;
+		}
+		private void BindPackageListViewItem(VisualElement element, int index)
+		{
+			var package = AssetBundleCollectorSettingData.Setting.Packages[index];
+
+			var textField1 = element.Q<Label>("Label1");
+			if (string.IsNullOrEmpty(package.PackageDesc))
+				textField1.text = package.PackageName;
+			else
+				textField1.text = $"{package.PackageName} ({package.PackageDesc})";
+		}
+		private void PackageListView_onSelectionChange(IEnumerable<object> objs)
+		{
+			var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
+			if (selectPackage == null)
+			{
+				_groupContainer.visible = false;
+				_collectorContainer.visible = false;
+				return;
+			}
+
+			_groupContainer.visible = true;
+			_lastModifyPackageIndex = _packageListView.selectedIndex;
+			_packageNameTxt.SetValueWithoutNotify(selectPackage.PackageName);
+			_packageDescTxt.SetValueWithoutNotify(selectPackage.PackageDesc);
+			FillGroupViewData();
+		}
+		private void AddPackageBtn_clicked()
+		{
+			Undo.RecordObject(AssetBundleCollectorSettingData.Setting, "YooAsset.AssetBundleCollectorWindow AddPackage");
+			AssetBundleCollectorSettingData.CreatePackage("DefaultPackage");
+			FillPackageViewData();
+		}
+		private void RemovePackageBtn_clicked()
+		{
+			var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
+			if (selectPackage == null)
+				return;
+
+			Undo.RecordObject(AssetBundleCollectorSettingData.Setting, "YooAsset.AssetBundleCollectorWindow RemovePackage");
+			AssetBundleCollectorSettingData.RemovePackage(selectPackage);
+			FillPackageViewData();
+		}
 
 		// 分组列表相关
 		private void FillGroupViewData()
 		{
+			var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
+			if (selectPackage == null)
+				return;
+
 			_groupListView.Clear();
 			_groupListView.ClearSelection();
-			_groupListView.itemsSource = AssetBundleCollectorSettingData.Setting.Groups;
+			_groupListView.itemsSource = selectPackage.Groups;
 			_groupListView.Rebuild();
 
-			for (int index = 0; index < AssetBundleCollectorSettingData.Setting.Groups.Count; index++)
+			if(_lastModifyGroupIndex >=0 && _lastModifyGroupIndex < _groupListView.itemsSource.Count)
 			{
-				var group = AssetBundleCollectorSettingData.Setting.Groups[index];
-				if (group.GroupName == _lastModifyGroup)
-				{
-					_groupListView.selectedIndex = index;
-					break;
-				}
+				_groupListView.selectedIndex = _lastModifyGroupIndex;
 			}
 		}
 		private VisualElement MakeGroupListViewItem()
@@ -257,9 +422,12 @@ namespace YooAsset.Editor
 		}
 		private void BindGroupListViewItem(VisualElement element, int index)
 		{
-			var group = AssetBundleCollectorSettingData.Setting.Groups[index];
+			var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
+			if (selectPackage == null)
+				return;
+
+			var group = selectPackage.Groups[index];
 
-			// Group Name
 			var textField1 = element.Q<Label>("Label1");
 			if (string.IsNullOrEmpty(group.GroupDesc))
 				textField1.text = group.GroupName;
@@ -273,22 +441,44 @@ namespace YooAsset.Editor
 		}
 		private void GroupListView_onSelectionChange(IEnumerable<object> objs)
 		{
+			var selectGroup = _groupListView.selectedItem as AssetBundleCollectorGroup;
+			if (selectGroup == null)
+			{
+				_collectorContainer.visible = false;
+				return;
+			}
+
+			_collectorContainer.visible = true;
+			_lastModifyGroupIndex = _groupListView.selectedIndex;
+			_activeRulePopupField.SetValueWithoutNotify(selectGroup.ActiveRuleName);
+			_groupNameTxt.SetValueWithoutNotify(selectGroup.GroupName);
+			_groupDescTxt.SetValueWithoutNotify(selectGroup.GroupDesc);
+			_groupAssetTagsTxt.SetValueWithoutNotify(selectGroup.AssetTags);
+
 			FillCollectorViewData();
 		}
 		private void AddGroupBtn_clicked()
 		{
+			var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
+			if (selectPackage == null)
+				return;
+
 			Undo.RecordObject(AssetBundleCollectorSettingData.Setting, "YooAsset.AssetBundleCollectorWindow AddGroup");
-			AssetBundleCollectorSettingData.CreateGroup("Default Group");
+			AssetBundleCollectorSettingData.CreateGroup(selectPackage, "Default Group");
 			FillGroupViewData();
 		}
 		private void RemoveGroupBtn_clicked()
 		{
+			var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
+			if (selectPackage == null)
+				return;
+
 			var selectGroup = _groupListView.selectedItem as AssetBundleCollectorGroup;
 			if (selectGroup == null)
 				return;
 
 			Undo.RecordObject(AssetBundleCollectorSettingData.Setting, "YooAsset.AssetBundleCollectorWindow RemoveGroup");
-			AssetBundleCollectorSettingData.RemoveGroup(selectGroup);
+			AssetBundleCollectorSettingData.RemoveGroup(selectPackage, selectGroup);
 			FillGroupViewData();
 		}
 
@@ -297,17 +487,7 @@ namespace YooAsset.Editor
 		{
 			var selectGroup = _groupListView.selectedItem as AssetBundleCollectorGroup;
 			if (selectGroup == null)
-			{
-				_groupContainer.visible = false;
 				return;
-			}
-
-			_lastModifyGroup = selectGroup.GroupName;
-			_groupContainer.visible = true;
-			_activeRulePopupField.SetValueWithoutNotify(selectGroup.ActiveRuleName);
-			_groupNameTxt.SetValueWithoutNotify(selectGroup.GroupName);
-			_groupDescTxt.SetValueWithoutNotify(selectGroup.GroupDesc);
-			_groupAssetTagsTxt.SetValueWithoutNotify(selectGroup.AssetTags);
 
 			// 填充数据
 			_collectorScrollView.Clear();
@@ -463,6 +643,7 @@ namespace YooAsset.Editor
 			objectField1.RegisterValueChangedCallback(evt =>
 			{
 				collector.CollectPath = AssetDatabase.GetAssetPath(evt.newValue);
+				collector.CollectorGUID = AssetDatabase.AssetPathToGUID(collector.CollectPath);
 				objectField1.value.name = collector.CollectPath;
 				AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
 				if (foldout.value)
@@ -552,7 +733,8 @@ namespace YooAsset.Editor
 
 				try
 				{
-					collectAssetInfos = collector.GetAllCollectAssets(EBuildMode.DryRunBuild, group);
+					bool enableAdressable = AssetBundleCollectorSettingData.Setting.EnableAddressable;
+					collectAssetInfos = collector.GetAllCollectAssets(EBuildMode.DryRunBuild, enableAdressable, group);
 				}
 				catch (System.Exception e)
 				{
@@ -593,7 +775,8 @@ namespace YooAsset.Editor
 				return;
 
 			Undo.RecordObject(AssetBundleCollectorSettingData.Setting, "YooAsset.AssetBundleCollectorWindow AddCollector");
-			AssetBundleCollectorSettingData.CreateCollector(selectGroup, string.Empty);
+			AssetBundleCollector collector = new AssetBundleCollector();
+			AssetBundleCollectorSettingData.CreateCollector(selectGroup, collector);
 			FillCollectorViewData();
 		}
 		private void RemoveCollectorBtn_clicked(AssetBundleCollector selectCollector)

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.uxml

@@ -1,32 +1,43 @@
 <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; flex-direction: row-reverse;">
+        <ui:Button text="Save" display-tooltip-when-elided="true" name="SaveButton" style="width: 50px; background-color: rgb(56, 147, 58);" />
         <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);" />
+        <ui:Button text="修复" display-tooltip-when-elided="true" name="FixButton" style="width: 50px; background-color: rgb(56, 147, 58);" />
     </uie:Toolbar>
+    <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="Show Packages" name="ShowPackages" style="width: 196px; -unity-text-align: middle-left;" />
+        <ui:Toggle label="Enable Addressable" name="EnableAddressable" style="width: 196px; -unity-text-align: middle-left;" />
+    </ui:VisualElement>
     <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:VisualElement name="PackageContainer" 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:Label text="Packages" display-tooltip-when-elided="true" name="PackageTitle" style="background-color: rgb(89, 89, 89); -unity-text-align: upper-center; -unity-font-style: bold; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px; font-size: 12px;" />
+            <ui:ListView focusable="true" name="PackageListView" item-height="20" virtualization-method="DynamicHeight" style="flex-grow: 1;" />
+            <ui:VisualElement name="PackageAddContainer" 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="GroupContainer" 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:Label text="Groups" display-tooltip-when-elided="true" name="GroupTitle" style="background-color: rgb(89, 89, 89); -unity-text-align: upper-center; -unity-font-style: bold; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px; font-size: 12px;" />
+            <ui:TextField picking-mode="Ignore" label="Package Name" value="filler text" name="PackageName" style="flex-direction: column;" />
+            <ui:TextField picking-mode="Ignore" label="Package Desc" value="filler text" name="PackageDesc" style="flex-direction: column;" />
             <ui:ListView focusable="true" name="GroupListView" item-height="20" virtualization-method="DynamicHeight" style="flex-grow: 1;" />
             <ui:VisualElement name="GroupAddContainer" 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="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>
-            <ui:VisualElement name="GroupContainer" style="flex-grow: 1; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">
-                <ui:VisualElement name="ActiveRuleContainer" style="height: 20px;" />
-                <ui:TextField picking-mode="Ignore" label="Group Name" name="GroupName" />
-                <ui:TextField picking-mode="Ignore" label="Group Desc" name="GroupDesc" />
-                <ui:TextField picking-mode="Ignore" label="Group Asset Tags" name="GroupAssetTags" />
-                <ui:VisualElement name="CollectorAddContainer" style="height: 20px; flex-direction: row-reverse;">
-                    <ui:Button text="[ + ]" display-tooltip-when-elided="true" name="AddBtn" />
-                </ui:VisualElement>
-                <ui:ScrollView name="CollectorScrollView" style="flex-grow: 1;" />
+        <ui:VisualElement name="CollectorContainer" style="flex-grow: 1; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">
+            <ui:Label text="Collectors" display-tooltip-when-elided="true" name="CollectorTitle" style="background-color: rgb(89, 89, 89); -unity-text-align: upper-center; -unity-font-style: bold; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px; font-size: 12px;" />
+            <ui:VisualElement name="ActiveRuleContainer" style="height: 20px;" />
+            <ui:TextField picking-mode="Ignore" label="Group Name" name="GroupName" />
+            <ui:TextField picking-mode="Ignore" label="Group Desc" name="GroupDesc" />
+            <ui:TextField picking-mode="Ignore" label="Group Asset Tags" name="GroupAssetTags" />
+            <ui:VisualElement name="CollectorAddContainer" style="height: 20px; flex-direction: row-reverse;">
+                <ui:Button text="[ + ]" display-tooltip-when-elided="true" name="AddBtn" />
             </ui:VisualElement>
+            <ui:ScrollView name="CollectorScrollView" style="flex-grow: 1;" />
         </ui:VisualElement>
     </ui:VisualElement>
 </ui:UXML>

Assets/YooAsset/Editor/AssetBundleCollector/DefaultFilterRule.cs

@@ -59,4 +59,15 @@ namespace YooAsset.Editor
 			}
 		}
 	}
+
+	/// <summary>
+	/// 只收集着色器变种收集文件
+	/// </summary>
+	public class CollectShaderVariants : IFilterRule
+	{
+		public bool IsCollectAsset(FilterRuleData data)
+		{
+			return Path.GetExtension(data.AssetPath) == ".shadervariants";
+		}
+	}
 }

Assets/YooAsset/Editor/AssetBundleCollector/DefaultPackRule.cs

@@ -15,7 +15,8 @@ namespace YooAsset.Editor
 	{
 		string IPackRule.GetBundleName(PackRuleData data)
 		{
-			return StringUtility.RemoveExtension(data.AssetPath);
+			string bundleName = StringUtility.RemoveExtension(data.AssetPath);
+			return EditorTools.GetRegularPath(bundleName).Replace('/', '_');
 		}
 	}
 
@@ -32,7 +33,8 @@ namespace YooAsset.Editor
 
 		string IPackRule.GetBundleName(PackRuleData data)
 		{
-			return Path.GetDirectoryName(data.AssetPath);
+			string bundleName = Path.GetDirectoryName(data.AssetPath);
+			return EditorTools.GetRegularPath(bundleName).Replace('/', '_');
 		}
 	}
 
@@ -55,7 +57,7 @@ namespace YooAsset.Editor
 				if (Path.HasExtension(splits[0]))
 					throw new Exception($"Not found root directory : {assetPath}");
 				string bundleName = $"{data.CollectPath}/{splits[0]}";
-				return bundleName;
+				return EditorTools.GetRegularPath(bundleName).Replace('/', '_');
 			}
 			else
 			{
@@ -72,7 +74,8 @@ namespace YooAsset.Editor
 	{
 		string IPackRule.GetBundleName(PackRuleData data)
 		{
-			return StringUtility.RemoveExtension(data.CollectPath);
+			string bundleName = StringUtility.RemoveExtension(data.CollectPath);
+			return EditorTools.GetRegularPath(bundleName).Replace('/', '_');
 		}
 	}
 
@@ -110,7 +113,19 @@ namespace YooAsset.Editor
 			if (depends.Length != 1)
 				throw new Exception($"{nameof(PackRawFile)} is not support estension : {extension}");
 
-			return StringUtility.RemoveExtension(data.AssetPath);
+			string bundleName = StringUtility.RemoveExtension(data.AssetPath);
+			return EditorTools.GetRegularPath(bundleName).Replace('/', '_');
+		}
+	}
+
+	/// <summary>
+	/// 着色器变种收集文件
+	/// </summary>
+	public class PackShaderVariants : IPackRule
+	{
+		public string GetBundleName(PackRuleData data)
+		{
+			return YooAssetSettings.UnityShadersBundleName;
 		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebuggerWindow.cs

@@ -45,12 +45,15 @@ namespace YooAsset.Editor
 
 		private Label _playerName;
 		private ToolbarMenu _viewModeMenu;
+		private SliderInt _frameSlider;
 		private DebuggerAssetListViewer _assetListViewer;
 		private DebuggerBundleListViewer _bundleListViewer;
 
 		private EViewMode _viewMode;
-		private DebugReport _debugReport;
 		private string _searchKeyWord;
+		private DebugReport _currentReport;
+		private RemotePlayerSession _currentPlayerSession;
+		private int _rangeIndex = 0;
 
 
 		public void CreateGUI()
@@ -76,14 +79,36 @@ namespace YooAsset.Editor
 
 				// 视口模式菜单
 				_viewModeMenu = root.Q<ToolbarMenu>("ViewModeMenu");
-				_viewModeMenu.menu.AppendAction(EViewMode.AssetView.ToString(), ViewModeMenuAction, ViewModeMenuFun, EViewMode.AssetView);
-				_viewModeMenu.menu.AppendAction(EViewMode.BundleView.ToString(), ViewModeMenuAction, ViewModeMenuFun, EViewMode.BundleView);
+				_viewModeMenu.menu.AppendAction(EViewMode.AssetView.ToString(), OnViewModeMenuChange, OnViewModeMenuStatusUpdate, EViewMode.AssetView);
+				_viewModeMenu.menu.AppendAction(EViewMode.BundleView.ToString(), OnViewModeMenuChange, OnViewModeMenuStatusUpdate, EViewMode.BundleView);
 				_viewModeMenu.text = EViewMode.AssetView.ToString();
 
 				// 搜索栏
 				var searchField = root.Q<ToolbarSearchField>("SearchField");
 				searchField.RegisterValueChangedCallback(OnSearchKeyWordChange);
 
+				// 帧数相关
+				{
+					_frameSlider = root.Q<SliderInt>("FrameSlider");
+					_frameSlider.label = "Frame:";
+					_frameSlider.highValue = 0;
+					_frameSlider.lowValue = 0;
+					_frameSlider.value = 0;
+					_frameSlider.RegisterValueChangedCallback(evt =>
+					{
+						OnFrameSliderChange(evt.newValue);
+					});
+
+					var frameLast = root.Q<ToolbarButton>("FrameLast");
+					frameLast.clicked += OnFrameLast_clicked;
+
+					var frameNext = root.Q<ToolbarButton>("FrameNext");
+					frameNext.clicked += OnFrameNext_clicked;
+
+					var frameClear = root.Q<ToolbarButton>("FrameClear");
+					frameClear.clicked += OnFrameClear_clicked;
+				}
+
 				// 加载视图
 				_assetListViewer = new DebuggerAssetListViewer();
 				_assetListViewer.InitViewer();
@@ -126,7 +151,6 @@ namespace YooAsset.Editor
 		{
 			Debug.Log($"Game player disconnection : {playerId}");
 			_playerName.text = $"Disconneced player : {playerId}";
-			RemovePlayerSession(playerId);
 		}
 		private void OnHandlePlayerMessage(MessageEventArgs args)
 		{
@@ -135,13 +159,53 @@ namespace YooAsset.Editor
 		}
 		private void OnHandleDebugReport(int playerId, DebugReport debugReport)
 		{
-			var playerSession = GetOrCreatePlayerSession(playerId);
-			playerSession.AddDebugReport(debugReport);
-
-			_debugReport = debugReport;
-			_assetListViewer.FillViewData(debugReport, _searchKeyWord);
-			_bundleListViewer.FillViewData(debugReport, _searchKeyWord);
+			Debug.Log($"Handle player {playerId} debug report !");
+			_currentPlayerSession = GetOrCreatePlayerSession(playerId);
+			_currentPlayerSession.AddDebugReport(debugReport);
+			_frameSlider.highValue = _currentPlayerSession.MaxRangeValue;
+			_frameSlider.value = _currentPlayerSession.MaxRangeValue;
+			UpdateFrameView(_currentPlayerSession);
 		}
+		private void OnFrameSliderChange(int sliderValue)
+		{
+			if (_currentPlayerSession != null)
+			{
+				_rangeIndex = _currentPlayerSession.ClampRangeIndex(sliderValue); ;
+				UpdateFrameView(_currentPlayerSession, _rangeIndex);
+			}
+		}
+		private void OnFrameLast_clicked()
+		{
+			if (_currentPlayerSession != null)
+			{
+				_rangeIndex = _currentPlayerSession.ClampRangeIndex(_rangeIndex - 1);
+				_frameSlider.value = _rangeIndex;
+				UpdateFrameView(_currentPlayerSession, _rangeIndex);
+			}
+		}
+		private void OnFrameNext_clicked()
+		{
+			if (_currentPlayerSession != null)
+			{
+				_rangeIndex = _currentPlayerSession.ClampRangeIndex(_rangeIndex + 1);
+				_frameSlider.value = _rangeIndex;
+				UpdateFrameView(_currentPlayerSession, _rangeIndex);
+			}
+		}
+		private void OnFrameClear_clicked()
+		{
+			if (_currentPlayerSession != null)
+			{
+				_frameSlider.label = $"Frame:";
+				_frameSlider.value = 0;
+				_frameSlider.lowValue = 0;
+				_frameSlider.highValue = 0;
+				_currentPlayerSession.ClearDebugReport();
+				_assetListViewer.ClearView();
+				_bundleListViewer.ClearView();
+			}
+		}
+
 		private RemotePlayerSession GetOrCreatePlayerSession(int playerId)
 		{
 			if (_playerSessions.TryGetValue(playerId, out RemotePlayerSession session))
@@ -155,10 +219,26 @@ namespace YooAsset.Editor
 				return newSession;
 			}
 		}
-		private void RemovePlayerSession(int playerId)
+		private void UpdateFrameView(RemotePlayerSession playerSession)
 		{
-			if (_playerSessions.ContainsKey(playerId))
-				_playerSessions.Remove(playerId);
+			if (playerSession != null)
+			{
+				UpdateFrameView(playerSession, playerSession.MaxRangeValue);
+			}
+		}
+		private void UpdateFrameView(RemotePlayerSession playerSession, int rangeIndex)
+		{
+			if (playerSession == null)
+				return;
+
+			var debugReport = playerSession.GetDebugReport(rangeIndex);
+			if (debugReport != null)
+			{
+				_currentReport = debugReport;
+				_frameSlider.label = $"Frame: {debugReport.FrameCount}";
+				_assetListViewer.FillViewData(debugReport, _searchKeyWord);
+				_bundleListViewer.FillViewData(debugReport, _searchKeyWord);
+			}
 		}
 
 		private void SampleBtn_onClick()
@@ -174,13 +254,13 @@ namespace YooAsset.Editor
 		private void OnSearchKeyWordChange(ChangeEvent<string> e)
 		{
 			_searchKeyWord = e.newValue;
-			if (_debugReport != null)
+			if (_currentReport != null)
 			{
-				_assetListViewer.FillViewData(_debugReport, _searchKeyWord);
-				_bundleListViewer.FillViewData(_debugReport, _searchKeyWord);
+				_assetListViewer.FillViewData(_currentReport, _searchKeyWord);
+				_bundleListViewer.FillViewData(_currentReport, _searchKeyWord);
 			}
 		}
-		private void ViewModeMenuAction(DropdownMenuAction action)
+		private void OnViewModeMenuChange(DropdownMenuAction action)
 		{
 			var viewMode = (EViewMode)action.userData;
 			if (_viewMode != viewMode)
@@ -188,11 +268,24 @@ namespace YooAsset.Editor
 				_viewMode = viewMode;
 				VisualElement root = this.rootVisualElement;
 				_viewModeMenu.text = viewMode.ToString();
-				_assetListViewer.AttachParent(root);
-				_bundleListViewer.DetachParent();
+
+				if (viewMode == EViewMode.AssetView)
+				{
+					_assetListViewer.AttachParent(root);
+					_bundleListViewer.DetachParent();
+				}
+				else if (viewMode == EViewMode.BundleView)
+				{
+					_assetListViewer.DetachParent();
+					_bundleListViewer.AttachParent(root);
+				}
+				else
+				{
+					throw new NotImplementedException(viewMode.ToString());
+				}
 			}
 		}
-		private DropdownMenuAction.Status ViewModeMenuFun(DropdownMenuAction action)
+		private DropdownMenuAction.Status OnViewModeMenuStatusUpdate(DropdownMenuAction action)
 		{
 			var viewMode = (EViewMode)action.userData;
 			if (_viewMode == viewMode)

Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebuggerWindow.uxml

@@ -1,8 +1,14 @@
 <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:Toolbar name="TopToolbar" style="display: flex;">
         <ui:Label text="Player" display-tooltip-when-elided="true" name="PlayerName" style="width: 200px; -unity-text-align: middle-left; padding-left: 5px;" />
         <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>
+    <uie:Toolbar name="FrameToolbar">
+        <ui:SliderInt picking-mode="Ignore" label="Frame:" value="42" high-value="100" name="FrameSlider" style="flex-grow: 1;" />
+        <uie:ToolbarButton text=" &lt;&lt; " display-tooltip-when-elided="true" name="FrameLast" />
+        <uie:ToolbarButton text=" &gt;&gt; " display-tooltip-when-elided="true" name="FrameNext" />
+        <uie:ToolbarButton text="Clear" display-tooltip-when-elided="true" name="FrameClear" />
+    </uie:Toolbar>
 </ui:UXML>

Assets/YooAsset/Editor/AssetBundleDebugger/RemotePlayerSession.cs

@@ -18,6 +18,24 @@ namespace YooAsset.Editor
 		/// </summary>
 		public int MaxReportCount { private set; get; }
 
+		public int MinRangeValue
+		{
+			get
+			{
+				return 0;
+			}
+		}
+		public int MaxRangeValue
+		{
+			get
+			{
+				int index = _reportList.Count - 1;
+				if (index < 0)
+					index = 0;
+				return index;
+			}
+		}
+
 
 		public RemotePlayerSession(int playerId, int maxReportCount = 1000)
 		{
@@ -25,6 +43,14 @@ namespace YooAsset.Editor
 			MaxReportCount = maxReportCount;
 		}
 
+		/// <summary>
+		/// 清理缓存数据
+		/// </summary>
+		public void ClearDebugReport()
+		{
+			_reportList.Clear();
+		}
+
 		/// <summary>
 		/// 添加一个调试报告
 		/// </summary>
@@ -39,13 +65,29 @@ namespace YooAsset.Editor
 		}
 
 		/// <summary>
-		/// 获取最近一次的报告
+		/// 获取调试报告
 		/// </summary>
-		public DebugReport GetLatestReport()
+		public DebugReport GetDebugReport(int rangeIndex)
 		{
 			if (_reportList.Count == 0)
 				return null;
-			return _reportList[_reportList.Count - 1];
+			if (rangeIndex < 0 || rangeIndex >= _reportList.Count)
+				return null;
+			return _reportList[rangeIndex];
+		}
+
+		/// <summary>
+		/// 规范索引值
+		/// </summary>
+		public int ClampRangeIndex(int rangeIndex)
+		{
+			if (rangeIndex < 0)
+				return 0;
+
+			if (rangeIndex > MaxRangeValue)
+				return MaxRangeValue;
+
+			return rangeIndex;
 		}
 	}
 }

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

@@ -47,6 +47,18 @@ namespace YooAsset.Editor
 			_dependListView.bindItem = BindDependListViewItem;
 		}
 
+		/// <summary>
+		/// 清空页面
+		/// </summary>
+		public void ClearView()
+		{
+			_debugReport = null;
+			_assetListView.Clear();
+			_assetListView.ClearSelection();
+			_assetListView.itemsSource.Clear();
+			_assetListView.Rebuild();
+		}
+
 		/// <summary>
 		/// 填充页面数据
 		/// </summary>
@@ -247,7 +259,7 @@ namespace YooAsset.Editor
 		{
 			_dependListView.Clear();
 			_dependListView.ClearSelection();
-			_dependListView.itemsSource = providerInfo.BundleInfos;
+			_dependListView.itemsSource = providerInfo.DependBundleInfos;
 			_dependListView.Rebuild();
 		}
 	}

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

@@ -46,6 +46,18 @@ namespace YooAsset.Editor
 			_usingListView.makeItem = MakeIncludeListViewItem;
 			_usingListView.bindItem = BindIncludeListViewItem;
 		}
+		
+		/// <summary>
+		/// 清空页面
+		/// </summary>
+		public void ClearView()
+		{
+			_debugReport = null;
+			_bundleListView.Clear();
+			_bundleListView.ClearSelection();
+			_bundleListView.itemsSource.Clear();
+			_bundleListView.Rebuild();
+		}
 
 		/// <summary>
 		/// 填充页面数据
@@ -63,7 +75,7 @@ namespace YooAsset.Editor
 			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.DependBundleInfos)
 				{
 					if (string.IsNullOrEmpty(searchKeyWord) == false)
 					{
@@ -252,7 +264,7 @@ namespace YooAsset.Editor
 			List<DebugProviderInfo> source = new List<DebugProviderInfo>();
 			foreach (var providerInfo in _debugReport.ProviderInfos)
 			{
-				foreach (var bundleInfo in providerInfo.BundleInfos)
+				foreach (var bundleInfo in providerInfo.DependBundleInfos)
 				{
 					if (bundleInfo.BundleName == bundleName)
 					{

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

@@ -310,11 +310,11 @@ namespace YooAsset.Editor
 
 			// Size
 			var label2 = element.Q<Label>("Label2");
-			label2.text = EditorUtility.FormatBytes(bundleInfo.SizeBytes);
+			label2.text = EditorUtility.FormatBytes(bundleInfo.FileSize);
 
 			// Hash
 			var label3 = element.Q<Label>("Label3");
-			label3.text = bundleInfo.Hash;
+			label3.text = bundleInfo.FileHash;
 		}
 	}
 }

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

@@ -122,9 +122,9 @@ namespace YooAsset.Editor
 			else if (_sortMode == ESortMode.BundleSize)
 			{
 				if (_descendingSort)
-					return result.OrderByDescending(a => a.SizeBytes).ToList();
+					return result.OrderByDescending(a => a.FileSize).ToList();
 				else
-					return result.OrderBy(a => a.SizeBytes).ToList();
+					return result.OrderBy(a => a.FileSize).ToList();
 			}
 			else if (_sortMode == ESortMode.BundleTags)
 			{
@@ -249,11 +249,11 @@ namespace YooAsset.Editor
 
 			// Size
 			var label2 = element.Q<Label>("Label2");
-			label2.text = EditorUtility.FormatBytes(bundleInfo.SizeBytes);
+			label2.text = EditorUtility.FormatBytes(bundleInfo.FileSize);
 
 			// Hash
 			var label3 = element.Q<Label>("Label3");
-			label3.text = bundleInfo.Hash;
+			label3.text = bundleInfo.FileHash;
 
 			// Tags
 			var label5 = element.Q<Label>("Label5");
@@ -275,7 +275,7 @@ namespace YooAsset.Editor
 				return;
 
 			string rootDirectory = Path.GetDirectoryName(_reportFilePath);
-			string filePath = $"{rootDirectory}/{bundleInfo.Hash}";
+			string filePath = $"{rootDirectory}/{bundleInfo.FileName}";
 			if (File.Exists(filePath))
 				Selection.activeObject = AssetBundleRecorder.GetAssetBundle(filePath);
 			else

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

@@ -58,23 +58,22 @@ namespace YooAsset.Editor
 			_buildReport = buildReport;
 			
 			_items.Clear();
+
+			_items.Add(new ItemWrapper("YooAsset版本", buildReport.Summary.YooVersion));
 			_items.Add(new ItemWrapper("引擎版本", buildReport.Summary.UnityVersion));
-			_items.Add(new ItemWrapper("构建时间", buildReport.Summary.BuildTime));
+			_items.Add(new ItemWrapper("构建时间", buildReport.Summary.BuildDate));
 			_items.Add(new ItemWrapper("构建耗时", $"{buildReport.Summary.BuildSeconds}秒"));
 			_items.Add(new ItemWrapper("构建平台", $"{buildReport.Summary.BuildTarget}"));
+			_items.Add(new ItemWrapper("构建管线", $"{buildReport.Summary.BuildPipeline}"));
 			_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.BuildPackage}"));
 
 			_items.Add(new ItemWrapper("启用可寻址资源定位", $"{buildReport.Summary.EnableAddressable}"));
-			_items.Add(new ItemWrapper("追加文件扩展名", $"{buildReport.Summary.AppendFileExtension}"));
-			_items.Add(new ItemWrapper("拷贝内置资源文件", $"{buildReport.Summary.CopyBuildinTagFiles}"));
-			_items.Add(new ItemWrapper("自动收集着色器", $"{buildReport.Summary.AutoCollectShaders}"));
-			_items.Add(new ItemWrapper("着色器资源包名称", $"{buildReport.Summary.ShadersBundleName}"));
 			_items.Add(new ItemWrapper("加密服务类名称", $"{buildReport.Summary.EncryptionServicesClassName}"));
 
 			_items.Add(new ItemWrapper(string.Empty, string.Empty));
 			_items.Add(new ItemWrapper("构建参数", string.Empty));
+			_items.Add(new ItemWrapper("OutputNameStyle", $"{buildReport.Summary.OutputNameStyle}"));
 			_items.Add(new ItemWrapper("CompressOption", $"{buildReport.Summary.CompressOption}"));
 			_items.Add(new ItemWrapper("DisableWriteTypeTree", $"{buildReport.Summary.DisableWriteTypeTree}"));
 			_items.Add(new ItemWrapper("IgnoreTypeTreeChanges", $"{buildReport.Summary.IgnoreTypeTreeChanges}"));
@@ -82,10 +81,9 @@ namespace YooAsset.Editor
 			_items.Add(new ItemWrapper(string.Empty, string.Empty));
 			_items.Add(new ItemWrapper("构建结果", string.Empty));
 			_items.Add(new ItemWrapper("构建文件总数", $"{buildReport.Summary.AssetFileTotalCount}"));
+			_items.Add(new ItemWrapper("主资源总数", $"{buildReport.Summary.MainAssetTotalCount}"));
 			_items.Add(new ItemWrapper("资源包总数", $"{buildReport.Summary.AllBundleTotalCount}"));
 			_items.Add(new ItemWrapper("资源包总大小", ConvertSize(buildReport.Summary.AllBundleTotalSize)));
-			_items.Add(new ItemWrapper("内置资源包总数", $"{buildReport.Summary.BuildinBundleTotalCount}"));
-			_items.Add(new ItemWrapper("内置资源包总大小", ConvertSize(buildReport.Summary.BuildinBundleTotalSize)));
 			_items.Add(new ItemWrapper("加密资源包总数", $"{buildReport.Summary.EncryptedBundleTotalCount}"));
 			_items.Add(new ItemWrapper("加密资源包总大小", ConvertSize(buildReport.Summary.EncryptedBundleTotalSize)));
 			_items.Add(new ItemWrapper("原生资源包总数", $"{buildReport.Summary.RawBundleTotalCount}"));

Assets/YooAsset/Editor/EditorTools.cs

@@ -7,6 +7,7 @@ using System.IO;
 using System.Text;
 using UnityEngine;
 using UnityEditor;
+using UnityEditor.SceneManagement;
 
 namespace YooAsset.Editor
 {
@@ -212,6 +213,11 @@ namespace YooAsset.Editor
 		public static void FocusUnitySceneWindow()
 		{
 			EditorWindow.FocusWindowIfItsOpen<SceneView>();
+		} 
+		public static void CloseUnityGameWindow() 
+		{ 
+			System.Type T = Assembly.Load("UnityEditor").GetType("UnityEditor.GameView"); 
+			EditorWindow.GetWindow(T, false, "GameView", true).Close(); 
 		}
 		public static void FocusUnityGameWindow()
 		{
@@ -265,6 +271,20 @@ namespace YooAsset.Editor
 		}
 		#endregion
 
+		#region SceneUtility
+		public static bool HasDirtyScenes()
+		{
+			var sceneCount = EditorSceneManager.sceneCount;
+			for (var i = 0; i < sceneCount; ++i)
+			{
+				var scene = EditorSceneManager.GetSceneAt(i);
+				if (scene.isDirty)
+					return true;
+			}
+			return false;
+		}
+		#endregion
+
 		#region 文件
 		/// <summary>
 		/// 创建文件所在的目录
@@ -333,6 +353,9 @@ namespace YooAsset.Editor
 		/// </summary>
 		public static void FileMoveTo(string filePath, string destPath)
 		{
+			if (File.Exists(destPath))
+				File.Delete(destPath);
+
 			FileInfo fileInfo = new FileInfo(filePath);
 			fileInfo.MoveTo(destPath);
 		}

Assets/YooAsset/Editor/ShaderVariantCollector/ShaderVariantCollectionHelper.cs

@@ -10,103 +10,31 @@ namespace YooAsset.Editor
 {
 	public static class ShaderVariantCollectionHelper
 	{
-		[Serializable]
-		public class ShaderVariantWrapper
+		public static void ClearCurrentShaderVariantCollection()
 		{
-			/// <summary>
-			/// Shader asset path in editor.
-			/// </summary>
-			public string AssetPath;
-
-			/// <summary>
-			/// Shader name.
-			/// </summary>
-			public string ShaderName;
-
-			/// <summary>
-			///  Pass type to use in this variant.
-			/// </summary>
-			public PassType PassType;
-
-			/// <summary>
-			/// Array of shader keywords to use in this variant.
-			/// </summary>
-			public string[] Keywords;
-
-			public ShaderVariantWrapper(string assetPath, string shaderName, PassType passType, params string[] keywords)
-			{
-				AssetPath = assetPath;
-				ShaderName = shaderName;
-				PassType = passType;
-				Keywords = keywords;
-			}
+			EditorTools.InvokeNonPublicStaticMethod(typeof(ShaderUtil), "ClearCurrentShaderVariantCollection");
+		}
+		public static void SaveCurrentShaderVariantCollection(string savePath)
+		{
+			EditorTools.InvokeNonPublicStaticMethod(typeof(ShaderUtil), "SaveCurrentShaderVariantCollection", savePath);
+		}
+		public static int GetCurrentShaderVariantCollectionShaderCount()
+		{
+			return (int)EditorTools.InvokeNonPublicStaticMethod(typeof(ShaderUtil), "GetCurrentShaderVariantCollectionShaderCount");
+		}
+		public static int GetCurrentShaderVariantCollectionVariantCount()
+		{
+			return (int)EditorTools.InvokeNonPublicStaticMethod(typeof(ShaderUtil), "GetCurrentShaderVariantCollectionVariantCount");
 		}
 
-		[Serializable]
-		public class ShaderVariantCollectionWrapper
+		/// <summary>
+		/// 获取着色器的变种总数量
+		/// </summary>
+		public static string GetShaderVariantCount(string assetPath)
 		{
-			/// <summary>
-			/// Number of shaders in this collection
-			/// </summary>
-			public int ShaderCount;
-
-			/// <summary>
-			/// Number of total varians in this collection
-			/// </summary>
-			public int VariantCount;
-
-			/// <summary>
-			/// Shader variants list.
-			/// </summary>
-			public List<ShaderVariantWrapper> ShaderVariants = new List<ShaderVariantWrapper>(1000);
-
-			public void Add(ShaderVariantWrapper variant)
-			{
-				ShaderVariants.Add(variant);
-			}
-		}
-
-
-		public static ShaderVariantCollectionWrapper Extract(ShaderVariantCollection svc)
-		{
-			var result = new ShaderVariantCollectionWrapper();
-			using (var so = new SerializedObject(svc))
-			{
-				var shaderArray = so.FindProperty("m_Shaders.Array");
-				if (shaderArray != null && shaderArray.isArray)
-				{
-					for (int i = 0; i < shaderArray.arraySize; ++i)
-					{
-						var shaderRef = shaderArray.FindPropertyRelative($"data[{i}].first");
-						var shaderVariantsArray = shaderArray.FindPropertyRelative($"data[{i}].second.variants");
-						if (shaderRef != null && shaderRef.propertyType == SerializedPropertyType.ObjectReference && shaderVariantsArray != null && shaderVariantsArray.isArray)
-						{
-							var shader = shaderRef.objectReferenceValue as Shader;
-							if (shader == null)
-							{
-								throw new Exception("Invalid shader in ShaderVariantCollection file.");
-							}
-
-							string shaderAssetPath = AssetDatabase.GetAssetPath(shader);
-							string shaderName = shader.name;
-
-							// 添加变种信息
-							for (int j = 0; j < shaderVariantsArray.arraySize; ++j)
-							{
-								var propKeywords = shaderVariantsArray.FindPropertyRelative($"Array.data[{j}].keywords");
-								var propPassType = shaderVariantsArray.FindPropertyRelative($"Array.data[{j}].passType");
-								if (propKeywords != null && propPassType != null && propKeywords.propertyType == SerializedPropertyType.String)
-								{
-									string[] keywords = propKeywords.stringValue.Split(' ');
-									PassType pathType = (PassType)propPassType.intValue;
-									result.Add(new ShaderVariantWrapper(shaderAssetPath, shaderName, pathType, keywords));
-								}
-							}
-						}
-					}
-				}
-			}
-			return result;
+			Shader shader = AssetDatabase.LoadAssetAtPath<Shader>(assetPath);
+			var variantCount = EditorTools.InvokeNonPublicStaticMethod(typeof(ShaderUtil), "GetVariantCount", shader, true);
+			return variantCount.ToString();
 		}
 	}
 }

Assets/YooAsset/Editor/ShaderVariantCollector/ShaderVariantCollectionManifest.cs

@@ -0,0 +1,145 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using UnityEngine;
+using UnityEngine.Rendering;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+	public static class ShaderVariantCollectionReadme
+	{
+		[Serializable]
+		public class ShaderVariantElement
+		{
+			/// <summary>
+			///  Pass type to use in this variant.
+			/// </summary>
+			public PassType PassType;
+
+			/// <summary>
+			/// Array of shader keywords to use in this variant.
+			/// </summary>
+			public string[] Keywords;
+		}
+
+		[Serializable]
+		public class ShaderVariantInfo
+		{
+			/// <summary>
+			/// Shader asset path in editor.
+			/// </summary>
+			public string AssetPath;
+
+			/// <summary>
+			/// Shader name.
+			/// </summary>
+			public string ShaderName;
+
+			/// <summary>
+			/// Shader variants elements list.
+			/// </summary>
+			public List<ShaderVariantElement> ShaderVariantElements = new List<ShaderVariantElement>(1000);
+		}
+
+		[Serializable]
+		public class ShaderVariantCollectionManifest
+		{
+			/// <summary>
+			/// Number of shaders in this collection
+			/// </summary>
+			public int ShaderTotalCount;
+
+			/// <summary>
+			/// Number of total varians in this collection
+			/// </summary>
+			public int VariantTotalCount;
+
+			/// <summary>
+			/// Shader variants info list.
+			/// </summary>
+			public List<ShaderVariantInfo> ShaderVariantInfos = new List<ShaderVariantInfo>(1000);
+
+			/// <summary>
+			/// 添加着色器变种信息
+			/// </summary>
+			public void AddShaderVariant(string assetPath, string shaderName, PassType passType, string[] keywords)
+			{
+				var info = GetOrCreateShaderVariantInfo(assetPath, shaderName);
+				ShaderVariantElement element = new ShaderVariantElement();
+				element.PassType = passType;
+				element.Keywords = keywords;
+				info.ShaderVariantElements.Add(element);
+			}
+			private ShaderVariantInfo GetOrCreateShaderVariantInfo(string assetPath, string shaderName)
+			{
+				var selectList = ShaderVariantInfos.Where(t => t.ShaderName == shaderName && t.AssetPath == assetPath).ToList();
+				if (selectList.Count == 0)
+				{
+					ShaderVariantInfo newInfo = new ShaderVariantInfo();
+					newInfo.AssetPath = assetPath;
+					newInfo.ShaderName = shaderName;
+					ShaderVariantInfos.Add(newInfo);
+					return newInfo;
+				}
+
+				if (selectList.Count != 1)
+					throw new Exception("Should never get here !");
+
+				return selectList[0];
+			}
+		}
+
+
+		/// <summary>
+		/// 解析SVC文件并将数据写入到清单
+		/// </summary>
+		public static ShaderVariantCollectionManifest Extract(ShaderVariantCollection svc)
+		{
+			var manifest = new ShaderVariantCollectionManifest();
+			manifest.ShaderTotalCount = ShaderVariantCollectionHelper.GetCurrentShaderVariantCollectionShaderCount();
+			manifest.VariantTotalCount = ShaderVariantCollectionHelper.GetCurrentShaderVariantCollectionVariantCount();
+
+			using (var so = new SerializedObject(svc))
+			{
+				var shaderArray = so.FindProperty("m_Shaders.Array");
+				if (shaderArray != null && shaderArray.isArray)
+				{
+					for (int i = 0; i < shaderArray.arraySize; ++i)
+					{
+						var shaderRef = shaderArray.FindPropertyRelative($"data[{i}].first");
+						var shaderVariantsArray = shaderArray.FindPropertyRelative($"data[{i}].second.variants");
+						if (shaderRef != null && shaderRef.propertyType == SerializedPropertyType.ObjectReference && shaderVariantsArray != null && shaderVariantsArray.isArray)
+						{
+							var shader = shaderRef.objectReferenceValue as Shader;
+							if (shader == null)
+							{
+								throw new Exception("Invalid shader in ShaderVariantCollection file.");
+							}
+
+							string shaderAssetPath = AssetDatabase.GetAssetPath(shader);
+							string shaderName = shader.name;
+
+							// 添加变种信息
+							for (int j = 0; j < shaderVariantsArray.arraySize; ++j)
+							{
+								var propKeywords = shaderVariantsArray.FindPropertyRelative($"Array.data[{j}].keywords");
+								var propPassType = shaderVariantsArray.FindPropertyRelative($"Array.data[{j}].passType");
+								if (propKeywords != null && propPassType != null && propKeywords.propertyType == SerializedPropertyType.String)
+								{
+									string[] keywords = propKeywords.stringValue.Split(' ');
+									PassType pathType = (PassType)propPassType.intValue;
+									manifest.AddShaderVariant(shaderAssetPath, shaderName, pathType, keywords);
+								}
+							}
+						}
+					}
+				}
+			}
+
+			return manifest;
+		}
+	}
+}

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

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

Assets/YooAsset/Editor/ShaderVariantCollector/ShaderVariantCollector.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -6,21 +6,18 @@ using System.IO;
 using UnityEngine;
 using UnityEditor;
 using UnityEditor.SceneManagement;
+using Debug = UnityEngine.Debug;
 
 namespace YooAsset.Editor
 {
-	[InitializeOnLoad]
 	public static class ShaderVariantCollector
 	{
 		private const float WaitMilliseconds = 1000f;
 		private static string _saveFilePath;
 		private static bool _isStarted = false;
 		private static readonly Stopwatch _elapsedTime = new Stopwatch();
+		private static Action _completedCallback;
 
-		static ShaderVariantCollector()
-		{
-			EditorApplication.update += EditorUpdate;
-		}
 		private static void EditorUpdate()
 		{
 			// 注意：一定要延迟保存才会起效
@@ -28,34 +25,23 @@ namespace YooAsset.Editor
 			{
 				_isStarted = false;
 				_elapsedTime.Stop();
+				EditorApplication.update -= EditorUpdate;
 
 				// 保存结果
-				SaveCurrentShaderVariantCollection();
+				ShaderVariantCollectionHelper.SaveCurrentShaderVariantCollection(_saveFilePath);
 
 				// 创建说明文件
 				CreateReadme();
-			}
-		}
-		private static void CreateReadme()
-		{
-			AssetDatabase.Refresh(ImportAssetOptions.ForceUpdate);
 
-			ShaderVariantCollection svc = AssetDatabase.LoadAssetAtPath<ShaderVariantCollection>(_saveFilePath);
-			if(svc != null)
-			{
-				var wrapper = ShaderVariantCollectionHelper.Extract(svc);
-				string jsonContents = JsonUtility.ToJson(wrapper, true);
-				string savePath = _saveFilePath.Replace(".shadervariants", ".json");
-				File.WriteAllText(savePath, jsonContents);
+				Debug.Log($"搜集SVC完毕！");
+				_completedCallback?.Invoke();
 			}
-
-			AssetDatabase.Refresh(ImportAssetOptions.ForceUpdate);
 		}
 
 		/// <summary>
 		/// 开始收集
 		/// </summary>
-		public static void Run(string saveFilePath)
+		public static void Run(string saveFilePath, Action completedCallback)
 		{
 			if (_isStarted)
 				return;
@@ -64,14 +50,18 @@ namespace YooAsset.Editor
 				saveFilePath = $"{saveFilePath}.shadervariants";
 			if (Path.GetExtension(saveFilePath) != ".shadervariants")
 				throw new System.Exception("Shader variant file extension is invalid.");
+
+			// 注意：先删除再保存，否则ShaderVariantCollection内容将无法及时刷新
+			AssetDatabase.DeleteAsset(ShaderVariantCollectorSettingData.Setting.SavePath);		
 			EditorTools.CreateFileDirectory(saveFilePath);
 			_saveFilePath = saveFilePath;
+			_completedCallback = completedCallback;
 
 			// 聚焦到游戏窗口
 			EditorTools.FocusUnityGameWindow();
 
 			// 清空旧数据
-			ClearCurrentShaderVariantCollection();
+			ShaderVariantCollectionHelper.ClearCurrentShaderVariantCollection();
 
 			// 创建临时测试场景
 			CreateTemperScene();
@@ -80,11 +70,10 @@ namespace YooAsset.Editor
 			var materials = GetAllMaterials();
 			CollectVariants(materials);
 
+			EditorApplication.update += EditorUpdate;
 			_isStarted = true;
 			_elapsedTime.Reset();
 			_elapsedTime.Start();
-
-			UnityEngine.Debug.LogWarning("已经启动着色器变种收集工作，该工具只支持在编辑器下人工操作！");
 		}
 
 		private static void CreateTemperScene()
@@ -98,7 +87,7 @@ namespace YooAsset.Editor
 			List<string> allAssets = new List<string>(1000);
 
 			// 获取所有打包的资源
-			List<CollectAssetInfo> allCollectInfos = AssetBundleCollectorSettingData.Setting.GetAllCollectAssets(EBuildMode.DryRunBuild);
+			List<CollectAssetInfo> allCollectInfos = AssetBundleCollectorSettingData.Setting.GetAllPackageAssets(EBuildMode.DryRunBuild);
 			List<string> collectAssets = allCollectInfos.Select(t => t.AssetPath).ToList();
 			foreach (var assetPath in collectAssets)
 			{
@@ -149,7 +138,7 @@ namespace YooAsset.Editor
 		private static void CollectVariants(List<Material> materials)
 		{
 			Camera camera = Camera.main;
-			if(camera == null)
+			if (camera == null)
 				throw new System.Exception("Not found main camera.");
 
 			// 设置主相机
@@ -192,22 +181,20 @@ namespace YooAsset.Editor
 			go.transform.position = position;
 			go.name = $"Sphere_{index}|{material.name}";
 		}
+		private static void CreateReadme()
+		{
+			AssetDatabase.Refresh(ImportAssetOptions.ForceUpdate);
 
-		private static void ClearCurrentShaderVariantCollection()
-		{
-			EditorTools.InvokeNonPublicStaticMethod(typeof(ShaderUtil), "ClearCurrentShaderVariantCollection");
-		}
-		private static void SaveCurrentShaderVariantCollection()
-		{
-			EditorTools.InvokeNonPublicStaticMethod(typeof(ShaderUtil), "SaveCurrentShaderVariantCollection", _saveFilePath);
-		}
-		public static int GetCurrentShaderVariantCollectionShaderCount()
-		{
-			return (int)EditorTools.InvokeNonPublicStaticMethod(typeof(ShaderUtil), "GetCurrentShaderVariantCollectionShaderCount");
-		}
-		public static int GetCurrentShaderVariantCollectionVariantCount()
-		{
-			return (int)EditorTools.InvokeNonPublicStaticMethod(typeof(ShaderUtil), "GetCurrentShaderVariantCollectionVariantCount");
+			ShaderVariantCollection svc = AssetDatabase.LoadAssetAtPath<ShaderVariantCollection>(_saveFilePath);
+			if (svc != null)
+			{
+				var wrapper = ShaderVariantCollectionReadme.Extract(svc);
+				string jsonContents = JsonUtility.ToJson(wrapper, true);
+				string savePath = _saveFilePath.Replace(".shadervariants", "Manifest.json");
+				File.WriteAllText(savePath, jsonContents);
+			}
+
+			AssetDatabase.Refresh(ImportAssetOptions.ForceUpdate);
 		}
 	}
 }

Assets/YooAsset/Editor/ShaderVariantCollector/ShaderVariantCollectorWindow.cs

@@ -25,8 +25,8 @@ namespace YooAsset.Editor
 			EditorGUILayout.Space();
 			ShaderVariantCollectorSettingData.Setting.SavePath = EditorGUILayout.TextField("收集文件保存路径", ShaderVariantCollectorSettingData.Setting.SavePath);
 
-			int currentShaderCount = ShaderVariantCollector.GetCurrentShaderVariantCollectionShaderCount();
-			int currentVariantCount = ShaderVariantCollector.GetCurrentShaderVariantCollectionVariantCount();
+			int currentShaderCount = ShaderVariantCollectionHelper.GetCurrentShaderVariantCollectionShaderCount();
+			int currentVariantCount = ShaderVariantCollectionHelper.GetCurrentShaderVariantCollectionVariantCount();
 			EditorGUILayout.LabelField($"CurrentShaderCount : {currentShaderCount}");
 			EditorGUILayout.LabelField($"CurrentVariantCount : {currentVariantCount}");
 
@@ -34,7 +34,7 @@ namespace YooAsset.Editor
 			EditorGUILayout.Space();
 			if (GUILayout.Button("搜集变种", GUILayout.MaxWidth(80)))
 			{
-				ShaderVariantCollector.Run(ShaderVariantCollectorSettingData.Setting.SavePath);
+				ShaderVariantCollector.Run(ShaderVariantCollectorSettingData.Setting.SavePath, null);
 			}
 
 			// 查询

Assets/YooAsset/Editor/YooAsset.Editor.asmdef

@@ -2,7 +2,9 @@
     "name": "YooAsset.Editor",
     "rootNamespace": "",
     "references": [
-        "YooAsset"
+        "YooAsset",
+        "Unity.ScriptableBuildPipeline",
+        "Unity.ScriptableBuildPipeline.Editor"
     ],
     "includePlatforms": [
         "Editor"

Assets/YooAsset/Runtime/AssetSystem/AssetSystem.cs

@@ -6,29 +6,29 @@ using UnityEngine.SceneManagement;
 
 namespace YooAsset
 {
-	internal static class AssetSystem
+	internal class AssetSystemImpl
 	{
-		private static readonly List<AssetBundleLoaderBase> _loaders = new List<AssetBundleLoaderBase>(1000);
-		private static readonly List<ProviderBase> _providers = new List<ProviderBase>(1000);
-		private static readonly HashSet<AssetOperationHandle> _trackGameObjectHandles = new HashSet<AssetOperationHandle>();
-		private static readonly Dictionary<string, SceneOperationHandle> _sceneHandles = new Dictionary<string, SceneOperationHandle>(100);
-		private static bool _simulationOnEditor;
-		private static int _loadingMaxNumber;
+		private static string SceneRunningPackage = string.Empty;
 
-		public static bool AutoReleaseGameObjectHandle { private set; get; }
-		public static IDecryptionServices DecryptionServices { private set; get; }
-		public static IBundleServices BundleServices { private set; get; }
+		private readonly List<AssetBundleLoaderBase> _loaders = new List<AssetBundleLoaderBase>(1000);
+		private readonly List<ProviderBase> _providers = new List<ProviderBase>(1000);
+		private readonly Dictionary<string, SceneOperationHandle> _sceneHandles = new Dictionary<string, SceneOperationHandle>(100);
+
+		private long _sceneCreateCount = 0;
+		private bool _simulationOnEditor;
+		private int _loadingMaxNumber;
+		public IDecryptionServices DecryptionServices { private set; get; }
+		public IBundleServices BundleServices { private set; get; }
 
 
 		/// <summary>
 		/// 初始化
 		/// 注意：在使用AssetSystem之前需要初始化
 		/// </summary>
-		public static void Initialize(bool simulationOnEditor, int loadingMaxNumber, bool autoReleaseGameObjectHandle, IDecryptionServices decryptionServices, IBundleServices bundleServices)
+		public void Initialize(bool simulationOnEditor, int loadingMaxNumber, IDecryptionServices decryptionServices, IBundleServices bundleServices)
 		{
 			_simulationOnEditor = simulationOnEditor;
 			_loadingMaxNumber = loadingMaxNumber;
-			AutoReleaseGameObjectHandle = autoReleaseGameObjectHandle;
 			DecryptionServices = decryptionServices;
 			BundleServices = bundleServices;
 		}
@@ -36,7 +36,7 @@ namespace YooAsset
 		/// <summary>
 		/// 更新
 		/// </summary>
-		public static void Update()
+		public void Update()
 		{
 			// 更新加载器	
 			foreach (var loader in _loaders)
@@ -69,7 +69,7 @@ namespace YooAsset
 		/// <summary>
 		/// 销毁
 		/// </summary>
-		public static void DestroyAll()
+		public void DestroyAll()
 		{
 			_loaders.Clear();
 			_providers.Clear();
@@ -82,13 +82,8 @@ namespace YooAsset
 		/// <summary>
 		/// 资源回收（卸载引用计数为零的资源）
 		/// </summary>
-		public static void UnloadUnusedAssets()
+		public void UnloadUnusedAssets()
 		{
-			if (AutoReleaseGameObjectHandle)
-			{
-				CheckAutoReleaseGameObjectHandle();
-			}
-
 			if (_simulationOnEditor)
 			{
 				for (int i = _providers.Count - 1; i >= 0; i--)
@@ -122,7 +117,7 @@ namespace YooAsset
 		/// <summary>
 		/// 强制回收所有资源
 		/// </summary>
-		public static void ForceUnloadAllAssets()
+		public void ForceUnloadAllAssets()
 		{
 			foreach (var provider in _providers)
 			{
@@ -143,19 +138,27 @@ namespace YooAsset
 		/// <summary>
 		/// 加载场景
 		/// </summary>
-		public static SceneOperationHandle LoadSceneAsync(AssetInfo assetInfo, LoadSceneMode sceneMode, bool activateOnLoad, int priority)
+		public SceneOperationHandle LoadSceneAsync(AssetInfo assetInfo, LoadSceneMode sceneMode, bool activateOnLoad, int priority)
 		{
 			if (assetInfo.IsInvalid)
 			{
-				YooLogger.Warning(assetInfo.Error);
 				CompletedProvider completedProvider = new CompletedProvider(assetInfo);
+				completedProvider.SetCompleted(assetInfo.Error);
 				return completedProvider.CreateHandle<SceneOperationHandle>();
 			}
 
-			// 注意：场景句柄永远保持唯一
-			string providerGUID = assetInfo.ProviderGUID;
-			if (_sceneHandles.ContainsKey(providerGUID))
-				return _sceneHandles[providerGUID];
+			// 注意：场景只允许运行在一个资源包内
+			if (string.IsNullOrEmpty(SceneRunningPackage))
+			{
+				SceneRunningPackage = BundleServices.GetPackageName();
+			}
+			if (BundleServices.GetPackageName() != SceneRunningPackage)
+			{
+				CompletedProvider completedProvider = new CompletedProvider(assetInfo);
+				string error = $"Scene are allowed to running within only {SceneRunningPackage}";
+				completedProvider.SetCompleted(error);
+				return completedProvider.CreateHandle<SceneOperationHandle>();
+			}
 
 			// 如果加载的是主场景，则卸载所有缓存的场景
 			if (sceneMode == LoadSceneMode.Single)
@@ -163,13 +166,14 @@ namespace YooAsset
 				UnloadAllScene();
 			}
 
-			ProviderBase provider = TryGetProvider(providerGUID);
-			if (provider == null)
+			// 注意：同一个场景的ProviderGUID每次加载都会变化
+			string providerGUID = $"{assetInfo.GUID}-{++_sceneCreateCount}";
+			ProviderBase provider;
 			{
 				if (_simulationOnEditor)
-					provider = new DatabaseSceneProvider(assetInfo, sceneMode, activateOnLoad, priority);
+					provider = new DatabaseSceneProvider(this, providerGUID, assetInfo, sceneMode, activateOnLoad, priority);
 				else
-					provider = new BundledSceneProvider(assetInfo, sceneMode, activateOnLoad, priority);
+					provider = new BundledSceneProvider(this, providerGUID, assetInfo, sceneMode, activateOnLoad, priority);
 				provider.InitSpawnDebugInfo();
 				_providers.Add(provider);
 			}
@@ -182,22 +186,23 @@ namespace YooAsset
 		/// <summary>
 		/// 加载资源对象
 		/// </summary>
-		public static AssetOperationHandle LoadAssetAsync(AssetInfo assetInfo)
+		public AssetOperationHandle LoadAssetAsync(AssetInfo assetInfo)
 		{
 			if (assetInfo.IsInvalid)
 			{
-				YooLogger.Warning(assetInfo.Error);
 				CompletedProvider completedProvider = new CompletedProvider(assetInfo);
+				completedProvider.SetCompleted(assetInfo.Error);
 				return completedProvider.CreateHandle<AssetOperationHandle>();
 			}
 
-			ProviderBase provider = TryGetProvider(assetInfo.ProviderGUID);
+			string providerGUID = assetInfo.GUID;
+			ProviderBase provider = TryGetProvider(providerGUID);
 			if (provider == null)
 			{
 				if (_simulationOnEditor)
-					provider = new DatabaseAssetProvider(assetInfo);
+					provider = new DatabaseAssetProvider(this, providerGUID, assetInfo);
 				else
-					provider = new BundledAssetProvider(assetInfo);
+					provider = new BundledAssetProvider(this, providerGUID, assetInfo);
 				provider.InitSpawnDebugInfo();
 				_providers.Add(provider);
 			}
@@ -207,54 +212,32 @@ namespace YooAsset
 		/// <summary>
 		/// 加载子资源对象
 		/// </summary>
-		public static SubAssetsOperationHandle LoadSubAssetsAsync(AssetInfo assetInfo)
+		public SubAssetsOperationHandle LoadSubAssetsAsync(AssetInfo assetInfo)
 		{
 			if (assetInfo.IsInvalid)
 			{
-				YooLogger.Warning(assetInfo.Error);
 				CompletedProvider completedProvider = new CompletedProvider(assetInfo);
+				completedProvider.SetCompleted(assetInfo.Error);
 				return completedProvider.CreateHandle<SubAssetsOperationHandle>();
 			}
 
-			ProviderBase provider = TryGetProvider(assetInfo.ProviderGUID);
+			string providerGUID = assetInfo.GUID;
+			ProviderBase provider = TryGetProvider(providerGUID);
 			if (provider == null)
 			{
 				if (_simulationOnEditor)
-					provider = new DatabaseSubAssetsProvider(assetInfo);
+					provider = new DatabaseSubAssetsProvider(this, providerGUID, assetInfo);
 				else
-					provider = new BundledSubAssetsProvider(assetInfo);
+					provider = new BundledSubAssetsProvider(this, providerGUID, assetInfo);
 				provider.InitSpawnDebugInfo();
 				_providers.Add(provider);
 			}
 			return provider.CreateHandle<SubAssetsOperationHandle>();
 		}
 
-		/// <summary>
-		/// 添加自动释放的游戏对象句柄
-		/// </summary>
-		public static void AddAutoReleaseGameObjectHandle(AssetOperationHandle handle)
+		internal void UnloadSubScene(ProviderBase provider)
 		{
-			if (_trackGameObjectHandles.Contains(handle) == false)
-				_trackGameObjectHandles.Add(handle);
-		}
-		private static void CheckAutoReleaseGameObjectHandle()
-		{
-			List<AssetOperationHandle> removeList = new List<AssetOperationHandle>();
-			foreach (var trackHandle in _trackGameObjectHandles)
-			{
-				trackHandle.CheckAutoReleaseHandle();
-				if (trackHandle.IsValidNoWarning == false)
-					removeList.Add(trackHandle);
-			}
-			foreach (var removeHandle in removeList)
-			{
-				_trackGameObjectHandles.Remove(removeHandle);
-			}
-		}
-
-		internal static void UnloadSubScene(ProviderBase provider)
-		{
-			string providerGUID = provider.MainAssetInfo.ProviderGUID;
+			string providerGUID = provider.ProviderGUID;
 			if (_sceneHandles.ContainsKey(providerGUID) == false)
 				throw new Exception("Should never get here !");
 
@@ -263,15 +246,9 @@ namespace YooAsset
 			_sceneHandles.Remove(providerGUID);
 
 			// 卸载未被使用的资源（包括场景）
-			AssetSystem.UnloadUnusedAssets();
-
-			// 检验子场景是否销毁
-			if (provider.IsDestroyed == false)
-			{
-				throw new Exception("Should never get here !");
-			}
+			UnloadUnusedAssets();
 		}
-		internal static void UnloadAllScene()
+		internal void UnloadAllScene()
 		{
 			// 释放所有场景句柄
 			foreach (var valuePair in _sceneHandles)
@@ -281,25 +258,15 @@ namespace YooAsset
 			_sceneHandles.Clear();
 
 			// 卸载未被使用的资源（包括场景）
-			AssetSystem.UnloadUnusedAssets();
-
-			// 检验所有场景是否销毁
-			foreach (var provider in _providers)
-			{
-				if (provider.IsSceneProvider())
-				{
-					if (provider.IsDestroyed == false)
-						throw new Exception("Should never get here !");
-				}
-			}
+			UnloadUnusedAssets();
 		}
 
-		internal static AssetBundleLoaderBase CreateOwnerAssetBundleLoader(AssetInfo assetInfo)
+		internal AssetBundleLoaderBase CreateOwnerAssetBundleLoader(AssetInfo assetInfo)
 		{
 			BundleInfo bundleInfo = BundleServices.GetBundleInfo(assetInfo);
 			return CreateAssetBundleLoaderInternal(bundleInfo);
 		}
-		internal static List<AssetBundleLoaderBase> CreateDependAssetBundleLoaders(AssetInfo assetInfo)
+		internal List<AssetBundleLoaderBase> CreateDependAssetBundleLoaders(AssetInfo assetInfo)
 		{
 			BundleInfo[] depends = BundleServices.GetAllDependBundleInfos(assetInfo);
 			List<AssetBundleLoaderBase> result = new List<AssetBundleLoaderBase>(depends.Length);
@@ -310,7 +277,7 @@ namespace YooAsset
 			}
 			return result;
 		}
-		internal static void RemoveBundleProviders(List<ProviderBase> providers)
+		internal void RemoveBundleProviders(List<ProviderBase> providers)
 		{
 			foreach (var provider in providers)
 			{
@@ -318,30 +285,30 @@ namespace YooAsset
 			}
 		}
 
-		private static AssetBundleLoaderBase CreateAssetBundleLoaderInternal(BundleInfo bundleInfo)
+		private AssetBundleLoaderBase CreateAssetBundleLoaderInternal(BundleInfo bundleInfo)
 		{
 			// 如果加载器已经存在
-			AssetBundleLoaderBase loader = TryGetAssetBundleLoader(bundleInfo.BundleName);
+			AssetBundleLoaderBase loader = TryGetAssetBundleLoader(bundleInfo.Bundle.BundleName);
 			if (loader != null)
 				return loader;
 
 			// 新增下载需求
 #if UNITY_WEBGL
-			loader = new AssetBundleWebLoader(bundleInfo);
+			loader = new AssetBundleWebLoader(this, bundleInfo);
 #else
-			loader = new AssetBundleFileLoader(bundleInfo);
+			loader = new AssetBundleFileLoader(this, bundleInfo);
 #endif
 
 			_loaders.Add(loader);
 			return loader;
 		}
-		private static AssetBundleLoaderBase TryGetAssetBundleLoader(string bundleName)
+		private AssetBundleLoaderBase TryGetAssetBundleLoader(string bundleName)
 		{
 			AssetBundleLoaderBase loader = null;
 			for (int i = 0; i < _loaders.Count; i++)
 			{
 				AssetBundleLoaderBase temp = _loaders[i];
-				if (temp.MainBundleInfo.BundleName.Equals(bundleName))
+				if (temp.MainBundleInfo.Bundle.BundleName.Equals(bundleName))
 				{
 					loader = temp;
 					break;
@@ -349,13 +316,13 @@ namespace YooAsset
 			}
 			return loader;
 		}
-		private static ProviderBase TryGetProvider(string providerGUID)
+		private ProviderBase TryGetProvider(string providerGUID)
 		{
 			ProviderBase provider = null;
 			for (int i = 0; i < _providers.Count; i++)
 			{
 				ProviderBase temp = _providers[i];
-				if (temp.MainAssetInfo.ProviderGUID.Equals(providerGUID))
+				if (temp.ProviderGUID.Equals(providerGUID))
 				{
 					provider = temp;
 					break;
@@ -364,35 +331,38 @@ namespace YooAsset
 			return provider;
 		}
 
-		#region 调试专属方法
-		internal static DebugReport GetDebugReport()
+		#region 调试信息
+		internal List<DebugProviderInfo> GetDebugReportInfos()
 		{
-			DebugReport report = new DebugReport();
-			report.FrameCount = Time.frameCount;
-			report.BundleCount = _loaders.Count;
-			report.AssetCount = _providers.Count;
-
+			List<DebugProviderInfo> result = new List<DebugProviderInfo>(_providers.Count);
 			foreach (var provider in _providers)
 			{
 				DebugProviderInfo providerInfo = new DebugProviderInfo();
+				providerInfo.PackageName = BundleServices.GetPackageName();
 				providerInfo.AssetPath = provider.MainAssetInfo.AssetPath;
 				providerInfo.SpawnScene = provider.SpawnScene;
 				providerInfo.SpawnTime = provider.SpawnTime;
 				providerInfo.RefCount = provider.RefCount;
 				providerInfo.Status = (int)provider.Status;
-				providerInfo.BundleInfos = new List<DebugBundleInfo>();
-				report.ProviderInfos.Add(providerInfo);
+				providerInfo.DependBundleInfos = new List<DebugBundleInfo>();
+				result.Add(providerInfo);
 
 				if (provider is BundledProvider)
 				{
 					BundledProvider temp = provider as BundledProvider;
-					temp.GetBundleDebugInfos(providerInfo.BundleInfos);
+					temp.GetBundleDebugInfos(providerInfo.DependBundleInfos);
 				}
 			}
-
-			// 重新排序
-			report.ProviderInfos.Sort();
-			return report;
+			return result;
+		}
+		internal List<BundleInfo> GetLoadedBundleInfos()
+		{
+			List<BundleInfo> result = new List<BundleInfo>(100);
+			foreach (var bundleLoader in _loaders)
+			{
+				result.Add(bundleLoader.MainBundleInfo);
+			}
+			return result;
 		}
 		#endregion
 	}

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

@@ -50,6 +50,17 @@ namespace YooAsset
 			}
 		}
 
+		/// <summary>
+		/// 获取资源对象
+		/// </summary>
+		/// <typeparam name="TAsset">资源类型</typeparam>
+		public TAsset GetAssetObject<TAsset>() where TAsset : UnityEngine.Object
+		{
+			if (IsValid == false)
+				return null;
+			return Provider.AssetObject as TAsset;
+		}
+
 		/// <summary>
 		/// 等待异步执行完毕
 		/// </summary>
@@ -76,7 +87,7 @@ namespace YooAsset
 		/// <returns></returns>
 		public GameObject InstantiateSync(Transform parent = null)
 		{
-			return InstantiateSyncInternal(Vector3.zero, Quaternion.identity, parent, false);
+			return InstantiateSyncInternal(Vector3.zero, Quaternion.identity, parent);
 		}
 
 		/// <summary>
@@ -87,7 +98,7 @@ namespace YooAsset
 		/// <param name="parent">父类对象</param>
 		public GameObject InstantiateSync(Vector3 position, Quaternion rotation, Transform parent = null)
 		{
-			return InstantiateSyncInternal(position, rotation, parent, true);
+			return InstantiateSyncInternal(position, rotation, parent);
 		}
 
 		/// <summary>
@@ -96,7 +107,7 @@ namespace YooAsset
 		/// <param name="parent">父类对象</param>
 		public InstantiateOperation InstantiateAsync(Transform parent = null)
 		{
-			return InstantiateAsyncInternal(Vector3.zero, Quaternion.identity, parent, false);
+			return InstantiateAsyncInternal(Vector3.zero, Quaternion.identity, parent);
 		}
 
 		/// <summary>
@@ -107,83 +118,25 @@ namespace YooAsset
 		/// <param name="parent">父类对象</param>
 		public InstantiateOperation InstantiateAsync(Vector3 position, Quaternion rotation, Transform parent = null)
 		{
-			return InstantiateAsyncInternal(position, rotation, parent, true);
+			return InstantiateAsyncInternal(position, rotation, parent);
 		}
 
 
-		private GameObject InstantiateSyncInternal(Vector3 position, Quaternion rotation, Transform parent, bool setPositionRotation)
+		private GameObject InstantiateSyncInternal(Vector3 position, Quaternion rotation, Transform parent)
 		{
 			if (IsValid == false)
 				return null;
 			if (Provider.AssetObject == null)
 				return null;
 
-			GameObject result;
-			if (setPositionRotation)
-			{
-				if (parent == null)
-					result = UnityEngine.Object.Instantiate(Provider.AssetObject as GameObject, position, rotation);
-				else
-					result = UnityEngine.Object.Instantiate(Provider.AssetObject as GameObject, position, rotation, parent);
-			}
-			else
-			{
-				if (parent == null)
-					result = UnityEngine.Object.Instantiate(Provider.AssetObject as GameObject);
-				else
-					result = UnityEngine.Object.Instantiate(Provider.AssetObject as GameObject, parent);
-			}
-
-			if (AssetSystem.AutoReleaseGameObjectHandle)
-			{
-				AddTrackGameObject(result);
-			}
-			return result;
+			GameObject clone = UnityEngine.Object.Instantiate(Provider.AssetObject as GameObject, position, rotation, parent);			
+			return clone;
 		}
-		private InstantiateOperation InstantiateAsyncInternal(Vector3 position, Quaternion rotation, Transform parent, bool setPositionRotation)
+		private InstantiateOperation InstantiateAsyncInternal(Vector3 position, Quaternion rotation, Transform parent)
 		{
-			InstantiateOperation operation = new InstantiateOperation(this, position, rotation, parent, setPositionRotation);
-			OperationSystem.StartOperaiton(operation);
-
-			if (AssetSystem.AutoReleaseGameObjectHandle)
-			{
-				operation.Completed += InstantiateOperationCompleted;
-			}
+			InstantiateOperation operation = new InstantiateOperation(this, position, rotation, parent);
+			OperationSystem.StartOperation(operation);
 			return operation;
 		}
-
-		#region 资源对象句柄相关
-		private readonly HashSet<GameObject> _trackGameObjects = new HashSet<GameObject>();
-		private void InstantiateOperationCompleted(AsyncOperationBase obj)
-		{
-			if (obj.Status == EOperationStatus.Succeed)
-			{
-				var op = obj as InstantiateOperation;
-				AddTrackGameObject(op.Result);
-			}
-		}
-		private void AddTrackGameObject(GameObject go)
-		{
-			if (go != null)
-			{
-				_trackGameObjects.Add(go);
-				AssetSystem.AddAutoReleaseGameObjectHandle(this);
-			}
-		}
-		internal void CheckAutoReleaseHandle()
-		{
-			if (IsValidNoWarning == false)
-				return;
-			if (_trackGameObjects.Count == 0)
-				return;
-
-			foreach (var go in _trackGameObjects)
-			{
-				if (go != null)
-					return;
-			}
-			ReleaseInternal();
-		}
-		#endregion
 	}
-}
+}

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

@@ -14,6 +14,15 @@ namespace YooAsset
 		}
 		internal abstract void InvokeCallback();
 
+
+		/// <summary>
+		/// 获取资源信息
+		/// </summary>
+		public AssetInfo GetAssetInfo()
+		{
+			return _assetInfo;
+		}
+
 		/// <summary>
 		/// 当前状态
 		/// </summary>

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

@@ -102,7 +102,7 @@ namespace YooAsset
 			{
 				string error = $"{nameof(SceneOperationHandle)} is invalid.";
 				var operation = new UnloadSceneOperation(error);
-				OperationSystem.StartOperaiton(operation);
+				OperationSystem.StartOperation(operation);
 				return operation;
 			}
 
@@ -112,16 +112,16 @@ namespace YooAsset
 				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.StartOperaiton(operation);
+				OperationSystem.StartOperation(operation);
 				return operation;
 			}
 
 			// 卸载子场景
 			Scene sceneObject = SceneObject;
-			AssetSystem.UnloadSubScene(Provider);
+			Provider.Impl.UnloadSubScene(Provider);
 			{
 				var operation = new UnloadSceneOperation(sceneObject);
-				OperationSystem.StartOperaiton(operation);
+				OperationSystem.StartOperation(operation);
 				return operation;
 			}
 		}

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

@@ -14,7 +14,7 @@ namespace YooAsset
 			Download,
 			CheckDownload,
 			LoadFile,
-			CheckFile,
+			CheckLoadFile,
 			Done,
 		}
 
@@ -23,10 +23,10 @@ namespace YooAsset
 		private bool _isWaitForAsyncComplete = false;
 		private bool _isShowWaitForAsyncError = false;
 		private DownloaderBase _downloader;
-		private AssetBundleCreateRequest _cacheRequest;
+		private AssetBundleCreateRequest _createRequest;
 
 
-		public AssetBundleFileLoader(BundleInfo bundleInfo) : base(bundleInfo)
+		public AssetBundleFileLoader(AssetSystemImpl impl, BundleInfo bundleInfo) : base(impl, bundleInfo)
 		{
 		}
 
@@ -40,29 +40,20 @@ namespace YooAsset
 
 			if (_steps == ESteps.None)
 			{
-				if (MainBundleInfo.IsInvalid)
-				{
-					_steps = ESteps.Done;
-					Status = EStatus.Failed;
-					LastError = $"The bundle info is invalid : {MainBundleInfo.BundleName}";
-					YooLogger.Error(LastError);
-					return;
-				}
-
 				if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromRemote)
 				{
 					_steps = ESteps.Download;
-					_fileLoadPath = MainBundleInfo.GetCacheLoadPath();
+					_fileLoadPath = MainBundleInfo.Bundle.CachedFilePath;
 				}
 				else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromStreaming)
 				{
 					_steps = ESteps.LoadFile;
-					_fileLoadPath = MainBundleInfo.GetStreamingLoadPath();
+					_fileLoadPath = MainBundleInfo.Bundle.StreamingFilePath;
 				}
 				else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromCache)
 				{
 					_steps = ESteps.LoadFile;
-					_fileLoadPath = MainBundleInfo.GetCacheLoadPath();
+					_fileLoadPath = MainBundleInfo.Bundle.CachedFilePath;
 				}
 				else
 				{
@@ -112,43 +103,46 @@ namespace YooAsset
 #endif
 
 				// Load assetBundle file
-				if (MainBundleInfo.IsEncrypted)
+				if (MainBundleInfo.Bundle.IsEncrypted)
 				{
-					if (AssetSystem.DecryptionServices == null)
-						throw new Exception($"{nameof(AssetBundleFileLoader)} need {nameof(IDecryptionServices)} : {MainBundleInfo.BundleName}");
+					if (Impl.DecryptionServices == null)
+						throw new Exception($"{nameof(AssetBundleFileLoader)} need {nameof(IDecryptionServices)} : {MainBundleInfo.Bundle.BundleName}");
 
-					ulong offset = AssetSystem.DecryptionServices.GetFileOffset();
+					DecryptionFileInfo fileInfo = new DecryptionFileInfo();
+					fileInfo.BundleName = MainBundleInfo.Bundle.BundleName;
+					fileInfo.FileHash = MainBundleInfo.Bundle.FileHash;
+					ulong offset = Impl.DecryptionServices.GetFileOffset(fileInfo);
 					if (_isWaitForAsyncComplete)
 						CacheBundle = AssetBundle.LoadFromFile(_fileLoadPath, 0, offset);
 					else
-						_cacheRequest = AssetBundle.LoadFromFileAsync(_fileLoadPath, 0, offset);
+						_createRequest = AssetBundle.LoadFromFileAsync(_fileLoadPath, 0, offset);
 				}
 				else
 				{
 					if (_isWaitForAsyncComplete)
 						CacheBundle = AssetBundle.LoadFromFile(_fileLoadPath);
 					else
-						_cacheRequest = AssetBundle.LoadFromFileAsync(_fileLoadPath);
+						_createRequest = AssetBundle.LoadFromFileAsync(_fileLoadPath);
 				}
-				_steps = ESteps.CheckFile;
+				_steps = ESteps.CheckLoadFile;
 			}
 
 			// 4. 检测AssetBundle加载结果
-			if (_steps == ESteps.CheckFile)
+			if (_steps == ESteps.CheckLoadFile)
 			{
-				if (_cacheRequest != null)
+				if (_createRequest != null)
 				{
 					if (_isWaitForAsyncComplete)
 					{
 						// 强制挂起主线程（注意：该操作会很耗时）
 						YooLogger.Warning("Suspend the main thread to load unity bundle.");
-						CacheBundle = _cacheRequest.assetBundle;
+						CacheBundle = _createRequest.assetBundle;
 					}
 					else
 					{
-						if (_cacheRequest.isDone == false)
+						if (_createRequest.isDone == false)
 							return;
-						CacheBundle = _cacheRequest.assetBundle;
+						CacheBundle = _createRequest.assetBundle;
 					}
 				}
 
@@ -157,15 +151,15 @@ namespace YooAsset
 				{
 					_steps = ESteps.Done;
 					Status = EStatus.Failed;
-					LastError = $"Failed to load assetBundle : {MainBundleInfo.BundleName}";
+					LastError = $"Failed to load assetBundle : {MainBundleInfo.Bundle.BundleName}";
 					YooLogger.Error(LastError);
 
 					// 注意：当缓存文件的校验等级为Low的时候，并不能保证缓存文件的完整性。
 					// 在AssetBundle文件加载失败的情况下，我们需要重新验证文件的完整性！
 					if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromCache)
 					{
-						string cacheLoadPath = MainBundleInfo.GetCacheLoadPath();
-						if (DownloadSystem.CheckContentIntegrity(EVerifyLevel.High, cacheLoadPath, MainBundleInfo.SizeBytes, MainBundleInfo.CRC) == false)
+						string cacheLoadPath = MainBundleInfo.Bundle.CachedFilePath;
+						if (CacheSystem.VerifyBundle(MainBundleInfo.Bundle, EVerifyLevel.High) != EVerifyResult.Succeed)
 						{
 							if (File.Exists(cacheLoadPath))
 							{
@@ -201,7 +195,7 @@ namespace YooAsset
 					if (_isShowWaitForAsyncError == false)
 					{
 						_isShowWaitForAsyncError = true;
-						YooLogger.Error($"WaitForAsyncComplete failed ! Try load bundle : {MainBundleInfo.BundleName} from remote with sync load method !");
+						YooLogger.Error($"WaitForAsyncComplete failed ! Try load bundle : {MainBundleInfo.Bundle.BundleName} from remote with sync load method !");
 					}
 					break;
 				}

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

@@ -14,6 +14,11 @@ namespace YooAsset
 			Failed
 		}
 
+		/// <summary>
+		/// 所属资源系统
+		/// </summary>
+		public AssetSystemImpl Impl { private set; get; }
+		
 		/// <summary>
 		/// 资源包文件信息
 		/// </summary>
@@ -43,8 +48,9 @@ namespace YooAsset
 		internal AssetBundle CacheBundle { set; get; }
 
 
-		public AssetBundleLoaderBase(BundleInfo bundleInfo)
+		public AssetBundleLoaderBase(AssetSystemImpl impl, BundleInfo bundleInfo)
 		{
+			Impl = impl;
 			MainBundleInfo = bundleInfo;
 			RefCount = 0;
 			Status = EStatus.None;
@@ -79,7 +85,7 @@ namespace YooAsset
 		/// 轮询更新
 		/// </summary>
 		public abstract void Update();
-	
+
 		/// <summary>
 		/// 销毁
 		/// </summary>
@@ -91,9 +97,9 @@ namespace YooAsset
 			if (forceDestroy == false)
 			{
 				if (RefCount > 0)
-					throw new Exception($"Bundle file loader ref is not zero : {MainBundleInfo.BundleName}");
+					throw new Exception($"Bundle file loader ref is not zero : {MainBundleInfo.Bundle.BundleName}");
 				if (IsDone() == false)
-					throw new Exception($"Bundle file loader is not done : {MainBundleInfo.BundleName}");
+					throw new Exception($"Bundle file loader is not done : {MainBundleInfo.Bundle.BundleName}");
 			}
 
 			if (CacheBundle != null)
@@ -130,14 +136,14 @@ namespace YooAsset
 			if (IsDone() == false)
 				return;
 
-			// 注意：必须等待所有Provider可以销毁的时候，才可以释放Bundle文件。
+			// 条件1：必须等待所有Provider可以销毁
 			foreach (var provider in _providers)
 			{
 				if (provider.CanDestroy() == false)
 					return;
 			}
 
-			// 除了自己没有其它引用
+			// 条件2：除了自己没有其它引用
 			if (RefCount > _providers.Count)
 				return;
 
@@ -148,7 +154,7 @@ namespace YooAsset
 			}
 
 			// 从列表里移除Providers
-			AssetSystem.RemoveBundleProviders(_providers);
+			Impl.RemoveBundleProviders(_providers);
 			_providers.Clear();
 		}
 

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

@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@@ -11,20 +12,26 @@ namespace YooAsset
 		private enum ESteps
 		{
 			None = 0,
-			LoadFile,
-			CheckFile,
-			TryLoad,
+			Download,
+			CheckDownload,
+			LoadCacheFile,
+			CheckLoadCacheFile,
+			LoadWebFile,
+			CheckLoadWebFile,		
+			TryLoadWebFile,
 			Done,
 		}
 
 		private ESteps _steps = ESteps.None;
 		private float _tryTimer = 0;
-		private string _webURL;
+		private string _fileLoadPath;
 		private bool _isShowWaitForAsyncError = false;
+		private DownloaderBase _downloader;
 		private UnityWebRequest _webRequest;
+		private AssetBundleCreateRequest _createRequest;
 
-
-		public AssetBundleWebLoader(BundleInfo bundleInfo) : base(bundleInfo)
+		
+		public AssetBundleWebLoader(AssetSystemImpl impl, BundleInfo bundleInfo) : base(impl, bundleInfo)
 		{
 		}
 
@@ -38,19 +45,20 @@ namespace YooAsset
 
 			if (_steps == ESteps.None)
 			{
-				if (MainBundleInfo.IsInvalid)
+				if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromRemote)
 				{
-					_steps = ESteps.Done;
-					Status = EStatus.Failed;
-					LastError = $"The bundle info is invalid : {MainBundleInfo.BundleName}";
-					YooLogger.Error(LastError);
-					return;
+					_steps = ESteps.Download;
+					_fileLoadPath = MainBundleInfo.Bundle.CachedFilePath;
 				}
-
-				if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromStreaming)
+				else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromStreaming)
 				{
-					_steps = ESteps.LoadFile;
-					_webURL = MainBundleInfo.GetStreamingLoadPath();
+					_steps = ESteps.LoadWebFile;
+					_fileLoadPath = MainBundleInfo.Bundle.StreamingFilePath;
+				}
+				else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromCache)
+				{
+					_steps = ESteps.LoadCacheFile;
+					_fileLoadPath = MainBundleInfo.Bundle.CachedFilePath;
 				}
 				else
 				{
@@ -58,17 +66,112 @@ namespace YooAsset
 				}
 			}
 
-			// 1. 从服务器或缓存中获取AssetBundle文件
-			if (_steps == ESteps.LoadFile)
+			// 1. 从服务器下载
+			if (_steps == ESteps.Download)
 			{
-				string hash = StringUtility.RemoveExtension(MainBundleInfo.Hash);
-				_webRequest = UnityWebRequestAssetBundle.GetAssetBundle(_webURL, Hash128.Parse(hash));
-				_webRequest.SendWebRequest();
-				_steps = ESteps.CheckFile;
+				int failedTryAgain = int.MaxValue;
+				_downloader = DownloadSystem.BeginDownload(MainBundleInfo, failedTryAgain);
+				_steps = ESteps.CheckDownload;
 			}
 
-			// 2. 检测获取的AssetBundle文件
-			if (_steps == ESteps.CheckFile)
+			// 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.LoadCacheFile;
+				}
+			}
+
+			// 3. 从本地缓存里加载AssetBundle
+			if (_steps == ESteps.LoadCacheFile)
+			{
+#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 (MainBundleInfo.Bundle.IsEncrypted)
+				{
+					if (Impl.DecryptionServices == null)
+						throw new Exception($"{nameof(AssetBundleFileLoader)} need {nameof(IDecryptionServices)} : {MainBundleInfo.Bundle.BundleName}");
+
+					DecryptionFileInfo fileInfo = new DecryptionFileInfo();
+					fileInfo.BundleName = MainBundleInfo.Bundle.BundleName;
+					fileInfo.FileHash = MainBundleInfo.Bundle.FileHash;
+					ulong offset = Impl.DecryptionServices.GetFileOffset(fileInfo);
+					_createRequest = AssetBundle.LoadFromFileAsync(_fileLoadPath, 0, offset);
+				}
+				else
+				{
+					_createRequest = AssetBundle.LoadFromFileAsync(_fileLoadPath);
+				}
+				_steps = ESteps.CheckLoadCacheFile;
+			}
+
+			// 4. 检测AssetBundle加载结果
+			if (_steps == ESteps.CheckLoadCacheFile)
+			{
+				if (_createRequest.isDone == false)
+					return;
+
+				CacheBundle = _createRequest.assetBundle;
+				if (CacheBundle == null)
+				{
+					_steps = ESteps.Done;
+					Status = EStatus.Failed;
+					LastError = $"Failed to load AssetBundle file : {MainBundleInfo.Bundle.BundleName}";
+					YooLogger.Error(LastError);
+
+					// 注意：当缓存文件的校验等级为Low的时候，并不能保证缓存文件的完整性。
+					// 在AssetBundle文件加载失败的情况下，我们需要重新验证文件的完整性！
+					if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromCache)
+					{
+						string cacheLoadPath = MainBundleInfo.Bundle.CachedFilePath;
+						if (CacheSystem.VerifyBundle(MainBundleInfo.Bundle, EVerifyLevel.High) != EVerifyResult.Succeed)
+						{
+							if (File.Exists(cacheLoadPath))
+							{
+								YooLogger.Error($"Delete the invalid cache file : {cacheLoadPath}");
+								File.Delete(cacheLoadPath);
+							}
+						}
+					}
+				}
+				else
+				{
+					_steps = ESteps.Done;
+					Status = EStatus.Succeed;
+				}
+			}
+
+			// 5. 从WEB网站获取AssetBundle文件
+			if (_steps == ESteps.LoadWebFile)
+			{
+				_webRequest = UnityWebRequestAssetBundle.GetAssetBundle(_fileLoadPath, Hash128.Parse(MainBundleInfo.Bundle.FileHash));
+				_webRequest.SendWebRequest();
+				_steps = ESteps.CheckLoadWebFile;
+			}
+
+			// 6. 检测AssetBundle加载结果
+			if (_steps == ESteps.CheckLoadWebFile)
 			{
 				if (_webRequest.isDone == false)
 					return;
@@ -79,8 +182,8 @@ namespace YooAsset
 				if (_webRequest.isNetworkError || _webRequest.isHttpError)
 #endif
 				{
-					YooLogger.Warning($"Failed to get asset bundle form web : {_webURL} Error : {_webRequest.error}");
-					_steps = ESteps.TryLoad;
+					YooLogger.Warning($"Failed to get asset bundle from web : {_fileLoadPath} Error : {_webRequest.error}");
+					_steps = ESteps.TryLoadWebFile;
 					_tryTimer = 0;
 				}
 				else
@@ -90,7 +193,7 @@ namespace YooAsset
 					{
 						_steps = ESteps.Done;
 						Status = EStatus.Failed;
-						LastError = $"AssetBundle file is invalid : {MainBundleInfo.BundleName}";
+						LastError = $"AssetBundle file is invalid : {MainBundleInfo.Bundle.BundleName}";
 						YooLogger.Error(LastError);
 					}
 					else
@@ -101,15 +204,15 @@ namespace YooAsset
 				}
 			}
 
-			// 3. 如果获取失败，重新尝试
-			if (_steps == ESteps.TryLoad)
+			// 7. 如果获取失败，重新尝试
+			if (_steps == ESteps.TryLoadWebFile)
 			{
 				_tryTimer += Time.unscaledDeltaTime;
 				if (_tryTimer > 1f)
 				{
 					_webRequest.Dispose();
 					_webRequest = null;
-					_steps = ESteps.LoadFile;
+					_steps = ESteps.LoadWebFile;
 				}
 			}
 		}

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

@@ -102,7 +102,7 @@ namespace YooAsset
 			foreach (var loader in _dependBundles)
 			{
 				var bundleInfo = new DebugBundleInfo();
-				bundleInfo.BundleName = loader.MainBundleInfo.BundleName;
+				bundleInfo.BundleName = loader.MainBundleInfo.Bundle.BundleName;
 				bundleInfo.RefCount = loader.RefCount;
 				bundleInfo.Status = (int)loader.Status;
 				output.Add(bundleInfo);

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

@@ -15,7 +15,6 @@ namespace YooAsset
 		private readonly Vector3 _position;
 		private readonly Quaternion _rotation;
 		private readonly Transform _parent;
-		private readonly bool _setPositionRotation;
 		private ESteps _steps = ESteps.None;
 
 		/// <summary>
@@ -24,13 +23,12 @@ namespace YooAsset
 		public GameObject Result = null;
 
 
-		internal InstantiateOperation(AssetOperationHandle handle, Vector3 position, Quaternion rotation, Transform parent, bool setPositionRotation)
+		internal InstantiateOperation(AssetOperationHandle handle, Vector3 position, Quaternion rotation, Transform parent)
 		{
 			_handle = handle;
 			_position = position;
 			_rotation = rotation;
 			_parent = parent;
-			_setPositionRotation = setPositionRotation;
 		}
 		internal override void Start()
 		{
@@ -62,24 +60,36 @@ namespace YooAsset
 					return;
 				}
 
-				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
-				{
-					if (_parent == null)
-						Result = Object.Instantiate(_handle.AssetObject as GameObject);
-					else
-						Result = Object.Instantiate(_handle.AssetObject as GameObject, _parent);
-				}
+				// 实例化游戏对象
+				Result = Object.Instantiate(_handle.AssetObject as GameObject, _position, _rotation, _parent);
 
 				_steps = ESteps.Done;
 				Status = EOperationStatus.Succeed;
 			}
 		}
+
+		/// <summary>
+		/// 取消实例化对象操作
+		/// </summary>
+		public void Cancel()
+		{
+			if (IsDone == false)
+			{
+				_steps = ESteps.Done;
+				Status = EOperationStatus.Failed;
+				Error = $"User cancelled !";
+			}
+		}
+
+		/// <summary>
+		/// 等待异步实例化结束
+		/// </summary>
+		public void WaitForAsyncComplete()
+		{
+			if (_steps == ESteps.Done)
+				return;
+			_handle.WaitForAsyncComplete();
+			Update();
+		}
 	}
 }

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

@@ -171,14 +171,14 @@ namespace YooAsset
 		{
 			None,
 			Prepare,
-			DownloadFromApk,
-			CheckDownloadFromApk,
+			DownloadBuildinFile,
+			CheckDownload,
 			CheckAndCopyFile,
 			Done,
 		}
 
 		private ESteps _steps = ESteps.None;
-		private UnityWebFileRequester _fileRequester;
+		private DownloaderBase _downloader;
 
 		public OfflinePlayModeRawFileOperation(BundleInfo bundleInfo, string copyPath) : base(bundleInfo, copyPath)
 		{
@@ -199,14 +199,15 @@ namespace YooAsset
 				{
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Failed;
-					Error = $"Bundle info is invalid : {_bundleInfo.BundleName}";
+					Error = $"Bundle info is invalid : {_bundleInfo.Bundle.BundleName}";
 				}
 				else if (_bundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromStreaming)
 				{
-					if (DownloadSystem.ContainsVerifyFile(_bundleInfo.Hash))
-						_steps = ESteps.CheckAndCopyFile;
-					else
-						_steps = ESteps.DownloadFromApk;
+					_steps = ESteps.DownloadBuildinFile;
+				}
+				else if (_bundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromCache)
+				{
+					_steps = ESteps.CheckAndCopyFile;
 				}
 				else
 				{
@@ -214,43 +215,32 @@ namespace YooAsset
 				}
 			}
 
-			// 2. 从APK拷贝文件
-			if (_steps == ESteps.DownloadFromApk)
+			// 2. 下载文件
+			if (_steps == ESteps.DownloadBuildinFile)
 			{
-				string downloadURL = PathHelper.ConvertToWWWPath(_bundleInfo.GetStreamingLoadPath());
-				_fileRequester = new UnityWebFileRequester();
-				_fileRequester.SendRequest(downloadURL, GetCachePath());
-				_steps = ESteps.CheckDownloadFromApk;
+				int failedTryAgain = int.MaxValue;
+				var bundleInfo = PatchHelper.ConvertToUnpackInfo(_bundleInfo.Bundle);
+				_downloader = DownloadSystem.BeginDownload(bundleInfo, failedTryAgain);
+				_steps = ESteps.CheckDownload;
 			}
 
-			// 3. 检测APK拷贝文件结果
-			if (_steps == ESteps.CheckDownloadFromApk)
+			// 3. 检测下载结果
+			if (_steps == ESteps.CheckDownload)
 			{
-				Progress = _fileRequester.Progress();
-				if (_fileRequester.IsDone() == false)
+				Progress = _downloader.DownloadProgress;
+				if (_downloader.IsDone() == false)
 					return;
 
-				if (_fileRequester.HasError())
+				if (_downloader.HasError())
 				{
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Failed;
-					Error = _fileRequester.GetError();
+					Error = _downloader.GetLastError();
 				}
 				else
 				{
-					if (DownloadSystem.CheckContentIntegrity(GetCachePath(), _bundleInfo.SizeBytes, _bundleInfo.CRC))
-					{
-						DownloadSystem.CacheVerifyFile(_bundleInfo.Hash, _bundleInfo.BundleName);
-						_steps = ESteps.CheckAndCopyFile;
-					}
-					else
-					{
-						_steps = ESteps.Done;
-						Status = EOperationStatus.Failed;
-						Error = "File content verify failed !";
-					}
+					_steps = ESteps.CheckAndCopyFile;
 				}
-				_fileRequester.Dispose();
 			}
 
 			// 4. 检测并拷贝原生文件
@@ -267,8 +257,8 @@ namespace YooAsset
 				// 如果原生文件已经存在，则验证其完整性
 				if (File.Exists(CopyPath))
 				{
-					bool result = DownloadSystem.CheckContentIntegrity(CopyPath, _bundleInfo.SizeBytes, _bundleInfo.CRC);
-					if (result)
+					var verifyResult = CacheSystem.VerifyContentInternal(CopyPath, _bundleInfo.Bundle.FileSize, _bundleInfo.Bundle.FileCRC, EVerifyLevel.High);
+					if (verifyResult == EVerifyResult.Succeed)
 					{
 						_steps = ESteps.Done;
 						Status = EOperationStatus.Succeed;
@@ -303,12 +293,12 @@ namespace YooAsset
 		{
 			if (_bundleInfo == null)
 				return string.Empty;
-			return _bundleInfo.GetCacheLoadPath();
+			return _bundleInfo.Bundle.CachedFilePath;
 		}
 	}
 
 	/// <summary>
-	/// 网络模式的原生文件操作
+	/// 联机模式的原生文件操作
 	/// </summary>
 	internal sealed class HostPlayModeRawFileOperation : RawFileOperation
 	{
@@ -316,17 +306,15 @@ namespace YooAsset
 		{
 			None,
 			Prepare,
-			DownloadFromWeb,
-			CheckDownloadFromWeb,
-			DownloadFromApk,
-			CheckDownloadFromApk,
+			DownloadWebFile,
+			DownloadBuildinFile,
+			CheckDownload,
 			CheckAndCopyFile,
 			Done,
 		}
 
 		private ESteps _steps = ESteps.None;
 		private DownloaderBase _downloader;
-		private UnityWebFileRequester _fileRequester;
 
 		internal HostPlayModeRawFileOperation(BundleInfo bundleInfo, string copyPath) : base(bundleInfo, copyPath)
 		{
@@ -347,18 +335,15 @@ namespace YooAsset
 				{
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Failed;
-					Error = $"Bundle info is invalid : {_bundleInfo.BundleName}";
+					Error = $"Bundle info is invalid : {_bundleInfo.Bundle.BundleName}";
 				}
 				else if (_bundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromRemote)
 				{
-					_steps = ESteps.DownloadFromWeb;
+					_steps = ESteps.DownloadWebFile;
 				}
 				else if (_bundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromStreaming)
 				{
-					if (DownloadSystem.ContainsVerifyFile(_bundleInfo.Hash))
-						_steps = ESteps.CheckAndCopyFile;
-					else
-						_steps = ESteps.DownloadFromApk;
+					_steps = ESteps.DownloadBuildinFile;
 				}
 				else if (_bundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromCache)
 				{
@@ -370,16 +355,25 @@ namespace YooAsset
 				}
 			}
 
-			// 2. 从服务器下载
-			if (_steps == ESteps.DownloadFromWeb)
+			// 2. 下载远端文件
+			if (_steps == ESteps.DownloadWebFile)
 			{
 				int failedTryAgain = int.MaxValue;
 				_downloader = DownloadSystem.BeginDownload(_bundleInfo, failedTryAgain);
-				_steps = ESteps.CheckDownloadFromWeb;
+				_steps = ESteps.CheckDownload;
 			}
 
-			// 3. 检测服务器下载结果
-			if (_steps == ESteps.CheckDownloadFromWeb)
+			// 3. 下载内置文件
+			if (_steps == ESteps.DownloadBuildinFile)
+			{
+				int failedTryAgain = int.MaxValue;
+				var bundleInfo = PatchHelper.ConvertToUnpackInfo(_bundleInfo.Bundle);
+				_downloader = DownloadSystem.BeginDownload(bundleInfo, failedTryAgain);
+				_steps = ESteps.CheckDownload;
+			}
+
+			// 4. 检测下载结果
+			if (_steps == ESteps.CheckDownload)
 			{
 				Progress = _downloader.DownloadProgress;
 				if (_downloader.IsDone() == false)
@@ -397,46 +391,7 @@ namespace YooAsset
 				}
 			}
 
-			// 4. 从APK拷贝文件
-			if (_steps == ESteps.DownloadFromApk)
-			{
-				string downloadURL = PathHelper.ConvertToWWWPath(_bundleInfo.GetStreamingLoadPath());
-				_fileRequester = new UnityWebFileRequester();
-				_fileRequester.SendRequest(downloadURL, GetCachePath());
-				_steps = ESteps.CheckDownloadFromApk;
-			}
-
-			// 5. 检测APK拷贝文件结果
-			if (_steps == ESteps.CheckDownloadFromApk)
-			{
-				Progress = _fileRequester.Progress();
-				if (_fileRequester.IsDone() == false)
-					return;
-
-				if (_fileRequester.HasError())
-				{
-					_steps = ESteps.Done;
-					Status = EOperationStatus.Failed;
-					Error = _fileRequester.GetError();
-				}
-				else
-				{
-					if (DownloadSystem.CheckContentIntegrity(GetCachePath(), _bundleInfo.SizeBytes, _bundleInfo.CRC))
-					{
-						DownloadSystem.CacheVerifyFile(_bundleInfo.Hash, _bundleInfo.BundleName);
-						_steps = ESteps.CheckAndCopyFile;
-					}
-					else
-					{
-						_steps = ESteps.Done;
-						Status = EOperationStatus.Failed;
-						Error = "File content verify failed !";
-					}
-				}
-				_fileRequester.Dispose();
-			}
-
-			// 6. 检测并拷贝原生文件
+			// 5. 检测并拷贝原生文件
 			if (_steps == ESteps.CheckAndCopyFile)
 			{
 				// 如果不需要保存文件
@@ -450,8 +405,8 @@ namespace YooAsset
 				// 如果原生文件已经存在，则验证其完整性
 				if (File.Exists(CopyPath))
 				{
-					bool result = DownloadSystem.CheckContentIntegrity(CopyPath, _bundleInfo.SizeBytes, _bundleInfo.CRC);
-					if (result)
+					var verifyResult = CacheSystem.VerifyContentInternal(CopyPath, _bundleInfo.Bundle.FileSize, _bundleInfo.Bundle.FileCRC, EVerifyLevel.High);
+					if (verifyResult == EVerifyResult.Succeed)
 					{
 						_steps = ESteps.Done;
 						Status = EOperationStatus.Succeed;
@@ -486,7 +441,7 @@ namespace YooAsset
 		{
 			if (_bundleInfo == null)
 				return string.Empty;
-			return _bundleInfo.GetCacheLoadPath();
+			return _bundleInfo.Bundle.CachedFilePath;
 		}
 	}
 }

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

@@ -17,7 +17,7 @@ namespace YooAsset
 			}
 		}
 
-		public BundledAssetProvider(AssetInfo assetInfo) : base(assetInfo)
+		public BundledAssetProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
 		{
 		}
 		public override void Update()
@@ -60,6 +60,16 @@ namespace YooAsset
 					return;
 				}
 
+				if (OwnerBundle.CacheBundle == null)
+				{
+					if (OwnerBundle.IsDestroyed)
+						throw new System.Exception("Should never get here !");
+					Status = EStatus.Fail;
+					LastError = $"The bundle {OwnerBundle.MainBundleInfo.Bundle.BundleName} has been destroyed by unity bugs !";
+					InvokeCompletion();
+					return;
+				}
+
 				Status = EStatus.Loading;
 			}
 
@@ -105,10 +115,10 @@ namespace YooAsset
 				Status = AssetObject == null ? EStatus.Fail : EStatus.Success;
 				if (Status == EStatus.Fail)
 				{
-					if(MainAssetInfo.AssetType == null)
-						LastError = $"Failed to load asset : {MainAssetInfo.AssetPath} AssetType : null AssetBundle : {OwnerBundle.MainBundleInfo.BundleName}";
+					if (MainAssetInfo.AssetType == null)
+						LastError = $"Failed to load asset : {MainAssetInfo.AssetPath} AssetType : null AssetBundle : {OwnerBundle.MainBundleInfo.Bundle.BundleName}";
 					else
-						LastError = $"Failed to load asset : {MainAssetInfo.AssetPath} AssetType : {MainAssetInfo.AssetType} AssetBundle : {OwnerBundle.MainBundleInfo.BundleName}";
+						LastError = $"Failed to load asset : {MainAssetInfo.AssetPath} AssetType : {MainAssetInfo.AssetType} AssetBundle : {OwnerBundle.MainBundleInfo.Bundle.BundleName}";
 					YooLogger.Error(LastError);
 				}
 				InvokeCompletion();

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

@@ -8,13 +8,13 @@ namespace YooAsset
 		protected AssetBundleLoaderBase OwnerBundle { private set; get; }
 		protected DependAssetBundleGroup DependBundleGroup { private set; get; }
 
-		public BundledProvider(AssetInfo assetInfo) : base(assetInfo)
+		public BundledProvider(AssetSystemImpl impl, string providerGUID,  AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
 		{
-			OwnerBundle = AssetSystem.CreateOwnerAssetBundleLoader(assetInfo);
+			OwnerBundle = impl.CreateOwnerAssetBundleLoader(assetInfo);
 			OwnerBundle.Reference();
 			OwnerBundle.AddProvider(this);
 
-			var dependBundles = AssetSystem.CreateDependAssetBundleLoaders(assetInfo);
+			var dependBundles = impl.CreateDependAssetBundleLoaders(assetInfo);
 			DependBundleGroup = new DependAssetBundleGroup(dependBundles);
 			DependBundleGroup.Reference();
 		}
@@ -41,7 +41,7 @@ namespace YooAsset
 		internal void GetBundleDebugInfos(List<DebugBundleInfo> output)
 		{
 			var bundleInfo = new DebugBundleInfo();
-			bundleInfo.BundleName = OwnerBundle.MainBundleInfo.BundleName;
+			bundleInfo.BundleName = OwnerBundle.MainBundleInfo.Bundle.BundleName;
 			bundleInfo.RefCount = OwnerBundle.RefCount;
 			bundleInfo.Status = (int)OwnerBundle.Status;
 			output.Add(bundleInfo);

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

@@ -23,7 +23,7 @@ namespace YooAsset
 			}
 		}
 
-		public BundledSceneProvider(AssetInfo assetInfo, LoadSceneMode sceneMode, bool activateOnLoad, int priority) : base(assetInfo)
+		public BundledSceneProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo, LoadSceneMode sceneMode, bool activateOnLoad, int priority) : base(impl, providerGUID, assetInfo)
 		{
 			SceneMode = sceneMode;
 			_sceneName = Path.GetFileNameWithoutExtension(assetInfo.AssetPath);
@@ -70,11 +70,13 @@ namespace YooAsset
 			// 2. 加载场景
 			if (Status == EStatus.Loading)
 			{
-				_asyncOp = SceneManager.LoadSceneAsync(_sceneName, SceneMode);
+				// 注意：如果场景不存在则返回NULL
+				_asyncOp = SceneManager.LoadSceneAsync(MainAssetInfo.AssetPath, SceneMode);
 				if (_asyncOp != null)
 				{
 					_asyncOp.allowSceneActivation = true;
 					_asyncOp.priority = _priority;
+					SceneObject = SceneManager.GetSceneAt(SceneManager.sceneCount - 1);
 					Status = EStatus.Checking;
 				}
 				else
@@ -91,7 +93,6 @@ namespace YooAsset
 			{
 				if (_asyncOp.isDone)
 				{
-					SceneObject = SceneManager.GetSceneByName(_sceneName);
 					if (SceneObject.IsValid() && _activateOnLoad)
 						SceneManager.SetActiveScene(SceneObject);
 

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

@@ -17,7 +17,7 @@ namespace YooAsset
 			}
 		}
 
-		public BundledSubAssetsProvider(AssetInfo assetInfo) : base(assetInfo)
+		public BundledSubAssetsProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
 		{
 		}
 		public override void Update()
@@ -106,9 +106,9 @@ namespace YooAsset
 				if (Status == EStatus.Fail)
 				{
 					if (MainAssetInfo.AssetType == null)
-						LastError = $"Failed to load sub assets : {MainAssetInfo.AssetPath} AssetType : null AssetBundle : {OwnerBundle.MainBundleInfo.BundleName}";
+						LastError = $"Failed to load sub assets : {MainAssetInfo.AssetPath} AssetType : null AssetBundle : {OwnerBundle.MainBundleInfo.Bundle.BundleName}";
 					else
-						LastError = $"Failed to load sub assets : {MainAssetInfo.AssetPath} AssetType : {MainAssetInfo.AssetType} AssetBundle : {OwnerBundle.MainBundleInfo.BundleName}";
+						LastError = $"Failed to load sub assets : {MainAssetInfo.AssetPath} AssetType : {MainAssetInfo.AssetType} AssetBundle : {OwnerBundle.MainBundleInfo.Bundle.BundleName}";
 					YooLogger.Error(LastError);
 				}
 				InvokeCompletion();

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

@@ -14,18 +14,18 @@ namespace YooAsset
 			}
 		}
 
-		public CompletedProvider(AssetInfo assetInfo) : base(assetInfo)
+		public CompletedProvider(AssetInfo assetInfo) : base(null, string.Empty, assetInfo)
 		{
 		}
 		public override void Update()
 		{
-			if (IsDone)
-				return;
-
+		}
+		public void SetCompleted(string error)
+		{
 			if (Status == EStatus.None)
 			{
 				Status = EStatus.Fail;
-				LastError = MainAssetInfo.Error;
+				LastError = error;
 				InvokeCompletion();
 			}
 		}

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

@@ -17,7 +17,7 @@ namespace YooAsset
 			}
 		}
 
-		public DatabaseAssetProvider(AssetInfo assetInfo) : base(assetInfo)
+		public DatabaseAssetProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
 		{
 		}
 		public override void Update()

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

@@ -19,7 +19,7 @@ namespace YooAsset
 			}
 		}
 
-		public DatabaseSceneProvider(AssetInfo assetInfo, LoadSceneMode sceneMode, bool activateOnLoad, int priority) : base(assetInfo)
+		public DatabaseSceneProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo, LoadSceneMode sceneMode, bool activateOnLoad, int priority) : base(impl, providerGUID, assetInfo)
 		{
 			SceneMode = sceneMode;
 			_activateOnLoad = activateOnLoad;
@@ -46,6 +46,7 @@ namespace YooAsset
 				{
 					_asyncOp.allowSceneActivation = true;
 					_asyncOp.priority = _priority;
+					SceneObject = SceneManager.GetSceneAt(SceneManager.sceneCount - 1);
 					Status = EStatus.Checking;
 				}
 				else
@@ -61,8 +62,7 @@ namespace YooAsset
 			if (Status == EStatus.Checking)
 			{
 				if (_asyncOp.isDone)
-				{
-					SceneObject = SceneManager.GetSceneAt(SceneManager.sceneCount - 1);
+				{				
 					if (SceneObject.IsValid() && _activateOnLoad)
 						SceneManager.SetActiveScene(SceneObject);
 

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

@@ -17,7 +17,7 @@ namespace YooAsset
 			}
 		}
 
-		public DatabaseSubAssetsProvider(AssetInfo assetInfo) : base(assetInfo)
+		public DatabaseSubAssetsProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
 		{
 		}
 		public override void Update()

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

@@ -17,6 +17,16 @@ namespace YooAsset
 			Fail,
 		}
 
+		/// <summary>
+		/// 资源提供者唯一标识符
+		/// </summary>
+		public string ProviderGUID { private set; get; }
+
+		/// <summary>
+		/// 所属资源系统
+		/// </summary>
+		public AssetSystemImpl Impl { private set; get; }
+
 		/// <summary>
 		/// 资源信息
 		/// </summary>
@@ -85,8 +95,10 @@ namespace YooAsset
 		private readonly List<OperationHandleBase> _handles = new List<OperationHandleBase>();
 
 
-		public ProviderBase(AssetInfo assetInfo)
+		public ProviderBase(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo)
 		{
+			Impl = impl;
+			ProviderGUID = providerGUID;
 			MainAssetInfo = assetInfo;
 		}
 
@@ -128,7 +140,6 @@ namespace YooAsset
 		/// <summary>
 		/// 创建操作句柄
 		/// </summary>
-		/// <returns></returns>
 		public T CreateHandle<T>() where T : OperationHandleBase
 		{
 			// 引用计数增加

Assets/YooAsset/Runtime/AssetsPackage.cs.meta

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

Assets/YooAsset/Runtime/CacheSystem.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 96a75a20111d6124696665e7aac3564c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/YooAsset/Runtime/CacheSystem/CacheSystem.cs

@@ -0,0 +1,124 @@
+using System;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace YooAsset
+{
+	internal static class CacheSystem
+	{
+		private readonly static Dictionary<string, PatchBundle> _cachedDic = new Dictionary<string, PatchBundle>(1000);
+
+		/// <summary>
+		/// 初始化时的验证级别
+		/// </summary>
+		public static EVerifyLevel InitVerifyLevel { set; get; } = EVerifyLevel.Low;
+
+
+		/// <summary>
+		/// 清空所有数据
+		/// </summary>
+		public static void ClearAll()
+		{
+			_cachedDic.Clear();
+		}
+
+		/// <summary>
+		/// 查询是否为验证文件
+		/// 注意：被收录的文件完整性是绝对有效的
+		/// </summary>
+		public static bool IsCached(PatchBundle patchBundle)
+		{
+			string fileHash = patchBundle.FileHash;
+			if (_cachedDic.ContainsKey(fileHash))
+			{
+				string filePath = patchBundle.CachedFilePath;
+				if (File.Exists(filePath))
+				{
+					return true;
+				}
+				else
+				{
+					_cachedDic.Remove(fileHash);
+					YooLogger.Error($"Cache file is missing : {filePath}");
+					return false;
+				}
+			}
+			else
+			{
+				return false;
+			}
+		}
+
+		/// <summary>
+		/// 缓存补丁包文件
+		/// </summary>
+		public static void CacheBundle(PatchBundle patchBundle)
+		{
+			string fileHash = patchBundle.FileHash;
+			if (_cachedDic.ContainsKey(fileHash) == false)
+			{
+				string filePath = patchBundle.CachedFilePath;
+				YooLogger.Log($"Cache verify file : {filePath}");
+				_cachedDic.Add(fileHash, patchBundle);
+			}
+		}
+
+		/// <summary>
+		/// 验证补丁包文件
+		/// </summary>
+		public static EVerifyResult VerifyBundle(PatchBundle patchBundle, EVerifyLevel verifyLevel)
+		{
+			return VerifyContentInternal(patchBundle.CachedFilePath, patchBundle.FileSize, patchBundle.FileCRC, verifyLevel);
+		}
+
+		/// <summary>
+		/// 验证并缓存补丁包文件
+		/// </summary>
+		public static EVerifyResult VerifyAndCacheBundle(PatchBundle patchBundle, EVerifyLevel verifyLevel)
+		{
+			var verifyResult = VerifyContentInternal(patchBundle.CachedFilePath, patchBundle.FileSize, patchBundle.FileCRC, verifyLevel);
+			if (verifyResult == EVerifyResult.Succeed)
+				CacheBundle(patchBundle);
+			return verifyResult;
+		}
+
+		/// <summary>
+		/// 验证文件完整性
+		/// </summary>
+		public static EVerifyResult VerifyContentInternal(string filePath, long fileSize, string fileCRC, EVerifyLevel verifyLevel)
+		{
+			try
+			{
+				if (File.Exists(filePath) == false)
+					return EVerifyResult.FileNotExisted;
+
+				// 先验证文件大小
+				long size = FileUtility.GetFileSize(filePath);
+				if (size < fileSize)
+					return EVerifyResult.FileNotComplete;
+				else if (size > fileSize)
+					return EVerifyResult.FileOverflow;
+
+				// 再验证文件CRC
+				if (verifyLevel == EVerifyLevel.High)
+				{
+					string crc = HashUtility.FileCRC32(filePath);
+					if (crc == fileCRC)
+						return EVerifyResult.Succeed;
+					else
+						return EVerifyResult.FileCrcError;
+				}
+				else
+				{
+					return EVerifyResult.Succeed;
+				}
+			}
+			catch (Exception)
+			{
+				return EVerifyResult.Exception;
+			}
+		}
+	}
+}

Assets/YooAsset/Runtime/CacheSystem/CacheSystem.cs.meta

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

Assets/YooAsset/Runtime/CacheSystem/CacheVerifier.cs

@@ -0,0 +1,181 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+
+namespace YooAsset
+{
+	/// <summary>
+	/// 本地缓存文件验证器
+	/// </summary>
+	internal abstract class CacheVerifier
+	{
+		public abstract void InitVerifier(List<VerifyInfo> verifyInfos);
+		public abstract bool UpdateVerifier();
+		public abstract float GetVerifierProgress();
+
+		public List<VerifyInfo> VerifySuccessList { protected set; get; }
+		public List<VerifyInfo> VerifyFailList { protected set; get; }
+	}
+
+	/// <summary>
+	/// 本地缓存文件验证器（线程版）
+	/// </summary>
+	internal class CacheVerifierWithThread : CacheVerifier
+	{
+		private readonly ThreadSyncContext _syncContext = new ThreadSyncContext();
+		private readonly List<VerifyInfo> _waitingList = new List<VerifyInfo>(1000);
+		private readonly List<VerifyInfo> _verifyingList = new List<VerifyInfo>(100);
+		private int _verifyMaxNum;
+		private int _verifyTotalCount;
+
+		public override void InitVerifier(List<VerifyInfo> verifyInfos)
+		{
+			_waitingList.AddRange(verifyInfos);
+			VerifySuccessList = new List<VerifyInfo>(verifyInfos.Count);
+			VerifyFailList = new List<VerifyInfo>(verifyInfos.Count);
+
+			// 设置同时验证的最大数
+			ThreadPool.GetMaxThreads(out int workerThreads, out int ioThreads);
+			YooLogger.Log($"Work threads : {workerThreads}, IO threads : {ioThreads}");
+			_verifyMaxNum = Math.Min(workerThreads, ioThreads);
+			_verifyTotalCount = _waitingList.Count;
+			if (_verifyMaxNum < 1)
+				_verifyMaxNum = 1;
+		}
+		public override bool UpdateVerifier()
+		{
+			_syncContext.Update();
+
+			if (_waitingList.Count == 0 && _verifyingList.Count == 0)
+				return true;
+
+			if (_verifyingList.Count >= _verifyMaxNum)
+				return false;
+
+			for (int i = _waitingList.Count - 1; i >= 0; i--)
+			{
+				if (_verifyingList.Count >= _verifyMaxNum)
+					break;
+
+				var verifyIno = _waitingList[i];
+				if (VerifyFileWithThread(verifyIno))
+				{
+					_waitingList.RemoveAt(i);
+					_verifyingList.Add(verifyIno);
+				}
+				else
+				{
+					YooLogger.Warning("The thread pool is failed queued.");
+					break;
+				}
+			}
+
+			return false;
+		}
+		public override float GetVerifierProgress()
+		{
+			if (_verifyTotalCount == 0)
+				return 1f;
+			return (float)(VerifySuccessList.Count + VerifyFailList.Count) / _verifyTotalCount;
+		}
+
+		private bool VerifyFileWithThread(VerifyInfo verifyInfo)
+		{
+			return ThreadPool.QueueUserWorkItem(new WaitCallback(VerifyInThread), verifyInfo);
+		}
+		private void VerifyInThread(object infoObj)
+		{
+			VerifyInfo verifyInfo = (VerifyInfo)infoObj;
+			verifyInfo.Result = CacheSystem.VerifyBundle(verifyInfo.VerifyBundle, CacheSystem.InitVerifyLevel);
+			_syncContext.Post(VerifyCallback, verifyInfo);
+		}
+		private void VerifyCallback(object obj)
+		{
+			VerifyInfo verifyIno = (VerifyInfo)obj;
+			if (verifyIno.Result == EVerifyResult.Succeed)
+			{
+				VerifySuccessList.Add(verifyIno);
+				CacheSystem.CacheBundle(verifyIno.VerifyBundle);
+			}
+			else
+			{
+				VerifyFailList.Add(verifyIno);
+
+				// NOTE：不期望删除断点续传的资源文件
+				/*
+				if (File.Exists(patchBundle.CachedBundleFilePath))
+					File.Delete(patchBundle.CachedBundleFilePath);
+				*/
+			}
+			_verifyingList.Remove(verifyIno);
+		}
+	}
+
+	/// <summary>
+	/// 本地缓存文件验证器（非线程版）
+	/// </summary>
+	internal class CacheVerifierWithoutThread : CacheVerifier
+	{
+		private readonly List<VerifyInfo> _waitingList = new List<VerifyInfo>(1000);
+		private readonly List<VerifyInfo> _verifyingList = new List<VerifyInfo>(100);
+		private int _verifyMaxNum;
+		private int _verifyTotalCount;
+
+		public override void InitVerifier(List<VerifyInfo> verifyInfos)
+		{
+			_waitingList.AddRange(verifyInfos);
+			VerifySuccessList = new List<VerifyInfo>(verifyInfos.Count);
+			VerifyFailList = new List<VerifyInfo>(verifyInfos.Count);
+
+			// 设置同时验证的最大数
+			_verifyMaxNum = 32;
+			_verifyTotalCount = _waitingList.Count;
+		}
+		public override bool UpdateVerifier()
+		{
+			if (_waitingList.Count == 0 && _verifyingList.Count == 0)
+				return true;
+
+			for (int i = _waitingList.Count - 1; i >= 0; i--)
+			{
+				if (_verifyingList.Count >= _verifyMaxNum)
+					break;
+
+				var verifyIno = _waitingList[i];
+				VerifyFileWithoutThread(verifyIno);
+				_waitingList.RemoveAt(i);
+				_verifyingList.Add(verifyIno);
+			}
+
+			_verifyingList.Clear();
+			return false;
+		}
+		public override float GetVerifierProgress()
+		{
+			if (_verifyTotalCount == 0)
+				return 1f;
+			return (float)(VerifySuccessList.Count + VerifyFailList.Count) / _verifyTotalCount;
+		}
+
+		private void VerifyFileWithoutThread(VerifyInfo verifyIno)
+		{
+			var verifyResult = CacheSystem.VerifyAndCacheBundle(verifyIno.VerifyBundle, CacheSystem.InitVerifyLevel);
+			if (verifyResult == EVerifyResult.Succeed)
+			{
+				VerifySuccessList.Add(verifyIno);
+			}
+			else
+			{
+				VerifyFailList.Add(verifyIno);
+
+				// NOTE：不期望删除断点续传的资源文件
+				/*			
+				if (File.Exists(patchBundle.CachedBundleFilePath))
+					File.Delete(patchBundle.CachedBundleFilePath);
+				*/
+			}
+		}
+	}
+}

Assets/YooAsset/Runtime/CacheSystem/CacheVerifier.cs.meta

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

Assets/YooAsset/Runtime/CacheSystem/EVerifyResult.cs

@@ -0,0 +1,39 @@
+
+namespace YooAsset
+{
+	/// <summary>
+	/// 下载文件校验结果
+	/// </summary>
+	public enum EVerifyResult
+	{
+		/// <summary>
+		/// 文件不存在
+		/// </summary>
+		FileNotExisted = -4,
+
+		/// <summary>
+		/// 文件内容不足（小于正常大小）
+		/// </summary>
+		FileNotComplete = -3,
+		
+		/// <summary>
+		/// 文件内容溢出（超过正常大小）
+		/// </summary>
+		FileOverflow = -2,
+		
+		/// <summary>
+		/// 文件内容不匹配
+		/// </summary>
+		FileCrcError = -1,
+
+		/// <summary>
+		/// 验证异常
+		/// </summary>
+		Exception = 0,
+
+		/// <summary>
+		/// 验证成功
+		/// </summary>
+		Succeed = 1,
+	}
+}

Assets/YooAsset/Runtime/CacheSystem/EVerifyResult.cs.meta

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

Assets/YooAsset/Runtime/CacheSystem/VerifyInfo.cs

@@ -0,0 +1,33 @@
+
+namespace YooAsset
+{
+	internal class VerifyInfo
+	{
+		/// <summary>
+		/// 验证的资源文件是否为内置资源
+		/// </summary>
+		public bool IsBuildinFile { private set; get; }
+
+		/// <summary>
+		/// 验证的资源包实例
+		/// </summary>
+		public PatchBundle VerifyBundle { private set; get; }
+
+		/// <summary>
+		/// 验证的文件路径
+		/// </summary>
+		public string VerifyFilePath { private set; get; }
+
+		/// <summary>
+		/// 验证结果
+		/// </summary>
+		public EVerifyResult Result;
+
+		public VerifyInfo(bool isBuildinFile, PatchBundle verifyBundle)
+		{
+			IsBuildinFile = isBuildinFile;
+			VerifyBundle = verifyBundle;
+			VerifyFilePath = verifyBundle.CachedFilePath;
+		}
+	}
+}

Assets/YooAsset/Runtime/CacheSystem/VerifyInfo.cs.meta

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

Assets/YooAsset/Runtime/Debugger/DebugProviderInfo.cs

@@ -7,6 +7,11 @@ namespace YooAsset
 	[Serializable]
 	internal class DebugProviderInfo : IComparer<DebugProviderInfo>, IComparable<DebugProviderInfo>
 	{
+		/// <summary>
+		/// 所属的资源包裹
+		/// </summary>
+		public string PackageName;
+
 		/// <summary>
 		/// 资源对象路径
 		/// </summary>
@@ -35,7 +40,7 @@ namespace YooAsset
 		/// <summary>
 		/// 依赖的资源包列表
 		/// </summary>
-		public List<DebugBundleInfo> BundleInfos;
+		public List<DebugBundleInfo> DependBundleInfos;
 
 		public int CompareTo(DebugProviderInfo other)
 		{