Update CHANGELOG.md

在更新资源清单之前检查已加载资源包并给与警告。

.gitignore

@@ -58,4 +58,7 @@ sysinfo.txt
 # Crashlytics generated file
 crashlytics-build.properties
 
-*.vsconfig
+*.vsconfig
+
+Sandbox/
+Bundles/

Assets/UniTask.YooAsset~/README.md

@@ -1,20 +0,0 @@
-# UniTask 扩展
-
-[仓库链接](https://github.com/Cysharp/UniTask) 
-- 请去下载对应的源码，并删除此目录最后的波浪线
-- 在项目的 `asmdef` 文件中添加对 `UniTask.YooAsset` 的引用
-- 在 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,86 @@
 
 All notable changes to this package will be documented in this file.
 
+## [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

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilder.cs

@@ -13,7 +13,7 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 开始构建
 		/// </summary>
-		public bool Run(BuildParameters buildParameters)
+		public BuildResult Run(BuildParameters buildParameters)
 		{
 			// 清空旧数据
 			_buildContext.ClearAllContext();
@@ -77,12 +77,19 @@ namespace YooAsset.Editor
 			}
 
 			// 执行构建流程
-			bool succeed = BuildRunner.Run(pipeline, _buildContext);
-			if (succeed)
+			var buildResult = BuildRunner.Run(pipeline, _buildContext);
+			if (buildResult.Success)
+			{
+				buildResult.OutputPackageDirectory = buildParametersContext.GetPackageDirectory();
 				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

@@ -30,7 +30,7 @@ namespace YooAsset.Editor
 		/// </summary>
 		public static string MakePipelineOutputDirectory(string outputRoot, BuildTarget buildTarget)
 		{
-			return $"{outputRoot}/{buildTarget}/{YooAssetSettingsData.Setting.UnityManifestFileName}";
+			return $"{outputRoot}/{buildTarget}/{YooAssetSettings.OutputFolderName}";
 		}
 
 		/// <summary>

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSetting.cs

@@ -30,14 +30,14 @@ namespace YooAsset.Editor
 		/// </summary>
 		public ECompressOption CompressOption = ECompressOption.LZ4;
 
+		/// <summary>
+		/// 输出文件名称样式
+		/// </summary>
+		public EOutputNameStyle OutputNameStyle = EOutputNameStyle.HashName;
+
 		/// <summary>
 		/// 加密类名称
 		/// </summary>
 		public string EncyptionClassName = string.Empty;
-
-		/// <summary>
-		/// 附加后缀格式
-		/// </summary>
-		public bool AppendExtension = false;
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs

@@ -30,7 +30,7 @@ namespace YooAsset.Editor
 		private TextField _buildinTagsField;
 		private PopupField<string> _encryptionField;
 		private EnumField _compressionField;
-		private Toggle _appendExtensionToggle;
+		private EnumField _outputNameStyleField;
 
 		public void CreateGUI()
 		{
@@ -76,7 +76,7 @@ namespace YooAsset.Editor
 				_buildPipelineField = root.Q<EnumField>("BuildPipeline");
 				_buildPipelineField.Init(AssetBundleBuilderSettingData.Setting.BuildPipeline);
 				_buildPipelineField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.BuildPipeline);
-				_buildPipelineField.style.width = 300;
+				_buildPipelineField.style.width = 350;
 				_buildPipelineField.RegisterValueChangedCallback(evt =>
 				{
 					AssetBundleBuilderSettingData.IsDirty = true;
@@ -88,7 +88,7 @@ namespace YooAsset.Editor
 				_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;
@@ -112,7 +112,7 @@ namespace YooAsset.Editor
 					int defaultIndex = GetEncryptionDefaultIndex(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;
@@ -124,7 +124,7 @@ namespace YooAsset.Editor
 				{
 					_encryptionField = new PopupField<string>();
 					_encryptionField.label = "Encryption";
-					_encryptionField.style.width = 300;
+					_encryptionField.style.width = 350;
 					encryptionContainer.Add(_encryptionField);
 				}
 
@@ -132,20 +132,22 @@ namespace YooAsset.Editor
 				_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.IsDirty = true;
-					AssetBundleBuilderSettingData.Setting.AppendExtension = _appendExtensionToggle.value;
+					AssetBundleBuilderSettingData.Setting.OutputNameStyle = (EOutputNameStyle)_outputNameStyleField.value;
 				});
 
 				// 构建按钮
@@ -188,7 +190,7 @@ namespace YooAsset.Editor
 			_buildinTagsField.SetEnabled(enableElement);
 			_encryptionField.SetEnabled(enableElement);
 			_compressionField.SetEnabled(enableElement);
-			_appendExtensionToggle.SetEnabled(enableElement);
+			_outputNameStyleField.SetEnabled(enableElement);
 		}
 		private void SaveBtn_clicked()
 		{
@@ -223,10 +225,10 @@ namespace YooAsset.Editor
 			buildParameters.BuildinTags = AssetBundleBuilderSettingData.Setting.BuildTags;
 			buildParameters.VerifyBuildingResult = true;
 			buildParameters.EnableAddressable = AssetBundleCollectorSettingData.Setting.EnableAddressable;
-			buildParameters.AppendFileExtension = AssetBundleBuilderSettingData.Setting.AppendExtension;
 			buildParameters.CopyBuildinTagFiles = AssetBundleBuilderSettingData.Setting.BuildMode == EBuildMode.ForceRebuild;
 			buildParameters.EncryptionServices = CreateEncryptionServicesInstance();
 			buildParameters.CompressOption = AssetBundleBuilderSettingData.Setting.CompressOption;
+			buildParameters.OutputNameStyle = AssetBundleBuilderSettingData.Setting.OutputNameStyle;
 
 			if (AssetBundleBuilderSettingData.Setting.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
 			{
@@ -235,8 +237,8 @@ namespace YooAsset.Editor
 			}
 			
 			var builder = new AssetBundleBuilder();
-			bool succeed = builder.Run(buildParameters);
-			if (succeed)
+			var buildResult = builder.Run(buildParameters);
+			if (buildResult.Success)
 			{
 				EditorUtility.RevealInFinder($"{buildParameters.OutputRoot}/{buildParameters.BuildTarget}/{buildParameters.BuildVersion}");
 			}

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.uxml

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

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleSimulateBuilder.cs

@@ -20,8 +20,8 @@ namespace YooAsset.Editor
 			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)}";

Assets/YooAsset/Editor/AssetBundleBuilder/BuildAssetInfo.cs

@@ -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,26 @@ namespace YooAsset.Editor
 			}
 		}
 
+		/// <summary>
+		/// 构建内容哈希值
+		/// </summary>
+		public string ContentHash { set; get; } = "00000000000000000000000000000000"; //32位
+
+		/// <summary>
+		/// 文件哈希值
+		/// </summary>
+		public string FileHash { set; get; } = "00000000000000000000000000000000"; //32位
+
+		/// <summary>
+		/// 文件CRC32
+		/// </summary>
+		public string FileCRC { set; get; } = "00000000"; //8位
+
+		/// <summary>
+		/// 文件大小
+		/// </summary>
+		public long FileSize { set; get; } = 0;
+
 
 		public BuildBundleInfo(string bundleName)
 		{

Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs

@@ -18,6 +18,16 @@ namespace YooAsset.Editor
 			/// 生成代码防裁剪配置
 			/// </summary>
 			public bool WriteLinkXML = true;
+
+			/// <summary>
+			/// 缓存服务器地址
+			/// </summary>
+			public string CacheServerHost;
+
+			/// <summary>
+			/// 缓存服务器端口
+			/// </summary>
+			public int CacheServerPort;
 		}
 
 		/// <summary>
@@ -67,12 +77,7 @@ namespace YooAsset.Editor
 		/// 启用可寻址资源定位
 		/// </summary>
 		public bool EnableAddressable = false;
-
-		/// <summary>
-		/// 追加文件扩展名
-		/// </summary>
-		public bool AppendFileExtension = false;
-
+		
 		/// <summary>
 		/// 拷贝内置资源文件到StreamingAssets目录（首包资源文件）
 		/// </summary>
@@ -84,6 +89,11 @@ namespace YooAsset.Editor
 		/// </summary>
 		public IEncryptionServices EncryptionServices = null;
 
+		/// <summary>
+		/// 补丁文件名称的样式
+		/// </summary>
+		public EOutputNameStyle OutputNameStyle = EOutputNameStyle.HashName;
+
 		/// <summary>
 		/// 压缩选项
 		/// </summary>
@@ -108,6 +118,4 @@ namespace YooAsset.Editor
 			return StringUtility.StringToStringList(BuildinTags, ';');
 		}
 	}
-
-
 }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildParametersContext.cs

@@ -100,11 +100,19 @@ namespace YooAsset.Editor
 			else
 				throw new System.NotImplementedException(Parameters.CompressOption.ToString());
 
-			if (Parameters.BuildMode == EBuildMode.ForceRebuild)
-				buildParams.UseCache = false;
 			if (Parameters.DisableWriteTypeTree)
 				buildParams.ContentBuildFlags |= UnityEditor.Build.Content.ContentBuildFlags.DisableWriteTypeTree;
 
+			if(Parameters.BuildMode == EBuildMode.ForceRebuild)
+			{
+				buildParams.UseCache = false;
+			}
+			else
+			{
+				buildParams.UseCache = true;
+				buildParams.CacheServerHost = Parameters.SBPParameters.CacheServerHost;
+				buildParams.CacheServerPort = Parameters.SBPParameters.CacheServerPort;
+			}
 			buildParams.WriteLinkXML = Parameters.SBPParameters.WriteLinkXML;
 
 			return buildParams;

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

@@ -58,38 +58,25 @@ namespace YooAsset.Editor
 		/// </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;

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

@@ -0,0 +1,29 @@
+
+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;
+    }
+}

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 03baa90d8f534834c9c31d469a507f66
+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

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

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

@@ -10,7 +10,7 @@ namespace YooAsset.Editor
 	[TaskAttribute("资源构建内容打包")]
 	public class TaskBuilding : IBuildTask
 	{
-		public class UnityManifestContext : IContextObject
+		public class BuildResultContext : IContextObject
 		{
 			public AssetBundleManifest UnityManifest;
 		}
@@ -26,19 +26,19 @@ namespace YooAsset.Editor
 				return;
 
 			BuildAssetBundleOptions opt = buildParametersContext.GetPipelineBuildOptions();
-			AssetBundleManifest unityManifest = BuildPipeline.BuildAssetBundles(buildParametersContext.PipelineOutputDirectory, buildMapContext.GetPipelineBuilds(), opt, buildParametersContext.Parameters.BuildTarget);
-			if (unityManifest == null)
+			AssetBundleManifest buildResults = BuildPipeline.BuildAssetBundles(buildParametersContext.PipelineOutputDirectory, buildMapContext.GetPipelineBuilds(), opt, buildParametersContext.Parameters.BuildTarget);
+			if (buildResults == null)
 				throw new Exception("构建过程中发生错误！");
 
 			BuildRunner.Log("Unity引擎打包成功！");
-			UnityManifestContext unityManifestContext = new UnityManifestContext();
-			unityManifestContext.UnityManifest = unityManifest;
-			context.SetContextObject(unityManifestContext);
+			BuildResultContext buildResultContext = new BuildResultContext();
+			buildResultContext.UnityManifest = buildResults;
+			context.SetContextObject(buildResultContext);
 
-			// 拷贝原生文件
 			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
 			{
 				CopyRawBundle(buildMapContext, buildParametersContext);
+				UpdateBuildBundleInfo(buildMapContext, buildParametersContext, buildResultContext);
 			}
 		}
 
@@ -60,5 +60,31 @@ namespace YooAsset.Editor
 				}
 			}
 		}
+
+		/// <summary>
+		/// 更新构建结果
+		/// </summary>
+		private void UpdateBuildBundleInfo(BuildMapContext buildMapContext, BuildParametersContext buildParametersContext, BuildResultContext buildResult)
+		{
+			foreach (var bundleInfo in buildMapContext.BundleInfos)
+			{
+				string filePath = $"{buildParametersContext.PipelineOutputDirectory}/{bundleInfo.BundleName}";
+				bundleInfo.FileHash = HashUtility.FileMD5(filePath);
+				bundleInfo.FileCRC = HashUtility.FileCRC32(filePath);
+				bundleInfo.FileSize = FileUtility.GetFileSize(filePath);
+				if (bundleInfo.IsRawFile)
+				{
+					bundleInfo.ContentHash = bundleInfo.FileHash;
+				}
+				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

@@ -2,18 +2,17 @@
 using System.Linq;
 using System.Collections;
 using System.Collections.Generic;
-using UnityEditor;
-using UnityEngine;
 
 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 SBPBuildResultContext : IContextObject
+		public class BuildResultContext : IContextObject
 		{
 			public IBundleBuildResults Results;
 		}
@@ -34,7 +33,8 @@ namespace YooAsset.Editor
 			// 开始构建
 			IBundleBuildResults buildResults;
 			var buildParameters = buildParametersContext.GetSBPBuildParameters();
-			var taskList = DefaultBuildTasks.Create(DefaultBuildTasks.Preset.AssetBundleBuiltInShaderExtraction);
+			var shadersBunldeName = YooAssetSettingsData.GetUnityShadersBundleFullName();
+			var taskList = SBPBuildTasks.Create(shadersBunldeName);
 			ReturnCode exitCode = ContentPipeline.BuildAssetBundles(buildParameters, buildContent, out buildResults, taskList);
 			if (exitCode < 0)
 			{
@@ -42,21 +42,14 @@ namespace YooAsset.Editor
 			}
 
 			BuildRunner.Log("Unity引擎打包成功！");
-			SBPBuildResultContext buildResultContext = new SBPBuildResultContext();
+			BuildResultContext buildResultContext = new BuildResultContext();
 			buildResultContext.Results = buildResults;
 			context.SetContextObject(buildResultContext);
 
-			// 添加Unity内置资源包信息
-			if (buildResults.BundleInfos.Keys.Any(t => t == YooAssetSettings.UnityBuiltInShadersBundleName))
-			{
-				BuildBundleInfo builtInBundleInfo = new BuildBundleInfo(YooAssetSettings.UnityBuiltInShadersBundleName);
-				buildMapContext.BundleInfos.Add(builtInBundleInfo);
-			}
-
-			// 拷贝原生文件
 			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
 			{
 				CopyRawBundle(buildMapContext, buildParametersContext);
+				UpdateBuildBundleInfo(buildMapContext, buildParametersContext, buildResultContext);
 			}
 		}
 
@@ -78,5 +71,31 @@ namespace YooAsset.Editor
 				}
 			}
 		}
+
+		/// <summary>
+		/// 更新构建结果
+		/// </summary>
+		private void UpdateBuildBundleInfo(BuildMapContext buildMapContext, BuildParametersContext buildParametersContext, BuildResultContext buildResult)
+		{
+			foreach (var bundleInfo in buildMapContext.BundleInfos)
+			{
+				string filePath = $"{buildParametersContext.PipelineOutputDirectory}/{bundleInfo.BundleName}";
+				bundleInfo.FileHash = HashUtility.FileMD5(filePath);
+				bundleInfo.FileCRC = HashUtility.FileCRC32(filePath);
+				bundleInfo.FileSize = FileUtility.GetFileSize(filePath);
+				if (bundleInfo.IsRawFile)
+				{
+					bundleInfo.ContentHash = bundleInfo.FileHash;
+				}
+				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/TaskCopyBuildinFiles.cs

@@ -35,7 +35,7 @@ namespace YooAsset.Editor
 					continue;
 
 				string sourcePath = $"{pipelineOutputDirectory}/{patchBundle.BundleName}";
-				string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsFolderPath()}/{patchBundle.Hash}";
+				string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsFolderPath()}/{patchBundle.FileName}";
 				EditorTools.CopyFile(sourcePath, destPath, true);
 			}
 

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

@@ -22,22 +22,22 @@ namespace YooAsset.Editor
 		private void CreatePatchManifestFile(BuildContext context)
 		{
 			var buildParameters = context.GetContextObject<BuildParametersContext>();
-			var buildMapContext = context.GetContextObject<BuildMapContext>();
-			var encryptionContext = context.GetContextObject<TaskEncryption.EncryptionContext>();
 			int resourceVersion = buildParameters.Parameters.BuildVersion;
 
 			// 创建新补丁清单
 			PatchManifest patchManifest = new PatchManifest();
-			patchManifest.EnableAddressable = buildParameters.Parameters.EnableAddressable;
+			patchManifest.FileVersion = YooAssetSettings.PatchManifestFileVersion;
 			patchManifest.ResourceVersion = buildParameters.Parameters.BuildVersion;
+			patchManifest.EnableAddressable = buildParameters.Parameters.EnableAddressable;
+			patchManifest.OutputNameStyle = (int)buildParameters.Parameters.OutputNameStyle;
 			patchManifest.BuildinTags = buildParameters.Parameters.BuildinTags;
-			patchManifest.BundleList = GetAllPatchBundle(buildParameters, buildMapContext, encryptionContext);
-			patchManifest.AssetList = GetAllPatchAsset(buildParameters, buildMapContext, patchManifest);
+			patchManifest.BundleList = GetAllPatchBundle(context);
+			patchManifest.AssetList = GetAllPatchAsset(context, patchManifest);
 
 			// 更新Unity内置资源包的引用关系
 			if (buildParameters.Parameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
 			{
-				var buildResultContext = context.GetContextObject<TaskBuilding_SBP.SBPBuildResultContext>();
+				var buildResultContext = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
 				UpdateBuiltInBundleReference(patchManifest, buildResultContext.Results);
 			}
 
@@ -62,33 +62,27 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 获取资源包列表
 		/// </summary>
-		private List<PatchBundle> GetAllPatchBundle(BuildParametersContext buildParameters, BuildMapContext buildMapContext,
-			TaskEncryption.EncryptionContext encryptionContext)
+		private List<PatchBundle> GetAllPatchBundle(BuildContext context)
 		{
+			var buildParameters = context.GetContextObject<BuildParametersContext>();
+			var buildMapContext = context.GetContextObject<BuildMapContext>();
+			var encryptionContext = context.GetContextObject<TaskEncryption.EncryptionContext>();
+
 			List<PatchBundle> result = new List<PatchBundle>(1000);
 
 			List<string> buildinTags = buildParameters.Parameters.GetBuildinTags();
-			var buildMode = buildParameters.Parameters.BuildMode;
-			bool standardBuild = buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild;
 			foreach (var bundleInfo in buildMapContext.BundleInfos)
 			{
 				var bundleName = bundleInfo.BundleName;
-				string filePath = $"{buildParameters.PipelineOutputDirectory}/{bundleName}";
-				string hash = GetFileHash(filePath, standardBuild);
-				string crc32 = GetFileCRC(filePath, standardBuild);
-				long size = GetFileSize(filePath, standardBuild);
+				string fileHash = bundleInfo.FileHash;
+				string fileCRC = bundleInfo.FileCRC;
+				long fileSize = bundleInfo.FileSize;
 				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 patchBundle = new PatchBundle(bundleName, fileHash, fileCRC, fileSize, tags);
 				patchBundle.SetFlagsValue(isEncrypted, isBuildin, isRawFile);
 				result.Add(patchBundle);
 			}
@@ -108,33 +102,15 @@ namespace YooAsset.Editor
 			}
 			return false;
 		}
-		private string GetFileHash(string filePath, bool standardBuild)
-		{
-			if (standardBuild)
-				return HashUtility.FileMD5(filePath);
-			else
-				return "00000000000000000000000000000000"; //32位
-		}
-		private string GetFileCRC(string filePath, bool standardBuild)
-		{
-			if (standardBuild)
-				return HashUtility.FileCRC32(filePath);
-			else
-				return "00000000"; //8位
-		}
-		private long GetFileSize(string filePath, bool standardBuild)
-		{
-			if (standardBuild)
-				return FileUtility.GetFileSize(filePath);
-			else
-				return 0;
-		}
 
 		/// <summary>
 		/// 获取资源列表
 		/// </summary>
-		private List<PatchAsset> GetAllPatchAsset(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)
 			{
@@ -187,24 +163,31 @@ namespace YooAsset.Editor
 		/// </summary>
 		private void UpdateBuiltInBundleReference(PatchManifest patchManifest, IBundleBuildResults buildResults)
 		{
-			// 获取所有依赖内置资源包的资源包列表
-			List<string> builtInBundleReferenceList = new List<string>();
+			// 获取所有依赖着色器资源包的资源包列表
+			string shadersBunldeName = YooAssetSettingsData.GetUnityShadersBundleFullName();
+			List<string> shaderBundleReferenceList = new List<string>();
 			foreach (var valuePair in buildResults.BundleInfos)
 			{
-				if (valuePair.Value.Dependencies.Any(t => t == YooAssetSettings.UnityBuiltInShadersBundleName))
-					builtInBundleReferenceList.Add(valuePair.Key);
+				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
-			int builtInBundleId = patchManifest.BundleList.Count - 1;
 			foreach (var patchAsset in patchManifest.AssetList)
 			{
 				List<string> dependBundles = GetPatchAssetAllDependBundles(patchManifest, patchAsset);
-				List<string> conflictAssetPathList = dependBundles.Intersect(builtInBundleReferenceList).ToList();
+				List<string> conflictAssetPathList = dependBundles.Intersect(shaderBundleReferenceList).ToList();
 				if (conflictAssetPathList.Count > 0)
 				{
 					List<int> newDependIDs = new List<int>(patchAsset.DependIDs);
-					newDependIDs.Add(builtInBundleId);
+					if (newDependIDs.Contains(shaderBundleId) == false)
+						newDependIDs.Add(shaderBundleId);
 					patchAsset.DependIDs = newDependIDs.ToArray();
 				}
 			}

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

@@ -75,15 +75,15 @@ namespace YooAsset.Editor
 			{
 				// 拷贝UnityManifest序列化文件
 				{
-					string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.Setting.UnityManifestFileName}";
-					string destPath = $"{packageDirectory}/{YooAssetSettingsData.Setting.UnityManifestFileName}";
+					string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettings.OutputFolderName}";
+					string destPath = $"{packageDirectory}/{YooAssetSettings.OutputFolderName}";
 					EditorTools.CopyFile(sourcePath, destPath, true);
 				}
 
 				// 拷贝UnityManifest文本文件
 				{
-					string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.Setting.UnityManifestFileName}.manifest";
-					string destPath = $"{packageDirectory}/{YooAssetSettingsData.Setting.UnityManifestFileName}.manifest";
+					string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettings.OutputFolderName}.manifest";
+					string destPath = $"{packageDirectory}/{YooAssetSettings.OutputFolderName}.manifest";
 					EditorTools.CopyFile(sourcePath, destPath, true);
 				}
 			}
@@ -95,7 +95,7 @@ namespace YooAsset.Editor
 			foreach (var patchBundle in patchManifest.BundleList)
 			{
 				string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{patchBundle.BundleName}";
-				string destPath = $"{packageDirectory}/{patchBundle.Hash}";
+				string destPath = $"{packageDirectory}/{patchBundle.FileName}";
 				EditorTools.CopyFile(sourcePath, destPath, true);
 				EditorTools.DisplayProgressBar("拷贝补丁文件", ++progressValue, patchFileTotalCount);
 			}

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

@@ -47,20 +47,19 @@ namespace YooAsset.Editor
 				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.OutputNameStyle = buildParameters.Parameters.OutputNameStyle;
 				buildReport.Summary.CompressOption = buildParameters.Parameters.CompressOption;
 				buildReport.Summary.DisableWriteTypeTree = buildParameters.Parameters.DisableWriteTypeTree;
 				buildReport.Summary.IgnoreTypeTreeChanges = buildParameters.Parameters.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);
@@ -82,7 +81,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);
@@ -94,9 +93,10 @@ 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);
@@ -159,6 +159,10 @@ namespace YooAsset.Editor
 			return result;
 		}
 
+		private int GetMainAssetCount(PatchManifest patchManifest)
+		{
+			return patchManifest.AssetList.Count;
+		}
 		private int GetAllBundleCount(PatchManifest patchManifest)
 		{
 			return patchManifest.BundleList.Count;
@@ -168,7 +172,7 @@ namespace YooAsset.Editor
 			long fileBytes = 0;
 			foreach (var patchBundle in patchManifest.BundleList)
 			{
-				fileBytes += patchBundle.SizeBytes;
+				fileBytes += patchBundle.FileSize;
 			}
 			return fileBytes;
 		}
@@ -188,7 +192,7 @@ namespace YooAsset.Editor
 			foreach (var patchBundle in patchManifest.BundleList)
 			{
 				if (patchBundle.IsBuildin)
-					fileBytes += patchBundle.SizeBytes;
+					fileBytes += patchBundle.FileSize;
 			}
 			return fileBytes;
 		}
@@ -208,7 +212,7 @@ namespace YooAsset.Editor
 			foreach (var patchBundle in patchManifest.BundleList)
 			{
 				if (patchBundle.IsEncrypted)
-					fileBytes += patchBundle.SizeBytes;
+					fileBytes += patchBundle.FileSize;
 			}
 			return fileBytes;
 		}
@@ -228,7 +232,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/TaskPrepare.cs

@@ -14,6 +14,8 @@ namespace YooAsset.Editor
 			var buildParameters = context.GetContextObject<BuildParametersContext>();
 			buildParameters.BeginWatch();
 
+			var buildMode = buildParameters.Parameters.BuildMode;
+
 			// 检测构建平台是否合法
 			if (buildParameters.Parameters.BuildTarget == BuildTarget.NoTarget)
 				throw new Exception("请选择目标平台");
@@ -26,39 +28,41 @@ namespace YooAsset.Editor
 			if (string.IsNullOrEmpty(buildParameters.PipelineOutputDirectory))
 				throw new Exception("输出目录不能为空");
 
-			// 检测当前是否正在构建资源包
-			if (BuildPipeline.isBuildingPlayer)
-				throw new Exception("当前正在构建资源包，请结束后再试");
+			if (buildMode != EBuildMode.SimulateBuild)
+			{
+				// 检测当前是否正在构建资源包
+				if (BuildPipeline.isBuildingPlayer)
+					throw new Exception("当前正在构建资源包，请结束后再试");
 
-			// 检测是否有未保存场景
-			if (EditorTools.HasDirtyScenes())
-				throw new Exception("检测到未保存的场景文件");
+				// 检测是否有未保存场景
+				if (EditorTools.HasDirtyScenes())
+					throw new Exception("检测到未保存的场景文件");
 
-			// 保存改动的资源
-			AssetDatabase.SaveAssets();
+				// 保存改动的资源
+				AssetDatabase.SaveAssets();
+			}
 
 			// 增量更新时候的必要检测
-			var buildMode = buildParameters.Parameters.BuildMode;
 			if (buildMode == EBuildMode.IncrementalBuild)
 			{
 				// 检测历史版本是否存在
-				if (AssetBundleBuilderHelper.HasAnyPackageVersion(buildParameters.Parameters.BuildTarget, buildParameters.Parameters.OutputRoot) == false)
-					throw new Exception("没有发现任何历史版本，请尝试强制重建");
+				if (AssetBundleBuilderHelper.HasAnyPackageVersion(buildParameters.Parameters.BuildTarget, buildParameters.Parameters.OutputRoot))
+				{
+					// 检测构建版本是否合法
+					int maxPackageVersion = AssetBundleBuilderHelper.GetMaxPackageVersion(buildParameters.Parameters.BuildTarget, buildParameters.Parameters.OutputRoot);
+					if (buildParameters.Parameters.BuildVersion <= maxPackageVersion)
+						throw new Exception("构建版本不能小于历史版本");
 
-				// 检测构建版本是否合法
-				int maxPackageVersion = AssetBundleBuilderHelper.GetMaxPackageVersion(buildParameters.Parameters.BuildTarget, buildParameters.Parameters.OutputRoot);
-				if (buildParameters.Parameters.BuildVersion <= maxPackageVersion)
-					throw new Exception("构建版本不能小于历史版本");
+					// 检测补丁包是否已经存在
+					string packageDirectory = buildParameters.GetPackageDirectory();
+					if (Directory.Exists(packageDirectory))
+						throw new Exception($"补丁包已经存在：{packageDirectory}");
 
-				// 检测补丁包是否已经存在
-				string packageDirectory = buildParameters.GetPackageDirectory();
-				if (Directory.Exists(packageDirectory))
-					throw new Exception($"补丁包已经存在：{packageDirectory}");
-
-				// 检测内置资源分类标签是否一致
-				var oldPatchManifest = AssetBundleBuilderHelper.GetOldPatchManifest(buildParameters.PipelineOutputDirectory);
-				if (buildParameters.Parameters.BuildinTags != oldPatchManifest.BuildinTags)
-					throw new Exception($"增量更新时内置资源标签必须一致：{buildParameters.Parameters.BuildinTags} != {oldPatchManifest.BuildinTags}");
+					// 检测内置资源分类标签是否一致
+					var oldPatchManifest = AssetBundleBuilderHelper.GetOldPatchManifest(buildParameters.PipelineOutputDirectory);
+					if (buildParameters.Parameters.BuildinTags != oldPatchManifest.BuildinTags)
+						throw new Exception($"增量更新时内置资源标签必须一致：{buildParameters.Parameters.BuildinTags} != {oldPatchManifest.BuildinTags}");
+				}
 			}
 
 			// 如果是强制重建

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

@@ -14,7 +14,7 @@ namespace YooAsset.Editor
 		void IBuildTask.Run(BuildContext context)
 		{
 			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);
 			}
 		}
 
@@ -37,20 +37,31 @@ namespace YooAsset.Editor
 			string[] buildedBundles = unityManifest.GetAllAssetBundles();
 
 			// 1. 过滤掉原生Bundle
-			string[] expectBundles = buildMapContext.BundleInfos.Where(t => t.IsRawFile == false).Select(t => t.BundleName).ToArray();
+			string[] mapBundles = buildMapContext.BundleInfos.Where(t => t.IsRawFile == false).Select(t => t.BundleName).ToArray();
 
 			// 2. 验证Bundle
-			List<string> intersectBundleList = buildedBundles.Except(expectBundles).ToList();
-			if (intersectBundleList.Count > 0)
+			List<string> exceptBundleList1 = buildedBundles.Except(mapBundles).ToList();
+			if (exceptBundleList1.Count > 0)
 			{
-				foreach (var intersectBundle in intersectBundleList)
+				foreach (var exceptBundle in exceptBundleList1)
 				{
-					Debug.LogWarning($"差异资源包: {intersectBundle}");
+					Debug.LogWarning($"差异资源包: {exceptBundle}");
 				}
 				throw new System.Exception("存在差异资源包！请查看警告信息！");
 			}
 
-			// 3. 验证Asset
+			// 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;
 			var buildMode = buildParameters.Parameters.BuildMode;
 			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
@@ -59,46 +70,28 @@ namespace YooAsset.Editor
 				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[] 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("构建结果验证没有通过，请参考警告日志！");

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

@@ -23,7 +23,7 @@ namespace YooAsset.Editor
 			// 验证构建结果
 			if (buildParametersContext.Parameters.VerifyBuildingResult)
 			{
-				var buildResultContext = context.GetContextObject<TaskBuilding_SBP.SBPBuildResultContext>();
+				var buildResultContext = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
 				VerifyingBuildingResult(context, buildResultContext.Results);
 			}
 		}
@@ -35,21 +35,29 @@ namespace YooAsset.Editor
 		{
 			var buildParameters = context.GetContextObject<BuildParametersContext>();
 			var buildMapContext = context.GetContextObject<BuildMapContext>();
-
-			// 1. 移除特定Bundle
 			List<string> buildedBundles = buildResults.BundleInfos.Keys.ToList();
-			buildedBundles.Remove(YooAssetSettings.UnityBuiltInShadersBundleName);
 
-			// 2. 过滤掉原生Bundle
+			// 1. 过滤掉原生Bundle
 			List<string> expectBundles = buildMapContext.BundleInfos.Where(t => t.IsRawFile == false).Select(t => t.BundleName).ToList();
 
-			// 3. 验证Bundle
-			List<string> intersectBundleList = buildedBundles.Except(expectBundles).ToList();
-			if (intersectBundleList.Count > 0)
+			// 2. 验证Bundle
+			List<string> exceptBundleList1 = buildedBundles.Except(expectBundles).ToList();
+			if (exceptBundleList1.Count > 0)
 			{
-				foreach (var intersectBundle in intersectBundleList)
+				foreach (var exceptBundle in exceptBundleList1)
 				{
-					Debug.LogWarning($"差异资源包: {intersectBundle}");
+					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("存在差异资源包！请查看警告信息！");
 			}

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

@@ -190,29 +190,44 @@ namespace YooAsset.Editor
 				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))
+				return true;
 
 			// 根据规则设置过滤资源文件
 			IFilterRule filterRuleInstance = AssetBundleCollectorSettingData.GetFilterRuleInstance(FilterRuleName);
@@ -229,23 +244,16 @@ 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))
 			{
-				System.Type assetType = AssetDatabase.GetMainAssetTypeAtPath(assetPath);
-				if (assetType == typeof(UnityEngine.Shader))
-				{
-					string bundleName = AssetBundleCollectorSettingData.Setting.ShadersBundleName;
-					return EditorTools.GetRegularPath(bundleName).ToLower();
-				}
+				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

@@ -15,8 +15,6 @@ namespace YooAsset.Editor
 		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 XmlGroup = "Group";
 		public const string XmlGroupName = "GroupName";
 		public const string XmlGroupDesc = "GroupDesc";
@@ -53,22 +51,13 @@ namespace YooAsset.Editor
 
 			// 读取公共配置
 			bool enableAddressable = false;
-			bool autoCollectShaders = false;
-			string shaderBundleName = string.Empty;
 			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}");
-
 				enableAddressable = commonElement.GetAttribute(XmlEnableAddressable) == "True" ? true : false;
-				autoCollectShaders = commonElement.GetAttribute(XmlAutoCollectShader) == "True" ? true : false;
-				shaderBundleName = commonElement.GetAttribute(XmlShaderBundleName);
 			}
 
 			// 读取分组配置
@@ -122,8 +111,6 @@ namespace YooAsset.Editor
 			// 保存配置数据
 			AssetBundleCollectorSettingData.ClearAll();
 			AssetBundleCollectorSettingData.Setting.EnableAddressable = enableAddressable;
-			AssetBundleCollectorSettingData.Setting.AutoCollectShaders = autoCollectShaders;
-			AssetBundleCollectorSettingData.Setting.ShadersBundleName = shaderBundleName;
 			AssetBundleCollectorSettingData.Setting.Groups.AddRange(groupTemper);
 			AssetBundleCollectorSettingData.SaveFile();
 			Debug.Log($"导入配置完毕！");
@@ -152,8 +139,6 @@ 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);
 			root.AppendChild(commonElement);
 
 			// 设置分组配置

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSetting.cs

@@ -13,16 +13,6 @@ namespace YooAsset.Editor
 		/// </summary>
 		public bool EnableAddressable = false;
 
-		/// <summary>
-		/// 自动收集着色器
-		/// </summary>
-		public bool AutoCollectShaders = true;
-
-		/// <summary>
-		/// 自动收集的着色器资源包名称
-		/// </summary>
-		public string ShadersBundleName = "myshaders";
-
 		/// <summary>
 		/// 分组列表
 		/// </summary>
@@ -40,6 +30,34 @@ namespace YooAsset.Editor
 			}
 		}
 
+		/// <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();
+		}
+
 		/// <summary>
 		/// 获取打包收集的资源文件
 		/// </summary>
@@ -56,7 +74,7 @@ namespace YooAsset.Editor
 					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.");
+						throw new Exception($"The collecting asset file is existed : {assetInfo.AssetPath}");
 				}
 			}
 
@@ -72,7 +90,7 @@ namespace YooAsset.Editor
 						if (adressTemper.Contains(address) == false)
 							adressTemper.Add(address);
 						else
-							throw new Exception($"The address is existed : {address} in group setting.");
+							throw new Exception($"The address is existed : {address}");
 					}
 				}
 			}

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSettingData.cs

@@ -250,8 +250,7 @@ namespace YooAsset.Editor
 		/// </summary>
 		public static void ClearAll()
 		{
-			Setting.AutoCollectShaders = false;
-			Setting.ShadersBundleName = string.Empty;
+			Setting.EnableAddressable = false;
 			Setting.Groups.Clear();
 			SaveFile();
 		}
@@ -333,14 +332,6 @@ namespace YooAsset.Editor
 			IsDirty = true;
 		}
 
-		// 着色器编辑相关
-		public static void ModifyShader(bool isCollectAllShaders, string shadersBundleName)
-		{
-			Setting.AutoCollectShaders = isCollectAllShaders;
-			Setting.ShadersBundleName = shadersBundleName;
-			IsDirty = true;
-		}
-
 		// 资源分组编辑相关
 		public static void CreateGroup(string groupName)
 		{
@@ -394,5 +385,14 @@ namespace YooAsset.Editor
 				IsDirty = true;
 			}
 		}
+
+		/// <summary>
+		/// 获取所有的资源标签
+		/// </summary>
+		public static string GetAllTags()
+		{
+			var allTags = Setting.GetAllTags();
+			return string.Join(";", allTags);
+		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs

@@ -28,8 +28,6 @@ namespace YooAsset.Editor
 		private ScrollView _collectorScrollView;
 		private PopupField<string> _activeRulePopupField;
 		private Toggle _enableAddressableToogle;
-		private Toggle _autoCollectShaderToogle;
-		private TextField _shaderBundleNameTxt;
 		private TextField _groupNameTxt;
 		private TextField _groupDescTxt;
 		private TextField _groupAssetTagsTxt;
@@ -81,17 +79,6 @@ namespace YooAsset.Editor
 					AssetBundleCollectorSettingData.ModifyAddressable(evt.newValue);
 					RefreshWindow();
 				});
-				_autoCollectShaderToogle = root.Q<Toggle>("AutoCollectShader");
-				_autoCollectShaderToogle.RegisterValueChangedCallback(evt =>
-				{
-					AssetBundleCollectorSettingData.ModifyShader(evt.newValue, _shaderBundleNameTxt.value);
-					_shaderBundleNameTxt.SetEnabled(evt.newValue);
-				});
-				_shaderBundleNameTxt = root.Q<TextField>("ShaderBundleName");
-				_shaderBundleNameTxt.RegisterValueChangedCallback(evt =>
-				{
-					AssetBundleCollectorSettingData.ModifyShader(_autoCollectShaderToogle.value, evt.newValue);
-				});
 
 				// 分组列表相关
 				_groupListView = root.Q<ListView>("GroupListView");
@@ -218,9 +205,6 @@ namespace YooAsset.Editor
 		private void RefreshWindow()
 		{
 			_enableAddressableToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.EnableAddressable);
-			_autoCollectShaderToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.AutoCollectShaders);
-			_shaderBundleNameTxt.SetEnabled(AssetBundleCollectorSettingData.Setting.AutoCollectShaders);
-			_shaderBundleNameTxt.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.ShadersBundleName);
 			_groupContainer.visible = false;
 
 			FillGroupViewData();

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.uxml

@@ -15,8 +15,6 @@
         <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;" />

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/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

@@ -70,14 +70,12 @@ namespace YooAsset.Editor
 			_items.Add(new ItemWrapper("内置资源标签", $"{buildReport.Summary.BuildinTags}"));
 
 			_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}"));
@@ -85,6 +83,7 @@ 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}"));

Assets/YooAsset/Editor/EditorTools.cs

@@ -213,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()
 		{

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()
@@ -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,9 +34,7 @@ namespace YooAsset.Editor
 			EditorGUILayout.Space();
 			if (GUILayout.Button("搜集变种", GUILayout.MaxWidth(80)))
 			{
-				// 先删除再保存，否则ShaderVariantCollection内容将无法及时刷新
-				AssetDatabase.DeleteAsset(ShaderVariantCollectorSettingData.Setting.SavePath);
-				ShaderVariantCollector.Run(ShaderVariantCollectorSettingData.Setting.SavePath);
+				ShaderVariantCollector.Run(ShaderVariantCollectorSettingData.Setting.SavePath, null);
 			}
 
 			// 查询

Assets/YooAsset/Runtime/AssetSystem/AssetSystem.cs

@@ -11,7 +11,8 @@ namespace YooAsset
 		private static readonly List<AssetBundleLoaderBase> _loaders = new List<AssetBundleLoaderBase>(1000);
 		private static readonly List<ProviderBase> _providers = new List<ProviderBase>(1000);
 		private static readonly Dictionary<string, SceneOperationHandle> _sceneHandles = new Dictionary<string, SceneOperationHandle>(100);
-		
+		private static long _sceneCreateCount = 0;
+
 		private static bool _simulationOnEditor;
 		private static int _loadingMaxNumber;
 		public static IDecryptionServices DecryptionServices { private set; get; }
@@ -139,29 +140,25 @@ namespace YooAsset
 		{
 			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 (sceneMode == LoadSceneMode.Single)
 			{
 				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(providerGUID, assetInfo, sceneMode, activateOnLoad, priority);
 				else
-					provider = new BundledSceneProvider(assetInfo, sceneMode, activateOnLoad, priority);
+					provider = new BundledSceneProvider(providerGUID, assetInfo, sceneMode, activateOnLoad, priority);
 				provider.InitSpawnDebugInfo();
 				_providers.Add(provider);
 			}
@@ -178,18 +175,19 @@ namespace YooAsset
 		{
 			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(providerGUID, assetInfo);
 				else
-					provider = new BundledAssetProvider(assetInfo);
+					provider = new BundledAssetProvider(providerGUID, assetInfo);
 				provider.InitSpawnDebugInfo();
 				_providers.Add(provider);
 			}
@@ -203,18 +201,19 @@ namespace YooAsset
 		{
 			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(providerGUID, assetInfo);
 				else
-					provider = new BundledSubAssetsProvider(assetInfo);
+					provider = new BundledSubAssetsProvider(providerGUID, assetInfo);
 				provider.InitSpawnDebugInfo();
 				_providers.Add(provider);
 			}
@@ -223,7 +222,7 @@ namespace YooAsset
 
 		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 !");
 
@@ -233,12 +232,6 @@ namespace YooAsset
 
 			// 卸载未被使用的资源（包括场景）
 			AssetSystem.UnloadUnusedAssets();
-
-			// 检验子场景是否销毁
-			if (provider.IsDestroyed == false)
-			{
-				throw new Exception("Should never get here !");
-			}
 		}
 		internal static void UnloadAllScene()
 		{
@@ -251,16 +244,6 @@ namespace YooAsset
 
 			// 卸载未被使用的资源（包括场景）
 			AssetSystem.UnloadUnusedAssets();
-
-			// 检验所有场景是否销毁
-			foreach (var provider in _providers)
-			{
-				if (provider.IsSceneProvider())
-				{
-					if (provider.IsDestroyed == false)
-						throw new Exception("Should never get here !");
-				}
-			}
 		}
 
 		internal static AssetBundleLoaderBase CreateOwnerAssetBundleLoader(AssetInfo assetInfo)
@@ -290,7 +273,7 @@ namespace YooAsset
 		private static AssetBundleLoaderBase CreateAssetBundleLoaderInternal(BundleInfo bundleInfo)
 		{
 			// 如果加载器已经存在
-			AssetBundleLoaderBase loader = TryGetAssetBundleLoader(bundleInfo.BundleName);
+			AssetBundleLoaderBase loader = TryGetAssetBundleLoader(bundleInfo.Bundle.BundleName);
 			if (loader != null)
 				return loader;
 
@@ -310,7 +293,7 @@ namespace YooAsset
 			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;
@@ -324,7 +307,7 @@ namespace YooAsset
 			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;
@@ -363,6 +346,15 @@ namespace YooAsset
 			report.ProviderInfos.Sort();
 			return report;
 		}
+		internal static 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

@@ -149,7 +149,7 @@ namespace YooAsset
 		private InstantiateOperation InstantiateAsyncInternal(Vector3 position, Quaternion rotation, Transform parent, bool setPositionRotation)
 		{
 			InstantiateOperation operation = new InstantiateOperation(this, position, rotation, parent, setPositionRotation);
-			OperationSystem.StartOperaiton(operation);
+			OperationSystem.StartOperation(operation);
 			return operation;
 		}
 	}

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,7 +112,7 @@ 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;
 			}
 
@@ -121,7 +121,7 @@ namespace YooAsset
 			AssetSystem.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,7 +23,7 @@ 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)
@@ -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,47 +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}");
+						throw new Exception($"{nameof(AssetBundleFileLoader)} need {nameof(IDecryptionServices)} : {MainBundleInfo.Bundle.BundleName}");
 
 					DecryptionFileInfo fileInfo = new DecryptionFileInfo();
-					fileInfo.BundleName = MainBundleInfo.BundleName;
-					fileInfo.BundleHash = MainBundleInfo.Hash;
-					fileInfo.BundleCRC = MainBundleInfo.CRC;
+					fileInfo.BundleName = MainBundleInfo.Bundle.BundleName;
+					fileInfo.FileHash = MainBundleInfo.Bundle.FileHash;
 					ulong offset = AssetSystem.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;
 					}
 				}
 
@@ -161,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))
 							{
@@ -205,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

@@ -91,9 +91,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 +130,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;
 

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,19 +12,25 @@ 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)
 		{
 		}
@@ -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 (AssetSystem.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 = AssetSystem.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/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(string providerGUID, AssetInfo assetInfo) : base(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,7 +8,7 @@ namespace YooAsset
 		protected AssetBundleLoaderBase OwnerBundle { private set; get; }
 		protected DependAssetBundleGroup DependBundleGroup { private set; get; }
 
-		public BundledProvider(AssetInfo assetInfo) : base(assetInfo)
+		public BundledProvider(string providerGUID, AssetInfo assetInfo) : base(providerGUID, assetInfo)
 		{
 			OwnerBundle = AssetSystem.CreateOwnerAssetBundleLoader(assetInfo);
 			OwnerBundle.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(string providerGUID, AssetInfo assetInfo, LoadSceneMode sceneMode, bool activateOnLoad, int priority) : base(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(string providerGUID, AssetInfo assetInfo) : base(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(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(string providerGUID, AssetInfo assetInfo) : base(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(string providerGUID, AssetInfo assetInfo, LoadSceneMode sceneMode, bool activateOnLoad, int priority) : base(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(string providerGUID, AssetInfo assetInfo) : base(providerGUID, assetInfo)
 		{
 		}
 		public override void Update()

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

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

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 { private set; get; }
+
+		public static void Initialize(EVerifyLevel initVerifyLevel)
+		{
+			InitVerifyLevel = initVerifyLevel;
+		}
+		public static void DestroyAll()
+		{
+			_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/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/PatchCacheVerifier.cs

@@ -0,0 +1,255 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+
+namespace YooAsset
+{
+	/// <summary>
+	/// 本地缓存文件验证器
+	/// </summary>
+	internal abstract class PatchCacheVerifier
+	{
+		public abstract bool InitVerifier(PatchManifest appPatchManifest, PatchManifest localPatchManifest, bool weaklyUpdate);
+		public abstract bool UpdateVerifier();
+		public abstract float GetVerifierProgress();
+
+		public int VerifySuccessCount { protected set; get; } = 0;
+		public int VerifyFailCount { protected set; get; } = 0;
+	}
+
+	/// <summary>
+	/// 本地缓存文件验证器（线程版）
+	/// </summary>
+	internal class PatchCacheVerifierWithThread : PatchCacheVerifier
+	{
+		private class ThreadInfo
+		{
+			public EVerifyResult Result;
+			public string FilePath { private set; get; }
+			public PatchBundle Bundle { private set; get; }
+			public ThreadInfo(string filePath, PatchBundle bundle)
+			{
+				FilePath = filePath;
+				Bundle = bundle;
+			}
+		}
+
+		private readonly ThreadSyncContext _syncContext = new ThreadSyncContext();
+		private readonly List<PatchBundle> _waitingList = new List<PatchBundle>(1000);
+		private readonly List<PatchBundle> _verifyingList = new List<PatchBundle>(100);
+		private int _verifyMaxNum;
+		private int _verifyTotalCount;
+
+		public override bool InitVerifier(PatchManifest appPatchManifest, PatchManifest localPatchManifest, bool weaklyUpdate)
+		{
+			// 遍历所有文件然后验证并缓存合法文件
+			foreach (var patchBundle in localPatchManifest.BundleList)
+			{
+				// 忽略缓存文件
+				if (CacheSystem.IsCached(patchBundle))
+					continue;
+
+				// 忽略APP资源
+				// 注意：如果是APP资源并且哈希值相同，则不需要下载
+				if (appPatchManifest.TryGetPatchBundle(patchBundle.BundleName, out PatchBundle appPatchBundle))
+				{
+					if (appPatchBundle.IsBuildin && appPatchBundle.Equals(patchBundle))
+						continue;
+				}
+
+				// 注意：在弱联网模式下，我们需要验证指定资源版本的所有资源完整性
+				if (weaklyUpdate)
+				{
+					string filePath = patchBundle.CachedFilePath;
+					if (File.Exists(filePath))
+						_waitingList.Add(patchBundle);
+					else
+						return false;
+				}
+				else
+				{
+					string filePath = patchBundle.CachedFilePath;
+					if (File.Exists(filePath))
+						_waitingList.Add(patchBundle);
+				}
+			}
+
+			// 设置同时验证的最大数
+			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;
+			return true;
+		}
+		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 patchBundle = _waitingList[i];
+				if (VerifyFile(patchBundle))
+				{
+					_waitingList.RemoveAt(i);
+					_verifyingList.Add(patchBundle);
+				}
+				else
+				{
+					YooLogger.Warning("The thread pool is failed queued.");
+					break;
+				}
+			}
+
+			return false;
+		}
+		public override float GetVerifierProgress()
+		{
+			if (_verifyTotalCount == 0)
+				return 1f;
+			return (float)(VerifySuccessCount + VerifyFailCount) / _verifyTotalCount;
+		}
+
+		private bool VerifyFile(PatchBundle patchBundle)
+		{
+			string filePath = patchBundle.CachedFilePath;
+			ThreadInfo info = new ThreadInfo(filePath, patchBundle);
+			return ThreadPool.QueueUserWorkItem(new WaitCallback(VerifyInThread), info);
+		}
+		private void VerifyInThread(object infoObj)
+		{
+			ThreadInfo info = (ThreadInfo)infoObj;
+			info.Result = CacheSystem.VerifyBundle(info.Bundle, CacheSystem.InitVerifyLevel);
+			_syncContext.Post(VerifyCallback, info);
+		}
+		private void VerifyCallback(object obj)
+		{
+			ThreadInfo info = (ThreadInfo)obj;
+			if (info.Result == EVerifyResult.Succeed)
+			{
+				VerifySuccessCount++;
+				CacheSystem.CacheBundle(info.Bundle);
+			}
+			else
+			{
+				VerifyFailCount++;
+				YooLogger.Warning($"Failed to verify file : {info.Bundle.CachedFilePath}");
+
+				// NOTE：不期望删除断点续传的资源文件
+				/*
+				if (File.Exists(patchBundle.CachedBundleFilePath))
+					File.Delete(patchBundle.CachedBundleFilePath);
+				*/
+			}
+			_verifyingList.Remove(info.Bundle);
+		}
+	}
+
+	/// <summary>
+	/// 本地缓存文件验证器（非线程版）
+	/// </summary>
+	internal class PatchCacheVerifierWithoutThread : PatchCacheVerifier
+	{
+		private readonly List<PatchBundle> _waitingList = new List<PatchBundle>(1000);
+		private readonly List<PatchBundle> _verifyingList = new List<PatchBundle>(100);
+		private int _verifyMaxNum;
+		private int _verifyTotalCount;
+
+		public override bool InitVerifier(PatchManifest appPatchManifest, PatchManifest localPatchManifest, bool weaklyUpdate)
+		{
+			// 遍历所有文件然后验证并缓存合法文件
+			foreach (var patchBundle in localPatchManifest.BundleList)
+			{
+				// 忽略缓存文件
+				if (CacheSystem.IsCached(patchBundle))
+					continue;
+
+				// 忽略APP资源
+				// 注意：如果是APP资源并且哈希值相同，则不需要下载
+				if (appPatchManifest.TryGetPatchBundle(patchBundle.BundleName, out PatchBundle appPatchBundle))
+				{
+					if (appPatchBundle.IsBuildin && appPatchBundle.Equals(patchBundle))
+						continue;
+				}
+
+				// 注意：在弱联网模式下，我们需要验证指定资源版本的所有资源完整性
+				if (weaklyUpdate)
+				{
+					string filePath = patchBundle.CachedFilePath;
+					if (File.Exists(filePath))
+						_waitingList.Add(patchBundle);
+					else
+						return false;
+				}
+				else
+				{
+					string filePath = patchBundle.CachedFilePath;
+					if (File.Exists(filePath))
+						_waitingList.Add(patchBundle);
+				}
+			}
+
+			// 设置同时验证的最大数
+			_verifyMaxNum = 32;
+			_verifyTotalCount = _waitingList.Count;
+			return true;
+		}
+		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 patchBundle = _waitingList[i];
+				VerifyFile(patchBundle);
+				_waitingList.RemoveAt(i);
+				_verifyingList.Add(patchBundle);
+			}
+
+			_verifyingList.Clear();
+			return false;
+		}
+		public override float GetVerifierProgress()
+		{
+			if (_verifyTotalCount == 0)
+				return 1f;
+			return (float)(VerifySuccessCount + VerifyFailCount) / _verifyTotalCount;
+		}
+
+		private void VerifyFile(PatchBundle patchBundle)
+		{
+			var verifyResult = CacheSystem.VerifyAndCacheBundle(patchBundle, CacheSystem.InitVerifyLevel);
+			if (verifyResult == EVerifyResult.Succeed)
+			{
+				VerifySuccessCount++;
+			}
+			else
+			{
+				VerifyFailCount++;
+				YooLogger.Warning($"Failed to verify file : {patchBundle.CachedFilePath}");
+
+				// NOTE：不期望删除断点续传的资源文件
+				/*			
+				if (File.Exists(patchBundle.CachedBundleFilePath))
+					File.Delete(patchBundle.CachedBundleFilePath);
+				*/
+			}
+		}
+	}
+}

Assets/YooAsset/Runtime/CacheSystem/PatchCacheVerifier.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/DownloadSystem/DownloadSystem.cs

@@ -14,18 +14,15 @@ namespace YooAsset
 	{
 		private static readonly Dictionary<string, DownloaderBase> _downloaderDic = new Dictionary<string, DownloaderBase>();
 		private static readonly List<string> _removeList = new List<string>(100);
-		private static readonly Dictionary<string, string> _cachedHashList = new Dictionary<string, string>(1000);
 		private static int _breakpointResumeFileSize = int.MaxValue;
-		private static EVerifyLevel _verifyLevel = EVerifyLevel.High;
 
 
 		/// <summary>
 		/// 初始化
 		/// </summary>
-		public static void Initialize(int breakpointResumeFileSize, EVerifyLevel verifyLevel)
+		public static void Initialize(int breakpointResumeFileSize)
 		{
 			_breakpointResumeFileSize = breakpointResumeFileSize;
-			_verifyLevel = verifyLevel;
 		}
 
 		/// <summary>
@@ -62,7 +59,6 @@ namespace YooAsset
 			}
 			_downloaderDic.Clear();
 			_removeList.Clear();
-			_cachedHashList.Clear();
 			_breakpointResumeFileSize = int.MaxValue;
 		}
 
@@ -74,13 +70,13 @@ namespace YooAsset
 		public static DownloaderBase BeginDownload(BundleInfo bundleInfo, int failedTryAgain, int timeout = 60)
 		{
 			// 查询存在的下载器
-			if (_downloaderDic.TryGetValue(bundleInfo.Hash, out var downloader))
+			if (_downloaderDic.TryGetValue(bundleInfo.Bundle.CachedFilePath, out var downloader))
 			{
 				return downloader;
 			}
 
 			// 如果资源已经缓存
-			if (ContainsVerifyFile(bundleInfo.Hash))
+			if (CacheSystem.IsCached(bundleInfo.Bundle))
 			{
 				var tempDownloader = new TempDownloader(bundleInfo);
 				return tempDownloader;
@@ -88,15 +84,12 @@ namespace YooAsset
 
 			// 创建新的下载器	
 			{
-				YooLogger.Log($"Beginning to download file : {bundleInfo.BundleName} URL : {bundleInfo.RemoteMainURL}");
-				FileUtility.CreateFileDirectory(bundleInfo.GetCacheLoadPath());
-				DownloaderBase newDownloader;
-				if (bundleInfo.SizeBytes >= _breakpointResumeFileSize)
-					newDownloader = new HttpDownloader(bundleInfo);
-				else
-					newDownloader = new FileDownloader(bundleInfo);
+				YooLogger.Log($"Beginning to download file : {bundleInfo.Bundle.FileName} URL : {bundleInfo.RemoteMainURL}");
+				FileUtility.CreateFileDirectory(bundleInfo.Bundle.CachedFilePath);
+				bool breakDownload = bundleInfo.Bundle.FileSize >= _breakpointResumeFileSize;
+				DownloaderBase newDownloader = new FileDownloader(bundleInfo, breakDownload);
 				newDownloader.SendRequest(failedTryAgain, timeout);
-				_downloaderDic.Add(bundleInfo.Hash, newDownloader);
+				_downloaderDic.Add(bundleInfo.Bundle.CachedFilePath, newDownloader);
 				return newDownloader;
 			}
 		}
@@ -108,84 +101,5 @@ namespace YooAsset
 		{
 			return _downloaderDic.Count;
 		}
-
-		/// <summary>
-		/// 查询是否为验证文件
-		/// 注意：被收录的文件完整性是绝对有效的
-		/// </summary>
-		public static bool ContainsVerifyFile(string hash)
-		{
-			if (_cachedHashList.ContainsKey(hash))
-			{
-				string filePath = SandboxHelper.MakeCacheFilePath(hash);
-				if (File.Exists(filePath))
-				{
-					return true;
-				}
-				else
-				{
-					string bundleName = _cachedHashList[hash];
-					_cachedHashList.Remove(hash);
-					YooLogger.Error($"Cache file is missing : {bundleName} Hash : {hash}");
-					return false;
-				}
-			}
-			else
-			{
-				return false;
-			}
-		}
-
-		/// <summary>
-		/// 缓存验证过的文件
-		/// </summary>
-		public static void CacheVerifyFile(string hash, string bundleName)
-		{
-			if (_cachedHashList.ContainsKey(hash) == false)
-			{
-				YooLogger.Log($"Cache verify file : {bundleName} Hash : {hash}");
-				_cachedHashList.Add(hash, bundleName);
-			}
-		}
-
-		/// <summary>
-		/// 验证文件完整性
-		/// </summary>
-		public static bool CheckContentIntegrity(string filePath, long size, string crc)
-		{
-			return CheckContentIntegrity(_verifyLevel, filePath, size, crc);
-		}
-
-		/// <summary>
-		/// 验证文件完整性
-		/// </summary>
-		public static bool CheckContentIntegrity(EVerifyLevel verifyLevel, string filePath, long size, string crc)
-		{
-			try
-			{
-				if (File.Exists(filePath) == false)
-					return false;
-
-				// 先验证文件大小
-				long fileSize = FileUtility.GetFileSize(filePath);
-				if (fileSize != size)
-					return false;
-
-				// 再验证文件CRC
-				if (verifyLevel == EVerifyLevel.High)
-				{
-					string fileCRC = HashUtility.FileCRC32(filePath);
-					return fileCRC == crc;
-				}
-				else
-				{
-					return true;
-				}
-			}
-			catch (Exception)
-			{
-				return false;
-			}
-		}
 	}
 }

Assets/YooAsset/Runtime/DownloadSystem/Downloader/DownloadHandlerFileRange.cs

@@ -0,0 +1,87 @@
+using System;
+using System.IO;
+using UnityEngine;
+using UnityEngine.Networking;
+
+namespace YooAsset
+{
+	/// <summary>
+	/// 支持Unity2018版本的断点续传下载器
+	/// </summary>
+	public class DownloadHandlerFileRange : DownloadHandlerScript
+	{
+		private string _fileSavePath;
+		private long _fileTotalSize;
+		private UnityWebRequest _webRequest;
+		private FileStream _fileStream;
+
+		private long _localFileSize = 0;
+		private long _curFileSize = 0;
+
+
+		public DownloadHandlerFileRange(string fileSavePath, long fileTotalSize, UnityWebRequest webRequest) : base(new byte[1024 * 1024])
+		{
+			_fileSavePath = fileSavePath;
+			_fileTotalSize = fileTotalSize;
+			_webRequest = webRequest;
+
+			if (File.Exists(fileSavePath))
+			{
+				FileInfo fileInfo = new FileInfo(fileSavePath);
+				_localFileSize = fileInfo.Length;
+			}
+
+			_fileStream = new FileStream(_fileSavePath, FileMode.Append, FileAccess.Write);
+			_curFileSize = _localFileSize;
+		}
+		protected override bool ReceiveData(byte[] data, int dataLength)
+		{
+			if (data == null || dataLength == 0 || _webRequest.responseCode >= 400)
+				return false;
+
+			if (_fileStream == null)
+				return false;
+
+			_fileStream.Write(data, 0, dataLength);
+			_curFileSize += dataLength;
+			return true;
+		}
+
+		/// <summary>
+		/// UnityWebRequest.downloadHandler.data
+		/// </summary>
+		protected override byte[] GetData()
+		{
+			return null;
+		}
+
+		/// <summary>
+		/// UnityWebRequest.downloadHandler.text
+		/// </summary>
+		protected override string GetText()
+		{
+			return null;
+		}
+
+		/// <summary>
+		/// UnityWebRequest.downloadProgress
+		/// </summary>
+		protected override float GetProgress()
+		{
+			return _fileTotalSize == 0 ? 0 : ((float)_curFileSize) / _fileTotalSize;
+		}
+
+		/// <summary>
+		/// 释放下载句柄
+		/// </summary>
+		public void Cleanup()
+		{
+			if (_fileStream != null)
+			{
+				_fileStream.Flush();
+				_fileStream.Dispose();
+				_fileStream = null;
+			}
+		}
+	}
+}

Assets/YooAsset/Runtime/DownloadSystem/Downloader/DownloadHandlerFileRange.cs.meta

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

Assets/YooAsset/Runtime/DownloadSystem/Downloader/DownloaderBase.cs

@@ -6,6 +6,7 @@ namespace YooAsset
 		protected enum ESteps
 		{
 			None,
+			CheckLocalFile,
 			CreateDownload,
 			CheckDownload,
 			TryAgain,
@@ -54,7 +55,7 @@ namespace YooAsset
 			{
 				_failedTryAgain = failedTryAgain;
 				_timeout = timeout;
-				_steps = ESteps.CreateDownload;
+				_steps = ESteps.CheckLocalFile;
 			}
 		}
 		public abstract void Update();

Assets/YooAsset/Runtime/DownloadSystem/Downloader/FileDownloader.cs

@@ -9,8 +9,9 @@ namespace YooAsset
 {
 	internal sealed class FileDownloader : DownloaderBase
 	{
-		private UnityWebRequest _webRequest;
-		private UnityWebRequestAsyncOperation _operationHandle;
+		private readonly bool _breakResume;
+		private UnityWebRequest _webRequest = null;
+		private DownloadHandlerFileRange _downloadHandle = null;
 
 		// 重置变量
 		private bool _isAbort = false;
@@ -19,8 +20,9 @@ namespace YooAsset
 		private float _tryAgainTimer;
 
 
-		public FileDownloader(BundleInfo bundleInfo) : base(bundleInfo)
+		public FileDownloader(BundleInfo bundleInfo, bool breakResume) : base(bundleInfo)
 		{
+			_breakResume = breakResume;
 		}
 		public override void Update()
 		{
@@ -29,9 +31,31 @@ namespace YooAsset
 			if (IsDone())
 				return;
 
+			// 检测本地文件
+			if (_steps == ESteps.CheckLocalFile)
+			{
+				var verifyResult = CacheSystem.VerifyAndCacheBundle(_bundleInfo.Bundle, EVerifyLevel.High);
+				if (verifyResult == EVerifyResult.Succeed)
+				{
+					_steps = ESteps.Succeed;
+				}
+				else
+				{
+					if (verifyResult == EVerifyResult.FileOverflow)
+					{
+						string cacheFilePath = _bundleInfo.Bundle.CachedFilePath;
+						if (File.Exists(cacheFilePath))
+							File.Delete(cacheFilePath);
+					}
+					_steps = ESteps.CreateDownload;
+				}
+			}
+
 			// 创建下载器
 			if (_steps == ESteps.CreateDownload)
 			{
+				string fileSavePath = _bundleInfo.Bundle.CachedFilePath;
+
 				// 重置变量
 				_downloadProgress = 0f;
 				_downloadedBytes = 0;
@@ -40,14 +64,45 @@ namespace YooAsset
 				_latestDownloadRealtime = Time.realtimeSinceStartup;
 				_tryAgainTimer = 0f;
 
-				_requestURL = GetRequestURL();
-				_webRequest = new UnityWebRequest(_requestURL, UnityWebRequest.kHttpVerbGET);
-				DownloadHandlerFile handler = new DownloadHandlerFile(_bundleInfo.GetCacheLoadPath());
-				handler.removeFileOnAbort = true;
-				_webRequest.downloadHandler = handler;
-				_webRequest.disposeDownloadHandlerOnDispose = true;
-				_operationHandle = _webRequest.SendWebRequest();
-				_steps = ESteps.CheckDownload;
+				// 是否开启断点续传下载	
+				if (_breakResume)
+				{
+					long fileLength = -1;
+					if (File.Exists(fileSavePath))
+					{
+						FileInfo fileInfo = new FileInfo(fileSavePath);
+						fileLength = fileInfo.Length;
+					}
+
+					_requestURL = GetRequestURL();
+					_webRequest = UnityWebRequest.Get(_requestURL);
+
+#if UNITY_2019_4_OR_NEWER
+					var handler = new DownloadHandlerFile(fileSavePath, true);
+					handler.removeFileOnAbort = false;
+#else
+					var handler = new DownloadHandlerFileRange(fileSavePath, _bundleInfo.Bundle.FileSize, _webRequest);
+					_downloadHandle = handler;
+#endif
+
+					_webRequest.downloadHandler = handler;
+					_webRequest.disposeDownloadHandlerOnDispose = true;
+					if (fileLength > 0)
+						_webRequest.SetRequestHeader("Range", $"bytes={fileLength}-");
+					_webRequest.SendWebRequest();
+					_steps = ESteps.CheckDownload;
+				}
+				else
+				{
+					_requestURL = GetRequestURL();
+					_webRequest = new UnityWebRequest(_requestURL, UnityWebRequest.kHttpVerbGET);
+					DownloadHandlerFile handler = new DownloadHandlerFile(fileSavePath);
+					handler.removeFileOnAbort = true;
+					_webRequest.downloadHandler = handler;
+					_webRequest.disposeDownloadHandlerOnDispose = true;
+					_webRequest.SendWebRequest();
+					_steps = ESteps.CheckDownload;
+				}
 			}
 
 			// 检测下载结果
@@ -55,14 +110,15 @@ namespace YooAsset
 			{
 				_downloadProgress = _webRequest.downloadProgress;
 				_downloadedBytes = _webRequest.downloadedBytes;
-				if (_operationHandle.isDone == false)
+				if (_webRequest.isDone == false)
 				{
 					CheckTimeout();
 					return;
 				}
 
-				// 检查网络错误
 				bool hasError = false;
+
+				// 检查网络错误
 #if UNITY_2020_3_OR_NEWER
 				if (_webRequest.result != UnityWebRequest.Result.Success)
 				{
@@ -80,25 +136,29 @@ namespace YooAsset
 				// 检查文件完整性
 				if (hasError == false)
 				{
-					// 注意：如果文件验证失败需要删除文件
-					
-					if (DownloadSystem.CheckContentIntegrity(_bundleInfo.GetCacheLoadPath(), _bundleInfo.SizeBytes, _bundleInfo.CRC) == false)
+					var verifyResult = CacheSystem.VerifyAndCacheBundle(_bundleInfo.Bundle, EVerifyLevel.High);
+					if (verifyResult != EVerifyResult.Succeed)
 					{
 						hasError = true;
-						_lastError = $"Verification failed";
+						_lastError = $"Verify bundle content failed : {_bundleInfo.Bundle.FileName}";
+
+						// 验证失败后删除文件
+						string cacheFilePath = _bundleInfo.Bundle.CachedFilePath;
+						if (File.Exists(cacheFilePath))
+							File.Delete(cacheFilePath);
 					}
 				}
 
-				if (hasError == false)
+				// 如果下载失败
+				if (hasError)
 				{
-					_steps = ESteps.Succeed;
-					DownloadSystem.CacheVerifyFile(_bundleInfo.Hash, _bundleInfo.BundleName);
-				}
-				else
-				{
-					string cacheFilePath = _bundleInfo.GetCacheLoadPath();
-					if (File.Exists(cacheFilePath))
-						File.Delete(cacheFilePath);
+					// 注意：非断点续传下载失败后删除文件
+					if (_breakResume == false)
+					{
+						string cacheFilePath = _bundleInfo.Bundle.CachedFilePath;
+						if (File.Exists(cacheFilePath))
+							File.Delete(cacheFilePath);
+					}
 
 					// 失败后重新尝试
 					if (_failedTryAgain > 0)
@@ -112,6 +172,11 @@ namespace YooAsset
 						_steps = ESteps.Failed;
 					}
 				}
+				else
+				{
+					_lastError = string.Empty;
+					_steps = ESteps.Succeed;
+				}
 
 				// 释放下载器
 				DisposeWebRequest();
@@ -161,11 +226,16 @@ namespace YooAsset
 		}
 		private void DisposeWebRequest()
 		{
+			if(_downloadHandle != null)
+			{
+				_downloadHandle.Cleanup();
+				_downloadHandle = null;
+			}
+
 			if (_webRequest != null)
 			{
 				_webRequest.Dispose();
 				_webRequest = null;
-				_operationHandle = null;
 			}
 		}
 	}

Assets/YooAsset/Runtime/DownloadSystem/Downloader/HttpDownloader.cs

@@ -8,6 +8,7 @@ using System.Threading;
 
 namespace YooAsset
 {
+	/*
 	internal sealed class HttpDownloader : DownloaderBase
 	{
 		/// <summary>
@@ -21,8 +22,6 @@ namespace YooAsset
 			private bool _running = true;
 			private string _url;
 			private string _savePath;
-			private string _fileHash;
-			private string _fileCRC;
 			private long _fileSize;
 			private int _timeout;
 
@@ -50,12 +49,10 @@ namespace YooAsset
 			/// <summary>
 			/// 开始下载
 			/// </summary>
-			public void Run(string url, string savePath, string fileHash, string fileCRC, long fileSize, int timeout)
+			public void Run(string url, string savePath, long fileSize, int timeout)
 			{
 				_url = url;
 				_savePath = savePath;
-				_fileHash = fileHash;
-				_fileCRC = fileCRC;
 				_fileSize = fileSize;
 				_timeout = timeout;
 
@@ -153,22 +150,6 @@ namespace YooAsset
 						fileStream.Close();
 					}
 
-					// 验证下载文件完整性
-					if (DownloadedBytes == (ulong)_fileSize)
-					{
-						bool verfiyResult = DownloadSystem.CheckContentIntegrity(_savePath, _fileSize, _fileCRC);
-						if (verfiyResult == false)
-						{
-							Error = $"Verify download content failed : {_fileHash}";
-							if (File.Exists(_savePath))
-								File.Delete(_savePath);
-						}
-					}
-					else
-					{
-						Error = $"Download content is incomplete : {_fileHash}";
-					}
-
 					IsDone = true;
 				}
 			}
@@ -188,6 +169,27 @@ namespace YooAsset
 			if (IsDone())
 				return;
 
+			// 检测本地文件
+			if (_steps == ESteps.CheckLocalFile)
+			{
+				var verifyResult = CacheSystem.VerifyAndCacheBundle(_bundleInfo.Bundle, EVerifyLevel.High);
+				if (verifyResult == EVerifyResult.Succeed)
+				{
+					_steps = ESteps.Succeed;
+				}
+				else
+				{
+					if (verifyResult == EVerifyResult.FileOverflow)
+					{
+						string cacheFilePath = _bundleInfo.Bundle.CachedFilePath;
+						if (File.Exists(cacheFilePath))
+							File.Delete(cacheFilePath);
+					}
+					_steps = ESteps.CreateDownload;
+				}
+			}
+
+			// 创建下载器
 			if (_steps == ESteps.CreateDownload)
 			{
 				// 重置变量
@@ -197,10 +199,11 @@ namespace YooAsset
 
 				_requestURL = GetRequestURL();
 				_threadDownloader = new ThreadDownloader();
-				_threadDownloader.Run(_requestURL, _bundleInfo.GetCacheLoadPath(), _bundleInfo.Hash, _bundleInfo.CRC, _bundleInfo.SizeBytes, _timeout);
+				_threadDownloader.Run(_requestURL, _bundleInfo.Bundle.CachedFilePath, _bundleInfo.Bundle.FileSize, _timeout);
 				_steps = ESteps.CheckDownload;
 			}
 
+			// 检测下载结果
 			if (_steps == ESteps.CheckDownload)
 			{
 				_downloadProgress = _threadDownloader.DownloadProgress;
@@ -208,10 +211,34 @@ namespace YooAsset
 				if (_threadDownloader.IsDone == false)
 					return;
 
+				bool hasError = false;
+
+				// 检查下载错误
 				if (_threadDownloader.HasError())
 				{
+					hasError = true;
 					_lastError = _threadDownloader.Error;
+				}
 
+				// 检查文件完整性
+				if (hasError == false)
+				{
+					var verifyResult = CacheSystem.VerifyAndCacheBundle(_bundleInfo.Bundle, EVerifyLevel.High);
+					if (verifyResult != EVerifyResult.Succeed)
+					{
+						hasError = true;
+						_lastError = $"Verify bundle content failed : {_bundleInfo.Bundle.FileName}";
+
+						// 验证失败后删除文件
+						string cacheFilePath = _bundleInfo.Bundle.CachedFilePath;
+						if (File.Exists(cacheFilePath))
+							File.Delete(cacheFilePath);
+					}
+				}
+
+				// 如果下载失败
+				if (hasError)
+				{
 					// 失败后重新尝试
 					if (_failedTryAgain > 0)
 					{
@@ -226,7 +253,7 @@ namespace YooAsset
 				}
 				else
 				{
-					DownloadSystem.CacheVerifyFile(_bundleInfo.Hash, _bundleInfo.BundleName);
+					_lastError = string.Empty;
 					_steps = ESteps.Succeed;
 				}
 			}
@@ -257,4 +284,5 @@ namespace YooAsset
 			}
 		}
 	}
+	*/
 }

Assets/YooAsset/Runtime/DownloadSystem/Downloader/TempDownloader.cs

@@ -6,7 +6,7 @@ namespace YooAsset
 		public TempDownloader(BundleInfo bundleInfo) : base(bundleInfo)
 		{
 			_downloadProgress = 1f;
-			_downloadedBytes = (ulong)bundleInfo.SizeBytes;
+			_downloadedBytes = (ulong)bundleInfo.Bundle.FileSize;
 			_steps = ESteps.Succeed;
 		}
 

Assets/YooAsset/Runtime/OperationSystem/OperationSystem.cs

@@ -13,6 +13,17 @@ namespace YooAsset
 		private static long _maxTimeSlice;
 		private static long _frameTime;
 
+		/// <summary>
+		/// 处理器是否繁忙
+		/// </summary>
+		public static bool IsBusy
+		{
+			get
+			{
+				return _watch.ElapsedMilliseconds - _frameTime >= _maxTimeSlice;
+			}
+		}
+
 
 		/// <summary>
 		/// 初始化异步操作系统
@@ -32,7 +43,7 @@ namespace YooAsset
 
 			for (int i = _operations.Count - 1; i >= 0; i--)
 			{
-				if (_watch.ElapsedMilliseconds - _frameTime >= _maxTimeSlice)
+				if (IsBusy)
 					return;
 
 				var operation = _operations[i];
@@ -59,7 +70,7 @@ namespace YooAsset
 		/// <summary>
 		/// 开始处理异步操作类
 		/// </summary>
-		public static void StartOperaiton(AsyncOperationBase operationBase)
+		public static void StartOperation(AsyncOperationBase operationBase)
 		{
 			_operations.Add(operationBase);
 			operationBase.Start();

Assets/YooAsset/Runtime/PatchSystem/AssetInfo.cs

@@ -7,9 +7,9 @@ namespace YooAsset
 		private string _providerGUID;
 
 		/// <summary>
-		/// 资源提供者唯一标识符
+		/// 唯一标识符
 		/// </summary>
-		internal string ProviderGUID
+		internal string GUID
 		{
 			get
 			{

Assets/YooAsset/Runtime/PatchSystem/BundleInfo.cs

@@ -12,17 +12,9 @@ namespace YooAsset
 			LoadFromEditor,
 		}
 
-		private readonly PatchBundle _patchBundle;
+		public readonly PatchBundle Bundle;
 		public readonly ELoadMode LoadMode;
 
-		private string _streamingPath;
-		private string _cachePath;
-
-		/// <summary>
-		/// 资源包名称
-		/// </summary>
-		public string BundleName { private set; get; }
-
 		/// <summary>
 		/// 远端下载地址
 		/// </summary>
@@ -38,144 +30,35 @@ namespace YooAsset
 		/// </summary>
 		public string EditorAssetPath { private set; get; }
 
-		/// <summary>
-		/// 文件哈希值
-		/// </summary>
-		public string Hash
-		{
-			get
-			{
-				if (_patchBundle == null)
-					return string.Empty;
-				else
-					return _patchBundle.Hash;
-			}
-		}
-
-		/// <summary>
-		/// 校验的CRC
-		/// </summary>
-		public string CRC
-		{
-			get
-			{
-				if (_patchBundle == null)
-					return string.Empty;
-				else
-					return _patchBundle.CRC;
-			}
-		}
-
-		/// <summary>
-		/// 文件大小
-		/// </summary>
-		public long SizeBytes
-		{
-			get
-			{
-				if (_patchBundle == null)
-					return 0;
-				else
-					return _patchBundle.SizeBytes;
-			}
-		}
-
-		/// <summary>
-		/// 是否为加密文件
-		/// </summary>
-		public bool IsEncrypted
-		{
-			get
-			{
-				if (_patchBundle == null)
-					return false;
-				else
-					return _patchBundle.IsEncrypted;
-			}
-		}
-
-		/// <summary>
-		/// 是否为原生文件
-		/// </summary>
-		public bool IsRawFile
-		{
-			get
-			{
-				if (_patchBundle == null)
-					return false;
-				else
-					return _patchBundle.IsRawFile;
-			}
-		}
-
-		/// <summary>
-		/// 身份是否无效
-		/// </summary>
-		public bool IsInvalid
-		{
-			get
-			{
-				return _patchBundle == null;
-			}
-		}
-
 
 		private BundleInfo()
 		{
 		}
 		public BundleInfo(PatchBundle patchBundle, ELoadMode loadMode, string mainURL, string fallbackURL)
 		{
-			_patchBundle = patchBundle;
+			Bundle = patchBundle;
 			LoadMode = loadMode;
-			BundleName = patchBundle.BundleName;
 			RemoteMainURL = mainURL;
 			RemoteFallbackURL = fallbackURL;
 			EditorAssetPath = string.Empty;
 		}
 		public BundleInfo(PatchBundle patchBundle, ELoadMode loadMode, string editorAssetPath)
 		{
-			_patchBundle = patchBundle;
+			Bundle = patchBundle;
 			LoadMode = loadMode;
-			BundleName = patchBundle.BundleName;
 			RemoteMainURL = string.Empty;
 			RemoteFallbackURL = string.Empty;
 			EditorAssetPath = editorAssetPath;
 		}
 		public BundleInfo(PatchBundle patchBundle, ELoadMode loadMode)
 		{
-			_patchBundle = patchBundle;
+			Bundle = patchBundle;
 			LoadMode = loadMode;
-			BundleName = patchBundle.BundleName;
 			RemoteMainURL = string.Empty;
 			RemoteFallbackURL = string.Empty;
 			EditorAssetPath = string.Empty;
 		}
 
-		/// <summary>
-		/// 获取流文件夹的加载路径
-		/// </summary>
-		public string GetStreamingLoadPath()
-		{
-			if (_patchBundle == null)
-				return string.Empty;
-
-			if (string.IsNullOrEmpty(_streamingPath))
-				_streamingPath = PathHelper.MakeStreamingLoadPath(_patchBundle.Hash);
-			return _streamingPath;
-		}
-
-		/// <summary>
-		/// 获取缓存文件夹的加载路径
-		/// </summary>
-		public string GetCacheLoadPath()
-		{
-			if (_patchBundle == null)
-				return string.Empty;
-
-			if (string.IsNullOrEmpty(_cachePath))
-				_cachePath = SandboxHelper.MakeCacheFilePath(_patchBundle.Hash);
-			return _cachePath;
-		}
 
 		/// <summary>
 		/// 是否为JAR包内文件

Assets/YooAsset/Runtime/PatchSystem/Operations/ClearUnusedCacheFilesOperation.cs

@@ -0,0 +1,111 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using UnityEngine;
+
+namespace YooAsset
+{
+	/// <summary>
+	/// 清理未使用的缓存资源操作类
+	/// </summary>
+	public abstract class ClearUnusedCacheFilesOperation : AsyncOperationBase
+	{
+	}
+
+	/// <summary>
+	/// 编辑器模式
+	/// </summary>
+	internal sealed class EditorPlayModeClearUnusedCacheFilesOperation : ClearUnusedCacheFilesOperation
+	{
+		internal override void Start()
+		{
+			Status = EOperationStatus.Succeed;
+		}
+		internal override void Update()
+		{
+		}
+	}
+
+	/// <summary>
+	/// 离线模式
+	/// </summary>
+	internal sealed class OfflinePlayModeClearUnusedCacheFilesOperation : ClearUnusedCacheFilesOperation
+	{
+		internal override void Start()
+		{
+			Status = EOperationStatus.Succeed;
+		}
+		internal override void Update()
+		{
+		}
+	}
+
+	/// <summary>
+	/// 联机模式
+	/// </summary>
+	internal sealed class HostPlayModeClearUnusedCacheFilesOperation : ClearUnusedCacheFilesOperation
+	{
+		private enum ESteps
+		{
+			None,
+			GetUnusedCacheFiles,
+			ClearUnusedCacheFiles,
+			Done,
+		}
+
+		private ESteps _steps = ESteps.None;
+		private List<string> _unusedCacheFilePaths;
+		private int _unusedFileTotalCount = 0;
+		private HostPlayModeImpl _impl;
+
+		internal HostPlayModeClearUnusedCacheFilesOperation(HostPlayModeImpl impl)
+		{
+			_impl = impl;
+		}
+		internal override void Start()
+		{
+			_steps = ESteps.GetUnusedCacheFiles;
+		}
+		internal override void Update()
+		{
+			if (_steps == ESteps.None || _steps == ESteps.Done)
+				return;
+
+			if (_steps == ESteps.GetUnusedCacheFiles)
+			{
+				_unusedCacheFilePaths = _impl.ClearUnusedCacheFilePaths();
+				_unusedFileTotalCount = _unusedCacheFilePaths.Count;
+				YooLogger.Log($"Found unused cache file count : {_unusedFileTotalCount}");
+				_steps = ESteps.ClearUnusedCacheFiles;
+			}
+
+			if (_steps == ESteps.ClearUnusedCacheFiles)
+			{
+				for (int i = _unusedCacheFilePaths.Count - 1; i >= 0; i--)
+				{
+					string filePath = _unusedCacheFilePaths[i];
+					if (File.Exists(filePath))
+					{
+						YooLogger.Log($"Delete unused cache file : {filePath}");
+						File.Delete(filePath);
+					}
+					_unusedCacheFilePaths.RemoveAt(i);
+
+					if (OperationSystem.IsBusy)
+						break;
+				}
+
+				if (_unusedFileTotalCount == 0)
+					Progress = 1.0f;
+				else
+					Progress = 1.0f - (_unusedCacheFilePaths.Count / _unusedFileTotalCount);
+
+				if (_unusedCacheFilePaths.Count == 0)
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Succeed;
+				}
+			}
+		}
+	}
+}

Assets/YooAsset/Runtime/PatchSystem/Operations/ClearUnusedCacheFilesOperation.cs.meta

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

Assets/YooAsset/Runtime/PatchSystem/Operations/DownloaderOperation.cs

@@ -86,7 +86,7 @@ namespace YooAsset
 				TotalDownloadCount = downloadList.Count;
 				foreach (var patchBundle in downloadList)
 				{
-					TotalDownloadBytes += patchBundle.SizeBytes;
+					TotalDownloadBytes += patchBundle.Bundle.FileSize;
 				}
 			}
 		}
@@ -138,7 +138,7 @@ namespace YooAsset
 					// 下载成功
 					_removeList.Add(downloader);
 					CurrentDownloadCount++;
-					CurrentDownloadBytes += bundleInfo.SizeBytes;
+					CurrentDownloadBytes += bundleInfo.Bundle.FileSize;
 				}
 
 				// 移除已经完成的下载器（无论成功或失败）
@@ -170,7 +170,7 @@ namespace YooAsset
 						var operation = DownloadSystem.BeginDownload(bundleInfo, _failedTryAgain);
 						_downloaders.Add(operation);
 						_downloadList.RemoveAt(index);
-						OnStartDownloadFileCallback?.Invoke(bundleInfo.BundleName, bundleInfo.SizeBytes);
+						OnStartDownloadFileCallback?.Invoke(bundleInfo.Bundle.BundleName, bundleInfo.Bundle.FileSize);
 					}
 				}
 
@@ -180,7 +180,7 @@ namespace YooAsset
 					if (_failedList.Count > 0)
 					{
 						var failedDownloader = _failedList[0];
-						string fileName = failedDownloader.GetBundleInfo().BundleName;
+						string fileName = failedDownloader.GetBundleInfo().Bundle.BundleName;
 						Error = $"Failed to download file : {fileName}";
 						_steps = ESteps.Done;
 						Status = EOperationStatus.Failed;
@@ -205,7 +205,7 @@ namespace YooAsset
 		{
 			if (_steps == ESteps.None)
 			{
-				OperationSystem.StartOperaiton(this);
+				OperationSystem.StartOperation(this);
 			}
 		}
 

Assets/YooAsset/Runtime/PatchSystem/Operations/InitializationOperation.cs

@@ -129,7 +129,7 @@ namespace YooAsset
 	}
 
 	/// <summary>
-	/// 网络运行模式的初始化操作
+	/// 联机运行模式的初始化操作
 	/// </summary>
 	internal sealed class HostPlayModeInitializationOperation : InitializationOperation
 	{

Assets/YooAsset/Runtime/PatchSystem/Operations/UpdateManifestOperation.cs

@@ -2,7 +2,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
-using System.Threading;
 
 namespace YooAsset
 {
@@ -46,7 +45,7 @@ namespace YooAsset
 	}
 
 	/// <summary>
-	/// 网络模式的更新清单操作
+	/// 联机模式的更新清单操作
 	/// </summary>
 	internal sealed class HostPlayModeUpdateManifestOperation : UpdateManifestOperation
 	{
@@ -69,7 +68,7 @@ namespace YooAsset
 		private ESteps _steps = ESteps.None;
 		private UnityWebDataRequester _downloader1;
 		private UnityWebDataRequester _downloader2;
-		private VerifyManager _verifyManager = new VerifyManager();
+		private PatchCacheVerifier _patchCacheVerifier;
 		private float _verifyTime;
 
 		internal HostPlayModeUpdateManifestOperation(HostPlayModeImpl impl, int resourceVersion, int timeout)
@@ -77,6 +76,12 @@ namespace YooAsset
 			_impl = impl;
 			_resourceVersion = resourceVersion;
 			_timeout = timeout;
+
+#if UNITY_WEBGL
+			_patchCacheVerifier = new PatchCacheVerifierWithoutThread();
+#else
+			_patchCacheVerifier = new PatchCacheVerifierWithThread();
+#endif
 		}
 		internal override void Start()
 		{
@@ -172,20 +177,20 @@ namespace YooAsset
 
 			if (_steps == ESteps.InitVerifyingCache)
 			{
-				_verifyManager.InitVerifyingCache(_impl.AppPatchManifest, _impl.LocalPatchManifest, false);
+				_patchCacheVerifier.InitVerifier(_impl.AppPatchManifest, _impl.LocalPatchManifest, false);
 				_verifyTime = UnityEngine.Time.realtimeSinceStartup;
 				_steps = ESteps.UpdateVerifyingCache;
 			}
 
 			if (_steps == ESteps.UpdateVerifyingCache)
 			{
-				Progress = _verifyManager.GetVerifyProgress();
-				if (_verifyManager.UpdateVerifyingCache())
+				Progress = _patchCacheVerifier.GetVerifierProgress();
+				if (_patchCacheVerifier.UpdateVerifier())
 				{
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Succeed;
 					float costTime = UnityEngine.Time.realtimeSinceStartup - _verifyTime;
-					YooLogger.Log($"Verify result : Success {_verifyManager.VerifySuccessCount}, Fail {_verifyManager.VerifyFailCount}, Elapsed time {costTime} seconds");
+					YooLogger.Log($"Verify result : Success {_patchCacheVerifier.VerifySuccessCount}, Fail {_patchCacheVerifier.VerifyFailCount}, Elapsed time {costTime} seconds");
 				}
 			}
 		}
@@ -252,7 +257,7 @@ namespace YooAsset
 	}
 
 	/// <summary>
-	/// 网络模式的更新清单操作（弱联网）
+	/// 联机模式的更新清单操作（弱联网）
 	/// </summary>
 	internal sealed class HostPlayModeWeaklyUpdateManifestOperation : UpdateManifestOperation
 	{
@@ -268,13 +273,19 @@ namespace YooAsset
 		private readonly HostPlayModeImpl _impl;
 		private readonly int _resourceVersion;
 		private ESteps _steps = ESteps.None;
-		private VerifyManager _verifyManager = new VerifyManager();
+		private PatchCacheVerifier _patchCacheVerifier;
 		private float _verifyTime;
 
 		internal HostPlayModeWeaklyUpdateManifestOperation(HostPlayModeImpl impl, int resourceVersion)
 		{
 			_impl = impl;
 			_resourceVersion = resourceVersion;
+
+#if UNITY_WEBGL
+			_patchCacheVerifier = new PatchCacheVerifierWithoutThread();
+#else
+			_patchCacheVerifier = new PatchCacheVerifierWithThread();
+#endif
 		}
 		internal override void Start()
 		{
@@ -293,7 +304,7 @@ namespace YooAsset
 
 			if (_steps == ESteps.InitVerifyingCache)
 			{
-				if (_verifyManager.InitVerifyingCache(_impl.AppPatchManifest, _impl.LocalPatchManifest, true))
+				if (_patchCacheVerifier.InitVerifier(_impl.AppPatchManifest, _impl.LocalPatchManifest, true))
 				{
 					_verifyTime = UnityEngine.Time.realtimeSinceStartup;
 					_steps = ESteps.UpdateVerifyingCache;
@@ -308,12 +319,12 @@ namespace YooAsset
 
 			if (_steps == ESteps.UpdateVerifyingCache)
 			{
-				Progress = _verifyManager.GetVerifyProgress();
-				if (_verifyManager.UpdateVerifyingCache())
+				Progress = _patchCacheVerifier.GetVerifierProgress();
+				if (_patchCacheVerifier.UpdateVerifier())
 				{
 					float costTime = UnityEngine.Time.realtimeSinceStartup - _verifyTime;
-					YooLogger.Log($"Verify result : Success {_verifyManager.VerifySuccessCount}, Fail {_verifyManager.VerifyFailCount}, Elapsed time {costTime} seconds");
-					if (_verifyManager.VerifyFailCount > 0)
+					YooLogger.Log($"Verify result : Success {_patchCacheVerifier.VerifySuccessCount}, Fail {_patchCacheVerifier.VerifyFailCount}, Elapsed time {costTime} seconds");
+					if (_patchCacheVerifier.VerifyFailCount > 0)
 					{
 						_steps = ESteps.Done;
 						Status = EOperationStatus.Failed;
@@ -344,139 +355,4 @@ namespace YooAsset
 			}
 		}
 	}
-
-	/// <summary>
-	/// 本地缓存文件验证管理器
-	/// </summary>
-	internal class VerifyManager
-	{
-		private class ThreadInfo
-		{
-			public bool Result = false;
-			public string FilePath { private set; get; }
-			public PatchBundle Bundle { private set; get; }
-			public ThreadInfo(string filePath, PatchBundle bundle)
-			{
-				FilePath = filePath;
-				Bundle = bundle;
-			}
-		}
-
-		private readonly List<PatchBundle> _waitingList = new List<PatchBundle>(1000);
-		private readonly List<PatchBundle> _verifyingList = new List<PatchBundle>(100);
-		private readonly ThreadSyncContext _syncContext = new ThreadSyncContext();
-		private int _verifyMaxNum = 32;
-		private int _verifyTotalCount = 0;
-
-		public int VerifySuccessCount { private set; get; } = 0;
-		public int VerifyFailCount { private set; get; } = 0;
-
-		public bool InitVerifyingCache(PatchManifest appPatchManifest, PatchManifest localPatchManifest, bool weaklyUpdate)
-		{
-			// 遍历所有文件然后验证并缓存合法文件
-			foreach (var patchBundle in localPatchManifest.BundleList)
-			{
-				// 忽略缓存文件
-				if (DownloadSystem.ContainsVerifyFile(patchBundle.Hash))
-					continue;
-
-				// 忽略APP资源
-				// 注意：如果是APP资源并且哈希值相同，则不需要下载
-				if (appPatchManifest.TryGetPatchBundle(patchBundle.BundleName, out PatchBundle appPatchBundle))
-				{
-					if (appPatchBundle.IsBuildin && appPatchBundle.Hash == patchBundle.Hash)
-						continue;
-				}
-
-				// 注意：在弱联网模式下，我们需要验证指定资源版本的所有资源完整性
-				if (weaklyUpdate)
-				{
-					string filePath = SandboxHelper.MakeCacheFilePath(patchBundle.Hash);
-					if (File.Exists(filePath))
-						_waitingList.Add(patchBundle);
-					else
-						return false;
-				}
-				else
-				{
-					string filePath = SandboxHelper.MakeCacheFilePath(patchBundle.Hash);
-					if (File.Exists(filePath))
-						_waitingList.Add(patchBundle);
-				}
-			}
-
-			// 设置同时验证的最大数
-			ThreadPool.GetMaxThreads(out int workerThreads, out int ioThreads);
-			YooLogger.Log($"Work threads : {workerThreads}, IO threads : {ioThreads}");
-			_verifyMaxNum = Math.Min(workerThreads, ioThreads);
-			_verifyTotalCount = _waitingList.Count;
-			return true;
-		}
-		public bool UpdateVerifyingCache()
-		{
-			_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 patchBundle = _waitingList[i];
-				if (RunThread(patchBundle))
-				{
-					_waitingList.RemoveAt(i);
-					_verifyingList.Add(patchBundle);
-				}
-				else
-				{
-					YooLogger.Warning("The thread pool is failed queued.");
-					break;
-				}
-			}
-
-			return false;
-		}
-		public float GetVerifyProgress()
-		{
-			if (_verifyTotalCount == 0)
-				return 1f;
-			return (float)(VerifySuccessCount + VerifyFailCount) / _verifyTotalCount;
-		}
-
-		private bool RunThread(PatchBundle patchBundle)
-		{
-			string filePath = SandboxHelper.MakeCacheFilePath(patchBundle.Hash);
-			ThreadInfo info = new ThreadInfo(filePath, patchBundle);
-			return ThreadPool.QueueUserWorkItem(new WaitCallback(VerifyInThread), info);
-		}
-		private void VerifyInThread(object infoObj)
-		{
-			ThreadInfo info = (ThreadInfo)infoObj;
-			info.Result = DownloadSystem.CheckContentIntegrity(info.FilePath, info.Bundle.SizeBytes, info.Bundle.CRC);
-			_syncContext.Post(VerifyCallback, info);
-		}
-		private void VerifyCallback(object obj)
-		{
-			ThreadInfo info = (ThreadInfo)obj;
-			if (info.Result)
-			{
-				VerifySuccessCount++;
-				DownloadSystem.CacheVerifyFile(info.Bundle.Hash, info.Bundle.BundleName);
-			}
-			else
-			{
-				VerifyFailCount++;
-				YooLogger.Warning($"Failed to verify file : {info.FilePath}");
-				if (File.Exists(info.FilePath))
-					File.Delete(info.FilePath);
-			}
-			_verifyingList.Remove(info.Bundle);
-		}
-	}
 }

Assets/YooAsset/Runtime/PatchSystem/Operations/UpdatePackageOperation.cs

@@ -64,7 +64,7 @@ namespace YooAsset
 	}
 
 	/// <summary>
-	/// 网络模式的更新资源包裹操作
+	/// 联机模式的更新资源包裹操作
 	/// </summary>
 	internal sealed class HostPlayModeUpdatePackageOperation : UpdatePackageOperation
 	{
@@ -198,24 +198,14 @@ namespace YooAsset
 			foreach (var patchBundle in _remotePatchManifest.BundleList)
 			{
 				// 忽略缓存文件
-				if (DownloadSystem.ContainsVerifyFile(patchBundle.Hash))
+				if (CacheSystem.IsCached(patchBundle))
 					continue;
 
 				// 忽略APP资源
 				// 注意：如果是APP资源并且哈希值相同，则不需要下载
 				if (_impl.AppPatchManifest.TryGetPatchBundle(patchBundle.BundleName, out PatchBundle appPatchBundle))
 				{
-					if (appPatchBundle.IsBuildin && appPatchBundle.Hash == patchBundle.Hash)
-						continue;
-				}
-
-				// 注意：通过比对文件大小做快速的文件校验！
-				// 注意：在初始化的时候会去做最终校验！
-				string filePath = SandboxHelper.MakeCacheFilePath(patchBundle.Hash);
-				if (File.Exists(filePath))
-				{
-					long fileSize = FileUtility.GetFileSize(filePath);
-					if (fileSize == patchBundle.SizeBytes)
+					if (appPatchBundle.IsBuildin && appPatchBundle.Equals(patchBundle))
 						continue;
 				}
 

Assets/YooAsset/Runtime/PatchSystem/Operations/UpdateStaticVersionOperation.cs

@@ -43,7 +43,7 @@ namespace YooAsset
 	}
 
 	/// <summary>
-	/// 网络模式的更新静态版本操作
+	/// 联机模式的更新静态版本操作
 	/// </summary>
 	internal sealed class HostPlayModeUpdateStaticVersionOperation : UpdateStaticVersionOperation
 	{

Assets/YooAsset/Runtime/PatchSystem/PatchBundle.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.IO;
 
 namespace YooAsset
 {
@@ -14,17 +15,17 @@ namespace YooAsset
 		/// <summary>
 		/// 文件哈希值
 		/// </summary>
-		public string Hash;
+		public string FileHash;
 
 		/// <summary>
 		/// 文件校验码
 		/// </summary>
-		public string CRC;
+		public string FileCRC;
 
 		/// <summary>
 		/// 文件大小（字节数）
 		/// </summary>
-		public long SizeBytes;
+		public long FileSize;
 
 		/// <summary>
 		/// 资源包的分类标签
@@ -52,14 +53,51 @@ namespace YooAsset
 		/// </summary>
 		public bool IsRawFile { private set; get; }
 
+		/// <summary>
+		/// 文件名称
+		/// </summary>	
+		public string FileName { private set; get; }
+
+		/// <summary>
+		/// 缓存文件路径
+		/// </summary>
+		private string _cachedFilePath;
+		public string CachedFilePath
+		{
+			get
+			{
+				if (string.IsNullOrEmpty(_cachedFilePath) == false)
+					return _cachedFilePath;
+
+				string cacheRoot = SandboxHelper.GetCacheFolderPath();			
+				_cachedFilePath = $"{cacheRoot}/{FileName}";
+				return _cachedFilePath;
+			}
+		}
+
+		/// <summary>
+		/// 内置文件路径
+		/// </summary>
+		private string _streamingFilePath;
+		public string StreamingFilePath
+		{
+			get
+			{
+				if (string.IsNullOrEmpty(_streamingFilePath) == false)
+					return _streamingFilePath;
+
+				_streamingFilePath = PathHelper.MakeStreamingLoadPath(FileName);
+				return _streamingFilePath;
+			}
+		}
 
 
-		public PatchBundle(string bundleName, string hash, string crc, long sizeBytes, string[] tags)
+		public PatchBundle(string bundleName, string fileHash, string fileCRC, long fileSize, string[] tags)
 		{
 			BundleName = bundleName;
-			Hash = hash;
-			CRC = crc;
-			SizeBytes = sizeBytes;
+			FileHash = fileHash;
+			FileCRC = fileCRC;
+			FileSize = fileSize;
 			Tags = tags;
 		}
 
@@ -90,6 +128,38 @@ namespace YooAsset
 			IsRawFile = value.Test(2);
 		}
 
+		/// <summary>
+		/// 解析文件名称
+		/// </summary>
+		public void ParseFileName(int nameStype)
+		{
+			if (nameStype == 1)
+			{
+				FileName = FileHash;
+			}
+			else if (nameStype == 2)
+			{
+				string tempFileExtension = System.IO.Path.GetExtension(BundleName);
+				FileName = $"{FileHash}{tempFileExtension}";
+			}
+			else if (nameStype == 3)
+			{
+				string tempFileExtension = System.IO.Path.GetExtension(BundleName);
+				string tempBundleName = BundleName.Replace('/', '_').Replace(tempFileExtension, "");
+				FileName = $"{tempBundleName}_{FileHash}";
+			}
+			else if (nameStype == 4)
+			{
+				string tempFileExtension = System.IO.Path.GetExtension(BundleName);
+				string tempBundleName = BundleName.Replace('/', '_').Replace(tempFileExtension, "");
+				FileName = $"{tempBundleName}_{FileHash}{tempFileExtension}";
+			}
+			else
+			{
+				throw new NotImplementedException();
+			}
+		}
+
 		/// <summary>
 		/// 是否包含Tag
 		/// </summary>
@@ -118,5 +188,16 @@ namespace YooAsset
 			else
 				return false;
 		}
+
+		/// <summary>
+		/// 检测资源包文件内容是否相同
+		/// </summary>
+		public bool Equals(PatchBundle otherBundle)
+		{
+			if (FileHash == otherBundle.FileHash)
+				return true;
+			
+			return false;
+		}
 	}
 }

Assets/YooAsset/Runtime/PatchSystem/PatchManifest.cs

@@ -13,15 +13,25 @@ namespace YooAsset
 	internal class PatchManifest
 	{
 		/// <summary>
-		/// 启用可寻址资源定位
+		/// 文件版本
 		/// </summary>
-		public bool EnableAddressable;
+		public string FileVersion;
 
 		/// <summary>
 		/// 资源版本号
 		/// </summary>
 		public int ResourceVersion;
 
+		/// <summary>
+		/// 启用可寻址资源定位
+		/// </summary>
+		public bool EnableAddressable;
+
+		/// <summary>
+		/// 文件名称样式
+		/// </summary>
+		public int OutputNameStyle;
+
 		/// <summary>
 		/// 内置资源的标签列表（首包资源）
 		/// </summary>
@@ -224,10 +234,15 @@ namespace YooAsset
 		{
 			PatchManifest patchManifest = JsonUtility.FromJson<PatchManifest>(jsonData);
 
+			// 检测文件版本
+			if (patchManifest.FileVersion != YooAssetSettings.PatchManifestFileVersion)
+				throw new Exception($"The manifest file version are not compatible : {patchManifest.FileVersion} != {YooAssetSettings.PatchManifestFileVersion}");
+
 			// BundleList
 			foreach (var patchBundle in patchManifest.BundleList)
 			{
 				patchBundle.ParseFlagsValue();
+				patchBundle.ParseFileName(patchManifest.OutputNameStyle);
 				patchManifest.BundleDic.Add(patchBundle.BundleName, patchBundle);
 			}
 

Assets/YooAsset/Runtime/PatchSystem/PlayMode/EditorSimulateModeImpl.cs

@@ -16,7 +16,7 @@ namespace YooAsset
 		{
 			_locationToLower = locationToLower;
 			var operation = new EditorSimulateModeInitializationOperation(this, simulatePatchManifestPath);
-			OperationSystem.StartOperaiton(operation);
+			OperationSystem.StartOperation(operation);
 			return operation;
 		}
 

Assets/YooAsset/Runtime/PatchSystem/PlayMode/HostPlayModeImpl.cs

@@ -33,7 +33,7 @@ namespace YooAsset
 			_fallbackHostServer = fallbackHostServer;
 
 			var operation = new HostPlayModeInitializationOperation(this);
-			OperationSystem.StartOperaiton(operation);
+			OperationSystem.StartOperation(operation);
 			return operation;
 		}
 
@@ -43,7 +43,7 @@ namespace YooAsset
 		public UpdateStaticVersionOperation UpdateStaticVersionAsync(int timeout)
 		{
 			var operation = new HostPlayModeUpdateStaticVersionOperation(this, timeout);
-			OperationSystem.StartOperaiton(operation);
+			OperationSystem.StartOperation(operation);
 			return operation;
 		}
 
@@ -53,7 +53,7 @@ namespace YooAsset
 		public UpdateManifestOperation UpdatePatchManifestAsync(int resourceVersion, int timeout)
 		{
 			var operation = new HostPlayModeUpdateManifestOperation(this, resourceVersion, timeout);
-			OperationSystem.StartOperaiton(operation);
+			OperationSystem.StartOperation(operation);
 			return operation;
 		}
 
@@ -63,7 +63,7 @@ namespace YooAsset
 		public UpdateManifestOperation WeaklyUpdatePatchManifestAsync(int resourceVersion)
 		{
 			var operation = new HostPlayModeWeaklyUpdateManifestOperation(this, resourceVersion);
-			OperationSystem.StartOperaiton(operation);
+			OperationSystem.StartOperation(operation);
 			return operation;
 		}
 
@@ -73,7 +73,7 @@ namespace YooAsset
 		public UpdatePackageOperation UpdatePackageAsync(int resourceVersion, int timeout)
 		{
 			var operation = new HostPlayModeUpdatePackageOperation(this, resourceVersion, timeout);
-			OperationSystem.StartOperaiton(operation);
+			OperationSystem.StartOperation(operation);
 			return operation;
 		}
 
@@ -88,32 +88,32 @@ namespace YooAsset
 		}
 
 		/// <summary>
-		/// 清空未被使用的缓存文件
+		/// 获取未被使用的缓存文件路径集合
 		/// </summary>
-		public void ClearUnusedCacheFiles()
+		public List<string> ClearUnusedCacheFilePaths()
 		{
 			string cacheFolderPath = SandboxHelper.GetCacheFolderPath();
 			if (Directory.Exists(cacheFolderPath) == false)
-				return;
+				return new List<string>();
 
 			DirectoryInfo directoryInfo = new DirectoryInfo(cacheFolderPath);
-			foreach (FileInfo fileInfo in directoryInfo.GetFiles())
+			FileInfo[] fileInfos = directoryInfo.GetFiles();
+			List<string> result = new List<string>(fileInfos.Length);
+			foreach (FileInfo fileInfo in fileInfos)
 			{
 				bool used = false;
 				foreach (var patchBundle in LocalPatchManifest.BundleList)
 				{
-					if (fileInfo.Name == patchBundle.Hash)
+					if (fileInfo.Name == patchBundle.FileName)
 					{
 						used = true;
 						break;
 					}
 				}
 				if (used == false)
-				{
-					YooLogger.Log($"Delete unused cache file : {fileInfo.Name}");
-					File.Delete(fileInfo.FullName);
-				}
+					result.Add(fileInfo.FullName);
 			}
+			return result;
 		}
 
 		/// <summary>
@@ -131,14 +131,14 @@ namespace YooAsset
 			foreach (var patchBundle in LocalPatchManifest.BundleList)
 			{
 				// 忽略缓存文件
-				if (DownloadSystem.ContainsVerifyFile(patchBundle.Hash))
+				if (CacheSystem.IsCached(patchBundle))
 					continue;
 
 				// 忽略APP资源
 				// 注意：如果是APP资源并且哈希值相同，则不需要下载
 				if (AppPatchManifest.TryGetPatchBundle(patchBundle.BundleName, out PatchBundle appPatchBundle))
 				{
-					if (appPatchBundle.IsBuildin && appPatchBundle.Hash == patchBundle.Hash)
+					if (appPatchBundle.IsBuildin && appPatchBundle.Equals(patchBundle))
 						continue;
 				}
 
@@ -163,14 +163,14 @@ namespace YooAsset
 			foreach (var patchBundle in LocalPatchManifest.BundleList)
 			{
 				// 忽略缓存文件
-				if (DownloadSystem.ContainsVerifyFile(patchBundle.Hash))
+				if (CacheSystem.IsCached(patchBundle))
 					continue;
 
 				// 忽略APP资源
 				// 注意：如果是APP资源并且哈希值相同，则不需要下载
 				if (AppPatchManifest.TryGetPatchBundle(patchBundle.BundleName, out PatchBundle appPatchBundle))
 				{
-					if (appPatchBundle.IsBuildin && appPatchBundle.Hash == patchBundle.Hash)
+					if (appPatchBundle.IsBuildin && appPatchBundle.Equals(patchBundle))
 						continue;
 				}
 
@@ -233,14 +233,14 @@ namespace YooAsset
 			foreach (var patchBundle in checkList)
 			{
 				// 忽略缓存文件
-				if (DownloadSystem.ContainsVerifyFile(patchBundle.Hash))
+				if (CacheSystem.IsCached(patchBundle))
 					continue;
 
 				// 忽略APP资源
 				// 注意：如果是APP资源并且哈希值相同，则不需要下载
 				if (AppPatchManifest.TryGetPatchBundle(patchBundle.BundleName, out PatchBundle appPatchBundle))
 				{
-					if (appPatchBundle.IsBuildin && appPatchBundle.Hash == patchBundle.Hash)
+					if (appPatchBundle.IsBuildin && appPatchBundle.Equals(patchBundle))
 						continue;
 				}
 
@@ -269,7 +269,7 @@ namespace YooAsset
 					continue;
 
 				// 忽略缓存文件
-				if (DownloadSystem.ContainsVerifyFile(patchBundle.Hash))
+				if (CacheSystem.IsCached(patchBundle))
 					continue;
 
 				// 查询DLC资源
@@ -279,7 +279,7 @@ namespace YooAsset
 				}
 			}
 
-			return ConvertToUnpackList(downloadList);
+			return PatchHelper.ConvertToUnpackList(downloadList);
 		}
 
 		/// <summary>
@@ -301,13 +301,13 @@ namespace YooAsset
 					continue;
 
 				// 忽略缓存文件
-				if (DownloadSystem.ContainsVerifyFile(patchBundle.Hash))
+				if (CacheSystem.IsCached(patchBundle))
 					continue;
 
 				downloadList.Add(patchBundle);
 			}
 
-			return ConvertToUnpackList(downloadList);
+			return PatchHelper.ConvertToUnpackList(downloadList);
 		}
 
 		// WEB相关
@@ -333,33 +333,12 @@ namespace YooAsset
 		}
 		public BundleInfo ConvertToDownloadInfo(PatchBundle patchBundle)
 		{
-			// 注意：资源版本号只用于确定下载路径
-			string remoteMainURL = GetPatchDownloadMainURL(patchBundle.Hash);
-			string remoteFallbackURL = GetPatchDownloadFallbackURL(patchBundle.Hash);
+			string remoteMainURL = GetPatchDownloadMainURL(patchBundle.FileName);
+			string remoteFallbackURL = GetPatchDownloadFallbackURL(patchBundle.FileName);
 			BundleInfo bundleInfo = new BundleInfo(patchBundle, BundleInfo.ELoadMode.LoadFromRemote, remoteMainURL, remoteFallbackURL);
 			return bundleInfo;
 		}
 
-		// 解压相关
-		public List<BundleInfo> ConvertToUnpackList(List<PatchBundle> unpackList)
-		{
-			List<BundleInfo> result = new List<BundleInfo>(unpackList.Count);
-			foreach (var patchBundle in unpackList)
-			{
-				var bundleInfo = ConvertToUnpackInfo(patchBundle);
-				result.Add(bundleInfo);
-			}
-			return result;
-		}
-		public BundleInfo ConvertToUnpackInfo(PatchBundle patchBundle)
-		{
-			// 注意：我们把流加载路径指定为远端下载地址
-			string streamingPath = PathHelper.MakeStreamingLoadPath(patchBundle.Hash);
-			streamingPath = PathHelper.ConvertToWWWPath(streamingPath);
-			BundleInfo bundleInfo = new BundleInfo(patchBundle, BundleInfo.ELoadMode.LoadFromRemote, streamingPath, streamingPath);
-			return bundleInfo;
-		}
-
 		// 设置资源清单
 		internal void SetAppPatchManifest(PatchManifest patchManifest)
 		{
@@ -378,7 +357,7 @@ namespace YooAsset
 				throw new Exception("Should never get here !");
 
 			// 查询沙盒资源
-			if (DownloadSystem.ContainsVerifyFile(patchBundle.Hash))
+			if (CacheSystem.IsCached(patchBundle))
 			{
 				BundleInfo bundleInfo = new BundleInfo(patchBundle, BundleInfo.ELoadMode.LoadFromCache);
 				return bundleInfo;
@@ -387,7 +366,7 @@ namespace YooAsset
 			// 查询APP资源
 			if (AppPatchManifest.TryGetPatchBundle(patchBundle.BundleName, out PatchBundle appPatchBundle))
 			{
-				if (appPatchBundle.IsBuildin && appPatchBundle.Hash == patchBundle.Hash)
+				if (appPatchBundle.IsBuildin && appPatchBundle.Equals(patchBundle))
 				{
 					BundleInfo bundleInfo = new BundleInfo(appPatchBundle, BundleInfo.ELoadMode.LoadFromStreaming);
 					return bundleInfo;

Assets/YooAsset/Runtime/PatchSystem/PlayMode/OfflinePlayModeImpl.cs

@@ -16,7 +16,7 @@ namespace YooAsset
 		{
 			_locationToLower = locationToLower;
 			var operation = new OfflinePlayModeInitializationOperation(this);
-			OperationSystem.StartOperaiton(operation);
+			OperationSystem.StartOperation(operation);
 			return operation;
 		}
 
@@ -43,8 +43,18 @@ namespace YooAsset
 			if (patchBundle == null)
 				throw new Exception("Should never get here !");
 
-			BundleInfo bundleInfo = new BundleInfo(patchBundle, BundleInfo.ELoadMode.LoadFromStreaming);
-			return bundleInfo;
+			// 查询沙盒资源
+			if (CacheSystem.IsCached(patchBundle))
+			{
+				BundleInfo bundleInfo = new BundleInfo(patchBundle, BundleInfo.ELoadMode.LoadFromCache);
+				return bundleInfo;
+			}
+
+			// 查询APP资源
+			{
+				BundleInfo bundleInfo = new BundleInfo(patchBundle, BundleInfo.ELoadMode.LoadFromStreaming);
+				return bundleInfo;
+			}
 		}
 		BundleInfo IBundleServices.GetBundleInfo(AssetInfo assetInfo)
 		{

Assets/YooAsset/Runtime/PatchSystem/PlayMode/WebPlayModeImpl.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-/*
-namespace YooAsset
-{
-	internal class WebPlayModeImpl : IBundleServices
-	{
-	}
-}
-*/

Assets/YooAsset/Runtime/Properties/AssemblyInfo.cs

@@ -1,4 +1,5 @@
 using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("YooAsset.Editor")]
-[assembly: InternalsVisibleTo("YooAsset.EditorExtension")]
+[assembly: InternalsVisibleTo("YooAsset.EditorExtension")]
+[assembly: InternalsVisibleTo("YooAsset.RuntimeExtension")]

Assets/YooAsset/Runtime/Services/IDecryptionServices.cs

@@ -4,8 +4,7 @@ namespace YooAsset
 	public struct DecryptionFileInfo
 	{
 		public string BundleName;
-		public string BundleHash;
-		public string BundleCRC;
+		public string FileHash;
 	}
 
 	public interface IDecryptionServices

Assets/YooAsset/Runtime/Settings/YooAssetSettings.cs

@@ -16,15 +16,20 @@ namespace YooAsset
 		public string RawFileVariant = "rawfile";
 
 		/// <summary>
-		/// 构建输出的补丁清单文件名称
+		/// 补丁清单文件名称
 		/// </summary>
 		public string PatchManifestFileName = "PatchManifest";
 
-		/// <summary>
-		/// 构建输出的Unity清单文件名称
-		/// </summary>
-		public string UnityManifestFileName = "UnityManifest";
 
+		/// <summary>
+		/// 补丁清单文件版本
+		/// </summary>
+		public const string PatchManifestFileVersion = "1.2.2";
+
+		/// <summary>
+		/// 构建输出文件夹名称
+		/// </summary>
+		public const string OutputFolderName = "OutputCache";
 
 		/// <summary>
 		/// 构建输出的报告文件
@@ -37,8 +42,13 @@ namespace YooAsset
 		public const string VersionFileName = "StaticVersion.bytes";
 
 		/// <summary>
-		/// Unity内置着色器资源包名称
+		/// Unity着色器资源包名称
 		/// </summary>
-		public const string UnityBuiltInShadersBundleName = "UnityBuiltInShaders.bundle";
+		public const string UnityShadersBundleName = "unityshaders";
+
+		/// <summary>
+		/// 忽略的文件类型
+		/// </summary>
+		public static readonly string[] IgnoreFileExtensions = { "", ".so", ".dll", ".cs", ".js", ".boo", ".meta", ".cginc" };
 	}
 }