Update CHANGELOG.md

UpdateStaticVersionOperation.PackageCRC重名为PackageVersion。
AssetPackage.GetHumanReadableVersion()重名为GetPackageVersion()

.gitignore

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

Assets/YooAsset/CHANGELOG.md

@@ -2,6 +2,176 @@
 
 All notable changes to this package will be documented in this file.
 
+## [1.3.3] - 2022-10-27
+
+### Fixed
+
+- 修复了资源回收方法无效的问题。
+
+### Added
+
+- 新增了PackageVersion构建参数。
+
+  ````c#
+  public class BuildParameters
+  {
+      /// <summary>
+      /// 构建的包裹版本
+      /// </summary>
+      public string PackageVersion;  
+  }
+  ````
+
+### Changed
+
+- AssetBundleDebugger窗口增加了包裹名称显示列。
+- AssetBundleDebugger窗口增加资源对象的加载耗时统计和显示。
+- AssetBundleDebugger窗口增加帧调试数据导出功能。
+- AssetBundleBuilder构建流程增加输出目录文件路径过长的检测。
+- 下载器返回的错误提示增加HTTP Response Code。
+- UpdateStaticVersionOperation.PackageCRC重名为UpdateStaticVersionOperation.PackageVersion。
+- AssetPackage.GetHumanReadableVersion()重名为AssetPackage.GetPackageVersion()
+
+## [1.3.2] - 2022-10-22
+
+### Fixed
+
+- 修复了AssetBundleCollector界面点击修复按钮界面没有刷新的问题。
+
+### Added
+
+- 新增了自定义证书认证方法。
+
+  ````c#
+  public static class YooAssets
+  {
+      /// <summary>
+      /// 设置下载系统参数，自定义的证书认证实例
+      /// </summary>
+      public static void SetDownloadSystemCertificateHandler(UnityEngine.Networking.CertificateHandler instance)
+  }
+  ````
+
+- 新增了下载失败后清理文件的方法。
+
+  ````c#
+  public static class YooAssets
+  {
+      /// <summary>
+      /// 设置下载系统参数，下载失败后清理文件的HTTP错误码
+      /// </summary>
+      public static void SetDownloadSystemClearFileResponseCode(List<long> codes)
+  }
+  ````
+
+- 新增了检查资源定位地址是否有效的方法。
+
+  ```c#
+  public class AssetsPackage
+  {
+      /// <summary>
+      /// 检查资源定位地址是否有效
+      /// </summary>
+      /// <param name="location">资源的定位地址</param>
+      public bool CheckLocationValid(string location)
+  }
+  ```
+
+### Removed
+
+- 移除了ILocationServices接口类和初始化字段。
+- 移除了AssetPackage.GetAssetPath(string location)方法。
+- 移除了BuildParameters.EnableAddressable字段。
+
+### Changed
+
+- AssetBundleCollector配置增加了UniqueBundleName设置，用于解决不同包裹之间Bundle名称冲突的问题。
+
+## [1.3.1] - 2022-10-18
+
+### Fixed
+
+- 修复了原生文件每次获取都重复拷贝的问题。
+- 修复了断点续传下载字节数统计不准确的问题。
+
+### Added
+
+- 所有下载相关方法增加超时判断参数。
+
+- 新增首包资源文件拷贝选项。
+
+  ```c#
+  public class BuildParameters
+  {
+      /// <summary>
+      /// 拷贝内置资源选项
+      /// </summary>
+      public ECopyBuildinFileOption CopyBuildinFileOption = ECopyBuildinFileOption.None;
+  
+      /// <summary>
+      /// 拷贝内置资源的标签
+      /// </summary>
+      public string CopyBuildinFileTags = string.Empty;  
+  }
+  ```
+
+- 新增资源包初始化查询字段。
+
+  ```c#
+  public class AssetsPackage
+  {
+      /// <summary>
+      /// 初始化状态
+      /// </summary>
+      public EOperationStatus InitializeStatus
+  }
+  ```
+
+- 增加获取人类可读的版本信息。
+
+  ````c#
+  public class AssetsPackage
+  {
+      /// <summary>
+      /// 获取人类可读的版本信息
+      /// </summary>
+      public string GetHumanReadableVersion()
+  }
+  ````
+
+- 新增资源缓存清理方法。
+
+  ```c#
+  public static class YooAssets
+  {
+      /// <summary>
+      /// 清理未使用的缓存文件
+      /// </summary>
+      public static ClearUnusedCacheFilesOperation ClearUnusedCacheFiles()  
+  }
+  ```
+
+- 异步操作类新增繁忙查询方法。
+
+  ````c#
+  public abstract class GameAsyncOperation
+  {
+      /// <summary>
+      /// 异步操作系统是否繁忙
+      /// </summary>
+      protected bool IsBusy() 
+  }
+  ````
+
+### Removed
+
+- 移除了AssetsPackage.IsInitialized()方法。
+- 移除了YooAssets.ClearAllCacheFiles()方法。
+
+### Changed
+
+- YooAssetsPackage类重名为AssetsPackage
+
 ## [1.3.0-preview] - 2022-10-08
 
 该预览版本提供了分布式构建的功能，用于解决分工程或分内容构建的问题。

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilder.cs

@@ -59,6 +59,7 @@ namespace YooAsset.Editor
 					new TaskCreatePatchManifest(), //创建清单文件
 					new TaskCreateReport(), //创建报告文件
 					new TaskCreatePatchPackage(), //制作补丁包
+					new TaskCopyBuildinFiles(), //拷贝内置文件
 				};
 			}
 			else if (buildParameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
@@ -73,6 +74,7 @@ namespace YooAsset.Editor
 					new TaskCreatePatchManifest(), //创建清单文件
 					new TaskCreateReport(), //创建报告文件
 					new TaskCreatePatchPackage(), //制作补丁包
+					new TaskCopyBuildinFiles(), //拷贝内置文件
 				};
 			}
 			else
@@ -84,7 +86,6 @@ namespace YooAsset.Editor
 			var buildResult = BuildRunner.Run(pipeline, _buildContext);
 			if (buildResult.Success)
 			{
-				buildResult.OutputPackageCRC = buildParametersContext.OutputPackageCRC;
 				buildResult.OutputPackageDirectory = buildParametersContext.GetPackageOutputDirectory();
 				Debug.Log($"{buildParameters.BuildMode} pipeline build succeed !");
 			}

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderHelper.cs

@@ -22,7 +22,7 @@ namespace YooAsset.Editor
 		/// </summary>
 		public static string GetStreamingAssetsFolderPath()
 		{
-			return $"{Application.dataPath}/StreamingAssets/YooAssets/";
+			return $"{Application.dataPath}/StreamingAssets/{YooAssetSettings.StreamingAssetsBuildinFolder}/";
 		}
 
 		/// <summary>
@@ -75,9 +75,9 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 加载补丁清单文件
 		/// </summary>
-		internal static PatchManifest LoadPatchManifestFile(string fileDirectory, string packageName, string packageCRC)
+		internal static PatchManifest LoadPatchManifestFile(string fileDirectory, string packageName, string packageVersion)
 		{
-			string filePath = $"{fileDirectory}/{YooAssetSettingsData.GetPatchManifestFileName(packageName, packageCRC)}";
+			string filePath = $"{fileDirectory}/{YooAssetSettingsData.GetPatchManifestFileName(packageName, packageVersion)}";
 			if (File.Exists(filePath) == false)
 			{
 				throw new System.Exception($"Not found patch manifest file : {filePath}");

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSetting.cs

@@ -30,6 +30,16 @@ namespace YooAsset.Editor
 		/// </summary>
 		public EOutputNameStyle OutputNameStyle = EOutputNameStyle.HashName;
 
+		/// <summary>
+		/// 首包资源文件的拷贝方式
+		/// </summary>
+		public ECopyBuildinFileOption CopyBuildinFileOption = ECopyBuildinFileOption.None;
+
+		/// <summary>
+		/// 首包资源文件的标签集合
+		/// </summary>
+		public string CopyBuildinFileTags = string.Empty;
+
 		/// <summary>
 		/// 加密类名称
 		/// </summary>

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs

@@ -31,6 +31,8 @@ namespace YooAsset.Editor
 		private PopupField<string> _encryptionField;
 		private EnumField _compressionField;
 		private EnumField _outputNameStyleField;
+		private EnumField _copyBuildinFileOptionField;
+		private TextField _copyBuildinFileTagsField;
 
 		public void CreateGUI()
 		{
@@ -135,7 +137,7 @@ namespace YooAsset.Editor
 					encryptionContainer.Add(_encryptionField);
 				}
 
-				// 压缩方式
+				// 压缩方式选项
 				_compressionField = root.Q<EnumField>("Compression");
 				_compressionField.Init(AssetBundleBuilderSettingData.Setting.CompressOption);
 				_compressionField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.CompressOption);
@@ -157,6 +159,27 @@ namespace YooAsset.Editor
 					AssetBundleBuilderSettingData.Setting.OutputNameStyle = (EOutputNameStyle)_outputNameStyleField.value;
 				});
 
+				// 首包文件拷贝选项
+				_copyBuildinFileOptionField = root.Q<EnumField>("CopyBuildinFileOption");
+				_copyBuildinFileOptionField.Init(AssetBundleBuilderSettingData.Setting.CopyBuildinFileOption);
+				_copyBuildinFileOptionField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.CopyBuildinFileOption);
+				_copyBuildinFileOptionField.style.width = 350;
+				_copyBuildinFileOptionField.RegisterValueChangedCallback(evt =>
+				{
+					AssetBundleBuilderSettingData.IsDirty = true;
+					AssetBundleBuilderSettingData.Setting.CopyBuildinFileOption = (ECopyBuildinFileOption)_copyBuildinFileOptionField.value;
+					RefreshWindow();
+				});
+
+				// 首包文件的资源标签
+				_copyBuildinFileTagsField = root.Q<TextField>("CopyBuildinFileTags");
+				_copyBuildinFileTagsField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.CopyBuildinFileTags);
+				_copyBuildinFileTagsField.RegisterValueChangedCallback(evt =>
+				{
+					AssetBundleBuilderSettingData.IsDirty = true;
+					AssetBundleBuilderSettingData.Setting.CopyBuildinFileTags = _copyBuildinFileTagsField.value;
+				});
+
 				// 构建按钮
 				var buildButton = root.Q<Button>("Build");
 				buildButton.clicked += BuildButton_clicked; ;
@@ -193,10 +216,15 @@ namespace YooAsset.Editor
 		private void RefreshWindow()
 		{
 			var buildMode = AssetBundleBuilderSettingData.Setting.BuildMode;
+			var copyOption = AssetBundleBuilderSettingData.Setting.CopyBuildinFileOption;
 			bool enableElement = buildMode == EBuildMode.ForceRebuild;
+			bool tagsFiledVisible = copyOption == ECopyBuildinFileOption.ClearAndCopyByTags || copyOption == ECopyBuildinFileOption.OnlyCopyByTags;
 			_encryptionField.SetEnabled(enableElement);
 			_compressionField.SetEnabled(enableElement);
 			_outputNameStyleField.SetEnabled(enableElement);
+			_copyBuildinFileOptionField.SetEnabled(enableElement);
+			_copyBuildinFileTagsField.SetEnabled(enableElement);
+			_copyBuildinFileTagsField.visible = tagsFiledVisible;
 		}
 		private void SaveBtn_clicked()
 		{
@@ -227,12 +255,14 @@ namespace YooAsset.Editor
 			buildParameters.BuildTarget = _buildTarget;
 			buildParameters.BuildPipeline = AssetBundleBuilderSettingData.Setting.BuildPipeline;
 			buildParameters.BuildMode = AssetBundleBuilderSettingData.Setting.BuildMode;
-			buildParameters.BuildPackage = AssetBundleBuilderSettingData.Setting.BuildPackage;
+			buildParameters.PackageName = AssetBundleBuilderSettingData.Setting.BuildPackage;
+			buildParameters.PackageVersion = GetDefaultPackageVersion();
 			buildParameters.VerifyBuildingResult = true;
-			buildParameters.EnableAddressable = AssetBundleCollectorSettingData.Setting.EnableAddressable;
 			buildParameters.EncryptionServices = CreateEncryptionServicesInstance();
 			buildParameters.CompressOption = AssetBundleBuilderSettingData.Setting.CompressOption;
 			buildParameters.OutputNameStyle = AssetBundleBuilderSettingData.Setting.OutputNameStyle;
+			buildParameters.CopyBuildinFileOption = AssetBundleBuilderSettingData.Setting.CopyBuildinFileOption;
+			buildParameters.CopyBuildinFileTags = AssetBundleBuilderSettingData.Setting.CopyBuildinFileTags;
 
 			if (AssetBundleBuilderSettingData.Setting.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
 			{
@@ -247,6 +277,11 @@ namespace YooAsset.Editor
 				EditorUtility.RevealInFinder(buildResult.OutputPackageDirectory);
 			}
 		}
+		private string GetDefaultPackageVersion()
+		{
+			int totalMinutes = DateTime.Now.Hour * 60 + DateTime.Now.Minute;
+			return DateTime.Now.ToString("yyyy-MM-dd") + "-" + totalMinutes;
+		}
 
 		// 构建包裹相关
 		private int GetDefaultPackageIndex(string packageName)

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.uxml

@@ -10,6 +10,8 @@
         <ui:VisualElement name="EncryptionContainer" style="height: 24px;" />
         <uie:EnumField label="Compression" value="Center" name="Compression" />
         <uie:EnumField label="Output Name Style" value="Center" name="OutputNameStyle" />
+        <uie:EnumField label="Copy Buildin File Option" value="Center" name="CopyBuildinFileOption" />
+        <ui:TextField picking-mode="Ignore" label="Copy Buildin File Tags" name="CopyBuildinFileTags" />
         <ui:Button text="构建" display-tooltip-when-elided="true" name="Build" style="height: 50px; background-color: rgb(40, 106, 42); margin-top: 10px;" />
     </ui:VisualElement>
 </ui:UXML>

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleSimulateBuilder.cs

@@ -7,22 +7,22 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 模拟构建
 		/// </summary>
-		public static string SimulateBuild(string packageName, bool enableAddressable)
+		public static string SimulateBuild(string packageName)
 		{
 			string defaultOutputRoot = AssetBundleBuilderHelper.GetDefaultOutputRoot();
 			BuildParameters buildParameters = new BuildParameters();
 			buildParameters.OutputRoot = defaultOutputRoot;
 			buildParameters.BuildTarget = EditorUserBuildSettings.activeBuildTarget;
 			buildParameters.BuildMode = EBuildMode.SimulateBuild;
-			buildParameters.BuildPackage = packageName;
+			buildParameters.PackageName = packageName;
-			buildParameters.EnableAddressable = enableAddressable;
+			buildParameters.PackageVersion = "Simulate";
 
 			AssetBundleBuilder builder = new AssetBundleBuilder();
 			var buildResult = builder.Run(buildParameters);
 			if (buildResult.Success)
 			{
-				string pipelineOutputDirectory = AssetBundleBuilderHelper.MakePipelineOutputDirectory(buildParameters.OutputRoot, buildParameters.BuildPackage, buildParameters.BuildTarget, buildParameters.BuildMode);
+				string pipelineOutputDirectory = AssetBundleBuilderHelper.MakePipelineOutputDirectory(buildParameters.OutputRoot, buildParameters.PackageName, buildParameters.BuildTarget, buildParameters.BuildMode);
-				string manifestFileName = YooAssetSettingsData.GetPatchManifestFileName(buildParameters.BuildPackage, buildResult.OutputPackageCRC);
+				string manifestFileName = YooAssetSettingsData.GetPatchManifestFileName(buildParameters.PackageName, buildParameters.PackageVersion);
 				string manifestFilePath = $"{pipelineOutputDirectory}/{manifestFileName}";
 				return manifestFilePath;
 			}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildAssetInfo.cs

@@ -63,7 +63,7 @@ namespace YooAsset.Editor
 			IsRawAsset = isRawAsset;
 
 			System.Type assetType = UnityEditor.AssetDatabase.GetMainAssetTypeAtPath(assetPath);
-			if (assetType == typeof(UnityEngine.Shader))
+			if (assetType == typeof(UnityEngine.Shader) || assetType == typeof(UnityEngine.ShaderVariantCollection))
 				IsShaderAsset = true;
 			else
 				IsShaderAsset = false;
@@ -76,7 +76,7 @@ namespace YooAsset.Editor
 			IsRawAsset = false;
 
 			System.Type assetType = UnityEditor.AssetDatabase.GetMainAssetTypeAtPath(assetPath);
-			if (assetType == typeof(UnityEngine.Shader))
+			if (assetType == typeof(UnityEngine.Shader) || assetType == typeof(UnityEngine.ShaderVariantCollection))
 				IsShaderAsset = true;
 			else
 				IsShaderAsset = false;
@@ -166,7 +166,7 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 计算主资源或共享资源的完整包名
 		/// </summary>
-		public void CalculateFullBundleName()
+		public void CalculateFullBundleName(bool uniqueBundleName, string packageName)
 		{
 			if (CollectorType == ECollectorType.None)
 			{
@@ -177,15 +177,22 @@ namespace YooAsset.Editor
 				{
 					string shareBundleName = YooAssetSettingsData.GetUnityShadersBundleFullName();
 					_shareBundleName = EditorTools.GetRegularPath(shareBundleName).ToLower();
-					return;
+				}
+				else
+				{
+					if (_referenceBundleNames.Count > 1)
+					{
+						IPackRule packRule = PackDirectory.StaticPackRule;
+						var bundleName = packRule.GetBundleName(new PackRuleData(AssetPath));
+						var shareBundleName = $"share_{bundleName}.{YooAssetSettingsData.Setting.AssetBundleFileVariant}";
+						_shareBundleName = EditorTools.GetRegularPath(shareBundleName).ToLower();
+					}
 				}
 
-				if (_referenceBundleNames.Count > 1)
+				if (uniqueBundleName)
 				{
-					IPackRule packRule = PackDirectory.StaticPackRule;
+					if (string.IsNullOrEmpty(_shareBundleName) == false)
-					var bundleName = packRule.GetBundleName(new PackRuleData(AssetPath));
+						_shareBundleName = $"{packageName.ToLower()}_{_shareBundleName}";
-					var shareBundleName = $"share_{bundleName}.{YooAssetSettingsData.Setting.AssetBundleFileVariant}";
-					_shareBundleName = EditorTools.GetRegularPath(shareBundleName).ToLower();
 				}
 			}
 			else

Assets/YooAsset/Editor/AssetBundleBuilder/BuildBundleInfo.cs

@@ -89,14 +89,6 @@ namespace YooAsset.Editor
 			return result.ToArray();
 		}
 
-		/// <summary>
-		/// 获取文件的扩展名
-		/// </summary>
-		public string GetAppendExtension()
-		{
-			return System.IO.Path.GetExtension(BundleName);
-		}
-
 		/// <summary>
 		/// 获取构建的资源路径列表
 		/// </summary>

Assets/YooAsset/Editor/AssetBundleBuilder/BuildMapContext.cs

@@ -14,6 +14,16 @@ namespace YooAsset.Editor
 		/// </summary>
 		public int AssetFileCount;
 
+		/// <summary>
+		/// 是否启用可寻址资源定位
+		/// </summary>
+		public bool EnableAddressable;
+
+		/// <summary>
+		/// 资源包名唯一化
+		/// </summary>
+		public bool UniqueBundleName;
+
 		/// <summary>
 		/// 资源包列表
 		/// </summary>

Assets/YooAsset/Editor/AssetBundleBuilder/BuildMapCreater.cs

@@ -19,7 +19,8 @@ namespace YooAsset.Editor
 			AssetBundleCollectorSettingData.Setting.CheckConfigError();
 
 			// 2. 获取所有收集器收集的资源
-			List<CollectAssetInfo> allCollectAssets = AssetBundleCollectorSettingData.Setting.GetPackageAssets(buildMode, packageName);
+			var buildResult = AssetBundleCollectorSettingData.Setting.GetPackageAssets(buildMode, packageName);
+			List<CollectAssetInfo> allCollectAssets = buildResult.CollectAssets;
 
 			// 3. 剔除未被引用的依赖资源
 			List<CollectAssetInfo> removeDependList = new List<CollectAssetInfo>();
@@ -72,9 +73,13 @@ namespace YooAsset.Editor
 					}
 				}
 			}
-			context.AssetFileCount = buildAssetDic.Count;
 
-			// 6. 填充主动收集资源的依赖列表
+			// 6. 记录关键信息
+			context.AssetFileCount = buildAssetDic.Count;
+			context.EnableAddressable = buildResult.EnableAddressable;
+			context.UniqueBundleName = buildResult.UniqueBundleName;
+
+			// 7. 填充主动收集资源的依赖列表
 			foreach (var collectAssetInfo in allCollectAssets)
 			{
 				var dependAssetInfos = new List<BuildAssetInfo>(collectAssetInfo.DependAssets.Count);
@@ -88,13 +93,13 @@ namespace YooAsset.Editor
 				buildAssetDic[collectAssetInfo.AssetPath].SetAllDependAssetInfos(dependAssetInfos);
 			}
 
-			// 7. 计算完整的资源包名
+			// 8. 计算完整的资源包名
 			foreach (KeyValuePair<string, BuildAssetInfo> pair in buildAssetDic)
 			{
-				pair.Value.CalculateFullBundleName();
+				pair.Value.CalculateFullBundleName(buildResult.UniqueBundleName, buildResult.PackageName);
 			}
 
-			// 8. 移除不参与构建的资源
+			// 9. 移除不参与构建的资源
 			List<BuildAssetInfo> removeBuildList = new List<BuildAssetInfo>();
 			foreach (KeyValuePair<string, BuildAssetInfo> pair in buildAssetDic)
 			{
@@ -107,7 +112,7 @@ namespace YooAsset.Editor
 				buildAssetDic.Remove(removeValue.AssetPath);
 			}
 
-			// 9. 构建资源包
+			// 10. 构建资源包
 			var allBuildinAssets = buildAssetDic.Values.ToList();
 			if (allBuildinAssets.Count == 0)
 				throw new Exception("构建的资源列表不能为空");

Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs

@@ -57,21 +57,21 @@ namespace YooAsset.Editor
 		public EBuildMode BuildMode;
 
 		/// <summary>
-		/// 构建的Package名称
+		/// 构建的包裹名称
 		/// </summary>
-		public string BuildPackage;
+		public string PackageName;
+
+		/// <summary>
+		/// 构建的包裹版本
+		/// </summary>
+		public string PackageVersion;
 
 
 		/// <summary>
 		/// 验证构建结果
 		/// </summary>
 		public bool VerifyBuildingResult = false;
-
+		
-		/// <summary>
-		/// 启用可寻址资源定位
-		/// </summary>
-		public bool EnableAddressable = false;
-
 		/// <summary>
 		/// 加密类
 		/// </summary>
@@ -82,6 +82,16 @@ namespace YooAsset.Editor
 		/// </summary>
 		public EOutputNameStyle OutputNameStyle = EOutputNameStyle.HashName;
 
+		/// <summary>
+		/// 拷贝内置资源选项
+		/// </summary>
+		public ECopyBuildinFileOption CopyBuildinFileOption = ECopyBuildinFileOption.None;
+
+		/// <summary>
+		/// 拷贝内置资源的标签
+		/// </summary>
+		public string CopyBuildinFileTags = string.Empty;
+
 		/// <summary>
 		/// 压缩选项
 		/// </summary>

Assets/YooAsset/Editor/AssetBundleBuilder/BuildParametersContext.cs

@@ -11,30 +11,12 @@ namespace YooAsset.Editor
 
 		private string _pipelineOutputDirectory = string.Empty;
 		private string _packageOutputDirectory = string.Empty;
-		private string _outputPackageCRC = string.Empty;
 
 		/// <summary>
 		/// 构建参数
 		/// </summary>
 		public BuildParameters Parameters { private set; get; }
 
-		/// <summary>
-		/// 构建输出的包裹清单哈希值
-		/// </summary>
-		public string OutputPackageCRC
-		{
-			get
-			{
-				if (string.IsNullOrEmpty(_outputPackageCRC))
-					throw new Exception("Output package file CRC32 is empty !");
-				return _outputPackageCRC;
-			}
-			set
-			{
-				_outputPackageCRC = value;
-			}
-		}
-
 
 		public BuildParametersContext(BuildParameters parameters)
 		{
@@ -49,7 +31,7 @@ namespace YooAsset.Editor
 		{
 			if (string.IsNullOrEmpty(_pipelineOutputDirectory))
 			{
-				_pipelineOutputDirectory = AssetBundleBuilderHelper.MakePipelineOutputDirectory(Parameters.OutputRoot, Parameters.BuildPackage, Parameters.BuildTarget, Parameters.BuildMode);
+				_pipelineOutputDirectory = AssetBundleBuilderHelper.MakePipelineOutputDirectory(Parameters.OutputRoot, Parameters.PackageName, Parameters.BuildTarget, Parameters.BuildMode);
 			}
 			return _pipelineOutputDirectory;
 		}
@@ -61,7 +43,7 @@ namespace YooAsset.Editor
 		{
 			if (string.IsNullOrEmpty(_packageOutputDirectory))
 			{
-				_packageOutputDirectory = $"{Parameters.OutputRoot}/{Parameters.BuildPackage}/{Parameters.BuildTarget}/{OutputPackageCRC}";
+				_packageOutputDirectory = $"{Parameters.OutputRoot}/{Parameters.PackageName}/{Parameters.BuildTarget}/{Parameters.PackageVersion}";
 			}
 			return _packageOutputDirectory;
 		}

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

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.IO;
 using UnityEngine;
 
 namespace YooAsset.Editor
@@ -56,6 +57,9 @@ namespace YooAsset.Editor
 
 		public static void Serialize(string savePath, BuildReport buildReport)
 		{
+			if (File.Exists(savePath))
+				File.Delete(savePath);
+
 			string json = JsonUtility.ToJson(buildReport, true);
 			FileUtility.CreateFile(savePath, json);
 		}

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

@@ -44,15 +44,25 @@ namespace YooAsset.Editor
 		public EBuildMode BuildMode;
 
 		/// <summary>
-		/// 构建包裹
+		/// 构建包裹名称
 		/// </summary>
-		public string BuildPackage;
+		public string BuildPackageName;
+
+		/// <summary>
+		/// 构建包裹版本
+		/// </summary>
+		public string BuildPackageVersion;
 
 		/// <summary>
 		/// 启用可寻址资源定位
 		/// </summary>
 		public bool EnableAddressable;
 
+		/// <summary>
+		/// 资源包名唯一化
+		/// </summary>
+		public bool UniqueBundleName;
+
 		/// <summary>
 		/// 加密服务类名称
 		/// </summary>

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

@@ -25,10 +25,5 @@ namespace YooAsset.Editor
         /// 输出的补丁包目录
         /// </summary>
         public string OutputPackageDirectory;
-
-        /// <summary>
-        /// 输出的包裹清单哈希值
-        /// </summary>
-        public string OutputPackageCRC;
     }
 }

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

@@ -0,0 +1,95 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("拷贝内置文件到流目录")]
+	public class TaskCopyBuildinFiles : IBuildTask
+	{
+		void IBuildTask.Run(BuildContext context)
+		{
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			if (buildParametersContext.Parameters.CopyBuildinFileOption != ECopyBuildinFileOption.None)
+			{
+				CopyBuildinFilesToStreaming(buildParametersContext);
+			}
+		}
+
+		/// <summary>
+		/// 拷贝首包资源文件
+		/// </summary>
+		private void CopyBuildinFilesToStreaming(BuildParametersContext buildParametersContext)
+		{
+			ECopyBuildinFileOption option = buildParametersContext.Parameters.CopyBuildinFileOption;
+			string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
+			string streamingAssetsDirectory = AssetBundleBuilderHelper.GetStreamingAssetsFolderPath();
+			string buildPackageName = buildParametersContext.Parameters.PackageName;
+			string buildPackageVersion = buildParametersContext.Parameters.PackageVersion;
+
+			// 加载补丁清单
+			PatchManifest patchManifest = AssetBundleBuilderHelper.LoadPatchManifestFile(packageOutputDirectory, buildPackageName, buildPackageVersion);
+
+			// 清空流目录
+			if (option == ECopyBuildinFileOption.ClearAndCopyAll || option == ECopyBuildinFileOption.ClearAndCopyByTags)
+			{
+				AssetBundleBuilderHelper.ClearStreamingAssetsFolder();
+			}
+
+			// 拷贝补丁清单文件
+			{
+				string fileName = YooAssetSettingsData.GetPatchManifestFileName(buildPackageName, buildPackageVersion);
+				string sourcePath = $"{packageOutputDirectory}/{fileName}";
+				string destPath = $"{streamingAssetsDirectory}/{fileName}";
+				EditorTools.CopyFile(sourcePath, destPath, true);
+			}
+
+			// 拷贝补丁清单哈希文件
+			{
+				string fileName = YooAssetSettingsData.GetPatchManifestHashFileName(buildPackageName, buildPackageVersion);
+				string sourcePath = $"{packageOutputDirectory}/{fileName}";
+				string destPath = $"{streamingAssetsDirectory}/{fileName}";
+				EditorTools.CopyFile(sourcePath, destPath, true);
+			}
+
+			// 拷贝补丁清单版本文件
+			{
+				string fileName = YooAssetSettingsData.GetPatchManifestVersionFileName(buildPackageName);
+				string sourcePath = $"{packageOutputDirectory}/{fileName}";
+				string destPath = $"{streamingAssetsDirectory}/{fileName}";
+				EditorTools.CopyFile(sourcePath, destPath, true);
+			}
+
+			// 拷贝文件列表（所有文件）
+			if (option == ECopyBuildinFileOption.ClearAndCopyAll || option == ECopyBuildinFileOption.OnlyCopyAll)
+			{		
+				foreach (var patchBundle in patchManifest.BundleList)
+				{
+					string sourcePath = $"{packageOutputDirectory}/{patchBundle.FileName}";
+					string destPath = $"{streamingAssetsDirectory}/{patchBundle.FileName}";
+					EditorTools.CopyFile(sourcePath, destPath, true);
+				}
+			}
+
+			// 拷贝文件列表（带标签的文件）
+			if (option == ECopyBuildinFileOption.ClearAndCopyByTags || option == ECopyBuildinFileOption.OnlyCopyByTags)
+			{
+				string[] tags = buildParametersContext.Parameters.CopyBuildinFileTags.Split(';');
+				foreach (var patchBundle in patchManifest.BundleList)
+				{
+					if (patchBundle.HasTag(tags) == false)
+						continue;
+					string sourcePath = $"{packageOutputDirectory}/{patchBundle.FileName}";
+					string destPath = $"{streamingAssetsDirectory}/{patchBundle.FileName}";
+					EditorTools.CopyFile(sourcePath, destPath, true);
+				}
+			}
+
+			// 刷新目录
+			AssetDatabase.Refresh();
+			BuildRunner.Log($"内置文件拷贝完成：{streamingAssetsDirectory}");
+		}
+	}
+}

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: cfc81e18e5b5f6f4b821c7427b34d349
+guid: 5c77e17c3a3a57548a218f1cd26f5a55
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -21,6 +21,7 @@ namespace YooAsset.Editor
 		/// </summary>
 		private void CreatePatchManifestFile(BuildContext context)
 		{
+			var buildMapContext = context.GetContextObject<BuildMapContext>();
 			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
 			var buildParameters = buildParametersContext.Parameters;
 			string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
@@ -28,41 +29,48 @@ namespace YooAsset.Editor
 			// 创建新补丁清单
 			PatchManifest patchManifest = new PatchManifest();
 			patchManifest.FileVersion = YooAssetSettings.PatchManifestFileVersion;
-			patchManifest.EnableAddressable = buildParameters.EnableAddressable;
+			patchManifest.EnableAddressable = buildMapContext.EnableAddressable;
 			patchManifest.OutputNameStyle = (int)buildParameters.OutputNameStyle;
-			patchManifest.PackageName = buildParameters.BuildPackage;
+			patchManifest.PackageName = buildParameters.PackageName;
+			patchManifest.PackageVersion = buildParameters.PackageVersion;
 			patchManifest.BundleList = GetAllPatchBundle(context);
 			patchManifest.AssetList = GetAllPatchAsset(context, patchManifest);
 
 			// 更新Unity内置资源包的引用关系
 			if (buildParameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
 			{
-				if(buildParameters.BuildMode == EBuildMode.IncrementalBuild)
+				if (buildParameters.BuildMode == EBuildMode.IncrementalBuild)
 				{
 					var buildResultContext = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
 					UpdateBuiltInBundleReference(patchManifest, buildResultContext.Results);
 				}
 			}
-
+			
 			// 创建补丁清单文件
-			string manifestFileTempName = YooAssetSettingsData.GetPatchManifestTempFileName(buildParameters.BuildPackage);
+			string packageHash = string.Empty;
-			string manifestFileTempPath = $"{pipelineOutputDirectory}/{manifestFileTempName}";
+			{
-			BuildRunner.Log($"创建补丁清单文件：{manifestFileTempPath}");
+				string fileName = YooAssetSettingsData.GetPatchManifestFileName(buildParameters.PackageName, buildParameters.PackageVersion);
-			PatchManifest.Serialize(manifestFileTempPath, patchManifest);
+				string filePath = $"{pipelineOutputDirectory}/{fileName}";
+				PatchManifest.Serialize(filePath, patchManifest);
+				packageHash = HashUtility.FileMD5(filePath);
+				BuildRunner.Log($"创建补丁清单文件：{filePath}");
+			}
 
-			// 计算补丁清单文件的CRC32
+			// 创建补丁清单哈希文件
-			buildParametersContext.OutputPackageCRC = HashUtility.FileCRC32(manifestFileTempPath);
+			{
+				string fileName = YooAssetSettingsData.GetPatchManifestHashFileName(buildParameters.PackageName, buildParameters.PackageVersion);
+				string filePath = $"{pipelineOutputDirectory}/{fileName}";		
+				FileUtility.CreateFile(filePath, packageHash);
+				BuildRunner.Log($"创建补丁清单哈希文件：{filePath}");
+			}
 
-			// 补丁清单文件重命名
+			// 创建补丁清单版本文件
-			string manifestFileName = YooAssetSettingsData.GetPatchManifestFileName(buildParameters.BuildPackage, buildParametersContext.OutputPackageCRC);
+			{
-			string manifestFilePath = $"{pipelineOutputDirectory}/{manifestFileName}";
+				string fileName = YooAssetSettingsData.GetPatchManifestVersionFileName(buildParameters.PackageName);
-			EditorTools.FileMoveTo(manifestFileTempPath, manifestFilePath);
+				string filePath = $"{pipelineOutputDirectory}/{fileName}";
-
+				FileUtility.CreateFile(filePath, buildParameters.PackageVersion);
-			// 创建静态版本文件
+				BuildRunner.Log($"创建补丁清单版本文件：{filePath}");
-			string staticVersionFileName = YooAssetSettingsData.GetStaticVersionFileName(buildParameters.BuildPackage);
+			}
-			string staticVersionFilePath = $"{pipelineOutputDirectory}/{staticVersionFileName}";
-			BuildRunner.Log($"创建静态版本文件：{staticVersionFilePath}");
-			FileUtility.CreateFile(staticVersionFilePath, buildParametersContext.OutputPackageCRC);
 		}
 
 		/// <summary>
@@ -70,17 +78,22 @@ namespace YooAsset.Editor
 		/// </summary>
 		private List<PatchBundle> GetAllPatchBundle(BuildContext context)
 		{
-			var buildParameters = context.GetContextObject<BuildParametersContext>();
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
 			var buildMapContext = context.GetContextObject<BuildMapContext>();
 			var encryptionContext = context.GetContextObject<TaskEncryption.EncryptionContext>();
 
 			List<PatchBundle> result = new List<PatchBundle>(1000);
 			foreach (var bundleInfo in buildMapContext.BundleInfos)
 			{
+				// NOTE：检测路径长度不要超过260字符。
+				string filePath = $"{buildParametersContext.GetPipelineOutputDirectory()}/{bundleInfo.BundleName}";
+				if (filePath.Length >= 260)
+					throw new Exception($"The output bundle name is too long {filePath.Length} chars : {filePath}");
+
 				var bundleName = bundleInfo.BundleName;
-				string fileHash = GetBundleFileHash(bundleInfo, buildParameters);
+				string fileHash = GetBundleFileHash(bundleInfo, buildParametersContext);
-				string fileCRC = GetBundleFileCRC(bundleInfo, buildParameters);
+				string fileCRC = GetBundleFileCRC(bundleInfo, buildParametersContext);
-				long fileSize = GetBundleFileSize(bundleInfo, buildParameters);
+				long fileSize = GetBundleFileSize(bundleInfo, buildParametersContext);
 				string[] tags = buildMapContext.GetBundleTags(bundleName);
 				bool isEncrypted = encryptionContext.IsEncryptFile(bundleName);
 				bool isRawFile = bundleInfo.IsRawFile;
@@ -124,7 +137,6 @@ namespace YooAsset.Editor
 		/// </summary>
 		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);
@@ -134,7 +146,7 @@ namespace YooAsset.Editor
 				foreach (var assetInfo in assetInfos)
 				{
 					PatchAsset patchAsset = new PatchAsset();
-					if (buildParameters.Parameters.EnableAddressable)
+					if (buildMapContext.EnableAddressable)
 						patchAsset.Address = assetInfo.Address;
 					else
 						patchAsset.Address = string.Empty;

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

@@ -28,25 +28,33 @@ namespace YooAsset.Editor
 
 			// 拷贝Report文件
 			{
-				string reportFileName = YooAssetSettingsData.GetReportFileName(buildParameters.BuildPackage, buildParametersContext.OutputPackageCRC);
+				string fileName = YooAssetSettingsData.GetReportFileName(buildParameters.PackageName, buildParameters.PackageVersion);
-				string sourcePath = $"{pipelineOutputDirectory}/{reportFileName}";
+				string sourcePath = $"{pipelineOutputDirectory}/{fileName}";
-				string destPath = $"{packageOutputDirectory}/{reportFileName}";
+				string destPath = $"{packageOutputDirectory}/{fileName}";
 				EditorTools.CopyFile(sourcePath, destPath, true);
 			}
 
 			// 拷贝补丁清单文件
 			{
-				string manifestFileName = YooAssetSettingsData.GetPatchManifestFileName(buildParameters.BuildPackage, buildParametersContext.OutputPackageCRC);
+				string fileName = YooAssetSettingsData.GetPatchManifestFileName(buildParameters.PackageName, buildParameters.PackageVersion);
-				string sourcePath = $"{pipelineOutputDirectory}/{manifestFileName}";
+				string sourcePath = $"{pipelineOutputDirectory}/{fileName}";
-				string destPath = $"{packageOutputDirectory}/{manifestFileName}";
+				string destPath = $"{packageOutputDirectory}/{fileName}";
 				EditorTools.CopyFile(sourcePath, destPath, true);
 			}
 
-			// 拷贝静态版本文件
+			// 拷贝补丁清单哈希文件
 			{
-				string versionFileName = YooAssetSettingsData.GetStaticVersionFileName(buildParameters.BuildPackage);
+				string fileName = YooAssetSettingsData.GetPatchManifestHashFileName(buildParameters.PackageName, buildParameters.PackageVersion);
-				string sourcePath = $"{pipelineOutputDirectory}/{versionFileName}";
+				string sourcePath = $"{pipelineOutputDirectory}/{fileName}";
-				string destPath = $"{packageOutputDirectory}/{versionFileName}";
+				string destPath = $"{packageOutputDirectory}/{fileName}";
+				EditorTools.CopyFile(sourcePath, destPath, true);
+			}
+
+			// 拷贝补丁清单版本文件
+			{
+				string fileName = YooAssetSettingsData.GetPatchManifestVersionFileName(buildParameters.PackageName);
+				string sourcePath = $"{pipelineOutputDirectory}/{fileName}";
+				string destPath = $"{packageOutputDirectory}/{fileName}";
 				EditorTools.CopyFile(sourcePath, destPath, true);
 			}
 
@@ -86,7 +94,7 @@ namespace YooAsset.Editor
 
 			// 拷贝所有补丁文件
 			int progressValue = 0;
-			PatchManifest patchManifest = AssetBundleBuilderHelper.LoadPatchManifestFile(pipelineOutputDirectory, buildParameters.BuildPackage, buildParametersContext.OutputPackageCRC);
+			PatchManifest patchManifest = AssetBundleBuilderHelper.LoadPatchManifestFile(pipelineOutputDirectory, buildParameters.PackageName, buildParameters.PackageVersion);
 			int patchFileTotalCount = patchManifest.BundleList.Count;
 			foreach (var patchBundle in patchManifest.BundleList)
 			{

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

@@ -29,7 +29,7 @@ namespace YooAsset.Editor
 			var buildParameters = buildParametersContext.Parameters;
 
 			string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
-			PatchManifest patchManifest = AssetBundleBuilderHelper.LoadPatchManifestFile(pipelineOutputDirectory, buildParameters.BuildPackage, buildParametersContext.OutputPackageCRC);
+			PatchManifest patchManifest = AssetBundleBuilderHelper.LoadPatchManifestFile(pipelineOutputDirectory, buildParameters.PackageName, buildParameters.PackageVersion);
 			BuildReport buildReport = new BuildReport();
 
 			// 概述信息
@@ -45,8 +45,11 @@ namespace YooAsset.Editor
 				buildReport.Summary.BuildTarget = buildParameters.BuildTarget;
 				buildReport.Summary.BuildPipeline = buildParameters.BuildPipeline;
 				buildReport.Summary.BuildMode = buildParameters.BuildMode;
-				buildReport.Summary.BuildPackage = buildParameters.BuildPackage;
+				buildReport.Summary.BuildPackageName = buildParameters.PackageName;
-				buildReport.Summary.EnableAddressable = buildParameters.EnableAddressable;
+				buildReport.Summary.BuildPackageVersion = buildParameters.PackageVersion;
+				buildReport.Summary.EnableAddressable = buildMapContext.EnableAddressable;
+				buildReport.Summary.UniqueBundleName = buildMapContext.UniqueBundleName;
+
 				buildReport.Summary.EncryptionServicesClassName = buildParameters.EncryptionServices == null ?
 					"null" : buildParameters.EncryptionServices.GetType().FullName;
 
@@ -99,13 +102,9 @@ namespace YooAsset.Editor
 				buildReport.BundleInfos.Add(reportBundleInfo);
 			}
 
-			// 删除旧文件
-			string fileName = YooAssetSettingsData.GetReportFileName(buildParameters.BuildPackage, buildParametersContext.OutputPackageCRC);
-			string filePath = $"{pipelineOutputDirectory}/{fileName}";
-			if (File.Exists(filePath))
-				File.Delete(filePath);
-
 			// 序列化文件
+			string fileName = YooAssetSettingsData.GetReportFileName(buildParameters.PackageName, buildParameters.PackageVersion);
+			string filePath = $"{pipelineOutputDirectory}/{fileName}";
 			BuildReport.Serialize(filePath, buildReport);
 			BuildRunner.Log($"资源构建报告文件创建完成：{filePath}");
 		}

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

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

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

@@ -19,8 +19,10 @@ namespace YooAsset.Editor
 			// 检测构建参数合法性
 			if (buildParameters.BuildTarget == BuildTarget.NoTarget)
 				throw new Exception("请选择目标平台");
-			if (string.IsNullOrEmpty(buildParameters.BuildPackage))
+			if (string.IsNullOrEmpty(buildParameters.PackageName))
 				throw new Exception("包裹名称不能为空");
+			if(string.IsNullOrEmpty(buildParameters.PackageVersion))
+				throw new Exception("包裹版本不能为空");
 
 			if (buildParameters.BuildMode != EBuildMode.SimulateBuild)
 			{
@@ -32,13 +34,27 @@ namespace YooAsset.Editor
 				if (EditorTools.HasDirtyScenes())
 					throw new Exception("检测到未保存的场景文件");
 
+				// 检测首包资源标签
+				if (buildParameters.CopyBuildinFileOption == ECopyBuildinFileOption.ClearAndCopyByTags
+					|| buildParameters.CopyBuildinFileOption == ECopyBuildinFileOption.OnlyCopyByTags)
+				{
+					if (string.IsNullOrEmpty(buildParameters.CopyBuildinFileTags))
+						throw new Exception("首包资源标签不能为空！");
+				}
+
+				// 检测包裹输出目录是否存在
+				string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
+				if (Directory.Exists(packageOutputDirectory))
+					throw new Exception($"本次构建的补丁目录已经存在：{packageOutputDirectory}");
+
 				// 保存改动的资源
 				AssetDatabase.SaveAssets();
 			}
+
 			if (buildParameters.BuildMode == EBuildMode.ForceRebuild)
 			{
 				// 删除平台总目录
-				string platformDirectory = $"{buildParameters.OutputRoot}/{buildParameters.BuildPackage}/{buildParameters.BuildTarget}";
+				string platformDirectory = $"{buildParameters.OutputRoot}/{buildParameters.PackageName}/{buildParameters.BuildTarget}";
 				if (EditorTools.DeleteDirectory(platformDirectory))
 				{
 					BuildRunner.Log($"删除平台总目录：{platformDirectory}");

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

@@ -62,6 +62,7 @@ namespace YooAsset.Editor
 			}
 
 			// 4. 验证Asset
+			/*
 			bool isPass = true;
 			var buildMode = buildParametersContext.Parameters.BuildMode;
 			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
@@ -98,6 +99,7 @@ namespace YooAsset.Editor
 					throw new Exception("构建结果验证没有通过，请参考警告日志！");
 				}
 			}
+			*/
 
 			BuildRunner.Log("构建结果验证成功！");
 		}

Assets/YooAsset/Editor/AssetBundleBuilder/ECopyBuildinFileOption.cs

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

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8d996937ba73c9b4bb942b8ba6f43398
+guid: 4defd475b635cdf4b87108140d3a0ad1
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollector.cs

@@ -132,10 +132,10 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 获取打包收集的资源文件
 		/// </summary>
-		public List<CollectAssetInfo> GetAllCollectAssets(EBuildMode buildMode, bool enableAddressable, AssetBundleCollectorGroup group)
+		public List<CollectAssetInfo> GetAllCollectAssets(CollectCommand command, AssetBundleCollectorGroup group)
 		{
 			// 注意：模拟构建模式下只收集主资源
-			if (buildMode == EBuildMode.SimulateBuild)
+			if (command.BuildMode == EBuildMode.SimulateBuild)
 			{
 				if (CollectorType != ECollectorType.MainAssetCollector)
 					return new List<CollectAssetInfo>();
@@ -162,7 +162,7 @@ namespace YooAsset.Editor
 					{
 						if (result.ContainsKey(assetPath) == false)
 						{
-							var collectAssetInfo = CreateCollectAssetInfo(buildMode, group, assetPath, isRawAsset);
+							var collectAssetInfo = CreateCollectAssetInfo(command, group, assetPath, isRawAsset);
 							result.Add(assetPath, collectAssetInfo);
 						}
 						else
@@ -177,7 +177,7 @@ namespace YooAsset.Editor
 				string assetPath = CollectPath;
 				if (IsValidateAsset(assetPath) && IsCollectAsset(assetPath))
 				{
-					var collectAssetInfo = CreateCollectAssetInfo(buildMode, group, assetPath, isRawAsset);
+					var collectAssetInfo = CreateCollectAssetInfo(command, group, assetPath, isRawAsset);
 					result.Add(assetPath, collectAssetInfo);
 				}
 				else
@@ -187,7 +187,7 @@ namespace YooAsset.Editor
 			}
 
 			// 检测可寻址地址是否重复
-			if (enableAddressable)
+			if (command.EnableAddressable)
 			{
 				HashSet<string> adressTemper = new HashSet<string>();
 				foreach (var collectInfoPair in result)
@@ -207,7 +207,7 @@ namespace YooAsset.Editor
 			return result.Values.ToList();
 		}
 
-		private CollectAssetInfo CreateCollectAssetInfo(EBuildMode buildMode, AssetBundleCollectorGroup group, string assetPath, bool isRawAsset)
+		private CollectAssetInfo CreateCollectAssetInfo(CollectCommand command, AssetBundleCollectorGroup group, string assetPath, bool isRawAsset)
 		{
 			string address = GetAddress(group, assetPath);
 			string bundleName = GetBundleName(group, assetPath);
@@ -215,7 +215,7 @@ namespace YooAsset.Editor
 			CollectAssetInfo collectAssetInfo = new CollectAssetInfo(CollectorType, bundleName, address, assetPath, assetTags, isRawAsset);
 
 			// 注意：模拟构建模式下不需要收集依赖资源
-			if (buildMode == EBuildMode.SimulateBuild)
+			if (command.BuildMode == EBuildMode.SimulateBuild)
 				collectAssetInfo.DependAssets = new List<string>();
 			else
 				collectAssetInfo.DependAssets = GetAllDependencies(assetPath);
@@ -266,7 +266,7 @@ namespace YooAsset.Editor
 		private bool IsCollectAsset(string assetPath)
 		{
 			Type assetType = AssetDatabase.GetMainAssetTypeAtPath(assetPath);
-			if (assetType == typeof(UnityEngine.Shader))
+			if (assetType == typeof(UnityEngine.Shader) || assetType == typeof(UnityEngine.ShaderVariantCollection))
 				return true;
 
 			// 根据规则设置过滤资源文件
@@ -285,10 +285,8 @@ namespace YooAsset.Editor
 		private string GetBundleName(AssetBundleCollectorGroup group, string assetPath)
 		{
 			System.Type assetType = AssetDatabase.GetMainAssetTypeAtPath(assetPath);
-			if (assetType == typeof(UnityEngine.Shader))
+			if (assetType == typeof(UnityEngine.Shader) || assetType == typeof(UnityEngine.ShaderVariantCollection))
-			{
 				return EditorTools.GetRegularPath(YooAssetSettings.UnityShadersBundleName).ToLower();
-			}
 
 			// 根据规则设置获取资源包名称
 			IPackRule packRuleInstance = AssetBundleCollectorSettingData.GetPackRuleInstance(PackRuleName);

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorConfig.cs

@@ -10,11 +10,12 @@ namespace YooAsset.Editor
 {
 	public class AssetBundleCollectorConfig
 	{
-		public const string ConfigVersion = "2.0";
+		public const string ConfigVersion = "2.1";
 
 		public const string XmlVersion = "Version";
 		public const string XmlCommon = "Common";
 		public const string XmlEnableAddressable = "AutoAddressable";
+		public const string XmlUniqueBundleName = "UniqueBundleName";
 		public const string XmlShowPackageView = "ShowPackageView";
 
 		public const string XmlPackage = "Package";
@@ -62,6 +63,7 @@ namespace YooAsset.Editor
 
 			// 读取公共配置
 			bool enableAddressable = false;
+			bool uniqueBundleName = false;
 			bool showPackageView = false;
 			var commonNodeList = root.GetElementsByTagName(XmlCommon);
 			if (commonNodeList.Count > 0)
@@ -69,10 +71,13 @@ namespace YooAsset.Editor
 				XmlElement commonElement = commonNodeList[0] as XmlElement;
 				if (commonElement.HasAttribute(XmlEnableAddressable) == false)
 					throw new Exception($"Not found attribute {XmlEnableAddressable} in {XmlCommon}");
+				if (commonElement.HasAttribute(XmlUniqueBundleName) == false)
+					throw new Exception($"Not found attribute {XmlUniqueBundleName} in {XmlCommon}");
 				if (commonElement.HasAttribute(XmlShowPackageView) == false)
 					throw new Exception($"Not found attribute {XmlShowPackageView} in {XmlCommon}");
 
 				enableAddressable = commonElement.GetAttribute(XmlEnableAddressable) == "True" ? true : false;
+				uniqueBundleName = commonElement.GetAttribute(XmlUniqueBundleName) == "True" ? true : false;
 				showPackageView = commonElement.GetAttribute(XmlShowPackageView) == "True" ? true : false;
 			}
 
@@ -146,6 +151,7 @@ namespace YooAsset.Editor
 			// 保存配置数据
 			AssetBundleCollectorSettingData.ClearAll();
 			AssetBundleCollectorSettingData.Setting.EnableAddressable = enableAddressable;
+			AssetBundleCollectorSettingData.Setting.UniqueBundleName = uniqueBundleName;
 			AssetBundleCollectorSettingData.Setting.ShowPackageView = showPackageView;
 			AssetBundleCollectorSettingData.Setting.Packages.AddRange(packages);
 			AssetBundleCollectorSettingData.SaveFile();
@@ -175,6 +181,7 @@ namespace YooAsset.Editor
 			// 设置公共配置
 			var commonElement = xmlDoc.CreateElement(XmlCommon);
 			commonElement.SetAttribute(XmlEnableAddressable, AssetBundleCollectorSettingData.Setting.EnableAddressable.ToString());
+			commonElement.SetAttribute(XmlUniqueBundleName, AssetBundleCollectorSettingData.Setting.UniqueBundleName.ToString());
 			commonElement.SetAttribute(XmlShowPackageView, AssetBundleCollectorSettingData.Setting.ShowPackageView.ToString());
 			root.AppendChild(commonElement);
 
@@ -269,7 +276,23 @@ namespace YooAsset.Editor
 
 				// 更新版本
 				root.SetAttribute(XmlVersion, "2.0");
+				return UpdateXmlConfig(xmlDoc);
+			}
 
+			// 2.0 -> 2.1
+			if (configVersion == "2.0")
+			{
+				// 添加公共元素属性
+				var commonNodeList = root.GetElementsByTagName(XmlCommon);
+				if (commonNodeList.Count > 0)
+				{
+					XmlElement commonElement = commonNodeList[0] as XmlElement;
+					if (commonElement.HasAttribute(XmlUniqueBundleName) == false)
+						commonElement.SetAttribute(XmlUniqueBundleName, "False");
+				}
+
+				// 更新版本
+				root.SetAttribute(XmlVersion, "2.1");
 				return UpdateXmlConfig(xmlDoc);
 			}
 

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorGroup.cs

@@ -69,7 +69,7 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 获取打包收集的资源文件
 		/// </summary>
-		public List<CollectAssetInfo> GetAllCollectAssets(EBuildMode buildMode, bool enableAddressable)
+		public List<CollectAssetInfo> GetAllCollectAssets(CollectCommand command)
 		{
 			Dictionary<string, CollectAssetInfo> result = new Dictionary<string, CollectAssetInfo>(10000);
 
@@ -83,7 +83,7 @@ namespace YooAsset.Editor
 			// 收集打包资源
 			foreach (var collector in Collectors)
 			{
-				var temper = collector.GetAllCollectAssets(buildMode, enableAddressable, this);
+				var temper = collector.GetAllCollectAssets(command, this);
 				foreach (var assetInfo in temper)
 				{
 					if (result.ContainsKey(assetInfo.AssetPath) == false)
@@ -94,7 +94,7 @@ namespace YooAsset.Editor
 			}
 
 			// 检测可寻址地址是否重复
-			if (enableAddressable)
+			if (command.EnableAddressable)
 			{
 				HashSet<string> adressTemper = new HashSet<string>();
 				foreach (var collectInfoPair in result)

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorPackage.cs

@@ -56,14 +56,14 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 获取打包收集的资源文件
 		/// </summary>
-		public List<CollectAssetInfo> GetAllCollectAssets(EBuildMode buildMode, bool enableAddressable)
+		public List<CollectAssetInfo> GetAllCollectAssets(CollectCommand command)
 		{
 			Dictionary<string, CollectAssetInfo> result = new Dictionary<string, CollectAssetInfo>(10000);
 
 			// 收集打包资源
 			foreach (var group in Groups)
 			{
-				var temper = group.GetAllCollectAssets(buildMode, enableAddressable);
+				var temper = group.GetAllCollectAssets(command);
 				foreach (var assetInfo in temper)
 				{
 					if (result.ContainsKey(assetInfo.AssetPath) == false)
@@ -74,7 +74,7 @@ namespace YooAsset.Editor
 			}
 
 			// 检测可寻址地址是否重复
-			if (enableAddressable)
+			if (command.EnableAddressable)
 			{
 				HashSet<string> adressTemper = new HashSet<string>();
 				foreach (var collectInfoPair in result)

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSetting.cs

@@ -9,7 +9,7 @@ namespace YooAsset.Editor
 	public class AssetBundleCollectorSetting : ScriptableObject
 	{
 		/// <summary>
-		/// 是否显示包裹视图
+		/// 是否显示包裹列表视图
 		/// </summary>
 		public bool ShowPackageView = false;
 
@@ -18,6 +18,11 @@ namespace YooAsset.Editor
 		/// </summary>
 		public bool EnableAddressable = false;
 
+		/// <summary>
+		/// 资源包名唯一化
+		/// </summary>
+		public bool UniqueBundleName = false;
+
 		/// <summary>
 		/// 包裹列表
 		/// </summary>
@@ -76,37 +81,43 @@ namespace YooAsset.Editor
 			Debug.LogWarning($"Not found package : {packageName}");
 			return new List<string>();
 		}
-		
+
 		/// <summary>
 		/// 获取包裹收集的资源文件
 		/// </summary>
-		public List<CollectAssetInfo> GetPackageAssets(EBuildMode buildMode, string packageName)
+		public CollectResult GetPackageAssets(EBuildMode buildMode, string packageName)
 		{
 			if (string.IsNullOrEmpty(packageName))
-				throw new Exception("Build Package name is null or mepty !");
+				throw new Exception("Build package name is null or mepty !");
 
 			foreach (var package in Packages)
 			{
 				if (package.PackageName == packageName)
 				{
-					return package.GetAllCollectAssets(buildMode, EnableAddressable);
+					CollectCommand command = new CollectCommand(buildMode, EnableAddressable);
+					CollectResult collectResult = new CollectResult(package.PackageName, EnableAddressable, UniqueBundleName);
+					collectResult.SetCollectAssets(package.GetAllCollectAssets(command));
+					return collectResult;
 				}
 			}
+
 			throw new Exception($"Not found collector pacakge : {packageName}");
 		}
 
 		/// <summary>
 		/// 获取所有包裹收集的资源文件
 		/// </summary>
-		public List<CollectAssetInfo> GetAllPackageAssets(EBuildMode buildMode)
+		public List<CollectResult> GetAllPackageAssets(EBuildMode buildMode)
 		{
-			List<CollectAssetInfo> result = new List<CollectAssetInfo>(1000);
+			List<CollectResult> collectResultList = new List<CollectResult>(1000);
 			foreach (var package in Packages)
 			{
-				var temper = package.GetAllCollectAssets(buildMode, EnableAddressable);
+				CollectCommand command = new CollectCommand(buildMode, EnableAddressable);
-				result.AddRange(temper);
+				CollectResult collectResult = new CollectResult(package.PackageName, EnableAddressable, UniqueBundleName);
+				collectResult.SetCollectAssets(package.GetAllCollectAssets(command));
+				collectResultList.Add(collectResult);
 			}
-			return result;
+			return collectResultList;
 		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSettingData.cs

@@ -347,14 +347,20 @@ namespace YooAsset.Editor
 			Setting.EnableAddressable = enableAddressable;
 			IsDirty = true;
 		}
+		public static void ModifyUniqueBundleName(bool uniqueBundleName)
+		{
+			Setting.UniqueBundleName = uniqueBundleName;
+			IsDirty = true;
+		}
 
 		// 资源包裹编辑相关
-		public static void CreatePackage(string packageName)
+		public static AssetBundleCollectorPackage CreatePackage(string packageName)
 		{
 			AssetBundleCollectorPackage package = new AssetBundleCollectorPackage();
 			package.PackageName = packageName;
 			Setting.Packages.Add(package);
 			IsDirty = true;
+			return package;
 		}
 		public static void RemovePackage(AssetBundleCollectorPackage package)
 		{
@@ -376,12 +382,13 @@ namespace YooAsset.Editor
 		}
 
 		// 资源分组编辑相关
-		public static void CreateGroup(AssetBundleCollectorPackage package, string groupName)
+		public static AssetBundleCollectorGroup CreateGroup(AssetBundleCollectorPackage package, string groupName)
 		{
 			AssetBundleCollectorGroup group = new AssetBundleCollectorGroup();
 			group.GroupName = groupName;
 			package.Groups.Add(group);
 			IsDirty = true;
+			return group;
 		}
 		public static void RemoveGroup(AssetBundleCollectorPackage package, AssetBundleCollectorGroup group)
 		{

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs

@@ -27,6 +27,7 @@ namespace YooAsset.Editor
 		
 		private Toggle _showPackageToogle;
 		private Toggle _enableAddressableToogle;
+		private Toggle _uniqueBundleNameToogle;
 
 		private VisualElement _packageContainer;
 		private ListView _packageListView;
@@ -87,6 +88,12 @@ namespace YooAsset.Editor
 					AssetBundleCollectorSettingData.ModifyAddressable(evt.newValue);
 					RefreshWindow();
 				});
+				_uniqueBundleNameToogle = root.Q<Toggle>("UniqueBundleName");
+				_uniqueBundleNameToogle.RegisterValueChangedCallback(evt =>
+				{
+					AssetBundleCollectorSettingData.ModifyUniqueBundleName(evt.newValue);
+					RefreshWindow();
+				});
 
 				// 配置修复按钮
 				var fixBtn = root.Q<Button>("FixButton");
@@ -289,6 +296,7 @@ namespace YooAsset.Editor
 		private void FixBtn_clicked()
 		{
 			AssetBundleCollectorSettingData.FixFile();
+			RefreshWindow();
 		}
 		private void ExportBtn_clicked()
 		{
@@ -733,8 +741,8 @@ namespace YooAsset.Editor
 
 				try
 				{
-					bool enableAdressable = AssetBundleCollectorSettingData.Setting.EnableAddressable;
+					CollectCommand command = new CollectCommand(EBuildMode.DryRunBuild, _enableAddressableToogle.value);
-					collectAssetInfos = collector.GetAllCollectAssets(EBuildMode.DryRunBuild, enableAdressable, group);
+					collectAssetInfos = collector.GetAllCollectAssets(command, group);
 				}
 				catch (System.Exception e)
 				{

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.uxml

@@ -8,6 +8,7 @@
     <ui:VisualElement name="PublicContainer" style="height: 30px; background-color: rgb(67, 67, 67); flex-direction: row; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">
         <ui:Toggle label="Show Packages" name="ShowPackages" style="width: 196px; -unity-text-align: middle-left;" />
         <ui:Toggle label="Enable Addressable" name="EnableAddressable" style="width: 196px; -unity-text-align: middle-left;" />
+        <ui:Toggle label="Unique Bundle Name" name="UniqueBundleName" style="width: 196px; -unity-text-align: middle-left;" />
     </ui:VisualElement>
     <ui:VisualElement name="ContentContainer" style="flex-grow: 1; flex-direction: row;">
         <ui:VisualElement name="PackageContainer" style="width: 200px; flex-grow: 0; background-color: rgb(67, 67, 67); border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">

Assets/YooAsset/Editor/AssetBundleCollector/CollectAssetInfo.cs

@@ -50,5 +50,13 @@ namespace YooAsset.Editor
 			AssetTags = assetTags;
 			IsRawAsset = isRawAsset;
 		}
+
+		/// <summary>
+		/// 资源包名称追加包裹名
+		/// </summary>
+		public void BundleNameAppendPackageName(string packageName)
+		{
+			BundleName = $"{packageName.ToLower()}_{BundleName}";
+		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleCollector/CollectCommand.cs

@@ -0,0 +1,22 @@
+
+namespace YooAsset.Editor
+{
+	public class CollectCommand
+	{
+		/// <summary>
+		/// 构建模式
+		/// </summary>
+		public EBuildMode BuildMode { private set; get; }
+
+		/// <summary>
+		/// 是否启用可寻址资源定位
+		/// </summary>
+		public bool EnableAddressable { private set; get; }
+
+		public CollectCommand(EBuildMode buildMode, bool enableAddressable)
+		{
+			BuildMode = buildMode;
+			EnableAddressable = enableAddressable;
+		}
+	}
+}

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a8d6592eded144142afcf85c79cf1ce4
+guid: b1741e85d76b28d41a4da3cd0e3e6f20
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/YooAsset/Editor/AssetBundleCollector/CollectResult.cs

@@ -0,0 +1,49 @@
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset.Editor
+{
+	public class CollectResult
+	{
+		/// <summary>
+		/// 包裹名称
+		/// </summary>
+		public string PackageName { private set; get; }
+
+		/// <summary>
+		/// 是否启用可寻址资源定位
+		/// </summary>
+		public bool EnableAddressable { private set; get; }
+
+		/// <summary>
+		/// 资源包名唯一化
+		/// </summary>
+		public bool UniqueBundleName { private set; get; }
+
+		/// <summary>
+		/// 收集的资源信息列表
+		/// </summary>
+		public List<CollectAssetInfo> CollectAssets { private set; get; }
+
+
+		public CollectResult(string packageName, bool enableAddressable, bool uniqueBundleName)
+		{
+			PackageName = packageName;
+			EnableAddressable = enableAddressable;
+			UniqueBundleName = uniqueBundleName;
+		}
+
+		public void SetCollectAssets(List<CollectAssetInfo> collectAssets)
+		{
+			CollectAssets = collectAssets;
+
+			if (UniqueBundleName)
+			{
+				foreach (var collectAsset in CollectAssets)
+				{
+					collectAsset.BundleNameAppendPackageName(PackageName);
+				}
+			}
+		}
+	}
+}

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

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

Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebuggerWindow.cs

@@ -73,6 +73,10 @@ namespace YooAsset.Editor
 				var sampleBtn = root.Q<Button>("SampleButton");
 				sampleBtn.clicked += SampleBtn_onClick;
 
+				// 导出按钮
+				var exportBtn = root.Q<Button>("ExportButton");
+				exportBtn.clicked += ExportBtn_clicked;
+
 				// 用户列表菜单
 				_playerName = root.Q<Label>("PlayerName");
 				_playerName.text = "Editor player";
@@ -251,6 +255,32 @@ namespace YooAsset.Editor
 			EditorConnection.instance.Send(RemoteDebuggerDefine.kMsgSendEditorToPlayer, data);
 			RemoteDebuggerInRuntime.EditorRequestDebugReport();
 		}
+		private void ExportBtn_clicked()
+		{
+			if (_currentReport == null)
+			{
+				Debug.LogWarning("Debug report is null.");
+				return;
+			}
+
+			string resultPath = EditorTools.OpenFolderPanel("Export JSON", "Assets/");
+			if (resultPath != null)
+			{
+				// 注意：排序保证生成配置的稳定性
+				foreach (var packageData in _currentReport.PackageDatas)
+				{
+					packageData.ProviderInfos.Sort();
+					foreach (var providerInfo in packageData.ProviderInfos)
+					{
+						providerInfo.DependBundleInfos.Sort();
+					}
+				}
+
+				string filePath = $"{resultPath}/{nameof(DebugReport)}_{_currentReport.FrameCount}.json";
+				string fileContent = JsonUtility.ToJson(_currentReport, true);
+				FileUtility.CreateFile(filePath, fileContent);
+			}
+		}
 		private void OnSearchKeyWordChange(ChangeEvent<string> e)
 		{
 			_searchKeyWord = e.newValue;

Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebuggerWindow.uxml

@@ -4,6 +4,7 @@
         <uie:ToolbarMenu display-tooltip-when-elided="true" name="ViewModeMenu" text="ViewMode" style="width: 100px; flex-grow: 0;" />
         <uie:ToolbarSearchField focusable="true" name="SearchField" style="flex-grow: 1;" />
         <uie:ToolbarButton text="刷新" display-tooltip-when-elided="true" name="SampleButton" style="width: 70px; background-color: rgb(15, 118, 31); -unity-text-align: middle-center; border-top-left-radius: 2px; border-bottom-left-radius: 2px; border-top-right-radius: 2px; border-bottom-right-radius: 2px; border-left-width: 1px; border-right-width: 1px;" />
+        <uie:ToolbarButton text="导出" display-tooltip-when-elided="true" name="ExportButton" style="width: 70px; background-color: rgb(15, 118, 31); -unity-text-align: middle-center; border-top-left-radius: 2px; border-bottom-left-radius: 2px; border-top-right-radius: 2px; border-bottom-right-radius: 2px; border-left-width: 1px; border-right-width: 1px;" />
     </uie:Toolbar>
     <uie:Toolbar name="FrameToolbar">
         <ui:SliderInt picking-mode="Ignore" label="Frame:" value="42" high-value="100" name="FrameSlider" style="flex-grow: 1;" />

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

@@ -27,7 +27,7 @@ namespace YooAsset.Editor
 			_visualAsset = EditorHelper.LoadWindowUXML<DebuggerAssetListViewer>();
 			if (_visualAsset == null)
 				return;
-			
+
 			_root = _visualAsset.CloneTree();
 			_root.style.flexGrow = 1f;
 
@@ -72,15 +72,24 @@ namespace YooAsset.Editor
 		}
 		private List<DebugProviderInfo> FilterViewItems(DebugReport debugReport, string searchKeyWord)
 		{
-			var result = new List<DebugProviderInfo>(debugReport.ProviderInfos.Count);
+			List<DebugProviderInfo> result = new List<DebugProviderInfo>(1000);
-			foreach (var providerInfo in debugReport.ProviderInfos)
+			foreach (var packageData in debugReport.PackageDatas)
 			{
-				if (string.IsNullOrEmpty(searchKeyWord) == false)
+				var tempList = new List<DebugProviderInfo>(packageData.ProviderInfos.Count);
+				foreach (var providerInfo in packageData.ProviderInfos)
 				{
-					if (providerInfo.AssetPath.Contains(searchKeyWord) == false)
+					if (string.IsNullOrEmpty(searchKeyWord) == false)
-						continue;
+					{
+						if (providerInfo.AssetPath.Contains(searchKeyWord) == false)
+							continue;
+					}
+
+					providerInfo.PackageName = packageData.PackageName;
+					tempList.Add(providerInfo);
 				}
-				result.Add(providerInfo);
+
+				tempList.Sort();
+				result.AddRange(tempList);
 			}
 			return result;
 		}
@@ -102,12 +111,22 @@ namespace YooAsset.Editor
 		}
 
 
-		// 资源列表相关
+		// 顶部列表相关
 		private VisualElement MakeAssetListViewItem()
 		{
 			VisualElement element = new VisualElement();
 			element.style.flexDirection = FlexDirection.Row;
 
+			{
+				var label = new Label();
+				label.name = "Label0";
+				label.style.unityTextAlign = TextAnchor.MiddleLeft;
+				label.style.marginLeft = 3f;
+				//label.style.flexGrow = 1f;
+				label.style.width = 150;
+				element.Add(label);
+			}
+
 			{
 				var label = new Label();
 				label.name = "Label1";
@@ -144,7 +163,7 @@ namespace YooAsset.Editor
 				label.style.unityTextAlign = TextAnchor.MiddleLeft;
 				label.style.marginLeft = 3f;
 				//label.style.flexGrow = 1f;
-				label.style.width = 100;
+				label.style.width = 150;
 				element.Add(label);
 			}
 
@@ -154,6 +173,16 @@ namespace YooAsset.Editor
 				label.style.unityTextAlign = TextAnchor.MiddleLeft;
 				label.style.marginLeft = 3f;
 				//label.style.flexGrow = 1f;
+				label.style.width = 100;
+				element.Add(label);
+			}
+
+			{
+				var label = new Label();
+				label.name = "Label6";
+				label.style.unityTextAlign = TextAnchor.MiddleLeft;
+				label.style.marginLeft = 3f;
+				//label.style.flexGrow = 1f;
 				label.style.width = 120;
 				element.Add(label);
 			}
@@ -165,6 +194,10 @@ namespace YooAsset.Editor
 			var sourceData = _assetListView.itemsSource as List<DebugProviderInfo>;
 			var providerInfo = sourceData[index];
 
+			// Package Name
+			var label0 = element.Q<Label>("Label0");
+			label0.text = providerInfo.PackageName;
+
 			// Asset Path
 			var label1 = element.Q<Label>("Label1");
 			label1.text = providerInfo.AssetPath;
@@ -177,9 +210,13 @@ namespace YooAsset.Editor
 			var label3 = element.Q<Label>("Label3");
 			label3.text = providerInfo.SpawnTime;
 
-			// Ref Count
+			// Loading Time
 			var label4 = element.Q<Label>("Label4");
-			label4.text = providerInfo.RefCount.ToString();
+			label4.text = providerInfo.LoadingTime.ToString();
+
+			// Ref Count
+			var label5 = element.Q<Label>("Label5");
+			label5.text = providerInfo.RefCount.ToString();
 
 			// Status
 			StyleColor textColor;
@@ -187,9 +224,9 @@ namespace YooAsset.Editor
 				textColor = new StyleColor(Color.yellow);
 			else
 				textColor = label1.style.color;
-			var label5 = element.Q<Label>("Label5");
+			var label6 = element.Q<Label>("Label6");
-			label5.text = providerInfo.Status.ToString();
+			label6.text = providerInfo.Status.ToString();
-			label5.style.color = textColor;
+			label6.style.color = textColor;
 		}
 		private void AssetListView_onSelectionChange(IEnumerable<object> objs)
 		{
@@ -200,7 +237,7 @@ namespace YooAsset.Editor
 			}
 		}
 
-		// 依赖列表相关
+		// 底部列表相关
 		private VisualElement MakeDependListViewItem()
 		{
 			VisualElement element = new VisualElement();
@@ -255,11 +292,11 @@ namespace YooAsset.Editor
 			var label4 = element.Q<Label>("Label4");
 			label4.text = bundleInfo.Status.ToString();
 		}
-		private void FillDependListView(DebugProviderInfo providerInfo)
+		private void FillDependListView(DebugProviderInfo selectedProviderInfo)
 		{
 			_dependListView.Clear();
 			_dependListView.ClearSelection();
-			_dependListView.itemsSource = providerInfo.DependBundleInfos;
+			_dependListView.itemsSource = selectedProviderInfo.DependBundleInfos;
 			_dependListView.Rebuild();
 		}
 	}

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

@@ -1,11 +1,13 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
     <ui:VisualElement name="TopGroup" style="flex-grow: 1; border-left-width: 1px; border-right-width: 1px; border-top-width: 1px; border-bottom-width: 1px; border-left-color: rgb(0, 0, 0); border-right-color: rgb(0, 0, 0); border-top-color: rgb(0, 0, 0); border-bottom-color: rgb(0, 0, 0); margin-left: 0; margin-right: 0; margin-top: 2px; margin-bottom: 1px; display: flex;">
         <uie:Toolbar name="TopBar" style="height: 25px; margin-left: 1px; margin-right: 1px;">
+            <uie:ToolbarButton text="Package Name" display-tooltip-when-elided="true" name="TopBar0" style="width: 150px; -unity-text-align: middle-left; flex-grow: 0;" />
             <uie:ToolbarButton text="Asset Path" display-tooltip-when-elided="true" name="TopBar1" style="width: 280px; -unity-text-align: middle-left; flex-grow: 1;" />
             <uie:ToolbarButton text="Spawn Scene" display-tooltip-when-elided="true" name="TopBar2" style="width: 150px; -unity-text-align: middle-left; flex-grow: 0;" />
             <uie:ToolbarButton text="Spawn Time" display-tooltip-when-elided="true" name="TopBar3" style="width: 150px; -unity-text-align: middle-left; flex-grow: 0;" />
-            <uie:ToolbarButton text="Ref Count" display-tooltip-when-elided="true" name="TopBar4" style="width: 100px; -unity-text-align: middle-left; flex-grow: 0;" />
+            <uie:ToolbarButton text="Loading Time (ms)" display-tooltip-when-elided="true" name="TopBar4" style="width: 150px; -unity-text-align: middle-left; flex-grow: 0;" />
-            <uie:ToolbarButton text="Status" display-tooltip-when-elided="true" name="TopBar5" style="width: 120px; -unity-text-align: middle-left;" />
+            <uie:ToolbarButton text="Ref Count" display-tooltip-when-elided="true" name="TopBar5" style="width: 100px; -unity-text-align: middle-left; flex-grow: 0;" />
+            <uie:ToolbarButton text="Status" display-tooltip-when-elided="true" name="TopBar6" style="width: 120px; -unity-text-align: middle-left;" />
         </uie:Toolbar>
         <ui:ListView focusable="true" name="TopListView" item-height="18" virtualization-method="DynamicHeight" style="flex-grow: 1;" />
     </ui:VisualElement>

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

@@ -27,14 +27,14 @@ namespace YooAsset.Editor
 			_visualAsset = EditorHelper.LoadWindowUXML<DebuggerBundleListViewer>();
 			if (_visualAsset == null)
 				return;
-			
+
 			_root = _visualAsset.CloneTree();
 			_root.style.flexGrow = 1f;
 
 			// 资源包列表
 			_bundleListView = _root.Q<ListView>("TopListView");
-			_bundleListView.makeItem = MakeAssetListViewItem;
+			_bundleListView.makeItem = MakeBundleListViewItem;
-			_bundleListView.bindItem = BindAssetListViewItem;
+			_bundleListView.bindItem = BindBundleListViewItem;
 #if UNITY_2020_1_OR_NEWER
 			_bundleListView.onSelectionChange += BundleListView_onSelectionChange;
 #else
@@ -46,7 +46,7 @@ namespace YooAsset.Editor
 			_usingListView.makeItem = MakeIncludeListViewItem;
 			_usingListView.bindItem = BindIncludeListViewItem;
 		}
-		
+
 		/// <summary>
 		/// 清空页面
 		/// </summary>
@@ -72,21 +72,33 @@ namespace YooAsset.Editor
 		}
 		private List<DebugBundleInfo> FilterViewItems(DebugReport debugReport, string searchKeyWord)
 		{
-			Dictionary<string, DebugBundleInfo> result = new Dictionary<string, DebugBundleInfo>(debugReport.ProviderInfos.Count);
+			List<DebugBundleInfo> result = new List<DebugBundleInfo>(1000);
-			foreach (var providerInfo in debugReport.ProviderInfos)
+			foreach (var pakcageData in debugReport.PackageDatas)
 			{
-				foreach (var bundleInfo in providerInfo.DependBundleInfos)
+				Dictionary<string, DebugBundleInfo> tempDic = new Dictionary<string, DebugBundleInfo>(1000);
+				foreach (var providerInfo in pakcageData.ProviderInfos)
 				{
-					if (string.IsNullOrEmpty(searchKeyWord) == false)
+					foreach (var bundleInfo in providerInfo.DependBundleInfos)
 					{
-						if (bundleInfo.BundleName.Contains(searchKeyWord) == false)
+						if (string.IsNullOrEmpty(searchKeyWord) == false)
-							continue;
+						{
+							if (bundleInfo.BundleName.Contains(searchKeyWord) == false)
+								continue;
+						}
+
+						if (tempDic.ContainsKey(bundleInfo.BundleName) == false)
+						{
+							bundleInfo.PackageName = pakcageData.PackageName;
+							tempDic.Add(bundleInfo.BundleName, bundleInfo);
+						}
 					}
-					if (result.ContainsKey(bundleInfo.BundleName) == false)
-						result.Add(bundleInfo.BundleName, bundleInfo);
 				}
+
+				var tempList = tempDic.Values.ToList();
+				tempList.Sort();
+				result.AddRange(tempList);
 			}
-			return result.Values.ToList();
+			return result;
 		}
 
 		/// <summary>
@@ -107,11 +119,21 @@ namespace YooAsset.Editor
 
 
 		// 顶部列表相关
-		private VisualElement MakeAssetListViewItem()
+		private VisualElement MakeBundleListViewItem()
 		{
 			VisualElement element = new VisualElement();
 			element.style.flexDirection = FlexDirection.Row;
 
+			{
+				var label = new Label();
+				label.name = "Label0";
+				label.style.unityTextAlign = TextAnchor.MiddleLeft;
+				label.style.marginLeft = 3f;
+				//label.style.flexGrow = 1f;
+				label.style.width = 150;
+				element.Add(label);
+			}
+
 			{
 				var label = new Label();
 				label.name = "Label1";
@@ -144,11 +166,15 @@ namespace YooAsset.Editor
 
 			return element;
 		}
-		private void BindAssetListViewItem(VisualElement element, int index)
+		private void BindBundleListViewItem(VisualElement element, int index)
 		{
 			var sourceData = _bundleListView.itemsSource as List<DebugBundleInfo>;
 			var bundleInfo = sourceData[index];
 
+			// Package Name
+			var label0 = element.Q<Label>("Label0");
+			label0.text = bundleInfo.PackageName;
+
 			// Bundle Name
 			var label1 = element.Q<Label>("Label1");
 			label1.text = bundleInfo.BundleName;
@@ -172,7 +198,7 @@ namespace YooAsset.Editor
 			foreach (var item in objs)
 			{
 				DebugBundleInfo bundleInfo = item as DebugBundleInfo;
-				FillUsingListView(bundleInfo.BundleName);
+				FillUsingListView(bundleInfo);
 			}
 		}
 
@@ -259,17 +285,23 @@ namespace YooAsset.Editor
 			var label5 = element.Q<Label>("Label5");
 			label5.text = providerInfo.Status.ToString();
 		}
-		private void FillUsingListView(string bundleName)
+		private void FillUsingListView(DebugBundleInfo selectedBundleInfo)
-		{	
+		{
 			List<DebugProviderInfo> source = new List<DebugProviderInfo>();
-			foreach (var providerInfo in _debugReport.ProviderInfos)
+			foreach (var packageData in _debugReport.PackageDatas)
 			{
-				foreach (var bundleInfo in providerInfo.DependBundleInfos)
+				if (packageData.PackageName == selectedBundleInfo.PackageName)
 				{
-					if (bundleInfo.BundleName == bundleName)
+					foreach (var providerInfo in packageData.ProviderInfos)
 					{
-						source.Add(providerInfo);
+						foreach (var bundleInfo in providerInfo.DependBundleInfos)
-						continue;
+						{
+							if (bundleInfo.BundleName == selectedBundleInfo.BundleName)
+							{
+								source.Add(providerInfo);
+								continue;
+							}
+						}
 					}
 				}
 			}

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

@@ -1,6 +1,7 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
     <ui:VisualElement name="TopGroup" style="flex-grow: 1; border-left-width: 1px; border-right-width: 1px; border-top-width: 1px; border-bottom-width: 1px; border-left-color: rgb(0, 0, 0); border-right-color: rgb(0, 0, 0); border-top-color: rgb(0, 0, 0); border-bottom-color: rgb(0, 0, 0); margin-left: 0; margin-right: 0; margin-top: 2px; margin-bottom: 1px; display: flex;">
         <uie:Toolbar name="TopBar" style="height: 25px; margin-left: 1px; margin-right: 1px;">
+            <uie:ToolbarButton text="Package Name" display-tooltip-when-elided="true" name="TopBar0" style="width: 150px; -unity-text-align: middle-left; flex-grow: 0;" />
             <uie:ToolbarButton text="Bundle Name" display-tooltip-when-elided="true" name="TopBar1" style="width: 280px; -unity-text-align: middle-left; flex-grow: 1;" />
             <uie:ToolbarButton text="Ref Count" display-tooltip-when-elided="true" name="TopBar3" style="width: 100px; -unity-text-align: middle-left;" />
             <uie:ToolbarButton text="Status" display-tooltip-when-elided="true" name="TopBar4" style="width: 120px; -unity-text-align: middle-left;" />

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

@@ -40,7 +40,7 @@ namespace YooAsset.Editor
 			_visualAsset = EditorHelper.LoadWindowUXML<ReporterSummaryViewer>();
 			if (_visualAsset == null)
 				return;
-			
+
 			_root = _visualAsset.CloneTree();
 			_root.style.flexGrow = 1f;
 
@@ -56,7 +56,7 @@ namespace YooAsset.Editor
 		public void FillViewData(BuildReport buildReport)
 		{
 			_buildReport = buildReport;
-			
+
 			_items.Clear();
 
 			_items.Add(new ItemWrapper("YooAsset版本", buildReport.Summary.YooVersion));
@@ -66,9 +66,11 @@ namespace YooAsset.Editor
 			_items.Add(new ItemWrapper("构建平台", $"{buildReport.Summary.BuildTarget}"));
 			_items.Add(new ItemWrapper("构建管线", $"{buildReport.Summary.BuildPipeline}"));
 			_items.Add(new ItemWrapper("构建模式", $"{buildReport.Summary.BuildMode}"));
-			_items.Add(new ItemWrapper("构建包裹", $"{buildReport.Summary.BuildPackage}"));
+			_items.Add(new ItemWrapper("包裹名称", buildReport.Summary.BuildPackageName));
+			_items.Add(new ItemWrapper("包裹版本", buildReport.Summary.BuildPackageVersion));
 
 			_items.Add(new ItemWrapper("启用可寻址资源定位", $"{buildReport.Summary.EnableAddressable}"));
+			_items.Add(new ItemWrapper("资源包名唯一化", $"{buildReport.Summary.UniqueBundleName}"));
 			_items.Add(new ItemWrapper("加密服务类名称", $"{buildReport.Summary.EncryptionServicesClassName}"));
 
 			_items.Add(new ItemWrapper(string.Empty, string.Empty));

Assets/YooAsset/Editor/ShaderVariantCollector/ShaderVariantCollector.cs

@@ -52,7 +52,7 @@ namespace YooAsset.Editor
 				throw new System.Exception("Shader variant file extension is invalid.");
 
 			// 注意：先删除再保存，否则ShaderVariantCollection内容将无法及时刷新
-			AssetDatabase.DeleteAsset(ShaderVariantCollectorSettingData.Setting.SavePath);		
+			AssetDatabase.DeleteAsset(ShaderVariantCollectorSettingData.Setting.SavePath);
 			EditorTools.CreateFileDirectory(saveFilePath);
 			_saveFilePath = saveFilePath;
 			_completedCallback = completedCallback;
@@ -87,9 +87,14 @@ namespace YooAsset.Editor
 			List<string> allAssets = new List<string>(1000);
 
 			// 获取所有打包的资源
-			List<CollectAssetInfo> allCollectInfos = AssetBundleCollectorSettingData.Setting.GetAllPackageAssets(EBuildMode.DryRunBuild);
+			List<CollectAssetInfo> allCollectAssetInfos = new List<CollectAssetInfo>();
-			List<string> collectAssets = allCollectInfos.Select(t => t.AssetPath).ToList();
+			List<CollectResult> collectResults = AssetBundleCollectorSettingData.Setting.GetAllPackageAssets(EBuildMode.DryRunBuild);
-			foreach (var assetPath in collectAssets)
+			foreach (var collectResult in collectResults)
+			{
+				allCollectAssetInfos.AddRange(collectResult.CollectAssets);
+			}
+			List<string> allAssetPath = allCollectAssetInfos.Select(t => t.AssetPath).ToList();
+			foreach (var assetPath in allAssetPath)
 			{
 				string[] depends = AssetDatabase.GetDependencies(assetPath, true);
 				foreach (var depend in depends)
@@ -97,7 +102,7 @@ namespace YooAsset.Editor
 					if (allAssets.Contains(depend) == false)
 						allAssets.Add(depend);
 				}
-				EditorTools.DisplayProgressBar("获取所有打包资源", ++progressValue, collectAssets.Count);
+				EditorTools.DisplayProgressBar("获取所有打包资源", ++progressValue, allAssetPath.Count);
 			}
 			EditorTools.ClearProgressBar();
 

Assets/YooAsset/Runtime/AssetSystem/AssetSystem.cs

@@ -131,6 +131,8 @@ namespace YooAsset
 			}
 			_loaders.Clear();
 
+			_sceneHandles.Clear();
+
 			// 注意：调用底层接口释放所有资源
 			Resources.UnloadUnusedAssets();
 		}
@@ -142,6 +144,7 @@ namespace YooAsset
 		{
 			if (assetInfo.IsInvalid)
 			{
+				YooLogger.Error($"Failed to load scene. {assetInfo.Error}");
 				CompletedProvider completedProvider = new CompletedProvider(assetInfo);
 				completedProvider.SetCompleted(assetInfo.Error);
 				return completedProvider.CreateHandle<SceneOperationHandle>();
@@ -190,6 +193,7 @@ namespace YooAsset
 		{
 			if (assetInfo.IsInvalid)
 			{
+				YooLogger.Error($"Failed to load asset. {assetInfo.Error}");
 				CompletedProvider completedProvider = new CompletedProvider(assetInfo);
 				completedProvider.SetCompleted(assetInfo.Error);
 				return completedProvider.CreateHandle<AssetOperationHandle>();
@@ -216,6 +220,7 @@ namespace YooAsset
 		{
 			if (assetInfo.IsInvalid)
 			{
+				YooLogger.Error($"Failed to load sub assets. {assetInfo.Error}");
 				CompletedProvider completedProvider = new CompletedProvider(assetInfo);
 				completedProvider.SetCompleted(assetInfo.Error);
 				return completedProvider.CreateHandle<SubAssetsOperationHandle>();
@@ -338,10 +343,10 @@ namespace YooAsset
 			foreach (var provider in _providers)
 			{
 				DebugProviderInfo providerInfo = new DebugProviderInfo();
-				providerInfo.PackageName = BundleServices.GetPackageName();
 				providerInfo.AssetPath = provider.MainAssetInfo.AssetPath;
 				providerInfo.SpawnScene = provider.SpawnScene;
 				providerInfo.SpawnTime = provider.SpawnTime;
+				providerInfo.LoadingTime = provider.LoadingTime;
 				providerInfo.RefCount = provider.RefCount;
 				providerInfo.Status = (int)provider.Status;
 				providerInfo.DependBundleInfos = new List<DebugBundleInfo>();

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

@@ -87,7 +87,7 @@ namespace YooAsset
 		/// <returns></returns>
 		public GameObject InstantiateSync(Transform parent = null)
 		{
-			return InstantiateSyncInternal(Vector3.zero, Quaternion.identity, parent, false);
+			return InstantiateSyncInternal(Vector3.zero, Quaternion.identity, parent);
 		}
 
 		/// <summary>
@@ -98,7 +98,7 @@ namespace YooAsset
 		/// <param name="parent">父类对象</param>
 		public GameObject InstantiateSync(Vector3 position, Quaternion rotation, Transform parent = null)
 		{
-			return InstantiateSyncInternal(position, rotation, parent, true);
+			return InstantiateSyncInternal(position, rotation, parent);
 		}
 
 		/// <summary>
@@ -107,7 +107,7 @@ namespace YooAsset
 		/// <param name="parent">父类对象</param>
 		public InstantiateOperation InstantiateAsync(Transform parent = null)
 		{
-			return InstantiateAsyncInternal(Vector3.zero, Quaternion.identity, parent, false);
+			return InstantiateAsyncInternal(Vector3.zero, Quaternion.identity, parent);
 		}
 
 		/// <summary>
@@ -118,37 +118,23 @@ namespace YooAsset
 		/// <param name="parent">父类对象</param>
 		public InstantiateOperation InstantiateAsync(Vector3 position, Quaternion rotation, Transform parent = null)
 		{
-			return InstantiateAsyncInternal(position, rotation, parent, true);
+			return InstantiateAsyncInternal(position, rotation, parent);
 		}
 
 
-		private GameObject InstantiateSyncInternal(Vector3 position, Quaternion rotation, Transform parent, bool setPositionRotation)
+		private GameObject InstantiateSyncInternal(Vector3 position, Quaternion rotation, Transform parent)
 		{
 			if (IsValid == false)
 				return null;
 			if (Provider.AssetObject == null)
 				return null;
 
-			GameObject result;
+			GameObject clone = UnityEngine.Object.Instantiate(Provider.AssetObject as GameObject, position, rotation, parent);			
-			if (setPositionRotation)
+			return clone;
-			{
-				if (parent == null)
-					result = UnityEngine.Object.Instantiate(Provider.AssetObject as GameObject, position, rotation);
-				else
-					result = UnityEngine.Object.Instantiate(Provider.AssetObject as GameObject, position, rotation, parent);
-			}
-			else
-			{
-				if (parent == null)
-					result = UnityEngine.Object.Instantiate(Provider.AssetObject as GameObject);
-				else
-					result = UnityEngine.Object.Instantiate(Provider.AssetObject as GameObject, parent);
-			}
-			return result;
 		}
-		private InstantiateOperation InstantiateAsyncInternal(Vector3 position, Quaternion rotation, Transform parent, bool setPositionRotation)
+		private InstantiateOperation InstantiateAsyncInternal(Vector3 position, Quaternion rotation, Transform parent)
 		{
-			InstantiateOperation operation = new InstantiateOperation(this, position, rotation, parent, setPositionRotation);
+			InstantiateOperation operation = new InstantiateOperation(this, position, rotation, parent);
 			OperationSystem.StartOperation(operation);
 			return operation;
 		}

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

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

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

@@ -22,6 +22,8 @@ namespace YooAsset
 		}
 		public override void Update()
 		{
+			DebugRecording();
+
 			if (IsDone)
 				return;
 
@@ -66,6 +68,7 @@ namespace YooAsset
 						throw new System.Exception("Should never get here !");
 					Status = EStatus.Fail;
 					LastError = $"The bundle {OwnerBundle.MainBundleInfo.Bundle.BundleName} has been destroyed by unity bugs !";
+					YooLogger.Error(LastError);
 					InvokeCompletion();
 					return;
 				}

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

@@ -3,12 +3,12 @@ using System.Collections.Generic;
 
 namespace YooAsset
 {
-    internal abstract class BundledProvider : ProviderBase
+	internal abstract class BundledProvider : ProviderBase
-    {
+	{
 		protected AssetBundleLoaderBase OwnerBundle { private set; get; }
 		protected DependAssetBundleGroup DependBundleGroup { private set; get; }
 
-		public BundledProvider(AssetSystemImpl impl, string providerGUID,  AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
+		public BundledProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
 		{
 			OwnerBundle = impl.CreateOwnerAssetBundleLoader(assetInfo);
 			OwnerBundle.Reference();

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

@@ -32,6 +32,8 @@ namespace YooAsset
 		}
 		public override void Update()
 		{
+			DebugRecording();
+
 			if (IsDone)
 				return;
 
@@ -97,7 +99,7 @@ namespace YooAsset
 						SceneManager.SetActiveScene(SceneObject);
 
 					Status = SceneObject.IsValid() ? EStatus.Success : EStatus.Fail;
-					if(Status == EStatus.Fail)
+					if (Status == EStatus.Fail)
 					{
 						LastError = $"The load scene is invalid : {MainAssetInfo.AssetPath}";
 						YooLogger.Error(LastError);

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

@@ -22,6 +22,8 @@ namespace YooAsset
 		}
 		public override void Update()
 		{
+			DebugRecording();
+
 			if (IsDone)
 				return;
 

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

@@ -238,6 +238,15 @@ namespace YooAsset
 		/// </summary>
 		public string SpawnTime = string.Empty;
 
+		/// <summary>
+		/// 加载耗时（单位：毫秒）
+		/// </summary>
+		public long LoadingTime { protected set; get; }
+
+		// 加载耗时统计
+		private bool _isRecording = false;
+		private Stopwatch _watch;
+
 		[Conditional("DEBUG")]
 		public void InitSpawnDebugInfo()
 		{
@@ -251,6 +260,25 @@ namespace YooAsset
 			float s = UnityEngine.Mathf.FloorToInt(spawnTime - m * 60f - h * 3600f);
 			return h.ToString("00") + ":" + m.ToString("00") + ":" + s.ToString("00");
 		}
+
+		[Conditional("DEBUG")]
+		protected void DebugRecording()
+		{
+			if (_isRecording == false)
+			{
+				_isRecording = true;
+				_watch = Stopwatch.StartNew();
+			}
+
+			if (_watch != null)
+			{
+				if (IsDone)
+				{
+					LoadingTime = _watch.ElapsedMilliseconds;
+					_watch = null;
+				}
+			}
+		}
 		#endregion
 	}
 }

Assets/YooAsset/Runtime/AssetsPackage.cs

@@ -6,14 +6,13 @@ using UnityEngine.SceneManagement;
 
 namespace YooAsset
 {
-	public class YooAssetPackage
+	public class AssetsPackage
 	{
 		private bool _isInitialize = false;
 		private string _initializeError = string.Empty;
 		private EOperationStatus _initializeStatus = EOperationStatus.None;
 		private EPlayMode _playMode;
 		private IBundleServices _bundleServices;
-		private ILocationServices _locationServices;
 		private AssetSystemImpl _assetSystemImpl;
 		private EditorSimulateModeImpl _editorSimulateModeImpl;
 		private OfflinePlayModeImpl _offlinePlayModeImpl;
@@ -25,21 +24,18 @@ namespace YooAsset
 		public string PackageName { private set; get; }
 
 		/// <summary>
-		/// 是否已经初始化
+		/// 初始化状态
 		/// </summary>
-		public bool IsInitialized
+		public EOperationStatus InitializeStatus
 		{
-			get { return _isInitialize; }
+			get { return _initializeStatus; }
 		}
 
 
-		/// <summary>
+		private AssetsPackage()
-		/// 拒绝外部实例化
-		/// </summary>
-		internal YooAssetPackage()
 		{
 		}
-		internal YooAssetPackage(string packageName)
+		internal AssetsPackage(string packageName)
 		{
 			PackageName = packageName;
 		}
@@ -65,7 +61,6 @@ namespace YooAsset
 				_initializeStatus = EOperationStatus.None;
 
 				_bundleServices = null;
-				_locationServices = null;
 				_editorSimulateModeImpl = null;
 				_offlinePlayModeImpl = null;
 				_hostPlayModeImpl = null;
@@ -75,8 +70,6 @@ namespace YooAsset
 					_assetSystemImpl.DestroyAll();
 					_assetSystemImpl = null;
 				}
-
-				YooLogger.Log("YooAssets destroy all !");
 			}
 		}
 
@@ -90,7 +83,6 @@ namespace YooAsset
 
 			// 初始化资源系统
 			InitializationOperation initializeOperation;
-			_locationServices = parameters.LocationServices;
 			_assetSystemImpl = new AssetSystemImpl();
 			if (_playMode == EPlayMode.EditorSimulateMode)
 			{
@@ -122,7 +114,8 @@ namespace YooAsset
 					initializeParameters.LocationToLower,
 					initializeParameters.DefaultHostServer,
 					initializeParameters.FallbackHostServer,
-					initializeParameters.QueryServices);
+					initializeParameters.QueryServices,
+					PackageName);
 			}
 			else
 			{
@@ -130,30 +123,28 @@ namespace YooAsset
 			}
 
 			// 监听初始化结果
+			_isInitialize = true;
 			initializeOperation.Completed += InitializeOperation_Completed;
 			return initializeOperation;
 		}
 		private void CheckInitializeParameters(InitializeParameters parameters)
 		{
 			if (_isInitialize)
-				throw new Exception($"{nameof(YooAssetPackage)} is initialized yet.");
+				throw new Exception($"{nameof(AssetsPackage)} is initialized yet.");
 
 			if (parameters == null)
-				throw new Exception($"{nameof(YooAssetPackage)} create parameters is null.");
+				throw new Exception($"{nameof(AssetsPackage)} create parameters is null.");
 
 #if !UNITY_EDITOR
 			if (parameters is EditorSimulateModeParameters)
 				throw new Exception($"Editor simulate mode only support unity editor.");
 #endif
 
-			if (parameters.LocationServices == null)
+			if (parameters is EditorSimulateModeParameters)
-				throw new Exception($"{nameof(ILocationServices)} is null.");
-
-			if(parameters is EditorSimulateModeParameters)
 			{
 				var editorSimulateModeParameters = parameters as EditorSimulateModeParameters;
 				if (string.IsNullOrEmpty(editorSimulateModeParameters.SimulatePatchManifestPath))
-					throw new Exception($"${editorSimulateModeParameters.SimulatePatchManifestPath} is null or empty.");
+					throw new Exception($"{nameof(editorSimulateModeParameters.SimulatePatchManifestPath)} is null or empty.");
 			}
 
 			if (parameters is HostPlayModeParameters)
@@ -222,9 +213,9 @@ namespace YooAsset
 		/// <summary>
 		/// 向网络端请求并更新补丁清单
 		/// </summary>
-		/// <param name="packageCRC">更新的资源包裹版本</param>
+		/// <param name="packageVersion">更新的包裹版本</param>
 		/// <param name="timeout">超时时间（默认值：60秒）</param>
-		public UpdateManifestOperation UpdateManifestAsync(string packageCRC, int timeout = 60)
+		public UpdateManifestOperation UpdateManifestAsync(string packageVersion, int timeout = 60)
 		{
 			DebugCheckInitialize();
 			DebugCheckUpdateManifest();
@@ -242,7 +233,7 @@ namespace YooAsset
 			}
 			else if (_playMode == EPlayMode.HostPlayMode)
 			{
-				return _hostPlayModeImpl.UpdatePatchManifestAsync(PackageName, packageCRC, timeout);
+				return _hostPlayModeImpl.UpdatePatchManifestAsync(PackageName, packageVersion, timeout);
 			}
 			else
 			{
@@ -254,8 +245,8 @@ namespace YooAsset
 		/// 弱联网情况下加载补丁清单
 		/// 注意：当指定版本内容验证失败后会返回失败。
 		/// </summary>
-		/// <param name="packageCRC">指定的资源包裹版本</param>
+		/// <param name="packageVersion">指定的包裹版本</param>
-		public UpdateManifestOperation WeaklyUpdateManifestAsync(string packageCRC)
+		public UpdateManifestOperation WeaklyUpdateManifestAsync(string packageVersion)
 		{
 			DebugCheckInitialize();
 			if (_playMode == EPlayMode.EditorSimulateMode)
@@ -272,7 +263,31 @@ namespace YooAsset
 			}
 			else if (_playMode == EPlayMode.HostPlayMode)
 			{
-				return _hostPlayModeImpl.WeaklyUpdatePatchManifestAsync(PackageName, packageCRC);
+				return _hostPlayModeImpl.WeaklyUpdatePatchManifestAsync(PackageName, packageVersion);
+			}
+			else
+			{
+				throw new NotImplementedException();
+			}
+		}
+
+		/// <summary>
+		/// 获取包裹的版本信息
+		/// </summary>
+		public string GetPackageVersion()
+		{
+			DebugCheckInitialize();
+			if (_playMode == EPlayMode.EditorSimulateMode)
+			{
+				return _editorSimulateModeImpl.GetPackageVersion();
+			}
+			else if (_playMode == EPlayMode.OfflinePlayMode)
+			{
+				return _offlinePlayModeImpl.GetPackageVersion();
+			}
+			else if (_playMode == EPlayMode.HostPlayMode)
+			{
+				return _hostPlayModeImpl.GetPackageVersion();
 			}
 			else
 			{
@@ -285,11 +300,9 @@ namespace YooAsset
 		/// </summary>
 		public void UnloadUnusedAssets()
 		{
-			if (_isInitialize)
+			DebugCheckInitialize();
-			{
+			_assetSystemImpl.Update();
-				_assetSystemImpl.Update();
+			_assetSystemImpl.UnloadUnusedAssets();
-				_assetSystemImpl.UnloadUnusedAssets();
-			}
 		}
 
 		/// <summary>
@@ -297,10 +310,8 @@ namespace YooAsset
 		/// </summary>
 		public void ForceUnloadAllAssets()
 		{
-			if (_isInitialize)
+			DebugCheckInitialize();
-			{
+			_assetSystemImpl.ForceUnloadAllAssets();
-				_assetSystemImpl.ForceUnloadAllAssets();
-			}
 		}
 
 
@@ -314,7 +325,10 @@ namespace YooAsset
 			DebugCheckInitialize();
 			AssetInfo assetInfo = ConvertLocationToAssetInfo(location, null);
 			if (assetInfo.IsInvalid)
+			{
+				YooLogger.Warning(assetInfo.Error);
 				return false;
+			}
 
 			BundleInfo bundleInfo = _bundleServices.GetBundleInfo(assetInfo);
 			if (bundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromRemote)
@@ -376,14 +390,14 @@ namespace YooAsset
 		}
 
 		/// <summary>
-		/// 获取资源路径
+		/// 检查资源定位地址是否有效
 		/// </summary>
 		/// <param name="location">资源的定位地址</param>
-		/// <returns>如果location地址无效，则返回空字符串</returns>
+		public bool CheckLocationValid(string location)
-		public string GetAssetPath(string location)
 		{
 			DebugCheckInitialize();
-			return _locationServices.ConvertLocationToAssetPath(this, location);
+			string assetPath = _bundleServices.TryMappingToAssetPath(location);
+			return string.IsNullOrEmpty(assetPath) == false;
 		}
 		#endregion
 
@@ -408,8 +422,6 @@ namespace YooAsset
 		public RawFileOperation GetRawFileAsync(AssetInfo assetInfo, string copyPath = null)
 		{
 			DebugCheckInitialize();
-			if (assetInfo.IsInvalid)
-				YooLogger.Warning(assetInfo.Error);
 			return GetRawFileInternal(assetInfo, copyPath);
 		}
 
@@ -418,6 +430,7 @@ namespace YooAsset
 		{
 			if (assetInfo.IsInvalid)
 			{
+				YooLogger.Error($"Failed to get raw file. {assetInfo.Error}");
 				RawFileOperation operation = new CompletedRawFileOperation(assetInfo.Error, copyPath);
 				OperationSystem.StartOperation(operation);
 				return operation;
@@ -487,8 +500,6 @@ namespace YooAsset
 		public SceneOperationHandle LoadSceneAsync(AssetInfo assetInfo, LoadSceneMode sceneMode = LoadSceneMode.Single, bool activateOnLoad = true, int priority = 100)
 		{
 			DebugCheckInitialize();
-			if (assetInfo.IsInvalid)
-				YooLogger.Warning(assetInfo.Error);
 			var handle = _assetSystemImpl.LoadSceneAsync(assetInfo, sceneMode, activateOnLoad, priority);
 			return handle;
 		}
@@ -502,8 +513,6 @@ namespace YooAsset
 		public AssetOperationHandle LoadAssetSync(AssetInfo assetInfo)
 		{
 			DebugCheckInitialize();
-			if (assetInfo.IsInvalid)
-				YooLogger.Warning(assetInfo.Error);
 			return LoadAssetInternal(assetInfo, true);
 		}
 
@@ -539,8 +548,6 @@ namespace YooAsset
 		public AssetOperationHandle LoadAssetAsync(AssetInfo assetInfo)
 		{
 			DebugCheckInitialize();
-			if (assetInfo.IsInvalid)
-				YooLogger.Warning(assetInfo.Error);
 			return LoadAssetInternal(assetInfo, false);
 		}
 
@@ -572,14 +579,17 @@ namespace YooAsset
 		private AssetOperationHandle LoadAssetInternal(AssetInfo assetInfo, bool waitForAsyncComplete)
 		{
 #if UNITY_EDITOR
-			BundleInfo bundleInfo = _bundleServices.GetBundleInfo(assetInfo);
+			if (assetInfo.IsInvalid == false)
-			if (bundleInfo.Bundle.IsRawFile)
 			{
-				string error = $"Cannot load raw file using LoadAsset method !";
+				BundleInfo bundleInfo = _bundleServices.GetBundleInfo(assetInfo);
-				YooLogger.Error(error);
+				if (bundleInfo.Bundle.IsRawFile)
-				CompletedProvider completedProvider = new CompletedProvider(assetInfo);
+				{
-				completedProvider.SetCompleted(error);
+					string error = $"Cannot load raw file using LoadAsset method !";
-				return completedProvider.CreateHandle<AssetOperationHandle>();
+					YooLogger.Error(error);
+					CompletedProvider completedProvider = new CompletedProvider(assetInfo);
+					completedProvider.SetCompleted(error);
+					return completedProvider.CreateHandle<AssetOperationHandle>();
+				}
 			}
 #endif
 
@@ -598,8 +608,6 @@ namespace YooAsset
 		public SubAssetsOperationHandle LoadSubAssetsSync(AssetInfo assetInfo)
 		{
 			DebugCheckInitialize();
-			if (assetInfo.IsInvalid)
-				YooLogger.Warning(assetInfo.Error);
 			return LoadSubAssetsInternal(assetInfo, true);
 		}
 
@@ -635,8 +643,6 @@ namespace YooAsset
 		public SubAssetsOperationHandle LoadSubAssetsAsync(AssetInfo assetInfo)
 		{
 			DebugCheckInitialize();
-			if (assetInfo.IsInvalid)
-				YooLogger.Warning(assetInfo.Error);
 			return LoadSubAssetsInternal(assetInfo, false);
 		}
 
@@ -668,14 +674,17 @@ namespace YooAsset
 		private SubAssetsOperationHandle LoadSubAssetsInternal(AssetInfo assetInfo, bool waitForAsyncComplete)
 		{
 #if UNITY_EDITOR
-			BundleInfo bundleInfo = _bundleServices.GetBundleInfo(assetInfo);
+			if (assetInfo.IsInvalid == false)
-			if (bundleInfo.Bundle.IsRawFile)
 			{
-				string error = $"Cannot load raw file using LoadSubAssets method !";
+				BundleInfo bundleInfo = _bundleServices.GetBundleInfo(assetInfo);
-				YooLogger.Error(error);
+				if (bundleInfo.Bundle.IsRawFile)
-				CompletedProvider completedProvider = new CompletedProvider(assetInfo);
+				{
-				completedProvider.SetCompleted(error);
+					string error = $"Cannot load raw file using LoadSubAssets method !";
-				return completedProvider.CreateHandle<SubAssetsOperationHandle>();
+					YooLogger.Error(error);
+					CompletedProvider completedProvider = new CompletedProvider(assetInfo);
+					completedProvider.SetCompleted(error);
+					return completedProvider.CreateHandle<SubAssetsOperationHandle>();
+				}
 			}
 #endif
 
@@ -693,10 +702,11 @@ namespace YooAsset
 		/// <param name="tag">资源标签</param>
 		/// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
 		/// <param name="failedTryAgain">下载失败的重试次数</param>
-		public PatchDownloaderOperation CreatePatchDownloader(string tag, int downloadingMaxNumber, int failedTryAgain)
+		/// <param name="timeout">超时时间</param>
+		public PatchDownloaderOperation CreatePatchDownloader(string tag, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
 		{
 			DebugCheckInitialize();
-			return CreatePatchDownloader(new string[] { tag }, downloadingMaxNumber, failedTryAgain);
+			return CreatePatchDownloader(new string[] { tag }, downloadingMaxNumber, failedTryAgain, timeout);
 		}
 
 		/// <summary>
@@ -705,18 +715,19 @@ namespace YooAsset
 		/// <param name="tags">资源标签列表</param>
 		/// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
 		/// <param name="failedTryAgain">下载失败的重试次数</param>
-		public PatchDownloaderOperation CreatePatchDownloader(string[] tags, int downloadingMaxNumber, int failedTryAgain)
+		/// <param name="timeout">超时时间</param>
+		public PatchDownloaderOperation CreatePatchDownloader(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
 		{
 			DebugCheckInitialize();
 			if (_playMode == EPlayMode.EditorSimulateMode || _playMode == EPlayMode.OfflinePlayMode)
 			{
 				List<BundleInfo> downloadList = new List<BundleInfo>();
-				var operation = new PatchDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain);
+				var operation = new PatchDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain, timeout);
 				return operation;
 			}
 			else if (_playMode == EPlayMode.HostPlayMode)
 			{
-				return _hostPlayModeImpl.CreatePatchDownloaderByTags(tags, downloadingMaxNumber, failedTryAgain);
+				return _hostPlayModeImpl.CreatePatchDownloaderByTags(tags, downloadingMaxNumber, failedTryAgain, timeout);
 			}
 			else
 			{
@@ -729,18 +740,19 @@ namespace YooAsset
 		/// </summary>
 		/// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
 		/// <param name="failedTryAgain">下载失败的重试次数</param>
-		public PatchDownloaderOperation CreatePatchDownloader(int downloadingMaxNumber, int failedTryAgain)
+		/// <param name="timeout">超时时间</param>
+		public PatchDownloaderOperation CreatePatchDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
 		{
 			DebugCheckInitialize();
 			if (_playMode == EPlayMode.EditorSimulateMode || _playMode == EPlayMode.OfflinePlayMode)
 			{
 				List<BundleInfo> downloadList = new List<BundleInfo>();
-				var operation = new PatchDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain);
+				var operation = new PatchDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain, timeout);
 				return operation;
 			}
 			else if (_playMode == EPlayMode.HostPlayMode)
 			{
-				return _hostPlayModeImpl.CreatePatchDownloaderByAll(downloadingMaxNumber, failedTryAgain);
+				return _hostPlayModeImpl.CreatePatchDownloaderByAll(downloadingMaxNumber, failedTryAgain, timeout);
 			}
 			else
 			{
@@ -755,13 +767,14 @@ namespace YooAsset
 		/// <param name="locations">资源定位列表</param>
 		/// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
 		/// <param name="failedTryAgain">下载失败的重试次数</param>
-		public PatchDownloaderOperation CreateBundleDownloader(string[] locations, int downloadingMaxNumber, int failedTryAgain)
+		/// <param name="timeout">超时时间</param>
+		public PatchDownloaderOperation CreateBundleDownloader(string[] locations, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
 		{
 			DebugCheckInitialize();
 			if (_playMode == EPlayMode.EditorSimulateMode || _playMode == EPlayMode.OfflinePlayMode)
 			{
 				List<BundleInfo> downloadList = new List<BundleInfo>();
-				var operation = new PatchDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain);
+				var operation = new PatchDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain, timeout);
 				return operation;
 			}
 			else if (_playMode == EPlayMode.HostPlayMode)
@@ -772,7 +785,7 @@ namespace YooAsset
 					AssetInfo assetInfo = ConvertLocationToAssetInfo(location, null);
 					assetInfos.Add(assetInfo);
 				}
-				return _hostPlayModeImpl.CreatePatchDownloaderByPaths(assetInfos.ToArray(), downloadingMaxNumber, failedTryAgain);
+				return _hostPlayModeImpl.CreatePatchDownloaderByPaths(assetInfos.ToArray(), downloadingMaxNumber, failedTryAgain, timeout);
 			}
 			else
 			{
@@ -786,18 +799,19 @@ namespace YooAsset
 		/// <param name="assetInfos">资源信息列表</param>
 		/// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
 		/// <param name="failedTryAgain">下载失败的重试次数</param>
-		public PatchDownloaderOperation CreateBundleDownloader(AssetInfo[] assetInfos, int downloadingMaxNumber, int failedTryAgain)
+		/// <param name="timeout">超时时间</param>
+		public PatchDownloaderOperation CreateBundleDownloader(AssetInfo[] assetInfos, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
 		{
 			DebugCheckInitialize();
 			if (_playMode == EPlayMode.EditorSimulateMode || _playMode == EPlayMode.OfflinePlayMode)
 			{
 				List<BundleInfo> downloadList = new List<BundleInfo>();
-				var operation = new PatchDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain);
+				var operation = new PatchDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain, timeout);
 				return operation;
 			}
 			else if (_playMode == EPlayMode.HostPlayMode)
 			{
-				return _hostPlayModeImpl.CreatePatchDownloaderByPaths(assetInfos, downloadingMaxNumber, failedTryAgain);
+				return _hostPlayModeImpl.CreatePatchDownloaderByPaths(assetInfos, downloadingMaxNumber, failedTryAgain, timeout);
 			}
 			else
 			{
@@ -831,18 +845,18 @@ namespace YooAsset
 			if (_playMode == EPlayMode.EditorSimulateMode)
 			{
 				List<BundleInfo> downloadList = new List<BundleInfo>();
-				var operation = new PatchUnpackerOperation(downloadList, unpackingMaxNumber, failedTryAgain);
+				var operation = new PatchUnpackerOperation(downloadList, unpackingMaxNumber, failedTryAgain, int.MaxValue);
 				return operation;
 			}
 			else if (_playMode == EPlayMode.OfflinePlayMode)
 			{
 				List<BundleInfo> downloadList = new List<BundleInfo>();
-				var operation = new PatchUnpackerOperation(downloadList, unpackingMaxNumber, failedTryAgain);
+				var operation = new PatchUnpackerOperation(downloadList, unpackingMaxNumber, failedTryAgain, int.MaxValue);
 				return operation;
 			}
 			else if (_playMode == EPlayMode.HostPlayMode)
 			{
-				return _hostPlayModeImpl.CreatePatchUnpackerByTags(tags, unpackingMaxNumber, failedTryAgain);
+				return _hostPlayModeImpl.CreatePatchUnpackerByTags(tags, unpackingMaxNumber, failedTryAgain, int.MaxValue);
 			}
 			else
 			{
@@ -861,18 +875,18 @@ namespace YooAsset
 			if (_playMode == EPlayMode.EditorSimulateMode)
 			{
 				List<BundleInfo> downloadList = new List<BundleInfo>();
-				var operation = new PatchUnpackerOperation(downloadList, unpackingMaxNumber, failedTryAgain);
+				var operation = new PatchUnpackerOperation(downloadList, unpackingMaxNumber, failedTryAgain, int.MaxValue);
 				return operation;
 			}
 			else if (_playMode == EPlayMode.OfflinePlayMode)
 			{
 				List<BundleInfo> downloadList = new List<BundleInfo>();
-				var operation = new PatchUnpackerOperation(downloadList, unpackingMaxNumber, failedTryAgain);
+				var operation = new PatchUnpackerOperation(downloadList, unpackingMaxNumber, failedTryAgain, int.MaxValue);
 				return operation;
 			}
 			else if (_playMode == EPlayMode.HostPlayMode)
 			{
-				return _hostPlayModeImpl.CreatePatchUnpackerByAll(unpackingMaxNumber, failedTryAgain);
+				return _hostPlayModeImpl.CreatePatchUnpackerByAll(unpackingMaxNumber, failedTryAgain, int.MaxValue);
 			}
 			else
 			{
@@ -885,9 +899,9 @@ namespace YooAsset
 		/// <summary>
 		/// 创建资源包裹下载器，用于下载更新指定资源版本所有的资源包文件
 		/// </summary>
-		/// <param name="packageCRC">指定更新的资源包裹版本</param>
+		/// <param name="packageVersion">指定更新的包裹版本</param>
 		/// <param name="timeout">超时时间</param>
-		public UpdatePackageOperation UpdatePackageAsync(string packageCRC, int timeout = 60)
+		public UpdatePackageOperation UpdatePackageAsync(string packageVersion, int timeout = 60)
 		{
 			DebugCheckInitialize();
 			if (_playMode == EPlayMode.EditorSimulateMode)
@@ -904,7 +918,7 @@ namespace YooAsset
 			}
 			else if (_playMode == EPlayMode.HostPlayMode)
 			{
-				return _hostPlayModeImpl.UpdatePackageAsync(PackageName, packageCRC, timeout);
+				return _hostPlayModeImpl.UpdatePackageAsync(PackageName, packageVersion, timeout);
 			}
 			else
 			{
@@ -915,11 +929,14 @@ namespace YooAsset
 
 		#region 内部方法
 		/// <summary>
-		/// 资源定位地址转换为资源完整路径
+		/// 是否包含资源文件
 		/// </summary>
-		internal string MappingToAssetPath(string location)
+		internal bool IsIncludeBundleFile(string fileName)
 		{
-			return _bundleServices.MappingToAssetPath(location);
+			// NOTE : 编辑器模拟模式下始终返回TRUE
+			if (_playMode == EPlayMode.EditorSimulateMode)
+				return true;
+			return _bundleServices.IsIncludeBundleFile(fileName);
 		}
 		#endregion
 
@@ -963,9 +980,12 @@ namespace YooAsset
 		#endregion
 
 		#region 调试信息
-		internal List<DebugProviderInfo> GetDebugReportInfos()
+		internal DebugPackageData GetDebugPackageData()
 		{
-			return _assetSystemImpl.GetDebugReportInfos();
+			DebugPackageData data = new DebugPackageData();
+			data.PackageName = PackageName;
+			data.ProviderInfos = _assetSystemImpl.GetDebugReportInfos();
+			return data;
 		}
 		#endregion
 
@@ -977,7 +997,7 @@ namespace YooAsset
 		private AssetInfo ConvertLocationToAssetInfo(string location, System.Type assetType)
 		{
 			DebugCheckLocation(location);
-			string assetPath = _locationServices.ConvertLocationToAssetPath(this, location);
+			string assetPath = _bundleServices.MappingToAssetPath(location);
 			PatchAsset patchAsset = _bundleServices.TryGetPatchAsset(assetPath);
 			if (patchAsset != null)
 			{
@@ -991,7 +1011,6 @@ namespace YooAsset
 					error = $"The location is null or empty !";
 				else
 					error = $"The location is invalid : {location}";
-				YooLogger.Error(error);
 				AssetInfo assetInfo = new AssetInfo(error);
 				return assetInfo;
 			}

Assets/YooAsset/Runtime/CacheSystem/CacheVerifier.cs

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

Assets/YooAsset/Runtime/CacheSystem/PatchCacheVerifier.cs

@@ -1,247 +0,0 @@
-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(HostPlayModeImpl impl, 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(HostPlayModeImpl impl, bool weaklyUpdate)
-		{
-			// 遍历所有文件然后验证并缓存合法文件
-			foreach (var patchBundle in impl.LocalPatchManifest.BundleList)
-			{
-				// 忽略缓存文件
-				if (CacheSystem.IsCached(patchBundle))
-					continue;
-
-				// 忽略APP资源
-				if (impl.IsBuildinPatchBundle(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(HostPlayModeImpl impl, bool weaklyUpdate)
-		{
-			// 遍历所有文件然后验证并缓存合法文件
-			foreach (var patchBundle in impl.LocalPatchManifest.BundleList)
-			{
-				// 忽略缓存文件
-				if (CacheSystem.IsCached(patchBundle))
-					continue;
-
-				// 忽略APP资源
-				if (impl.IsBuildinPatchBundle(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/VerifyInfo.cs

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

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

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

Assets/YooAsset/Runtime/Debugger/DebugBundleInfo.cs

@@ -1,23 +0,0 @@
-using System;
-
-namespace YooAsset
-{
-	[Serializable]
-	internal class DebugBundleInfo
-	{
-		/// <summary>
-		/// 资源包名称
-		/// </summary>
-		public string BundleName;
-
-		/// <summary>
-		/// 引用计数
-		/// </summary>
-		public int RefCount;
-
-		/// <summary>
-		/// 加载状态
-		/// </summary>
-		public int Status;
-	}
-}

Assets/YooAsset/Runtime/DiagnosticSystem/DebugBundleInfo.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset
+{
+	[Serializable]
+	internal class DebugBundleInfo : IComparer<DebugBundleInfo>, IComparable<DebugBundleInfo>
+	{
+		/// <summary>
+		/// 包裹名
+		/// </summary>
+		public string PackageName { set; get; }
+
+		/// <summary>
+		/// 资源包名称
+		/// </summary>
+		public string BundleName;
+
+		/// <summary>
+		/// 引用计数
+		/// </summary>
+		public int RefCount;
+
+		/// <summary>
+		/// 加载状态
+		/// </summary>
+		public int Status;
+
+		public int CompareTo(DebugBundleInfo other)
+		{
+			return Compare(this, other);
+		}
+		public int Compare(DebugBundleInfo a, DebugBundleInfo b)
+		{
+			return string.CompareOrdinal(a.BundleName, b.BundleName);
+		}
+	}
+}

Assets/YooAsset/Runtime/DiagnosticSystem/DebugPackageData.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset
+{
+	[Serializable]
+	internal class DebugPackageData
+	{
+		/// <summary>
+		/// 包裹名称
+		/// </summary>
+		public string PackageName;
+
+		/// <summary>
+		/// 调试数据列表
+		/// </summary>
+		public List<DebugProviderInfo> ProviderInfos = new List<DebugProviderInfo>(1000);
+	}
+}

Assets/YooAsset/Runtime/DiagnosticSystem/DebugPackageData.cs.meta

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

Assets/YooAsset/Runtime/DiagnosticSystem/DebugProviderInfo.cs

@@ -8,9 +8,9 @@ namespace YooAsset
 	internal class DebugProviderInfo : IComparer<DebugProviderInfo>, IComparable<DebugProviderInfo>
 	{
 		/// <summary>
-		/// 所属的资源包裹
+		/// 包裹名
 		/// </summary>
-		public string PackageName;
+		public string PackageName { set; get; }
 
 		/// <summary>
 		/// 资源对象路径
@@ -27,6 +27,11 @@ namespace YooAsset
 		/// </summary>
 		public string SpawnTime;
 
+		/// <summary>
+		/// 加载耗时（单位：毫秒）
+		/// </summary>
+		public long LoadingTime;
+
 		/// <summary>
 		/// 引用计数
 		/// </summary>

Assets/YooAsset/Runtime/DiagnosticSystem/DebugReport.cs

@@ -12,17 +12,21 @@ namespace YooAsset
 	[Serializable]
 	internal class DebugReport
 	{
-		public List<DebugProviderInfo> ProviderInfos = new List<DebugProviderInfo>(1000);
-
 		/// <summary>
 		/// 游戏帧
 		/// </summary>
 		public int FrameCount;
 
+		/// <summary>
+		/// 调试的包裹数据列表
+		/// </summary>
+		public List<DebugPackageData> PackageDatas = new List<DebugPackageData>(10);
+		
+
 		/// <summary>
 		/// 序列化
 		/// </summary>
-        public static byte[] Serialize(DebugReport debugReport)
+		public static byte[] Serialize(DebugReport debugReport)
         {
             return Encoding.UTF8.GetBytes(JsonUtility.ToJson(debugReport));
         }

Assets/YooAsset/Runtime/DownloadSystem/DownloadSystem.cs

@@ -2,6 +2,7 @@
 using System.IO;
 using System.Collections;
 using System.Collections.Generic;
+using UnityEngine.Networking;
 
 namespace YooAsset
 {
@@ -15,11 +16,22 @@ namespace YooAsset
 		private static readonly Dictionary<string, DownloaderBase> _downloaderDic = new Dictionary<string, DownloaderBase>();
 		private static readonly List<string> _removeList = new List<string>(100);
 
+
 		/// <summary>
-		/// 启用断点续传的文件大小
+		/// 自定义的证书认证实例
+		/// </summary>
+		public static CertificateHandler CertificateHandlerInstance;
+
+		/// <summary>
+		/// 启用断点续传功能文件的最小字节数
 		/// </summary>
 		public static int BreakpointResumeFileSize { set; get; } = int.MaxValue;
 
+		/// <summary>
+		/// 下载失败后清理文件的HTTP错误码
+		/// </summary>
+		public static List<long> ClearFileResponseCodes { set; get; }
+
 		/// <summary>
 		/// 更新所有下载器
 		/// </summary>

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

@@ -8,7 +8,7 @@ namespace YooAsset
 	/// <summary>
 	/// 支持Unity2018版本的断点续传下载器
 	/// </summary>
-	public class DownloadHandlerFileRange : DownloadHandlerScript
+	internal class DownloadHandlerFileRange : DownloadHandlerScript
 	{
 		private string _fileSavePath;
 		private long _fileTotalSize;

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

@@ -24,6 +24,7 @@ namespace YooAsset
 		protected string _requestURL;
 
 		protected string _lastError = string.Empty;
+		protected long _lastCode = 0;
 		protected float _downloadProgress = 0f;
 		protected ulong _downloadedBytes = 0;
 
@@ -119,7 +120,7 @@ namespace YooAsset
 		/// </summary>
 		public string GetLastError()
 		{
-			return $"Failed to download : {_requestURL} Error : {_lastError}";
+			return $"Failed to download : {_requestURL} Error : {_lastError} Code : {_lastCode}";
 		}
 	}
 }

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

@@ -15,6 +15,7 @@ namespace YooAsset
 
 		// 重置变量
 		private bool _isAbort = false;
+		private ulong _fileOriginLength;
 		private ulong _latestDownloadBytes;
 		private float _latestDownloadRealtime;
 		private float _tryAgainTimer;
@@ -60,6 +61,7 @@ namespace YooAsset
 				_downloadProgress = 0f;
 				_downloadedBytes = 0;
 				_isAbort = false;
+				_fileOriginLength = 0;
 				_latestDownloadBytes = 0;
 				_latestDownloadRealtime = Time.realtimeSinceStartup;
 				_tryAgainTimer = 0f;
@@ -72,6 +74,8 @@ namespace YooAsset
 					{
 						FileInfo fileInfo = new FileInfo(fileSavePath);
 						fileLength = fileInfo.Length;
+						_fileOriginLength = (ulong)fileLength;
+						_downloadedBytes = _fileOriginLength;
 					}
 
 					_requestURL = GetRequestURL();
@@ -85,6 +89,12 @@ namespace YooAsset
 					_downloadHandle = handler;
 #endif
 
+					if (DownloadSystem.CertificateHandlerInstance != null)
+					{
+						_webRequest.certificateHandler = DownloadSystem.CertificateHandlerInstance;
+						_webRequest.disposeCertificateHandlerOnDispose = false;
+					}
+
 					_webRequest.downloadHandler = handler;
 					_webRequest.disposeDownloadHandlerOnDispose = true;
 					if (fileLength > 0)
@@ -109,7 +119,7 @@ namespace YooAsset
 			if (_steps == ESteps.CheckDownload)
 			{
 				_downloadProgress = _webRequest.downloadProgress;
-				_downloadedBytes = _webRequest.downloadedBytes;
+				_downloadedBytes = _fileOriginLength + _webRequest.downloadedBytes;
 				if (_webRequest.isDone == false)
 				{
 					CheckTimeout();
@@ -124,12 +134,14 @@ namespace YooAsset
 				{
 					hasError = true;
 					_lastError = _webRequest.error;
+					_lastCode = _webRequest.responseCode;
 				}
 #else
 				if (_webRequest.isNetworkError || _webRequest.isHttpError)
 				{
 					hasError = true;
 					_lastError = _webRequest.error;
+					_lastCode = _webRequest.responseCode;
 				}
 #endif
 
@@ -141,6 +153,7 @@ namespace YooAsset
 					{
 						hasError = true;
 						_lastError = $"Verify bundle content failed : {_bundleInfo.Bundle.FileName}";
+						_lastCode = _webRequest.responseCode;
 
 						// 验证失败后删除文件
 						string cacheFilePath = _bundleInfo.Bundle.CachedFilePath;
@@ -152,13 +165,26 @@ namespace YooAsset
 				// 如果下载失败
 				if (hasError)
 				{
-					// 注意：非断点续传下载失败后删除文件
+					// 注意：非断点续传下载失败之后删除文件
 					if (_breakResume == false)
 					{
 						string cacheFilePath = _bundleInfo.Bundle.CachedFilePath;
 						if (File.Exists(cacheFilePath))
 							File.Delete(cacheFilePath);
 					}
+					else
+					{
+						// 注意：下载断点续传文件发生特殊错误码之后删除文件
+						if (DownloadSystem.ClearFileResponseCodes != null)
+						{
+							if (DownloadSystem.ClearFileResponseCodes.Contains(_webRequest.responseCode))
+							{
+								string cacheFilePath = _bundleInfo.Bundle.CachedFilePath;
+								if (File.Exists(cacheFilePath))
+									File.Delete(cacheFilePath);
+							}
+						}
+					}
 
 					// 失败后重新尝试
 					if (_failedTryAgain > 0)
@@ -175,6 +201,7 @@ namespace YooAsset
 				else
 				{
 					_lastError = string.Empty;
+					_lastCode = 0;
 					_steps = ESteps.Succeed;
 				}
 
@@ -200,6 +227,7 @@ namespace YooAsset
 			{
 				_steps = ESteps.Failed;
 				_lastError = "user abort";
+				_lastCode = 0;
 				DisposeWebRequest();
 			}
 		}
@@ -226,7 +254,7 @@ namespace YooAsset
 		}
 		private void DisposeWebRequest()
 		{
-			if(_downloadHandle != null)
+			if (_downloadHandle != null)
 			{
 				_downloadHandle.Cleanup();
 				_downloadHandle = null;

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

@@ -1,288 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Net;
-using System.Net.Security;
-using System.Threading;
-
-namespace YooAsset
-{
-	/*
-	internal sealed class HttpDownloader : DownloaderBase
-	{
-		/// <summary>
-		/// 多线程下载器
-		/// </summary>
-		private class ThreadDownloader
-		{
-			private const int BufferSize = 1042 * 4;
-
-			private Thread _thread;
-			private bool _running = true;
-			private string _url;
-			private string _savePath;
-			private long _fileSize;
-			private int _timeout;
-
-			/// <summary>
-			/// 下载是否结束
-			/// </summary>
-			public bool IsDone = false;
-
-			/// <summary>
-			/// 错误日志
-			/// </summary>
-			public string Error = string.Empty;
-
-			/// <summary>
-			/// 下载进度
-			/// </summary>
-			public float DownloadProgress = 0f;
-
-			/// <summary>
-			/// 已经下载的总字节数
-			/// </summary>
-			public ulong DownloadedBytes = 0;
-
-
-			/// <summary>
-			/// 开始下载
-			/// </summary>
-			public void Run(string url, string savePath, long fileSize, int timeout)
-			{
-				_url = url;
-				_savePath = savePath;
-				_fileSize = fileSize;
-				_timeout = timeout;
-
-				_thread = new Thread(ThreadRun);
-				_thread.IsBackground = true;
-				_thread.Start();
-			}
-
-			/// <summary>
-			/// 中断下载线程
-			/// </summary>
-			public void Abort()
-			{
-				_running = false;
-			}
-
-			/// <summary>
-			/// 下载结果
-			/// </summary>
-			public bool HasError()
-			{
-				if (string.IsNullOrEmpty(Error))
-					return false;
-				else
-					return true;
-			}
-
-			private void ThreadRun()
-			{
-				long fileTotalSize = _fileSize;
-
-				FileStream fileStream = null;
-				HttpWebResponse webResponse = null;
-				Stream responseStream = null;
-
-				try
-				{
-					// 创建文件流
-					fileStream = new FileStream(_savePath, FileMode.OpenOrCreate, FileAccess.Write);
-					long fileLength = fileStream.Length;
-
-					// 创建HTTP下载请求
-					HttpWebRequest webRequest = WebRequest.Create(_url) as HttpWebRequest;
-					webRequest.Timeout = _timeout * 1000;
-					webRequest.ProtocolVersion = HttpVersion.Version10;
-					if (fileLength > 0)
-					{
-						// 注意：设置远端请求文件的起始位置
-						webRequest.AddRange(fileLength);
-						// 注意：设置本地文件流的起始位置
-						fileStream.Seek(fileLength, SeekOrigin.Begin);
-					}
-
-					// 读取下载数据并保存到文件
-					webResponse = webRequest.GetResponse() as HttpWebResponse;
-					responseStream = webResponse.GetResponseStream();
-					byte[] buffer = new byte[BufferSize];
-					while (_running)
-					{
-						int length = responseStream.Read(buffer, 0, buffer.Length);
-						if (length <= 0)
-							break;
-
-						fileStream.Write(buffer, 0, length);
-
-						// 计算下载进度
-						// 注意：原子操作保证数据安全
-						fileLength += length;
-						float progress = fileLength / fileTotalSize;
-						DownloadProgress = progress;
-						DownloadedBytes = (ulong)fileLength;
-					}
-				}
-				catch (Exception e)
-				{
-					Error = e.Message;
-				}
-				finally
-				{
-					if (responseStream != null)
-					{
-						responseStream.Close();
-						responseStream.Dispose();
-					}
-
-					if (webResponse != null)
-					{
-						webResponse.Close();
-						webResponse.Dispose();
-					}
-
-					if (fileStream != null)
-					{
-						fileStream.Flush();
-						fileStream.Close();
-					}
-
-					IsDone = true;
-				}
-			}
-		}
-
-
-		private ThreadDownloader _threadDownloader;
-		private float _tryAgainTimer;
-
-		public HttpDownloader(BundleInfo bundleInfo) : base(bundleInfo)
-		{
-		}
-		public override void Update()
-		{
-			if (_steps == ESteps.None)
-				return;
-			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)
-			{
-				// 重置变量
-				_downloadProgress = 0f;
-				_downloadedBytes = 0;
-				_tryAgainTimer = 0f;
-
-				_requestURL = GetRequestURL();
-				_threadDownloader = new ThreadDownloader();
-				_threadDownloader.Run(_requestURL, _bundleInfo.Bundle.CachedFilePath, _bundleInfo.Bundle.FileSize, _timeout);
-				_steps = ESteps.CheckDownload;
-			}
-
-			// 检测下载结果
-			if (_steps == ESteps.CheckDownload)
-			{
-				_downloadProgress = _threadDownloader.DownloadProgress;
-				_downloadedBytes = _threadDownloader.DownloadedBytes;
-				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)
-					{
-						ReportWarning();
-						_steps = ESteps.TryAgain;
-					}
-					else
-					{
-						ReportError();
-						_steps = ESteps.Failed;
-					}
-				}
-				else
-				{
-					_lastError = string.Empty;
-					_steps = ESteps.Succeed;
-				}
-			}
-
-			// 重新尝试下载
-			if (_steps == ESteps.TryAgain)
-			{
-				_tryAgainTimer += UnityEngine.Time.unscaledDeltaTime;
-				if (_tryAgainTimer > 1f)
-				{
-					_failedTryAgain--;
-					_steps = ESteps.CreateDownload;
-					YooLogger.Warning($"Try again download : {_requestURL}");
-				}
-			}
-		}
-		public override void Abort()
-		{
-			if (IsDone() == false)
-			{
-				_steps = ESteps.Failed;
-				_lastError = "user abort";
-				if (_threadDownloader != null)
-				{
-					_threadDownloader.Abort();
-					_threadDownloader = null;
-				}
-			}
-		}
-	}
-	*/
-}

Assets/YooAsset/Runtime/InitializeParameters.cs

@@ -1,5 +1,4 @@
-using UnityEngine;
+
-
 namespace YooAsset
 {
 	/// <summary>
@@ -9,7 +8,6 @@ namespace YooAsset
 	{
 		/// <summary>
 		/// 编辑器下的模拟模式
-		/// 注意：在初始化的时候自动构建真机模拟环境。
 		/// </summary>
 		EditorSimulateMode,
 
@@ -35,11 +33,6 @@ namespace YooAsset
 		/// </summary>
 		public bool LocationToLower = false;
 
-		/// <summary>
-		/// 资源定位服务接口
-		/// </summary>
-		public ILocationServices LocationServices = null;
-
 		/// <summary>
 		/// 文件解密服务接口
 		/// </summary>

Assets/YooAsset/Runtime/OperationSystem/AsyncOperationBase.cs

@@ -81,6 +81,14 @@ namespace YooAsset
 				_taskCompletionSource.TrySetResult(null);
 		}
 
+		/// <summary>
+		/// 清空完成回调
+		/// </summary>
+		protected void ClearCompletedCallback()
+		{
+			_callback = null;
+		}
+
 		#region 异步编程相关
 		bool IEnumerator.MoveNext()
 		{

Assets/YooAsset/Runtime/OperationSystem/GameAsyncOperation.cs

@@ -1,7 +1,7 @@
 
 namespace YooAsset
 {
-	public class GameAsyncOperation : AsyncOperationBase
+	public abstract class GameAsyncOperation : AsyncOperationBase
 	{
 		internal override void Start()
 		{
@@ -12,7 +12,22 @@ namespace YooAsset
 			OnUpdate();
 		}
 
-		protected virtual void OnStart() { }
+		/// <summary>
-		protected virtual void OnUpdate() { }
+		/// 异步操作开始
+		/// </summary>
+		protected abstract void OnStart();
+
+		/// <summary>
+		/// 异步操作更新
+		/// </summary>
+		protected abstract void OnUpdate();
+
+		/// <summary>
+		/// 异步操作系统是否繁忙
+		/// </summary>
+		protected bool IsBusy()
+		{
+			return OperationSystem.IsBusy;
+		}
 	}
 }

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

@@ -0,0 +1,112 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+
+namespace YooAsset
+{
+	/// <summary>
+	/// 清理未使用的缓存资源操作类
+	/// </summary>
+	public sealed class ClearUnusedCacheFilesOperation : AsyncOperationBase
+	{
+		private enum ESteps
+		{
+			None,
+			GetUnusedCacheFiles,
+			ClearUnusedCacheFiles,
+			Done,
+		}
+
+		private readonly List<AssetsPackage> _packages;
+		private ESteps _steps = ESteps.None;
+		private List<string> _unusedCacheFilePaths;
+		private int _unusedFileTotalCount = 0;
+
+		internal ClearUnusedCacheFilesOperation(List<AssetsPackage> packages)
+		{
+			_packages = packages;
+		}
+		internal override void Start()
+		{
+			_steps = ESteps.GetUnusedCacheFiles;
+		}
+		internal override void Update()
+		{
+			if (_steps == ESteps.None || _steps == ESteps.Done)
+				return;
+
+			if (_steps == ESteps.GetUnusedCacheFiles)
+			{
+				_unusedCacheFilePaths = GetUnusedCacheFilePaths();
+				_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))
+					{
+						try
+						{
+							File.Delete(filePath);
+							YooLogger.Log($"Delete unused cache file : {filePath}");
+						}
+						catch (System.Exception e)
+						{
+							YooLogger.Warning($"Failed delete cache file : {filePath} Exception : {e}");
+						}
+					}
+					_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;
+				}
+			}
+		}
+
+		/// <summary>
+		/// 获取未被使用的缓存文件路径集合
+		/// </summary>
+		private List<string> GetUnusedCacheFilePaths()
+		{
+			string cacheFolderPath = SandboxHelper.GetCacheFolderPath();
+			if (Directory.Exists(cacheFolderPath) == false)
+				return new List<string>();
+
+			// 获取所有缓存文件
+			DirectoryInfo directoryInfo = new DirectoryInfo(cacheFolderPath);
+			FileInfo[] fileInfos = directoryInfo.GetFiles();
+			List<string> result = new List<string>(fileInfos.Length);
+			foreach (FileInfo fileInfo in fileInfos)
+			{
+				bool used = false;
+				foreach (var package in _packages)
+				{
+					if (package.IsIncludeBundleFile(fileInfo.Name))
+					{
+						used = true;
+						break;
+					}
+				}
+				if (used == false)
+					result.Add(fileInfo.FullName);
+			}
+			return result;
+		}
+	}
+}

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

@@ -22,6 +22,7 @@ namespace YooAsset
 		
 		private readonly int _downloadingMaxNumber;
 		private readonly int _failedTryAgain;
+		private readonly int _timeout;
 		private readonly List<BundleInfo> _downloadList;
 		private readonly List<DownloaderBase> _downloaders = new List<DownloaderBase>(MAX_LOADER_COUNT);
 		private readonly List<DownloaderBase> _removeList = new List<DownloaderBase>(MAX_LOADER_COUNT);
@@ -75,11 +76,12 @@ namespace YooAsset
 		public OnStartDownloadFile OnStartDownloadFileCallback { set; get; }
 		
 
-		internal DownloaderOperation(List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain)
+		internal DownloaderOperation(List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain, int timeout)
 		{
 			_downloadList = downloadList;
 			_downloadingMaxNumber = UnityEngine.Mathf.Clamp(downloadingMaxNumber, 1, MAX_LOADER_COUNT); ;
 			_failedTryAgain = failedTryAgain;
+			_timeout = timeout;
 
 			if (downloadList != null)
 			{
@@ -167,7 +169,7 @@ namespace YooAsset
 					{
 						int index = _downloadList.Count - 1;
 						var bundleInfo = _downloadList[index];
-						var operation = DownloadSystem.BeginDownload(bundleInfo, _failedTryAgain);
+						var operation = DownloadSystem.BeginDownload(bundleInfo, _failedTryAgain, _timeout);
 						_downloaders.Add(operation);
 						_downloadList.RemoveAt(index);
 						OnStartDownloadFileCallback?.Invoke(bundleInfo.Bundle.BundleName, bundleInfo.Bundle.FileSize);
@@ -228,22 +230,22 @@ namespace YooAsset
 
 	public sealed class PackageDownloaderOperation : DownloaderOperation
 	{
-		internal PackageDownloaderOperation(List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain)
+		internal PackageDownloaderOperation(List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain, int timeout)
-			: base(downloadList, downloadingMaxNumber, failedTryAgain)
+			: base(downloadList, downloadingMaxNumber, failedTryAgain, timeout)
 		{
 		}
 	}
 	public sealed class PatchDownloaderOperation : DownloaderOperation
 	{
-		internal PatchDownloaderOperation(List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain)
+		internal PatchDownloaderOperation(List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain, int timeout)
-			: base(downloadList, downloadingMaxNumber, failedTryAgain)
+			: base(downloadList, downloadingMaxNumber, failedTryAgain, timeout)
 		{
 		}
 	}
 	public sealed class PatchUnpackerOperation : DownloaderOperation
 	{
-		internal PatchUnpackerOperation(List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain)
+		internal PatchUnpackerOperation(List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain, int timeout)
-			: base(downloadList, downloadingMaxNumber, failedTryAgain)
+			: base(downloadList, downloadingMaxNumber, failedTryAgain, timeout)
 		{
 		}
 	}

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

@@ -67,46 +67,99 @@ namespace YooAsset
 		private enum ESteps
 		{
 			None,
-			Update,
+			QueryPackageVersion,
+			LoadAppManifest,
+			InitVerifyingCache,
+			UpdateVerifyingCache,
 			Done,
 		}
 
 		private readonly OfflinePlayModeImpl _impl;
+		private readonly string _packageName;
+		private readonly CacheVerifier _patchCacheVerifier;
+		private readonly AppPackageVersionQuerier _appPackageVersionQuerier;
 		private AppManifestLoader _appManifestLoader;
 		private ESteps _steps = ESteps.None;
+		private float _verifyTime;
 
-		internal OfflinePlayModeInitializationOperation(OfflinePlayModeImpl impl, string buildinPackageName)
+		internal OfflinePlayModeInitializationOperation(OfflinePlayModeImpl impl, string packageName)
 		{
 			_impl = impl;
-			_appManifestLoader = new AppManifestLoader(buildinPackageName);
+			_packageName = packageName;
+			_appPackageVersionQuerier = new AppPackageVersionQuerier(packageName);
+
+#if UNITY_WEBGL
+			_patchCacheVerifier = new CacheVerifierWithoutThread();
+#else
+			_patchCacheVerifier = new CacheVerifierWithThread();
+#endif
 		}
 		internal override void Start()
 		{
-			_steps = ESteps.Update;
+			_steps = ESteps.QueryPackageVersion;
 		}
 		internal override void Update()
 		{
 			if (_steps == ESteps.None || _steps == ESteps.Done)
 				return;
 
-			if (_steps == ESteps.Update)
+			if (_steps == ESteps.QueryPackageVersion)
 			{
-				_appManifestLoader.Update();
+				_appPackageVersionQuerier.Update();
-				Progress = _appManifestLoader.Progress();
+				if (_appPackageVersionQuerier.IsDone == false)
-				if (_appManifestLoader.IsDone() == false)
 					return;
 
-				if (_appManifestLoader.Result == null)
+				string error = _appPackageVersionQuerier.Error;
+				if (string.IsNullOrEmpty(error) == false)
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = error;
+				}
+				else
+				{
+					_appManifestLoader = new AppManifestLoader(_packageName, _appPackageVersionQuerier.Version);
+					_steps = ESteps.LoadAppManifest;
+				}
+			}
+
+			if (_steps == ESteps.LoadAppManifest)
+			{
+				_appManifestLoader.Update();
+				Progress = _appManifestLoader.Progress;
+				if (_appManifestLoader.IsDone == false)
+					return;
+
+				if (_appManifestLoader.Manifest == null)
 				{
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Failed;
 					Error = _appManifestLoader.Error;
 				}
 				else
+				{
+					_steps = ESteps.InitVerifyingCache;
+					_impl.SetAppPatchManifest(_appManifestLoader.Manifest);
+				}
+			}
+
+			if (_steps == ESteps.InitVerifyingCache)
+			{
+				var verifyInfos = _impl.GetVerifyInfoList();
+				_patchCacheVerifier.InitVerifier(verifyInfos);
+				_verifyTime = UnityEngine.Time.realtimeSinceStartup;
+				_steps = ESteps.UpdateVerifyingCache;
+			}
+
+			if (_steps == ESteps.UpdateVerifyingCache)
+			{
+				Progress = _patchCacheVerifier.GetVerifierProgress();
+				if (_patchCacheVerifier.UpdateVerifier())
 				{
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Succeed;
-					_impl.SetAppPatchManifest(_appManifestLoader.Result);
+					float costTime = UnityEngine.Time.realtimeSinceStartup - _verifyTime;
+					YooLogger.Log($"Verify result : Success {_patchCacheVerifier.VerifySuccessList.Count}, Fail {_patchCacheVerifier.VerifyFailList.Count}, Elapsed time {costTime} seconds");
 				}
 			}
 		}
@@ -117,75 +170,170 @@ namespace YooAsset
 	/// </summary>
 	internal sealed class HostPlayModeInitializationOperation : InitializationOperation
 	{
-		internal HostPlayModeInitializationOperation()
+		private enum ESteps
 		{
+			None,
+			QueryPackageVersion,
+			LoadAppManifest,
+			CopyAppManifest,
+			InitVerifyingCache,
+			UpdateVerifyingCache,
+			Done,
+		}
+
+		private readonly HostPlayModeImpl _impl;
+		private readonly string _packageName;
+		private readonly CacheVerifier _patchCacheVerifier;
+		private readonly AppPackageVersionQuerier _appPackageVersionQuerier;
+		private AppManifestCopyer _appManifestCopyer;
+		private AppManifestLoader _appManifestLoader;
+		private ESteps _steps = ESteps.None;
+		private float _verifyTime;
+
+		internal HostPlayModeInitializationOperation(HostPlayModeImpl impl, string packageName)
+		{
+			_impl = impl;
+			_packageName = packageName;
+			_appPackageVersionQuerier = new AppPackageVersionQuerier(packageName);
+
+#if UNITY_WEBGL
+			_patchCacheVerifier = new CacheVerifierWithoutThread();
+#else
+			_patchCacheVerifier = new CacheVerifierWithThread();
+#endif
 		}
 		internal override void Start()
 		{
-			Status = EOperationStatus.Succeed;
+			_steps = ESteps.QueryPackageVersion;
 		}
 		internal override void Update()
 		{
+			if (_steps == ESteps.None || _steps == ESteps.Done)
+				return;
+
+			if (_steps == ESteps.QueryPackageVersion)
+			{
+				_appPackageVersionQuerier.Update();
+				if (_appPackageVersionQuerier.IsDone == false)
+					return;
+
+				// 注意：为了兼容MOD模式，初始化动态新增的包裹的时候，如果内置清单不存在也不需要报错！
+				string error = _appPackageVersionQuerier.Error;
+				if (string.IsNullOrEmpty(error) == false)
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Succeed;
+				}
+				else
+				{
+					_appManifestCopyer = new AppManifestCopyer(_packageName, _appPackageVersionQuerier.Version);
+					_appManifestLoader = new AppManifestLoader(_packageName, _appPackageVersionQuerier.Version);
+					_steps = ESteps.CopyAppManifest;
+				}
+			}
+
+			if (_steps == ESteps.CopyAppManifest)
+			{
+				_appManifestCopyer.Update();
+				Progress = _appManifestCopyer.Progress;
+				if (_appManifestCopyer.IsDone == false)
+					return;
+
+				string error = _appManifestCopyer.Error;
+				if(string.IsNullOrEmpty(error) == false)
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = error;
+				}
+				else
+				{
+					_steps = ESteps.LoadAppManifest;
+				}
+			}
+
+			if (_steps == ESteps.LoadAppManifest)
+			{
+				_appManifestLoader.Update();
+				Progress = _appManifestLoader.Progress;
+				if (_appManifestLoader.IsDone == false)
+					return;
+
+				if (_appManifestLoader.Manifest == null)
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = _appManifestLoader.Error;
+				}
+				else
+				{
+					_steps = ESteps.InitVerifyingCache;
+					_impl.SetLocalPatchManifest(_appManifestLoader.Manifest);
+				}
+			}
+
+			if (_steps == ESteps.InitVerifyingCache)
+			{
+				var verifyInfos = _impl.GetVerifyInfoList(false);
+				_patchCacheVerifier.InitVerifier(verifyInfos);
+				_verifyTime = UnityEngine.Time.realtimeSinceStartup;
+				_steps = ESteps.UpdateVerifyingCache;
+			}
+
+			if (_steps == ESteps.UpdateVerifyingCache)
+			{
+				Progress = _patchCacheVerifier.GetVerifierProgress();
+				if (_patchCacheVerifier.UpdateVerifier())
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Succeed;
+					float costTime = UnityEngine.Time.realtimeSinceStartup - _verifyTime;
+					YooLogger.Log($"Verify result : Success {_patchCacheVerifier.VerifySuccessList.Count}, Fail {_patchCacheVerifier.VerifyFailList.Count}, Elapsed time {costTime} seconds");
+				}
+			}
 		}
 	}
 
 
-	/// <summary>
+	// 内置补丁清单版本查询器
-	/// 内置补丁清单加载器
+	internal class AppPackageVersionQuerier
-	/// </summary>
-	internal class AppManifestLoader
 	{
 		private enum ESteps
 		{
 			LoadStaticVersion,
 			CheckStaticVersion,
-			LoadAppManifest,
-			CheckAppManifest,
 			Done,
 		}
 
-		private string _buildinPackageName;
+		private readonly string _buildinPackageName;
 		private ESteps _steps = ESteps.LoadStaticVersion;
-		private UnityWebDataRequester _downloader1;
+		private UnityWebDataRequester _downloader;
-		private UnityWebDataRequester _downloader2;
+
+		/// <summary>
+		/// 内置包裹版本
+		/// </summary>
+		public string Version { private set; get; }
 
 		/// <summary>
 		/// 错误日志
 		/// </summary>
 		public string Error { private set; get; }
 
-		/// <summary>
-		/// 加载结果
-		/// </summary>
-		public PatchManifest Result { private set; get; }
-
-		/// <summary>
-		/// 内置补丁清单CRC
-		/// </summary>
-		public string BuildinPackageCRC { private set; get; }
-
-
-		public AppManifestLoader(string buildinPackageName)
-		{
-			_buildinPackageName = buildinPackageName;
-		}
-
 		/// <summary>
 		/// 是否已经完成
 		/// </summary>
-		public bool IsDone()
+		public bool IsDone
 		{
-			return _steps == ESteps.Done;
+			get
+			{
+				return _steps == ESteps.Done;
+			}
 		}
 
-		/// <summary>
+
-		/// 加载进度
+		public AppPackageVersionQuerier(string buildinPackageName)
-		/// </summary>
-		public float Progress()
 		{
-			if (_downloader2 == null)
+			_buildinPackageName = buildinPackageName;
-				return 0;
-			return _downloader2.Progress();
 		}
 
 		/// <summary>
@@ -193,73 +341,135 @@ namespace YooAsset
 		/// </summary>
 		public void Update()
 		{
-			if (IsDone())
+			if (IsDone)
 				return;
 
 			if (_steps == ESteps.LoadStaticVersion)
 			{
-				string fileName = YooAssetSettingsData.GetStaticVersionFileName(_buildinPackageName);
+				string fileName = YooAssetSettingsData.GetPatchManifestVersionFileName(_buildinPackageName);
 				string filePath = PathHelper.MakeStreamingLoadPath(fileName);
 				string url = PathHelper.ConvertToWWWPath(filePath);
-				_downloader1 = new UnityWebDataRequester();
+				_downloader = new UnityWebDataRequester();
-				_downloader1.SendRequest(url);
+				_downloader.SendRequest(url);
 				_steps = ESteps.CheckStaticVersion;
-				YooLogger.Log($"Load static version file : {filePath}");
 			}
 
 			if (_steps == ESteps.CheckStaticVersion)
 			{
-				if (_downloader1.IsDone() == false)
+				if (_downloader.IsDone() == false)
 					return;
 
-				if (_downloader1.HasError())
+				if (_downloader.HasError())
 				{
-					Error = _downloader1.GetError();
+					Error = _downloader.GetError();
-					_steps = ESteps.Done;
 				}
 				else
 				{
-					BuildinPackageCRC = _downloader1.GetText();
+					Version = _downloader.GetText();
-					_steps = ESteps.LoadAppManifest;
+					if (string.IsNullOrEmpty(Version))
+						Error = $"Buildin package version is empty !";
 				}
-				_downloader1.Dispose();
+				_steps = ESteps.Done;
-			}
+				_downloader.Dispose();
-
-			if (_steps == ESteps.LoadAppManifest)
-			{
-				string fileName = YooAssetSettingsData.GetPatchManifestFileName(_buildinPackageName, BuildinPackageCRC);
-				string filePath = PathHelper.MakeStreamingLoadPath(fileName);
-				string url = PathHelper.ConvertToWWWPath(filePath);
-				_downloader2 = new UnityWebDataRequester();
-				_downloader2.SendRequest(url);
-				_steps = ESteps.CheckAppManifest;
-				YooLogger.Log($"Load patch manifest file : {filePath}");
-			}
-
-			if (_steps == ESteps.CheckAppManifest)
-			{
-				if (_downloader2.IsDone() == false)
-					return;
-
-				if (_downloader2.HasError())
-				{
-					Error = _downloader2.GetError();
-					_steps = ESteps.Done;
-				}
-				else
-				{
-					// 解析APP里的补丁清单
-					Result = PatchManifest.Deserialize(_downloader2.GetText());
-					_steps = ESteps.Done;
-				}
-				_downloader2.Dispose();
 			}
 		}
 	}
 
-	/// <summary>
+	// 内置补丁清单加载器
-	/// 内置补丁清单复制器
+	internal class AppManifestLoader
-	/// </summary>
+	{
+		private enum ESteps
+		{
+			LoadAppManifest,
+			CheckAppManifest,
+			Done,
+		}
+
+		private readonly string _buildinPackageName;
+		private readonly string _buildinPackageVersion;
+		private ESteps _steps = ESteps.LoadAppManifest;
+		private UnityWebDataRequester _downloader;
+
+		/// <summary>
+		/// 加载结果
+		/// </summary>
+		public PatchManifest Manifest { private set; get; }
+
+		/// <summary>
+		/// 错误日志
+		/// </summary>
+		public string Error { private set; get; }
+
+		/// <summary>
+		/// 是否已经完成
+		/// </summary>
+		public bool IsDone
+		{
+			get
+			{
+				return _steps == ESteps.Done;
+			}
+		}
+
+		/// <summary>
+		/// 加载进度
+		/// </summary>
+		public float Progress
+		{
+			get
+			{
+				if (_downloader == null)
+					return 0;
+				return _downloader.Progress();
+			}
+		}
+
+
+		public AppManifestLoader(string buildinPackageName, string buildinPackageVersion)
+		{
+			_buildinPackageName = buildinPackageName;
+			_buildinPackageVersion = buildinPackageVersion;
+		}
+
+		/// <summary>
+		/// 更新流程
+		/// </summary>
+		public void Update()
+		{
+			if (IsDone)
+				return;
+
+			if (_steps == ESteps.LoadAppManifest)
+			{
+				string fileName = YooAssetSettingsData.GetPatchManifestFileName(_buildinPackageName, _buildinPackageVersion);
+				string filePath = PathHelper.MakeStreamingLoadPath(fileName);
+				string url = PathHelper.ConvertToWWWPath(filePath);
+				_downloader = new UnityWebDataRequester();
+				_downloader.SendRequest(url);
+				_steps = ESteps.CheckAppManifest;
+			}
+
+			if (_steps == ESteps.CheckAppManifest)
+			{
+				if (_downloader.IsDone() == false)
+					return;
+
+				if (_downloader.HasError())
+				{
+					Error = _downloader.GetError();
+				}
+				else
+				{
+					// 解析APP里的补丁清单
+					Manifest = PatchManifest.Deserialize(_downloader.GetText());
+				}
+				_steps = ESteps.Done;
+				_downloader.Dispose();
+			}
+		}
+	}
+
+	// 内置补丁清单复制器
 	internal class AppManifestCopyer
 	{
 		private enum ESteps
@@ -269,10 +479,10 @@ namespace YooAsset
 			Done,
 		}
 
-		private string _buildinPackageName;
+		private readonly string _buildinPackageName;
-		private string _buildinPackageCRC;
+		private readonly string _buildinPackageVersion;
 		private ESteps _steps = ESteps.CopyAppManifest;
-		private UnityWebFileRequester _downloader1;
+		private UnityWebFileRequester _downloader;
 
 		/// <summary>
 		/// 错误日志
@@ -280,15 +490,34 @@ namespace YooAsset
 		public string Error { private set; get; }
 
 		/// <summary>
-		/// 拷贝结果
+		/// 是否已经完成
 		/// </summary>
-		public bool Result { private set; get; }
+		public bool IsDone
+		{
+			get
+			{
+				return _steps == ESteps.Done;
+			}
+		}
+
+		/// <summary>
+		/// 加载进度
+		/// </summary>
+		public float Progress
+		{
+			get
+			{
+				if (_downloader == null)
+					return 0;
+				return _downloader.Progress();
+			}
+		}
 
 
-		public AppManifestCopyer(string buildinPackageName, string buildinPackageCRC)
+		public AppManifestCopyer(string buildinPackageName, string buildinPackageVersion)
 		{
 			_buildinPackageName = buildinPackageName;
-			_buildinPackageCRC = buildinPackageCRC;
+			_buildinPackageVersion = buildinPackageVersion;
 		}
 
 		/// <summary>
@@ -296,56 +525,39 @@ namespace YooAsset
 		/// </summary>
 		public void Update()
 		{
-			if (IsDone())
+			if (IsDone)
 				return;
 
 			if (_steps == ESteps.CopyAppManifest)
 			{
-				string fileName = YooAssetSettingsData.GetPatchManifestFileName(_buildinPackageName, _buildinPackageCRC);
+				string fileName = YooAssetSettingsData.GetPatchManifestFileName(_buildinPackageName, _buildinPackageVersion);
 				string destFilePath = PathHelper.MakePersistentLoadPath(fileName);
 				if (File.Exists(destFilePath))
 				{
-					Result = true;
 					_steps = ESteps.Done;
-					return;
 				}
 				else
 				{
-					YooLogger.Log($"Copy application patch manifest.");
 					string sourceFilePath = PathHelper.MakeStreamingLoadPath(fileName);
 					string url = PathHelper.ConvertToWWWPath(sourceFilePath);
-					_downloader1 = new UnityWebFileRequester();
+					_downloader = new UnityWebFileRequester();
-					_downloader1.SendRequest(url, destFilePath);
+					_downloader.SendRequest(url, destFilePath);
 					_steps = ESteps.CheckAppManifest;
 				}
 			}
 
 			if (_steps == ESteps.CheckAppManifest)
 			{
-				if (_downloader1.IsDone() == false)
+				if (_downloader.IsDone() == false)
 					return;
 
-				if (_downloader1.HasError())
+				if (_downloader.HasError())
 				{
-					Result = false;
+					Error = _downloader.GetError();
-					Error = _downloader1.GetError();
-					_steps = ESteps.Done;
 				}
-				else
+				_steps = ESteps.Done;
-				{
+				_downloader.Dispose();
-					Result = true;
-					_steps = ESteps.Done;
-				}
-				_downloader1.Dispose();
 			}
 		}
-
-		/// <summary>
-		/// 是否已经完成
-		/// </summary>
-		public bool IsDone()
-		{
-			return _steps == ESteps.Done;
-		}
 	}
 }

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

@@ -52,7 +52,8 @@ namespace YooAsset
 		private enum ESteps
 		{
 			None,
-			CheckManifestHash,
+			LoadWebHash,
+			CheckWebHash,
 			LoadWebManifest,
 			CheckWebManifest,
 			InitVerifyingCache,
@@ -63,82 +64,108 @@ namespace YooAsset
 		private static int RequestCount = 0;
 		private readonly HostPlayModeImpl _impl;
 		private readonly string _packageName;
-		private readonly string _packageCRC;
+		private readonly string _packageVersion;
 		private readonly int _timeout;
+		private UnityWebDataRequester _downloader1;
+		private UnityWebDataRequester _downloader2;
+		private CacheVerifier _cacheVerifier;
 		private ESteps _steps = ESteps.None;
-		private UnityWebDataRequester _downloader;
-		private PatchCacheVerifier _patchCacheVerifier;
 		private float _verifyTime;
 
-		internal HostPlayModeUpdateManifestOperation(HostPlayModeImpl impl, string packageName, string packageCRC, int timeout)
+		internal HostPlayModeUpdateManifestOperation(HostPlayModeImpl impl, string packageName, string packageVersion, int timeout)
 		{
 			_impl = impl;
 			_packageName = packageName;
-			_packageCRC = packageCRC;
+			_packageVersion = packageVersion;
 			_timeout = timeout;
 
 #if UNITY_WEBGL
-			_patchCacheVerifier = new PatchCacheVerifierWithoutThread();
+			_cacheVerifier = new CacheVerifierWithoutThread();
 #else
-			_patchCacheVerifier = new PatchCacheVerifierWithThread();
+			_cacheVerifier = new CacheVerifierWithThread();
 #endif
 		}
 		internal override void Start()
 		{
 			RequestCount++;
-			_steps = ESteps.CheckManifestHash;
+			_steps = ESteps.LoadWebHash;
 		}
 		internal override void Update()
 		{
 			if (_steps == ESteps.None || _steps == ESteps.Done)
 				return;
 
-			if (_steps == ESteps.CheckManifestHash)
+			if (_steps == ESteps.LoadWebHash)
 			{
-				string cachedManifestCRC = GetSandboxPatchManifestFileHash(_packageName, _packageCRC);
+				string fileName = YooAssetSettingsData.GetPatchManifestHashFileName(_packageName, _packageVersion);
+				string webURL = GetPatchManifestRequestURL(fileName);
+				YooLogger.Log($"Beginning to request patch manifest hash : {webURL}");
+				_downloader1 = new UnityWebDataRequester();
+				_downloader1.SendRequest(webURL, _timeout);
+				_steps = ESteps.CheckWebHash;
+			}
 
-				// 如果补丁清单文件的哈希值相同
+			if (_steps == ESteps.CheckWebHash)
-				if (cachedManifestCRC == _packageCRC)
+			{
+				if (_downloader1.IsDone() == false)
+					return;
+
+				// Check error
+				if (_downloader1.HasError())
 				{
-					YooLogger.Log($"Patch manifest file hash is not change : {_packageCRC}");
+					_steps = ESteps.Done;
-					LoadSandboxPatchManifest(_packageName, _packageCRC);
+					Status = EOperationStatus.Failed;
-					FoundNewManifest = false;
+					Error = _downloader1.GetError();
-					_steps = ESteps.InitVerifyingCache;
 				}
 				else
 				{
-					YooLogger.Log($"Patch manifest hash is change : {cachedManifestCRC} -> {_packageCRC}");
+					string webManifestHash = _downloader1.GetText();
-					FoundNewManifest = true;
+					string cachedManifestHash = GetSandboxPatchManifestFileHash(_packageName, _packageVersion);
-					_steps = ESteps.LoadWebManifest;
+
+					// 如果补丁清单文件的哈希值相同
+					if (cachedManifestHash == webManifestHash)
+					{
+						YooLogger.Log($"Patch manifest file hash is not change : {webManifestHash}");
+						LoadSandboxPatchManifest(_packageName, _packageVersion);
+						FoundNewManifest = false;
+						_steps = ESteps.InitVerifyingCache;
+					}
+					else
+					{
+						YooLogger.Log($"Patch manifest hash is change : {cachedManifestHash} -> {webManifestHash}");
+						FoundNewManifest = true;
+						_steps = ESteps.LoadWebManifest;
+					}
 				}
+				_downloader1.Dispose();
 			}
 
 			if (_steps == ESteps.LoadWebManifest)
 			{
-				string fileName = YooAssetSettingsData.GetPatchManifestFileName(_packageName, _packageCRC);
+				string fileName = YooAssetSettingsData.GetPatchManifestFileName(_packageName, _packageVersion);
 				string webURL = GetPatchManifestRequestURL(fileName);
 				YooLogger.Log($"Beginning to request patch manifest : {webURL}");
-				_downloader = new UnityWebDataRequester();
+				_downloader2 = new UnityWebDataRequester();
-				_downloader.SendRequest(webURL, _timeout);
+				_downloader2.SendRequest(webURL, _timeout);
 				_steps = ESteps.CheckWebManifest;
 			}
 
 			if (_steps == ESteps.CheckWebManifest)
 			{
-				if (_downloader.IsDone() == false)
+				if (_downloader2.IsDone() == false)
 					return;
 
 				// Check error
-				if (_downloader.HasError())
+				if (_downloader2.HasError())
 				{
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Failed;
-					Error = _downloader.GetError();
+					Error = _downloader2.GetError();
 				}
 				else
 				{
 					// 解析补丁清单			
-					if (ParseAndSaveRemotePatchManifest(_packageName, _packageCRC, _downloader.GetText()))
+					if (ParseAndSaveRemotePatchManifest(_packageName, _packageVersion, _downloader2.GetText()))
 					{
 						_steps = ESteps.InitVerifyingCache;
 					}
@@ -146,28 +173,29 @@ namespace YooAsset
 					{
 						_steps = ESteps.Done;
 						Status = EOperationStatus.Failed;
-						Error = $"URL : {_downloader.URL} Error : remote patch manifest content is invalid";
+						Error = $"URL : {_downloader2.URL} Error : remote patch manifest content is invalid";
 					}
 				}
-				_downloader.Dispose();
+				_downloader2.Dispose();
 			}
 
 			if (_steps == ESteps.InitVerifyingCache)
 			{
-				_patchCacheVerifier.InitVerifier(_impl, false);
+				var verifyInfos = _impl.GetVerifyInfoList(false);
+				_cacheVerifier.InitVerifier(verifyInfos);
 				_verifyTime = UnityEngine.Time.realtimeSinceStartup;
 				_steps = ESteps.UpdateVerifyingCache;
 			}
 
 			if (_steps == ESteps.UpdateVerifyingCache)
 			{
-				Progress = _patchCacheVerifier.GetVerifierProgress();
+				Progress = _cacheVerifier.GetVerifierProgress();
-				if (_patchCacheVerifier.UpdateVerifier())
+				if (_cacheVerifier.UpdateVerifier())
 				{
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Succeed;
 					float costTime = UnityEngine.Time.realtimeSinceStartup - _verifyTime;
-					YooLogger.Log($"Verify result : Success {_patchCacheVerifier.VerifySuccessCount}, Fail {_patchCacheVerifier.VerifyFailCount}, Elapsed time {costTime} seconds");
+					YooLogger.Log($"Verify result : Success {_cacheVerifier.VerifySuccessList.Count}, Fail {_cacheVerifier.VerifyFailList.Count}, Elapsed time {costTime} seconds");
 				}
 			}
 		}
@@ -187,7 +215,7 @@ namespace YooAsset
 		/// <summary>
 		/// 解析并保存远端请求的补丁清单
 		/// </summary>
-		private bool ParseAndSaveRemotePatchManifest(string packageName, string packageCRC, string content)
+		private bool ParseAndSaveRemotePatchManifest(string packageName, string packageVersion, string content)
 		{
 			try
 			{
@@ -195,7 +223,7 @@ namespace YooAsset
 				_impl.SetLocalPatchManifest(remotePatchManifest);
 
 				YooLogger.Log("Save remote patch manifest file.");
-				string fileName = YooAssetSettingsData.GetPatchManifestFileName(packageName, packageCRC);
+				string fileName = YooAssetSettingsData.GetPatchManifestFileName(packageName, packageVersion);
 				string savePath = PathHelper.MakePersistentLoadPath(fileName);
 				PatchManifest.Serialize(savePath, remotePatchManifest);
 				return true;
@@ -211,10 +239,10 @@ namespace YooAsset
 		/// 加载沙盒内的补丁清单
 		/// 注意：在加载本地补丁清单之前，已经验证过文件的哈希值
 		/// </summary>
-		private void LoadSandboxPatchManifest(string packageName, string packageCRC)
+		private void LoadSandboxPatchManifest(string packageName, string packageVersion)
 		{
 			YooLogger.Log("Load sandbox patch manifest file.");
-			string fileName = YooAssetSettingsData.GetPatchManifestFileName(packageName, packageCRC);
+			string fileName = YooAssetSettingsData.GetPatchManifestFileName(packageName, packageVersion);
 			string filePath = PathHelper.MakePersistentLoadPath(fileName);
 			string jsonData = File.ReadAllText(filePath);
 			var sandboxPatchManifest = PatchManifest.Deserialize(jsonData);
@@ -225,12 +253,12 @@ namespace YooAsset
 		/// 获取沙盒内补丁清单文件的哈希值
 		/// 注意：如果沙盒内补丁清单文件不存在，返回空字符串
 		/// </summary>
-		private string GetSandboxPatchManifestFileHash(string packageName, string packageCRC)
+		private string GetSandboxPatchManifestFileHash(string packageName, string packageVersion)
 		{
-			string fileName = YooAssetSettingsData.GetPatchManifestFileName(packageName, packageCRC);
+			string fileName = YooAssetSettingsData.GetPatchManifestFileName(packageName, packageVersion);
 			string filePath = PathHelper.MakePersistentLoadPath(fileName);
 			if (File.Exists(filePath))
-				return HashUtility.FileCRC32(filePath);
+				return HashUtility.FileMD5(filePath);
 			else
 				return string.Empty;
 		}
@@ -252,21 +280,21 @@ namespace YooAsset
 
 		private readonly HostPlayModeImpl _impl;
 		private readonly string _packageName;
-		private readonly string _packageCRC;
+		private readonly string _packageVersion;
 		private ESteps _steps = ESteps.None;
-		private PatchCacheVerifier _patchCacheVerifier;
+		private CacheVerifier _cacheVerifier;
 		private float _verifyTime;
 
-		internal HostPlayModeWeaklyUpdateManifestOperation(HostPlayModeImpl impl, string packageName, string packageCRC)
+		internal HostPlayModeWeaklyUpdateManifestOperation(HostPlayModeImpl impl, string packageName, string packageVersion)
 		{
 			_impl = impl;
 			_packageName = packageName;
-			_packageCRC = packageCRC;
+			_packageVersion = packageVersion;
 
 #if UNITY_WEBGL
-			_patchCacheVerifier = new PatchCacheVerifierWithoutThread();
+			_cacheVerifier = new CacheVerifierWithoutThread();
 #else
-			_patchCacheVerifier = new PatchCacheVerifierWithThread();
+			_cacheVerifier = new CacheVerifierWithThread();
 #endif
 		}
 		internal override void Start()
@@ -280,42 +308,47 @@ namespace YooAsset
 
 			if (_steps == ESteps.LoadSandboxManifestHash)
 			{
-				LoadSandboxPatchManifest(_packageName, _packageCRC);
+				LoadSandboxPatchManifest(_packageName, _packageVersion);
 				_steps = ESteps.InitVerifyingCache;
 			}
 
 			if (_steps == ESteps.InitVerifyingCache)
 			{
-				if (_patchCacheVerifier.InitVerifier(_impl, true))
+				var verifyInfos = _impl.GetVerifyInfoList(true);
-				{
+				_cacheVerifier.InitVerifier(verifyInfos);
-					_verifyTime = UnityEngine.Time.realtimeSinceStartup;
+				_verifyTime = UnityEngine.Time.realtimeSinceStartup;
-					_steps = ESteps.UpdateVerifyingCache;
+				_steps = ESteps.UpdateVerifyingCache;
-				}
-				else
-				{
-					_steps = ESteps.Done;
-					Status = EOperationStatus.Failed;
-					Error = $"The package resource {_packageName}_{_packageCRC} content is not complete !";
-				}
 			}
 
 			if (_steps == ESteps.UpdateVerifyingCache)
 			{
-				Progress = _patchCacheVerifier.GetVerifierProgress();
+				Progress = _cacheVerifier.GetVerifierProgress();
-				if (_patchCacheVerifier.UpdateVerifier())
+				if (_cacheVerifier.UpdateVerifier())
 				{
 					float costTime = UnityEngine.Time.realtimeSinceStartup - _verifyTime;
-					YooLogger.Log($"Verify result : Success {_patchCacheVerifier.VerifySuccessCount}, Fail {_patchCacheVerifier.VerifyFailCount}, Elapsed time {costTime} seconds");
+					YooLogger.Log($"Verify result : Success {_cacheVerifier.VerifySuccessList.Count}, Fail {_cacheVerifier.VerifyFailList.Count}, Elapsed time {costTime} seconds");
-					if (_patchCacheVerifier.VerifyFailCount > 0)
+
+					bool verifySucceed = true;
+					foreach (var verifyInfo in _cacheVerifier.VerifyFailList)
+					{
+						// 注意：跳过内置资源文件
+						if (verifyInfo.IsBuildinFile)
+							continue;
+
+						verifySucceed = false;
+						YooLogger.Warning($"Failed verify file : {verifyInfo.VerifyFilePath}");
+					}
+
+					if (verifySucceed)
 					{
 						_steps = ESteps.Done;
-						Status = EOperationStatus.Failed;
+						Status = EOperationStatus.Succeed;
-						Error = $"The package resource {_packageName}_{_packageCRC} content has verify failed file !";
 					}
 					else
 					{
 						_steps = ESteps.Done;
-						Status = EOperationStatus.Succeed;
+						Status = EOperationStatus.Failed;
+						Error = $"The package resource {_packageName}_{_packageVersion} content has verify failed file !";
 					}
 				}
 			}
@@ -325,9 +358,9 @@ namespace YooAsset
 		/// 加载沙盒内的补丁清单
 		/// 注意：在加载本地补丁清单之前，未验证过文件的哈希值
 		/// </summary>
-		private void LoadSandboxPatchManifest(string packageName, string packageCRC)
+		private void LoadSandboxPatchManifest(string packageName, string packageVersion)
 		{
-			string fileName = YooAssetSettingsData.GetPatchManifestFileName(packageName, packageCRC);
+			string fileName = YooAssetSettingsData.GetPatchManifestFileName(packageName, packageVersion);
 			string filePath = PathHelper.MakePersistentLoadPath(fileName);
 			if (File.Exists(filePath))
 			{

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

@@ -12,7 +12,8 @@ namespace YooAsset
 		/// </summary>
 		/// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
 		/// <param name="failedTryAgain">下载失败的重试次数</param>
-		public abstract PackageDownloaderOperation CreatePackageDownloader(int downloadingMaxNumber, int failedTryAgain);
+		/// <param name="timeout">超时时间（单位：秒）</param>
+		public abstract PackageDownloaderOperation CreatePackageDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout);
 	}
 
 	/// <summary>
@@ -31,10 +32,10 @@ namespace YooAsset
 		/// <summary>
 		/// 创建包裹下载器
 		/// </summary>
-		public override PackageDownloaderOperation CreatePackageDownloader(int downloadingMaxNumber, int failedTryAgain)
+		public override PackageDownloaderOperation CreatePackageDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout)
 		{
 			List<BundleInfo> downloadList = new List<BundleInfo>();
-			var operation = new PackageDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain);
+			var operation = new PackageDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain, timeout);
 			return operation;
 		}
 	}
@@ -55,10 +56,10 @@ namespace YooAsset
 		/// <summary>
 		/// 创建包裹下载器
 		/// </summary>
-		public override PackageDownloaderOperation CreatePackageDownloader(int downloadingMaxNumber, int failedTryAgain)
+		public override PackageDownloaderOperation CreatePackageDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout)
 		{
 			List<BundleInfo> downloadList = new List<BundleInfo>();
-			var operation = new PackageDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain);
+			var operation = new PackageDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain, timeout);
 			return operation;
 		}
 	}
@@ -79,17 +80,17 @@ namespace YooAsset
 		private static int RequestCount = 0;
 		private readonly HostPlayModeImpl _impl;
 		private readonly string _packageName;
-		private readonly string _packageCRC;
+		private readonly string _packageVersion;
 		private readonly int _timeout;
 		private ESteps _steps = ESteps.None;
 		private UnityWebDataRequester _downloader;
 		private PatchManifest _remotePatchManifest;
 
-		internal HostPlayModeUpdatePackageOperation(HostPlayModeImpl impl, string packageName, string packageCRC, int timeout)
+		internal HostPlayModeUpdatePackageOperation(HostPlayModeImpl impl, string packageName, string packageVersion, int timeout)
 		{
 			_impl = impl;
 			_packageName = packageName;
-			_packageCRC = packageCRC;
+			_packageVersion = packageVersion;
 			_timeout = timeout;
 		}
 		internal override void Start()
@@ -104,7 +105,7 @@ namespace YooAsset
 
 			if (_steps == ESteps.LoadWebManifest)
 			{
-				string fileName = YooAssetSettingsData.GetPatchManifestFileName(_packageName, _packageCRC);
+				string fileName = YooAssetSettingsData.GetPatchManifestFileName(_packageName, _packageVersion);
 				string webURL = GetPatchManifestRequestURL(fileName);
 				YooLogger.Log($"Beginning to request patch manifest : {webURL}");
 				_downloader = new UnityWebDataRequester();
@@ -147,18 +148,18 @@ namespace YooAsset
 		/// <summary>
 		/// 创建包裹下载器
 		/// </summary>
-		public override PackageDownloaderOperation CreatePackageDownloader(int downloadingMaxNumber, int failedTryAgain)
+		public override PackageDownloaderOperation CreatePackageDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout)
 		{
 			if (Status == EOperationStatus.Succeed)
 			{
 				List<BundleInfo> downloadList = GetDownloadList();
-				var operation = new PackageDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain);
+				var operation = new PackageDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain, timeout);
 				return operation;
 			}
 			else
 			{
 				YooLogger.Error($"{nameof(UpdatePackageOperation)} status is failed !");
-				var operation = new PackageDownloaderOperation(null, downloadingMaxNumber, failedTryAgain);
+				var operation = new PackageDownloaderOperation(null, downloadingMaxNumber, failedTryAgain, timeout);
 				return operation;
 			}
 		}

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

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using UnityEngine;
 
 namespace YooAsset
 {
@@ -9,9 +10,9 @@ namespace YooAsset
 	public abstract class UpdateStaticVersionOperation : AsyncOperationBase
 	{
 		/// <summary>
-		/// 包裹文件的哈希值
+		/// 当前最新的包裹版本
 		/// </summary>
-		public string PackageCRC { protected set; get; } = string.Empty;
+		public string PackageVersion { protected set; get; }
 	}
 
 	/// <summary>
@@ -80,8 +81,8 @@ namespace YooAsset
 
 			if (_steps == ESteps.LoadStaticVersion)
 			{
-				string versionFileName = YooAssetSettingsData.GetStaticVersionFileName(_packageName);
+				string fileName = YooAssetSettingsData.GetPatchManifestVersionFileName(_packageName);
-				string webURL = GetStaticVersionRequestURL(versionFileName);
+				string webURL = GetStaticVersionRequestURL(fileName);
 				YooLogger.Log($"Beginning to request static version : {webURL}");
 				_downloader = new UnityWebDataRequester();
 				_downloader.SendRequest(webURL, _timeout);
@@ -102,16 +103,15 @@ namespace YooAsset
 				}
 				else
 				{
-					string packageCRC = _downloader.GetText();
+					PackageVersion = _downloader.GetText();
-					if(string.IsNullOrEmpty(packageCRC))
+					if (string.IsNullOrEmpty(PackageVersion))
 					{
 						_steps = ESteps.Done;
 						Status = EOperationStatus.Failed;
-						Error = $"URL : {_downloader.URL} Error : static version content is empty.";
+						Error = $"Static package version is empty : {_downloader.URL}";
 					}
 					else
 					{
-						PackageCRC = packageCRC;
 						_steps = ESteps.Done;
 						Status = EOperationStatus.Succeed;
 					}

Assets/YooAsset/Runtime/PatchSystem/PatchManifest.cs

@@ -32,6 +32,11 @@ namespace YooAsset
 		/// </summary>
 		public string PackageName;
 
+		/// <summary>
+		/// 资源包裹的版本信息
+		/// </summary>
+		public string PackageVersion;
+
 		/// <summary>
 		/// 资源列表（主动收集的资源列表）
 		/// </summary>
@@ -142,6 +147,23 @@ namespace YooAsset
 			}
 		}
 
+		/// <summary>
+		/// 尝试映射为资源路径
+		/// </summary>
+		public string TryMappingToAssetPath(string location)
+		{
+			if (string.IsNullOrEmpty(location))
+				return string.Empty;
+
+			if (_locationToLower)
+				location = location.ToLower();
+
+			if (AssetPathMapping.TryGetValue(location, out string assetPath))
+				return assetPath;
+			else
+				return string.Empty;
+		}
+
 		/// <summary>
 		/// 获取主资源包
 		/// 注意：传入的资源路径一定合法有效！
@@ -212,6 +234,19 @@ namespace YooAsset
 			return BundleDic.TryGetValue(bundleName, out result);
 		}
 
+		/// <summary>
+		/// 是否包含资源文件
+		/// </summary>
+		public bool IsIncludeBundleFile(string fileName)
+		{
+			foreach (var patchBundle in BundleList)
+			{
+				if (patchBundle.FileName == fileName)
+					return true;
+			}
+			return false;
+		}
+
 
 		/// <summary>
 		/// 序列化

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

@@ -10,12 +10,12 @@ namespace YooAsset
 		/// <summary>
 		/// 编辑器下模拟构建补丁清单
 		/// </summary>
-		public static string SimulateBuild(string packageName, bool enableAddressable)
+		public static string SimulateBuild(string packageName)
 		{
 			if (_classType == null)
 				_classType = Assembly.Load("YooAsset.Editor").GetType("YooAsset.Editor.AssetBundleSimulateBuilder");
 
-			string manifestFilePath = (string)InvokePublicStaticMethod(_classType, "SimulateBuild", packageName, enableAddressable);
+			string manifestFilePath = (string)InvokePublicStaticMethod(_classType, "SimulateBuild", packageName);
 			return manifestFilePath;
 		}
 
@@ -39,7 +39,7 @@ namespace YooAsset
 		/// <summary>
 		/// 编辑器下模拟构建补丁清单
 		/// </summary>
-		public static string SimulateBuild(string packageName, bool enableAddressable) { throw new System.Exception("Only support in unity editor !"); }
+		public static string SimulateBuild(string packageName) { throw new System.Exception("Only support in unity editor !"); }
 	}
 }
 #endif

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

@@ -20,7 +20,16 @@ namespace YooAsset
 			return operation;
 		}
 
-		// 设置资源清单
+		/// <summary>
+		/// 获取包裹的版本信息
+		/// </summary>
+		public string GetPackageVersion()
+		{
+			if (_simulatePatchManifest == null)
+				return string.Empty;
+			return _simulatePatchManifest.PackageVersion;
+		}
+
 		internal void SetSimulatePatchManifest(PatchManifest patchManifest)
 		{
 			_simulatePatchManifest = patchManifest;
@@ -57,10 +66,18 @@ namespace YooAsset
 		{
 			return _simulatePatchManifest.MappingToAssetPath(location);
 		}
+		string IBundleServices.TryMappingToAssetPath(string location)
+		{
+			return _simulatePatchManifest.TryMappingToAssetPath(location);
+		}
 		string IBundleServices.GetPackageName()
 		{
 			return _simulatePatchManifest.PackageName;
 		}
+		bool IBundleServices.IsIncludeBundleFile(string fileName)
+		{
+			return _simulatePatchManifest.IsIncludeBundleFile(fileName);
+		}
 		#endregion
 	}
 }

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

@@ -19,18 +19,28 @@ namespace YooAsset
 		/// <summary>
 		/// 异步初始化
 		/// </summary>
-		public InitializationOperation InitializeAsync(bool locationToLower, string defaultHostServer, string fallbackHostServer, IQueryServices queryServices)
+		public InitializationOperation InitializeAsync(bool locationToLower, string defaultHostServer, string fallbackHostServer, IQueryServices queryServices, string packageName)
 		{
 			_locationToLower = locationToLower;
 			_defaultHostServer = defaultHostServer;
 			_fallbackHostServer = fallbackHostServer;
 			_queryServices = queryServices;
 
-			var operation = new HostPlayModeInitializationOperation();
+			var operation = new HostPlayModeInitializationOperation(this, packageName);
 			OperationSystem.StartOperation(operation);
 			return operation;
 		}
 
+		/// <summary>
+		/// 获取包裹的版本信息
+		/// </summary>
+		public string GetPackageVersion()
+		{
+			if (LocalPatchManifest == null)
+				return string.Empty;
+			return LocalPatchManifest.PackageVersion;
+		}
+
 		/// <summary>
 		/// 异步更新资源版本号
 		/// </summary>
@@ -44,9 +54,9 @@ namespace YooAsset
 		/// <summary>
 		/// 异步更新补丁清单
 		/// </summary>
-		public UpdateManifestOperation UpdatePatchManifestAsync(string packageName, string packageCRC, int timeout)
+		public UpdateManifestOperation UpdatePatchManifestAsync(string packageName, string packageVersion, int timeout)
 		{
-			var operation = new HostPlayModeUpdateManifestOperation(this, packageName, packageCRC, timeout);
+			var operation = new HostPlayModeUpdateManifestOperation(this, packageName, packageVersion, timeout);
 			OperationSystem.StartOperation(operation);
 			return operation;
 		}
@@ -54,9 +64,9 @@ namespace YooAsset
 		/// <summary>
 		/// 异步更新补丁清单（弱联网）
 		/// </summary>
-		public UpdateManifestOperation WeaklyUpdatePatchManifestAsync(string packageName, string packageCRC)
+		public UpdateManifestOperation WeaklyUpdatePatchManifestAsync(string packageName, string packageVersion)
 		{
-			var operation = new HostPlayModeWeaklyUpdateManifestOperation(this, packageName, packageCRC);
+			var operation = new HostPlayModeWeaklyUpdateManifestOperation(this, packageName, packageVersion);
 			OperationSystem.StartOperation(operation);
 			return operation;
 		}
@@ -64,9 +74,9 @@ namespace YooAsset
 		/// <summary>
 		/// 异步更新资源包裹
 		/// </summary>
-		public UpdatePackageOperation UpdatePackageAsync(string packageName, string packageCRC, int timeout)
+		public UpdatePackageOperation UpdatePackageAsync(string packageName, string packageVersion, int timeout)
 		{
-			var operation = new HostPlayModeUpdatePackageOperation(this, packageName, packageCRC, timeout);
+			var operation = new HostPlayModeUpdatePackageOperation(this, packageName, packageVersion, timeout);
 			OperationSystem.StartOperation(operation);
 			return operation;
 		}
@@ -74,10 +84,10 @@ namespace YooAsset
 		/// <summary>
 		/// 创建下载器
 		/// </summary>
-		public PatchDownloaderOperation CreatePatchDownloaderByAll(int fileLoadingMaxNumber, int failedTryAgain)
+		public PatchDownloaderOperation CreatePatchDownloaderByAll(int fileLoadingMaxNumber, int failedTryAgain, int timeout)
 		{
 			List<BundleInfo> downloadList = GetDownloadListByAll();
-			var operation = new PatchDownloaderOperation(downloadList, fileLoadingMaxNumber, failedTryAgain);
+			var operation = new PatchDownloaderOperation(downloadList, fileLoadingMaxNumber, failedTryAgain, timeout);
 			return operation;
 		}
 		private List<BundleInfo> GetDownloadListByAll()
@@ -102,10 +112,10 @@ namespace YooAsset
 		/// <summary>
 		/// 创建下载器
 		/// </summary>
-		public PatchDownloaderOperation CreatePatchDownloaderByTags(string[] tags, int fileLoadingMaxNumber, int failedTryAgain)
+		public PatchDownloaderOperation CreatePatchDownloaderByTags(string[] tags, int fileLoadingMaxNumber, int failedTryAgain, int timeout)
 		{
 			List<BundleInfo> downloadList = GetDownloadListByTags(tags);
-			var operation = new PatchDownloaderOperation(downloadList, fileLoadingMaxNumber, failedTryAgain);
+			var operation = new PatchDownloaderOperation(downloadList, fileLoadingMaxNumber, failedTryAgain, timeout);
 			return operation;
 		}
 		private List<BundleInfo> GetDownloadListByTags(string[] tags)
@@ -142,10 +152,10 @@ namespace YooAsset
 		/// <summary>
 		/// 创建下载器
 		/// </summary>
-		public PatchDownloaderOperation CreatePatchDownloaderByPaths(AssetInfo[] assetInfos, int fileLoadingMaxNumber, int failedTryAgain)
+		public PatchDownloaderOperation CreatePatchDownloaderByPaths(AssetInfo[] assetInfos, int fileLoadingMaxNumber, int failedTryAgain, int timeout)
 		{
 			List<BundleInfo> downloadList = GetDownloadListByPaths(assetInfos);
-			var operation = new PatchDownloaderOperation(downloadList, fileLoadingMaxNumber, failedTryAgain);
+			var operation = new PatchDownloaderOperation(downloadList, fileLoadingMaxNumber, failedTryAgain, timeout);
 			return operation;
 		}
 		private List<BundleInfo> GetDownloadListByPaths(AssetInfo[] assetInfos)
@@ -194,10 +204,10 @@ namespace YooAsset
 		/// <summary>
 		/// 创建解压器
 		/// </summary>
-		public PatchUnpackerOperation CreatePatchUnpackerByTags(string[] tags, int fileUpackingMaxNumber, int failedTryAgain)
+		public PatchUnpackerOperation CreatePatchUnpackerByTags(string[] tags, int fileUpackingMaxNumber, int failedTryAgain, int timeout)
 		{
 			List<BundleInfo> unpcakList = GetUnpackListByTags(tags);
-			var operation = new PatchUnpackerOperation(unpcakList, fileUpackingMaxNumber, failedTryAgain);
+			var operation = new PatchUnpackerOperation(unpcakList, fileUpackingMaxNumber, failedTryAgain, timeout);
 			return operation;
 		}
 		private List<BundleInfo> GetUnpackListByTags(string[] tags)
@@ -225,10 +235,10 @@ namespace YooAsset
 		/// <summary>
 		/// 创建解压器
 		/// </summary>
-		public PatchUnpackerOperation CreatePatchUnpackerByAll(int fileUpackingMaxNumber, int failedTryAgain)
+		public PatchUnpackerOperation CreatePatchUnpackerByAll(int fileUpackingMaxNumber, int failedTryAgain, int timeout)
 		{
 			List<BundleInfo> unpcakList = GetUnpackListByAll();
-			var operation = new PatchUnpackerOperation(unpcakList, fileUpackingMaxNumber, failedTryAgain);
+			var operation = new PatchUnpackerOperation(unpcakList, fileUpackingMaxNumber, failedTryAgain, timeout);
 			return operation;
 		}
 		private List<BundleInfo> GetUnpackListByAll()
@@ -278,6 +288,38 @@ namespace YooAsset
 			return bundleInfo;
 		}
 
+		internal List<VerifyInfo> GetVerifyInfoList(bool weaklyUpdateMode)
+		{
+			List<VerifyInfo> result = new List<VerifyInfo>(LocalPatchManifest.BundleList.Count);
+
+			// 遍历所有文件然后验证并缓存合法文件
+			foreach (var patchBundle in LocalPatchManifest.BundleList)
+			{
+				// 忽略缓存文件
+				if (CacheSystem.IsCached(patchBundle))
+					continue;
+
+				// 注意：在弱联网模式下，我们需要验证指定资源版本的所有资源完整性
+				if (weaklyUpdateMode)
+				{
+					bool isBuildinFile = IsBuildinPatchBundle(patchBundle);
+					VerifyInfo verifyInfo = new VerifyInfo(isBuildinFile, patchBundle);
+					result.Add(verifyInfo);
+				}
+				else
+				{
+					string filePath = patchBundle.CachedFilePath;
+					if (File.Exists(filePath))
+					{
+						bool isBuildinFile = IsBuildinPatchBundle(patchBundle);
+						VerifyInfo verifyInfo = new VerifyInfo(isBuildinFile, patchBundle);
+						result.Add(verifyInfo);
+					}
+				}
+			}
+
+			return result;
+		}
 		internal void SetLocalPatchManifest(PatchManifest patchManifest)
 		{
 			LocalPatchManifest = patchManifest;
@@ -350,10 +392,18 @@ namespace YooAsset
 		{
 			return LocalPatchManifest.MappingToAssetPath(location);
 		}
+		string IBundleServices.TryMappingToAssetPath(string location)
+		{
+			return LocalPatchManifest.TryMappingToAssetPath(location);
+		}
 		string IBundleServices.GetPackageName()
 		{
 			return LocalPatchManifest.PackageName;
 		}
+		bool IBundleServices.IsIncludeBundleFile(string fileName)
+		{
+			return LocalPatchManifest.IsIncludeBundleFile(fileName);
+		}
 		#endregion
 	}
 }

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

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.IO;
 
 namespace YooAsset
 {
@@ -12,15 +13,46 @@ namespace YooAsset
 		/// <summary>
 		/// 异步初始化
 		/// </summary>
-		public InitializationOperation InitializeAsync(bool locationToLower, string buildinPackageName)
+		public InitializationOperation InitializeAsync(bool locationToLower, string packageName)
 		{
 			_locationToLower = locationToLower;
-			var operation = new OfflinePlayModeInitializationOperation(this, buildinPackageName);
+			var operation = new OfflinePlayModeInitializationOperation(this, packageName);
 			OperationSystem.StartOperation(operation);
 			return operation;
 		}
 
-		// 设置资源清单
+		/// <summary>
+		/// 获取包裹的版本信息
+		/// </summary>
+		public string GetPackageVersion()
+		{
+			if (_appPatchManifest == null)
+				return string.Empty;
+			return _appPatchManifest.PackageVersion;
+		}
+
+		internal List<VerifyInfo> GetVerifyInfoList()
+		{
+			List<VerifyInfo> result = new List<VerifyInfo>(_appPatchManifest.BundleList.Count);
+
+			// 遍历所有文件然后验证并缓存合法文件
+			foreach (var patchBundle in _appPatchManifest.BundleList)
+			{
+				// 忽略缓存文件
+				if (CacheSystem.IsCached(patchBundle))
+					continue;
+
+				string filePath = patchBundle.CachedFilePath;
+				if (File.Exists(filePath))
+				{
+					bool isBuildinFile = true;
+					VerifyInfo verifyInfo = new VerifyInfo(isBuildinFile, patchBundle);
+					result.Add(verifyInfo);
+				}
+			}
+
+			return result;
+		}
 		internal void SetAppPatchManifest(PatchManifest patchManifest)
 		{
 			_appPatchManifest = patchManifest;
@@ -85,10 +117,18 @@ namespace YooAsset
 		{
 			return _appPatchManifest.MappingToAssetPath(location);
 		}
+		string IBundleServices.TryMappingToAssetPath(string location)
+		{
+			return _appPatchManifest.TryMappingToAssetPath(location);
+		}
 		string IBundleServices.GetPackageName()
 		{
 			return _appPatchManifest.PackageName;
 		}
+		bool IBundleServices.IsIncludeBundleFile(string fileName)
+		{
+			return _appPatchManifest.IsIncludeBundleFile(fileName);
+		}
 		#endregion
 	}
 }

Assets/YooAsset/Runtime/Services/IBundleServices.cs

@@ -28,9 +28,19 @@ namespace YooAsset
 		/// </summary>
 		string MappingToAssetPath(string location);
 
+		/// <summary>
+		/// 尝试映射为资源路径
+		/// </summary>
+		string TryMappingToAssetPath(string location);
+
 		/// <summary>
 		/// 获取所属的包裹名
 		/// </summary>
 		string GetPackageName();
+
+		/// <summary>
+		/// 是否包含资源文件
+		/// </summary>
+		bool IsIncludeBundleFile(string fileName);
 	}
 }