Update CHANGELOG.md

修复资源加载代码逻辑错误。

Assets/YooAsset/CHANGELOG.md

@@ -2,6 +2,75 @@
 
 All notable changes to this package will be documented in this file.
 
+## [1.4.4-preview] - 2023-02-14
+
+### Fixed
+
+- (#65)修复了AssetBundle构建宏逻辑错误。
+- 修复了AssetBundle加载宏逻辑错误。
+
+## [1.4.3-preview] - 2023-02-10
+
+全新的缓存系统！
+
+### Fixed
+
+- 修复了WebGL平台本地文件验证报错。
+- 修复了WEBGL平台加载原生文件失败的问题。
+- 修复了通过Handle句柄查询资源包下载进度为零的问题。
+
+### Changed
+
+- 着色器变种收集增加分批次处理功能。
+- Unity2021版本开始不再支持内置构建管线。
+
+### Removed
+
+- 太空战机DEMO移除了BetterStreamingAssets插件。
+
+## [1.4.2-preview] - 2023-01-03
+
+### Fixed
+
+- 修复了清单解析异步操作的进度条变化错误。
+- 修复了更新资源清单错误计算超时时间的问题。
+
+## [1.4.1-preview] - 2022-12-26
+
+### Fixed
+
+- 修复了开启UniqueBundleName选项后，SBP构建报错的问题。
+
+### Added
+
+- 新增了AssetsPackage.PreDownloadPackageAsync()方法
+
+  ````c#
+  /// <summary>
+  /// 预下载指定版本的包裹资源
+  /// </summary>
+  /// <param name="packageVersion">下载的包裹版本</param>
+  /// <param name="timeout">超时时间（默认值：60秒）</param>
+  public PreDownloadPackageOperation PreDownloadPackageAsync(string packageVersion, int timeout = 60)
+  ````
+
+- 新增了OperationHandleBase.GetDownloadReport()方法
+
+  ````c#
+  /// <summary>
+  /// 获取下载报告
+  /// </summary>
+  public DownloadReport GetDownloadReport();
+  ````
+
+### Changed
+
+- 优化了资源清单更新流程，支持缓存下载的清单。
+- 优化了清单文件的解析流程，支持分帧解析避免卡顿。
+- 优化了缓存文件的验证流程，支持分帧处理。
+- 初始化的时候支持覆盖安装检测，然后清理所有的缓存清单文件。
+- ClearPackageUnusedCacheFilesAsync重名为ClearUnusedCacheFilesAsync
+
 ## [1.4.0-preview] - 2022-12-04
 
 ### Fixed

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs

@@ -220,15 +220,27 @@ namespace YooAsset.Editor
 
 		private void RefreshWindow()
 		{
+			var buildPipeline = AssetBundleBuilderSettingData.Setting.BuildPipeline;
 			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);
+			if (buildPipeline == EBuildPipeline.BuiltinBuildPipeline)
-			_outputNameStyleField.SetEnabled(enableElement);
+			{
-			_copyBuildinFileOptionField.SetEnabled(enableElement);
+				_compressionField.SetEnabled(enableElement);
-			_copyBuildinFileTagsField.SetEnabled(enableElement);
+				_outputNameStyleField.SetEnabled(enableElement);
+				_copyBuildinFileOptionField.SetEnabled(enableElement);
+				_copyBuildinFileTagsField.SetEnabled(enableElement);
+			}
+			else
+			{
+				_compressionField.SetEnabled(true);
+				_outputNameStyleField.SetEnabled(true);
+				_copyBuildinFileOptionField.SetEnabled(true);
+				_copyBuildinFileTagsField.SetEnabled(true);
+			}
+
 			_copyBuildinFileTagsField.visible = tagsFiledVisible;
 		}
 		private void SaveBtn_clicked()

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleSimulateBuilder.cs

@@ -23,7 +23,7 @@ namespace YooAsset.Editor
 			var buildResult = builder.Run(buildParameters);
 			if (buildResult.Success)
 			{
-				string manifestFileName = YooAssetSettingsData.GetPatchManifestBinaryFileName(buildParameters.PackageName, buildParameters.PackageVersion);
+				string manifestFileName = YooAssetSettingsData.GetManifestBinaryFileName(buildParameters.PackageName, buildParameters.PackageVersion);
 				string manifestFilePath = $"{buildResult.OutputPackageDirectory}/{manifestFileName}";
 				return manifestFilePath;
 			}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildAssetInfo.cs

@@ -175,8 +175,7 @@ namespace YooAsset.Editor
 
 				if (IsShaderAsset)
 				{
-					string shareBundleName = YooAssetSettingsData.GetUnityShadersBundleFullName();
+					_shareBundleName = YooAssetSettingsData.GetUnityShadersBundleFullName(uniqueBundleName, packageName);
-					_shareBundleName = EditorTools.GetRegularPath(shareBundleName).ToLower();
 				}
 				else
 				{
@@ -184,28 +183,34 @@ namespace YooAsset.Editor
 					{
 						IPackRule packRule = PackDirectory.StaticPackRule;
 						var bundleName = packRule.GetBundleName(new PackRuleData(AssetPath));
-						var shareBundleName = $"share_{bundleName}.{YooAssetSettingsData.Setting.AssetBundleFileVariant}";
+						if (YooAssetSettingsData.Setting.RegularBundleName)
-						_shareBundleName = EditorTools.GetRegularPath(shareBundleName).ToLower();
+							bundleName = EditorTools.GetRegularPath(bundleName).Replace('/', '_').Replace('.', '_').ToLower();
-					}
+						else
-				}
+							bundleName = EditorTools.GetRegularPath(bundleName).ToLower();
 
-				if (uniqueBundleName)
+						if (uniqueBundleName)
-				{
+							_shareBundleName = $"{packageName.ToLower()}_share_{bundleName}.{YooAssetSettingsData.Setting.AssetBundleFileVariant}";
-					if (string.IsNullOrEmpty(_shareBundleName) == false)
+						else
-						_shareBundleName = $"{packageName.ToLower()}_{_shareBundleName}";
+							_shareBundleName = $"share_{bundleName}.{YooAssetSettingsData.Setting.AssetBundleFileVariant}";
+					}
 				}
 			}
 			else
 			{
 				if (IsRawAsset)
 				{
-					string mainBundleName = $"{_mainBundleName}.{YooAssetSettingsData.Setting.RawFileVariant}";
+					string mainBundleName = $"{_mainBundleName}.{YooAssetSettingsData.Setting.RawBundleFileVariant}";
-					_mainBundleName = EditorTools.GetRegularPath(mainBundleName).ToLower();
+					_mainBundleName = mainBundleName.ToLower();
 				}
 				else
 				{
 					string mainBundleName = $"{_mainBundleName}.{YooAssetSettingsData.Setting.AssetBundleFileVariant}";
-					_mainBundleName = EditorTools.GetRegularPath(mainBundleName).ToLower(); ;
+					_mainBundleName = mainBundleName.ToLower(); ;
+				}
+
+				if (uniqueBundleName)
+				{
+					_mainBundleName = $"{packageName.ToLower()}_{_mainBundleName}";
 				}
 			}
 		}

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

@@ -33,7 +33,7 @@ namespace YooAsset.Editor
 			// 开始构建
 			IBundleBuildResults buildResults;
 			var buildParameters = buildParametersContext.GetSBPBuildParameters();
-			var shadersBunldeName = YooAssetSettingsData.GetUnityShadersBundleFullName();
+			var shadersBunldeName = YooAssetSettingsData.GetUnityShadersBundleFullName(buildMapContext.UniqueBundleName, buildParametersContext.Parameters.PackageName);
 			var taskList = SBPBuildTasks.Create(shadersBunldeName);
 			ReturnCode exitCode = ContentPipeline.BuildAssetBundles(buildParameters, buildContent, out buildResults, taskList);
 			if (exitCode < 0)

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

@@ -45,7 +45,7 @@ namespace YooAsset.Editor
 
 			// 拷贝补丁清单文件
 			{
-				string fileName = YooAssetSettingsData.GetPatchManifestBinaryFileName(buildPackageName, buildPackageVersion);
+				string fileName = YooAssetSettingsData.GetManifestBinaryFileName(buildPackageName, buildPackageVersion);
 				string sourcePath = $"{packageOutputDirectory}/{fileName}";
 				string destPath = $"{streamingAssetsDirectory}/{fileName}";
 				EditorTools.CopyFile(sourcePath, destPath, true);
@@ -53,7 +53,7 @@ namespace YooAsset.Editor
 
 			// 拷贝补丁清单哈希文件
 			{
-				string fileName = YooAssetSettingsData.GetPatchManifestHashFileName(buildPackageName, buildPackageVersion);
+				string fileName = YooAssetSettingsData.GetPackageHashFileName(buildPackageName, buildPackageVersion);
 				string sourcePath = $"{packageOutputDirectory}/{fileName}";
 				string destPath = $"{streamingAssetsDirectory}/{fileName}";
 				EditorTools.CopyFile(sourcePath, destPath, true);
@@ -61,7 +61,7 @@ namespace YooAsset.Editor
 
 			// 拷贝补丁清单版本文件
 			{
-				string fileName = YooAssetSettingsData.GetPatchManifestVersionFileName(buildPackageName);
+				string fileName = YooAssetSettingsData.GetPackageVersionFileName(buildPackageName);
 				string sourcePath = $"{packageOutputDirectory}/{fileName}";
 				string destPath = $"{streamingAssetsDirectory}/{fileName}";
 				EditorTools.CopyFile(sourcePath, destPath, true);

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

@@ -42,41 +42,42 @@ namespace YooAsset.Editor
 			patchManifest.AssetList = GetAllPatchAsset(context, patchManifest);
 
 			// 更新Unity内置资源包的引用关系
+			string shadersBunldeName = YooAssetSettingsData.GetUnityShadersBundleFullName(buildMapContext.UniqueBundleName, buildParameters.PackageName);
 			if (buildParameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
 			{
 				if (buildParameters.BuildMode == EBuildMode.IncrementalBuild)
 				{
 					var buildResultContext = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
-					UpdateBuiltInBundleReference(patchManifest, buildResultContext.Results);
+					UpdateBuiltInBundleReference(patchManifest, buildResultContext.Results, shadersBunldeName);
 				}
 			}
 
 			// 创建补丁清单文本文件
 			{
-				string fileName = YooAssetSettingsData.GetPatchManifestJsonFileName(buildParameters.PackageName, buildParameters.PackageVersion);
+				string fileName = YooAssetSettingsData.GetManifestJsonFileName(buildParameters.PackageName, buildParameters.PackageVersion);
 				string filePath = $"{packageOutputDirectory}/{fileName}";
-				PatchManifest.SerializeToJson(filePath, patchManifest);
+				PatchManifestTools.SerializeToJson(filePath, patchManifest);
 				BuildRunner.Log($"创建补丁清单文件：{filePath}");
 			}
 
 			// 创建补丁清单二进制文件
 			string packageHash;
 			{
-				string fileName = YooAssetSettingsData.GetPatchManifestBinaryFileName(buildParameters.PackageName, buildParameters.PackageVersion);
+				string fileName = YooAssetSettingsData.GetManifestBinaryFileName(buildParameters.PackageName, buildParameters.PackageVersion);
 				string filePath = $"{packageOutputDirectory}/{fileName}";
-				PatchManifest.SerializeToBinary(filePath, patchManifest);
+				PatchManifestTools.SerializeToBinary(filePath, patchManifest);
 				packageHash = HashUtility.FileMD5(filePath);
 				BuildRunner.Log($"创建补丁清单文件：{filePath}");
 
 				PatchManifestContext patchManifestContext = new PatchManifestContext();
 				byte[] bytesData = FileUtility.ReadAllBytes(filePath);
-				patchManifestContext.Manifest = PatchManifest.DeserializeFromBinary(bytesData);
+				patchManifestContext.Manifest = PatchManifestTools.DeserializeFromBinary(bytesData);
 				context.SetContextObject(patchManifestContext);
 			}
 
 			// 创建补丁清单哈希文件
 			{
-				string fileName = YooAssetSettingsData.GetPatchManifestHashFileName(buildParameters.PackageName, buildParameters.PackageVersion);
+				string fileName = YooAssetSettingsData.GetPackageHashFileName(buildParameters.PackageName, buildParameters.PackageVersion);
 				string filePath = $"{packageOutputDirectory}/{fileName}";
 				FileUtility.CreateFile(filePath, packageHash);
 				BuildRunner.Log($"创建补丁清单哈希文件：{filePath}");
@@ -84,7 +85,7 @@ namespace YooAsset.Editor
 
 			// 创建补丁清单版本文件
 			{
-				string fileName = YooAssetSettingsData.GetPatchManifestVersionFileName(buildParameters.PackageName);
+				string fileName = YooAssetSettingsData.GetPackageVersionFileName(buildParameters.PackageName);
 				string filePath = $"{packageOutputDirectory}/{fileName}";
 				FileUtility.CreateFile(filePath, buildParameters.PackageVersion);
 				BuildRunner.Log($"创建补丁清单版本文件：{filePath}");
@@ -165,10 +166,9 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 更新Unity内置资源包的引用关系
 		/// </summary>
-		private void UpdateBuiltInBundleReference(PatchManifest patchManifest, IBundleBuildResults buildResults)
+		private void UpdateBuiltInBundleReference(PatchManifest patchManifest, IBundleBuildResults buildResults, string shadersBunldeName)
 		{
 			// 获取所有依赖着色器资源包的资源包列表
-			string shadersBunldeName = YooAssetSettingsData.GetUnityShadersBundleFullName();
 			List<string> shaderBundleReferenceList = new List<string>();
 			foreach (var valuePair in buildResults.BundleInfos)
 			{

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

@@ -16,12 +16,17 @@ namespace YooAsset.Editor
 
 			var buildParameters = buildParametersContext.Parameters;
 
+#if UNITY_2021_1_OR_NEWER
+			if (buildParameters.BuildPipeline == EBuildPipeline.BuiltinBuildPipeline)
+				throw new Exception($"Unity2021 or newer not support {nameof(EBuildPipeline.BuiltinBuildPipeline)}, Please use {nameof(EBuildPipeline.ScriptableBuildPipeline)}");
+#endif
+
 			// 检测构建参数合法性
 			if (buildParameters.BuildTarget == BuildTarget.NoTarget)
 				throw new Exception("请选择目标平台");
 			if (string.IsNullOrEmpty(buildParameters.PackageName))
 				throw new Exception("包裹名称不能为空");
-			if(string.IsNullOrEmpty(buildParameters.PackageVersion))
+			if (string.IsNullOrEmpty(buildParameters.PackageVersion))
 				throw new Exception("包裹版本不能为空");
 
 			if (buildParameters.BuildMode != EBuildMode.SimulateBuild)

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

@@ -48,7 +48,7 @@ namespace YooAsset.Editor
 			// 4.更新补丁包输出的文件路径
 			foreach (var bundleInfo in buildMapContext.BundleInfos)
 			{
-				string patchFileName = PatchManifest.CreateBundleFileName(outputNameStyle, bundleInfo.BundleName, bundleInfo.PatchInfo.PatchFileHash);
+				string patchFileName = PatchManifestTools.CreateBundleFileName(outputNameStyle, bundleInfo.BundleName, bundleInfo.PatchInfo.PatchFileHash, bundleInfo.IsRawFile);
 				bundleInfo.PatchInfo.PatchOutputFilePath = $"{packageOutputDirectory}/{patchFileName}";
 			}
 		}

Assets/YooAsset/Editor/AssetBundleBuilder/EOutputNameStyle.cs

@@ -7,23 +7,13 @@ namespace YooAsset.Editor
 	public enum EOutputNameStyle
 	{
 		/// <summary>
-		/// 000000000000000f000000000000000
+		/// 哈希值名称
 		/// </summary>
 		HashName = 1,
 
 		/// <summary>
-		/// 000000000000000f000000000000000.bundle
+		/// 资源包名称 + 哈希值名称
 		/// </summary>
-		HashName_Extension = 2,
+		BundleName_HashName = 4,
-
-		/// <summary>
-		/// bundle_name_000000000000000f000000000000000
-		/// </summary>
-		BundleName_HashName = 3,
-
-		/// <summary>
-		/// bundle_name_000000000000000f000000000000000.bundle
-		/// </summary>
-		BundleName_HashName_Extension = 4,
 	}
 }

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollector.cs

@@ -293,12 +293,15 @@ namespace YooAsset.Editor
 			// 根据规则设置获取资源包名称
 			IPackRule packRuleInstance = AssetBundleCollectorSettingData.GetPackRuleInstance(PackRuleName);
 			string bundleName = packRuleInstance.GetBundleName(new PackRuleData(assetPath, CollectPath, group.GroupName));
-			return EditorTools.GetRegularPath(bundleName).ToLower();
+			if(YooAssetSettingsData.Setting.RegularBundleName)
+				return EditorTools.GetRegularPath(bundleName).Replace('/', '_').Replace('.', '_').ToLower();
+			else
+				return EditorTools.GetRegularPath(bundleName).ToLower();
 		}
 		private List<string> GetAssetTags(AssetBundleCollectorGroup group)
 		{
-			List<string> tags = StringUtility.StringToStringList(group.AssetTags, ';');
+			List<string> tags = EditorTools.StringToStringList(group.AssetTags, ';');
-			List<string> temper = StringUtility.StringToStringList(AssetTags, ';');
+			List<string> temper = EditorTools.StringToStringList(AssetTags, ';');
 			tags.AddRange(temper);
 			return tags;
 		}

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorConfig.cs

@@ -143,7 +143,7 @@ namespace YooAsset.Editor
 						AssetBundleCollector collector = new AssetBundleCollector();
 						collector.CollectPath = collectorElement.GetAttribute(XmlCollectPath);
 						collector.CollectorGUID = collectorElement.GetAttribute(XmlCollectorGUID);
-						collector.CollectorType = StringUtility.NameToEnum<ECollectorType>(collectorElement.GetAttribute(XmlCollectorType));
+						collector.CollectorType = EditorTools.NameToEnum<ECollectorType>(collectorElement.GetAttribute(XmlCollectorType));
 						collector.AddressRuleName = collectorElement.GetAttribute(XmlAddressRule);
 						collector.PackRuleName = collectorElement.GetAttribute(XmlPackRule);
 						collector.FilterRuleName = collectorElement.GetAttribute(XmlFilterRule);

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorPackage.cs

@@ -102,7 +102,7 @@ namespace YooAsset.Editor
 			HashSet<string> result = new HashSet<string>();
 			foreach (var group in Groups)
 			{
-				List<string> groupTags = StringUtility.StringToStringList(group.AssetTags, ';');
+				List<string> groupTags = EditorTools.StringToStringList(group.AssetTags, ';');
 				foreach (var tag in groupTags)
 				{
 					if (result.Contains(tag) == false)
@@ -111,7 +111,7 @@ namespace YooAsset.Editor
 
 				foreach (var collector in group.Collectors)
 				{
-					List<string> collectorTags = StringUtility.StringToStringList(collector.AssetTags, ';');
+					List<string> collectorTags = EditorTools.StringToStringList(collector.AssetTags, ';');
 					foreach (var tag in collectorTags)
 					{
 						if (result.Contains(tag) == false)

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs

@@ -694,7 +694,7 @@ namespace YooAsset.Editor
 			popupField0.index = GetCollectorTypeIndex(collector.CollectorType.ToString());
 			popupField0.RegisterValueChangedCallback(evt =>
 			{
-				collector.CollectorType = StringUtility.NameToEnum<ECollectorType>(evt.newValue);
+				collector.CollectorType = EditorTools.NameToEnum<ECollectorType>(evt.newValue);
 				AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
 				if (foldout.value)
 				{

Assets/YooAsset/Editor/AssetBundleCollector/CollectAssetInfo.cs

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

Assets/YooAsset/Editor/AssetBundleCollector/CollectResult.cs

@@ -36,14 +36,6 @@ namespace YooAsset.Editor
 		public void SetCollectAssets(List<CollectAssetInfo> collectAssets)
 		{
 			CollectAssets = collectAssets;
-
-			if (UniqueBundleName)
-			{
-				foreach (var collectAsset in CollectAssets)
-				{
-					collectAsset.BundleNameAppendPackageName(PackageName);
-				}
-			}
 		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleCollector/DefaultPackRule.cs

@@ -15,8 +15,7 @@ namespace YooAsset.Editor
 	{
 		string IPackRule.GetBundleName(PackRuleData data)
 		{
-			string bundleName = StringUtility.RemoveExtension(data.AssetPath);
+			return StringUtility.RemoveExtension(data.AssetPath);
-			return EditorTools.GetRegularPath(bundleName).Replace('/', '_');
 		}
 	}
 
@@ -33,8 +32,7 @@ namespace YooAsset.Editor
 
 		string IPackRule.GetBundleName(PackRuleData data)
 		{
-			string bundleName = Path.GetDirectoryName(data.AssetPath);
+			return Path.GetDirectoryName(data.AssetPath);
-			return EditorTools.GetRegularPath(bundleName).Replace('/', '_');
 		}
 	}
 
@@ -58,7 +56,7 @@ namespace YooAsset.Editor
 				if (Path.HasExtension(splits[0]))
 					throw new Exception($"Not found root directory : {assetPath}");
 				string bundleName = $"{data.CollectPath}/{splits[0]}";
-				return EditorTools.GetRegularPath(bundleName).Replace('/', '_');
+				return bundleName;
 			}
 			else
 			{
@@ -79,13 +77,11 @@ namespace YooAsset.Editor
 			string collectPath = data.CollectPath;
 			if (AssetDatabase.IsValidFolder(collectPath))
 			{
-				string bundleName = collectPath;
+				return collectPath;
-				return EditorTools.GetRegularPath(bundleName).Replace('/', '_');
 			}
 			else
 			{
-				string bundleName = StringUtility.RemoveExtension(collectPath);
+				return StringUtility.RemoveExtension(collectPath);
-				return EditorTools.GetRegularPath(bundleName).Replace('/', '_');
 			}
 		}
 	}
@@ -126,8 +122,7 @@ namespace YooAsset.Editor
 			if (depends.Length != 1)
 				throw new Exception($"{nameof(PackRawFile)} is not support estension : {extension}");
 
-			string bundleName = data.AssetPath;
+			return data.AssetPath;
-			return EditorTools.GetRegularPath(bundleName).Replace('/', '_').Replace('.', '_');
 		}
 	}
 

Assets/YooAsset/Editor/EditorTools.cs

@@ -285,6 +285,35 @@ namespace YooAsset.Editor
 		}
 		#endregion
 
+		#region StringUtility
+		public static List<string> StringToStringList(string str, char separator)
+		{
+			List<string> result = new List<string>();
+			if (!String.IsNullOrEmpty(str))
+			{
+				string[] splits = str.Split(separator);
+				foreach (string split in splits)
+				{
+					string value = split.Trim(); //移除首尾空格
+					if (!String.IsNullOrEmpty(value))
+					{
+						result.Add(value);
+					}
+				}
+			}
+			return result;
+		}
+
+		public static T NameToEnum<T>(string name)
+		{
+			if (Enum.IsDefined(typeof(T), name) == false)
+			{
+				throw new ArgumentException($"Enum {typeof(T)} is not defined name {name}");
+			}
+			return (T)Enum.Parse(typeof(T), name);
+		}
+		#endregion
+
 		#region 文件
 		/// <summary>
 		/// 创建文件所在的目录

Assets/YooAsset/Editor/ShaderVariantCollector/ShaderVariantCollector.cs

@@ -12,134 +12,169 @@ namespace YooAsset.Editor
 {
 	public static class ShaderVariantCollector
 	{
+		private enum ESteps
+		{
+			None,
+			Prepare,
+			CollectAllMaterial,
+			CollectVariants,
+			CollectSleeping,
+			WaitingDone,
+		}
+
 		private const float WaitMilliseconds = 1000f;
-		private static string _saveFilePath;
+		private const float SleepMilliseconds = 100f;
-		private static bool _isStarted = false;
+		private static string _savePath;
-		private static readonly Stopwatch _elapsedTime = new Stopwatch();
+		private static string _packageName;
+		private static int _processMaxNum;
 		private static Action _completedCallback;
 
-		private static void EditorUpdate()
+		private static ESteps _steps = ESteps.None;
-		{
+		private static Stopwatch _elapsedTime;
-			// 注意：一定要延迟保存才会起效
+		private static List<string> _allMaterials;
-			if (_isStarted && _elapsedTime.ElapsedMilliseconds > WaitMilliseconds)
+		private static List<GameObject> _allSpheres = new List<GameObject>(1000);
-			{
-				_isStarted = false;
-				_elapsedTime.Stop();
-				EditorApplication.update -= EditorUpdate;
 
-				// 保存结果
-				ShaderVariantCollectionHelper.SaveCurrentShaderVariantCollection(_saveFilePath);
-
-				// 创建清单
-				CreateManifest();
-
-				Debug.Log($"搜集SVC完毕！");
-				_completedCallback?.Invoke();
-			}
-		}
 
 		/// <summary>
 		/// 开始收集
 		/// </summary>
-		public static void Run(string saveFilePath, Action completedCallback)
+		public static void Run(string savePath, string packageName, int processMaxNum, Action completedCallback)
 		{
-			if (_isStarted)
+			if (_steps != ESteps.None)
 				return;
 
-			if (Path.HasExtension(saveFilePath) == false)
+			if (Path.HasExtension(savePath) == false)
-				saveFilePath = $"{saveFilePath}.shadervariants";
+				savePath = $"{savePath}.shadervariants";
-			if (Path.GetExtension(saveFilePath) != ".shadervariants")
+			if (Path.GetExtension(savePath) != ".shadervariants")
 				throw new System.Exception("Shader variant file extension is invalid.");
+			if (string.IsNullOrEmpty(packageName))
+				throw new System.Exception("Package name is null or empty !");
 
 			// 注意：先删除再保存，否则ShaderVariantCollection内容将无法及时刷新
-			AssetDatabase.DeleteAsset(ShaderVariantCollectorSettingData.Setting.SavePath);
+			AssetDatabase.DeleteAsset(savePath);
-			EditorTools.CreateFileDirectory(saveFilePath);
+			EditorTools.CreateFileDirectory(savePath);
-			_saveFilePath = saveFilePath;
+			_savePath = savePath;
+			_packageName = packageName;
+			_processMaxNum = processMaxNum;
 			_completedCallback = completedCallback;
 
 			// 聚焦到游戏窗口
 			EditorTools.FocusUnityGameWindow();
 
-			// 清空旧数据
-			ShaderVariantCollectionHelper.ClearCurrentShaderVariantCollection();
-
 			// 创建临时测试场景
 			CreateTempScene();
 
-			// 收集着色器变种
+			_steps = ESteps.Prepare;
-			var materials = GetAllMaterials();
-			CollectVariants(materials);
-
 			EditorApplication.update += EditorUpdate;
-			_isStarted = true;
-			_elapsedTime.Reset();
-			_elapsedTime.Start();
 		}
 
+		private static void EditorUpdate()
+		{
+			if (_steps == ESteps.None)
+				return;
+
+			if (_steps == ESteps.Prepare)
+			{
+				ShaderVariantCollectionHelper.ClearCurrentShaderVariantCollection();
+				_steps = ESteps.CollectAllMaterial;
+				return; //等待一帧
+			}
+
+			if (_steps == ESteps.CollectAllMaterial)
+			{
+				_allMaterials = GetAllMaterials();
+				_steps = ESteps.CollectVariants;
+				return; //等待一帧
+			}
+			
+			if (_steps == ESteps.CollectVariants)
+			{
+				int count = Mathf.Min(_processMaxNum, _allMaterials.Count);
+				List<string> range = _allMaterials.GetRange(0, count);
+				_allMaterials.RemoveRange(0, count);
+				CollectVariants(range);
+
+				if (_allMaterials.Count > 0)
+				{
+					_elapsedTime = Stopwatch.StartNew();
+					_steps = ESteps.CollectSleeping;
+				}
+				else
+				{
+					_elapsedTime = Stopwatch.StartNew();
+					_steps = ESteps.WaitingDone;
+				}
+			}
+
+			if (_steps == ESteps.CollectSleeping)
+			{
+				if (_elapsedTime.ElapsedMilliseconds > SleepMilliseconds)
+				{
+					DestroyAllSpheres();
+					_elapsedTime.Stop();
+					_steps = ESteps.CollectVariants;
+				}
+			}
+
+			if (_steps == ESteps.WaitingDone)
+			{
+				// 注意：一定要延迟保存才会起效
+				if (_elapsedTime.ElapsedMilliseconds > WaitMilliseconds)
+				{
+					_elapsedTime.Stop();
+					_steps = ESteps.None;
+
+					// 保存结果并创建清单
+					ShaderVariantCollectionHelper.SaveCurrentShaderVariantCollection(_savePath);
+					CreateManifest();
+
+					Debug.Log($"搜集SVC完毕！");
+					EditorApplication.update -= EditorUpdate;
+					_completedCallback?.Invoke();
+				}
+			}
+		}
 		private static void CreateTempScene()
 		{
 			EditorSceneManager.NewScene(NewSceneSetup.DefaultGameObjects);
 		}
-		private static List<Material> GetAllMaterials()
+		private static List<string> GetAllMaterials()
 		{
 			int progressValue = 0;
 			List<string> allAssets = new List<string>(1000);
 
 			// 获取所有打包的资源
-			List<CollectAssetInfo> allCollectAssetInfos = new List<CollectAssetInfo>();
+			CollectResult collectResult = AssetBundleCollectorSettingData.Setting.GetPackageAssets(EBuildMode.DryRunBuild, _packageName);
-			List<CollectResult> collectResults = AssetBundleCollectorSettingData.Setting.GetAllPackageAssets(EBuildMode.DryRunBuild);
+			foreach (var assetInfo in collectResult.CollectAssets)
-			foreach (var collectResult in collectResults)
 			{
-				allCollectAssetInfos.AddRange(collectResult.CollectAssets);
+				string[] depends = AssetDatabase.GetDependencies(assetInfo.AssetPath, true);
-			}
+				foreach (var dependAsset in depends)
-			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)
 				{
-					if (allAssets.Contains(depend) == false)
+					if (allAssets.Contains(dependAsset) == false)
-						allAssets.Add(depend);
+						allAssets.Add(dependAsset);
 				}
-				EditorTools.DisplayProgressBar("获取所有打包资源", ++progressValue, allAssetPath.Count);
+				EditorTools.DisplayProgressBar("获取所有打包资源", ++progressValue, collectResult.CollectAssets.Count);
 			}
 			EditorTools.ClearProgressBar();
 
 			// 搜集所有材质球
 			progressValue = 0;
-			var shaderDic = new Dictionary<Shader, List<Material>>(100);
+			List<string> allMaterial = new List<string>(1000);
 			foreach (var assetPath in allAssets)
 			{
 				System.Type assetType = AssetDatabase.GetMainAssetTypeAtPath(assetPath);
 				if (assetType == typeof(UnityEngine.Material))
 				{
-					var material = AssetDatabase.LoadAssetAtPath<Material>(assetPath);
+					allMaterial.Add(assetPath);
-					var shader = material.shader;
-					if (shader == null)
-						continue;
-
-					if (shaderDic.ContainsKey(shader) == false)
-					{
-						shaderDic.Add(shader, new List<Material>());
-					}
-					if (shaderDic[shader].Contains(material) == false)
-					{
-						shaderDic[shader].Add(material);
-					}
 				}
 				EditorTools.DisplayProgressBar("搜集所有材质球", ++progressValue, allAssets.Count);
 			}
 			EditorTools.ClearProgressBar();
 
 			// 返回结果
-			var materials = new List<Material>(1000);
+			return allMaterial;
-			foreach (var valuePair in shaderDic)
-			{
-				materials.AddRange(valuePair.Value);
-			}
-			return materials;
 		}
-		private static void CollectVariants(List<Material> materials)
+		private static void CollectVariants(List<string> materials)
 		{
 			Camera camera = Camera.main;
 			if (camera == null)
@@ -164,7 +199,9 @@ namespace YooAsset.Editor
 			{
 				var material = materials[i];
 				var position = new Vector3(x - halfWidth + 1f, y - halfHeight + 1f, 0f);
-				CreateSphere(material, position, i);
+				var go = CreateSphere(material, position, i);
+				if (go != null)
+					_allSpheres.Add(go);
 				if (x == xMax)
 				{
 					x = 0;
@@ -174,27 +211,44 @@ namespace YooAsset.Editor
 				{
 					x++;
 				}
-				EditorTools.DisplayProgressBar("测试所有材质球", ++progressValue, materials.Count);
+				EditorTools.DisplayProgressBar("照射所有材质球", ++progressValue, materials.Count);
 			}
 			EditorTools.ClearProgressBar();
 		}
-		private static void CreateSphere(Material material, Vector3 position, int index)
+		private static GameObject CreateSphere(string assetPath, Vector3 position, int index)
 		{
+			var material = AssetDatabase.LoadAssetAtPath<Material>(assetPath);
+			var shader = material.shader;
+			if (shader == null)
+				return null;
+
 			var go = GameObject.CreatePrimitive(PrimitiveType.Sphere);
-			go.GetComponent<Renderer>().material = material;
+			go.GetComponent<Renderer>().sharedMaterial = material;
 			go.transform.position = position;
-			go.name = $"Sphere_{index}|{material.name}";
+			go.name = $"Sphere_{index} | {material.name}";
+			return go;
+		}
+		private static void DestroyAllSpheres()
+		{
+			foreach(var go in _allSpheres)
+			{
+				GameObject.DestroyImmediate(go);
+			}
+			_allSpheres.Clear();
+
+			// 尝试释放编辑器加载的资源
+			EditorUtility.UnloadUnusedAssetsImmediate(true);
 		}
 		private static void CreateManifest()
 		{
 			AssetDatabase.Refresh(ImportAssetOptions.ForceUpdate);
 
-			ShaderVariantCollection svc = AssetDatabase.LoadAssetAtPath<ShaderVariantCollection>(_saveFilePath);
+			ShaderVariantCollection svc = AssetDatabase.LoadAssetAtPath<ShaderVariantCollection>(_savePath);
 			if (svc != null)
 			{
 				var wrapper = ShaderVariantCollectionManifest.Extract(svc);
 				string jsonData = JsonUtility.ToJson(wrapper, true);
-				string savePath = _saveFilePath.Replace(".shadervariants", ".json");
+				string savePath = _savePath.Replace(".shadervariants", ".json");
 				File.WriteAllText(savePath, jsonData);
 			}
 

Assets/YooAsset/Editor/ShaderVariantCollector/ShaderVariantCollectorSetting.cs

@@ -8,5 +8,10 @@ namespace YooAsset.Editor
 		/// 文件存储路径
 		/// </summary>
 		public string SavePath = "Assets/MyShaderVariants.shadervariants";
+
+		/// <summary>
+		/// 收集的包裹名称
+		/// </summary>
+		public string CollectPackage = string.Empty;
 	}
 }

Assets/YooAsset/Editor/ShaderVariantCollector/ShaderVariantCollectorWindow.cs

@@ -18,10 +18,13 @@ namespace YooAsset.Editor
 			window.minSize = new Vector2(800, 600);
 		}
 
+		private List<string> _packageNames;
+
 		private Button _collectButton;
 		private TextField _collectOutputField;
 		private Label _currentShaderCountField;
 		private Label _currentVariantCountField;
+		private PopupField<string> _packageField;
 
 		public void CreateGUI()
 		{
@@ -36,6 +39,9 @@ namespace YooAsset.Editor
 
 				visualAsset.CloneTree(root);
 
+				// 包裹名称列表
+				_packageNames = GetBuildPackageNames();
+
 				// 文件输出目录
 				_collectOutputField = root.Q<TextField>("CollectOutput");
 				_collectOutputField.SetValueWithoutNotify(ShaderVariantCollectorSettingData.Setting.SavePath);
@@ -44,14 +50,34 @@ namespace YooAsset.Editor
 					ShaderVariantCollectorSettingData.Setting.SavePath = _collectOutputField.value;
 				});
 
+				// 收集的包裹
+				var packageContainer = root.Q("PackageContainer");
+				if (_packageNames.Count > 0)
+				{
+					int defaultIndex = GetDefaultPackageIndex(ShaderVariantCollectorSettingData.Setting.CollectPackage);
+					_packageField = new PopupField<string>(_packageNames, defaultIndex);
+					_packageField.label = "Package";
+					_packageField.style.width = 350;
+					_packageField.RegisterValueChangedCallback(evt =>
+					{
+						ShaderVariantCollectorSettingData.Setting.CollectPackage = _packageField.value;
+					});
+					packageContainer.Add(_packageField);
+				}
+				else
+				{
+					_packageField = new PopupField<string>();
+					_packageField.label = "Package";
+					_packageField.style.width = 350;
+					packageContainer.Add(_packageField);
+				}
+
 				_currentShaderCountField = root.Q<Label>("CurrentShaderCount");
 				_currentVariantCountField = root.Q<Label>("CurrentVariantCount");
 
 				// 变种收集按钮
 				_collectButton = root.Q<Button>("CollectButton");
 				_collectButton.clicked += CollectButton_clicked;
-
-				//RefreshWindow();
 			}
 			catch (Exception e)
 			{
@@ -75,7 +101,33 @@ namespace YooAsset.Editor
 
 		private void CollectButton_clicked()
 		{
-			ShaderVariantCollector.Run(ShaderVariantCollectorSettingData.Setting.SavePath, null);
+			string savePath = ShaderVariantCollectorSettingData.Setting.SavePath;
+			string packageName = ShaderVariantCollectorSettingData.Setting.CollectPackage;
+			ShaderVariantCollector.Run(savePath, packageName, int.MaxValue, null);
+		}
+
+		// 构建包裹相关
+		private int GetDefaultPackageIndex(string packageName)
+		{
+			for (int index = 0; index < _packageNames.Count; index++)
+			{
+				if (_packageNames[index] == packageName)
+				{
+					return index;
+				}
+			}
+
+			ShaderVariantCollectorSettingData.Setting.CollectPackage = _packageNames[0];
+			return 0;
+		}
+		private List<string> GetBuildPackageNames()
+		{
+			List<string> result = new List<string>();
+			foreach (var package in AssetBundleCollectorSettingData.Setting.Packages)
+			{
+				result.Add(package.PackageName);
+			}
+			return result;
 		}
 	}
 }

Assets/YooAsset/Editor/ShaderVariantCollector/ShaderVariantCollectorWindow.uxml

@@ -1,9 +1,10 @@
-<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements">
     <uie:Toolbar name="Toolbar" style="display: flex; flex-direction: row-reverse;" />
-    <ui:VisualElement name="BuildContainer">
+    <ui:VisualElement name="CollectContainer">
-        <ui:TextField picking-mode="Ignore" label="文件保存路径" name="CollectOutput" />
+        <ui:TextField picking-mode="Ignore" label="文件保存路径" name="CollectOutput" style="height: 22px;" />
-        <ui:Label text="Current Shader Count" display-tooltip-when-elided="true" name="CurrentShaderCount" />
+        <ui:VisualElement name="PackageContainer" style="height: 24px;" />
-        <ui:Label text="Current Variant Count" display-tooltip-when-elided="true" name="CurrentVariantCount" />
+        <ui:Label text="Current Shader Count" display-tooltip-when-elided="true" name="CurrentShaderCount" style="height: 20px; padding-left: 4px;" />
+        <ui:Label text="Current Variant Count" display-tooltip-when-elided="true" name="CurrentVariantCount" style="height: 20px; padding-left: 4px;" />
         <ui:Button text="开始搜集" display-tooltip-when-elided="true" name="CollectButton" style="height: 50px; background-color: rgb(40, 106, 42); margin-top: 10px;" />
     </ui:VisualElement>
 </ui:UXML>

Assets/YooAsset/Runtime/AssetReference.cs

@@ -0,0 +1,8 @@
+
+namespace YooAsset
+{
+	public class AssetReference
+	{
+
+	}
+}

Assets/YooAsset/Runtime/AssetReference.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3d400b2548d79ca42bec7370f5d66b78
+guid: 1534f1a1b207ad542bf1fc73da8b4316
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/YooAsset/Runtime/AssetSystem/AssetSystem.cs

@@ -13,6 +13,7 @@ namespace YooAsset
 		private readonly static Dictionary<string, SceneOperationHandle> _sceneHandles = new Dictionary<string, SceneOperationHandle>(100);
 		private static long _sceneCreateCount = 0;
 
+		private string _packageName;
 		private bool _simulationOnEditor;
 		private int _loadingMaxNumber;
 		public IDecryptionServices DecryptionServices { private set; get; }
@@ -23,8 +24,9 @@ namespace YooAsset
 		/// 初始化
 		/// 注意：在使用AssetSystem之前需要初始化
 		/// </summary>
-		public void Initialize(bool simulationOnEditor, int loadingMaxNumber, IDecryptionServices decryptionServices, IBundleServices bundleServices)
+		public void Initialize(string packageName, bool simulationOnEditor, int loadingMaxNumber, IDecryptionServices decryptionServices, IBundleServices bundleServices)
 		{
+			_packageName = packageName;
 			_simulationOnEditor = simulationOnEditor;
 			_loadingMaxNumber = loadingMaxNumber;
 			DecryptionServices = decryptionServices;
@@ -184,7 +186,7 @@ namespace YooAsset
 			}
 
 			var handle = provider.CreateHandle<SceneOperationHandle>();
-			handle.PackageName = BundleServices.GetPackageName();
+			handle.PackageName = _packageName;
 			_sceneHandles.Add(providerGUID, handle);
 			return handle;
 		}
@@ -300,7 +302,7 @@ namespace YooAsset
 			// 释放资源包下的所有场景
 			if (BundleServices.IsServicesValid())
 			{
-				string packageName = BundleServices.GetPackageName();
+				string packageName = _packageName;
 				List<string> removeList = new List<string>();
 				foreach (var valuePair in _sceneHandles)
 				{
@@ -349,7 +351,10 @@ namespace YooAsset
 
 			// 新增下载需求
 #if UNITY_WEBGL
-			loader = new AssetBundleWebLoader(this, bundleInfo);
+			if (bundleInfo.Bundle.IsRawFile)
+				loader = new RawBundleFileLoader(this, bundleInfo);
+			else
+				loader = new AssetBundleWebLoader(this, bundleInfo);
 #else
 			if (bundleInfo.Bundle.IsRawFile)
 				loader = new RawBundleFileLoader(this, bundleInfo);

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

@@ -23,6 +23,18 @@ namespace YooAsset
 			return _assetInfo;
 		}
 
+		/// <summary>
+		/// 获取下载报告
+		/// </summary>
+		public DownloadReport GetDownloadReport()
+		{
+			if (IsValidWithWarning == false)
+			{
+				return DownloadReport.CreateDefaultReport();
+			}
+			return Provider.GetDownloadReport();
+		}
+
 		/// <summary>
 		/// 当前状态
 		/// </summary>

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

@@ -46,7 +46,7 @@ namespace YooAsset
 				if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromRemote)
 				{
 					_steps = ESteps.Download;
-					FileLoadPath = MainBundleInfo.Bundle.CachedFilePath;
+					FileLoadPath = MainBundleInfo.Bundle.CachedDataFilePath;
 				}
 				else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromStreaming)
 				{
@@ -55,7 +55,7 @@ namespace YooAsset
 					if (loadMethod == EBundleLoadMethod.LoadFromMemory || loadMethod == EBundleLoadMethod.LoadFromStream)
 					{
 						_steps = ESteps.Unpack;
-						FileLoadPath = MainBundleInfo.Bundle.CachedFilePath;
+						FileLoadPath = MainBundleInfo.Bundle.CachedDataFilePath;
 					}
 					else
 					{
@@ -70,7 +70,7 @@ namespace YooAsset
 				else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromCache)
 				{
 					_steps = ESteps.LoadFile;
-					FileLoadPath = MainBundleInfo.Bundle.CachedFilePath;
+					FileLoadPath = MainBundleInfo.Bundle.CachedDataFilePath;
 				}
 				else
 				{
@@ -89,6 +89,8 @@ namespace YooAsset
 			// 2. 检测服务器下载结果
 			if (_steps == ESteps.CheckDownload)
 			{
+				DownloadProgress = _downloader.DownloadProgress;
+				DownloadedBytes = _downloader.DownloadedBytes;
 				if (_downloader.IsDone() == false)
 					return;
 
@@ -108,7 +110,7 @@ namespace YooAsset
 			if (_steps == ESteps.Unpack)
 			{
 				int failedTryAgain = 1;
-				var bundleInfo = HostPlayModeImpl.ConvertToUnpackInfo(MainBundleInfo.Bundle);
+				var bundleInfo = PatchManifestTools.GetUnpackInfo(MainBundleInfo.Bundle);
 				_unpacker = DownloadSystem.BeginDownload(bundleInfo, failedTryAgain);
 				_steps = ESteps.CheckUnpack;
 			}
@@ -116,6 +118,8 @@ namespace YooAsset
 			// 4.检测内置文件解压结果
 			if (_steps == ESteps.CheckUnpack)
 			{
+				DownloadProgress = _unpacker.DownloadProgress;
+				DownloadedBytes = _unpacker.DownloadedBytes;
 				if (_unpacker.IsDone() == false)
 					return;
 
@@ -146,6 +150,10 @@ namespace YooAsset
 				}
 #endif
 
+				// 设置下载进度
+				DownloadProgress = 1f;
+				DownloadedBytes = (ulong)MainBundleInfo.Bundle.FileSize;
+
 				// Load assetBundle file
 				var loadMethod = (EBundleLoadMethod)MainBundleInfo.Bundle.LoadMethod;
 				if (loadMethod == EBundleLoadMethod.Normal)
@@ -234,14 +242,11 @@ namespace YooAsset
 					// 在AssetBundle文件加载失败的情况下，我们需要重新验证文件的完整性！
 					if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromCache)
 					{
-						string cacheLoadPath = MainBundleInfo.Bundle.CachedFilePath;
+						var result = CacheSystem.VerifyingRecordFile(MainBundleInfo.Bundle.PackageName, MainBundleInfo.Bundle.CacheGUID);
-						if (CacheSystem.VerifyBundle(MainBundleInfo.Bundle, EVerifyLevel.High) != EVerifyResult.Succeed)
+						if (result != EVerifyResult.Succeed)
 						{
-							if (File.Exists(cacheLoadPath))
+							YooLogger.Error($"Found possibly corrupt file ! {MainBundleInfo.Bundle.CacheGUID}");
-							{
+							CacheSystem.DiscardFile(MainBundleInfo.Bundle.PackageName, MainBundleInfo.Bundle.CacheGUID);
-								YooLogger.Error($"Delete the invalid cache file : {cacheLoadPath}");
-								File.Delete(cacheLoadPath);
-							}
 						}
 					}
 				}

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

@@ -47,7 +47,7 @@ namespace YooAsset
 				if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromRemote)
 				{
 					_steps = ESteps.Download;
-					FileLoadPath = MainBundleInfo.Bundle.CachedFilePath;
+					FileLoadPath = MainBundleInfo.Bundle.CachedDataFilePath;
 				}
 				else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromStreaming)
 				{
@@ -57,7 +57,7 @@ namespace YooAsset
 				else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromCache)
 				{
 					_steps = ESteps.LoadCacheFile;
-					FileLoadPath = MainBundleInfo.Bundle.CachedFilePath;
+					FileLoadPath = MainBundleInfo.Bundle.CachedDataFilePath;
 				}
 				else
 				{
@@ -76,6 +76,8 @@ namespace YooAsset
 			// 2. 检测服务器下载结果
 			if (_steps == ESteps.CheckDownload)
 			{
+				DownloadProgress = _downloader.DownloadProgress;
+				DownloadedBytes = _downloader.DownloadedBytes;
 				if (_downloader.IsDone() == false)
 					return;
 
@@ -106,6 +108,10 @@ namespace YooAsset
 				}
 #endif
 
+				// 设置下载进度
+				DownloadProgress = 1f;
+				DownloadedBytes = (ulong)MainBundleInfo.Bundle.FileSize;
+
 				// Load assetBundle file
 				var loadMethod = (EBundleLoadMethod)MainBundleInfo.Bundle.LoadMethod;
 				if (loadMethod == EBundleLoadMethod.Normal)
@@ -141,14 +147,11 @@ namespace YooAsset
 					// 在AssetBundle文件加载失败的情况下，我们需要重新验证文件的完整性！
 					if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromCache)
 					{
-						string cacheLoadPath = MainBundleInfo.Bundle.CachedFilePath;
+						var result = CacheSystem.VerifyingRecordFile(MainBundleInfo.Bundle.PackageName, MainBundleInfo.Bundle.CacheGUID);
-						if (CacheSystem.VerifyBundle(MainBundleInfo.Bundle, EVerifyLevel.High) != EVerifyResult.Succeed)
+						if (result != EVerifyResult.Succeed)
 						{
-							if (File.Exists(cacheLoadPath))
+							YooLogger.Error($"Found possibly corrupt file ! {MainBundleInfo.Bundle.CacheGUID}");
-							{
+							CacheSystem.DiscardFile(MainBundleInfo.Bundle.PackageName, MainBundleInfo.Bundle.CacheGUID);
-								YooLogger.Error($"Delete the invalid cache file : {cacheLoadPath}");
-								File.Delete(cacheLoadPath);
-							}
 						}
 					}
 				}
@@ -171,6 +174,8 @@ namespace YooAsset
 			// 6. 检测AssetBundle加载结果
 			if (_steps == ESteps.CheckLoadWebFile)
 			{
+				DownloadProgress = _webRequest.downloadProgress;
+				DownloadedBytes = _webRequest.downloadedBytes;
 				if (_webRequest.isDone == false)
 					return;
 

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

@@ -18,7 +18,7 @@ namespace YooAsset
 		/// 所属资源系统
 		/// </summary>
 		public AssetSystemImpl Impl { private set; get; }
-		
+
 		/// <summary>
 		/// 资源包文件信息
 		/// </summary>
@@ -47,7 +47,9 @@ namespace YooAsset
 		private readonly List<ProviderBase> _providers = new List<ProviderBase>(100);
 		internal AssetBundle CacheBundle { set; get; }
 		internal string FileLoadPath { set; get; }
-		
+		internal float DownloadProgress { set; get; }
+		internal ulong DownloadedBytes { set; get; }
+
 
 		public BundleLoaderBase(AssetSystemImpl impl, BundleInfo bundleInfo)
 		{
@@ -82,34 +84,6 @@ namespace YooAsset
 			RefCount--;
 		}
 
-		/// <summary>
-		/// 轮询更新
-		/// </summary>
-		public abstract void Update();
-
-		/// <summary>
-		/// 销毁
-		/// </summary>
-		public virtual void Destroy(bool forceDestroy)
-		{
-			IsDestroyed = true;
-
-			// Check fatal
-			if (forceDestroy == false)
-			{
-				if (RefCount > 0)
-					throw new Exception($"Bundle file loader ref is not zero : {MainBundleInfo.Bundle.BundleName}");
-				if (IsDone() == false)
-					throw new Exception($"Bundle file loader is not done : {MainBundleInfo.Bundle.BundleName}");
-			}
-
-			if (CacheBundle != null)
-			{
-				CacheBundle.Unload(true);
-				CacheBundle = null;
-			}
-		}
-
 		/// <summary>
 		/// 是否完毕（无论成功或失败）
 		/// </summary>
@@ -159,6 +133,35 @@ namespace YooAsset
 			_providers.Clear();
 		}
 
+
+		/// <summary>
+		/// 轮询更新
+		/// </summary>
+		public abstract void Update();
+
+		/// <summary>
+		/// 销毁
+		/// </summary>
+		public virtual void Destroy(bool forceDestroy)
+		{
+			IsDestroyed = true;
+
+			// Check fatal
+			if (forceDestroy == false)
+			{
+				if (RefCount > 0)
+					throw new Exception($"Bundle file loader ref is not zero : {MainBundleInfo.Bundle.BundleName}");
+				if (IsDone() == false)
+					throw new Exception($"Bundle file loader is not done : {MainBundleInfo.Bundle.BundleName}");
+			}
+
+			if (CacheBundle != null)
+			{
+				CacheBundle.Unload(true);
+				CacheBundle = null;
+			}
+		}
+
 		/// <summary>
 		/// 主线程等待异步操作完毕
 		/// </summary>

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

@@ -9,12 +9,12 @@ namespace YooAsset
 		/// <summary>
 		/// 依赖的资源包加载器列表
 		/// </summary>
-		private readonly List<BundleLoaderBase> _dependBundles;
+		internal readonly List<BundleLoaderBase> DependBundles;
 
 
 		public DependAssetBundleGroup(List<BundleLoaderBase> dpendBundles)
 		{
-			_dependBundles = dpendBundles;
+			DependBundles = dpendBundles;
 		}
 
 		/// <summary>
@@ -22,7 +22,7 @@ namespace YooAsset
 		/// </summary>
 		public bool IsDone()
 		{
-			foreach (var loader in _dependBundles)
+			foreach (var loader in DependBundles)
 			{
 				if (loader.IsDone() == false)
 					return false;
@@ -35,7 +35,7 @@ namespace YooAsset
 		/// </summary>
 		public bool IsSucceed()
 		{
-			foreach (var loader in _dependBundles)
+			foreach (var loader in DependBundles)
 			{
 				if (loader.Status != BundleLoaderBase.EStatus.Succeed)
 				{
@@ -50,7 +50,7 @@ namespace YooAsset
 		/// </summary>
 		public string GetLastError()
 		{
-			foreach (var loader in _dependBundles)
+			foreach (var loader in DependBundles)
 			{
 				if (loader.Status != BundleLoaderBase.EStatus.Succeed)
 				{
@@ -65,7 +65,7 @@ namespace YooAsset
 		/// </summary>
 		public void WaitForAsyncComplete()
 		{
-			foreach (var loader in _dependBundles)
+			foreach (var loader in DependBundles)
 			{
 				if (loader.IsDone() == false)
 					loader.WaitForAsyncComplete();
@@ -77,7 +77,7 @@ namespace YooAsset
 		/// </summary>
 		public void Reference()
 		{
-			foreach (var loader in _dependBundles)
+			foreach (var loader in DependBundles)
 			{
 				loader.Reference();
 			}
@@ -88,7 +88,7 @@ namespace YooAsset
 		/// </summary>
 		public void Release()
 		{
-			foreach (var loader in _dependBundles)
+			foreach (var loader in DependBundles)
 			{
 				loader.Release();
 			}
@@ -99,7 +99,7 @@ namespace YooAsset
 		/// </summary>
 		internal void GetBundleDebugInfos(List<DebugBundleInfo> output)
 		{
-			foreach (var loader in _dependBundles)
+			foreach (var loader in DependBundles)
 			{
 				var bundleInfo = new DebugBundleInfo();
 				bundleInfo.BundleName = loader.MainBundleInfo.Bundle.BundleName;

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

@@ -38,13 +38,13 @@ namespace YooAsset
 				if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromRemote)
 				{
 					_steps = ESteps.Download;
-					FileLoadPath = MainBundleInfo.Bundle.CachedFilePath;
+					FileLoadPath = MainBundleInfo.Bundle.CachedDataFilePath;
 				}
 				else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromStreaming)
 				{
 #if UNITY_ANDROID || UNITY_WEBGL
 					_steps = ESteps.Unpack;
-					FileLoadPath = MainBundleInfo.Bundle.CachedFilePath;
+					FileLoadPath = MainBundleInfo.Bundle.CachedDataFilePath;
 #else
 					_steps = ESteps.CheckFile;
 					FileLoadPath = MainBundleInfo.Bundle.StreamingFilePath;
@@ -53,7 +53,7 @@ namespace YooAsset
 				else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromCache)
 				{
 					_steps = ESteps.CheckFile;
-					FileLoadPath = MainBundleInfo.Bundle.CachedFilePath;
+					FileLoadPath = MainBundleInfo.Bundle.CachedDataFilePath;
 				}
 				else
 				{
@@ -72,6 +72,8 @@ namespace YooAsset
 			// 2. 检测下载结果
 			if (_steps == ESteps.CheckDownload)
 			{
+				DownloadProgress = _downloader.DownloadProgress;
+				DownloadedBytes = _downloader.DownloadedBytes;
 				if (_downloader.IsDone() == false)
 					return;
 
@@ -91,7 +93,7 @@ namespace YooAsset
 			if (_steps == ESteps.Unpack)
 			{
 				int failedTryAgain = 1;
-				var bundleInfo = HostPlayModeImpl.ConvertToUnpackInfo(MainBundleInfo.Bundle);
+				var bundleInfo = PatchManifestTools.GetUnpackInfo(MainBundleInfo.Bundle);
 				_unpacker = DownloadSystem.BeginDownload(bundleInfo, failedTryAgain);
 				_steps = ESteps.CheckUnpack;
 			}
@@ -99,6 +101,8 @@ namespace YooAsset
 			// 4. 检测解压结果
 			if (_steps == ESteps.CheckUnpack)
 			{
+				DownloadProgress = _unpacker.DownloadProgress;
+				DownloadedBytes = _unpacker.DownloadedBytes;
 				if (_unpacker.IsDone() == false)
 					return;
 
@@ -117,6 +121,10 @@ namespace YooAsset
 			// 5. 检测结果
 			if (_steps == ESteps.CheckFile)
 			{
+				// 设置下载进度
+				DownloadProgress = 1f;
+				DownloadedBytes = (ulong)MainBundleInfo.Bundle.FileSize;
+
 				_steps = ESteps.Done;
 				if (File.Exists(FileLoadPath))
 				{

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

@@ -7,15 +7,6 @@ namespace YooAsset
 	internal sealed class BundledAssetProvider : BundledProvider
 	{
 		private AssetBundleRequest _cacheRequest;
-		public override float Progress
-		{
-			get
-			{
-				if (_cacheRequest == null)
-					return 0;
-				return _cacheRequest.progress;
-			}
-		}
 
 		public BundledAssetProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
 		{
@@ -109,6 +100,7 @@ namespace YooAsset
 					}
 					else
 					{
+						Progress = _cacheRequest.progress;
 						if (_cacheRequest.isDone == false)
 							return;
 						AssetObject = _cacheRequest.asset;

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

@@ -35,6 +35,23 @@ namespace YooAsset
 			}
 		}
 
+		/// <summary>
+		/// 获取下载报告
+		/// </summary>
+		public override DownloadReport GetDownloadReport()
+		{
+			DownloadReport result = new DownloadReport();
+			result.TotalSize = (ulong)OwnerBundle.MainBundleInfo.Bundle.FileSize;
+			result.DownloadedBytes = OwnerBundle.DownloadedBytes;
+			foreach (var dependBundle in DependBundleGroup.DependBundles)
+			{
+				result.TotalSize += (ulong)dependBundle.MainBundleInfo.Bundle.FileSize;
+				result.DownloadedBytes += dependBundle.DownloadedBytes;
+			}
+			result.Progress = (float)result.DownloadedBytes / result.TotalSize;
+			return result;
+		}
+
 		/// <summary>
 		/// 获取资源包的调试信息列表
 		/// </summary>

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

@@ -3,17 +3,6 @@ namespace YooAsset
 {
 	internal class BundledRawFileProvider : BundledProvider
 	{
-		public override float Progress
-		{
-			get
-			{
-				if (IsDone)
-					return 1f;
-				else
-					return 0;
-			}
-		}
-
 		public BundledRawFileProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
 		{
 		}

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

@@ -13,15 +13,6 @@ namespace YooAsset
 		private readonly bool _activateOnLoad;
 		private readonly int _priority;
 		private AsyncOperation _asyncOp;
-		public override float Progress
-		{
-			get
-			{
-				if (_asyncOp == null)
-					return 0;
-				return _asyncOp.progress;
-			}
-		}
 
 		public BundledSceneProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo, LoadSceneMode sceneMode, bool activateOnLoad, int priority) : base(impl, providerGUID, assetInfo)
 		{
@@ -93,6 +84,7 @@ namespace YooAsset
 			// 3. 检测加载结果
 			if (Status == EStatus.Checking)
 			{
+				Progress = _asyncOp.progress;
 				if (_asyncOp.isDone)
 				{
 					if (SceneObject.IsValid() && _activateOnLoad)

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

@@ -7,15 +7,6 @@ namespace YooAsset
 	internal sealed class BundledSubAssetsProvider : BundledProvider
 	{
 		private AssetBundleRequest _cacheRequest;
-		public override float Progress
-		{
-			get
-			{
-				if (_cacheRequest == null)
-					return 0;
-				return _cacheRequest.progress;
-			}
-		}
 
 		public BundledSubAssetsProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
 		{
@@ -98,6 +89,7 @@ namespace YooAsset
 					}
 					else
 					{
+						Progress = _cacheRequest.progress;
 						if (_cacheRequest.isDone == false)
 							return;
 						AllAssetObjects = _cacheRequest.allAssets;

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

@@ -3,17 +3,6 @@ namespace YooAsset
 {
 	internal sealed class CompletedProvider : ProviderBase
 	{
-		public override float Progress
-		{
-			get
-			{
-				if (IsDone)
-					return 1f;
-				else
-					return 0;
-			}
-		}
-
 		public CompletedProvider(AssetInfo assetInfo) : base(null, string.Empty, assetInfo)
 		{
 		}

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

@@ -6,17 +6,6 @@ namespace YooAsset
 {
 	internal sealed class DatabaseAssetProvider : ProviderBase
 	{
-		public override float Progress
-		{
-			get
-			{
-				if (IsDone)
-					return 1f;
-				else
-					return 0;
-			}
-		}
-
 		public DatabaseAssetProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
 		{
 		}

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

@@ -3,17 +3,6 @@ namespace YooAsset
 {
 	internal class DatabaseRawFileProvider : ProviderBase
 	{
-		public override float Progress
-		{
-			get
-			{
-				if (IsDone)
-					return 1f;
-				else
-					return 0;
-			}
-		}
-
 		public DatabaseRawFileProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
 		{
 		}

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

@@ -9,15 +9,6 @@ namespace YooAsset
 		private readonly bool _activateOnLoad;
 		private readonly int _priority;
 		private AsyncOperation _asyncOp;
-		public override float Progress
-		{
-			get
-			{
-				if (_asyncOp == null)
-					return 0;
-				return _asyncOp.progress;
-			}
-		}
 
 		public DatabaseSceneProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo, LoadSceneMode sceneMode, bool activateOnLoad, int priority) : base(impl, providerGUID, assetInfo)
 		{
@@ -61,6 +52,7 @@ namespace YooAsset
 			// 2. 检测加载结果
 			if (Status == EStatus.Checking)
 			{
+				Progress = _asyncOp.progress;
 				if (_asyncOp.isDone)
 				{				
 					if (SceneObject.IsValid() && _activateOnLoad)

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

@@ -6,17 +6,6 @@ namespace YooAsset
 {
 	internal sealed class DatabaseSubAssetsProvider : ProviderBase
 	{
-		public override float Progress
-		{
-			get
-			{
-				if (IsDone)
-					return 1f;
-				else
-					return 0;
-			}
-		}
-
 		public DatabaseSubAssetsProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
 		{
 		}

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

@@ -63,6 +63,11 @@ namespace YooAsset
 		/// </summary>
 		public string LastError { protected set; get; } = string.Empty;
 
+		/// <summary>
+		/// 加载进度
+		/// </summary>
+		public float Progress { protected set; get; } = 0f;
+
 		/// <summary>
 		/// 引用计数
 		/// </summary>
@@ -84,17 +89,6 @@ namespace YooAsset
 			}
 		}
 
-		/// <summary>
-		/// 加载进度
-		/// </summary>
-		public virtual float Progress
-		{
-			get
-			{
-				return 0;
-			}
-		}
-
 
 		protected bool IsWaitForAsyncComplete { private set; get; } = false;
 		private readonly List<OperationHandleBase> _handles = new List<OperationHandleBase>();
@@ -120,6 +114,14 @@ namespace YooAsset
 			IsDestroyed = true;
 		}
 
+		/// <summary>
+		/// 获取下载进度
+		/// </summary>
+		public virtual DownloadReport GetDownloadReport()
+		{
+			return DownloadReport.CreateDefaultReport();
+		}
+
 		/// <summary>
 		/// 是否可以销毁
 		/// </summary>
@@ -219,11 +221,14 @@ namespace YooAsset
 		private TaskCompletionSource<object> _taskCompletionSource;
 		protected void InvokeCompletion()
 		{
+			// 进度百分百完成
+			Progress = 1f;
+
 			// 注意：创建临时列表是为了防止外部逻辑在回调函数内创建或者释放资源句柄。
 			List<OperationHandleBase> tempers = new List<OperationHandleBase>(_handles);
 			foreach (var hande in tempers)
 			{
-				if (hande.IsValidWithWarning)
+				if (hande.IsValid)
 				{
 					hande.InvokeCallback();
 				}

Assets/YooAsset/Runtime/AssetsPackage.cs

@@ -13,10 +13,8 @@ namespace YooAsset
 		private EOperationStatus _initializeStatus = EOperationStatus.None;
 		private EPlayMode _playMode;
 		private IBundleServices _bundleServices;
+		private IPlayModeServices _playModeServices;
 		private AssetSystemImpl _assetSystemImpl;
-		private EditorSimulateModeImpl _editorSimulateModeImpl;
-		private OfflinePlayModeImpl _offlinePlayModeImpl;
-		private HostPlayModeImpl _hostPlayModeImpl;
 
 		/// <summary>
 		/// 包裹名
@@ -59,11 +57,8 @@ namespace YooAsset
 				_isInitialize = false;
 				_initializeError = string.Empty;
 				_initializeStatus = EOperationStatus.None;
-
 				_bundleServices = null;
-				_editorSimulateModeImpl = null;
+				_playModeServices = null;
-				_offlinePlayModeImpl = null;
-				_hostPlayModeImpl = null;
 
 				if (_assetSystemImpl != null)
 				{
@@ -89,36 +84,39 @@ namespace YooAsset
 			_assetSystemImpl = new AssetSystemImpl();
 			if (_playMode == EPlayMode.EditorSimulateMode)
 			{
-				_editorSimulateModeImpl = new EditorSimulateModeImpl();
+				var editorSimulateModeImpl = new EditorSimulateModeImpl();
-				_bundleServices = _editorSimulateModeImpl;
+				_bundleServices = editorSimulateModeImpl;
-				_assetSystemImpl.Initialize(true, parameters.AssetLoadingMaxNumber, parameters.DecryptionServices, _bundleServices);
+				_playModeServices = editorSimulateModeImpl;
+				_assetSystemImpl.Initialize(PackageName, true, parameters.AssetLoadingMaxNumber, parameters.DecryptionServices, _bundleServices);
+
 				var initializeParameters = parameters as EditorSimulateModeParameters;
-				initializeOperation = _editorSimulateModeImpl.InitializeAsync(
+				initializeOperation = editorSimulateModeImpl.InitializeAsync(initializeParameters.LocationToLower, initializeParameters.SimulatePatchManifestPath);
-					initializeParameters.LocationToLower,
-					initializeParameters.SimulatePatchManifestPath);
 			}
 			else if (_playMode == EPlayMode.OfflinePlayMode)
 			{
-				_offlinePlayModeImpl = new OfflinePlayModeImpl();
+				var offlinePlayModeImpl = new OfflinePlayModeImpl();
-				_bundleServices = _offlinePlayModeImpl;
+				_bundleServices = offlinePlayModeImpl;
-				_assetSystemImpl.Initialize(false, parameters.AssetLoadingMaxNumber, parameters.DecryptionServices, _bundleServices);
+				_playModeServices = offlinePlayModeImpl;
+				_assetSystemImpl.Initialize(PackageName, false, parameters.AssetLoadingMaxNumber, parameters.DecryptionServices, _bundleServices);
+
 				var initializeParameters = parameters as OfflinePlayModeParameters;
-				initializeOperation = _offlinePlayModeImpl.InitializeAsync(
+				initializeOperation = offlinePlayModeImpl.InitializeAsync(PackageName, initializeParameters.LocationToLower);
-					initializeParameters.LocationToLower,
-					PackageName);
 			}
 			else if (_playMode == EPlayMode.HostPlayMode)
 			{
-				_hostPlayModeImpl = new HostPlayModeImpl();
+				var hostPlayModeImpl = new HostPlayModeImpl();
-				_bundleServices = _hostPlayModeImpl;
+				_bundleServices = hostPlayModeImpl;
-				_assetSystemImpl.Initialize(false, parameters.AssetLoadingMaxNumber, parameters.DecryptionServices, _bundleServices);
+				_playModeServices = hostPlayModeImpl;
+				_assetSystemImpl.Initialize(PackageName, false, parameters.AssetLoadingMaxNumber, parameters.DecryptionServices, _bundleServices);
+
 				var initializeParameters = parameters as HostPlayModeParameters;
-				initializeOperation = _hostPlayModeImpl.InitializeAsync(
+				initializeOperation = hostPlayModeImpl.InitializeAsync(
+					PackageName,
 					initializeParameters.LocationToLower,
 					initializeParameters.DefaultHostServer,
 					initializeParameters.FallbackHostServer,
-					initializeParameters.QueryServices,
+					initializeParameters.QueryServices
-					PackageName);
+					);
 			}
 			else
 			{
@@ -138,10 +136,8 @@ namespace YooAsset
 				_initializeStatus = EOperationStatus.None;
 				_initializeError = string.Empty;
 				_bundleServices = null;
+				_playModeServices = null;
 				_assetSystemImpl = null;
-				_editorSimulateModeImpl = null;
-				_offlinePlayModeImpl = null;
-				_hostPlayModeImpl = null;
 			}
 		}
 		private void CheckInitializeParameters(InitializeParameters parameters)
@@ -201,99 +197,45 @@ namespace YooAsset
 		/// <summary>
 		/// 向网络端请求最新的资源版本
 		/// </summary>
-		/// <param name="timeout">超时时间（默认值：60秒）</param>
 		/// <param name="appendTimeTicks">在URL末尾添加时间戳</param>
-		public UpdatePackageVersionOperation UpdatePackageVersionAsync(int timeout = 60, bool appendTimeTicks = true)
+		/// <param name="timeout">超时时间（默认值：60秒）</param>
+		public UpdatePackageVersionOperation UpdatePackageVersionAsync(bool appendTimeTicks = true, int timeout = 60)
 		{
 			DebugCheckInitialize();
-			if (_playMode == EPlayMode.EditorSimulateMode)
+			return _playModeServices.UpdatePackageVersionAsync(appendTimeTicks, timeout);
-			{
-				var operation = new EditorPlayModeUpdatePackageVersionOperation();
-				OperationSystem.StartOperation(operation);
-				return operation;
-			}
-			else if (_playMode == EPlayMode.OfflinePlayMode)
-			{
-				var operation = new OfflinePlayModeUpdatePackageVersionOperation();
-				OperationSystem.StartOperation(operation);
-				return operation;
-			}
-			else if (_playMode == EPlayMode.HostPlayMode)
-			{
-				return _hostPlayModeImpl.UpdatePackageVersionAsync(PackageName, timeout, appendTimeTicks);
-			}
-			else
-			{
-				throw new NotImplementedException();
-			}
 		}
 
 		/// <summary>
 		/// 向网络端请求并更新补丁清单
 		/// </summary>
 		/// <param name="packageVersion">更新的包裹版本</param>
+		/// <param name="autoActiveManifest">自动激活清单</param>
 		/// <param name="timeout">超时时间（默认值：60秒）</param>
 		public UpdatePackageManifestOperation UpdatePackageManifestAsync(string packageVersion, int timeout = 60)
 		{
 			DebugCheckInitialize();
 			DebugCheckUpdateManifest();
-			if (_playMode == EPlayMode.EditorSimulateMode)
+			return _playModeServices.UpdatePackageManifestAsync(packageVersion, timeout);
-			{
-				var operation = new EditorPlayModeUpdatePackageManifestOperation();
-				OperationSystem.StartOperation(operation);
-				return operation;
-			}
-			else if (_playMode == EPlayMode.OfflinePlayMode)
-			{
-				var operation = new OfflinePlayModeUpdatePackageManifestOperation();
-				OperationSystem.StartOperation(operation);
-				return operation;
-			}
-			else if (_playMode == EPlayMode.HostPlayMode)
-			{
-				return _hostPlayModeImpl.UpdatePackageManifestAsync(PackageName, packageVersion, timeout);
-			}
-			else
-			{
-				throw new NotImplementedException();
-			}
 		}
 
 		/// <summary>
-		/// 检查本地包裹内容的完整性
+		/// 预下载指定版本的包裹资源
 		/// </summary>
-		public CheckPackageContentsOperation CheckPackageContentsAsync()
+		/// <param name="packageVersion">下载的包裹版本</param>
+		/// <param name="timeout">超时时间（默认值：60秒）</param>
+		public PreDownloadPackageOperation PreDownloadPackageAsync(string packageVersion, int timeout = 60)
 		{
 			DebugCheckInitialize();
-			if (_playMode == EPlayMode.EditorSimulateMode)
+			return _playModeServices.PreDownloadPackageAsync(packageVersion, timeout);
-			{
-				var operation = new EditorSimulateModeCheckPackageContentsOperation();
-				OperationSystem.StartOperation(operation);
-				return operation;
-			}
-			else if (_playMode == EPlayMode.OfflinePlayMode)
-			{
-				var operation = new OfflinePlayModeCheckPackageContentsOperation();
-				OperationSystem.StartOperation(operation);
-				return operation;
-			}
-			else if (_playMode == EPlayMode.HostPlayMode)
-			{
-				return _hostPlayModeImpl.CheckPackageContentsAsync(PackageName);
-			}
-			else
-			{
-				throw new NotImplementedException();
-			}
 		}
 
 		/// <summary>
-		/// 清理本地包裹未使用的缓存文件
+		/// 清理包裹未使用的缓存文件
 		/// </summary>
-		public ClearPackageUnusedCacheFilesOperation ClearPackageUnusedCacheFilesAsync()
+		public ClearUnusedCacheFilesOperation ClearUnusedCacheFilesAsync()
 		{
 			DebugCheckInitialize();
-			var operation = new ClearPackageUnusedCacheFilesOperation(this);
+			var operation = new ClearUnusedCacheFilesOperation(this);
 			OperationSystem.StartOperation(operation);
 			return operation;
 		}
@@ -304,22 +246,9 @@ namespace YooAsset
 		public string GetPackageVersion()
 		{
 			DebugCheckInitialize();
-			if (_playMode == EPlayMode.EditorSimulateMode)
+			if (_playModeServices.ActiveManifest == null)
-			{
+				return string.Empty;
-				return _editorSimulateModeImpl.GetPackageVersion();
+			return _playModeServices.ActiveManifest.PackageVersion;
-			}
-			else if (_playMode == EPlayMode.OfflinePlayMode)
-			{
-				return _offlinePlayModeImpl.GetPackageVersion();
-			}
-			else if (_playMode == EPlayMode.HostPlayMode)
-			{
-				return _hostPlayModeImpl.GetPackageVersion();
-			}
-			else
-			{
-				throw new NotImplementedException();
-			}
 		}
 
 		/// <summary>
@@ -392,7 +321,7 @@ namespace YooAsset
 		{
 			DebugCheckInitialize();
 			string[] tags = new string[] { tag };
-			return _bundleServices.GetAssetInfos(tags);
+			return _playModeServices.ActiveManifest.GetAssetsInfoByTags(tags);
 		}
 
 		/// <summary>
@@ -402,7 +331,7 @@ namespace YooAsset
 		public AssetInfo[] GetAssetInfos(string[] tags)
 		{
 			DebugCheckInitialize();
-			return _bundleServices.GetAssetInfos(tags);
+			return _playModeServices.ActiveManifest.GetAssetsInfoByTags(tags);
 		}
 
 		/// <summary>
@@ -423,7 +352,7 @@ namespace YooAsset
 		public bool CheckLocationValid(string location)
 		{
 			DebugCheckInitialize();
-			string assetPath = _bundleServices.TryMappingToAssetPath(location);
+			string assetPath = _playModeServices.ActiveManifest.TryMappingToAssetPath(location);
 			return string.IsNullOrEmpty(assetPath) == false;
 		}
 		#endregion
@@ -710,7 +639,7 @@ namespace YooAsset
 		public PatchDownloaderOperation CreatePatchDownloader(string tag, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
 		{
 			DebugCheckInitialize();
-			return CreatePatchDownloader(new string[] { tag }, downloadingMaxNumber, failedTryAgain, timeout);
+			return _playModeServices.CreatePatchDownloaderByTags(new string[] { tag }, downloadingMaxNumber, failedTryAgain, timeout);
 		}
 
 		/// <summary>
@@ -723,20 +652,7 @@ namespace YooAsset
 		public PatchDownloaderOperation CreatePatchDownloader(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
 		{
 			DebugCheckInitialize();
-			if (_playMode == EPlayMode.EditorSimulateMode || _playMode == EPlayMode.OfflinePlayMode)
+			return _playModeServices.CreatePatchDownloaderByTags(tags, downloadingMaxNumber, failedTryAgain, timeout);
-			{
-				List<BundleInfo> downloadList = new List<BundleInfo>();
-				var operation = new PatchDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain, timeout);
-				return operation;
-			}
-			else if (_playMode == EPlayMode.HostPlayMode)
-			{
-				return _hostPlayModeImpl.CreatePatchDownloaderByTags(tags, downloadingMaxNumber, failedTryAgain, timeout);
-			}
-			else
-			{
-				throw new NotImplementedException();
-			}
 		}
 
 		/// <summary>
@@ -748,53 +664,7 @@ namespace YooAsset
 		public PatchDownloaderOperation CreatePatchDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
 		{
 			DebugCheckInitialize();
-			if (_playMode == EPlayMode.EditorSimulateMode || _playMode == EPlayMode.OfflinePlayMode)
+			return _playModeServices.CreatePatchDownloaderByAll(downloadingMaxNumber, failedTryAgain, timeout);
-			{
-				List<BundleInfo> downloadList = new List<BundleInfo>();
-				var operation = new PatchDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain, timeout);
-				return operation;
-			}
-			else if (_playMode == EPlayMode.HostPlayMode)
-			{
-				return _hostPlayModeImpl.CreatePatchDownloaderByAll(downloadingMaxNumber, failedTryAgain, timeout);
-			}
-			else
-			{
-				throw new NotImplementedException();
-			}
-		}
-
-
-		/// <summary>
-		/// 创建补丁下载器，用于下载更新指定的资源列表依赖的资源包文件
-		/// </summary>
-		/// <param name="locations">资源定位列表</param>
-		/// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
-		/// <param name="failedTryAgain">下载失败的重试次数</param>
-		/// <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, timeout);
-				return operation;
-			}
-			else if (_playMode == EPlayMode.HostPlayMode)
-			{
-				List<AssetInfo> assetInfos = new List<AssetInfo>(locations.Length);
-				foreach (var location in locations)
-				{
-					AssetInfo assetInfo = ConvertLocationToAssetInfo(location, null);
-					assetInfos.Add(assetInfo);
-				}
-				return _hostPlayModeImpl.CreatePatchDownloaderByPaths(assetInfos.ToArray(), downloadingMaxNumber, failedTryAgain, timeout);
-			}
-			else
-			{
-				throw new NotImplementedException();
-			}
 		}
 
 		/// <summary>
@@ -807,20 +677,7 @@ namespace YooAsset
 		public PatchDownloaderOperation CreateBundleDownloader(AssetInfo[] assetInfos, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
 		{
 			DebugCheckInitialize();
-			if (_playMode == EPlayMode.EditorSimulateMode || _playMode == EPlayMode.OfflinePlayMode)
+			return _playModeServices.CreatePatchDownloaderByPaths(assetInfos, downloadingMaxNumber, failedTryAgain, timeout);
-			{
-				List<BundleInfo> downloadList = new List<BundleInfo>();
-				var operation = new PatchDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain, timeout);
-				return operation;
-			}
-			else if (_playMode == EPlayMode.HostPlayMode)
-			{
-				return _hostPlayModeImpl.CreatePatchDownloaderByPaths(assetInfos, downloadingMaxNumber, failedTryAgain, timeout);
-			}
-			else
-			{
-				throw new NotImplementedException();
-			}
 		}
 		#endregion
 
@@ -834,7 +691,7 @@ namespace YooAsset
 		public PatchUnpackerOperation CreatePatchUnpacker(string tag, int unpackingMaxNumber, int failedTryAgain)
 		{
 			DebugCheckInitialize();
-			return CreatePatchUnpacker(new string[] { tag }, unpackingMaxNumber, failedTryAgain);
+			return _playModeServices.CreatePatchUnpackerByTags(new string[] { tag }, unpackingMaxNumber, failedTryAgain, int.MaxValue);
 		}
 
 		/// <summary>
@@ -846,26 +703,7 @@ namespace YooAsset
 		public PatchUnpackerOperation CreatePatchUnpacker(string[] tags, int unpackingMaxNumber, int failedTryAgain)
 		{
 			DebugCheckInitialize();
-			if (_playMode == EPlayMode.EditorSimulateMode)
+			return _playModeServices.CreatePatchUnpackerByTags(tags, unpackingMaxNumber, failedTryAgain, int.MaxValue);
-			{
-				List<BundleInfo> downloadList = new List<BundleInfo>();
-				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, int.MaxValue);
-				return operation;
-			}
-			else if (_playMode == EPlayMode.HostPlayMode)
-			{
-				return _hostPlayModeImpl.CreatePatchUnpackerByTags(tags, unpackingMaxNumber, failedTryAgain, int.MaxValue);
-			}
-			else
-			{
-				throw new NotImplementedException();
-			}
 		}
 
 		/// <summary>
@@ -876,58 +714,7 @@ namespace YooAsset
 		public PatchUnpackerOperation CreatePatchUnpacker(int unpackingMaxNumber, int failedTryAgain)
 		{
 			DebugCheckInitialize();
-			if (_playMode == EPlayMode.EditorSimulateMode)
+			return _playModeServices.CreatePatchUnpackerByAll(unpackingMaxNumber, failedTryAgain, int.MaxValue);
-			{
-				List<BundleInfo> downloadList = new List<BundleInfo>();
-				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, int.MaxValue);
-				return operation;
-			}
-			else if (_playMode == EPlayMode.HostPlayMode)
-			{
-				return _hostPlayModeImpl.CreatePatchUnpackerByAll(unpackingMaxNumber, failedTryAgain, int.MaxValue);
-			}
-			else
-			{
-				throw new NotImplementedException();
-			}
-		}
-		#endregion
-
-		#region 包裹更新
-		/// <summary>
-		/// 创建资源包裹下载器，用于下载更新指定资源版本所有的资源包文件
-		/// </summary>
-		/// <param name="packageVersion">指定更新的包裹版本</param>
-		/// <param name="timeout">超时时间</param>
-		public DownloadPackageOperation DownloadPackageAsync(string packageVersion, int timeout = 60)
-		{
-			DebugCheckInitialize();
-			if (_playMode == EPlayMode.EditorSimulateMode)
-			{
-				var operation = new EditorPlayModeDownloadPackageOperation();
-				OperationSystem.StartOperation(operation);
-				return operation;
-			}
-			else if (_playMode == EPlayMode.OfflinePlayMode)
-			{
-				var operation = new OfflinePlayModeDownloadPackageOperation();
-				OperationSystem.StartOperation(operation);
-				return operation;
-			}
-			else if (_playMode == EPlayMode.HostPlayMode)
-			{
-				return _hostPlayModeImpl.DownloadPackageAsync(PackageName, packageVersion, timeout);
-			}
-			else
-			{
-				throw new NotImplementedException();
-			}
 		}
 		#endregion
 
@@ -935,12 +722,20 @@ namespace YooAsset
 		/// <summary>
 		/// 是否包含资源文件
 		/// </summary>
-		internal bool IsIncludeBundleFile(string fileName)
+		internal bool IsIncludeBundleFile(string cacheGUID)
 		{
 			// NOTE : 编辑器模拟模式下始终返回TRUE
 			if (_playMode == EPlayMode.EditorSimulateMode)
 				return true;
-			return _bundleServices.IsIncludeBundleFile(fileName);
+			return _playModeServices.ActiveManifest.IsIncludeBundleFile(cacheGUID);
+		}
+
+		/// <summary>
+		/// 资源定位地址转换为资源信息类
+		/// </summary>
+		private AssetInfo ConvertLocationToAssetInfo(string location, System.Type assetType)
+		{
+			return _playModeServices.ActiveManifest.ConvertLocationToAssetInfo(location, assetType);
 		}
 		#endregion
 
@@ -954,31 +749,13 @@ namespace YooAsset
 				throw new Exception($"Package initialize failed ! {_initializeError}");
 		}
 
-		[Conditional("DEBUG")]
-		private void DebugCheckLocation(string location)
-		{
-			if (string.IsNullOrEmpty(location) == false)
-			{
-				// 检查路径末尾是否有空格
-				int index = location.LastIndexOf(" ");
-				if (index != -1)
-				{
-					if (location.Length == index + 1)
-						YooLogger.Warning($"Found blank character in location : \"{location}\"");
-				}
-
-				if (location.IndexOfAny(System.IO.Path.GetInvalidPathChars()) >= 0)
-					YooLogger.Warning($"Found illegal character in location : \"{location}\"");
-			}
-		}
-
 		[Conditional("DEBUG")]
 		private void DebugCheckUpdateManifest()
 		{
 			var loadedBundleInfos = _assetSystemImpl.GetLoadedBundleInfos();
 			if (loadedBundleInfos.Count > 0)
 			{
-				YooLogger.Error($"Found loaded bundle before update manifest ! Recommended to call the  {nameof(ForceUnloadAllAssets)} method to release loaded bundle !");
+				YooLogger.Warning($"Found loaded bundle before update manifest ! Recommended to call the  {nameof(ForceUnloadAllAssets)} method to release loaded bundle !");
 			}
 		}
 		#endregion
@@ -992,33 +769,5 @@ namespace YooAsset
 			return data;
 		}
 		#endregion
-
-		#region 私有方法
-		/// <summary>
-		/// 资源定位地址转换为资源信息类，失败时内部会发出错误日志。
-		/// </summary>
-		/// <returns>如果转换失败会返回一个无效的资源信息类</returns>
-		private AssetInfo ConvertLocationToAssetInfo(string location, System.Type assetType)
-		{
-			DebugCheckLocation(location);
-			string assetPath = _bundleServices.MappingToAssetPath(location);
-			PatchAsset patchAsset = _bundleServices.TryGetPatchAsset(assetPath);
-			if (patchAsset != null)
-			{
-				AssetInfo assetInfo = new AssetInfo(patchAsset, assetType);
-				return assetInfo;
-			}
-			else
-			{
-				string error;
-				if (string.IsNullOrEmpty(location))
-					error = $"The location is null or empty !";
-				else
-					error = $"The location is invalid : {location}";
-				AssetInfo assetInfo = new AssetInfo(error);
-				return assetInfo;
-			}
-		}
-		#endregion
 	}
 }

Assets/YooAsset/Runtime/CacheSystem/CacheFileInfo.cs

@@ -0,0 +1,36 @@
+using System;
+using System.IO;
+
+namespace YooAsset
+{
+	internal class CacheFileInfo
+	{
+		private static readonly BufferWriter SharedBuffer = new BufferWriter(1024);
+
+		/// <summary>
+		/// 写入资源包信息
+		/// </summary>
+		public static void WriteInfoToFile(string filePath, string dataFileCRC, long dataFileSize)
+		{
+			using (FileStream fs = new FileStream(filePath, FileMode.Create))
+			{
+				SharedBuffer.Clear();
+				SharedBuffer.WriteUTF8(dataFileCRC);
+				SharedBuffer.WriteInt64(dataFileSize);
+				SharedBuffer.WriteToStream(fs);
+				fs.Flush();
+			}
+		}
+
+		/// <summary>
+		/// 读取资源包信息
+		/// </summary>
+		public static void ReadInfoFromFile(string filePath, out string dataFileCRC, out long dataFileSize)
+		{
+			byte[] binaryData = FileUtility.ReadAllBytes(filePath);
+			BufferReader buffer = new BufferReader(binaryData);
+			dataFileCRC = buffer.ReadUTF8();
+			dataFileSize = buffer.ReadInt64();
+		}
+	}
+}

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 223f217ed81460541b5ea7eb7a7d82a4
+guid: e4a97c06e069c1146a881fcb359f9b4b
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/YooAsset/Runtime/CacheSystem/CacheSystem.cs

@@ -2,19 +2,19 @@
 using System.IO;
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics;
 
 namespace YooAsset
 {
 	internal static class CacheSystem
 	{
-		private readonly static Dictionary<string, PatchBundle> _cachedDic = new Dictionary<string, PatchBundle>(1000);
+		private readonly static Dictionary<string, PackageCache> _cachedDic = new Dictionary<string, PackageCache>(1000);
 
 		/// <summary>
 		/// 初始化时的验证级别
 		/// </summary>
 		public static EVerifyLevel InitVerifyLevel { set; get; } = EVerifyLevel.Low;
 
-
 		/// <summary>
 		/// 清空所有数据
 		/// </summary>
@@ -25,73 +25,116 @@ namespace YooAsset
 
 		/// <summary>
 		/// 查询是否为验证文件
-		/// 注意：被收录的文件完整性是绝对有效的
 		/// </summary>
-		public static bool IsCached(PatchBundle patchBundle)
+		public static bool IsCached(string packageName, string cacheGUID)
 		{
-			string cacheKey = patchBundle.CacheKey;
+			var cache = GetOrCreateCache(packageName);
-			if (_cachedDic.ContainsKey(cacheKey))
+			return cache.IsCached(cacheGUID);
+		}
+
+		/// <summary>
+		/// 录入验证的文件
+		/// </summary>
+		public static void RecordFile(string packageName, string cacheGUID, PackageCache.RecordWrapper wrapper)
+		{
+			var cache = GetOrCreateCache(packageName);
+			cache.Record(cacheGUID, wrapper);
+		}
+
+		/// <summary>
+		/// 丢弃验证的文件（同时删除文件）
+		/// </summary>
+		public static void DiscardFile(string packageName, string cacheGUID)
+		{
+			var cache = GetOrCreateCache(packageName);
+			var wrapper = cache.TryGetWrapper(cacheGUID);
+			if (wrapper == null)
+				return;
+
+			cache.Discard(cacheGUID);
+
+			try
 			{
-				string filePath = patchBundle.CachedFilePath;
+				string dataFilePath = wrapper.DataFilePath;
-				if (File.Exists(filePath))
+				FileInfo fileInfo = new FileInfo(dataFilePath);
+				if (fileInfo.Exists)
+					fileInfo.Directory.Delete(true);
+			}
+			catch (Exception e)
+			{
+				YooLogger.Error($"Failed to delete cache file ! {e.Message}");
+			}
+		}
+
+		/// <summary>
+		/// 验证缓存文件（子线程内操作）
+		/// </summary>
+		public static EVerifyResult VerifyingCacheFile(VerifyElement element, EVerifyLevel verifyLevel)
+		{
+			try
+			{
+				string infoFilePath = element.InfoFilePath;
+				if (File.Exists(infoFilePath) == false)
+					return EVerifyResult.InfoFileNotExisted;
+
+				// 解析信息文件获取验证数据
+				CacheFileInfo.ReadInfoFromFile(infoFilePath, out element.DataFileCRC, out element.DataFileSize);
+			}
+			catch (Exception)
+			{
+				return EVerifyResult.Exception;
+			}
+
+			return VerifyingInternal(element.DataFilePath, element.DataFileSize, element.DataFileCRC, verifyLevel);
+		}
+
+		/// <summary>
+		/// 验证下载文件
+		/// </summary>
+		public static EVerifyResult VerifyingTempFile(PatchBundle patchBundle, EVerifyLevel verifyLevel)
+		{
+			return VerifyingInternal(patchBundle.TempDataFilePath, patchBundle.FileSize, patchBundle.FileCRC, verifyLevel);
+		}
+
+		/// <summary>
+		/// 验证记录文件
+		/// </summary>
+		public static EVerifyResult VerifyingRecordFile(string packageName, string cacheGUID)
+		{
+			var cache = GetOrCreateCache(packageName);
+			var wrapper = cache.TryGetWrapper(cacheGUID);
+			if (wrapper == null)
+				return EVerifyResult.CacheNotFound;
+
+			EVerifyResult result = VerifyingInternal(wrapper.DataFilePath, wrapper.DataFileSize, wrapper.DataFileCRC, EVerifyLevel.High);
+			return result;
+		}
+
+		/// <summary>
+		/// 获取未被使用的缓存文件
+		/// </summary>
+		public static List<string> GetUnusedCacheGUIDs(AssetsPackage package)
+		{
+			var cache = GetOrCreateCache(package.PackageName);
+			var keys = cache.GetAllKeys();
+			List<string> result = new List<string>(keys.Count);
+			foreach (var cacheGUID in keys)
+			{
+				if (package.IsIncludeBundleFile(cacheGUID) == false)
 				{
-					return true;
+					result.Add(cacheGUID);
-				}
-				else
-				{
-					_cachedDic.Remove(cacheKey);
-					YooLogger.Error($"Cache file is missing : {filePath}");
-					return false;
 				}
 			}
-			else
+			return result;
-			{
-				return false;
-			}
 		}
 
-		/// <summary>
-		/// 缓存补丁包文件
-		/// </summary>
-		public static void CacheBundle(PatchBundle patchBundle)
-		{
-			string cacheKey = patchBundle.CacheKey;
-			if (_cachedDic.ContainsKey(cacheKey) == false)
-			{
-				string filePath = patchBundle.CachedFilePath;
-				YooLogger.Log($"Cache verify file : {filePath}");
-				_cachedDic.Add(cacheKey, patchBundle);
-			}
-		}
 
-		/// <summary>
+		private static EVerifyResult VerifyingInternal(string filePath, long fileSize, string fileCRC, EVerifyLevel verifyLevel)
-		/// 验证补丁包文件
-		/// </summary>
-		public static EVerifyResult VerifyBundle(PatchBundle patchBundle, EVerifyLevel verifyLevel)
-		{
-			return VerifyContentInternal(patchBundle.CachedFilePath, patchBundle.FileSize, patchBundle.FileCRC, verifyLevel);
-		}
-
-		/// <summary>
-		/// 验证并缓存补丁包文件
-		/// </summary>
-		public static EVerifyResult VerifyAndCacheBundle(PatchBundle patchBundle, EVerifyLevel verifyLevel)
-		{
-			var verifyResult = VerifyContentInternal(patchBundle.CachedFilePath, patchBundle.FileSize, patchBundle.FileCRC, verifyLevel);
-			if (verifyResult == EVerifyResult.Succeed)
-				CacheBundle(patchBundle);
-			return verifyResult;
-		}
-
-		/// <summary>
-		/// 验证文件完整性
-		/// </summary>
-		public static EVerifyResult VerifyContentInternal(string filePath, long fileSize, string fileCRC, EVerifyLevel verifyLevel)
 		{
 			try
 			{
 				if (File.Exists(filePath) == false)
-					return EVerifyResult.FileNotExisted;
+					return EVerifyResult.DataFileNotExisted;
 
 				// 先验证文件大小
 				long size = FileUtility.GetFileSize(filePath);
@@ -119,5 +162,14 @@ namespace YooAsset
 				return EVerifyResult.Exception;
 			}
 		}
+		private static PackageCache GetOrCreateCache(string packageName)
+		{
+			if (_cachedDic.TryGetValue(packageName, out PackageCache cache) == false)
+			{
+				cache = new PackageCache(packageName);
+				_cachedDic.Add(packageName, cache);
+			}
+			return cache;
+		}
 	}
 }

Assets/YooAsset/Runtime/CacheSystem/CacheVerifier.cs

@@ -1,181 +0,0 @@
-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/EVerifyResult.cs

@@ -7,9 +7,19 @@ namespace YooAsset
 	internal enum EVerifyResult
 	{
 		/// <summary>
-		/// 文件不存在
+		/// 未找到缓存信息
 		/// </summary>
-		FileNotExisted = -4,
+		CacheNotFound = -6,
+
+		/// <summary>
+		/// 信息文件不存在
+		/// </summary>
+		InfoFileNotExisted = -5,
+
+		/// <summary>
+		/// 数据文件不存在
+		/// </summary>
+		DataFileNotExisted = -4,
 
 		/// <summary>
 		/// 文件内容不足（小于正常大小）

Assets/YooAsset/Runtime/CacheSystem/Operations.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 89357359fd1b3f74fa7cb048a1ffa2b6
+guid: d29a9623b2b346e439b7a7e37fafa781
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

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

@@ -0,0 +1,71 @@
+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 AssetsPackage _package;
+		private List<string> _unusedCacheGUIDs;
+		private int _unusedFileTotalCount = 0;
+		private ESteps _steps = ESteps.None;
+
+		internal ClearUnusedCacheFilesOperation(AssetsPackage package)
+		{
+			_package = package;
+		}
+		internal override void Start()
+		{
+			_steps = ESteps.GetUnusedCacheFiles;
+		}
+		internal override void Update()
+		{
+			if (_steps == ESteps.None || _steps == ESteps.Done)
+				return;
+
+			if (_steps == ESteps.GetUnusedCacheFiles)
+			{
+				_unusedCacheGUIDs = CacheSystem.GetUnusedCacheGUIDs(_package);
+				_unusedFileTotalCount = _unusedCacheGUIDs.Count;
+				YooLogger.Log($"Found unused cache file count : {_unusedFileTotalCount}");
+				_steps = ESteps.ClearUnusedCacheFiles;
+			}
+
+			if (_steps == ESteps.ClearUnusedCacheFiles)
+			{
+				for (int i = _unusedCacheGUIDs.Count - 1; i >= 0; i--)
+				{
+					string cacheGUID = _unusedCacheGUIDs[i];
+					CacheSystem.DiscardFile(_package.PackageName, cacheGUID);
+					_unusedCacheGUIDs.RemoveAt(i);
+
+					if (OperationSystem.IsBusy)
+						break;
+				}
+
+				if (_unusedFileTotalCount == 0)
+					Progress = 1.0f;
+				else
+					Progress = 1.0f - (_unusedCacheGUIDs.Count / _unusedFileTotalCount);
+
+				if (_unusedCacheGUIDs.Count == 0)
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Succeed;
+				}
+			}
+		}
+	}
+}

Assets/YooAsset/Runtime/CacheSystem/Operations/PackageCachingOperation.cs

@@ -0,0 +1,80 @@
+using System;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset
+{
+	internal class PackageCachingOperation : AsyncOperationBase
+	{
+		private enum ESteps
+		{
+			None,
+			GetCacheFiles,
+			VerifyCacheFiles,
+			Done,
+		}
+
+		private readonly string _packageName;
+		private PackageVerifyOperation _packageVerifyOp;
+		private ESteps _steps = ESteps.None;
+
+		public PackageCachingOperation(string packageName)
+		{
+			_packageName = packageName;
+		}
+		internal override void Start()
+		{
+			_steps = ESteps.GetCacheFiles;
+		}
+		internal override void Update()
+		{
+			if (_steps == ESteps.None || _steps == ESteps.Done)
+				return;
+
+			if (_steps == ESteps.GetCacheFiles)
+			{
+				var elements = GetVerifyElements();
+				_packageVerifyOp = PackageVerifyOperation.CreateOperation(elements);
+				OperationSystem.StartOperation(_packageVerifyOp);
+				_steps = ESteps.VerifyCacheFiles;
+			}
+
+			if (_steps == ESteps.VerifyCacheFiles)
+			{
+				Progress = _packageVerifyOp.Progress;
+				if (_packageVerifyOp.IsDone == false)
+					return;
+
+				// 注意：总是返回成功
+				_steps = ESteps.Done;
+				Status = EOperationStatus.Succeed;
+			}
+		}
+
+		private List<VerifyElement> GetVerifyElements()
+		{
+			string cacheFolderPath = PersistentHelper.GetCacheFolderPath(_packageName);
+			if (Directory.Exists(cacheFolderPath) == false)
+				return new List<VerifyElement>();
+
+			DirectoryInfo rootDirectory = new DirectoryInfo(cacheFolderPath);
+			DirectoryInfo[] fileFolders = rootDirectory.GetDirectories();
+			List<VerifyElement> result = new List<VerifyElement>(fileFolders.Length);
+			foreach (var fileFoder in fileFolders)
+			{
+				string cacheGUID = fileFoder.Name;
+				if (CacheSystem.IsCached(_packageName, cacheGUID))
+					continue;
+
+				string fileRootPath = fileFoder.FullName;
+				string dataFilePath = $"{fileRootPath}/{ YooAssetSettings.CacheBundleDataFileName}";
+				string infoFilePath = $"{fileRootPath}/{ YooAssetSettings.CacheBundleInfoFileName}";
+				VerifyElement element = new VerifyElement(_packageName, cacheGUID, fileRootPath, dataFilePath, infoFilePath);
+				result.Add(element);
+			}
+
+			return result;
+		}
+	}
+}

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c4b754a3b15abc44fa2727f57721e18b
+guid: 4ff95e7516dbfa148b4fe16eaab783fb
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/YooAsset/Runtime/CacheSystem/Operations/PackageVerifyOperation.cs

@@ -0,0 +1,258 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+
+namespace YooAsset
+{
+	internal abstract class PackageVerifyOperation : AsyncOperationBase
+	{
+		public static PackageVerifyOperation CreateOperation(List<VerifyElement> elements)
+		{
+#if UNITY_WEBGL
+			var operation = new PackageVerifyWithoutThreadOperation(elements);
+#else
+			var operation = new PackageVerifyWithThreadOperation(elements);
+#endif
+			return operation;
+		}
+	}
+
+	/// <summary>
+	/// 本地缓存文件验证（线程版）
+	/// </summary>
+	internal class PackageVerifyWithThreadOperation : PackageVerifyOperation
+	{
+		private enum ESteps
+		{
+			None,
+			InitVerify,
+			UpdateVerify,
+			Done,
+		}
+
+		private readonly ThreadSyncContext _syncContext = new ThreadSyncContext();
+		private List<VerifyElement> _waitingList;
+		private List<VerifyElement> _verifyingList;
+		private int _verifyMaxNum;
+		private int _verifyTotalCount;
+		private float _verifyStartTime;
+		private int _succeedCount;
+		private int _failedCount;
+		private ESteps _steps = ESteps.None;
+
+		public PackageVerifyWithThreadOperation(List<VerifyElement> elements)
+		{
+			_waitingList = elements;
+		}
+		internal override void Start()
+		{
+			_steps = ESteps.InitVerify;
+			_verifyStartTime = UnityEngine.Time.realtimeSinceStartup;
+		}
+		internal override void Update()
+		{
+			if (_steps == ESteps.None || _steps == ESteps.Done)
+				return;
+
+			if (_steps == ESteps.InitVerify)
+			{
+				int fileCount = _waitingList.Count;
+
+				// 设置同时验证的最大数
+				ThreadPool.GetMaxThreads(out int workerThreads, out int ioThreads);
+				YooLogger.Log($"Work threads : {workerThreads}, IO threads : {ioThreads}");
+				_verifyMaxNum = Math.Min(workerThreads, ioThreads);
+				_verifyTotalCount = fileCount;
+				if (_verifyMaxNum < 1)
+					_verifyMaxNum = 1;
+
+				_verifyingList = new List<VerifyElement>(_verifyMaxNum);
+				_steps = ESteps.UpdateVerify;
+			}
+
+			if (_steps == ESteps.UpdateVerify)
+			{
+				_syncContext.Update();
+
+				Progress = GetProgress();
+				if (_waitingList.Count == 0 && _verifyingList.Count == 0)
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Succeed;
+					float costTime = UnityEngine.Time.realtimeSinceStartup - _verifyStartTime;
+					YooLogger.Log($"Package verify elapsed time {costTime:f1} seconds");
+				}
+
+				for (int i = _waitingList.Count - 1; i >= 0; i--)
+				{
+					if (OperationSystem.IsBusy)
+						break;
+
+					if (_verifyingList.Count >= _verifyMaxNum)
+						break;
+
+					var element = _waitingList[i];
+					if (BeginVerifyFileWithThread(element))
+					{
+						_waitingList.RemoveAt(i);
+						_verifyingList.Add(element);
+					}
+					else
+					{
+						YooLogger.Warning("The thread pool is failed queued.");
+						break;
+					}
+				}
+			}
+		}
+
+		private float GetProgress()
+		{
+			if (_verifyTotalCount == 0)
+				return 1f;
+			return (float)(_succeedCount + _failedCount) / _verifyTotalCount;
+		}
+		private bool BeginVerifyFileWithThread(VerifyElement element)
+		{
+			return ThreadPool.QueueUserWorkItem(new WaitCallback(VerifyInThread), element);
+		}
+		private void VerifyInThread(object obj)
+		{
+			VerifyElement element = (VerifyElement)obj;
+			element.Result = CacheSystem.VerifyingCacheFile(element, CacheSystem.InitVerifyLevel);
+			_syncContext.Post(VerifyCallback, element);
+		}
+		private void VerifyCallback(object obj)
+		{
+			VerifyElement element = (VerifyElement)obj;
+			_verifyingList.Remove(element);
+
+			if (element.Result == EVerifyResult.Succeed)
+			{
+				_succeedCount++;
+				var wrapper = new PackageCache.RecordWrapper(element.InfoFilePath, element.DataFilePath, element.DataFileCRC, element.DataFileSize);
+				CacheSystem.RecordFile(element.PackageName, element.CacheGUID, wrapper);
+			}
+			else
+			{
+				_failedCount++;
+
+				// 删除验证失败的缓存文件
+				if (Directory.Exists(element.FileRootPath))
+				{
+					YooLogger.Warning($"Failed verify file and delete files : {element.FileRootPath}");
+					Directory.Delete(element.FileRootPath, true);
+				}
+			}
+		}
+	}
+
+	/// <summary>
+	/// 本地缓存文件验证（非线程版）
+	/// </summary>
+	internal class PackageVerifyWithoutThreadOperation : PackageVerifyOperation
+	{
+		private enum ESteps
+		{
+			None,
+			InitVerify,
+			UpdateVerify,
+			Done,
+		}
+
+		private List<VerifyElement> _waitingList;
+		private List<VerifyElement> _verifyingList;
+		private int _verifyMaxNum;
+		private int _verifyTotalCount;
+		private float _verifyStartTime;
+		private int _succeedCount;
+		private int _failedCount;
+		private ESteps _steps = ESteps.None;
+
+		public PackageVerifyWithoutThreadOperation(List<VerifyElement> elements)
+		{
+			_waitingList = elements;
+		}
+		internal override void Start()
+		{
+			_steps = ESteps.InitVerify;
+			_verifyStartTime = UnityEngine.Time.realtimeSinceStartup;
+		}
+		internal override void Update()
+		{
+			if (_steps == ESteps.None || _steps == ESteps.Done)
+				return;
+
+			if (_steps == ESteps.InitVerify)
+			{
+				int fileCount = _waitingList.Count;
+
+				// 设置同时验证的最大数
+				_verifyMaxNum = fileCount;
+				_verifyTotalCount = fileCount;
+
+				_verifyingList = new List<VerifyElement>(_verifyMaxNum);
+				_steps = ESteps.UpdateVerify;
+			}
+
+			if (_steps == ESteps.UpdateVerify)
+			{
+				Progress = GetProgress();
+				if (_waitingList.Count == 0 && _verifyingList.Count == 0)
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Succeed;
+					float costTime = UnityEngine.Time.realtimeSinceStartup - _verifyStartTime;
+					YooLogger.Log($"Package verify elapsed time {costTime:f1} seconds");
+				}
+
+				for (int i = _waitingList.Count - 1; i >= 0; i--)
+				{
+					if (OperationSystem.IsBusy)
+						break;
+
+					if (_verifyingList.Count >= _verifyMaxNum)
+						break;
+
+					var element = _waitingList[i];
+					BeginVerifyFileWithoutThread(element);
+					_waitingList.RemoveAt(i);
+					_verifyingList.Add(element);
+				}
+
+				// 主线程内验证，可以清空列表
+				_verifyingList.Clear();
+			}
+		}
+
+		private float GetProgress()
+		{
+			if (_verifyTotalCount == 0)
+				return 1f;
+			return (float)(_succeedCount + _failedCount) / _verifyTotalCount;
+		}
+		private void BeginVerifyFileWithoutThread(VerifyElement element)
+		{
+			element.Result = CacheSystem.VerifyingCacheFile(element, CacheSystem.InitVerifyLevel);
+			if (element.Result == EVerifyResult.Succeed)
+			{
+				_succeedCount++;
+				var wrapper = new PackageCache.RecordWrapper(element.InfoFilePath, element.DataFilePath, element.DataFileCRC, element.DataFileSize);
+				CacheSystem.RecordFile(element.PackageName, element.CacheGUID, wrapper);
+			}
+			else
+			{
+				_failedCount++;
+
+				// 删除验证失败的缓存文件
+				if (Directory.Exists(element.FileRootPath))
+				{
+					YooLogger.Warning($"Failed verify file and delete files : {element.FileRootPath}");
+					Directory.Delete(element.FileRootPath, true);
+				}
+			}
+		}
+	}
+}

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a6296859f09655c4191594304ddf378f
+guid: 868188d19436b674b8c403d2d90afeaf
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/YooAsset/Runtime/CacheSystem/PackageCache.cs

@@ -0,0 +1,103 @@
+using System;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset
+{
+	internal class PackageCache
+	{
+		internal class RecordWrapper
+		{
+			public string InfoFilePath { private set; get; }
+			public string DataFilePath { private set; get; }
+			public string DataFileCRC { private set; get; }
+			public long DataFileSize { private set; get; }
+
+			public RecordWrapper(string infoFilePath, string dataFilePath, string dataFileCRC, long dataFileSize)
+			{
+				InfoFilePath = infoFilePath;
+				DataFilePath = dataFilePath;
+				DataFileCRC = dataFileCRC;
+				DataFileSize = dataFileSize;
+			}
+		}
+
+		private readonly Dictionary<string, RecordWrapper> _wrappers = new Dictionary<string, RecordWrapper>();
+
+		/// <summary>
+		/// 包裹名称
+		/// </summary>
+		public string PackageName { private set; get; }
+
+
+		public PackageCache(string packageName)
+		{
+			PackageName = packageName;
+		}
+
+		/// <summary>
+		/// 清空所有数据
+		/// </summary>
+		public void ClearAll()
+		{
+			_wrappers.Clear();
+		}
+
+		/// <summary>
+		/// 查询缓存记录
+		/// </summary>
+		public bool IsCached(string cacheGUID)
+		{
+			return _wrappers.ContainsKey(cacheGUID);
+		}
+
+		/// <summary>
+		/// 记录验证结果
+		/// </summary>
+		public void Record(string cacheGUID, RecordWrapper wrapper)
+		{
+			if (_wrappers.ContainsKey(cacheGUID) == false)
+			{
+				_wrappers.Add(cacheGUID, wrapper);
+			}
+			else
+			{
+				throw new Exception("Should never get here !");
+			}
+		}
+
+		/// <summary>
+		/// 丢弃验证结果
+		/// </summary>
+		public void Discard(string cacheGUID)
+		{
+			if (_wrappers.ContainsKey(cacheGUID))
+			{
+				_wrappers.Remove(cacheGUID);
+			}
+		}
+
+		/// <summary>
+		/// 获取记录对象
+		/// </summary>
+		public RecordWrapper TryGetWrapper(string cacheGUID)
+		{
+			if (_wrappers.TryGetValue(cacheGUID, out RecordWrapper value))
+				return value;
+			else
+				return null;
+		}
+
+		internal List<string> GetAllKeys()
+		{
+			List<string> keys = new List<string>(_wrappers.Keys.Count);
+			var keyCollection = _wrappers.Keys;
+			foreach (var key in keyCollection)
+			{
+				keys.Add(key);
+			}
+			return keys;
+		}
+	}
+}

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

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

Assets/YooAsset/Runtime/CacheSystem/VerifyElement.cs

@@ -0,0 +1,25 @@
+
+namespace YooAsset
+{
+	internal class VerifyElement
+	{
+		public string PackageName { private set; get; }
+		public string CacheGUID { private set; get; }
+		public string FileRootPath { private set; get; }
+		public string DataFilePath { private set; get; }
+		public string InfoFilePath { private set; get; }
+		
+		public EVerifyResult Result;
+		public string DataFileCRC;
+		public long DataFileSize;
+
+		public VerifyElement(string packageName, string cacheGUID, string fileRootPath, string dataFilePath, string infoFilePath)
+		{
+			PackageName = packageName;
+			CacheGUID = cacheGUID;
+			FileRootPath = fileRootPath;
+			DataFilePath = dataFilePath;
+			InfoFilePath = infoFilePath;
+		}
+	}
+}

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

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

Assets/YooAsset/Runtime/CacheSystem/VerifyInfo.cs

@@ -1,33 +0,0 @@
-
-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/DownloadSystem/DownloadReport.cs

@@ -0,0 +1,30 @@
+
+namespace YooAsset
+{
+	public struct DownloadReport
+	{
+		/// <summary>
+		/// 下载进度（0f~1f）
+		/// </summary>
+		public float Progress;
+
+		/// <summary>
+		/// 需要下载的总字节数
+		/// </summary>
+		public ulong TotalSize;
+
+		/// <summary>
+		/// 已经下载的字节数
+		/// </summary>
+		public ulong DownloadedBytes;
+
+		public static DownloadReport CreateDefaultReport()
+		{
+			DownloadReport report = new DownloadReport();
+			report.Progress = 0f;
+			report.TotalSize = 0;
+			report.DownloadedBytes = 0;
+			return report;
+		}
+	}
+}

Assets/YooAsset/Runtime/DownloadSystem/DownloadReport.cs.meta

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

Assets/YooAsset/Runtime/DownloadSystem/DownloadSystem.cs

@@ -77,13 +77,13 @@ namespace YooAsset
 		public static DownloaderBase BeginDownload(BundleInfo bundleInfo, int failedTryAgain, int timeout = 60)
 		{
 			// 查询存在的下载器
-			if (_downloaderDic.TryGetValue(bundleInfo.Bundle.CachedFilePath, out var downloader))
+			if (_downloaderDic.TryGetValue(bundleInfo.Bundle.CachedDataFilePath, out var downloader))
 			{
 				return downloader;
 			}
 
 			// 如果资源已经缓存
-			if (CacheSystem.IsCached(bundleInfo.Bundle))
+			if (CacheSystem.IsCached(bundleInfo.Bundle.PackageName, bundleInfo.Bundle.CacheGUID))
 			{
 				var tempDownloader = new TempDownloader(bundleInfo);
 				return tempDownloader;
@@ -92,11 +92,11 @@ namespace YooAsset
 			// 创建新的下载器	
 			{
 				YooLogger.Log($"Beginning to download file : {bundleInfo.Bundle.FileName} URL : {bundleInfo.RemoteMainURL}");
-				FileUtility.CreateFileDirectory(bundleInfo.Bundle.CachedFilePath);
+				FileUtility.CreateFileDirectory(bundleInfo.Bundle.CachedDataFilePath);
 				bool breakDownload = bundleInfo.Bundle.FileSize >= BreakpointResumeFileSize;
 				DownloaderBase newDownloader = new FileDownloader(bundleInfo, breakDownload);
 				newDownloader.SendRequest(failedTryAgain, timeout);
-				_downloaderDic.Add(bundleInfo.Bundle.CachedFilePath, newDownloader);
+				_downloaderDic.Add(bundleInfo.Bundle.CachedDataFilePath, newDownloader);
 				return newDownloader;
 			}
 		}

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

@@ -6,9 +6,13 @@ namespace YooAsset
 		protected enum ESteps
 		{
 			None,
-			CheckLocalFile,
+			CheckTempFile,
-			CreateDownload,
+			PrepareDownload,
+			CreateResumeDownloader,
+			CreateGeneralDownloader,
 			CheckDownload,
+			VerifyingFile,
+			CachingFile,
 			TryAgain,
 			Succeed,
 			Failed,
@@ -30,7 +34,7 @@ namespace YooAsset
 
 
 		/// <summary>
-		/// 下载进度
+		/// 下载进度（0f~1f）
 		/// </summary>
 		public float DownloadProgress
 		{
@@ -56,7 +60,7 @@ namespace YooAsset
 			{
 				_failedTryAgain = failedTryAgain;
 				_timeout = timeout;
-				_steps = ESteps.CheckLocalFile;
+				_steps = ESteps.CheckTempFile;
 			}
 		}
 		public abstract void Update();

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

@@ -10,6 +10,7 @@ namespace YooAsset
 	internal sealed class FileDownloader : DownloaderBase
 	{
 		private readonly bool _breakResume;
+		private readonly string _tempFilePath;
 		private UnityWebRequest _webRequest = null;
 		private DownloadHandlerFileRange _downloadHandle = null;
 
@@ -24,6 +25,7 @@ namespace YooAsset
 		public FileDownloader(BundleInfo bundleInfo, bool breakResume) : base(bundleInfo)
 		{
 			_breakResume = breakResume;
+			_tempFilePath = bundleInfo.Bundle.TempDataFilePath;
 		}
 		public override void Update()
 		{
@@ -32,31 +34,28 @@ namespace YooAsset
 			if (IsDone())
 				return;
 
-			// 检测本地文件
+			// 检测本地临时文件
-			if (_steps == ESteps.CheckLocalFile)
+			if (_steps == ESteps.CheckTempFile)
 			{
-				var verifyResult = CacheSystem.VerifyAndCacheBundle(_bundleInfo.Bundle, EVerifyLevel.High);
+				var verifyResult = CacheSystem.VerifyingTempFile(_bundleInfo.Bundle, EVerifyLevel.High);
 				if (verifyResult == EVerifyResult.Succeed)
 				{
-					_steps = ESteps.Succeed;
+					_steps = ESteps.CachingFile;
 				}
 				else
 				{
 					if (verifyResult == EVerifyResult.FileOverflow)
 					{
-						string cacheFilePath = _bundleInfo.Bundle.CachedFilePath;
+						if (File.Exists(_tempFilePath))
-						if (File.Exists(cacheFilePath))
+							File.Delete(_tempFilePath);
-							File.Delete(cacheFilePath);
 					}
-					_steps = ESteps.CreateDownload;
+					_steps = ESteps.PrepareDownload;
 				}
 			}
 
 			// 创建下载器
-			if (_steps == ESteps.CreateDownload)
+			if (_steps == ESteps.PrepareDownload)
 			{
-				string fileSavePath = _bundleInfo.Bundle.CachedFilePath;
-
 				// 重置变量
 				_downloadProgress = 0f;
 				_downloadedBytes = 0;
@@ -66,53 +65,71 @@ namespace YooAsset
 				_latestDownloadRealtime = Time.realtimeSinceStartup;
 				_tryAgainTimer = 0f;
 
-				// 是否开启断点续传下载	
+				// 获取请求地址
-				if (_breakResume)
+				_requestURL = GetRequestURL();
-				{
-					long fileLength = -1;
-					if (File.Exists(fileSavePath))
-					{
-						FileInfo fileInfo = new FileInfo(fileSavePath);
-						fileLength = fileInfo.Length;
-						_fileOriginLength = (ulong)fileLength;
-						_downloadedBytes = _fileOriginLength;
-					}
 
-					_requestURL = GetRequestURL();
+				if (_breakResume)
-					_webRequest = UnityWebRequest.Get(_requestURL);
+					_steps = ESteps.CreateResumeDownloader;
+				else
+					_steps = ESteps.CreateGeneralDownloader;
+			}
+
+			// 创建普通的下载器
+			if (_steps == ESteps.CreateGeneralDownloader)
+			{
+				if (File.Exists(_tempFilePath))
+					File.Delete(_tempFilePath);
+
+				_webRequest = new UnityWebRequest(_requestURL, UnityWebRequest.kHttpVerbGET);
+				DownloadHandlerFile handler = new DownloadHandlerFile(_tempFilePath);
+				handler.removeFileOnAbort = true;
+				_webRequest.downloadHandler = handler;
+				_webRequest.disposeDownloadHandlerOnDispose = true;
+
+				if (DownloadSystem.CertificateHandlerInstance != null)
+				{
+					_webRequest.certificateHandler = DownloadSystem.CertificateHandlerInstance;
+					_webRequest.disposeCertificateHandlerOnDispose = false;
+				}
+
+				_webRequest.SendWebRequest();
+				_steps = ESteps.CheckDownload;
+			}
+
+			// 创建断点续传下载器
+			if (_steps == ESteps.CreateResumeDownloader)
+			{
+				long fileLength = -1;
+				if (File.Exists(_tempFilePath))
+				{
+					FileInfo fileInfo = new FileInfo(_tempFilePath);
+					fileLength = fileInfo.Length;
+					_fileOriginLength = (ulong)fileLength;
+					_downloadedBytes = _fileOriginLength;
+				}
 
 #if UNITY_2019_4_OR_NEWER
-					var handler = new DownloadHandlerFile(fileSavePath, true);
+				_webRequest = new UnityWebRequest(_requestURL, UnityWebRequest.kHttpVerbGET);
-					handler.removeFileOnAbort = false;
+				var handler = new DownloadHandlerFile(_tempFilePath, true);
+				handler.removeFileOnAbort = false;
 #else
-					var handler = new DownloadHandlerFileRange(fileSavePath, _bundleInfo.Bundle.FileSize, _webRequest);
+				_webRequest = new UnityWebRequest(_requestURL, UnityWebRequest.kHttpVerbGET);
-					_downloadHandle = handler;
+				var handler = new DownloadHandlerFileRange(_tempFilePath, _bundleInfo.Bundle.FileSize, _webRequest);
+				_downloadHandle = handler;
 #endif
+				_webRequest.downloadHandler = handler;
+				_webRequest.disposeDownloadHandlerOnDispose = true;
+				if (fileLength > 0)
+					_webRequest.SetRequestHeader("Range", $"bytes={fileLength}-");
 
-					if (DownloadSystem.CertificateHandlerInstance != null)
+				if (DownloadSystem.CertificateHandlerInstance != null)
-					{
-						_webRequest.certificateHandler = DownloadSystem.CertificateHandlerInstance;
-						_webRequest.disposeCertificateHandlerOnDispose = false;
-					}
-
-					_webRequest.downloadHandler = handler;
-					_webRequest.disposeDownloadHandlerOnDispose = true;
-					if (fileLength > 0)
-						_webRequest.SetRequestHeader("Range", $"bytes={fileLength}-");
-					_webRequest.SendWebRequest();
-					_steps = ESteps.CheckDownload;
-				}
-				else
 				{
-					_requestURL = GetRequestURL();
+					_webRequest.certificateHandler = DownloadSystem.CertificateHandlerInstance;
-					_webRequest = new UnityWebRequest(_requestURL, UnityWebRequest.kHttpVerbGET);
+					_webRequest.disposeCertificateHandlerOnDispose = false;
-					DownloadHandlerFile handler = new DownloadHandlerFile(fileSavePath);
-					handler.removeFileOnAbort = true;
-					_webRequest.downloadHandler = handler;
-					_webRequest.disposeDownloadHandlerOnDispose = true;
-					_webRequest.SendWebRequest();
-					_steps = ESteps.CheckDownload;
 				}
+
+				_webRequest.SendWebRequest();
+				_steps = ESteps.CheckDownload;
 			}
 
 			// 检测下载结果
@@ -145,78 +162,111 @@ namespace YooAsset
 				}
 #endif
 
-				// 检查文件完整性
+				// 如果网络异常
-				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}";
-						_lastCode = _webRequest.responseCode;
-
-						// 验证失败后删除文件
-						string cacheFilePath = _bundleInfo.Bundle.CachedFilePath;
-						if (File.Exists(cacheFilePath))
-							File.Delete(cacheFilePath);
-					}
-				}
-
-				// 如果下载失败
 				if (hasError)
 				{
-					// 注意：非断点续传下载失败之后删除文件
+					if (_breakResume)
-					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(_tempFilePath))
-								if (File.Exists(cacheFilePath))
+									File.Delete(_tempFilePath);
-									File.Delete(cacheFilePath);
 							}
 						}
 					}
-
-					// 失败后重新尝试
-					if (_failedTryAgain > 0)
-					{
-						ReportWarning();
-						_steps = ESteps.TryAgain;
-					}
 					else
 					{
-						ReportError();
+						// 注意：非断点续传下载失败之后删除文件
-						_steps = ESteps.Failed;
+						if (File.Exists(_tempFilePath))
+							File.Delete(_tempFilePath);
 					}
+
+					_steps = ESteps.TryAgain;
 				}
 				else
 				{
-					_lastError = string.Empty;
+					_steps = ESteps.VerifyingFile;
-					_lastCode = 0;
-					_steps = ESteps.Succeed;
 				}
 
 				// 释放下载器
 				DisposeWebRequest();
 			}
 
+			// 验证下载文件
+			if (_steps == ESteps.VerifyingFile)
+			{
+				var verifyResult = CacheSystem.VerifyingTempFile(_bundleInfo.Bundle, EVerifyLevel.High);
+				if (verifyResult == EVerifyResult.Succeed)
+				{
+					_steps = ESteps.CachingFile;
+				}
+				else
+				{
+					_lastError = $"Failed to verifying file : {_bundleInfo.Bundle.FileName}, ErrorCode : {verifyResult}";
+
+					// 注意：验证失败后删除文件
+					if (File.Exists(_tempFilePath))
+						File.Delete(_tempFilePath);
+
+					_steps = ESteps.TryAgain;
+				}
+			}
+
+			// 缓存下载文件
+			if (_steps == ESteps.CachingFile)
+			{
+				try
+				{
+					string infoFilePath = _bundleInfo.Bundle.CachedInfoFilePath;
+					string dataFilePath = _bundleInfo.Bundle.CachedDataFilePath;
+					string dataFileCRC = _bundleInfo.Bundle.FileCRC;
+					long dataFileSize = _bundleInfo.Bundle.FileSize;
+
+					if (File.Exists(infoFilePath))
+						File.Delete(infoFilePath);		
+					if (File.Exists(dataFilePath))
+						File.Delete(dataFilePath);
+
+					FileInfo fileInfo = new FileInfo(_tempFilePath);
+					fileInfo.MoveTo(dataFilePath);
+
+					// 写入信息文件记录验证数据
+					CacheFileInfo.WriteInfoToFile(infoFilePath, dataFileCRC, dataFileSize);
+
+					// 记录缓存文件
+					var wrapper = new PackageCache.RecordWrapper(infoFilePath, dataFilePath, dataFileCRC, dataFileSize);
+					CacheSystem.RecordFile(_bundleInfo.Bundle.PackageName, _bundleInfo.Bundle.CacheGUID, wrapper);
+
+					_lastError = string.Empty;
+					_lastCode = 0;
+					_steps = ESteps.Succeed;
+				}
+				catch (Exception e)
+				{
+					_lastError = e.Message;
+					_steps = ESteps.TryAgain;
+				}
+			}
+
 			// 重新尝试下载
 			if (_steps == ESteps.TryAgain)
 			{
+				if (_failedTryAgain <= 0)
+				{
+					ReportError();
+					_steps = ESteps.Failed;
+					return;
+				}
+
 				_tryAgainTimer += Time.unscaledDeltaTime;
 				if (_tryAgainTimer > 1f)
 				{
 					_failedTryAgain--;
-					_steps = ESteps.CreateDownload;
+					_steps = ESteps.PrepareDownload;
+					ReportWarning();
 					YooLogger.Warning($"Try again download : {_requestURL}");
 				}
 			}

Assets/YooAsset/Runtime/DownloadSystem/UnityWebDataRequester.cs

@@ -11,8 +11,8 @@ namespace YooAsset
 	/// </summary>
 	internal class UnityWebDataRequester
 	{
-		protected UnityWebRequest _webRequest;
+		private UnityWebRequest _webRequest;
-		protected UnityWebRequestAsyncOperation _operationHandle;
+		private UnityWebRequestAsyncOperation _operationHandle;
 
 		/// <summary>
 		/// 请求URL地址

Assets/YooAsset/Runtime/DownloadSystem/UnityWebFileRequester.cs

@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine.Networking;
+using UnityEngine;
 
 namespace YooAsset
 {
@@ -11,8 +12,14 @@ namespace YooAsset
 	/// </summary>
 	internal class UnityWebFileRequester
 	{
-		protected UnityWebRequest _webRequest;
+		private UnityWebRequest _webRequest;
-		protected UnityWebRequestAsyncOperation _operationHandle;
+		private UnityWebRequestAsyncOperation _operationHandle;
+
+		// 超时相关
+		private float _timeout;
+		private bool _isAbort = false;
+		private ulong _latestDownloadBytes;
+		private float _latestDownloadRealtime;
 
 		/// <summary>
 		/// 请求URL地址
@@ -23,11 +30,15 @@ namespace YooAsset
 		/// <summary>
 		/// 发送GET请求
 		/// </summary>
-		public void SendRequest(string url, string savePath)
+		public void SendRequest(string url, string savePath, float timeout = 60)
 		{
 			if (_webRequest == null)
 			{
 				URL = url;
+				_timeout = timeout;
+				_latestDownloadBytes = 0;
+				_latestDownloadRealtime = Time.realtimeSinceStartup;
+
 				_webRequest = new UnityWebRequest(URL, UnityWebRequest.kHttpVerbGET);
 				DownloadHandlerFile handler = new DownloadHandlerFile(savePath);
 				handler.removeFileOnAbort = true;
@@ -96,5 +107,28 @@ namespace YooAsset
 			}
 			return string.Empty;
 		}
+
+		/// <summary>
+		/// 检测超时
+		/// </summary>
+		public void CheckTimeout()
+		{
+			// 注意：在连续时间段内无新增下载数据及判定为超时
+			if (_isAbort == false)
+			{
+				if (_latestDownloadBytes != _webRequest.downloadedBytes)
+				{
+					_latestDownloadBytes = _webRequest.downloadedBytes;
+					_latestDownloadRealtime = Time.realtimeSinceStartup;
+				}
+
+				float offset = Time.realtimeSinceStartup - _latestDownloadRealtime;
+				if (offset > _timeout)
+				{
+					_webRequest.Abort();
+					_isAbort = true;
+				}
+			}
+		}
 	}
 }

Assets/YooAsset/Runtime/OperationSystem/OperationSystem.cs

@@ -7,6 +7,8 @@ namespace YooAsset
 	internal class OperationSystem
 	{
 		private static readonly List<AsyncOperationBase> _operations = new List<AsyncOperationBase>(100);
+		private static readonly List<AsyncOperationBase> _addList = new List<AsyncOperationBase>(100);
+		private static readonly List<AsyncOperationBase> _removeList = new List<AsyncOperationBase>(100);
 
 		// 计时器相关
 		private static Stopwatch _watch;
@@ -44,19 +46,40 @@ namespace YooAsset
 		{
 			_frameTime = _watch.ElapsedMilliseconds;
 
-			for (int i = _operations.Count - 1; i >= 0; i--)
+			// 添加新的异步操作
+			if (_addList.Count > 0)
+			{
+				for (int i = 0; i < _addList.Count; i++)
+				{
+					var operation = _addList[i];
+					_operations.Add(operation);
+				}
+				_addList.Clear();
+			}
+
+			// 更新所有的异步操作
+			foreach (var operation in _operations)
 			{
 				if (IsBusy)
 					return;
 
-				var operation = _operations[i];
 				operation.Update();
 				if (operation.IsDone)
 				{
-					_operations.RemoveAt(i);
+					_removeList.Add(operation);
 					operation.Finish();
 				}
 			}
+
+			// 移除已经完成的异步操作
+			if (_removeList.Count > 0)
+			{
+				foreach (var operation in _removeList)
+				{
+					_operations.Remove(operation);
+				}
+				_removeList.Clear();
+			}
 		}
 
 		/// <summary>
@@ -65,6 +88,8 @@ namespace YooAsset
 		public static void DestroyAll()
 		{
 			_operations.Clear();
+			_addList.Clear();
+			_removeList.Clear();
 			_watch = null;
 			_frameTime = 0;
 			MaxTimeSlice = long.MaxValue;
@@ -73,10 +98,10 @@ namespace YooAsset
 		/// <summary>
 		/// 开始处理异步操作类
 		/// </summary>
-		public static void StartOperation(AsyncOperationBase operationBase)
+		public static void StartOperation(AsyncOperationBase operation)
 		{
-			_operations.Add(operationBase);
+			_addList.Add(operation);
-			operationBase.Start();
+			operation.Start();
 		}
 	}
 }

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

@@ -1,134 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using UnityEngine;
-
-namespace YooAsset
-{
-	/// <summary>
-	/// 检查本地包裹内容的完整性
-	/// </summary>
-	public abstract class CheckPackageContentsOperation : AsyncOperationBase
-	{
-	}
-
-	internal sealed class EditorSimulateModeCheckPackageContentsOperation : CheckPackageContentsOperation
-	{
-		internal EditorSimulateModeCheckPackageContentsOperation()
-		{
-		}
-		internal override void Start()
-		{
-			Status = EOperationStatus.Succeed;
-		}
-		internal override void Update()
-		{
-		}
-	}
-	internal sealed class OfflinePlayModeCheckPackageContentsOperation : CheckPackageContentsOperation
-	{
-		internal OfflinePlayModeCheckPackageContentsOperation()
-		{
-		}
-		internal override void Start()
-		{
-			Status = EOperationStatus.Succeed;
-		}
-		internal override void Update()
-		{
-		}
-	}
-	internal sealed class HostPlayModeCheckPackageContentsOperation : CheckPackageContentsOperation
-	{
-		private enum ESteps
-		{
-			None,
-			CheckLoadedManifest,
-			InitVerifyingCache,
-			UpdateVerifyingCache,
-			Done,
-		}
-
-		private readonly HostPlayModeImpl _impl;
-		private readonly string _packageName;
-		private readonly CacheVerifier _cacheVerifier;
-		private ESteps _steps = ESteps.None;
-		private float _verifyTime;
-
-		internal HostPlayModeCheckPackageContentsOperation(HostPlayModeImpl impl, string packageName)
-		{
-			_impl = impl;
-			_packageName = packageName;
-
-#if UNITY_WEBGL
-			_cacheVerifier = new CacheVerifierWithoutThread();
-#else
-			_cacheVerifier = new CacheVerifierWithThread();
-#endif
-		}
-		internal override void Start()
-		{
-			_steps = ESteps.CheckLoadedManifest;
-		}
-		internal override void Update()
-		{
-			if (_steps == ESteps.None || _steps == ESteps.Done)
-				return;
-
-			if (_steps == ESteps.CheckLoadedManifest)
-			{
-				if (_impl.LocalPatchManifest == null)
-				{
-					_steps = ESteps.Done;
-					Status = EOperationStatus.Failed;
-					Error = $"Not found loaded package : {_packageName}";
-				}
-				else
-				{
-					_steps = ESteps.InitVerifyingCache;
-				}
-			}
-
-			if (_steps == ESteps.InitVerifyingCache)
-			{
-				var verifyInfos = _impl.GetVerifyInfoList(true);
-				_cacheVerifier.InitVerifier(verifyInfos);
-				_verifyTime = UnityEngine.Time.realtimeSinceStartup;
-				_steps = ESteps.UpdateVerifyingCache;
-			}
-
-			if (_steps == ESteps.UpdateVerifyingCache)
-			{
-				Progress = _cacheVerifier.GetVerifierProgress();
-				if (_cacheVerifier.UpdateVerifier())
-				{
-					float costTime = UnityEngine.Time.realtimeSinceStartup - _verifyTime;
-					YooLogger.Log($"Verify result : Success {_cacheVerifier.VerifySuccessList.Count}, Fail {_cacheVerifier.VerifyFailList.Count}, Elapsed time {costTime} seconds");
-
-					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.Succeed;
-					}
-					else
-					{
-						_steps = ESteps.Done;
-						Status = EOperationStatus.Failed;
-						Error = $"The package resource {_packageName} content has verify failed file !";
-					}
-				}
-			}
-		}
-	}
-}

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

@@ -1,104 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-
-namespace YooAsset
-{
-	/// <summary>
-	/// 清理本地包裹未使用的缓存文件
-	/// </summary>
-	public sealed class ClearPackageUnusedCacheFilesOperation : AsyncOperationBase
-	{
-		private enum ESteps
-		{
-			None,
-			GetUnusedCacheFiles,
-			ClearUnusedCacheFiles,
-			Done,
-		}
-
-		private readonly AssetsPackage _package;
-		private ESteps _steps = ESteps.None;
-		private List<string> _unusedCacheFilePaths;
-		private int _unusedFileTotalCount = 0;
-
-		internal ClearPackageUnusedCacheFilesOperation(AssetsPackage package)
-		{
-			_package = package;
-		}
-		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} ! {e.Message}");
-						}
-					}
-					_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 = PersistentHelper.GetCacheFolderPath(_package.PackageName);
-			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)
-			{
-				if (_package.IsIncludeBundleFile(fileInfo.Name) == false)
-				{
-					result.Add(fileInfo.FullName);
-				}
-			}
-			return result;
-		}
-	}
-}

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

@@ -1,204 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-
-namespace YooAsset
-{
-	public abstract class DownloadPackageOperation : AsyncOperationBase
-	{
-		/// <summary>
-		/// 创建包裹下载器
-		/// </summary>
-		/// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
-		/// <param name="failedTryAgain">下载失败的重试次数</param>
-		/// <param name="timeout">超时时间（单位：秒）</param>
-		public abstract PackageDownloaderOperation CreatePackageDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout);
-	}
-
-	/// <summary>
-	/// 编辑器下模拟运行的更新资源包裹操作
-	/// </summary>
-	internal sealed class EditorPlayModeDownloadPackageOperation : DownloadPackageOperation
-	{
-		internal override void Start()
-		{
-			Status = EOperationStatus.Succeed;
-		}
-		internal override void Update()
-		{
-		}
-
-		/// <summary>
-		/// 创建包裹下载器
-		/// </summary>
-		public override PackageDownloaderOperation CreatePackageDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout)
-		{
-			List<BundleInfo> downloadList = new List<BundleInfo>();
-			var operation = new PackageDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain, timeout);
-			return operation;
-		}
-	}
-
-	/// <summary>
-	/// 离线模式的更新资源包裹操作
-	/// </summary>
-	internal sealed class OfflinePlayModeDownloadPackageOperation : DownloadPackageOperation
-	{
-		internal override void Start()
-		{
-			Status = EOperationStatus.Succeed;
-		}
-		internal override void Update()
-		{
-		}
-
-		/// <summary>
-		/// 创建包裹下载器
-		/// </summary>
-		public override PackageDownloaderOperation CreatePackageDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout)
-		{
-			List<BundleInfo> downloadList = new List<BundleInfo>();
-			var operation = new PackageDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain, timeout);
-			return operation;
-		}
-	}
-
-	/// <summary>
-	/// 联机模式的更新资源包裹操作
-	/// </summary>
-	internal sealed class HostPlayModeDownloadPackageOperation : DownloadPackageOperation
-	{
-		private enum ESteps
-		{
-			None,
-			LoadWebManifest,
-			CheckWebManifest,
-			Done,
-		}
-
-		private static int RequestCount = 0;
-		private readonly HostPlayModeImpl _impl;
-		private readonly string _packageName;
-		private readonly string _packageVersion;
-		private readonly int _timeout;
-		private ESteps _steps = ESteps.None;
-		private UnityWebDataRequester _downloader;
-		private PatchManifest _remotePatchManifest;
-
-		internal HostPlayModeDownloadPackageOperation(HostPlayModeImpl impl, string packageName, string packageVersion, int timeout)
-		{
-			_impl = impl;
-			_packageName = packageName;
-			_packageVersion = packageVersion;
-			_timeout = timeout;
-		}
-		internal override void Start()
-		{
-			RequestCount++;		
-			_steps = ESteps.LoadWebManifest;
-		}
-		internal override void Update()
-		{
-			if (_steps == ESteps.None || _steps == ESteps.Done)
-				return;
-
-			if (_steps == ESteps.LoadWebManifest)
-			{
-				string fileName = YooAssetSettingsData.GetPatchManifestBinaryFileName(_packageName, _packageVersion);
-				string webURL = GetPatchManifestRequestURL(fileName);
-				YooLogger.Log($"Beginning to request patch manifest : {webURL}");
-				_downloader = new UnityWebDataRequester();
-				_downloader.SendRequest(webURL, _timeout);
-				_steps = ESteps.CheckWebManifest;
-			}
-
-			if (_steps == ESteps.CheckWebManifest)
-			{
-				Progress = _downloader.Progress();
-				if (_downloader.IsDone() == false)
-					return;
-
-				// Check error
-				if (_downloader.HasError())
-				{
-					_steps = ESteps.Done;
-					Status = EOperationStatus.Failed;
-					Error = _downloader.GetError();
-				}
-				else
-				{
-					// 解析补丁清单
-					try
-					{
-						byte[] bytesData = _downloader.GetData();
-						_remotePatchManifest = PatchManifest.DeserializeFromBinary(bytesData);
-						_steps = ESteps.Done;
-						Status = EOperationStatus.Succeed;
-					}
-					catch(System.Exception e)
-					{
-						_steps = ESteps.Done;
-						Status = EOperationStatus.Failed;
-						Error = e.Message;
-					}
-				}
-				_downloader.Dispose();
-			}
-		}
-
-		/// <summary>
-		/// 创建包裹下载器
-		/// </summary>
-		public override PackageDownloaderOperation CreatePackageDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout)
-		{
-			if (Status == EOperationStatus.Succeed)
-			{
-				YooLogger.Log($"Create package downloader : {_remotePatchManifest.PackageName} {_remotePatchManifest.PackageVersion}");
-				List<BundleInfo> downloadList = GetDownloadList();
-				var operation = new PackageDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain, timeout);
-				return operation;
-			}
-			else
-			{
-				YooLogger.Error($"{nameof(DownloadPackageOperation)} status is failed !");
-				var operation = new PackageDownloaderOperation(null, downloadingMaxNumber, failedTryAgain, timeout);
-				return operation;
-			}
-		}
-
-		/// <summary>
-		/// 获取补丁清单请求地址
-		/// </summary>
-		private string GetPatchManifestRequestURL(string fileName)
-		{
-			// 轮流返回请求地址
-			if (RequestCount % 2 == 0)
-				return _impl.GetPatchDownloadFallbackURL(fileName);
-			else
-				return _impl.GetPatchDownloadMainURL(fileName);
-		}
-
-		/// <summary>
-		/// 获取下载列表
-		/// </summary>
-		private List<BundleInfo> GetDownloadList()
-		{
-			List<PatchBundle> downloadList = new List<PatchBundle>(1000);
-			foreach (var patchBundle in _remotePatchManifest.BundleList)
-			{
-				// 忽略缓存文件
-				if (CacheSystem.IsCached(patchBundle))
-					continue;
-
-				// 忽略APP资源
-				if (_impl.IsBuildinPatchBundle(patchBundle))
-					continue;
-
-				downloadList.Add(patchBundle);
-			}
-
-			return _impl.ConvertToDownloadList(downloadList);
-		}
-	}
-}

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

@@ -19,7 +19,7 @@ namespace YooAsset
 		public delegate void OnDownloadProgress(int totalDownloadCount, int currentDownloadCount, long totalDownloadBytes, long currentDownloadBytes);
 		public delegate void OnDownloadError(string fileName, string error);
 		public delegate void OnStartDownloadFile(string fileName, long sizeBytes);
-		
+
 		private readonly int _downloadingMaxNumber;
 		private readonly int _failedTryAgain;
 		private readonly int _timeout;
@@ -29,10 +29,10 @@ namespace YooAsset
 		private readonly List<DownloaderBase> _failedList = new List<DownloaderBase>(MAX_LOADER_COUNT);
 
 		// 数据相关
-		private ESteps _steps = ESteps.None;
 		private bool _isPause = false;
 		private long _lastDownloadBytes = 0;
 		private int _lastDownloadCount = 0;
+		private ESteps _steps = ESteps.None;
 
 
 		/// <summary>
@@ -74,7 +74,7 @@ namespace YooAsset
 		/// 当开始下载某个文件
 		/// </summary>
 		public OnStartDownloadFile OnStartDownloadFileCallback { set; get; }
-		
+
 
 		internal DownloaderOperation(List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain, int timeout)
 		{
@@ -183,9 +183,9 @@ namespace YooAsset
 					{
 						var failedDownloader = _failedList[0];
 						string fileName = failedDownloader.GetBundleInfo().Bundle.BundleName;
-						Error = $"Failed to download file : {fileName}";
 						_steps = ESteps.Done;
 						Status = EOperationStatus.Failed;
+						Error = $"Failed to download file : {fileName}";
 						OnDownloadErrorCallback?.Invoke(fileName, failedDownloader.GetLastError());
 						OnDownloadOverCallback?.Invoke(false);
 					}
@@ -241,19 +241,22 @@ namespace YooAsset
 		}
 	}
 
-	public sealed class PackageDownloaderOperation : DownloaderOperation
-	{
-		internal PackageDownloaderOperation(List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain, int timeout)
-			: base(downloadList, downloadingMaxNumber, failedTryAgain, timeout)
-		{
-		}
-	}
 	public sealed class PatchDownloaderOperation : DownloaderOperation
 	{
 		internal PatchDownloaderOperation(List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain, int timeout)
 			: base(downloadList, downloadingMaxNumber, failedTryAgain, timeout)
 		{
 		}
+
+		/// <summary>
+		/// 创建空的下载器
+		/// </summary>
+		internal static PatchDownloaderOperation CreateEmptyDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout)
+		{
+			List<BundleInfo> downloadList = new List<BundleInfo>();
+			var operation = new PatchDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain, timeout);
+			return operation;
+		}
 	}
 	public sealed class PatchUnpackerOperation : DownloaderOperation
 	{
@@ -261,5 +264,15 @@ namespace YooAsset
 			: base(downloadList, downloadingMaxNumber, failedTryAgain, timeout)
 		{
 		}
+
+		/// <summary>
+		/// 创建空的解压器
+		/// </summary>
+		internal static PatchUnpackerOperation CreateEmptyUnpacker(int upackingMaxNumber, int failedTryAgain, int timeout)
+		{
+			List<BundleInfo> downloadList = new List<BundleInfo>();
+			var operation = new PatchUnpackerOperation(downloadList, upackingMaxNumber, failedTryAgain, int.MaxValue);
+			return operation;
+		}
 	}
 }

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

@@ -10,10 +10,7 @@ namespace YooAsset
 	/// </summary>
 	public abstract class InitializationOperation : AsyncOperationBase
 	{
-		/// <summary>
+		public string PackageVersion { protected set; get; }
-		/// 初始化内部加载的包裹版本
-		/// </summary>
-		public string InitializedPackageVersion;
 	}
 
 	/// <summary>
@@ -24,50 +21,49 @@ namespace YooAsset
 		private enum ESteps
 		{
 			None,
-			Load,
+			LoadEditorManifest,
 			Done,
 		}
 
 		private readonly EditorSimulateModeImpl _impl;
-		private readonly string _simulatePatchManifestPath;
+		private readonly string _simulateManifestPath;
+		private LoadEditorManifestOperation _loadEditorManifestOp;
 		private ESteps _steps = ESteps.None;
 
-		internal EditorSimulateModeInitializationOperation(EditorSimulateModeImpl impl, string simulatePatchManifestPath)
+		internal EditorSimulateModeInitializationOperation(EditorSimulateModeImpl impl, string simulateManifestPath)
 		{
 			_impl = impl;
-			_simulatePatchManifestPath = simulatePatchManifestPath;
+			_simulateManifestPath = simulateManifestPath;
 		}
 		internal override void Start()
 		{
-			_steps = ESteps.Load;
+			_steps = ESteps.LoadEditorManifest;
 		}
 		internal override void Update()
 		{
-			if (_steps == ESteps.Load)
+			if (_steps == ESteps.LoadEditorManifest)
 			{
-				if (File.Exists(_simulatePatchManifestPath) == false)
+				if (_loadEditorManifestOp == null)
 				{
-					_steps = ESteps.Done;
+					_loadEditorManifestOp = new LoadEditorManifestOperation(_simulateManifestPath);
-					Status = EOperationStatus.Failed;
+					OperationSystem.StartOperation(_loadEditorManifestOp);
-					Error = $"Not found simulation manifest file : {_simulatePatchManifestPath}";
-					return;
 				}
 
-				try
+				if (_loadEditorManifestOp.IsDone == false)
+					return;
+
+				if (_loadEditorManifestOp.Status == EOperationStatus.Succeed)
 				{
-					YooLogger.Log($"Load simulation manifest file : {_simulatePatchManifestPath}");
+					PackageVersion = _loadEditorManifestOp.Manifest.PackageVersion;
-					byte[] bytesData = FileUtility.ReadAllBytes(_simulatePatchManifestPath);
+					_impl.ActiveManifest = _loadEditorManifestOp.Manifest;
-					var manifest = PatchManifest.DeserializeFromBinary(bytesData);
-					InitializedPackageVersion = manifest.PackageVersion;
-					_impl.SetSimulatePatchManifest(manifest);
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Succeed;
 				}
-				catch (System.Exception e)
+				else
 				{
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Failed;
-					Error = e.Message;
+					Error = _loadEditorManifestOp.Error;
 				}
 			}
 		}
@@ -81,101 +77,95 @@ namespace YooAsset
 		private enum ESteps
 		{
 			None,
-			QueryAppPackageVersion,
+			QueryBuildinPackageVersion,
-			LoadAppManifest,
+			LoadBuildinManifest,
-			InitVerifyingCache,
+			PackageCaching,
-			UpdateVerifyingCache,
 			Done,
 		}
 
 		private readonly OfflinePlayModeImpl _impl;
 		private readonly string _packageName;
-		private readonly CacheVerifier _cacheVerifier;
+		private QueryBuildinPackageVersionOperation _queryBuildinPackageVersionOp;
-		private readonly AppPackageVersionQuerier _appPackageVersionQuerier;
+		private LoadBuildinManifestOperation _loadBuildinManifestOp;
-		private AppManifestLoader _appManifestLoader;
+		private PackageCachingOperation _cachingOperation;
 		private ESteps _steps = ESteps.None;
-		private float _verifyTime;
 
 		internal OfflinePlayModeInitializationOperation(OfflinePlayModeImpl impl, string packageName)
 		{
 			_impl = impl;
 			_packageName = packageName;
-			_appPackageVersionQuerier = new AppPackageVersionQuerier(packageName);
-
-#if UNITY_WEBGL
-			_cacheVerifier = new CacheVerifierWithoutThread();
-#else
-			_cacheVerifier = new CacheVerifierWithThread();
-#endif
 		}
 		internal override void Start()
 		{
-			_steps = ESteps.QueryAppPackageVersion;
+			_steps = ESteps.QueryBuildinPackageVersion;
 		}
 		internal override void Update()
 		{
 			if (_steps == ESteps.None || _steps == ESteps.Done)
 				return;
 
-			if (_steps == ESteps.QueryAppPackageVersion)
+			if (_steps == ESteps.QueryBuildinPackageVersion)
 			{
-				_appPackageVersionQuerier.Update();
+				if (_queryBuildinPackageVersionOp == null)
-				if (_appPackageVersionQuerier.IsDone == false)
+				{
+					_queryBuildinPackageVersionOp = new QueryBuildinPackageVersionOperation(_packageName);
+					OperationSystem.StartOperation(_queryBuildinPackageVersionOp);
+				}
+
+				if (_queryBuildinPackageVersionOp.IsDone == false)
 					return;
 
-				string error = _appPackageVersionQuerier.Error;
+				if (_queryBuildinPackageVersionOp.Status == EOperationStatus.Succeed)
-				if (string.IsNullOrEmpty(error) == false)
 				{
-					_steps = ESteps.Done;
+					_steps = ESteps.LoadBuildinManifest;
-					Status = EOperationStatus.Failed;
-					Error = error;
 				}
 				else
 				{
-					_appManifestLoader = new AppManifestLoader(_packageName, _appPackageVersionQuerier.Version);
+					_steps = ESteps.Done;
-					_steps = ESteps.LoadAppManifest;
+					Status = EOperationStatus.Failed;
+					Error = _queryBuildinPackageVersionOp.Error;
 				}
 			}
 
-			if (_steps == ESteps.LoadAppManifest)
+			if (_steps == ESteps.LoadBuildinManifest)
 			{
-				_appManifestLoader.Update();
+				if (_loadBuildinManifestOp == null)
-				Progress = _appManifestLoader.Progress;
+				{
-				if (_appManifestLoader.IsDone == false)
+					_loadBuildinManifestOp = new LoadBuildinManifestOperation(_packageName, _queryBuildinPackageVersionOp.PackageVersion);
+					OperationSystem.StartOperation(_loadBuildinManifestOp);
+				}
+
+				Progress = _loadBuildinManifestOp.Progress;
+				if (_loadBuildinManifestOp.IsDone == false)
 					return;
 
-				var manifest = _appManifestLoader.Manifest;
+				if (_loadBuildinManifestOp.Status == EOperationStatus.Succeed)
-				if (manifest == null)
 				{
-					_steps = ESteps.Done;
+					PackageVersion = _loadBuildinManifestOp.Manifest.PackageVersion;
-					Status = EOperationStatus.Failed;
+					_impl.ActiveManifest = _loadBuildinManifestOp.Manifest;
-					Error = _appManifestLoader.Error;
+					_steps = ESteps.PackageCaching;
 				}
 				else
 				{
-					InitializedPackageVersion = manifest.PackageVersion;
+					_steps = ESteps.Done;
-					_impl.SetAppPatchManifest(manifest);
+					Status = EOperationStatus.Failed;
-					_steps = ESteps.InitVerifyingCache;
+					Error = _loadBuildinManifestOp.Error;
 				}
 			}
 
-			if (_steps == ESteps.InitVerifyingCache)
+			if (_steps == ESteps.PackageCaching)
 			{
-				var verifyInfos = _impl.GetVerifyInfoList();
+				if (_cachingOperation == null)
-				_cacheVerifier.InitVerifier(verifyInfos);
+				{
-				_verifyTime = UnityEngine.Time.realtimeSinceStartup;
+					_cachingOperation = new PackageCachingOperation(_packageName);
-				_steps = ESteps.UpdateVerifyingCache;
+					OperationSystem.StartOperation(_cachingOperation);
-			}
+				}
 
-			if (_steps == ESteps.UpdateVerifyingCache)
+				Progress = _cachingOperation.Progress;
-			{
+				if (_cachingOperation.IsDone)
-				Progress = _cacheVerifier.GetVerifierProgress();
-				if (_cacheVerifier.UpdateVerifier())
 				{
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Succeed;
-					float costTime = UnityEngine.Time.realtimeSinceStartup - _verifyTime;
-					YooLogger.Log($"Verify result : Success {_cacheVerifier.VerifySuccessList.Count}, Fail {_cacheVerifier.VerifyFailList.Count}, Elapsed time {costTime} seconds");
 				}
 			}
 		}
@@ -190,427 +180,238 @@ namespace YooAsset
 		private enum ESteps
 		{
 			None,
+			CheckAppFootPrint,
+			QueryCachePackageVersion,
 			TryLoadCacheManifest,
-			QueryAppPackageVersion,
+			QueryBuildinPackageVersion,
-			CopyAppManifest,
+			UnpackBuildinManifest,
-			LoadAppManifest,
+			LoadBuildinManifest,
-			InitVerifyingCache,
+			PackageCaching,
-			UpdateVerifyingCache,
 			Done,
 		}
 
 		private readonly HostPlayModeImpl _impl;
 		private readonly string _packageName;
-		private readonly CacheVerifier _cacheVerifier;
+		private QueryBuildinPackageVersionOperation _queryBuildinPackageVersionOp;
-		private readonly AppPackageVersionQuerier _appPackageVersionQuerier;
+		private QueryCachePackageVersionOperation _queryCachePackageVersionOp;
-		private AppManifestCopyer _appManifestCopyer;
+		private UnpackBuildinManifestOperation _unpackBuildinManifestOp;
-		private AppManifestLoader _appManifestLoader;
+		private LoadBuildinManifestOperation _loadBuildinManifestOp;
+		private LoadCacheManifestOperation _loadCacheManifestOp;
+		private PackageCachingOperation _cachingOperation;
 		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
-			_cacheVerifier = new CacheVerifierWithoutThread();
-#else
-			_cacheVerifier = new CacheVerifierWithThread();
-#endif
 		}
 		internal override void Start()
 		{
-			_steps = ESteps.TryLoadCacheManifest;
+			_steps = ESteps.CheckAppFootPrint;
 		}
 		internal override void Update()
 		{
 			if (_steps == ESteps.None || _steps == ESteps.Done)
 				return;
 
+			if (_steps == ESteps.CheckAppFootPrint)
+			{
+				var appFootPrint = new AppFootPrint();
+				appFootPrint.Load();
+
+				// 如果水印发生变化，则说明覆盖安装后首次打开游戏
+				if (appFootPrint.IsDirty())
+				{
+					PersistentHelper.DeleteManifestFolder();
+					appFootPrint.Coverage();
+					YooLogger.Log("Delete manifest files when application foot print dirty !");
+				}
+				_steps = ESteps.QueryCachePackageVersion;
+			}
+
+			if (_steps == ESteps.QueryCachePackageVersion)
+			{
+				if (_queryCachePackageVersionOp == null)
+				{
+					_queryCachePackageVersionOp = new QueryCachePackageVersionOperation(_packageName);
+					OperationSystem.StartOperation(_queryCachePackageVersionOp);
+				}
+
+				if (_queryCachePackageVersionOp.IsDone == false)
+					return;
+
+				if (_queryCachePackageVersionOp.Status == EOperationStatus.Succeed)
+				{
+					_steps = ESteps.TryLoadCacheManifest;
+				}
+				else
+				{
+					_steps = ESteps.QueryBuildinPackageVersion;
+				}
+			}
+
 			if (_steps == ESteps.TryLoadCacheManifest)
 			{
-				if (PersistentHelper.CheckCacheManifestFileExists(_packageName))
+				if (_loadCacheManifestOp == null)
 				{
-					try
+					_loadCacheManifestOp = new LoadCacheManifestOperation(_packageName, _queryCachePackageVersionOp.PackageVersion);
-					{
+					OperationSystem.StartOperation(_loadCacheManifestOp);
-						var manifest = PersistentHelper.LoadCacheManifestFile(_packageName);
+				}
-						InitializedPackageVersion = manifest.PackageVersion;
+
-						_impl.SetLocalPatchManifest(manifest);
+				if (_loadCacheManifestOp.IsDone == false)
-						_steps = ESteps.InitVerifyingCache;
+					return;
-					}
+
-					catch (System.Exception e)
+				if (_loadCacheManifestOp.Status == EOperationStatus.Succeed)
-					{
+				{
-						// 注意：如果加载沙盒内的清单报错，为了避免流程被卡住，我们主动把损坏的文件删除。
+					PackageVersion = _loadCacheManifestOp.Manifest.PackageVersion;
-						YooLogger.Warning($"Failed to load cache manifest file : {e.Message}");
+					_impl.ActiveManifest = _loadCacheManifestOp.Manifest;
-						PersistentHelper.DeleteCacheManifestFile(_packageName);
+					_steps = ESteps.PackageCaching;
-						_steps = ESteps.QueryAppPackageVersion;
-					}
 				}
 				else
 				{
-					_steps = ESteps.QueryAppPackageVersion;
+					_steps = ESteps.QueryBuildinPackageVersion;
 				}
 			}
 
-			if (_steps == ESteps.QueryAppPackageVersion)
+			if (_steps == ESteps.QueryBuildinPackageVersion)
 			{
-				_appPackageVersionQuerier.Update();
+				if (_queryBuildinPackageVersionOp == null)
-				if (_appPackageVersionQuerier.IsDone == false)
+				{
+					_queryBuildinPackageVersionOp = new QueryBuildinPackageVersionOperation(_packageName);
+					OperationSystem.StartOperation(_queryBuildinPackageVersionOp);
+				}
+
+				if (_queryBuildinPackageVersionOp.IsDone == false)
 					return;
 
-				// 注意：为了兼容MOD模式，初始化动态新增的包裹的时候，如果内置清单不存在也不需要报错！
+				if (_queryBuildinPackageVersionOp.Status == EOperationStatus.Succeed)
-				string error = _appPackageVersionQuerier.Error;
-				if (string.IsNullOrEmpty(error) == false)
 				{
-					_steps = ESteps.Done;
+					_steps = ESteps.UnpackBuildinManifest;
-					Status = EOperationStatus.Succeed;
+				}
+				else
+				{
+					// 注意：为了兼容MOD模式，初始化动态新增的包裹的时候，如果内置清单不存在也不需要报错！
+					_steps = ESteps.PackageCaching;
+					string error = _queryBuildinPackageVersionOp.Error;
 					YooLogger.Log($"Failed to load buildin package version file : {error}");
 				}
-				else
-				{
-					_appManifestCopyer = new AppManifestCopyer(_packageName, _appPackageVersionQuerier.Version);
-					_appManifestLoader = new AppManifestLoader(_packageName, _appPackageVersionQuerier.Version);
-					_steps = ESteps.CopyAppManifest;
-				}
 			}
 
-			if (_steps == ESteps.CopyAppManifest)
+			if (_steps == ESteps.UnpackBuildinManifest)
 			{
-				_appManifestCopyer.Update();
+				if (_unpackBuildinManifestOp == null)
-				Progress = _appManifestCopyer.Progress;
+				{
-				if (_appManifestCopyer.IsDone == false)
+					_unpackBuildinManifestOp = new UnpackBuildinManifestOperation(_packageName, _queryBuildinPackageVersionOp.PackageVersion);
+					OperationSystem.StartOperation(_unpackBuildinManifestOp);
+				}
+
+				if (_unpackBuildinManifestOp.IsDone == false)
 					return;
 
-				string error = _appManifestCopyer.Error;
+				if (_unpackBuildinManifestOp.Status == EOperationStatus.Succeed)
-				if (string.IsNullOrEmpty(error) == false)
+				{
+					_steps = ESteps.LoadBuildinManifest;
+				}
+				else
 				{
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Failed;
-					Error = error;
+					Error = _unpackBuildinManifestOp.Error;
-				}
-				else
-				{
-					_steps = ESteps.LoadAppManifest;
 				}
 			}
 
-			if (_steps == ESteps.LoadAppManifest)
+			if (_steps == ESteps.LoadBuildinManifest)
 			{
-				_appManifestLoader.Update();
+				if (_loadBuildinManifestOp == null)
-				Progress = _appManifestLoader.Progress;
+				{
-				if (_appManifestLoader.IsDone == false)
+					_loadBuildinManifestOp = new LoadBuildinManifestOperation(_packageName, _queryBuildinPackageVersionOp.PackageVersion);
+					OperationSystem.StartOperation(_loadBuildinManifestOp);
+				}
+
+				Progress = _loadBuildinManifestOp.Progress;
+				if (_loadBuildinManifestOp.IsDone == false)
 					return;
 
-				var manifest = _appManifestLoader.Manifest;
+				if (_loadBuildinManifestOp.Status == EOperationStatus.Succeed)
-				if (manifest == null)
+				{
+					PackageVersion = _loadBuildinManifestOp.Manifest.PackageVersion;
+					_impl.ActiveManifest = _loadBuildinManifestOp.Manifest;
+					_steps = ESteps.PackageCaching;
+				}
+				else
 				{
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Failed;
-					Error = _appManifestLoader.Error;
+					Error = _loadBuildinManifestOp.Error;
 				}
-				else
+			}
+
+			if (_steps == ESteps.PackageCaching)
+			{
+				if (_cachingOperation == null)
 				{
-					InitializedPackageVersion = manifest.PackageVersion;
+					_cachingOperation = new PackageCachingOperation(_packageName);
-					_impl.SetLocalPatchManifest(manifest);
+					OperationSystem.StartOperation(_cachingOperation);
-					_steps = ESteps.InitVerifyingCache;
 				}
-			}
 
-			if (_steps == ESteps.InitVerifyingCache)
+				Progress = _cachingOperation.Progress;
-			{
+				if (_cachingOperation.IsDone)
-				var verifyInfos = _impl.GetVerifyInfoList(false);
-				_cacheVerifier.InitVerifier(verifyInfos);
-				_verifyTime = UnityEngine.Time.realtimeSinceStartup;
-				_steps = ESteps.UpdateVerifyingCache;
-			}
-
-			if (_steps == ESteps.UpdateVerifyingCache)
-			{
-				Progress = _cacheVerifier.GetVerifierProgress();
-				if (_cacheVerifier.UpdateVerifier())
 				{
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Succeed;
-					float costTime = UnityEngine.Time.realtimeSinceStartup - _verifyTime;
-					YooLogger.Log($"Verify result : Success {_cacheVerifier.VerifySuccessList.Count}, Fail {_cacheVerifier.VerifyFailList.Count}, Elapsed time {costTime} seconds");
 				}
 			}
 		}
 	}
 
-
 	/// <summary>
-	/// 内置补丁清单版本查询器
+	/// 应用程序水印
 	/// </summary>
-	internal class AppPackageVersionQuerier
+	internal class AppFootPrint
 	{
-		private enum ESteps
+		private string _footPrint;
+
+		/// <summary>
+		/// 读取应用程序水印
+		/// </summary>
+		public void Load()
 		{
-			LoadStaticVersion,
+			string footPrintFilePath = PersistentHelper.GetAppFootPrintFilePath();
-			CheckStaticVersion,
+			if (File.Exists(footPrintFilePath))
-			Done,
-		}
-
-		private readonly string _buildinPackageName;
-		private ESteps _steps = ESteps.LoadStaticVersion;
-		private UnityWebDataRequester _downloader;
-
-		/// <summary>
-		/// 内置包裹版本
-		/// </summary>
-		public string Version { private set; get; }
-
-		/// <summary>
-		/// 错误日志
-		/// </summary>
-		public string Error { private set; get; }
-
-		/// <summary>
-		/// 是否已经完成
-		/// </summary>
-		public bool IsDone
-		{
-			get
 			{
-				return _steps == ESteps.Done;
+				_footPrint = FileUtility.ReadAllText(footPrintFilePath);
 			}
-		}
+			else
-
-
-		public AppPackageVersionQuerier(string buildinPackageName)
-		{
-			_buildinPackageName = buildinPackageName;
-		}
-
-		/// <summary>
-		/// 更新流程
-		/// </summary>
-		public void Update()
-		{
-			if (IsDone)
-				return;
-
-			if (_steps == ESteps.LoadStaticVersion)
 			{
-				string fileName = YooAssetSettingsData.GetPatchManifestVersionFileName(_buildinPackageName);
+				Coverage();
-				string filePath = PathHelper.MakeStreamingLoadPath(fileName);
-				string url = PathHelper.ConvertToWWWPath(filePath);
-				_downloader = new UnityWebDataRequester();
-				_downloader.SendRequest(url);
-				_steps = ESteps.CheckStaticVersion;
-			}
-
-			if (_steps == ESteps.CheckStaticVersion)
-			{
-				if (_downloader.IsDone() == false)
-					return;
-
-				if (_downloader.HasError())
-				{
-					Error = _downloader.GetError();
-				}
-				else
-				{
-					Version = _downloader.GetText();
-					if (string.IsNullOrEmpty(Version))
-						Error = $"Buildin package version file content is empty !";
-				}
-				_steps = ESteps.Done;
-				_downloader.Dispose();
-			}
-		}
-	}
-
-	/// <summary>
-	/// 内置补丁清单加载器
-	/// </summary>
-	internal class AppManifestLoader
-	{
-		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
+		public bool IsDirty()
 		{
-			get
+#if UNITY_EDITOR
-			{
+			return _footPrint != Application.version;
-				if (_downloader == null)
+#else
-					return 0;
+			return _footPrint != Application.buildGUID;
-				return _downloader.Progress();
+#endif
-			}
-		}
-
-
-		public AppManifestLoader(string buildinPackageName, string buildinPackageVersion)
-		{
-			_buildinPackageName = buildinPackageName;
-			_buildinPackageVersion = buildinPackageVersion;
 		}
 
 		/// <summary>
-		/// 更新流程
+		/// 覆盖掉水印
 		/// </summary>
-		public void Update()
+		public void Coverage()
 		{
-			if (IsDone)
+#if UNITY_EDITOR
-				return;
+			_footPrint = Application.version;
-
+#else
-			if (_steps == ESteps.LoadAppManifest)
+			_footPrint = Application.buildGUID;
-			{
+#endif
-				string fileName = YooAssetSettingsData.GetPatchManifestBinaryFileName(_buildinPackageName, _buildinPackageVersion);
+			string footPrintFilePath = PersistentHelper.GetAppFootPrintFilePath();
-				string filePath = PathHelper.MakeStreamingLoadPath(fileName);
+			FileUtility.CreateFile(footPrintFilePath, _footPrint);
-				string url = PathHelper.ConvertToWWWPath(filePath);
+			YooLogger.Log($"Save application foot print : {_footPrint}");
-				_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里的补丁清单
-					try
-					{
-						byte[] bytesData = _downloader.GetData();
-						Manifest = PatchManifest.DeserializeFromBinary(bytesData);
-					}
-					catch (System.Exception e)
-					{
-						Error = e.Message;
-					}
-				}
-				_steps = ESteps.Done;
-				_downloader.Dispose();
-			}
-		}
-	}
-
-	/// <summary>
-	/// 内置补丁清单复制器
-	/// </summary>
-	internal class AppManifestCopyer
-	{
-		private enum ESteps
-		{
-			CopyAppManifest,
-			CheckAppManifest,
-			Done,
-		}
-
-		private readonly string _buildinPackageName;
-		private readonly string _buildinPackageVersion;
-		private ESteps _steps = ESteps.CopyAppManifest;
-		private UnityWebFileRequester _downloader;
-
-		/// <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 AppManifestCopyer(string buildinPackageName, string buildinPackageVersion)
-		{
-			_buildinPackageName = buildinPackageName;
-			_buildinPackageVersion = buildinPackageVersion;
-		}
-
-		/// <summary>
-		/// 更新流程
-		/// </summary>
-		public void Update()
-		{
-			if (IsDone)
-				return;
-
-			if (_steps == ESteps.CopyAppManifest)
-			{
-				string savePath = PersistentHelper.GetCacheManifestFilePath(_buildinPackageName);
-				string fileName = YooAssetSettingsData.GetPatchManifestBinaryFileName(_buildinPackageName, _buildinPackageVersion);
-				string filePath = PathHelper.MakeStreamingLoadPath(fileName);
-				string url = PathHelper.ConvertToWWWPath(filePath);
-				_downloader = new UnityWebFileRequester();
-				_downloader.SendRequest(url, savePath);
-				_steps = ESteps.CheckAppManifest;
-			}
-
-			if (_steps == ESteps.CheckAppManifest)
-			{
-				if (_downloader.IsDone() == false)
-					return;
-
-				if (_downloader.HasError())
-				{
-					Error = _downloader.GetError();
-				}
-				_steps = ESteps.Done;
-				_downloader.Dispose();
-			}
 		}
 	}
 }

Assets/YooAsset/Runtime/PatchSystem/Operations/Internal.meta

@@ -1,5 +1,6 @@
 fileFormatVersion: 2
-guid: f3d9e435137e34d34a54f181bf3dc7c2
+guid: ba3f4fc8cf6941f4a96ab928cec547e3
+folderAsset: yes
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/YooAsset/Runtime/PatchSystem/Operations/Internal/DeserializeManifestOperation.cs

@@ -0,0 +1,173 @@
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset
+{
+	internal class DeserializeManifestOperation : AsyncOperationBase
+	{
+		private enum ESteps
+		{
+			None,
+			DeserializeFileHeader,
+			PrepareAssetList,
+			DeserializeAssetList,
+			PrepareBundleList,
+			DeserializeBundleList,
+			Done,
+		}
+	
+		private readonly BufferReader _buffer;
+		private int _patchAssetCount;
+		private int _patchBundleCount;
+		private int _progressTotalValue;
+		private ESteps _steps = ESteps.None;
+
+		/// <summary>
+		/// 解析的清单实例
+		/// </summary>
+		public PatchManifest Manifest { private set; get; }
+
+		public DeserializeManifestOperation(byte[] binaryData)
+		{
+			_buffer = new BufferReader(binaryData);
+		}
+		internal override void Start()
+		{
+			_steps = ESteps.DeserializeFileHeader;
+		}
+		internal override void Update()
+		{
+			if (_steps == ESteps.None || _steps == ESteps.Done)
+				return;
+
+			try
+			{
+				if (_steps == ESteps.DeserializeFileHeader)
+				{
+					if (_buffer.IsValid == false)
+					{
+						_steps = ESteps.Done;
+						Status = EOperationStatus.Failed;
+						Error = "Buffer is invalid !";
+						return;
+					}
+
+					// 读取文件标记
+					uint fileSign = _buffer.ReadUInt32();
+					if (fileSign != YooAssetSettings.PatchManifestFileSign)
+					{
+						_steps = ESteps.Done;
+						Status = EOperationStatus.Failed;
+						Error = "The manifest file format is invalid !";
+						return;
+					}
+
+					// 读取文件版本
+					string fileVersion = _buffer.ReadUTF8();
+					if (fileVersion != YooAssetSettings.PatchManifestFileVersion)
+					{
+						_steps = ESteps.Done;
+						Status = EOperationStatus.Failed;
+						Error = $"The manifest file version are not compatible : {fileVersion} != {YooAssetSettings.PatchManifestFileVersion}";
+						return;
+					}
+
+					// 读取文件头信息
+					Manifest = new PatchManifest();
+					Manifest.FileVersion = fileVersion;
+					Manifest.EnableAddressable = _buffer.ReadBool();
+					Manifest.OutputNameStyle = _buffer.ReadInt32();
+					Manifest.PackageName = _buffer.ReadUTF8();
+					Manifest.PackageVersion = _buffer.ReadUTF8();
+
+					_steps = ESteps.PrepareAssetList;
+				}
+
+				if (_steps == ESteps.PrepareAssetList)
+				{
+					_patchAssetCount = _buffer.ReadInt32();
+					Manifest.AssetList = new List<PatchAsset>(_patchAssetCount);
+					Manifest.AssetDic = new Dictionary<string, PatchAsset>(_patchAssetCount);
+					_progressTotalValue = _patchAssetCount;
+					_steps = ESteps.DeserializeAssetList;
+				}
+				if (_steps == ESteps.DeserializeAssetList)
+				{
+					while (_patchAssetCount > 0)
+					{
+						var patchAsset = new PatchAsset();
+						patchAsset.Address = _buffer.ReadUTF8();
+						patchAsset.AssetPath = _buffer.ReadUTF8();
+						patchAsset.AssetTags = _buffer.ReadUTF8Array();
+						patchAsset.BundleID = _buffer.ReadInt32();
+						patchAsset.DependIDs = _buffer.ReadInt32Array();
+						Manifest.AssetList.Add(patchAsset);
+
+						// 注意：我们不允许原始路径存在重名
+						string assetPath = patchAsset.AssetPath;
+						if (Manifest.AssetDic.ContainsKey(assetPath))
+							throw new System.Exception($"AssetPath have existed : {assetPath}");
+						else
+							Manifest.AssetDic.Add(assetPath, patchAsset);
+
+						_patchAssetCount--;
+						Progress = 1f - _patchAssetCount / _progressTotalValue;
+						if (OperationSystem.IsBusy)
+							break;
+					}
+
+					if (_patchAssetCount <= 0)
+					{
+						_steps = ESteps.PrepareBundleList;
+					}
+				}
+
+				if (_steps == ESteps.PrepareBundleList)
+				{
+					_patchBundleCount = _buffer.ReadInt32();
+					Manifest.BundleList = new List<PatchBundle>(_patchBundleCount);
+					Manifest.BundleDic = new Dictionary<string, PatchBundle>(_patchBundleCount);
+					_progressTotalValue = _patchBundleCount;
+					_steps = ESteps.DeserializeBundleList;
+				}
+				if (_steps == ESteps.DeserializeBundleList)
+				{
+					while (_patchBundleCount > 0)
+					{
+						var patchBundle = new PatchBundle();
+						patchBundle.BundleName = _buffer.ReadUTF8();
+						patchBundle.FileHash = _buffer.ReadUTF8();
+						patchBundle.FileCRC = _buffer.ReadUTF8();
+						patchBundle.FileSize = _buffer.ReadInt64();
+						patchBundle.IsRawFile = _buffer.ReadBool();
+						patchBundle.LoadMethod = _buffer.ReadByte();
+						patchBundle.Tags = _buffer.ReadUTF8Array();
+						Manifest.BundleList.Add(patchBundle);
+
+						patchBundle.ParseBundle(Manifest.PackageName, Manifest.OutputNameStyle);
+						Manifest.BundleDic.Add(patchBundle.BundleName, patchBundle);
+
+						_patchBundleCount--;
+						Progress = 1f - _patchBundleCount / _progressTotalValue;
+						if (OperationSystem.IsBusy)
+							break;
+					}
+
+					if (_patchBundleCount <= 0)
+					{
+						_steps = ESteps.Done;
+						Status = EOperationStatus.Succeed;
+					}
+				}
+			}
+			catch (System.Exception e)
+			{
+				Manifest = null;
+				_steps = ESteps.Done;
+				Status = EOperationStatus.Failed;
+				Error = e.Message;
+			}
+		}
+	}
+}

Assets/YooAsset/Runtime/PatchSystem/Operations/Internal/DeserializeManifestOperation.cs.meta

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

Assets/YooAsset/Runtime/PatchSystem/Operations/Internal/DownloadManifestOperation.cs

@@ -0,0 +1,111 @@
+
+namespace YooAsset
+{
+	internal class DownloadManifestOperation : AsyncOperationBase
+	{
+		private enum ESteps
+		{
+			None,
+			DownloadPackageHashFile,
+			DownloadManifestFile,
+			Done,
+		}
+
+		private static int RequestCount = 0;
+		private readonly IRemoteServices _remoteServices;
+		private readonly string _packageName;
+		private readonly string _packageVersion;
+		private readonly int _timeout;
+		private UnityWebFileRequester _downloader1;
+		private UnityWebFileRequester _downloader2;
+		private ESteps _steps = ESteps.None;
+
+		internal DownloadManifestOperation(IRemoteServices remoteServices, string packageName, string packageVersion, int timeout)
+		{
+			_remoteServices = remoteServices;
+			_packageName = packageName;
+			_packageVersion = packageVersion;
+			_timeout = timeout;
+		}
+		internal override void Start()
+		{
+			RequestCount++;
+			_steps = ESteps.DownloadPackageHashFile;
+		}
+		internal override void Update()
+		{
+			if (_steps == ESteps.None || _steps == ESteps.Done)
+				return;
+
+			if (_steps == ESteps.DownloadPackageHashFile)
+			{
+				if (_downloader1 == null)
+				{
+					string savePath = PersistentHelper.GetCachePackageHashFilePath(_packageName, _packageVersion);
+					string fileName = YooAssetSettingsData.GetPackageHashFileName(_packageName, _packageVersion);
+					string webURL = GetDownloadRequestURL(fileName);
+					YooLogger.Log($"Beginning to download package hash file : {webURL}");
+					_downloader1 = new UnityWebFileRequester();
+					_downloader1.SendRequest(webURL, savePath, _timeout);
+				}
+
+				_downloader1.CheckTimeout();
+				if (_downloader1.IsDone() == false)
+					return;
+
+				if (_downloader1.HasError())
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = _downloader1.GetError();
+				}
+				else
+				{
+					_steps = ESteps.DownloadManifestFile;
+				}
+
+				_downloader1.Dispose();
+			}
+
+			if (_steps == ESteps.DownloadManifestFile)
+			{
+				if (_downloader2 == null)
+				{
+					string savePath = PersistentHelper.GetCacheManifestFilePath(_packageName, _packageVersion);
+					string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_packageName, _packageVersion);
+					string webURL = GetDownloadRequestURL(fileName);
+					YooLogger.Log($"Beginning to download manifest file : {webURL}");
+					_downloader2 = new UnityWebFileRequester();
+					_downloader2.SendRequest(webURL, savePath, _timeout);
+				}
+
+				_downloader2.CheckTimeout();
+				if (_downloader2.IsDone() == false)
+					return;
+
+				if (_downloader2.HasError())
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = _downloader2.GetError();
+				}
+				else
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Succeed;
+				}
+
+				_downloader2.Dispose();
+			}
+		}
+
+		private string GetDownloadRequestURL(string fileName)
+		{
+			// 轮流返回请求地址
+			if (RequestCount % 2 == 0)
+				return _remoteServices.GetRemoteFallbackURL(fileName);
+			else
+				return _remoteServices.GetRemoteMainURL(fileName);
+		}
+	}
+}

Assets/YooAsset/Runtime/PatchSystem/Operations/Internal/DownloadManifestOperation.cs.meta

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

Assets/YooAsset/Runtime/PatchSystem/Operations/Internal/LoadBuildinManifestOperation.cs

@@ -0,0 +1,92 @@
+
+namespace YooAsset
+{
+	internal class LoadBuildinManifestOperation : AsyncOperationBase
+	{
+		private enum ESteps
+		{
+			None,
+			LoadBuildinManifest,
+			CheckDeserializeManifest,
+			Done,
+		}
+
+		private readonly string _buildinPackageName;
+		private readonly string _buildinPackageVersion;
+		private UnityWebDataRequester _downloader;
+		private DeserializeManifestOperation _deserializer;
+		private ESteps _steps = ESteps.None;
+
+		/// <summary>
+		/// 加载的清单实例
+		/// </summary>
+		public PatchManifest Manifest { private set; get; }
+
+
+		public LoadBuildinManifestOperation(string buildinPackageName, string buildinPackageVersion)
+		{
+			_buildinPackageName = buildinPackageName;
+			_buildinPackageVersion = buildinPackageVersion;
+		}
+		internal override void Start()
+		{
+			_steps = ESteps.LoadBuildinManifest;
+		}
+		internal override void Update()
+		{
+			if (_steps == ESteps.None || _steps == ESteps.Done)
+				return;
+
+			if (_steps == ESteps.LoadBuildinManifest)
+			{
+				if (_downloader == null)
+				{
+					string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_buildinPackageName, _buildinPackageVersion);
+					string filePath = PathHelper.MakeStreamingLoadPath(fileName);
+					string url = PathHelper.ConvertToWWWPath(filePath);
+					_downloader = new UnityWebDataRequester();
+					_downloader.SendRequest(url);
+				}
+
+				if (_downloader.IsDone() == false)
+					return;
+
+				if (_downloader.HasError())
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = _downloader.GetError();
+				}
+				else
+				{
+					byte[] bytesData = _downloader.GetData();
+					_deserializer = new DeserializeManifestOperation(bytesData);
+					OperationSystem.StartOperation(_deserializer);
+					_steps = ESteps.CheckDeserializeManifest;
+				}
+
+				_downloader.Dispose();
+			}
+
+			if (_steps == ESteps.CheckDeserializeManifest)
+			{
+				Progress = _deserializer.Progress;
+				if (_deserializer.IsDone == false)
+					return;
+
+				if (_deserializer.Status == EOperationStatus.Succeed)
+				{
+					Manifest = _deserializer.Manifest;
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Succeed;
+				}
+				else
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = _deserializer.Error;
+				}
+			}
+		}
+	}
+}

Assets/YooAsset/Runtime/PatchSystem/Operations/Internal/LoadBuildinManifestOperation.cs.meta

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

Assets/YooAsset/Runtime/PatchSystem/Operations/Internal/LoadCacheManifestOperation.cs

@@ -0,0 +1,141 @@
+using System.IO;
+
+namespace YooAsset
+{
+	internal class LoadCacheManifestOperation : AsyncOperationBase
+	{
+		private enum ESteps
+		{
+			None,
+			QueryCachePackageHash,
+			VerifyFileHash,
+			LoadCacheManifest,
+			CheckDeserializeManifest,
+			Done,
+		}
+
+		private readonly string _packageName;
+		private readonly string _packageVersion;
+		private QueryCachePackageHashOperation _queryCachePackageHashOp;
+		private DeserializeManifestOperation _deserializer;
+		private string _manifestFilePath;
+		private ESteps _steps = ESteps.None;
+
+		/// <summary>
+		/// 加载的清单实例
+		/// </summary>
+		public PatchManifest Manifest { private set; get; }
+
+
+		public LoadCacheManifestOperation(string packageName, string packageVersion)
+		{
+			_packageName = packageName;
+			_packageVersion = packageVersion;
+		}
+		internal override void Start()
+		{
+			_steps = ESteps.QueryCachePackageHash;
+		}
+		internal override void Update()
+		{
+			if (_steps == ESteps.None || _steps == ESteps.Done)
+				return;
+
+			if (_steps == ESteps.QueryCachePackageHash)
+			{
+				if (_queryCachePackageHashOp == null)
+				{
+					_queryCachePackageHashOp = new QueryCachePackageHashOperation(_packageName, _packageVersion);
+					OperationSystem.StartOperation(_queryCachePackageHashOp);
+				}
+
+				if (_queryCachePackageHashOp.IsDone == false)
+					return;
+
+				if (_queryCachePackageHashOp.Status == EOperationStatus.Succeed)
+				{
+					_steps = ESteps.VerifyFileHash;
+				}
+				else
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = _queryCachePackageHashOp.Error;
+					ClearCacheFile();
+				}
+			}
+
+			if (_steps == ESteps.VerifyFileHash)
+			{
+				_manifestFilePath = PersistentHelper.GetCacheManifestFilePath(_packageName, _packageVersion);
+				if (File.Exists(_manifestFilePath) == false)
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = $"Not found cache manifest file : {_manifestFilePath}";
+					ClearCacheFile();
+					return;
+				}
+
+				string fileHash = HashUtility.FileMD5(_manifestFilePath);
+				if (fileHash != _queryCachePackageHashOp.PackageHash)
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = "Failed to verify cache manifest file hash !";
+					ClearCacheFile();
+				}
+				else
+				{
+					_steps = ESteps.LoadCacheManifest;
+				}
+			}
+
+			if (_steps == ESteps.LoadCacheManifest)
+			{
+				byte[] bytesData = File.ReadAllBytes(_manifestFilePath);
+				_deserializer = new DeserializeManifestOperation(bytesData);
+				OperationSystem.StartOperation(_deserializer);
+				_steps = ESteps.CheckDeserializeManifest;
+			}
+
+			if (_steps == ESteps.CheckDeserializeManifest)
+			{
+				Progress = _deserializer.Progress;
+				if (_deserializer.IsDone == false)
+					return;
+
+				if (_deserializer.Status == EOperationStatus.Succeed)
+				{
+					Manifest = _deserializer.Manifest;
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Succeed;
+				}
+				else
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = _deserializer.Error;
+					ClearCacheFile();
+				}
+			}
+		}
+
+		private void ClearCacheFile()
+		{
+			// 注意：如果加载沙盒内的清单报错，为了避免流程被卡住，主动把损坏的文件删除。
+			if (File.Exists(_manifestFilePath))
+			{
+				YooLogger.Warning($"Failed to load cache manifest file : {Error}");
+				YooLogger.Warning($"Invalid cache manifest file have been removed : {_manifestFilePath}");
+				File.Delete(_manifestFilePath);
+			}
+
+			string hashFilePath = PersistentHelper.GetCachePackageHashFilePath(_packageName, _packageVersion);
+			if (File.Exists(hashFilePath))
+			{
+				File.Delete(hashFilePath);
+			}
+		}
+	}
+}

Assets/YooAsset/Runtime/PatchSystem/Operations/Internal/LoadCacheManifestOperation.cs.meta

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

Assets/YooAsset/Runtime/PatchSystem/Operations/Internal/LoadEditorManifestOperation.cs

@@ -0,0 +1,76 @@
+using System.IO;
+
+namespace YooAsset
+{
+	internal class LoadEditorManifestOperation : AsyncOperationBase
+	{
+		private enum ESteps
+		{
+			None,
+			LoadEditorManifest,
+			CheckDeserializeManifest,
+			Done,
+		}
+
+		private readonly string _manifestFilePath;
+		private DeserializeManifestOperation _deserializer;
+		private ESteps _steps = ESteps.None;
+
+		/// <summary>
+		/// 加载的清单实例
+		/// </summary>
+		public PatchManifest Manifest { private set; get; }
+
+
+		public LoadEditorManifestOperation(string manifestFilePath)
+		{
+			_manifestFilePath = manifestFilePath;
+		}
+		internal override void Start()
+		{
+			_steps = ESteps.LoadEditorManifest;
+		}
+		internal override void Update()
+		{
+			if (_steps == ESteps.None || _steps == ESteps.Done)
+				return;
+
+			if (_steps == ESteps.LoadEditorManifest)
+			{
+				if (File.Exists(_manifestFilePath) == false)
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = $"Not found simulation manifest file : {_manifestFilePath}";
+					return;
+				}
+				
+				YooLogger.Log($"Load editor manifest file : {_manifestFilePath}");
+				byte[] bytesData = FileUtility.ReadAllBytes(_manifestFilePath);
+				_deserializer = new DeserializeManifestOperation(bytesData);
+				OperationSystem.StartOperation(_deserializer);
+				_steps = ESteps.CheckDeserializeManifest;
+			}
+
+			if (_steps == ESteps.CheckDeserializeManifest)
+			{
+				Progress = _deserializer.Progress;
+				if (_deserializer.IsDone == false)
+					return;
+
+				if (_deserializer.Status == EOperationStatus.Succeed)
+				{
+					Manifest = _deserializer.Manifest;
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Succeed;
+				}
+				else
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = _deserializer.Error;
+				}
+			}
+		}
+	}
+}

Assets/YooAsset/Runtime/PatchSystem/Operations/Internal/LoadEditorManifestOperation.cs.meta

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

Assets/YooAsset/Runtime/PatchSystem/Operations/Internal/QueryBuildinPackageVersionOperation.cs

@@ -0,0 +1,76 @@
+
+namespace YooAsset
+{
+	internal class QueryBuildinPackageVersionOperation : AsyncOperationBase
+	{
+		private enum ESteps
+		{
+			None,
+			LoadBuildinPackageVersionFile,
+			Done,
+		}
+
+		private readonly string _packageName;
+		private UnityWebDataRequester _downloader;
+		private ESteps _steps = ESteps.None;
+
+		/// <summary>
+		/// 包裹版本
+		/// </summary>
+		public string PackageVersion { private set; get; }
+
+
+		public QueryBuildinPackageVersionOperation(string packageName)
+		{
+			_packageName = packageName;
+		}
+		internal override void Start()
+		{
+			_steps = ESteps.LoadBuildinPackageVersionFile;
+		}
+		internal override void Update()
+		{
+			if (_steps == ESteps.None || _steps == ESteps.Done)
+				return;
+
+			if (_steps == ESteps.LoadBuildinPackageVersionFile)
+			{
+				if (_downloader == null)
+				{
+					string fileName = YooAssetSettingsData.GetPackageVersionFileName(_packageName);
+					string filePath = PathHelper.MakeStreamingLoadPath(fileName);
+					string url = PathHelper.ConvertToWWWPath(filePath);
+					_downloader = new UnityWebDataRequester();
+					_downloader.SendRequest(url);
+				}
+
+				if (_downloader.IsDone() == false)
+					return;
+
+				if (_downloader.HasError())
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = _downloader.GetError();
+				}
+				else
+				{
+					PackageVersion = _downloader.GetText();
+					if (string.IsNullOrEmpty(PackageVersion))
+					{
+						_steps = ESteps.Done;
+						Status = EOperationStatus.Failed;
+						Error = $"Buildin package version file content is empty !";
+					}
+					else
+					{
+						_steps = ESteps.Done;
+						Status = EOperationStatus.Succeed;
+					}
+				}
+
+				_downloader.Dispose();
+			}
+		}
+	}
+}

Assets/YooAsset/Runtime/PatchSystem/Operations/Internal/QueryBuildinPackageVersionOperation.cs.meta

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

Assets/YooAsset/Runtime/PatchSystem/Operations/Internal/QueryCachePackageHashOperation.cs

@@ -0,0 +1,64 @@
+using System.IO;
+
+namespace YooAsset
+{
+	internal class QueryCachePackageHashOperation : AsyncOperationBase
+	{
+		private enum ESteps
+		{
+			None,
+			LoadCachePackageHashFile,
+			Done,
+		}
+
+		private readonly string _packageName;
+		private readonly string _packageVersion;
+		private ESteps _steps = ESteps.None;
+
+		/// <summary>
+		/// 包裹哈希值
+		/// </summary>
+		public string PackageHash { private set; get; }
+
+
+		public QueryCachePackageHashOperation(string packageName, string packageVersion)
+		{
+			_packageName = packageName;
+			_packageVersion = packageVersion;
+		}
+		internal override void Start()
+		{
+			_steps = ESteps.LoadCachePackageHashFile;
+		}
+		internal override void Update()
+		{
+			if (_steps == ESteps.None || _steps == ESteps.Done)
+				return;
+
+			if (_steps == ESteps.LoadCachePackageHashFile)
+			{
+				string filePath = PersistentHelper.GetCachePackageHashFilePath(_packageName, _packageVersion);
+				if (File.Exists(filePath) == false)
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = $"Cache package hash file not found : {filePath}";
+					return;
+				}
+
+				PackageHash = FileUtility.ReadAllText(filePath);
+				if (string.IsNullOrEmpty(PackageHash))
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = $"Cache package hash file content is empty !";
+				}
+				else
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Succeed;
+				}
+			}
+		}
+	}
+}

Assets/YooAsset/Runtime/PatchSystem/Operations/Internal/QueryCachePackageHashOperation.cs.meta

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

Assets/YooAsset/Runtime/PatchSystem/Operations/Internal/QueryCachePackageVersionOperation.cs

@@ -0,0 +1,62 @@
+using System.IO;
+
+namespace YooAsset
+{
+	internal class QueryCachePackageVersionOperation : AsyncOperationBase
+	{
+		private enum ESteps
+		{
+			None,
+			LoadCachePackageVersionFile,
+			Done,
+		}
+
+		private readonly string _packageName;
+		private ESteps _steps = ESteps.None;
+
+		/// <summary>
+		/// 包裹版本
+		/// </summary>
+		public string PackageVersion { private set; get; }
+
+
+		public QueryCachePackageVersionOperation(string packageName)
+		{
+			_packageName = packageName;
+		}
+		internal override void Start()
+		{
+			_steps = ESteps.LoadCachePackageVersionFile;
+		}
+		internal override void Update()
+		{
+			if (_steps == ESteps.None || _steps == ESteps.Done)
+				return;
+
+			if (_steps == ESteps.LoadCachePackageVersionFile)
+			{
+				string filePath = PersistentHelper.GetCachePackageVersionFilePath(_packageName);
+				if (File.Exists(filePath) == false)
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = $"Cache package version file not found : {filePath}";
+					return;
+				}
+
+				PackageVersion = FileUtility.ReadAllText(filePath);
+				if (string.IsNullOrEmpty(PackageVersion))
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = $"Cache package version file content is empty !";
+				}
+				else
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Succeed;
+				}
+			}
+		}
+	}
+}

Assets/YooAsset/Runtime/PatchSystem/Operations/Internal/QueryCachePackageVersionOperation.cs.meta

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

Assets/YooAsset/Runtime/PatchSystem/Operations/Internal/QueryRemotePackageVersionOperation.cs

@@ -0,0 +1,103 @@
+using System.IO;
+
+namespace YooAsset
+{
+	internal class QueryRemotePackageVersionOperation : AsyncOperationBase
+	{
+		private enum ESteps
+		{
+			None,
+			DownloadPackageVersion,
+			Done,
+		}
+
+		private static int RequestCount = 0;
+		private readonly IRemoteServices _remoteServices;
+		private readonly string _packageName;
+		private readonly bool _appendTimeTicks;
+		private readonly int _timeout;
+		private UnityWebDataRequester _downloader;
+		private ESteps _steps = ESteps.None;
+
+		/// <summary>
+		/// 包裹版本
+		/// </summary>
+		public string PackageVersion { private set; get; }
+		
+
+		public QueryRemotePackageVersionOperation(IRemoteServices remoteServices, string packageName, bool appendTimeTicks, int timeout)
+		{
+			_remoteServices = remoteServices;
+			_packageName = packageName;
+			_appendTimeTicks = appendTimeTicks;
+			_timeout = timeout;
+		}
+		internal override void Start()
+		{
+			RequestCount++;
+			_steps = ESteps.DownloadPackageVersion;
+		}
+		internal override void Update()
+		{
+			if (_steps == ESteps.None || _steps == ESteps.Done)
+				return;
+
+			if (_steps == ESteps.DownloadPackageVersion)
+			{
+				if (_downloader == null)
+				{
+					string fileName = YooAssetSettingsData.GetPackageVersionFileName(_packageName);
+					string webURL = GetPackageVersionRequestURL(fileName);
+					YooLogger.Log($"Beginning to request package version : {webURL}");
+					_downloader = new UnityWebDataRequester();
+					_downloader.SendRequest(webURL, _timeout);
+				}
+
+				Progress = _downloader.Progress();
+				if (_downloader.IsDone() == false)
+					return;
+
+				if (_downloader.HasError())
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = _downloader.GetError();
+				}
+				else
+				{
+					PackageVersion = _downloader.GetText();
+					if (string.IsNullOrEmpty(PackageVersion))
+					{
+						_steps = ESteps.Done;
+						Status = EOperationStatus.Failed;
+						Error = $"Remote package version is empty : {_downloader.URL}";
+					}
+					else
+					{
+						_steps = ESteps.Done;
+						Status = EOperationStatus.Succeed;
+					}
+				}
+
+				_downloader.Dispose();
+			}
+		}
+
+		private string GetPackageVersionRequestURL(string fileName)
+		{
+			string url;
+
+			// 轮流返回请求地址
+			if (RequestCount % 2 == 0)
+				url = _remoteServices.GetRemoteFallbackURL(fileName);
+			else
+				url = _remoteServices.GetRemoteMainURL(fileName);
+
+			// 在URL末尾添加时间戳
+			if (_appendTimeTicks)
+				return $"{url}?{System.DateTime.UtcNow.Ticks}";
+			else
+				return url;
+		}
+	}
+}

Assets/YooAsset/Runtime/PatchSystem/Operations/Internal/QueryRemotePackageVersionOperation.cs.meta

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

Assets/YooAsset/Runtime/PatchSystem/Operations/Internal/UnpackBuildinManifestOperation.cs

@@ -0,0 +1,94 @@
+
+namespace YooAsset
+{
+	internal class UnpackBuildinManifestOperation : AsyncOperationBase
+	{
+		private enum ESteps
+		{
+			None,
+			UnpackManifestHashFile,
+			UnpackManifestFile,
+			Done,
+		}
+
+		private readonly string _buildinPackageName;
+		private readonly string _buildinPackageVersion;
+		private UnityWebFileRequester _downloader1;
+		private UnityWebFileRequester _downloader2;
+		private ESteps _steps = ESteps.None;
+
+		public UnpackBuildinManifestOperation(string buildinPackageName, string buildinPackageVersion)
+		{
+			_buildinPackageName = buildinPackageName;
+			_buildinPackageVersion = buildinPackageVersion;
+		}
+		internal override void Start()
+		{
+			_steps = ESteps.UnpackManifestHashFile;
+		}
+		internal override void Update()
+		{
+			if (_steps == ESteps.None || _steps == ESteps.Done)
+				return;
+
+			if(_steps == ESteps.UnpackManifestHashFile)
+			{
+				if (_downloader1 == null)
+				{
+					string savePath = PersistentHelper.GetCachePackageHashFilePath(_buildinPackageName, _buildinPackageVersion);
+					string fileName = YooAssetSettingsData.GetPackageHashFileName(_buildinPackageName, _buildinPackageVersion);
+					string filePath = PathHelper.MakeStreamingLoadPath(fileName);
+					string url = PathHelper.ConvertToWWWPath(filePath);
+					_downloader1 = new UnityWebFileRequester();
+					_downloader1.SendRequest(url, savePath);
+				}
+
+				if (_downloader1.IsDone() == false)
+					return;
+
+				if (_downloader1.HasError())
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = _downloader1.GetError();
+				}
+				else
+				{
+					_steps = ESteps.UnpackManifestFile;
+				}
+
+				_downloader1.Dispose();
+			}
+
+			if (_steps == ESteps.UnpackManifestFile)
+			{
+				if (_downloader2 == null)
+				{
+					string savePath = PersistentHelper.GetCacheManifestFilePath(_buildinPackageName, _buildinPackageVersion);
+					string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_buildinPackageName, _buildinPackageVersion);
+					string filePath = PathHelper.MakeStreamingLoadPath(fileName);
+					string url = PathHelper.ConvertToWWWPath(filePath);
+					_downloader2 = new UnityWebFileRequester();
+					_downloader2.SendRequest(url, savePath);
+				}
+
+				if (_downloader2.IsDone() == false)
+					return;
+
+				if (_downloader2.HasError())
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = _downloader2.GetError();
+				}
+				else
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Succeed;
+				}
+
+				_downloader2.Dispose();
+			}
+		}
+	}
+}

Assets/YooAsset/Runtime/PatchSystem/Operations/Internal/UnpackBuildinManifestOperation.cs.meta

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

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

@@ -0,0 +1,261 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset
+{
+	public abstract class PreDownloadPackageOperation : AsyncOperationBase
+	{
+		/// <summary>
+		/// 创建补丁下载器，用于下载更新指定资源版本所有的资源包文件
+		/// </summary>
+		/// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
+		/// <param name="failedTryAgain">下载失败的重试次数</param>
+		/// <param name="timeout">超时时间</param>
+		public virtual PatchDownloaderOperation CreatePatchDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
+		{
+			return PatchDownloaderOperation.CreateEmptyDownloader(downloadingMaxNumber, failedTryAgain, timeout);
+		}
+
+		/// <summary>
+		/// 创建补丁下载器，用于下载更新资源标签指定的资源包文件
+		/// </summary>
+		/// <param name="tag">资源标签</param>
+		/// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
+		/// <param name="failedTryAgain">下载失败的重试次数</param>
+		/// <param name="timeout">超时时间</param>
+		public virtual PatchDownloaderOperation CreatePatchDownloader(string tag, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
+		{
+			return PatchDownloaderOperation.CreateEmptyDownloader(downloadingMaxNumber, failedTryAgain, timeout);
+		}
+
+		/// <summary>
+		/// 创建补丁下载器，用于下载更新资源标签指定的资源包文件
+		/// </summary>
+		/// <param name="tags">资源标签列表</param>
+		/// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
+		/// <param name="failedTryAgain">下载失败的重试次数</param>
+		/// <param name="timeout">超时时间</param>
+		public virtual PatchDownloaderOperation CreatePatchDownloader(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
+		{
+			return PatchDownloaderOperation.CreateEmptyDownloader(downloadingMaxNumber, failedTryAgain, timeout);
+		}
+
+		/// <summary>
+		/// 创建补丁下载器，用于下载更新指定的资源列表依赖的资源包文件
+		/// </summary>
+		/// <param name="locations">资源定位列表</param>
+		/// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
+		/// <param name="failedTryAgain">下载失败的重试次数</param>
+		/// <param name="timeout">超时时间</param>
+		public virtual PatchDownloaderOperation CreateBundleDownloader(string[] locations, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
+		{
+			return PatchDownloaderOperation.CreateEmptyDownloader(downloadingMaxNumber, failedTryAgain, timeout);
+		}
+	}
+
+	public class EditorPlayModePreDownloadPackageOperation : PreDownloadPackageOperation
+	{
+		internal override void Start()
+		{
+			Status = EOperationStatus.Succeed;
+		}
+		internal override void Update()
+		{
+		}
+	}
+	public class OfflinePlayModePreDownloadPackageOperation : PreDownloadPackageOperation
+	{
+		internal override void Start()
+		{
+			Status = EOperationStatus.Succeed;
+		}
+		internal override void Update()
+		{
+		}
+	}
+	public class HostPlayModePreDownloadPackageOperation : PreDownloadPackageOperation
+	{
+		private enum ESteps
+		{
+			None,
+			CheckActiveManifest,
+			TryLoadCacheManifest,
+			DownloadManifest,
+			LoadCacheManifest,
+			CheckDeserializeManifest,
+			Done,
+		}
+
+		private readonly HostPlayModeImpl _impl;
+		private readonly string _packageName;
+		private readonly string _packageVersion;
+		private readonly int _timeout;
+		private LoadCacheManifestOperation _tryLoadCacheManifestOp;
+		private LoadCacheManifestOperation _loadCacheManifestOp;
+		private DownloadManifestOperation _downloadManifestOp;
+		private PatchManifest _manifest;
+		private ESteps _steps = ESteps.None;
+
+
+		internal HostPlayModePreDownloadPackageOperation(HostPlayModeImpl impl, string packageName, string packageVersion, int timeout)
+		{
+			_impl = impl;
+			_packageName = packageName;
+			_packageVersion = packageVersion;
+			_timeout = timeout;
+		}
+		internal override void Start()
+		{
+			_steps = ESteps.CheckActiveManifest;
+		}
+		internal override void Update()
+		{
+			if (_steps == ESteps.None || _steps == ESteps.Done)
+				return;
+
+			if (_steps == ESteps.CheckActiveManifest)
+			{
+				// 检测当前激活的清单对象
+				if (_impl.ActiveManifest != null)
+				{
+					if (_impl.ActiveManifest.PackageVersion == _packageVersion)
+					{
+						_manifest = _impl.ActiveManifest;
+						_steps = ESteps.Done;
+						Status = EOperationStatus.Succeed;
+						return;
+					}
+				}
+				_steps = ESteps.TryLoadCacheManifest;
+			}
+
+			if (_steps == ESteps.TryLoadCacheManifest)
+			{
+				if (_tryLoadCacheManifestOp == null)
+				{
+					_tryLoadCacheManifestOp = new LoadCacheManifestOperation(_packageName, _packageVersion);
+					OperationSystem.StartOperation(_tryLoadCacheManifestOp);
+				}
+
+				if (_tryLoadCacheManifestOp.IsDone == false)
+					return;
+
+				if (_tryLoadCacheManifestOp.Status == EOperationStatus.Succeed)
+				{
+					_manifest = _tryLoadCacheManifestOp.Manifest;
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Succeed;
+				}
+				else
+				{
+					_steps = ESteps.DownloadManifest;
+				}
+			}
+
+			if (_steps == ESteps.DownloadManifest)
+			{
+				if (_downloadManifestOp == null)
+				{
+					_downloadManifestOp = new DownloadManifestOperation(_impl, _packageName, _packageVersion, _timeout);
+					OperationSystem.StartOperation(_downloadManifestOp);
+				}
+
+				if (_downloadManifestOp.IsDone == false)
+					return;
+
+				if (_downloadManifestOp.Status == EOperationStatus.Succeed)
+				{
+					_steps = ESteps.LoadCacheManifest;
+				}
+				else
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = _downloadManifestOp.Error;
+				}
+			}
+
+			if (_steps == ESteps.LoadCacheManifest)
+			{
+				if (_loadCacheManifestOp == null)
+				{
+					_loadCacheManifestOp = new LoadCacheManifestOperation(_packageName, _packageVersion);
+					OperationSystem.StartOperation(_loadCacheManifestOp);
+				}
+
+				if (_loadCacheManifestOp.IsDone == false)
+					return;
+
+				if (_loadCacheManifestOp.Status == EOperationStatus.Succeed)
+				{
+					_manifest = _loadCacheManifestOp.Manifest;
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Succeed;
+				}
+				else
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = _loadCacheManifestOp.Error;
+				}
+			}
+		}
+
+		public override PatchDownloaderOperation CreatePatchDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
+		{
+			if (Status != EOperationStatus.Succeed)
+			{
+				YooLogger.Warning($"{nameof(PreDownloadPackageOperation)} status is not succeed !");
+				return PatchDownloaderOperation.CreateEmptyDownloader(downloadingMaxNumber, failedTryAgain, timeout);
+			}
+
+			List<BundleInfo> downloadList = _impl.GetDownloadListByAll(_manifest);
+			var operation = new PatchDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain, timeout);
+			return operation;
+		}
+		public override PatchDownloaderOperation CreatePatchDownloader(string tag, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
+		{
+			if (Status != EOperationStatus.Succeed)
+			{
+				YooLogger.Warning($"{nameof(PreDownloadPackageOperation)} status is not succeed !");
+				return PatchDownloaderOperation.CreateEmptyDownloader(downloadingMaxNumber, failedTryAgain, timeout);
+			}
+
+			List<BundleInfo> downloadList = _impl.GetDownloadListByTags(_manifest, new string[] { tag });
+			var operation = new PatchDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain, timeout);
+			return operation;
+		}
+		public override PatchDownloaderOperation CreatePatchDownloader(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
+		{
+			if (Status != EOperationStatus.Succeed)
+			{
+				YooLogger.Warning($"{nameof(PreDownloadPackageOperation)} status is not succeed !");
+				return PatchDownloaderOperation.CreateEmptyDownloader(downloadingMaxNumber, failedTryAgain, timeout);
+			}
+
+			List<BundleInfo> downloadList = _impl.GetDownloadListByTags(_manifest, tags);
+			var operation = new PatchDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain, timeout);
+			return operation;
+		}
+		public override PatchDownloaderOperation CreateBundleDownloader(string[] locations, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
+		{
+			if (Status != EOperationStatus.Succeed)
+			{
+				YooLogger.Warning($"{nameof(PreDownloadPackageOperation)} status is not succeed !");
+				return PatchDownloaderOperation.CreateEmptyDownloader(downloadingMaxNumber, failedTryAgain, timeout);
+			}
+
+			List<AssetInfo> assetInfos = new List<AssetInfo>(locations.Length);
+			foreach (var location in locations)
+			{
+				var assetInfo = _manifest.ConvertLocationToAssetInfo(location, null);
+				assetInfos.Add(assetInfo);
+			}
+
+			List<BundleInfo> downloadList = _impl.GetDownloadListByPaths(_manifest, assetInfos.ToArray());
+			var operation = new PatchDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain, timeout);
+			return operation;
+		}
+	}
+}

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

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

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

@@ -1,7 +1,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.IO;
 
 namespace YooAsset
 {
@@ -10,10 +9,6 @@ namespace YooAsset
 	/// </summary>
 	public abstract class UpdatePackageManifestOperation : AsyncOperationBase
 	{
-		/// <summary>
-		/// 是否发现了新的补丁清单
-		/// </summary>
-		public bool FoundNewManifest { protected set; get; } = false;
 	}
 
 	/// <summary>
@@ -21,6 +16,9 @@ namespace YooAsset
 	/// </summary>
 	internal sealed class EditorPlayModeUpdatePackageManifestOperation : UpdatePackageManifestOperation
 	{
+		public EditorPlayModeUpdatePackageManifestOperation()
+		{
+		}
 		internal override void Start()
 		{
 			Status = EOperationStatus.Succeed;
@@ -35,6 +33,9 @@ namespace YooAsset
 	/// </summary>
 	internal sealed class OfflinePlayModeUpdatePackageManifestOperation : UpdatePackageManifestOperation
 	{
+		public OfflinePlayModeUpdatePackageManifestOperation()
+		{
+		}
 		internal override void Start()
 		{
 			Status = EOperationStatus.Succeed;
@@ -46,36 +47,30 @@ namespace YooAsset
 
 	/// <summary>
 	/// 联机模式的更新清单操作
-	/// 注意：优先比对沙盒清单哈希值，如果有变化就更新远端清单文件，并保存到本地。
+	/// 注意：优先加载沙盒里缓存的清单文件，如果缓存没找到就下载远端清单文件，并保存到本地。
 	/// </summary>
 	internal sealed class HostPlayModeUpdatePackageManifestOperation : UpdatePackageManifestOperation
 	{
 		private enum ESteps
 		{
 			None,
-			TryLoadCacheHash,
+			CheckActiveManifest,
-			LoadWebHash,
+			TryLoadCacheManifest,
-			CheckWebHash,
+			DownloadManifest,
 			LoadCacheManifest,
-			LoadWebManifest,
+			CheckDeserializeManifest,
-			CheckWebManifest,
-			InitVerifyingCache,
-			UpdateVerifyingCache,
 			Done,
 		}
 
-		private static int RequestCount = 0;
 		private readonly HostPlayModeImpl _impl;
 		private readonly string _packageName;
 		private readonly string _packageVersion;
-		private readonly CacheVerifier _cacheVerifier;
 		private readonly int _timeout;
-		private UnityWebDataRequester _downloader1;
+		private LoadCacheManifestOperation _tryLoadCacheManifestOp;
-		private UnityWebDataRequester _downloader2;
+		private LoadCacheManifestOperation _loadCacheManifestOp;
-
+		private DownloadManifestOperation _downloadManifestOp;
-		private string _cacheManifestHash;
 		private ESteps _steps = ESteps.None;
-		private float _verifyTime;
+
 
 		internal HostPlayModeUpdatePackageManifestOperation(HostPlayModeImpl impl, string packageName, string packageVersion, int timeout)
 		{
@@ -83,164 +78,100 @@ namespace YooAsset
 			_packageName = packageName;
 			_packageVersion = packageVersion;
 			_timeout = timeout;
-
-#if UNITY_WEBGL
-			_cacheVerifier = new CacheVerifierWithoutThread();
-#else
-			_cacheVerifier = new CacheVerifierWithThread();
-#endif
 		}
 		internal override void Start()
 		{
-			RequestCount++;
+			_steps = ESteps.CheckActiveManifest;
-			_steps = ESteps.TryLoadCacheHash;
 		}
 		internal override void Update()
 		{
 			if (_steps == ESteps.None || _steps == ESteps.Done)
 				return;
 
-			if (_steps == ESteps.TryLoadCacheHash)
+			if (_steps == ESteps.CheckActiveManifest)
 			{
-				string filePath = PersistentHelper.GetCacheManifestFilePath(_packageName);
+				// 检测当前激活的清单对象	
-				if (File.Exists(filePath))
+				if (_impl.ActiveManifest != null && _impl.ActiveManifest.PackageVersion == _packageVersion)
 				{
-					_cacheManifestHash = HashUtility.FileMD5(filePath);
+					_steps = ESteps.Done;
-					_steps = ESteps.LoadWebHash;
+					Status = EOperationStatus.Succeed;
 				}
 				else
 				{
-					_steps = ESteps.LoadWebManifest;
+					_steps = ESteps.TryLoadCacheManifest;
 				}
 			}
 
-			if (_steps == ESteps.LoadWebHash)
+			if (_steps == ESteps.TryLoadCacheManifest)
 			{
-				string fileName = YooAssetSettingsData.GetPatchManifestHashFileName(_packageName, _packageVersion);
+				if (_tryLoadCacheManifestOp == null)
-				string webURL = GetPatchManifestRequestURL(fileName);
+				{
-				YooLogger.Log($"Beginning to request patch manifest hash : {webURL}");
+					_tryLoadCacheManifestOp = new LoadCacheManifestOperation(_packageName, _packageVersion);
-				_downloader1 = new UnityWebDataRequester();
+					OperationSystem.StartOperation(_tryLoadCacheManifestOp);
-				_downloader1.SendRequest(webURL, _timeout);
+				}
-				_steps = ESteps.CheckWebHash;
-			}
 
-			if (_steps == ESteps.CheckWebHash)
+				if (_tryLoadCacheManifestOp.IsDone == false)
-			{
-				if (_downloader1.IsDone() == false)
 					return;
 
-				if (_downloader1.HasError())
+				if (_tryLoadCacheManifestOp.Status == EOperationStatus.Succeed)
+				{
+					_impl.ActiveManifest = _tryLoadCacheManifestOp.Manifest;
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Succeed;
+				}
+				else
+				{
+					_steps = ESteps.DownloadManifest;
+				}
+			}
+
+			if (_steps == ESteps.DownloadManifest)
+			{
+				if (_downloadManifestOp == null)
+				{
+					_downloadManifestOp = new DownloadManifestOperation(_impl, _packageName, _packageVersion, _timeout);
+					OperationSystem.StartOperation(_downloadManifestOp);
+				}
+
+				if (_downloadManifestOp.IsDone == false)
+					return;
+
+				if (_downloadManifestOp.Status == EOperationStatus.Succeed)
+				{
+					_steps = ESteps.LoadCacheManifest;
+				}
+				else
 				{
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Failed;
-					Error = _downloader1.GetError();
+					Error = _downloadManifestOp.Error;
 				}
-				else
-				{
-					string webManifestHash = _downloader1.GetText();
-					if (_cacheManifestHash == webManifestHash)
-					{
-						YooLogger.Log($"Not found new package : {_packageName}");
-						_steps = ESteps.LoadCacheManifest;
-					}
-					else
-					{
-						YooLogger.Log($"Package {_packageName} is change : {_cacheManifestHash} -> {webManifestHash}");
-						_steps = ESteps.LoadWebManifest;
-					}
-				}
-				_downloader1.Dispose();
 			}
 
 			if (_steps == ESteps.LoadCacheManifest)
 			{
-				try
+				if (_loadCacheManifestOp == null)
 				{
-					var manifest = PersistentHelper.LoadCacheManifestFile(_packageName);
+					_loadCacheManifestOp = new LoadCacheManifestOperation(_packageName, _packageVersion);
-					_impl.SetLocalPatchManifest(manifest);
+					OperationSystem.StartOperation(_loadCacheManifestOp);
-					_steps = ESteps.InitVerifyingCache;
 				}
-				catch (System.Exception e)
-				{
-					// 注意：如果加载沙盒内的清单报错，为了避免流程被卡住，我们主动把损坏的文件删除。
-					YooLogger.Warning($"Failed to load cache manifest file : {e.Message}");
-					PersistentHelper.DeleteCacheManifestFile(_packageName);
-					_steps = ESteps.LoadWebManifest;
-				}
-			}
 
-			if (_steps == ESteps.LoadWebManifest)
+				if (_loadCacheManifestOp.IsDone == false)
-			{
-				string fileName = YooAssetSettingsData.GetPatchManifestBinaryFileName(_packageName, _packageVersion);
-				string webURL = GetPatchManifestRequestURL(fileName);
-				YooLogger.Log($"Beginning to request patch manifest : {webURL}");
-				_downloader2 = new UnityWebDataRequester();
-				_downloader2.SendRequest(webURL, _timeout);
-				_steps = ESteps.CheckWebManifest;
-			}
-
-			if (_steps == ESteps.CheckWebManifest)
-			{
-				if (_downloader2.IsDone() == false)
 					return;
 
-				if (_downloader2.HasError())
+				if (_loadCacheManifestOp.Status == EOperationStatus.Succeed)
 				{
+					_impl.ActiveManifest = _loadCacheManifestOp.Manifest;
 					_steps = ESteps.Done;
-					Status = EOperationStatus.Failed;
+					Status = EOperationStatus.Succeed;
-					Error = _downloader2.GetError();
 				}
 				else
-				{
-					try
-					{
-						byte[] bytesData = _downloader2.GetData();
-						var manifest = PersistentHelper.SaveCacheManifestFile(_packageName, bytesData);
-						_impl.SetLocalPatchManifest(manifest);
-						FoundNewManifest = true;
-						_steps = ESteps.InitVerifyingCache;
-					}
-					catch (Exception e)
-					{
-						_steps = ESteps.Done;
-						Status = EOperationStatus.Failed;
-						Error = e.Message;
-					}
-				}
-				_downloader2.Dispose();
-			}
-
-			if (_steps == ESteps.InitVerifyingCache)
-			{
-				var verifyInfos = _impl.GetVerifyInfoList(false);
-				_cacheVerifier.InitVerifier(verifyInfos);
-				_verifyTime = UnityEngine.Time.realtimeSinceStartup;
-				_steps = ESteps.UpdateVerifyingCache;
-			}
-
-			if (_steps == ESteps.UpdateVerifyingCache)
-			{
-				Progress = _cacheVerifier.GetVerifierProgress();
-				if (_cacheVerifier.UpdateVerifier())
 				{
 					_steps = ESteps.Done;
-					Status = EOperationStatus.Succeed;
+					Status = EOperationStatus.Failed;
-					float costTime = UnityEngine.Time.realtimeSinceStartup - _verifyTime;
+					Error = _loadCacheManifestOp.Error;
-					YooLogger.Log($"Verify result : Success {_cacheVerifier.VerifySuccessList.Count}, Fail {_cacheVerifier.VerifyFailList.Count}, Elapsed time {costTime} seconds");
 				}
 			}
 		}
-
-		/// <summary>
-		/// 获取补丁清单请求地址
-		/// </summary>
-		private string GetPatchManifestRequestURL(string fileName)
-		{
-			// 轮流返回请求地址
-			if (RequestCount % 2 == 0)
-				return _impl.GetPatchDownloadFallbackURL(fileName);
-			else
-				return _impl.GetPatchDownloadMainURL(fileName);
-		}
 	}
 }

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

@@ -51,92 +51,57 @@ namespace YooAsset
 		private enum ESteps
 		{
 			None,
-			LoadStaticVersion,
+			QueryRemotePackageVersion,
-			CheckStaticVersion,
 			Done,
 		}
 
-		private static int RequestCount = 0;
 		private readonly HostPlayModeImpl _impl;
 		private readonly string _packageName;
-		private readonly int _timeout;
 		private readonly bool _appendTimeTicks;
+		private readonly int _timeout;
+		private QueryRemotePackageVersionOperation _queryRemotePackageVersionOp;
 		private ESteps _steps = ESteps.None;
-		private UnityWebDataRequester _downloader;
 
-		internal HostPlayModeUpdatePackageVersionOperation(HostPlayModeImpl impl, string packageName, int timeout, bool appendTimeTicks)
+		internal HostPlayModeUpdatePackageVersionOperation(HostPlayModeImpl impl, string packageName, bool appendTimeTicks, int timeout)
 		{
 			_impl = impl;
 			_packageName = packageName;
-			_timeout = timeout;
 			_appendTimeTicks = appendTimeTicks;
+			_timeout = timeout;
 		}
 		internal override void Start()
 		{
-			RequestCount++;
+			_steps = ESteps.QueryRemotePackageVersion;
-			_steps = ESteps.LoadStaticVersion;
 		}
 		internal override void Update()
 		{
 			if (_steps == ESteps.None || _steps == ESteps.Done)
 				return;
 
-			if (_steps == ESteps.LoadStaticVersion)
+			if (_steps == ESteps.QueryRemotePackageVersion)
 			{
-				string fileName = YooAssetSettingsData.GetPatchManifestVersionFileName(_packageName);
+				if (_queryRemotePackageVersionOp == null)
-				string webURL = GetStaticVersionRequestURL(fileName);
+				{
-				YooLogger.Log($"Beginning to request static version : {webURL}");
+					_queryRemotePackageVersionOp = new QueryRemotePackageVersionOperation(_impl, _packageName, _appendTimeTicks, _timeout);
-				_downloader = new UnityWebDataRequester();
+					OperationSystem.StartOperation(_queryRemotePackageVersionOp);
-				_downloader.SendRequest(webURL, _timeout);
+				}
-				_steps = ESteps.CheckStaticVersion;
-			}
 
-			if (_steps == ESteps.CheckStaticVersion)
+				if (_queryRemotePackageVersionOp.IsDone == false)
-			{
-				Progress = _downloader.Progress();
-				if (_downloader.IsDone() == false)
 					return;
 
-				if (_downloader.HasError())
+				if (_queryRemotePackageVersionOp.Status == EOperationStatus.Succeed)
 				{
+					PackageVersion = _queryRemotePackageVersionOp.PackageVersion;
 					_steps = ESteps.Done;
-					Status = EOperationStatus.Failed;
+					Status = EOperationStatus.Succeed;
-					Error = _downloader.GetError();
 				}
 				else
 				{
-					PackageVersion = _downloader.GetText();
+					_steps = ESteps.Done;
-					if (string.IsNullOrEmpty(PackageVersion))
+					Status = EOperationStatus.Failed;
-					{
+					Error = _queryRemotePackageVersionOp.Error;
-						_steps = ESteps.Done;
-						Status = EOperationStatus.Failed;
-						Error = $"Static package version is empty : {_downloader.URL}";
-					}
-					else
-					{
-						_steps = ESteps.Done;
-						Status = EOperationStatus.Succeed;
-					}
 				}
-				_downloader.Dispose();
 			}
 		}
-
-		private string GetStaticVersionRequestURL(string fileName)
-		{
-			string url;
-
-			// 轮流返回请求地址
-			if (RequestCount % 2 == 0)
-				url = _impl.GetPatchDownloadFallbackURL(fileName);
-			else
-				url = _impl.GetPatchDownloadMainURL(fileName);
-
-			// 在URL末尾添加时间戳
-			if (_appendTimeTicks)
-				return $"{url}?{System.DateTime.UtcNow.Ticks}";
-			else
-				return url;
-		}
 	}
 }

Assets/YooAsset/Runtime/PatchSystem/PatchBundle.cs

@@ -45,22 +45,63 @@ namespace YooAsset
 		/// <summary>
 		/// 所属的包裹名称
 		/// </summary>
-		private string _packageName;
+		public string PackageName { private set; get; }
 
 		/// <summary>
-		/// 缓存文件路径
+		/// 缓存GUID
 		/// </summary>
-		private string _cachedFilePath;
+		public string CacheGUID
-		public string CachedFilePath
+		{
+			get { return FileHash; }
+		}
+
+		/// <summary>
+		/// 缓存的数据文件路径
+		/// </summary>
+		private string _cachedDataFilePath;
+		public string CachedDataFilePath
 		{
 			get
 			{
-				if (string.IsNullOrEmpty(_cachedFilePath) == false)
+				if (string.IsNullOrEmpty(_cachedDataFilePath) == false)
-					return _cachedFilePath;
+					return _cachedDataFilePath;
 
-				string cacheRoot = PersistentHelper.GetCacheFolderPath(_packageName);
+				string cacheRoot = PersistentHelper.GetCacheFolderPath(PackageName);
-				_cachedFilePath = $"{cacheRoot}/{FileName}";
+				_cachedDataFilePath = $"{cacheRoot}/{CacheGUID}/{YooAssetSettings.CacheBundleDataFileName}";
-				return _cachedFilePath;
+				return _cachedDataFilePath;
+			}
+		}
+
+		/// <summary>
+		/// 缓存的信息文件路径
+		/// </summary>
+		private string _cachedInfoFilePath;
+		public string CachedInfoFilePath
+		{
+			get
+			{
+				if (string.IsNullOrEmpty(_cachedInfoFilePath) == false)
+					return _cachedInfoFilePath;
+
+				string cacheRoot = PersistentHelper.GetCacheFolderPath(PackageName);
+				_cachedInfoFilePath = $"{cacheRoot}/{CacheGUID}/{YooAssetSettings.CacheBundleInfoFileName}";
+				return _cachedInfoFilePath;
+			}
+		}
+
+		/// <summary>
+		/// 临时的数据文件路径
+		/// </summary>
+		private string _tempDataFilePath;
+		public string TempDataFilePath
+		{
+			get
+			{
+				if (string.IsNullOrEmpty(_tempDataFilePath) == false)
+					return _tempDataFilePath;
+
+				_tempDataFilePath = $"{CachedDataFilePath}.temp";
+				return _tempDataFilePath;
 			}
 		}
 
@@ -81,7 +122,7 @@ namespace YooAsset
 		}
 
 		/// <summary>
-		/// 文件名称
+		/// 文件名称（远端文件名和内置文件名）
 		/// </summary>
 		private string _fileName;
 		public string FileName
@@ -94,20 +135,6 @@ namespace YooAsset
 			}
 		}
 
-		/// <summary>
-		/// 缓存查询Key
-		/// </summary>
-		private string _cacheKey;
-		public string CacheKey
-		{
-			get
-			{
-				if (string.IsNullOrEmpty(_cacheKey))
-					throw new Exception("Should never get here !");
-				return _cacheKey;
-			}
-		}
-
 
 		public PatchBundle()
 		{
@@ -118,9 +145,8 @@ namespace YooAsset
 		/// </summary>
 		public void ParseBundle(string packageName, int nameStype)
 		{
-			_packageName = packageName;
+			PackageName = packageName;
-			_cacheKey = $"{packageName}-{FileHash}";
+			_fileName = PatchManifestTools.CreateBundleFileName(nameStype, BundleName, FileHash, IsRawFile);
-			_fileName = PatchManifest.CreateBundleFileName(nameStype, BundleName, FileHash);
 		}
 
 		/// <summary>

Assets/YooAsset/Runtime/PatchSystem/PatchManifest.cs

@@ -1,8 +1,8 @@
 using System;
 using System.IO;
+using System.Diagnostics;
 using System.Collections;
 using System.Collections.Generic;
-using UnityEngine;
 
 namespace YooAsset
 {
@@ -52,19 +52,19 @@ namespace YooAsset
 		/// 资源包集合（提供BundleName获取PatchBundle）
 		/// </summary>
 		[NonSerialized]
-		public readonly Dictionary<string, PatchBundle> BundleDic = new Dictionary<string, PatchBundle>();
+		public Dictionary<string, PatchBundle> BundleDic;
 
 		/// <summary>
 		/// 资源映射集合（提供AssetPath获取PatchAsset）
 		/// </summary>
 		[NonSerialized]
-		public readonly Dictionary<string, PatchAsset> AssetDic = new Dictionary<string, PatchAsset>();
+		public Dictionary<string, PatchAsset> AssetDic;
 
 		/// <summary>
 		/// 资源路径映射集合
 		/// </summary>
 		[NonSerialized]
-		public readonly Dictionary<string, string> AssetPathMapping = new Dictionary<string, string>();
+		public Dictionary<string, string> AssetPathMapping;
 
 		// 资源路径映射相关
 		private bool _isInitAssetPathMapping = false;
@@ -85,6 +85,7 @@ namespace YooAsset
 				if (locationToLower)
 					YooLogger.Error("Addressable not support location to lower !");
 
+				AssetPathMapping = new Dictionary<string, string>(AssetList.Count);
 				foreach (var patchAsset in AssetList)
 				{
 					string location = patchAsset.Address;
@@ -97,6 +98,7 @@ namespace YooAsset
 			else
 			{
 				_locationToLower = locationToLower;
+				AssetPathMapping = new Dictionary<string, string>(AssetList.Count * 2);
 				foreach (var patchAsset in AssetList)
 				{
 					string location = patchAsset.AssetPath;
@@ -237,11 +239,11 @@ namespace YooAsset
 		/// <summary>
 		/// 是否包含资源文件
 		/// </summary>
-		public bool IsIncludeBundleFile(string fileName)
+		public bool IsIncludeBundleFile(string cacheGUID)
 		{
 			foreach (var patchBundle in BundleList)
 			{
-				if (patchBundle.FileName == fileName)
+				if (patchBundle.CacheGUID == cacheGUID)
 					return true;
 			}
 			return false;
@@ -264,179 +266,50 @@ namespace YooAsset
 			return result.ToArray();
 		}
 
-
 		/// <summary>
-		/// 序列化（JSON文件）
+		/// 资源定位地址转换为资源信息类，失败时内部会发出错误日志。
 		/// </summary>
-		public static void SerializeToJson(string savePath, PatchManifest manifest)
+		/// <returns>如果转换失败会返回一个无效的资源信息类</returns>
+		public AssetInfo ConvertLocationToAssetInfo(string location, System.Type assetType)
 		{
-			string json = JsonUtility.ToJson(manifest, true);
+			DebugCheckLocation(location);
-			FileUtility.CreateFile(savePath, json);
-		}
 
-		/// <summary>
+			string assetPath = MappingToAssetPath(location);
-		/// 序列化（二进制文件）
+			if (TryGetPatchAsset(assetPath, out PatchAsset patchAsset))
-		/// </summary>
-		public static void SerializeToBinary(string savePath, PatchManifest patchManifest)
-		{
-			using (FileStream fs = new FileStream(savePath, FileMode.Create))
 			{
-				// 创建缓存器
+				AssetInfo assetInfo = new AssetInfo(patchAsset, assetType);
-				BufferWriter buffer = new BufferWriter(YooAssetSettings.PatchManifestFileMaxSize);
+				return assetInfo;
-
-				// 写入文件标记
-				buffer.WriteUInt32(YooAssetSettings.PatchManifestFileSign);
-
-				// 写入文件版本
-				buffer.WriteUTF8(patchManifest.FileVersion);
-
-				// 写入文件头信息
-				buffer.WriteBool(patchManifest.EnableAddressable);
-				buffer.WriteInt32(patchManifest.OutputNameStyle);
-				buffer.WriteUTF8(patchManifest.PackageName);
-				buffer.WriteUTF8(patchManifest.PackageVersion);
-
-				// 写入资源列表
-				buffer.WriteInt32(patchManifest.AssetList.Count);
-				for (int i = 0; i < patchManifest.AssetList.Count; i++)
-				{
-					var patchAsset = patchManifest.AssetList[i];
-					buffer.WriteUTF8(patchAsset.Address);
-					buffer.WriteUTF8(patchAsset.AssetPath);
-					buffer.WriteUTF8Array(patchAsset.AssetTags);
-					buffer.WriteInt32(patchAsset.BundleID);
-					buffer.WriteInt32Array(patchAsset.DependIDs);
-				}
-
-				// 写入资源包列表
-				buffer.WriteInt32(patchManifest.BundleList.Count);
-				for (int i = 0; i < patchManifest.BundleList.Count; i++)
-				{
-					var patchBundle = patchManifest.BundleList[i];
-					buffer.WriteUTF8(patchBundle.BundleName);
-					buffer.WriteUTF8(patchBundle.FileHash);
-					buffer.WriteUTF8(patchBundle.FileCRC);
-					buffer.WriteInt64(patchBundle.FileSize);
-					buffer.WriteBool(patchBundle.IsRawFile);
-					buffer.WriteByte(patchBundle.LoadMethod);
-					buffer.WriteUTF8Array(patchBundle.Tags);
-				}
-
-				// 写入文件流
-				buffer.WriteToStream(fs);
-				fs.Flush();
-			}
-		}
-
-		/// <summary>
-		/// 反序列化（二进制文件）
-		/// </summary>
-		public static PatchManifest DeserializeFromBinary(byte[] binaryData)
-		{
-			// 创建缓存器
-			BufferReader buffer = new BufferReader(binaryData);
-
-			// 读取文件标记
-			uint fileSign = buffer.ReadUInt32();
-			if (fileSign != YooAssetSettings.PatchManifestFileSign)
-				throw new Exception("Invalid manifest file !");
-
-			PatchManifest manifest = new PatchManifest();
-			{
-				// 读取文件版本
-				manifest.FileVersion = buffer.ReadUTF8();
-				if (manifest.FileVersion != YooAssetSettings.PatchManifestFileVersion)
-					throw new Exception($"The manifest file version are not compatible : {manifest.FileVersion} != {YooAssetSettings.PatchManifestFileVersion}");
-
-				// 读取文件头信息
-				manifest.EnableAddressable = buffer.ReadBool();
-				manifest.OutputNameStyle = buffer.ReadInt32();
-				manifest.PackageName = buffer.ReadUTF8();
-				manifest.PackageVersion = buffer.ReadUTF8();
-
-				// 读取资源列表
-				int patchAssetCount = buffer.ReadInt32();
-				manifest.AssetList = new List<PatchAsset>(patchAssetCount);
-				for (int i = 0; i < patchAssetCount; i++)
-				{
-					var patchAsset = new PatchAsset();
-					patchAsset.Address = buffer.ReadUTF8();
-					patchAsset.AssetPath = buffer.ReadUTF8();
-					patchAsset.AssetTags = buffer.ReadUTF8Array();
-					patchAsset.BundleID = buffer.ReadInt32();
-					patchAsset.DependIDs = buffer.ReadInt32Array();
-					manifest.AssetList.Add(patchAsset);
-				}
-
-				// 读取资源包列表
-				int patchBundleCount = buffer.ReadInt32();
-				manifest.BundleList = new List<PatchBundle>(patchBundleCount);
-				for (int i = 0; i < patchBundleCount; i++)
-				{
-					var patchBundle = new PatchBundle();
-					patchBundle.BundleName = buffer.ReadUTF8();
-					patchBundle.FileHash = buffer.ReadUTF8();
-					patchBundle.FileCRC = buffer.ReadUTF8();
-					patchBundle.FileSize = buffer.ReadInt64();
-					patchBundle.IsRawFile = buffer.ReadBool();
-					patchBundle.LoadMethod = buffer.ReadByte();
-					patchBundle.Tags = buffer.ReadUTF8Array();
-					manifest.BundleList.Add(patchBundle);
-				}
-			}
-
-			// BundleList
-			foreach (var patchBundle in manifest.BundleList)
-			{
-				patchBundle.ParseBundle(manifest.PackageName, manifest.OutputNameStyle);
-				manifest.BundleDic.Add(patchBundle.BundleName, patchBundle);
-			}
-
-			// AssetList
-			foreach (var patchAsset in manifest.AssetList)
-			{
-				// 注意：我们不允许原始路径存在重名
-				string assetPath = patchAsset.AssetPath;
-				if (manifest.AssetDic.ContainsKey(assetPath))
-					throw new Exception($"AssetPath have existed : {assetPath}");
-				else
-					manifest.AssetDic.Add(assetPath, patchAsset);
-			}
-
-			return manifest;
-		}
-
-
-		/// <summary>
-		/// 生成Bundle文件的正式名称
-		/// </summary>
-		public static string CreateBundleFileName(int nameStype, string bundleName, string fileHash)
-		{
-			if (nameStype == 1)
-			{
-				return fileHash;
-			}
-			else if (nameStype == 2)
-			{
-				string tempFileExtension = System.IO.Path.GetExtension(bundleName);
-				return $"{fileHash}{tempFileExtension}";
-			}
-			else if (nameStype == 3)
-			{
-				string tempFileExtension = System.IO.Path.GetExtension(bundleName);
-				string tempBundleName = bundleName.Replace('/', '_').Replace(tempFileExtension, "");
-				return $"{tempBundleName}_{fileHash}";
-			}
-			else if (nameStype == 4)
-			{
-				string tempFileExtension = System.IO.Path.GetExtension(bundleName);
-				string tempBundleName = bundleName.Replace('/', '_').Replace(tempFileExtension, "");
-				return $"{tempBundleName}_{fileHash}{tempFileExtension}";
 			}
 			else
 			{
-				throw new NotImplementedException();
+				string error;
+				if (string.IsNullOrEmpty(location))
+					error = $"The location is null or empty !";
+				else
+					error = $"The location is invalid : {location}";
+				AssetInfo assetInfo = new AssetInfo(error);
+				return assetInfo;
 			}
 		}
+
+		#region 调试方法
+		[Conditional("DEBUG")]
+		private void DebugCheckLocation(string location)
+		{
+			if (string.IsNullOrEmpty(location) == false)
+			{
+				// 检查路径末尾是否有空格
+				int index = location.LastIndexOf(" ");
+				if (index != -1)
+				{
+					if (location.Length == index + 1)
+						YooLogger.Warning($"Found blank character in location : \"{location}\"");
+				}
+
+				if (location.IndexOfAny(System.IO.Path.GetInvalidPathChars()) >= 0)
+					YooLogger.Warning($"Found illegal character in location : \"{location}\"");
+			}
+		}
+		#endregion
 	}
 }