Update CHANGELOG.md

可以自定义设置参数DefaultYooFolderName

.gitignore

@@ -10,8 +10,23 @@
 /[Ll]ogs/
 /[Mm]emoryCaptures/
 
+
+
+/Bundles/
+/ProjectSettings/
+/App/
+/yoo/ 
+/Assets/StreamingAssets
+/Assets/StreamingAssets.meta
+/Assets/Samples
+/Assets/Samples.meta
+/Packages
+/UserSettings
+
+
+
 # Asset meta data should only be ignored when the corresponding asset is also ignored
-!/[Aa]ssets/**/*.meta
+
 
 # Uncomment this line if you wish to ignore the asset store tools plugin
 # /[Aa]ssets/AssetStoreTools*

Assets/YooAsset/CHANGELOG.md

@@ -2,6 +2,91 @@
 
 All notable changes to this package will be documented in this file.
 
+## [1.5.6-preview] - 2023-09-26
+
+### Fixed
+
+- (#172) 修复包裹初始化后，package的状态不正确的问题。
+
+## [1.5.5-preview] - 2023-09-25
+
+### Fixed
+
+- (#96) 修复了异步操作任务的完成回调在业务层触发异常时无法正常完成的问题。
+- (#156) 修复了多个Package存在时，服务器请求地址请求顺序不对的问题。
+- (#163) 修复了Unity2019版本编译报错的问题。
+- (#167) 修复了初始化时每次都会提示文件验证失败日志。
+- (#171) 修复了IsNeedDownloadFromRemote里缺少判断依赖的资源是否下载 。
+
+### Added
+
+- 资源收集器里增加了AddressDisable规则。
+
+- 资源收集器里FilterRuleData结构体增加了多个备选字段。
+
+  ```c#
+  public struct FilterRuleData
+  {
+      public string AssetPath;
+      public string CollectPath;
+      public string GroupName;
+      public string UserData;
+  }
+  ```
+
+### Changed
+
+- 可以设置自定义参数DefaultYooFolderName。
+
+- 资源配置界面的分组不激活时，不再进行配置检测。
+
+- SBP构建管线增加新构建参数用于修复图集资源冗余问题。
+
+  ```c#
+  public class SBPBuildParameters
+  {
+      /// <summary>
+      /// 修复图集资源冗余问题
+      /// </summary>
+      public bool FixSpriteAtlasRedundancy = false;
+  }
+  ```
+
+## [1.5.4-preview] - 2023-08-25
+
+优化了资源清单文件构建速度（极大提升构建体验）（感谢yingnierxiao同学）。
+
+### Fixed
+
+- (#130) 修复了打包路径无效问题bug
+- (#138) 修复了Unity不支持的格式的原生文件会报warning
+
+### Added
+
+- 新增了IBuildinQueryServices 接口。
+
+### Changed
+
+- 在开启可寻址模式下，默认支持通过资源路径加载资源对象。
+
+- 优化了资源收集界面，增加了配置相关的警示提示。
+
+- 优化了资源报告界面，增加了BundleView界面里的builtin资源的列表显示。
+
+- IQueryServices接口变更为IBuildinQueryServices接口
+
+- EOperationStatus增加了正在处理的状态。
+
+  ```c#
+  public enum EOperationStatus
+  {
+      None,
+      Processing,
+      Succeed,
+      Failed
+  }
+  ```
+
 ## [1.5.3-preview] - 2023-07-28
 
 ### Fixed

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderHelper.cs

@@ -22,7 +22,7 @@ namespace YooAsset.Editor
 		/// </summary>
 		public static string GetDefaultStreamingAssetsRoot()
 		{
-			return $"{Application.dataPath}/StreamingAssets/{YooAssetSettings.DefaultYooFolderName}/";
+			return $"{Application.dataPath}/StreamingAssets/{YooAssetSettingsData.Setting.DefaultYooFolderName}/";
 		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs

@@ -28,6 +28,11 @@ namespace YooAsset.Editor
 			/// 缓存服务器端口
 			/// </summary>
 			public int CacheServerPort;
+
+			/// <summary>
+			/// 修复图集资源冗余问题
+			/// </summary>
+			public bool FixSpriteAtlasRedundancy = false;
 		}
 
 		/// <summary>

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

@@ -0,0 +1,68 @@
+using System.Collections.Generic;
+using UnityEditor.Build.Content;
+using UnityEngine.U2D;
+using UnityEditor.Build.Pipeline.Injector;
+using UnityEditor.Build.Pipeline.Interfaces;
+using UnityEngine;
+using System.Linq;
+
+namespace UnityEditor.Build.Pipeline.Tasks
+{
+	/// <summary>
+	/// Ref https://zhuanlan.zhihu.com/p/586918159
+	/// </summary>
+	public class RemoveSpriteAtlasRedundancy : IBuildTask
+	{
+		public int Version => 1;
+
+		[InjectContext]
+		IBundleWriteData writeDataParam;
+
+		public ReturnCode Run()
+		{
+#if UNITY_2020_3_OR_NEWER
+			BundleWriteData writeData = (BundleWriteData)writeDataParam;
+
+			// 图集引用的精灵图片集合
+			HashSet<GUID> spriteGuids = new HashSet<GUID>();
+			foreach (var pair in writeData.FileToObjects)
+			{
+				foreach (ObjectIdentifier objectIdentifier in pair.Value)
+				{
+					var assetPath = AssetDatabase.GUIDToAssetPath(objectIdentifier.guid);
+					var assetType = AssetDatabase.GetMainAssetTypeAtPath(assetPath);
+					if (assetType == typeof(SpriteAtlas))
+					{
+						var spritePaths = AssetDatabase.GetDependencies(assetPath, false);
+						foreach (string spritePath in spritePaths)
+						{
+							GUID spriteGuild = AssetDatabase.GUIDFromAssetPath(spritePath);
+							spriteGuids.Add(spriteGuild);
+						}
+					}
+				}
+			}
+
+			// 移除图集引用的精力图片对象
+			foreach (var pair in writeData.FileToObjects)
+			{
+				List<ObjectIdentifier> objectIdentifiers = pair.Value;
+				for (int i = objectIdentifiers.Count - 1; i >= 0; i--)
+				{
+					ObjectIdentifier objectIdentifier = objectIdentifiers[i];
+					if (spriteGuids.Contains(objectIdentifier.guid))
+					{
+						if (objectIdentifier.localIdentifierInFile == 2800000)
+						{
+							// 删除图集散图的冗余纹理
+							objectIdentifiers.RemoveAt(i);
+						}
+					}
+				}
+			}
+#endif
+
+			return ReturnCode.Success;
+		}
+	}
+}

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

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

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

@@ -9,7 +9,7 @@ namespace UnityEditor.Build.Pipeline.Tasks
 {
 	public static class SBPBuildTasks
 	{
-		public static IList<IBuildTask> Create(string builtInShaderBundleName)
+		public static IList<IBuildTask> Create(bool fixSpriteAtlasRedundancy, string builtInShaderBundleName)
 		{
 			var buildTasks = new List<IBuildTask>();
 
@@ -33,6 +33,8 @@ namespace UnityEditor.Build.Pipeline.Tasks
 
 			// Packing
 			buildTasks.Add(new GenerateBundlePacking());
+			if (fixSpriteAtlasRedundancy)
+				buildTasks.Add(new RemoveSpriteAtlasRedundancy());
 			buildTasks.Add(new UpdateBundleObjectLayout());
 			buildTasks.Add(new GenerateBundleCommands());
 			buildTasks.Add(new GenerateSubAssetPathMaps());

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

@@ -33,7 +33,7 @@ namespace YooAsset.Editor
 			// 开始构建
 			IBundleBuildResults buildResults;
 			var buildParameters = buildParametersContext.GetSBPBuildParameters();
-			var taskList = SBPBuildTasks.Create(buildMapContext.Command.ShadersBundleName);
+			var taskList = SBPBuildTasks.Create(buildParametersContext.Parameters.SBPParameters.FixSpriteAtlasRedundancy, buildMapContext.Command.ShadersBundleName);
 			ReturnCode exitCode = ContentPipeline.BuildAssetBundles(buildParameters, buildContent, out buildResults, taskList);
 			if (exitCode < 0)
 			{

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

@@ -40,7 +40,12 @@ namespace YooAsset.Editor
 			manifest.OutputNameStyle = (int)buildParameters.OutputNameStyle;
 			manifest.PackageName = buildParameters.PackageName;
 			manifest.PackageVersion = buildParameters.PackageVersion;
+
+			// 填充资源包集合
 			manifest.BundleList = GetAllPackageBundle(context);
+			CacheBundleIDs(manifest);
+
+			// 填充主资源集合
 			manifest.AssetList = GetAllPackageAsset(context, manifest);
 
 			// 更新Unity内置资源包的引用关系
@@ -147,7 +152,7 @@ namespace YooAsset.Editor
 					packageAsset.AssetPath = assetInfo.AssetPath;
 					packageAsset.AssetGUID = buildMapContext.Command.IncludeAssetGUID ? assetInfo.AssetGUID : string.Empty;
 					packageAsset.AssetTags = assetInfo.AssetTags.ToArray();
-					packageAsset.BundleID = GetAssetBundleID(assetInfo.BundleName, manifest);
+					packageAsset.BundleID = GetCachedBundleID(assetInfo.BundleName);
 					packageAsset.DependIDs = GetAssetBundleDependIDs(packageAsset.BundleID, assetInfo, manifest);
 					result.Add(packageAsset);
 				}
@@ -156,12 +161,12 @@ namespace YooAsset.Editor
 		}
 		private int[] GetAssetBundleDependIDs(int mainBundleID, BuildAssetInfo assetInfo, PackageManifest manifest)
 		{
-			List<int> result = new List<int>();
+			HashSet<int> result = new HashSet<int>();
 			foreach (var dependAssetInfo in assetInfo.AllDependAssetInfos)
 			{
 				if (dependAssetInfo.HasBundleName())
 				{
-					int bundleID = GetAssetBundleID(dependAssetInfo.BundleName, manifest);
+					int bundleID = GetCachedBundleID(dependAssetInfo.BundleName);
 					if (mainBundleID != bundleID)
 					{
 						if (result.Contains(bundleID) == false)
@@ -171,15 +176,6 @@ namespace YooAsset.Editor
 			}
 			return result.ToArray();
 		}
-		private int GetAssetBundleID(string bundleName, PackageManifest manifest)
-		{
-			for (int index = 0; index < manifest.BundleList.Count; index++)
-			{
-				if (manifest.BundleList[index].BundleName == bundleName)
-					return index;
-			}
-			throw new Exception($"Not found bundle name : {bundleName}");
-		}
 
 		/// <summary>
 		/// 更新Unity内置资源包的引用关系
@@ -212,7 +208,7 @@ namespace YooAsset.Editor
 				List<string> conflictAssetPathList = dependBundles.Intersect(shaderBundleReferenceList).ToList();
 				if (conflictAssetPathList.Count > 0)
 				{
-					List<int> newDependIDs = new List<int>(packageAsset.DependIDs);
+					HashSet<int> newDependIDs = new HashSet<int>(packageAsset.DependIDs);
 					if (newDependIDs.Contains(shaderBundleId) == false)
 						newDependIDs.Add(shaderBundleId);
 					packageAsset.DependIDs = newDependIDs.ToArray();
@@ -226,7 +222,7 @@ namespace YooAsset.Editor
 
 			// 更新资源包标签
 			var packageBundle = manifest.BundleList[shaderBundleId];
-			List<string> newTags = new List<string>(packageBundle.Tags);
+			HashSet<string> newTags = new HashSet<string>(packageBundle.Tags);
 			foreach (var tag in tagTemps)
 			{
 				if (newTags.Contains(tag) == false)
@@ -251,22 +247,21 @@ namespace YooAsset.Editor
 		private readonly Dictionary<string, int> _cachedBundleID = new Dictionary<string, int>(10000);
 		private readonly Dictionary<string, string[]> _cachedBundleDepends = new Dictionary<string, string[]>(10000);
 		
+		private void CacheBundleIDs(PackageManifest manifest)
+		{
+			UnityEngine.Debug.Assert(manifest.BundleList.Count != 0, "Manifest bundle list is empty !");
+			for (int index = 0; index < manifest.BundleList.Count; index++)
+			{
+				string bundleName = manifest.BundleList[index].BundleName;
+				_cachedBundleID.Add(bundleName, index);
+			}
+		}
+
 		private void UpdateScriptPipelineReference(PackageManifest manifest, TaskBuilding_SBP.BuildResultContext buildResultContext)
 		{
 			int progressValue;
 			int totalCount = manifest.BundleList.Count;
 
-			// 缓存资源包ID
-			_cachedBundleID.Clear();
-			progressValue = 0;
-			foreach (var packageBundle in manifest.BundleList)
-			{
-				int bundleID = GetAssetBundleID(packageBundle.BundleName, manifest);
-				_cachedBundleID.Add(packageBundle.BundleName, bundleID);
-				EditorTools.DisplayProgressBar("缓存资源包索引", ++progressValue, totalCount);
-			}
-			EditorTools.ClearProgressBar();
-
 			// 缓存资源包依赖
 			_cachedBundleDepends.Clear();
 			progressValue = 0;
@@ -283,7 +278,11 @@ namespace YooAsset.Editor
 
 				var depends = buildResultContext.Results.BundleInfos[packageBundle.BundleName].Dependencies;
 				_cachedBundleDepends.Add(packageBundle.BundleName, depends);
-				EditorTools.DisplayProgressBar("缓存资源包依赖列表", ++progressValue, totalCount);
+				int pro = ++progressValue;
+				if (pro % 100 == 0)
+				{
+					EditorTools.DisplayProgressBar("缓存资源包依赖列表", pro, totalCount);
+				}
 			}
 			EditorTools.ClearProgressBar();
 
@@ -291,7 +290,11 @@ namespace YooAsset.Editor
 			foreach (var packageBundle in manifest.BundleList)
 			{
 				packageBundle.ReferenceIDs = GetBundleRefrenceIDs(manifest, packageBundle);
-				EditorTools.DisplayProgressBar("计算资源包引用关系", ++progressValue, totalCount);
+				int pro = ++progressValue;
+				if (pro % 100 == 0)
+				{
+					EditorTools.DisplayProgressBar("计算资源包引用关系", pro, totalCount);
+				}
 			}
 			EditorTools.ClearProgressBar();
 		}
@@ -300,17 +303,6 @@ namespace YooAsset.Editor
 			int progressValue;
 			int totalCount = manifest.BundleList.Count;
 
-			// 缓存资源包ID
-			_cachedBundleID.Clear();
-			progressValue = 0;
-			foreach (var packageBundle in manifest.BundleList)
-			{
-				int bundleID = GetAssetBundleID(packageBundle.BundleName, manifest);
-				_cachedBundleID.Add(packageBundle.BundleName, bundleID);
-				EditorTools.DisplayProgressBar("缓存资源包索引", ++progressValue, totalCount);
-			}
-			EditorTools.ClearProgressBar();
-
 			// 缓存资源包依赖
 			_cachedBundleDepends.Clear();
 			progressValue = 0;
@@ -324,7 +316,11 @@ namespace YooAsset.Editor
 
 				var depends = buildResultContext.UnityManifest.GetDirectDependencies(packageBundle.BundleName);
 				_cachedBundleDepends.Add(packageBundle.BundleName, depends);
-				EditorTools.DisplayProgressBar("缓存资源包依赖列表", ++progressValue, totalCount);
+				int pro = ++progressValue;
+				if (pro % 100 == 0)
+				{
+					EditorTools.DisplayProgressBar("缓存资源包依赖列表", pro, totalCount);
+				}
 			}
 			EditorTools.ClearProgressBar();
 
@@ -333,7 +329,11 @@ namespace YooAsset.Editor
 			foreach (var packageBundle in manifest.BundleList)
 			{
 				packageBundle.ReferenceIDs = GetBundleRefrenceIDs(manifest, packageBundle);
-				EditorTools.DisplayProgressBar("计算资源包引用关系", ++progressValue, totalCount);
+				int pro = ++progressValue;
+				if (pro % 100 == 0)
+				{
+					EditorTools.DisplayProgressBar("计算资源包引用关系", ++progressValue, totalCount);
+				}
 			}
 			EditorTools.ClearProgressBar();
 		}
@@ -354,7 +354,7 @@ namespace YooAsset.Editor
 				}
 			}
 
-			List<int> result = new List<int>();
+			HashSet<int> result = new HashSet<int>();
 			foreach (var bundleName in referenceList)
 			{
 				int bundleID = GetCachedBundleID(bundleName);

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

@@ -33,7 +33,7 @@ namespace YooAsset.Editor
 			Dictionary<string, BuildAssetInfo> allBuildAssetInfoDic = new Dictionary<string, BuildAssetInfo>(1000);
 
 			// 1. 检测配置合法性
-			AssetBundleCollectorSettingData.Setting.CheckConfigError();
+			AssetBundleCollectorSettingData.Setting.CheckPackageConfigError(packageName);
 
 			// 2. 获取所有收集器收集的资源
 			var collectResult = AssetBundleCollectorSettingData.Setting.GetPackageAssets(buildMode, packageName);

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollector.cs

@@ -166,7 +166,7 @@ namespace YooAsset.Editor
 				string[] findAssets = EditorTools.FindAssets(EAssetSearchType.All, collectDirectory);
 				foreach (string assetPath in findAssets)
 				{
-					if (IsValidateAsset(assetPath, isRawFilePackRule) && IsCollectAsset(assetPath))
+					if (IsValidateAsset(assetPath, isRawFilePackRule) && IsCollectAsset(group, assetPath))
 					{
 						if (result.ContainsKey(assetPath) == false)
 						{
@@ -183,7 +183,7 @@ namespace YooAsset.Editor
 			else
 			{
 				string assetPath = CollectPath;
-				if (IsValidateAsset(assetPath, isRawFilePackRule) && IsCollectAsset(assetPath))
+				if (IsValidateAsset(assetPath, isRawFilePackRule) && IsCollectAsset(group, assetPath))
 				{
 					var collectAssetInfo = CreateCollectAssetInfo(command, group, assetPath, isRawFilePackRule);
 					result.Add(assetPath, collectAssetInfo);
@@ -204,6 +204,12 @@ namespace YooAsset.Editor
 					{
 						string address = collectInfoPair.Value.Address;
 						string assetPath = collectInfoPair.Value.AssetPath;
+						if (string.IsNullOrEmpty(address))
+							continue;
+
+						if (address.StartsWith("Assets/") || address.StartsWith("assets/"))
+							throw new Exception($"The address can not set asset path in collector : {CollectPath} \nAssetPath: {assetPath}");
+
 						if (addressTemper.TryGetValue(address, out var existed) == false)
 							addressTemper.Add(address, assetPath);
 						else
@@ -288,11 +294,11 @@ namespace YooAsset.Editor
 
 			return true;
 		}
-		private bool IsCollectAsset(string assetPath)
+		private bool IsCollectAsset(AssetBundleCollectorGroup group, string assetPath)
 		{
 			// 根据规则设置过滤资源文件
 			IFilterRule filterRuleInstance = AssetBundleCollectorSettingData.GetFilterRuleInstance(FilterRuleName);
-			return filterRuleInstance.IsCollectAsset(new FilterRuleData(assetPath));
+			return filterRuleInstance.IsCollectAsset(new FilterRuleData(assetPath, CollectPath, group.GroupName, UserData));
 		}
 		private string GetAddress(CollectCommand command, AssetBundleCollectorGroup group, string assetPath)
 		{
@@ -336,11 +342,13 @@ namespace YooAsset.Editor
 			List<string> result = new List<string>(depends.Length);
 			foreach (string assetPath in depends)
 			{
+				// 注意：排除主资源对象
+				if (assetPath == mainAssetPath)
+					continue;
+
 				if (IsValidateAsset(assetPath, false))
 				{
-					// 注意：排除主资源对象
+					result.Add(assetPath);
-					if (assetPath != mainAssetPath)
-						result.Add(assetPath);
 				}
 			}
 			return result;

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorGroup.cs

@@ -44,6 +44,9 @@ namespace YooAsset.Editor
 			if (AssetBundleCollectorSettingData.HasActiveRuleName(ActiveRuleName) == false)
 				throw new Exception($"Invalid {nameof(IActiveRule)} class type : {ActiveRuleName} in group : {GroupName}");
 			
+			// 当分组不是激活状态时，直接不进行检测
+			if (ActiveRuleName == nameof(DisableGroup)) return;
+			
 			foreach (var collector in Collectors)
 			{
 				collector.CheckConfigError();
@@ -103,6 +106,9 @@ namespace YooAsset.Editor
 					{
 						string address = collectInfoPair.Value.Address;
 						string assetPath = collectInfoPair.Value.AssetPath;
+						if (string.IsNullOrEmpty(address))
+							continue;
+
 						if (addressTemper.TryGetValue(address, out var existed) == false)
 							addressTemper.Add(address, assetPath);
 						else

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorPackage.cs

@@ -83,6 +83,9 @@ namespace YooAsset.Editor
 					{
 						string address = collectInfoPair.Value.Address;
 						string assetPath = collectInfoPair.Value.AssetPath;
+						if (string.IsNullOrEmpty(address))
+							continue;
+
 						if (addressTemper.TryGetValue(address, out var existed) == false)
 							addressTemper.Add(address, assetPath);
 						else

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSetting.cs

@@ -61,9 +61,18 @@ namespace YooAsset.Editor
 		}
 
 		/// <summary>
-		/// 检测配置错误
+		/// 检测包裹配置错误
 		/// </summary>
-		public void CheckConfigError()
+		public void CheckPackageConfigError(string packageName)
+		{
+			var package = GetPackage(packageName);
+			package.CheckConfigError();
+		}
+
+		/// <summary>
+		/// 检测所有配置错误
+		/// </summary>
+		public void CheckAllPackageConfigError()
 		{
 			foreach (var package in Packages)
 			{
@@ -72,9 +81,9 @@ namespace YooAsset.Editor
 		}
 
 		/// <summary>
-		/// 修复配置错误
+		/// 修复所有配置错误
 		/// </summary>
-		public bool FixConfigError()
+		public bool FixAllPackageConfigError()
 		{
 			bool isFixed = false;
 			foreach (var package in Packages)
@@ -92,16 +101,8 @@ namespace YooAsset.Editor
 		/// </summary>
 		public List<string> GetPackageAllTags(string packageName)
 		{
-			foreach (var package in Packages)
+			var package = GetPackage(packageName);
-			{
+			return package.GetAllTags();
-				if (package.PackageName == packageName)
-				{
-					return package.GetAllTags();
-				}
-			}
-
-			Debug.LogWarning($"Not found package : {packageName}");
-			return new List<string>();
 		}
 
 		/// <summary>
@@ -110,21 +111,27 @@ namespace YooAsset.Editor
 		public CollectResult GetPackageAssets(EBuildMode buildMode, string packageName)
 		{
 			if (string.IsNullOrEmpty(packageName))
-				throw new Exception("Build package name is null or mepty !");
+				throw new Exception("Build package name is null or empty !");
 
+			var package = GetPackage(packageName);
+			CollectCommand command = new CollectCommand(buildMode, packageName,
+			EnableAddressable, LocationToLower, IncludeAssetGUID, UniqueBundleName);
+			CollectResult collectResult = new CollectResult(command);
+			collectResult.SetCollectAssets(package.GetAllCollectAssets(command));
+			return collectResult;
+		}
+
+		/// <summary>
+		/// 获取包裹类
+		/// </summary>
+		public AssetBundleCollectorPackage GetPackage(string packageName)
+		{
 			foreach (var package in Packages)
 			{
 				if (package.PackageName == packageName)
-				{
+					return package;
-					CollectCommand command = new CollectCommand(buildMode, packageName,
-						EnableAddressable, LocationToLower, IncludeAssetGUID, UniqueBundleName);
-					CollectResult collectResult = new CollectResult(command);
-					collectResult.SetCollectAssets(package.GetAllCollectAssets(command));
-					return collectResult;
-				}
 			}
-
+			throw new Exception($"Not found package : {packageName}");
-			throw new Exception($"Not found collector pacakge : {packageName}");
 		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSettingData.cs

@@ -94,7 +94,8 @@ namespace YooAsset.Editor
 					typeof(AddressByFileName),
 					typeof(AddressByFilePath),
 					typeof(AddressByFolderAndFileName),
-					typeof(AddressByGroupAndFileName)
+					typeof(AddressByGroupAndFileName),
+					typeof(AddressDisable)
 				};
 
 				var customTypes = EditorTools.GetAssignableTypes(typeof(IAddressRule));
@@ -161,7 +162,7 @@ namespace YooAsset.Editor
 		/// </summary>
 		public static void FixFile()
 		{
-			bool isFixed = Setting.FixConfigError();
+			bool isFixed = Setting.FixAllPackageConfigError();
 			if (isFixed)
 			{
 				IsDirty = true;

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs

@@ -26,6 +26,7 @@ namespace YooAsset.Editor
 		private List<RuleDisplayName> _filterRuleList;
 
 		private Button _settingsButton;
+		private VisualElement _helpBoxContainer;
 		private VisualElement _setting1Container;
 		private VisualElement _setting2Container;
 		private Toggle _showPackageToogle;
@@ -82,6 +83,9 @@ namespace YooAsset.Editor
 
 				visualAsset.CloneTree(root);
 
+				// 警示栏
+				_helpBoxContainer = root.Q("HelpBoxContainer");
+
 				// 公共设置相关
 				_settingsButton = root.Q<Button>("SettingsButton");
 				_settingsButton.clicked += SettingsBtn_clicked;
@@ -328,6 +332,26 @@ namespace YooAsset.Editor
 			_uniqueBundleNameToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.UniqueBundleName);
 			_showEditorAliasToggle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.ShowEditorAlias);
 
+			// 警示框
+#if UNITY_2020_3_OR_NEWER
+			_helpBoxContainer.Clear();
+			if (_enableAddressableToogle.value && _locationToLowerToogle.value)
+			{
+				var helpBox = new HelpBox("无法同时开启[Enable Addressable]选项和[Location To Lower]选项", HelpBoxMessageType.Error);
+				_helpBoxContainer.Add(helpBox);
+			}
+			if (AssetBundleCollectorSettingData.Setting.Packages.Count > 1 && _uniqueBundleNameToogle.value == false)
+			{
+				var helpBox = new HelpBox("检测到当前配置存在多个Package，建议开启[Unique Bundle Name]选项", HelpBoxMessageType.Warning);
+				_helpBoxContainer.Add(helpBox);
+			}
+			if (_helpBoxContainer.childCount > 0)
+				_helpBoxContainer.style.display = DisplayStyle.Flex;
+			else
+				_helpBoxContainer.style.display = DisplayStyle.None;
+#endif
+
+			// 设置栏
 			if (_showSettings)
 			{
 				_setting1Container.style.display = DisplayStyle.Flex;

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.uxml

@@ -1,4 +1,4 @@
-<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="True">
     <uie:Toolbar name="Toolbar" style="display: flex; flex-direction: row-reverse;">
         <ui:Button text="Save" display-tooltip-when-elided="true" name="SaveButton" style="width: 50px; background-color: rgb(56, 147, 58);" />
         <ui:Button text="导出" display-tooltip-when-elided="true" name="ExportButton" style="width: 50px; background-color: rgb(56, 147, 58);" />
@@ -6,6 +6,7 @@
         <ui:Button text="修复" display-tooltip-when-elided="true" name="FixButton" style="width: 50px; background-color: rgb(56, 147, 58);" />
     </uie:Toolbar>
     <ui:VisualElement name="PublicContainer" style="background-color: rgb(79, 79, 79); flex-direction: column; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">
+        <ui:VisualElement name="HelpBoxContainer" style="flex-grow: 1;" />
         <ui:Button text="Settings" display-tooltip-when-elided="true" name="SettingsButton" />
         <ui:VisualElement name="PublicContainer1" style="flex-direction: row; flex-wrap: nowrap; height: 28px;">
             <ui:Toggle label="Show Packages" name="ShowPackages" style="width: 196px; -unity-text-align: middle-left;" />

Assets/YooAsset/Editor/AssetBundleCollector/CollectRules/IFilterRule.cs

@@ -4,10 +4,16 @@ namespace YooAsset.Editor
 	public struct FilterRuleData
 	{
 		public string AssetPath;
+		public string CollectPath;
+		public string GroupName;
+		public string UserData;
 		
-		public FilterRuleData(string assetPath)
+		public FilterRuleData(string assetPath, string collectPath, string groupName, string userData)
 		{
 			AssetPath = assetPath;
+			CollectPath = collectPath;
+			GroupName = groupName;
+			UserData = userData;
 		}
 	}
 

Assets/YooAsset/Editor/AssetBundleCollector/CollectRules/IPackRule.cs

@@ -8,13 +8,6 @@ namespace YooAsset.Editor
 		public string GroupName;
 		public string UserData;
 
-		public PackRuleData(string assetPath)
-		{
-			AssetPath = assetPath;
-			CollectPath = string.Empty;
-			GroupName = string.Empty;
-			UserData = string.Empty;
-		}
 		public PackRuleData(string assetPath, string collectPath, string groupName, string userData)
 		{
 			AssetPath = assetPath;

Assets/YooAsset/Editor/AssetBundleCollector/DefaultRules/DefaultAddressRule.cs

@@ -2,6 +2,15 @@
 
 namespace YooAsset.Editor
 {
+	[DisplayName("定位地址: 禁用")]
+	public class AddressDisable : IAddressRule
+	{
+		string IAddressRule.GetAssetAddress(AddressRuleData data)
+		{
+			return string.Empty;
+		}
+	}
+
 	[DisplayName("定位地址: 文件名")]
 	public class AddressByFileName : IAddressRule
 	{
@@ -16,7 +25,7 @@ namespace YooAsset.Editor
 	{
 		string IAddressRule.GetAssetAddress(AddressRuleData data)
 		{
-			return data.AssetPath;
+			throw new System.Exception("可寻址模式下已经默认支持通过资源路径加载！");
 		}
 	}
 

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

@@ -349,10 +349,24 @@ namespace YooAsset.Editor
 		private void FillIncludeListView(ReportBundleInfo bundleInfo)
 		{
 			List<ReportAssetInfo> containsList = new List<ReportAssetInfo>();
+			HashSet<string> mainAssetDic = new HashSet<string>();
 			foreach (var assetInfo in _buildReport.AssetInfos)
 			{
 				if (assetInfo.MainBundleName == bundleInfo.BundleName)
+				{
+					mainAssetDic.Add(assetInfo.AssetPath);
 					containsList.Add(assetInfo);
+				}
+			}
+			foreach (string assetPath in bundleInfo.AllBuiltinAssets)
+			{
+				if (mainAssetDic.Contains(assetPath) == false)
+				{
+					var assetInfo = new ReportAssetInfo();
+					assetInfo.AssetPath = assetPath;
+					assetInfo.AssetGUID = "--";
+					containsList.Add(assetInfo);
+				}
 			}
 
 			_includeListView.Clear();
@@ -376,6 +390,16 @@ namespace YooAsset.Editor
 				element.Add(label);
 			}
 
+			{
+				var label = new Label();
+				label.name = "Label3";
+				label.style.unityTextAlign = TextAnchor.MiddleLeft;
+				label.style.marginLeft = 3f;
+				//label.style.flexGrow = 1f;
+				label.style.width = 100;
+				element.Add(label);
+			}
+
 			{
 				var label = new Label();
 				label.name = "Label2";
@@ -397,6 +421,10 @@ namespace YooAsset.Editor
 			var label1 = element.Q<Label>("Label1");
 			label1.text = assetInfo.AssetPath;
 
+			// Asset Source
+			var label3 = element.Q<Label>("Label3");
+			label3.text = assetInfo.AssetGUID != "--" ? "Main Asset" : "Builtin Asset";
+
 			// GUID
 			var label2 = element.Q<Label>("Label2");
 			label2.text = assetInfo.AssetGUID;

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a0319abb8eae03b4b88e8f900fe2276c
+guid: 8875000dff445624da4d6a2d6ef2f446
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -12,6 +12,7 @@
     <ui:VisualElement name="BottomGroup" style="height: 200px; border-left-width: 1px; border-right-width: 1px; border-top-width: 1px; border-bottom-width: 1px; border-left-color: rgb(0, 0, 0); border-right-color: rgb(0, 0, 0); border-top-color: rgb(0, 0, 0); border-bottom-color: rgb(0, 0, 0); margin-left: 0; margin-right: 0; margin-top: 1px; margin-bottom: 1px; display: flex;">
         <uie:Toolbar name="BottomBar" style="height: 25px; margin-left: 1px; margin-right: 1px;">
             <uie:ToolbarButton text="Include Assets" display-tooltip-when-elided="true" name="BottomBar1" style="width: 280px; -unity-text-align: middle-left; flex-grow: 1;" />
+            <uie:ToolbarButton text="Asset Source" display-tooltip-when-elided="true" name="BottomBar3" style="width: 100px; -unity-text-align: middle-left;" />
             <uie:ToolbarButton text="GUID" display-tooltip-when-elided="true" name="BottomBar2" style="width: 280px; -unity-text-align: middle-left;" />
         </uie:Toolbar>
         <ui:ListView focusable="true" name="BottomListView" item-height="18" virtualization-method="DynamicHeight" style="flex-grow: 1;" />

Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterBundleListViewer.uxml.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 56d6dbe0d65ce334a8996beb19612989
+guid: cf2a9340bb457594d9bc1f80b84a89f6
 ScriptedImporter:
   internalIDToNameTable: []
   externalObjects: {}

Assets/YooAsset/Editor/EditorTools.cs

@@ -153,7 +153,7 @@ namespace YooAsset.Editor
 				guids = AssetDatabase.FindAssets($"t:{searchType}", searchInFolders);
 
 			// 注意：AssetDatabase.FindAssets()可能会获取到重复的资源
-			List<string> result = new List<string>();
+			HashSet<string> result = new HashSet<string>();
 			for (int i = 0; i < guids.Length; i++)
 			{
 				string guid = guids[i];

Assets/YooAsset/Editor/ShaderVariantCollector/ShaderVariantCollectionManifest.cs

@@ -30,17 +30,22 @@ namespace YooAsset.Editor
 		public class ShaderVariantInfo
 		{
 			/// <summary>
-			/// Shader asset path in editor.
+			/// 着色器资源路径.
 			/// </summary>
 			public string AssetPath;
 
 			/// <summary>
-			/// Shader name.
+			/// 着色器名称
 			/// </summary>
 			public string ShaderName;
 
 			/// <summary>
-			/// Shader variants elements list.
+			/// 着色器变种总数
+			/// </summary>
+			public int ShaderVariantCount = 0;
+
+			/// <summary>
+			/// 着色器变种列表
 			/// </summary>
 			public List<ShaderVariantElement> ShaderVariantElements = new List<ShaderVariantElement>(1000);
 		}
@@ -71,6 +76,7 @@ namespace YooAsset.Editor
 			element.PassType = passType;
 			element.Keywords = keywords;
 			info.ShaderVariantElements.Add(element);
+			info.ShaderVariantCount++;
 		}
 		private ShaderVariantInfo GetOrCreateShaderVariantInfo(string assetPath, string shaderName)
 		{

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

@@ -44,12 +44,16 @@ namespace YooAsset
 			{
 				if (IsValidWithWarning == false)
 					return EOperationStatus.None;
-				if (Provider.Status == ProviderBase.EStatus.Failed)
+
-					return EOperationStatus.Failed;
+				var status = Provider.Status;
-				else if (Provider.Status == ProviderBase.EStatus.Succeed)
+				if (status == ProviderBase.EStatus.None)
-					return EOperationStatus.Succeed;
-				else
 					return EOperationStatus.None;
+				else if (status == ProviderBase.EStatus.Succeed)
+					return EOperationStatus.Succeed;
+				else if (status == ProviderBase.EStatus.Failed)
+					return EOperationStatus.Failed;
+				else
+					return EOperationStatus.Processing;
 			}
 		}
 

Assets/YooAsset/Runtime/CacheSystem/Persistent.cs

@@ -46,7 +46,7 @@ namespace YooAsset
 		}
 		private static string CreateDefaultBuildinRoot()
 		{
-			return PathUtility.Combine(UnityEngine.Application.streamingAssetsPath, YooAssetSettings.DefaultYooFolderName);
+			return PathUtility.Combine(UnityEngine.Application.streamingAssetsPath, YooAssetSettingsData.Setting.DefaultYooFolderName);
 		}
 		private static string CreateDefaultSandboxRoot()
 		{
@@ -54,11 +54,11 @@ namespace YooAsset
 			// 注意：为了方便调试查看，编辑器下把存储目录放到项目里。
 			string projectPath = Path.GetDirectoryName(UnityEngine.Application.dataPath);
 			projectPath = PathUtility.RegularPath(projectPath);
-			return PathUtility.Combine(projectPath, YooAssetSettings.DefaultYooFolderName);
+			return PathUtility.Combine(projectPath, YooAssetSettingsData.Setting.DefaultYooFolderName);
 #elif UNITY_STANDALONE
-			return PathUtility.Combine(UnityEngine.Application.dataPath, YooAssetSettings.DefaultYooFolderName);
+			return PathUtility.Combine(UnityEngine.Application.dataPath, YooAssetSettingsData.Setting.DefaultYooFolderName);
 #else
-			return PathUtility.Combine(UnityEngine.Application.persistentDataPath, YooAssetSettings.DefaultYooFolderName);	
+			return PathUtility.Combine(UnityEngine.Application.persistentDataPath, YooAssetSettingsData.Setting.DefaultYooFolderName);	
 #endif
 		}
 

Assets/YooAsset/Runtime/CacheSystem/VerifyElement.cs

@@ -28,14 +28,13 @@ namespace YooAsset
 
 		public void DeleteFiles()
 		{
-			if (File.Exists(DataFilePath))
+			try
 			{
-				File.Delete(DataFilePath);
+				Directory.Delete(FileRootPath, true);
 			}
-
+			catch (System.Exception e)
-			if (File.Exists(InfoFilePath))
 			{
-				File.Delete(InfoFilePath);
+				YooLogger.Warning($"Failed delete cache bundle folder : {e}");
 			}
 		}
 	}

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

@@ -51,6 +51,9 @@ namespace YooAsset
 			// 准备下载
 			if (_steps == ESteps.PrepareDownload)
 			{
+				// 获取请求地址
+				_requestURL = GetRequestURL();
+
 				// 重置变量
 				_downloadProgress = 0f;
 				_downloadedBytes = 0;
@@ -59,14 +62,16 @@ namespace YooAsset
 				_isAbort = false;
 				_latestDownloadBytes = 0;
 				_latestDownloadRealtime = Time.realtimeSinceStartup;
+
+				// 重置计时器
+				if(_tryAgainTimer > 0f)
+					YooLogger.Warning($"Try again download : {_requestURL}");
 				_tryAgainTimer = 0f;
 
 				// 删除临时文件
 				if (File.Exists(_tempFilePath))
 					File.Delete(_tempFilePath);
 
-				// 获取请求地址
-				_requestURL = GetRequestURL();
 				_steps = ESteps.CreateDownloader;
 			}
 
@@ -197,7 +202,6 @@ namespace YooAsset
 					_failedTryAgain--;
 					_steps = ESteps.PrepareDownload;
 					ReportWarning();
-					YooLogger.Warning($"Try again download : {_requestURL}");
 				}
 			}
 		}

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

@@ -91,6 +91,9 @@ namespace YooAsset
 			// 创建下载器
 			if (_steps == ESteps.PrepareDownload)
 			{
+				// 获取请求地址
+				_requestURL = GetRequestURL();
+
 				// 重置变量
 				_downloadProgress = 0f;
 				_downloadedBytes = 0;
@@ -99,11 +102,13 @@ namespace YooAsset
 				_isAbort = false;
 				_latestDownloadBytes = 0;
 				_latestDownloadRealtime = Time.realtimeSinceStartup;
-				_tryAgainTimer = 0f;
 				_fileOriginLength = 0;
 
-				// 获取请求地址
+				// 重置计时器
-				_requestURL = GetRequestURL();
+				if (_tryAgainTimer > 0f)
+					YooLogger.Warning($"Try again download : {_requestURL}");
+				_tryAgainTimer = 0f;
+
 				_steps = ESteps.CreateDownloader;
 			}
 
@@ -257,7 +262,6 @@ namespace YooAsset
 					_failedTryAgain--;
 					_steps = ESteps.PrepareDownload;
 					ReportWarning();
-					YooLogger.Warning($"Try again download : {_requestURL}");
 				}
 			}
 		}

Assets/YooAsset/Runtime/DownloadSystem/RequestHelper.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset
+{
+	public class RequestHelper
+	{
+		/// <summary>
+		/// 记录网络请求失败事件的次数
+		/// </summary>
+		private static readonly Dictionary<string, int> _requestFailedRecorder = new Dictionary<string, int>(1000);
+
+		/// <summary>
+		/// 记录请求失败事件
+		/// </summary>
+		public static void RecordRequestFailed(string packageName, string eventName)
+		{
+			string key = $"{packageName}_{eventName}";
+			if (_requestFailedRecorder.ContainsKey(key) == false)
+				_requestFailedRecorder.Add(key, 0);
+			_requestFailedRecorder[key]++;
+		}
+
+		/// <summary>
+		/// 获取请求失败的次数
+		/// </summary>
+		public static int GetRequestFailedCount(string packageName, string eventName)
+		{
+			string key = $"{packageName}_{eventName}";
+			if (_requestFailedRecorder.ContainsKey(key) == false)
+				_requestFailedRecorder.Add(key, 0);
+			return _requestFailedRecorder[key];
+		}
+	}
+}

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

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

Assets/YooAsset/Runtime/InitializeParameters.cs

@@ -88,7 +88,12 @@ namespace YooAsset
 		/// <summary>
 		/// 内置资源查询服务接口
 		/// </summary>
-		public IQueryServices QueryServices = null;
+		public IBuildinQueryServices BuildinQueryServices = null;
+
+		/// <summary>
+		/// 分发资源查询服务接口
+		/// </summary>
+		public IDeliveryQueryServices DeliveryQueryServices = null;
 
 		/// <summary>
 		/// 远端资源地址查询服务类
@@ -104,7 +109,7 @@ namespace YooAsset
 		/// <summary>
 		/// 内置资源查询服务接口
 		/// </summary>
-		public IQueryServices QueryServices = null;
+		public IBuildinQueryServices BuildinQueryServices = null;
 
 		/// <summary>
 		/// 远端资源地址查询服务类

Assets/YooAsset/Runtime/OperationSystem/AsyncOperationBase.cs

@@ -73,13 +73,18 @@ namespace YooAsset
 
 		internal abstract void Start();
 		internal abstract void Update();
-		internal void Finish()
+
+		internal void SetFinish()
 		{
 			Progress = 1f;
-			_callback?.Invoke(this);
+			_callback?.Invoke(this); //注意：如果完成回调内发生异常，会导致Task无限期等待
 			if (_taskCompletionSource != null)
 				_taskCompletionSource.TrySetResult(null);
 		}
+		internal void SetStart()
+		{
+			Status = EOperationStatus.Processing;
+		}
 
 		/// <summary>
 		/// 清空完成回调

Assets/YooAsset/Runtime/OperationSystem/EOperationStatus.cs

@@ -4,6 +4,7 @@ namespace YooAsset
 	public enum EOperationStatus
 	{
 		None,
+		Processing,
 		Succeed,
 		Failed
 	}

Assets/YooAsset/Runtime/OperationSystem/OperationSystem.cs

@@ -7,8 +7,7 @@ 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> _newList = new List<AsyncOperationBase>(100);
-		private static readonly List<AsyncOperationBase> _removeList = new List<AsyncOperationBase>(100);
 
 		// 计时器相关
 		private static Stopwatch _watch;
@@ -47,39 +46,26 @@ namespace YooAsset
 			_frameTime = _watch.ElapsedMilliseconds;
 
 			// 添加新的异步操作
-			if (_addList.Count > 0)
+			if (_newList.Count > 0)
 			{
-				for (int i = 0; i < _addList.Count; i++)
+				_operations.AddRange(_newList);
-				{
+				_newList.Clear();
-					var operation = _addList[i];
-					_operations.Add(operation);
-				}
-				_addList.Clear();
 			}
 
 			// 更新所有的异步操作
-			foreach (var operation in _operations)
+			for (int i = _operations.Count - 1; i >= 0; i--)
 			{
 				if (IsBusy)
 					break;
 
+				var operation = _operations[i];
 				operation.Update();
 				if (operation.IsDone)
 				{
-					_removeList.Add(operation);
+					_operations.RemoveAt(i);
-					operation.Finish();
+					operation.SetFinish(); //注意：如果业务端发生异常，保证异步操作提前移除。
 				}
 			}
-
-			// 移除已经完成的异步操作
-			if (_removeList.Count > 0)
-			{
-				foreach (var operation in _removeList)
-				{
-					_operations.Remove(operation);
-				}
-				_removeList.Clear();
-			}
 		}
 
 		/// <summary>
@@ -88,8 +74,7 @@ namespace YooAsset
 		public static void DestroyAll()
 		{
 			_operations.Clear();
-			_addList.Clear();
+			_newList.Clear();
-			_removeList.Clear();
 			_watch = null;
 			_frameTime = 0;
 			MaxTimeSlice = long.MaxValue;
@@ -100,7 +85,8 @@ namespace YooAsset
 		/// </summary>
 		public static void StartOperation(AsyncOperationBase operation)
 		{
-			_addList.Add(operation);
+			_newList.Add(operation);
+			operation.SetStart();
 			operation.Start();
 		}
 	}

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

@@ -97,7 +97,7 @@ namespace YooAsset
 					Manifest.AssetDic = new Dictionary<string, PackageAsset>(_packageAssetCount);
 
 					if (Manifest.EnableAddressable)
-						Manifest.AssetPathMapping1 = new Dictionary<string, string>(_packageAssetCount);
+						Manifest.AssetPathMapping1 = new Dictionary<string, string>(_packageAssetCount * 3);
 					else
 						Manifest.AssetPathMapping1 = new Dictionary<string, string>(_packageAssetCount * 2);
 
@@ -130,15 +130,6 @@ namespace YooAsset
 							Manifest.AssetDic.Add(assetPath, packageAsset);
 
 						// 填充AssetPathMapping1
-						if (Manifest.EnableAddressable)
-						{
-							string location = packageAsset.Address;
-							if (Manifest.AssetPathMapping1.ContainsKey(location))
-								throw new System.Exception($"Address have existed : {location}");
-							else
-								Manifest.AssetPathMapping1.Add(location, packageAsset.AssetPath);
-						}
-						else
 						{
 							string location = packageAsset.AssetPath;
 							if (Manifest.LocationToLower)
@@ -146,7 +137,7 @@ namespace YooAsset
 
 							// 添加原生路径的映射
 							if (Manifest.AssetPathMapping1.ContainsKey(location))
-								throw new System.Exception($"AssetPath have existed : {location}");
+								throw new System.Exception($"Location have existed : {location}");
 							else
 								Manifest.AssetPathMapping1.Add(location, packageAsset.AssetPath);
 
@@ -155,11 +146,22 @@ namespace YooAsset
 							{
 								string locationWithoutExtension = PathUtility.RemoveExtension(location);
 								if (Manifest.AssetPathMapping1.ContainsKey(locationWithoutExtension))
-									YooLogger.Warning($"AssetPath have existed : {locationWithoutExtension}");
+									YooLogger.Warning($"Location have existed : {locationWithoutExtension}");
 								else
 									Manifest.AssetPathMapping1.Add(locationWithoutExtension, packageAsset.AssetPath);
 							}
 						}
+						if (Manifest.EnableAddressable)
+						{
+							string location = packageAsset.Address;
+							if (string.IsNullOrEmpty(location) == false)
+							{
+								if (Manifest.AssetPathMapping1.ContainsKey(location))
+									throw new System.Exception($"Location have existed : {location}");
+								else
+									Manifest.AssetPathMapping1.Add(location, packageAsset.AssetPath);
+							}
+						}
 
 						// 填充AssetPathMapping2
 						if (Manifest.IncludeAssetGUID)
@@ -209,6 +211,10 @@ namespace YooAsset
 						packageBundle.ParseBundle(Manifest.PackageName, Manifest.OutputNameStyle);
 						Manifest.BundleDic.Add(packageBundle.BundleName, packageBundle);
 
+						// 注意：原始文件可能存在相同的CacheGUID
+						if (Manifest.CacheGUIDs.Contains(packageBundle.CacheGUID) == false)
+							Manifest.CacheGUIDs.Add(packageBundle.CacheGUID);
+
 						_packageBundleCount--;
 						Progress = 1f - _packageBundleCount / _progressTotalValue;
 						if (OperationSystem.IsBusy)

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

@@ -11,7 +11,6 @@ namespace YooAsset
 			Done,
 		}
 	
-		private static int RequestCount = 0;
 		private readonly IRemoteServices _remoteServices;
 		private readonly string _packageName;
 		private readonly string _packageVersion;
@@ -19,6 +18,7 @@ namespace YooAsset
 		private UnityWebFileRequester _downloader1;
 		private UnityWebFileRequester _downloader2;
 		private ESteps _steps = ESteps.None;
+		private int _requestCount = 0;
 
 		internal DownloadManifestOperation(IRemoteServices remoteServices, string packageName, string packageVersion, int timeout)
 		{
@@ -29,7 +29,7 @@ namespace YooAsset
 		}
 		internal override void Start()
 		{
-			RequestCount++;
+			_requestCount = RequestHelper.GetRequestFailedCount(_packageName, nameof(DownloadManifestOperation));
 			_steps = ESteps.DownloadPackageHashFile;
 		}
 		internal override void Update()
@@ -58,6 +58,7 @@ namespace YooAsset
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Failed;
 					Error = _downloader1.GetError();
+					RequestHelper.RecordRequestFailed(_packageName, nameof(DownloadManifestOperation));
 				}
 				else
 				{
@@ -88,6 +89,7 @@ namespace YooAsset
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Failed;
 					Error = _downloader2.GetError();
+					RequestHelper.RecordRequestFailed(_packageName, nameof(DownloadManifestOperation));
 				}
 				else
 				{
@@ -102,10 +104,10 @@ namespace YooAsset
 		private string GetDownloadRequestURL(string fileName)
 		{
 			// 轮流返回请求地址
-			if (RequestCount % 2 == 0)
+			if (_requestCount % 2 == 0)
-				return _remoteServices.GetRemoteFallbackURL(fileName);
-			else
 				return _remoteServices.GetRemoteMainURL(fileName);
+			else
+				return _remoteServices.GetRemoteFallbackURL(fileName);
 		}
 	}
 }

Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/LoadRemoteManifestOperation.cs

@@ -13,7 +13,6 @@ namespace YooAsset
 			Done,
 		}
 
-		private static int RequestCount = 0;
 		private readonly IRemoteServices _remoteServices;
 		private readonly string _packageName;
 		private readonly string _packageVersion;
@@ -23,6 +22,7 @@ namespace YooAsset
 		private DeserializeManifestOperation _deserializer;
 		private byte[] _fileData;
 		private ESteps _steps = ESteps.None;
+		private int _requestCount = 0;
 
 		/// <summary>
 		/// 加载的清单实例
@@ -39,7 +39,7 @@ namespace YooAsset
 		}
 		internal override void Start()
 		{
-			RequestCount++;
+			_requestCount = RequestHelper.GetRequestFailedCount(_packageName, nameof(LoadRemoteManifestOperation));
 			_steps = ESteps.DownloadPackageHashFile;
 		}
 		internal override void Update()
@@ -90,6 +90,7 @@ namespace YooAsset
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Failed;
 					Error = _downloader.GetError();
+					RequestHelper.RecordRequestFailed(_packageName, nameof(LoadRemoteManifestOperation));
 				}
 				else
 				{
@@ -141,10 +142,10 @@ namespace YooAsset
 		private string GetDownloadRequestURL(string fileName)
 		{
 			// 轮流返回请求地址
-			if (RequestCount % 2 == 0)
+			if (_requestCount % 2 == 0)
-				return _remoteServices.GetRemoteFallbackURL(fileName);
-			else
 				return _remoteServices.GetRemoteMainURL(fileName);
+			else
+				return _remoteServices.GetRemoteFallbackURL(fileName);
 		}
 	}
 }

Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/QueryRemotePackageHashOperation.cs

@@ -10,13 +10,13 @@ namespace YooAsset
 			Done,
 		}
 		
-		private static int RequestCount = 0;
 		private readonly IRemoteServices _remoteServices;
 		private readonly string _packageName;
 		private readonly string _packageVersion;
 		private readonly int _timeout;
 		private UnityWebDataRequester _downloader;
 		private ESteps _steps = ESteps.None;
+		private int _requestCount = 0;
 
 		/// <summary>
 		/// 包裹哈希值
@@ -33,7 +33,7 @@ namespace YooAsset
 		}
 		internal override void Start()
 		{
-			RequestCount++;
+			_requestCount = RequestHelper.GetRequestFailedCount(_packageName, nameof(QueryRemotePackageHashOperation));
 			_steps = ESteps.DownloadPackageHash;
 		}
 		internal override void Update()
@@ -62,6 +62,7 @@ namespace YooAsset
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Failed;
 					Error = _downloader.GetError();
+					RequestHelper.RecordRequestFailed(_packageName, nameof(QueryRemotePackageHashOperation));
 				}
 				else
 				{
@@ -88,10 +89,10 @@ namespace YooAsset
 			string url;
 
 			// 轮流返回请求地址
-			if (RequestCount % 2 == 0)
+			if (_requestCount % 2 == 0)
-				url = _remoteServices.GetRemoteFallbackURL(fileName);
-			else
 				url = _remoteServices.GetRemoteMainURL(fileName);
+			else
+				url = _remoteServices.GetRemoteFallbackURL(fileName);
 
 			return url;
 		}

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

@@ -10,13 +10,13 @@ namespace YooAsset
 			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;
+		private int _requestCount = 0;
 
 		/// <summary>
 		/// 包裹版本
@@ -33,7 +33,7 @@ namespace YooAsset
 		}
 		internal override void Start()
 		{
-			RequestCount++;
+			_requestCount = RequestHelper.GetRequestFailedCount(_packageName, nameof(QueryRemotePackageVersionOperation));
 			_steps = ESteps.DownloadPackageVersion;
 		}
 		internal override void Update()
@@ -62,6 +62,7 @@ namespace YooAsset
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Failed;
 					Error = _downloader.GetError();
+					RequestHelper.RecordRequestFailed(_packageName, nameof(QueryRemotePackageVersionOperation));
 				}
 				else
 				{
@@ -88,10 +89,10 @@ namespace YooAsset
 			string url;
 
 			// 轮流返回请求地址
-			if (RequestCount % 2 == 0)
+			if (_requestCount % 2 == 0)
-				url = _remoteServices.GetRemoteFallbackURL(fileName);
-			else
 				url = _remoteServices.GetRemoteMainURL(fileName);
+			else
+				url = _remoteServices.GetRemoteFallbackURL(fileName);
 
 			// 在URL末尾添加时间戳
 			if (_appendTimeTicks)

Assets/YooAsset/Runtime/PackageSystem/PackageManifest.cs

@@ -82,6 +82,12 @@ namespace YooAsset
 		[NonSerialized]
 		public Dictionary<string, string> AssetPathMapping2;
 
+		/// <summary>
+		/// 该资源清单所有文件的缓存GUID集合
+		/// </summary>
+		[NonSerialized]
+		public HashSet<string> CacheGUIDs = new HashSet<string>();
+
 
 		/// <summary>
 		/// 尝试映射为资源路径
@@ -191,12 +197,7 @@ namespace YooAsset
 		/// </summary>
 		public bool IsIncludeBundleFile(string cacheGUID)
 		{
-			foreach (var packageBundle in BundleList)
+			return CacheGUIDs.Contains(cacheGUID);
-			{
-				if (packageBundle.CacheGUID == cacheGUID)
-					return true;
-			}
-			return false;
 		}
 
 		/// <summary>

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

@@ -10,7 +10,8 @@ namespace YooAsset
 
 		// 参数相关
 		private string _packageName;
-		private IQueryServices _queryServices;
+		private IBuildinQueryServices _buildinQueryServices;
+		private IDeliveryQueryServices _deliveryQueryServices;
 		private IRemoteServices _remoteServices;
 
 		public IRemoteServices RemoteServices
@@ -21,10 +22,11 @@ namespace YooAsset
 		/// <summary>
 		/// 异步初始化
 		/// </summary>
-		public InitializationOperation InitializeAsync(string packageName, IQueryServices queryServices, IRemoteServices remoteServices)
+		public InitializationOperation InitializeAsync(string packageName, IBuildinQueryServices buildinQueryServices, IDeliveryQueryServices deliveryQueryServices, IRemoteServices remoteServices)
 		{
 			_packageName = packageName;
-			_queryServices = queryServices;
+			_buildinQueryServices = buildinQueryServices;
+			_deliveryQueryServices = deliveryQueryServices;
 			_remoteServices = remoteServices;
 
 			var operation = new HostPlayModeInitializationOperation(this, packageName);
@@ -54,7 +56,7 @@ namespace YooAsset
 		// 查询相关
 		private bool IsBuildinPackageBundle(PackageBundle packageBundle)
 		{
-			return _queryServices.QueryStreamingAssets(_packageName, packageBundle.FileName);
+			return _buildinQueryServices.QueryStreamingAssets(_packageName, packageBundle.FileName);
 		}
 		private bool IsCachedPackageBundle(PackageBundle packageBundle)
 		{
@@ -62,11 +64,11 @@ namespace YooAsset
 		}
 		private bool IsDeliveryPackageBundle(PackageBundle packageBundle)
 		{
-			return _queryServices.QueryDeliveryFiles(_packageName, packageBundle.FileName);
+			return _deliveryQueryServices.QueryDeliveryFiles(_packageName, packageBundle.FileName);
 		}
 		private DeliveryFileInfo GetDeiveryFileInfo(PackageBundle packageBundle)
 		{
-			return _queryServices.GetDeliveryFileInfo(_packageName, packageBundle.FileName);
+			return _deliveryQueryServices.GetDeliveryFileInfo(_packageName, packageBundle.FileName);
 		}
 
 		#region IPlayModeServices接口

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

@@ -10,7 +10,7 @@ namespace YooAsset
 
 		// 参数相关
 		private string _packageName;
-		private IQueryServices _queryServices;
+		private IBuildinQueryServices _buildinQueryServices;
 		private IRemoteServices _remoteServices;
 
 		public IRemoteServices RemoteServices
@@ -21,10 +21,10 @@ namespace YooAsset
 		/// <summary>
 		/// 异步初始化
 		/// </summary>
-		public InitializationOperation InitializeAsync(string packageName, IQueryServices queryServices, IRemoteServices remoteServices)
+		public InitializationOperation InitializeAsync(string packageName, IBuildinQueryServices buildinQueryServices, IRemoteServices remoteServices)
 		{
 			_packageName = packageName;
-			_queryServices = queryServices;
+			_buildinQueryServices = buildinQueryServices;
 			_remoteServices = remoteServices;
 
 			var operation = new WebPlayModeInitializationOperation(this, packageName);
@@ -44,7 +44,7 @@ namespace YooAsset
 		// 查询相关
 		private bool IsBuildinPackageBundle(PackageBundle packageBundle)
 		{
-			return _queryServices.QueryStreamingAssets(_packageName, packageBundle.FileName);
+			return _buildinQueryServices.QueryStreamingAssets(_packageName, packageBundle.FileName);
 		}
 
 		#region IPlayModeServices接口

Assets/YooAsset/Runtime/PackageSystem/ResourcePackage.cs

@@ -122,7 +122,8 @@ namespace YooAsset
 				var initializeParameters = parameters as HostPlayModeParameters;
 				initializeOperation = hostPlayModeImpl.InitializeAsync(
 					PackageName,
-					initializeParameters.QueryServices,
+					initializeParameters.BuildinQueryServices,
+					initializeParameters.DeliveryQueryServices,
 					initializeParameters.RemoteServices
 					);
 			}
@@ -138,7 +139,7 @@ namespace YooAsset
 				var initializeParameters = parameters as WebPlayModeParameters;
 				initializeOperation = webPlayModeImpl.InitializeAsync(
 					PackageName,
-					initializeParameters.QueryServices,
+					initializeParameters.BuildinQueryServices,
 					initializeParameters.RemoteServices
 					);
 			}
@@ -187,8 +188,10 @@ namespace YooAsset
 			if (parameters is HostPlayModeParameters)
 			{
 				var hostPlayModeParameters = parameters as HostPlayModeParameters;
-				if (hostPlayModeParameters.QueryServices == null)
+				if (hostPlayModeParameters.BuildinQueryServices == null)
-					throw new Exception($"{nameof(IQueryServices)} is null.");
+					throw new Exception($"{nameof(IBuildinQueryServices)} is null.");
+				if (hostPlayModeParameters.DeliveryQueryServices == null)
+					throw new Exception($"{nameof(IDeliveryQueryServices)} is null.");
 				if (hostPlayModeParameters.RemoteServices == null)
 					throw new Exception($"{nameof(IRemoteServices)} is null.");
 			}
@@ -365,17 +368,7 @@ namespace YooAsset
 		{
 			DebugCheckInitialize();
 			AssetInfo assetInfo = ConvertLocationToAssetInfo(location, null);
-			if (assetInfo.IsInvalid)
+			return IsNeedDownloadFromRemoteInternal(assetInfo);
-			{
-				YooLogger.Warning(assetInfo.Error);
-				return false;
-			}
-
-			BundleInfo bundleInfo = _bundleServices.GetBundleInfo(assetInfo);
-			if (bundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromRemote)
-				return true;
-			else
-				return false;
 		}
 
 		/// <summary>
@@ -385,17 +378,7 @@ namespace YooAsset
 		public bool IsNeedDownloadFromRemote(AssetInfo assetInfo)
 		{
 			DebugCheckInitialize();
-			if (assetInfo.IsInvalid)
+			return IsNeedDownloadFromRemoteInternal(assetInfo);
-			{
-				YooLogger.Warning(assetInfo.Error);
-				return false;
-			}
-
-			BundleInfo bundleInfo = _bundleServices.GetBundleInfo(assetInfo);
-			if (bundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromRemote)
-				return true;
-			else
-				return false;
 		}
 
 		/// <summary>
@@ -449,6 +432,28 @@ namespace YooAsset
 			string assetPath = _playModeServices.ActiveManifest.TryMappingToAssetPath(location);
 			return string.IsNullOrEmpty(assetPath) == false;
 		}
+
+		private bool IsNeedDownloadFromRemoteInternal(AssetInfo assetInfo)
+		{
+			if (assetInfo.IsInvalid)
+			{
+				YooLogger.Warning(assetInfo.Error);
+				return false;
+			}
+
+			BundleInfo bundleInfo = _bundleServices.GetBundleInfo(assetInfo);
+			if (bundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromRemote)
+				return true;
+
+			BundleInfo[] depends = _bundleServices.GetAllDependBundleInfos(assetInfo);
+			foreach (var depend in depends)
+			{
+				if (depend.LoadMode == BundleInfo.ELoadMode.LoadFromRemote)
+					return true;
+			}
+
+			return false;
+		}
 		#endregion
 
 		#region 原生文件

Assets/YooAsset/Runtime/Services/IBuildinQueryServices.cs

@@ -0,0 +1,11 @@
+
+namespace YooAsset
+{
+	public interface IBuildinQueryServices
+	{
+		/// <summary>
+		/// 查询应用程序里的内置资源是否存在
+		/// </summary>
+		bool QueryStreamingAssets(string packageName, string fileName);
+	}
+}

Assets/YooAsset/Runtime/Services/IDeliveryQueryServices.cs

@@ -10,13 +10,8 @@ namespace YooAsset
 		public ulong DeliveryFileOffset;
 	}
 	
-	public interface IQueryServices
+	public interface IDeliveryQueryServices
 	{
-		/// <summary>
-		/// 查询应用程序里的内置资源是否存在
-		/// </summary>
-		bool QueryStreamingAssets(string packageName, string fileName);
-
 		/// <summary>
 		/// 查询是否为开发者分发的资源
 		/// </summary>

Assets/YooAsset/Runtime/Services/IDeliveryQueryServices.cs.meta

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

Assets/YooAsset/Runtime/Settings/YooAssetSettings.cs

@@ -10,6 +10,10 @@ namespace YooAsset
 		/// </summary>
 		public string ManifestFileName = "PackageManifest";
 
+		/// <summary>
+		/// 默认的YooAsset文件夹名称
+		/// </summary>
+		public string DefaultYooFolderName = "yoo";
 
 		/// <summary>
 		/// 清单文件头标记
@@ -37,11 +41,6 @@ namespace YooAsset
 		/// </summary>
 		public const string CacheBundleInfoFileName = "__info";
 
-		/// <summary>
-		/// 默认的YooAsset文件夹名称
-		/// </summary>
-		public const string DefaultYooFolderName = "yoo";
-
 		/// <summary>
 		/// 缓存的资源文件的文件夹名称
 		/// </summary>

Assets/YooAsset/Runtime/YooAsset.asmdef

@@ -1,5 +1,6 @@
 {
     "name": "YooAsset",
+    "rootNamespace": "",
     "references": [],
     "includePlatforms": [],
     "excludePlatforms": [],

Assets/YooAsset/Samples~/Space Shooter/GameScript/Runtime/PatchLogic/FsmNode/FsmInitialize.cs

@@ -69,19 +69,20 @@ internal class FsmInitialize : IStateNode
 			string fallbackHostServer = GetHostServerURL();
 			var createParameters = new HostPlayModeParameters();
 			createParameters.DecryptionServices = new GameDecryptionServices();
-			createParameters.QueryServices = new GameQueryServices();
+			createParameters.BuildinQueryServices = new GameQueryServices();
+			createParameters.DeliveryQueryServices = new DefaultDeliveryQueryServices();
 			createParameters.RemoteServices = new RemoteServices(defaultHostServer, fallbackHostServer);
 			initializationOperation = package.InitializeAsync(createParameters);
 		}
 
 		// WebGL运行模式
-		if(playMode == EPlayMode.WebPlayMode)
+		if (playMode == EPlayMode.WebPlayMode)
 		{
 			string defaultHostServer = GetHostServerURL();
 			string fallbackHostServer = GetHostServerURL();
 			var createParameters = new WebPlayModeParameters();
 			createParameters.DecryptionServices = new GameDecryptionServices();
-			createParameters.QueryServices = new GameQueryServices();
+			createParameters.BuildinQueryServices = new GameQueryServices();
 			createParameters.RemoteServices = new RemoteServices(defaultHostServer, fallbackHostServer);
 			initializationOperation = package.InitializeAsync(createParameters);
 		}
@@ -178,4 +179,19 @@ internal class FsmInitialize : IStateNode
 			return 1024;
 		}
 	}
+
+	/// <summary>
+	/// 默认的分发资源查询服务类
+	/// </summary>
+	private class DefaultDeliveryQueryServices : IDeliveryQueryServices
+	{
+		public DeliveryFileInfo GetDeliveryFileInfo(string packageName, string fileName)
+		{
+			throw new NotImplementedException();
+		}
+		public bool QueryDeliveryFiles(string packageName, string fileName)
+		{
+			return false;
+		}
+	}
 }

Assets/YooAsset/Samples~/Space Shooter/ThirdParty/StreamingAssetsHelper/StreamingAssetsHelper.cs

@@ -6,18 +6,8 @@ using YooAsset;
 /// <summary>
 /// 资源文件查询服务类
 /// </summary>
-public class GameQueryServices : IQueryServices
+public class GameQueryServices : IBuildinQueryServices
 {
-	public DeliveryFileInfo GetDeliveryFileInfo(string packageName, string fileName)
-	{
-		throw new System.NotImplementedException();
-	}
-
-	public bool QueryDeliveryFiles(string packageName, string fileName)
-	{
-		return false;
-	}
-
 	public bool QueryStreamingAssets(string packageName, string fileName)
 	{
 		// 注意：fileName包含文件格式

Assets/YooAsset/Samples~/Space Shooter/ThirdParty/StreamingAssetsHelper/StreamingAssetsHelper2.cs

@@ -9,18 +9,8 @@ using YooAsset;
 /// <summary>
 /// 资源文件查询服务类
 /// </summary>
-public class GameQueryServices2 : IQueryServices
+public class GameQueryServices2 : IBuildinQueryServices
 {
-	public DeliveryFileInfo GetDeliveryFileInfo(string packageName, string fileName)
-	{
-		throw new System.NotImplementedException();
-	}
-
-	public bool QueryDeliveryFiles(string packageName, string fileName)
-	{
-		return false;
-	}
-
 	public bool QueryStreamingAssets(string packageName, string fileName)
 	{
 		return StreamingAssetsHelper2.FileExists($"{StreamingAssetsDefine.RootFolderName}/{packageName}/{fileName}");

Assets/YooAsset/package.json

@@ -1,7 +1,7 @@
 {
     "name": "com.tuyoogame.yooasset",
     "displayName": "YooAsset",
-    "version": "1.5.3-preview",
+    "version": "1.5.6-preview",
     "unity": "2019.4",
     "description": "unity3d resources management system.",
     "author": {