.gitignore

@@ -10,23 +10,8 @@
 /[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,347 +2,6 @@
 
 All notable changes to this package will be documented in this file.
 
-## [1.5.7] - 2023-10-07
-
-### Changed
-
-- WebGL平台支持创建下载器。
-
-## [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
-
-- 修复了Unity2020以下版本的编辑器提示找不到"autoLoadAssetBundle"的编译错误。
-
-### Added
-
-- 新增了支持开发者分发资源的功能。
-
-  ```c#
-  public interface IQueryServices
-  {
-      /// <summary>
-      /// 查询应用程序里的内置资源是否存在
-      /// </summary>
-      bool QueryStreamingAssets(string packageName, string fileName);
-  
-      /// <summary>
-      /// 查询是否为开发者分发的资源
-      /// </summary>
-      bool QueryDeliveryFiles(string packageName, string fileName);
-  
-      /// <summary>
-      /// 获取开发者分发的资源信息
-      /// </summary>
-      DeliveryFileInfo GetDeliveryFileInfo(string packageName, string fileName);
-  }
-  ```
-
-### Changed
-
-- 针对资源清单更新方法传入参数的合法性检测。
-- 编辑器下针对激活的资源清单有效性的检测。
-
-## [1.5.2-preview] - 2023-07-18
-
-重新设计了对WebGL平台的支持，新增加了专属模式：WebPlayMode
-
-## [1.5.1] - 2023-07-12
-
-### Fixed
-
-- 修复了太空战机DEMO在生成内置文件清单的时候，目录不存在引发的异常。
-- 修复了在销毁Package时，如果存在正在加载的bundle，会导致后续加载该bundle报错的问题。
-
-### Changed
-
-- 真机上使用错误方法加载原生文件的时候给予正确的错误提示。
-
-### Added
-
-- 新增了HostPlayModeParameters.RemoteServices字段
-
-  ```c#
-  /// <summary>
-  /// 远端资源地址查询服务类
-  /// </summary>
-  public IRemoteServices RemoteServices = null;
-  ```
-
-### Removed
-
-- 移除了HostPlayModeParameters.DefaultHostServer字段
-- 移除了HostPlayModeParameters.FallbackHostServer字段
-
-## [1.5.0] - 2023-07-05
-
-该版本重构了Persistent类，导致沙盒目录和内置目录的存储结构发生了变化。
-
-该版本支持按照Package自定义沙盒存储目录和内置存储目录。
-
-**注意：低版本升级用户，请使用Space Shooter目录下的StreamingAssetsHelper插件覆盖到本地工程！**
-
-### Changed
-
-- BuildParameters.OutputRoot重命名为BuildOutputRoot
-- 变更了IQueryServices.QueryStreamingAssets(string packageName, string fileName)方法
-
-### Added
-
-- 新增了YooAssets.SetCacheSystemDisableCacheOnWebGL()方法
-
-  ```c#
-  /// <summary>
-  /// 设置缓存系统参数，禁用缓存在WebGL平台
-  /// </summary>
-  public static void SetCacheSystemDisableCacheOnWebGL()
-  ```
-
-- 新增了YooAssets.SetDownloadSystemRedirectLimit()方法
-
-  ```c#
-  /// <summary>
-  /// 设置下载系统参数，网络重定向次数（Unity引擎默认值32）
-  /// 注意：不支持设置为负值
-  /// </summary>
-  public static void SetDownloadSystemRedirectLimit(int redirectLimit)
-  ```
-
-- 新增了构建流程可扩展的方法。
-
-  ```c#
-  public class AssetBundleBuilder
-  {
-      /// <summary>
-      /// 构建资源包
-      /// </summary>
-      public BuildResult Run(BuildParameters buildParameters, List<IBuildTask> buildPipeline)
-  }
-  ```
-
-- 新增了BuildParameters.StreamingAssetsRoot字段
-
-  ```c#
-  public class BuildParameters
-  {
-      /// <summary>
-      /// 内置资源的根目录
-      /// </summary>
-      public string StreamingAssetsRoot;
-  }
-  ```
-
-- 新增了InitializeParameters.BuildinRootDirectory字段
-
-  ```c#
-  /// <summary>
-  /// 内置文件的根路径
-  /// 注意：当参数为空的时候会使用默认的根目录。
-  /// </summary>
-  public string BuildinRootDirectory = string.Empty;
-  ```
-
-- 新增了InitializeParameters.SandboxRootDirectory字段
-
-  ```c#
-  /// <summary>
-  /// 沙盒文件的根路径
-  /// 注意：当参数为空的时候会使用默认的根目录。
-  /// </summary>
-  public string SandboxRootDirectory = string.Empty;
-  ```
-
-- 新增了ResourcePackage.GetPackageBuildinRootDirectory()方法
-
-  ```c#
-  /// <summary>
-  /// 获取包裹的内置文件根路径
-  /// </summary>
-  public string GetPackageBuildinRootDirectory()
-  ```
-
-- 新增了ResourcePackage.GetPackageSandboxRootDirectory()方法
-
-  ```c#
-  /// <summary>
-  /// 获取包裹的沙盒文件根路径
-  /// </summary>
-  public string GetPackageSandboxRootDirectory()
-  ```
-
-- 新增了ResourcePackage.ClearPackageSandbox()方法
-
-  ```c#
-  /// <summary>
-  /// 清空包裹的沙盒目录
-  /// </summary>
-  public void ClearPackageSandbox()
-  ```
-
-### Removed
-
-- 移除了资源包构建流程任务节点可扩展功能。
-- 移除了YooAssets.SetCacheSystemSandboxPath()方法
-- 移除了YooAssets.GetStreamingAssetBuildinFolderName()方法
-- 移除了YooAssets.GetSandboxRoot()方法
-- 移除了YooAssets.ClearSandbox()方法
-
-## [1.4.17] - 2023-06-27
-
-### Changed
-
-- 优化了缓存的信息文件写入方式
-
-- 离线模式支持内置资源解压到沙盒
-
-- 资源包构建流程任务节点支持可扩展
-
-  ```c#
-  using YooAsset.Editor
-  
-  [TaskAttribute(ETaskPipeline.AllPipeline, 100, "自定义任务节点")]
-  public class CustomTask : IBuildTask
-  ```
-
-- 资源收集界面增加了LocationToLower选项
-
-- 资源收集界面增加了IncludeAssetGUID选项
-
-- IShareAssetPackRule 重命名为 ISharedPackRule
-
-### Added
-
-- 新增了ResourcePackage.LoadAllAssetsAsync方法
-
-  ```c#
-  /// <summary>
-  /// 异步加载资源包内所有资源对象
-  /// </summary>
-  /// <param name="assetInfo">资源信息</param>
-  public AllAssetsOperationHandle LoadAllAssetsAsync(AssetInfo assetInfo)
-  ```
-
-- 新增了ResourcePackage.GetAssetInfoByGUID()方法
-
-  ```c#
-  /// <summary>
-  /// 获取资源信息
-  /// </summary>
-  /// <param name="assetGUID">资源GUID</param>
-  public AssetInfo GetAssetInfoByGUID(string assetGUID)
-  ```
-
-- 新增了场景加载参数suspendLoad
-
-  ```c#
-  /// <summary>
-  /// 异步加载场景
-  /// </summary>
-  /// <param name="location">场景的定位地址</param>
-  /// <param name="sceneMode">场景加载模式</param>
-  /// <param name="suspendLoad">场景加载到90%自动挂起</param>
-  /// <param name="priority">优先级</param>
-  public SceneOperationHandle LoadSceneAsync(string location, LoadSceneMode sceneMode = LoadSceneMode.Single, bool suspendLoad = false, int priority = 100)
-  ```
-
-- Extension Sample 增加了GameObjectAssetReference示例脚本
-
-- 新增加了ZeroRedundancySharedPackRule类（零冗余的共享资源打包规则）
-
-- 新增加了FullRedundancySharedPackRule类（全部冗余的共享资源打包规则）
-
-### Removed
-
-- 移除了InitializeParameters.LocationToLower成员字段
-- 移除了LoadSceneAsync方法里的activateOnLoad形参参数
-- 移除了BuildParameters.AutoAnalyzeRedundancy成员字段
-- 移除了DefaultShareAssetPackRule编辑器类
-
 ## [1.4.16] - 2023-06-14
 
 ### Changed

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilder.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Reflection;
-using System.Linq;
 using UnityEngine;
 using UnityEditor;
 
@@ -13,30 +11,80 @@ namespace YooAsset.Editor
 		private readonly BuildContext _buildContext = new BuildContext();
 
 		/// <summary>
-		/// 构建资源包
+		/// 开始构建
 		/// </summary>
-		public BuildResult Run(BuildParameters buildParameters, List<IBuildTask> buildPipeline)
+		public BuildResult Run(BuildParameters buildParameters)
 		{
+			// 清空旧数据
+			_buildContext.ClearAllContext();
+
 			// 检测构建参数是否为空
 			if (buildParameters == null)
 				throw new Exception($"{nameof(buildParameters)} is null !");
 
-			// 检测构建参数是否为空
-			if (buildPipeline.Count == 0)
-				throw new Exception($"Build pipeline is empty !");	
+			// 检测可编程构建管线参数
+			if (buildParameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
+			{
+				if (buildParameters.SBPParameters == null)
+					throw new Exception($"{nameof(BuildParameters.SBPParameters)} is null !");
 
-			// 清空旧数据
-			_buildContext.ClearAllContext();
+				if (buildParameters.BuildMode == EBuildMode.DryRunBuild)
+					throw new Exception($"{nameof(EBuildPipeline.ScriptableBuildPipeline)} not support {nameof(EBuildMode.DryRunBuild)} build mode !");
+
+				if (buildParameters.BuildMode == EBuildMode.ForceRebuild)
+					throw new Exception($"{nameof(EBuildPipeline.ScriptableBuildPipeline)} not support {nameof(EBuildMode.ForceRebuild)} build mode !");
+			}
 
 			// 构建参数
 			var buildParametersContext = new BuildParametersContext(buildParameters);
 			_buildContext.SetContextObject(buildParametersContext);
 
+			// 创建构建节点
+			List<IBuildTask> pipeline;
+			if (buildParameters.BuildPipeline == EBuildPipeline.BuiltinBuildPipeline)
+			{
+				pipeline = new List<IBuildTask>
+				{
+					new TaskPrepare(), //前期准备工作
+					new TaskGetBuildMap(), //获取构建列表
+					new TaskBuilding(), //开始执行构建
+					new TaskCopyRawFile(), //拷贝原生文件
+					new TaskVerifyBuildResult(), //验证构建结果
+					new TaskEncryption(), //加密资源文件
+					new TaskUpdateBundleInfo(), //更新资源包信息
+					new TaskCreateManifest(), //创建清单文件
+					new TaskCreateReport(), //创建报告文件
+					new TaskCreatePackage(), //制作包裹
+					new TaskCopyBuildinFiles(), //拷贝内置文件
+				};
+			}
+			else if (buildParameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
+			{
+				pipeline = new List<IBuildTask>
+				{
+					new TaskPrepare(), //前期准备工作
+					new TaskGetBuildMap(), //获取构建列表
+					new TaskBuilding_SBP(), //开始执行构建
+					new TaskCopyRawFile(), //拷贝原生文件
+					new TaskVerifyBuildResult_SBP(), //验证构建结果
+					new TaskEncryption(), //加密资源文件
+					new TaskUpdateBundleInfo(), //更新补丁信息
+					new TaskCreateManifest(), //创建清单文件
+					new TaskCreateReport(), //创建报告文件
+					new TaskCreatePackage(), //制作补丁包
+					new TaskCopyBuildinFiles(), //拷贝内置文件
+				};
+			}
+			else
+			{
+				throw new NotImplementedException();
+			}
+
 			// 初始化日志
 			BuildLogger.InitLogger(buildParameters.EnableLog);
 
 			// 执行构建流程
-			var buildResult = BuildRunner.Run(buildPipeline, _buildContext);
+			var buildResult = BuildRunner.Run(pipeline, _buildContext);
 			if (buildResult.Success)
 			{
 				buildResult.OutputPackageDirectory = buildParametersContext.GetPackageOutputDirectory();
@@ -51,62 +99,5 @@ namespace YooAsset.Editor
 
 			return buildResult;
 		}
-
-		/// <summary>
-		/// 构建资源包
-		/// </summary>
-		public BuildResult Run(BuildParameters buildParameters)
-		{
-			var buildPipeline = GetDefaultBuildPipeline(buildParameters.BuildPipeline);
-			return Run(buildParameters, buildPipeline);
-		}
-
-		/// <summary>
-		/// 获取默认的构建流程
-		/// </summary>
-		private List<IBuildTask> GetDefaultBuildPipeline(EBuildPipeline buildPipeline)
-		{
-			// 获取任务节点的属性集合
-			if (buildPipeline == EBuildPipeline.BuiltinBuildPipeline)
-			{
-				List<IBuildTask> pipeline = new List<IBuildTask>
-				{
-					new TaskPrepare(), //前期准备工作
-					new TaskGetBuildMap(), //获取构建列表
-					new TaskBuilding(), //开始执行构建
-					new TaskCopyRawFile(), //拷贝原生文件
-					new TaskVerifyBuildResult(), //验证构建结果
-					new TaskEncryption(), //加密资源文件
-					new TaskUpdateBundleInfo(), //更新资源包信息
-					new TaskCreateManifest(), //创建清单文件
-					new TaskCreateReport(), //创建报告文件
-					new TaskCreatePackage(), //制作包裹
-					new TaskCopyBuildinFiles(), //拷贝内置文件
-				};
-				return pipeline;
-			}
-			else if (buildPipeline == EBuildPipeline.ScriptableBuildPipeline)
-			{
-				List<IBuildTask> pipeline = new List<IBuildTask>
-				{
-					new TaskPrepare(), //前期准备工作
-					new TaskGetBuildMap(), //获取构建列表
-					new TaskBuilding_SBP(), //开始执行构建
-					new TaskCopyRawFile(), //拷贝原生文件
-					new TaskVerifyBuildResult_SBP(), //验证构建结果
-					new TaskEncryption(), //加密资源文件
-					new TaskUpdateBundleInfo(), //更新补丁信息
-					new TaskCreateManifest(), //创建清单文件
-					new TaskCreateReport(), //创建报告文件
-					new TaskCreatePackage(), //制作补丁包
-					new TaskCopyBuildinFiles(), //拷贝内置文件
-				};
-				return pipeline;
-			}
-			else
-			{
-				throw new NotImplementedException();
-			}
-		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderHelper.cs

@@ -11,7 +11,7 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 获取默认的输出根路录
 		/// </summary>
-		public static string GetDefaultBuildOutputRoot()
+		public static string GetDefaultOutputRoot()
 		{
 			string projectPath = EditorTools.GetProjectPath();
 			return $"{projectPath}/Bundles";
@@ -20,9 +20,43 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 获取流文件夹路径
 		/// </summary>
-		public static string GetDefaultStreamingAssetsRoot()
+		public static string GetStreamingAssetsFolderPath()
 		{
-			return $"{Application.dataPath}/StreamingAssets/{YooAssetSettingsData.Setting.DefaultYooFolderName}/";
+			return $"{Application.dataPath}/StreamingAssets/{YooAssetSettings.StreamingAssetsBuildinFolder}/";
+		}
+
+		/// <summary>
+		/// 清空流文件夹
+		/// </summary>
+		public static void ClearStreamingAssetsFolder()
+		{
+			string streamingFolderPath = GetStreamingAssetsFolderPath();
+			EditorTools.ClearFolder(streamingFolderPath);
+		}
+
+		/// <summary>
+		/// 删除流文件夹内无关的文件
+		/// 删除.manifest文件和.meta文件
+		/// </summary>
+		public static void DeleteStreamingAssetsIgnoreFiles()
+		{
+			string streamingFolderPath = GetStreamingAssetsFolderPath();
+			if (Directory.Exists(streamingFolderPath))
+			{
+				string[] files = Directory.GetFiles(streamingFolderPath, "*.manifest", SearchOption.AllDirectories);
+				foreach (var file in files)
+				{
+					FileInfo info = new FileInfo(file);
+					info.Delete();
+				}
+
+				files = Directory.GetFiles(streamingFolderPath, "*.meta", SearchOption.AllDirectories);
+				foreach (var item in files)
+				{
+					FileInfo info = new FileInfo(item);
+					info.Delete();
+				}
+			}
 		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderTools.cs

@@ -0,0 +1,215 @@
+using System;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditor;
+using UnityEditor.Animations;
+
+namespace YooAsset.Editor
+{
+	public static class AssetBundleBuilderTools
+	{
+		/// <summary>
+		/// 检测所有损坏的预制体文件
+		/// </summary>
+		public static void CheckCorruptionPrefab(List<string> searchDirectorys)
+		{
+			if (searchDirectorys.Count == 0)
+				throw new Exception("路径列表不能为空！");
+
+			// 获取所有资源列表
+			int checkCount = 0;
+			int invalidCount = 0;
+			string[] findAssets = EditorTools.FindAssets(EAssetSearchType.Prefab, searchDirectorys.ToArray());
+			foreach (string assetPath in findAssets)
+			{
+				UnityEngine.Object prefab = AssetDatabase.LoadAssetAtPath(assetPath, typeof(UnityEngine.Object));
+				if (prefab == null)
+				{
+					invalidCount++;
+					Debug.LogError($"发现损坏预制件：{assetPath}");
+				}
+				EditorTools.DisplayProgressBar("检测预制件文件是否损坏", ++checkCount, findAssets.Length);
+			}
+			EditorTools.ClearProgressBar();
+
+			if (invalidCount == 0)
+				Debug.Log($"没有发现损坏预制件");
+		}
+
+		/// <summary>
+		/// 检测所有动画控制器的冗余状态
+		/// </summary>
+		public static void FindRedundantAnimationState(List<string> searchDirectorys)
+		{
+			if (searchDirectorys.Count == 0)
+				throw new Exception("路径列表不能为空！");
+
+			// 获取所有资源列表
+			int checkCount = 0;
+			int findCount = 0;
+			string[] findAssets = EditorTools.FindAssets(EAssetSearchType.RuntimeAnimatorController, searchDirectorys.ToArray());
+			foreach (string assetPath in findAssets)
+			{
+				AnimatorController animator= AssetDatabase.LoadAssetAtPath<AnimatorController>(assetPath);
+				if (FindRedundantAnimationState(animator))
+				{
+					findCount++;
+					Debug.LogWarning($"发现冗余的动画控制器：{assetPath}");
+				}
+				EditorTools.DisplayProgressBar("检测冗余的动画控制器", ++checkCount, findAssets.Length);
+			}
+			EditorTools.ClearProgressBar();
+
+			if (findCount == 0)
+				Debug.Log($"没有发现冗余的动画控制器");
+			else
+				AssetDatabase.SaveAssets();
+		}
+
+		/// <summary>
+		/// 清理所有材质球的冗余属性
+		/// </summary>
+		public static void ClearMaterialUnusedProperty(List<string> searchDirectorys)
+		{
+			if (searchDirectorys.Count == 0)
+				throw new Exception("路径列表不能为空！");
+
+			// 获取所有资源列表
+			int checkCount = 0;
+			int removedCount = 0;
+			string[] findAssets = EditorTools.FindAssets(EAssetSearchType.Material, searchDirectorys.ToArray());
+			foreach (string assetPath in findAssets)
+			{
+				Material mat = AssetDatabase.LoadAssetAtPath<Material>(assetPath);
+				if (ClearMaterialUnusedProperty(mat))
+				{
+					removedCount++;
+					Debug.LogWarning($"材质球已被处理：{assetPath}");
+				}
+				EditorTools.DisplayProgressBar("清理冗余的材质球", ++checkCount, findAssets.Length);
+			}
+			EditorTools.ClearProgressBar();
+
+			if (removedCount == 0)
+				Debug.Log($"没有发现冗余的材质球");
+			else
+				AssetDatabase.SaveAssets();
+		}
+
+
+		/// <summary>
+		/// 清理无用的材质球属性
+		/// </summary>
+		private static bool ClearMaterialUnusedProperty(Material mat)
+		{
+			bool removeUnused = false;
+			SerializedObject so = new SerializedObject(mat);
+			SerializedProperty sp = so.FindProperty("m_SavedProperties");
+
+			sp.Next(true);
+			do
+			{
+				if (sp.isArray == false)
+					continue;
+
+				for (int i = sp.arraySize - 1; i >= 0; --i)
+				{
+					var p1 = sp.GetArrayElementAtIndex(i);
+					if (p1.isArray)
+					{
+						for (int ii = p1.arraySize - 1; ii >= 0; --ii)
+						{
+							var p2 = p1.GetArrayElementAtIndex(ii);
+							var val = p2.FindPropertyRelative("first");
+							if (mat.HasProperty(val.stringValue) == false)
+							{
+								Debug.Log($"Material {mat.name} remove unused property : {val.stringValue}");
+								p1.DeleteArrayElementAtIndex(ii);
+								removeUnused = true;
+							}
+						}
+					}
+					else
+					{
+						var val = p1.FindPropertyRelative("first");
+						if (mat.HasProperty(val.stringValue) == false)
+						{
+							Debug.Log($"Material {mat.name} remove unused property : {val.stringValue}");
+							sp.DeleteArrayElementAtIndex(i);
+							removeUnused = true;
+						}
+					}
+				}
+			}
+			while (sp.Next(false));
+			so.ApplyModifiedProperties();
+			return removeUnused;
+		}
+
+		/// <summary>
+		/// 查找动画控制器里冗余的动画状态机
+		/// </summary>
+		private static bool FindRedundantAnimationState(AnimatorController animatorController)
+		{
+			if (animatorController == null)
+				return false;
+
+			string assetPath = AssetDatabase.GetAssetPath(animatorController);
+
+			// 查找使用的状态机名称
+			List<string> usedStateNames = new List<string>();
+			foreach (var layer in animatorController.layers)
+			{
+				foreach (var state in layer.stateMachine.states)
+				{
+					usedStateNames.Add(state.state.name);
+				}
+			}
+
+			List<string> allLines = new List<string>();
+			List<int> stateIndexList = new List<int>();
+			using (StreamReader reader = File.OpenText(assetPath))
+			{
+				string content;
+				while (null != (content = reader.ReadLine()))
+				{
+					allLines.Add(content);
+					if (content.StartsWith("AnimatorState:"))
+					{
+						stateIndexList.Add(allLines.Count - 1);
+					}
+				}
+			}
+
+			List<string> allStateNames = new List<string>();
+			foreach (var index in stateIndexList)
+			{
+				for (int i = index; i < allLines.Count; i++)
+				{
+					string content = allLines[i];
+					content = content.Trim();
+					if (content.StartsWith("m_Name"))
+					{
+						string[] splits = content.Split(':');
+						string name = splits[1].TrimStart(' '); //移除前面的空格
+						allStateNames.Add(name);
+						break;
+					}
+				}
+			}
+
+			bool foundRedundantState = false;
+			foreach (var stateName in allStateNames)
+			{
+				if (usedStateNames.Contains(stateName) == false)
+				{
+					Debug.LogWarning($"发现冗余的动画文件:{assetPath}={stateName}");
+					foundRedundantState = true;
+				}
+			}
+			return foundRedundantState;
+		}
+	}
+}

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9b0e966838827284a9266a9f2237a460
+guid: fe50795c51a46884088139b840c1557f
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs

@@ -63,7 +63,7 @@ namespace YooAsset.Editor
 				_encryptionServicesClassNames = _encryptionServicesClassTypes.Select(t => t.Name).ToList();
 
 				// 输出目录
-				string defaultOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
+				string defaultOutputRoot = AssetBundleBuilderHelper.GetDefaultOutputRoot();
 				_buildOutputField = root.Q<TextField>("BuildOutput");
 				_buildOutputField.SetValueWithoutNotify(defaultOutputRoot);
 				_buildOutputField.SetEnabled(false);
@@ -266,16 +266,17 @@ namespace YooAsset.Editor
 		/// </summary>
 		private void ExecuteBuild()
 		{
+			string defaultOutputRoot = AssetBundleBuilderHelper.GetDefaultOutputRoot();
 			BuildParameters buildParameters = new BuildParameters();
-			buildParameters.StreamingAssetsRoot = AssetBundleBuilderHelper.GetDefaultStreamingAssetsRoot();
-			buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
+			buildParameters.OutputRoot = defaultOutputRoot;
 			buildParameters.BuildTarget = _buildTarget;
 			buildParameters.BuildPipeline = AssetBundleBuilderSettingData.Setting.BuildPipeline;
 			buildParameters.BuildMode = AssetBundleBuilderSettingData.Setting.BuildMode;
 			buildParameters.PackageName = AssetBundleBuilderSettingData.Setting.BuildPackage;
 			buildParameters.PackageVersion = _buildVersionField.value;
 			buildParameters.VerifyBuildingResult = true;
-			buildParameters.SharedPackRule = new ZeroRedundancySharedPackRule();
+			buildParameters.AutoAnalyzeRedundancy = true;
+			buildParameters.ShareAssetPackRule = new DefaultShareAssetPackRule();
 			buildParameters.EncryptionServices = CreateEncryptionServicesInstance();
 			buildParameters.CompressOption = AssetBundleBuilderSettingData.Setting.CompressOption;
 			buildParameters.OutputNameStyle = AssetBundleBuilderSettingData.Setting.OutputNameStyle;

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleSimulateBuilder.cs

@@ -11,9 +11,9 @@ namespace YooAsset.Editor
 		public static string SimulateBuild(string packageName)
 		{
 			Debug.Log($"Begin to create simulate package : {packageName}");
+			string defaultOutputRoot = AssetBundleBuilderHelper.GetDefaultOutputRoot();
 			BuildParameters buildParameters = new BuildParameters();
-			buildParameters.StreamingAssetsRoot = AssetBundleBuilderHelper.GetDefaultStreamingAssetsRoot();
-			buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
+			buildParameters.OutputRoot = defaultOutputRoot;
 			buildParameters.BuildTarget = EditorUserBuildSettings.activeBuildTarget;
 			buildParameters.BuildMode = EBuildMode.SimulateBuild;
 			buildParameters.PackageName = packageName;

Assets/YooAsset/Editor/AssetBundleBuilder/BuildAssetInfo.cs

@@ -30,11 +30,6 @@ namespace YooAsset.Editor
 		/// </summary>
 		public string AssetPath { private set; get; }
 
-		/// <summary>
-		/// 资源GUID
-		/// </summary>
-		public string AssetGUID { private set; get; }
-
 		/// <summary>
 		/// 是否为原生资源
 		/// </summary>
@@ -70,7 +65,6 @@ namespace YooAsset.Editor
 			AssetPath = assetPath;
 			IsRawAsset = isRawAsset;
 
-			AssetGUID = UnityEditor.AssetDatabase.AssetPathToGUID(assetPath);
 			System.Type assetType = UnityEditor.AssetDatabase.GetMainAssetTypeAtPath(assetPath);
 			if (assetType == typeof(UnityEngine.Shader) || assetType == typeof(UnityEngine.ShaderVariantCollection))
 				IsShaderAsset = true;
@@ -84,7 +78,6 @@ namespace YooAsset.Editor
 			AssetPath = assetPath;
 			IsRawAsset = false;
 
-			AssetGUID = UnityEditor.AssetDatabase.AssetPathToGUID(assetPath);
 			System.Type assetType = UnityEditor.AssetDatabase.GetMainAssetTypeAtPath(assetPath);
 			if (assetType == typeof(UnityEngine.Shader) || assetType == typeof(UnityEngine.ShaderVariantCollection))
 				IsShaderAsset = true;
@@ -164,7 +157,7 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 计算共享资源包的完整包名
 		/// </summary>
-		public void CalculateShareBundleName(ISharedPackRule sharedPackRule, bool uniqueBundleName, string packageName, string shadersBundleName)
+		public void CalculateShareBundleName(IShareAssetPackRule packRule, bool uniqueBundleName, string packageName, string shadersBundleName)
 		{
 			if (CollectorType != ECollectorType.None)
 				return;
@@ -180,7 +173,7 @@ namespace YooAsset.Editor
 			{
 				if (_referenceBundleNames.Count > 1)
 				{
-					PackRuleResult packRuleResult = sharedPackRule.GetPackRuleResult(AssetPath);
+					PackRuleResult packRuleResult = packRule.GetPackRuleResult(AssetPath);
 					BundleName = packRuleResult.GetShareBundleName(packageName, uniqueBundleName);
 				}
 				else
@@ -196,9 +189,12 @@ namespace YooAsset.Editor
 		/// </summary>
 		public bool IsRedundancyAsset()
 		{
-			if (HasBundleName())
+			if (CollectorType != ECollectorType.None)
 				return false;
 
+			if (IsRawAsset)
+				throw new Exception("Should never get here !");
+
 			return _referenceBundleNames.Count > 1;
 		}
 

Assets/YooAsset/Editor/AssetBundleBuilder/BuildBundleInfo.cs

@@ -8,54 +8,39 @@ namespace YooAsset.Editor
 {
 	public class BuildBundleInfo
 	{
-		#region 补丁文件的关键信息
-		/// <summary>
-		/// Unity引擎生成的哈希值（构建内容的哈希值）
-		/// </summary>
-		public string PackageUnityHash { set; get; }
+		public class InfoWrapper
+		{
+			/// <summary>
+			/// 构建内容的哈希值
+			/// </summary>
+			public string ContentHash { set; get; }
 
-		/// <summary>
-		/// Unity引擎生成的CRC
-		/// </summary>
-		public uint PackageUnityCRC { set; get; }
+			/// <summary>
+			/// 文件哈希值
+			/// </summary>
+			public string FileHash { set; get; }
 
-		/// <summary>
-		/// 文件哈希值
-		/// </summary>
-		public string PackageFileHash { set; get; }
+			/// <summary>
+			/// 文件哈希值
+			/// </summary>
+			public string FileCRC { set; get; }
 
-		/// <summary>
-		/// 文件哈希值
-		/// </summary>
-		public string PackageFileCRC { set; get; }
+			/// <summary>
+			/// 文件哈希值
+			/// </summary>
+			public long FileSize { set; get; }
 
-		/// <summary>
-		/// 文件哈希值
-		/// </summary>
-		public long PackageFileSize { set; get; }
 
-		/// <summary>
-		/// 构建输出的文件路径
-		/// </summary>
-		public string BuildOutputFilePath { set; get; }
-
-		/// <summary>
-		/// 补丁包的源文件路径
-		/// </summary>
-		public string PackageSourceFilePath { set; get; }
-
-		/// <summary>
-		/// 补丁包的目标文件路径
-		/// </summary>
-		public string PackageDestFilePath { set; get; }
-
-		/// <summary>
-		/// 加密生成文件的路径
-		/// 注意：如果未加密该路径为空
-		/// </summary>
-		public string EncryptedFilePath { set; get; }
-		#endregion
+			/// <summary>
+			/// 构建输出的文件路径
+			/// </summary>
+			public string BuildOutputFilePath { set; get; }
 
+			/// <summary>
+			/// 补丁包输出文件路径
+			/// </summary>
+			public string PackageOutputFilePath { set; get; }
+		}
 
 		/// <summary>
 		/// 资源包名称
@@ -64,15 +49,26 @@ namespace YooAsset.Editor
 
 		/// <summary>
 		/// 参与构建的资源列表
-		/// 注意：不包含零依赖资源和冗余资源
+		/// 注意：不包含零依赖资源
 		/// </summary>
 		public readonly List<BuildAssetInfo> AllMainAssets = new List<BuildAssetInfo>();
 
+		/// <summary>
+		/// 补丁文件信息
+		/// </summary>
+		public readonly InfoWrapper BundleInfo = new InfoWrapper();
+
 		/// <summary>
 		/// Bundle文件的加载方法
 		/// </summary>
 		public EBundleLoadMethod LoadMethod { set; get; }
 
+		/// <summary>
+		/// 加密生成文件的路径
+		/// 注意：如果未加密该路径为空
+		/// </summary>
+		public string EncryptedFilePath { set; get; }
+
 		/// <summary>
 		/// 是否为原生文件
 		/// </summary>
@@ -153,15 +149,7 @@ namespace YooAsset.Editor
 		}
 
 		/// <summary>
-		/// 获取构建的资源路径列表
-		/// </summary>
-		public string[] GetAllMainAssetPaths()
-		{
-			return AllMainAssets.Select(t => t.AssetPath).ToArray();
-		}
-
-		/// <summary>
-		/// 获取该资源包内的所有资源（包括零依赖资源和冗余资源）
+		/// 获取该资源包内的所有资源（包括零依赖资源）
 		/// </summary>
 		public List<string> GetAllBuiltinAssetPaths()
 		{
@@ -173,7 +161,6 @@ namespace YooAsset.Editor
 					continue;
 				foreach (var dependAssetInfo in assetInfo.AllDependAssetInfos)
 				{
-					// 注意：依赖资源里只添加零依赖资源和冗余资源
 					if (dependAssetInfo.HasBundleName() == false)
 					{
 						if (result.Contains(dependAssetInfo.AssetPath) == false)
@@ -184,6 +171,22 @@ namespace YooAsset.Editor
 			return result;
 		}
 
+		/// <summary>
+		/// 获取构建的资源路径列表
+		/// </summary>
+		public string[] GetAllMainAssetPaths()
+		{
+			return AllMainAssets.Select(t => t.AssetPath).ToArray();
+		}
+
+		/// <summary>
+		/// 获取所有写入补丁清单的资源
+		/// </summary>
+		public BuildAssetInfo[] GetAllMainAssetInfos()
+		{
+			return AllMainAssets.Where(t => t.CollectorType == ECollectorType.MainAssetCollector).ToArray();
+		}
+
 		/// <summary>
 		/// 创建AssetBundleBuild类
 		/// </summary>
@@ -197,14 +200,6 @@ namespace YooAsset.Editor
 			return build;
 		}
 
-		/// <summary>
-		/// 获取所有写入补丁清单的资源
-		/// </summary>
-		public BuildAssetInfo[] GetAllManifestAssetInfos()
-		{
-			return AllMainAssets.Where(t => t.CollectorType == ECollectorType.MainAssetCollector).ToArray();
-		}
-
 		/// <summary>
 		/// 创建PackageBundle类
 		/// </summary>
@@ -212,10 +207,9 @@ namespace YooAsset.Editor
 		{
 			PackageBundle packageBundle = new PackageBundle();
 			packageBundle.BundleName = BundleName;
-			packageBundle.FileHash = PackageFileHash;
-			packageBundle.FileCRC = PackageFileCRC;
-			packageBundle.FileSize = PackageFileSize;
-			packageBundle.UnityCRC = PackageUnityCRC;
+			packageBundle.FileHash = BundleInfo.FileHash;
+			packageBundle.FileCRC = BundleInfo.FileCRC;
+			packageBundle.FileSize = BundleInfo.FileSize;
 			packageBundle.IsRawFile = IsRawFile;
 			packageBundle.LoadMethod = (byte)LoadMethod;
 			packageBundle.Tags = GetBundleTags();

Assets/YooAsset/Editor/AssetBundleBuilder/BuildMapContext.cs

@@ -22,9 +22,19 @@ namespace YooAsset.Editor
 		public int AssetFileCount;
 
 		/// <summary>
-		/// 收集命令
+		/// 是否启用可寻址资源定位
 		/// </summary>
-		public CollectCommand Command { set; get; }
+		public bool EnableAddressable;
+
+		/// <summary>
+		/// 资源包名唯一化
+		/// </summary>
+		public bool UniqueBundleName;
+
+		/// <summary>
+		/// 着色器统一的全名称
+		/// </summary>
+		public string ShadersBundleName;
 
 		/// <summary>
 		/// 资源包信息列表

Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs

@@ -28,11 +28,6 @@ namespace YooAsset.Editor
 			/// 缓存服务器端口
 			/// </summary>
 			public int CacheServerPort;
-
-			/// <summary>
-			/// 修复图集资源冗余问题
-			/// </summary>
-			public bool FixSpriteAtlasRedundancy = false;
 		}
 
 		/// <summary>
@@ -42,14 +37,9 @@ namespace YooAsset.Editor
 
 
 		/// <summary>
-		/// 内置资源的根目录
+		/// 输出的根目录
 		/// </summary>
-		public string StreamingAssetsRoot;
-
-		/// <summary>
-		/// 构建输出的根目录
-		/// </summary>
-		public string BuildOutputRoot;
+		public string OutputRoot;
 
 		/// <summary>
 		/// 构建的平台
@@ -86,11 +76,16 @@ namespace YooAsset.Editor
 		/// 验证构建结果
 		/// </summary>
 		public bool VerifyBuildingResult = false;
+
+		/// <summary>
+		/// 自动分析冗余资源
+		/// </summary>
+		public bool AutoAnalyzeRedundancy = true;
 		
 		/// <summary>
 		/// 共享资源的打包规则
 		/// </summary>
-		public ISharedPackRule SharedPackRule = null;
+		public IShareAssetPackRule ShareAssetPackRule = null;
 
 		/// <summary>
 		/// 资源的加密接口

Assets/YooAsset/Editor/AssetBundleBuilder/BuildParametersContext.cs

@@ -9,8 +9,6 @@ namespace YooAsset.Editor
 	{
 		private string _pipelineOutputDirectory = string.Empty;
 		private string _packageOutputDirectory = string.Empty;
-		private string _packageRootDirectory = string.Empty;
-		private string _streamingAssetsDirectory = string.Empty;
 
 		/// <summary>
 		/// 构建参数
@@ -31,47 +29,23 @@ namespace YooAsset.Editor
 		{
 			if (string.IsNullOrEmpty(_pipelineOutputDirectory))
 			{
-				_pipelineOutputDirectory = $"{Parameters.BuildOutputRoot}/{Parameters.BuildTarget}/{Parameters.PackageName}/{YooAssetSettings.OutputFolderName}";
+				_pipelineOutputDirectory = $"{Parameters.OutputRoot}/{Parameters.BuildTarget}/{Parameters.PackageName}/{YooAssetSettings.OutputFolderName}";
 			}
 			return _pipelineOutputDirectory;
 		}
 
 		/// <summary>
-		/// 获取本次构建的补丁输出目录
+		/// 获取本次构建的补丁目录
 		/// </summary>
 		public string GetPackageOutputDirectory()
 		{
 			if (string.IsNullOrEmpty(_packageOutputDirectory))
 			{
-				_packageOutputDirectory = $"{Parameters.BuildOutputRoot}/{Parameters.BuildTarget}/{Parameters.PackageName}/{Parameters.PackageVersion}";
+				_packageOutputDirectory = $"{Parameters.OutputRoot}/{Parameters.BuildTarget}/{Parameters.PackageName}/{Parameters.PackageVersion}";
 			}
 			return _packageOutputDirectory;
 		}
 
-		/// <summary>
-		/// 获取本次构建的补丁根目录
-		/// </summary>
-		public string GetPackageRootDirectory()
-		{
-			if (string.IsNullOrEmpty(_packageRootDirectory))
-			{
-				_packageRootDirectory = $"{Parameters.BuildOutputRoot}/{Parameters.BuildTarget}/{Parameters.PackageName}";
-			}
-			return _packageRootDirectory;
-		}
-
-		/// <summary>
-		/// 获取内置资源的目录
-		/// </summary>
-		public string GetStreamingAssetsDirectory()
-		{
-			if (string.IsNullOrEmpty(_streamingAssetsDirectory))
-			{
-				_streamingAssetsDirectory = $"{Parameters.StreamingAssetsRoot}/{Parameters.PackageName}";
-			}
-			return _streamingAssetsDirectory;
-		}
-
 		/// <summary>
 		/// 获取内置构建管线的构建选项
 		/// </summary>

Assets/YooAsset/Editor/AssetBundleBuilder/BuildReport.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a44aabee880cce943b52fe806464be0d
+guid: d6268d725eec21b4aae819adc1553f0e
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

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

@@ -58,25 +58,20 @@ namespace YooAsset.Editor
 		/// </summary>
 		public bool EnableAddressable;
 
-		/// <summary>
-		/// 资源定位地址大小写不敏感
-		/// </summary>
-		public bool LocationToLower;
-
-		/// <summary>
-		/// 包含资源GUID数据
-		/// </summary>
-		public bool IncludeAssetGUID;
-
 		/// <summary>
 		/// 资源包名唯一化
 		/// </summary>
 		public bool UniqueBundleName;
 
 		/// <summary>
-		/// 共享资源的打包规则类名
+		/// 自动分析冗余
 		/// </summary>
-		public string SharedPackRuleClassName;
+		public bool AutoAnalyzeRedundancy;
+
+		/// <summary>
+		/// 共享资源的打包类名称
+		/// </summary>
+		public string ShareAssetPackRuleClassName;
 
 		/// <summary>
 		/// 加密服务类名称

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

@@ -38,7 +38,7 @@ namespace YooAsset.Editor
 					_buildWatch = Stopwatch.StartNew();
 					var taskAttribute = task.GetType().GetCustomAttribute<TaskAttribute>();
 					if (taskAttribute != null)
-						BuildLogger.Log($"---------------------------------------->{taskAttribute.TaskDesc}<---------------------------------------");
+						BuildLogger.Log($"---------------------------------------->{taskAttribute.Desc}<---------------------------------------");
 					task.Run(context);
 					_buildWatch.Stop();
 
@@ -46,7 +46,7 @@ namespace YooAsset.Editor
 					int seconds = GetBuildSeconds();
 					TotalSeconds += seconds;
 					if (taskAttribute != null)
-						BuildLogger.Log($"{taskAttribute.TaskDesc}耗时：{seconds}秒");
+						BuildLogger.Log($"{taskAttribute.Desc}耗时：{seconds}秒");
 				}
 				catch (Exception e)
 				{

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

@@ -5,14 +5,10 @@ namespace YooAsset.Editor
 	[AttributeUsage(AttributeTargets.Class)]
 	public class TaskAttribute : Attribute
 	{
-		/// <summary>
-		/// 任务说明
-		/// </summary>
-		public string TaskDesc;
-
-		public TaskAttribute(string taskDesc)
+		public string Desc;
+		public TaskAttribute(string desc)
 		{
-			TaskDesc = taskDesc;
+			Desc = desc;
 		}
 	}
 }

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

@@ -1,68 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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,10 +9,10 @@ namespace UnityEditor.Build.Pipeline.Tasks
 {
 	public static class SBPBuildTasks
 	{
-		public static IList<IBuildTask> Create(bool fixSpriteAtlasRedundancy, string builtInShaderBundleName)
+		public static IList<IBuildTask> Create(string builtInShaderBundleName)
 		{
 			var buildTasks = new List<IBuildTask>();
-
+			
 			// Setup
 			buildTasks.Add(new SwitchToBuildPlatform());
 			buildTasks.Add(new RebuildSpriteAtlasCache());
@@ -33,8 +33,6 @@ 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(buildParametersContext.Parameters.SBPParameters.FixSpriteAtlasRedundancy, buildMapContext.Command.ShadersBundleName);
+			var taskList = SBPBuildTasks.Create(buildMapContext.ShadersBundleName);
 			ReturnCode exitCode = ContentPipeline.BuildAssetBundles(buildParameters, buildContent, out buildResults, taskList);
 			if (exitCode < 0)
 			{
@@ -43,7 +43,7 @@ namespace YooAsset.Editor
 			// 创建着色器信息
 			// 说明：解决因为着色器资源包导致验证失败。
 			// 例如：当项目里没有着色器，如果有依赖内置着色器就会验证失败。
-			string shadersBundleName = buildMapContext.Command.ShadersBundleName;
+			string shadersBundleName = buildMapContext.ShadersBundleName;
 			if (buildResults.BundleInfos.ContainsKey(shadersBundleName))
 			{
 				buildMapContext.CreateShadersBundleInfo(shadersBundleName);

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

@@ -30,7 +30,7 @@ namespace YooAsset.Editor
 		{
 			ECopyBuildinFileOption option = buildParametersContext.Parameters.CopyBuildinFileOption;
 			string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
-			string streamingAssetsDirectory = buildParametersContext.GetStreamingAssetsDirectory();
+			string streamingAssetsDirectory = AssetBundleBuilderHelper.GetStreamingAssetsFolderPath();
 			string buildPackageName = buildParametersContext.Parameters.PackageName;
 			string buildPackageVersion = buildParametersContext.Parameters.PackageVersion;
 
@@ -40,7 +40,7 @@ namespace YooAsset.Editor
 			// 清空流目录
 			if (option == ECopyBuildinFileOption.ClearAndCopyAll || option == ECopyBuildinFileOption.ClearAndCopyByTags)
 			{
-				EditorTools.ClearFolder(streamingAssetsDirectory);
+				AssetBundleBuilderHelper.ClearStreamingAssetsFolder();
 			}
 
 			// 拷贝补丁清单文件
@@ -69,7 +69,7 @@ namespace YooAsset.Editor
 
 			// 拷贝文件列表（所有文件）
 			if (option == ECopyBuildinFileOption.ClearAndCopyAll || option == ECopyBuildinFileOption.OnlyCopyAll)
-			{
+			{		
 				foreach (var packageBundle in manifest.BundleList)
 				{
 					string sourcePath = $"{packageOutputDirectory}/{packageBundle.FileName}";

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

@@ -34,18 +34,11 @@ namespace YooAsset.Editor
 			// 创建新补丁清单
 			PackageManifest manifest = new PackageManifest();
 			manifest.FileVersion = YooAssetSettings.ManifestFileVersion;
-			manifest.EnableAddressable = buildMapContext.Command.EnableAddressable;
-			manifest.LocationToLower = buildMapContext.Command.LocationToLower;
-			manifest.IncludeAssetGUID = buildMapContext.Command.IncludeAssetGUID;
+			manifest.EnableAddressable = buildMapContext.EnableAddressable;
 			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内置资源包的引用关系
@@ -54,7 +47,7 @@ namespace YooAsset.Editor
 				if (buildParameters.BuildMode == EBuildMode.IncrementalBuild)
 				{
 					var buildResultContext = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
-					UpdateBuiltInBundleReference(manifest, buildResultContext, buildMapContext.Command.ShadersBundleName);
+					UpdateBuiltInBundleReference(manifest, buildResultContext, buildMapContext.ShadersBundleName);
 				}
 			}
 
@@ -144,15 +137,17 @@ namespace YooAsset.Editor
 			List<PackageAsset> result = new List<PackageAsset>(1000);
 			foreach (var bundleInfo in buildMapContext.Collection)
 			{
-				var assetInfos = bundleInfo.GetAllManifestAssetInfos();
+				var assetInfos = bundleInfo.GetAllMainAssetInfos();
 				foreach (var assetInfo in assetInfos)
 				{
 					PackageAsset packageAsset = new PackageAsset();
-					packageAsset.Address = buildMapContext.Command.EnableAddressable ? assetInfo.Address : string.Empty;
+					if (buildMapContext.EnableAddressable)
+						packageAsset.Address = assetInfo.Address;
+					else
+						packageAsset.Address = string.Empty;
 					packageAsset.AssetPath = assetInfo.AssetPath;
-					packageAsset.AssetGUID = buildMapContext.Command.IncludeAssetGUID ? assetInfo.AssetGUID : string.Empty;
 					packageAsset.AssetTags = assetInfo.AssetTags.ToArray();
-					packageAsset.BundleID = GetCachedBundleID(assetInfo.BundleName);
+					packageAsset.BundleID = GetAssetBundleID(assetInfo.BundleName, manifest);
 					packageAsset.DependIDs = GetAssetBundleDependIDs(packageAsset.BundleID, assetInfo, manifest);
 					result.Add(packageAsset);
 				}
@@ -161,12 +156,12 @@ namespace YooAsset.Editor
 		}
 		private int[] GetAssetBundleDependIDs(int mainBundleID, BuildAssetInfo assetInfo, PackageManifest manifest)
 		{
-			HashSet<int> result = new HashSet<int>();
+			List<int> result = new List<int>();
 			foreach (var dependAssetInfo in assetInfo.AllDependAssetInfos)
 			{
 				if (dependAssetInfo.HasBundleName())
 				{
-					int bundleID = GetCachedBundleID(dependAssetInfo.BundleName);
+					int bundleID = GetAssetBundleID(dependAssetInfo.BundleName, manifest);
 					if (mainBundleID != bundleID)
 					{
 						if (result.Contains(bundleID) == false)
@@ -176,6 +171,15 @@ 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内置资源包的引用关系
@@ -208,7 +212,7 @@ namespace YooAsset.Editor
 				List<string> conflictAssetPathList = dependBundles.Intersect(shaderBundleReferenceList).ToList();
 				if (conflictAssetPathList.Count > 0)
 				{
-					HashSet<int> newDependIDs = new HashSet<int>(packageAsset.DependIDs);
+					List<int> newDependIDs = new List<int>(packageAsset.DependIDs);
 					if (newDependIDs.Contains(shaderBundleId) == false)
 						newDependIDs.Add(shaderBundleId);
 					packageAsset.DependIDs = newDependIDs.ToArray();
@@ -222,7 +226,7 @@ namespace YooAsset.Editor
 
 			// 更新资源包标签
 			var packageBundle = manifest.BundleList[shaderBundleId];
-			HashSet<string> newTags = new HashSet<string>(packageBundle.Tags);
+			List<string> newTags = new List<string>(packageBundle.Tags);
 			foreach (var tag in tagTemps)
 			{
 				if (newTags.Contains(tag) == false)
@@ -246,22 +250,23 @@ namespace YooAsset.Editor
 		#region 资源包引用关系相关
 		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;
@@ -278,11 +283,7 @@ namespace YooAsset.Editor
 
 				var depends = buildResultContext.Results.BundleInfos[packageBundle.BundleName].Dependencies;
 				_cachedBundleDepends.Add(packageBundle.BundleName, depends);
-				int pro = ++progressValue;
-				if (pro % 100 == 0)
-				{
-					EditorTools.DisplayProgressBar("缓存资源包依赖列表", pro, totalCount);
-				}
+				EditorTools.DisplayProgressBar("缓存资源包依赖列表", ++progressValue, totalCount);
 			}
 			EditorTools.ClearProgressBar();
 
@@ -290,11 +291,7 @@ namespace YooAsset.Editor
 			foreach (var packageBundle in manifest.BundleList)
 			{
 				packageBundle.ReferenceIDs = GetBundleRefrenceIDs(manifest, packageBundle);
-				int pro = ++progressValue;
-				if (pro % 100 == 0)
-				{
-					EditorTools.DisplayProgressBar("计算资源包引用关系", pro, totalCount);
-				}
+				EditorTools.DisplayProgressBar("计算资源包引用关系", ++progressValue, totalCount);
 			}
 			EditorTools.ClearProgressBar();
 		}
@@ -303,6 +300,17 @@ 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;
@@ -316,11 +324,7 @@ namespace YooAsset.Editor
 
 				var depends = buildResultContext.UnityManifest.GetDirectDependencies(packageBundle.BundleName);
 				_cachedBundleDepends.Add(packageBundle.BundleName, depends);
-				int pro = ++progressValue;
-				if (pro % 100 == 0)
-				{
-					EditorTools.DisplayProgressBar("缓存资源包依赖列表", pro, totalCount);
-				}
+				EditorTools.DisplayProgressBar("缓存资源包依赖列表", ++progressValue, totalCount);
 			}
 			EditorTools.ClearProgressBar();
 
@@ -329,11 +333,7 @@ namespace YooAsset.Editor
 			foreach (var packageBundle in manifest.BundleList)
 			{
 				packageBundle.ReferenceIDs = GetBundleRefrenceIDs(manifest, packageBundle);
-				int pro = ++progressValue;
-				if (pro % 100 == 0)
-				{
-					EditorTools.DisplayProgressBar("计算资源包引用关系", ++progressValue, totalCount);
-				}
+				EditorTools.DisplayProgressBar("计算资源包引用关系", ++progressValue, totalCount);
 			}
 			EditorTools.ClearProgressBar();
 		}
@@ -354,7 +354,7 @@ namespace YooAsset.Editor
 				}
 			}
 
-			HashSet<int> result = new HashSet<int>();
+			List<int> result = new List<int>();
 			foreach (var bundleName in referenceList)
 			{
 				int bundleID = GetCachedBundleID(bundleName);

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

@@ -70,7 +70,7 @@ namespace YooAsset.Editor
 			int fileTotalCount = buildMapContext.Collection.Count;
 			foreach (var bundleInfo in buildMapContext.Collection)
 			{
-				EditorTools.CopyFile(bundleInfo.PackageSourceFilePath, bundleInfo.PackageDestFilePath, true);
+				EditorTools.CopyFile(bundleInfo.BundleInfo.BuildOutputFilePath, bundleInfo.BundleInfo.PackageOutputFilePath, true);
 				EditorTools.DisplayProgressBar("拷贝补丁文件", ++progressValue, fileTotalCount);
 			}
 			EditorTools.ClearProgressBar();

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

@@ -45,12 +45,11 @@ namespace YooAsset.Editor
 				buildReport.Summary.BuildMode = buildParameters.BuildMode;
 				buildReport.Summary.BuildPackageName = buildParameters.PackageName;
 				buildReport.Summary.BuildPackageVersion = buildParameters.PackageVersion;
-				buildReport.Summary.EnableAddressable = buildMapContext.Command.EnableAddressable;
-				buildReport.Summary.LocationToLower = buildMapContext.Command.LocationToLower;
-				buildReport.Summary.IncludeAssetGUID = buildMapContext.Command.IncludeAssetGUID;
-				buildReport.Summary.UniqueBundleName = buildMapContext.Command.UniqueBundleName;
-				buildReport.Summary.SharedPackRuleClassName = buildParameters.SharedPackRule == null ?
-					"null" : buildParameters.SharedPackRule.GetType().FullName;
+				buildReport.Summary.EnableAddressable = buildMapContext.EnableAddressable;
+				buildReport.Summary.UniqueBundleName = buildMapContext.UniqueBundleName;
+				buildReport.Summary.AutoAnalyzeRedundancy = buildParameters.AutoAnalyzeRedundancy;
+				buildReport.Summary.ShareAssetPackRuleClassName = buildParameters.ShareAssetPackRule == null ?
+					"null" : buildParameters.ShareAssetPackRule.GetType().FullName;
 				buildReport.Summary.EncryptionServicesClassName = buildParameters.EncryptionServices == null ?
 					"null" : buildParameters.EncryptionServices.GetType().FullName;
 
@@ -160,7 +159,7 @@ namespace YooAsset.Editor
 		}
 
 		/// <summary>
-		/// 获取该资源包内的所有资源
+		/// 获取该资源包内的所有资源（包括零依赖资源）
 		/// </summary>
 		private List<string> GetAllBuiltinAssets(BuildMapContext buildMapContext, string bundleName)
 		{

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

@@ -26,14 +26,15 @@ namespace YooAsset.Editor
 		/// </summary>
 		public BuildMapContext CreateBuildMap(BuildParameters buildParameters)
 		{
-			var buildMode = buildParameters.BuildMode;
-			var packageName = buildParameters.PackageName;
-			var sharedPackRule = buildParameters.SharedPackRule;
+			EBuildMode buildMode = buildParameters.BuildMode;
+			string packageName = buildParameters.PackageName;
+			IShareAssetPackRule sharePackRule = buildParameters.ShareAssetPackRule;
+			bool autoAnalyzeRedundancy = buildParameters.AutoAnalyzeRedundancy;
 
 			Dictionary<string, BuildAssetInfo> allBuildAssetInfoDic = new Dictionary<string, BuildAssetInfo>(1000);
 
 			// 1. 检测配置合法性
-			AssetBundleCollectorSettingData.Setting.CheckPackageConfigError(packageName);
+			AssetBundleCollectorSettingData.Setting.CheckConfigError();
 
 			// 2. 获取所有收集器收集的资源
 			var collectResult = AssetBundleCollectorSettingData.Setting.GetPackageAssets(buildMode, packageName);
@@ -97,31 +98,38 @@ namespace YooAsset.Editor
 			// 7. 记录关键信息
 			BuildMapContext context = new BuildMapContext();
 			context.AssetFileCount = allBuildAssetInfoDic.Count;
-			context.Command = collectResult.Command;
+			context.EnableAddressable = collectResult.Command.EnableAddressable;
+			context.UniqueBundleName = collectResult.Command.UniqueBundleName;
+			context.ShadersBundleName = collectResult.Command.ShadersBundleName;
 
-			// 8. 计算共享资源的包名		
-			var command = collectResult.Command;
-			foreach (var buildAssetInfo in allBuildAssetInfoDic.Values)
+			// 8. 计算共享的资源包名
+			if (autoAnalyzeRedundancy)
 			{
-				buildAssetInfo.CalculateShareBundleName(sharedPackRule, command.UniqueBundleName, command.PackageName, command.ShadersBundleName);
-			}
-
-			// 9. 记录冗余资源
-			foreach (var buildAssetInfo in allBuildAssetInfoDic.Values)
-			{
-				if (buildAssetInfo.IsRedundancyAsset())
+				var command = collectResult.Command;
+				foreach (var buildAssetInfo in allBuildAssetInfoDic.Values)
 				{
-					var redundancyInfo = new ReportRedundancyInfo();
-					redundancyInfo.AssetPath = buildAssetInfo.AssetPath;
-					redundancyInfo.AssetType = AssetDatabase.GetMainAssetTypeAtPath(buildAssetInfo.AssetPath).Name;
-					redundancyInfo.AssetGUID = AssetDatabase.AssetPathToGUID(buildAssetInfo.AssetPath);
-					redundancyInfo.FileSize = FileUtility.GetFileSize(buildAssetInfo.AssetPath);
-					redundancyInfo.Number = buildAssetInfo.GetReferenceBundleCount();
-					context.RedundancyInfos.Add(redundancyInfo);
+					buildAssetInfo.CalculateShareBundleName(sharePackRule, command.UniqueBundleName, command.PackageName, command.ShadersBundleName);
+				}
+			}
+			else
+			{
+				// 记录冗余资源
+				foreach (var buildAssetInfo in allBuildAssetInfoDic.Values)
+				{
+					if (buildAssetInfo.IsRedundancyAsset())
+					{
+						var redundancyInfo = new ReportRedundancyInfo();
+						redundancyInfo.AssetPath = buildAssetInfo.AssetPath;
+						redundancyInfo.AssetType = AssetDatabase.GetMainAssetTypeAtPath(buildAssetInfo.AssetPath).Name;
+						redundancyInfo.AssetGUID = AssetDatabase.AssetPathToGUID(buildAssetInfo.AssetPath);
+						redundancyInfo.FileSize = FileUtility.GetFileSize(buildAssetInfo.AssetPath);
+						redundancyInfo.Number = buildAssetInfo.GetReferenceBundleCount();
+						context.RedundancyInfos.Add(redundancyInfo);
+					}
 				}
 			}
 
-			// 10. 移除不参与构建的资源
+			// 9. 移除不参与构建的资源
 			List<BuildAssetInfo> removeBuildList = new List<BuildAssetInfo>();
 			foreach (var buildAssetInfo in allBuildAssetInfoDic.Values)
 			{
@@ -133,7 +141,7 @@ namespace YooAsset.Editor
 				allBuildAssetInfoDic.Remove(removeValue.AssetPath);
 			}
 
-			// 11. 构建资源列表
+			// 10. 构建资源包
 			var allPackAssets = allBuildAssetInfoDic.Values.ToList();
 			if (allPackAssets.Count == 0)
 				throw new Exception("构建的资源列表不能为空");
@@ -141,23 +149,22 @@ namespace YooAsset.Editor
 			{
 				context.PackAsset(assetInfo);
 			}
-
 			return context;
 		}
 		private void RemoveZeroReferenceAssets(List<CollectAssetInfo> allCollectAssetInfos)
 		{
 			// 1. 检测是否任何存在依赖资源
-			bool hasAnyDependCollector = false;
+			bool hasAnyDependAsset = false;
 			foreach (var collectAssetInfo in allCollectAssetInfos)
 			{
 				var collectorType = collectAssetInfo.CollectorType;
 				if (collectorType == ECollectorType.DependAssetCollector)
 				{
-					hasAnyDependCollector = true;
+					hasAnyDependAsset = true;
 					break;
 				}
 			}
-			if (hasAnyDependCollector == false)
+			if (hasAnyDependAsset == false)
 				return;
 
 			// 2. 获取所有主资源的依赖资源集合

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

@@ -16,27 +16,11 @@ namespace YooAsset.Editor
 
 			// 检测构建参数合法性
 			if (buildParameters.BuildTarget == BuildTarget.NoTarget)
-				throw new Exception("请选择目标平台！");
+				throw new Exception("请选择目标平台");
 			if (string.IsNullOrEmpty(buildParameters.PackageName))
-				throw new Exception("包裹名称不能为空！");
+				throw new Exception("包裹名称不能为空");
 			if (string.IsNullOrEmpty(buildParameters.PackageVersion))
-				throw new Exception("包裹版本不能为空！");
-			if (string.IsNullOrEmpty(buildParameters.BuildOutputRoot))
-				throw new Exception("构建输出的根目录为空！");
-			if (string.IsNullOrEmpty(buildParameters.StreamingAssetsRoot))
-				throw new Exception("内置资源根目录为空！");
-
-			if (buildParameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
-			{
-				if (buildParameters.SBPParameters == null)
-					throw new Exception($"{nameof(BuildParameters.SBPParameters)} is null !");
-
-				if (buildParameters.BuildMode == EBuildMode.DryRunBuild)
-					throw new Exception($"{nameof(EBuildPipeline.ScriptableBuildPipeline)} not support {nameof(EBuildMode.DryRunBuild)} build mode !");
-
-				if (buildParameters.BuildMode == EBuildMode.ForceRebuild)
-					throw new Exception($"{nameof(EBuildPipeline.ScriptableBuildPipeline)} not support {nameof(EBuildMode.ForceRebuild)} build mode !");
-			}
+				throw new Exception("包裹版本不能为空");
 
 			if (buildParameters.BuildMode != EBuildMode.SimulateBuild)
 			{
@@ -64,7 +48,7 @@ namespace YooAsset.Editor
 				}
 
 				// 检测共享资源打包规则
-				if (buildParameters.SharedPackRule == null)
+				if (buildParameters.ShareAssetPackRule == null)
 					throw new Exception("共享资源打包规则不能为空！");
 
 #if UNITY_WEBGL
@@ -88,10 +72,11 @@ namespace YooAsset.Editor
 
 			if (buildParameters.BuildMode == EBuildMode.ForceRebuild)
 			{
-				string packageRootDirectory = buildParametersContext.GetPackageRootDirectory();
-				if (EditorTools.DeleteDirectory(packageRootDirectory))
+				// 删除总目录
+				string platformDirectory = $"{buildParameters.OutputRoot}/{buildParameters.BuildTarget}/{buildParameters.PackageName}";
+				if (EditorTools.DeleteDirectory(platformDirectory))
 				{
-					BuildLogger.Log($"删除包裹目录：{packageRootDirectory}");
+					BuildLogger.Log($"删除平台总目录：{platformDirectory}");
 				}
 			}
 

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

@@ -29,35 +29,32 @@ namespace YooAsset.Editor
 			// 2.更新构建输出的文件路径
 			foreach (var bundleInfo in buildMapContext.Collection)
 			{
-				bundleInfo.BuildOutputFilePath = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}";
 				if (bundleInfo.IsEncryptedFile)
-					bundleInfo.PackageSourceFilePath = bundleInfo.EncryptedFilePath;
+					bundleInfo.BundleInfo.BuildOutputFilePath = bundleInfo.EncryptedFilePath;
 				else
-					bundleInfo.PackageSourceFilePath = bundleInfo.BuildOutputFilePath;
+					bundleInfo.BundleInfo.BuildOutputFilePath = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}";
 			}
 
 			// 3.更新文件其它信息
 			foreach (var bundleInfo in buildMapContext.Collection)
 			{
-				bundleInfo.PackageUnityHash = GetUnityHash(bundleInfo, context);
-				bundleInfo.PackageUnityCRC = GetUnityCRC(bundleInfo, context);
-				bundleInfo.PackageFileHash = GetBundleFileHash(bundleInfo.PackageSourceFilePath, buildParametersContext);
-				bundleInfo.PackageFileCRC = GetBundleFileCRC(bundleInfo.PackageSourceFilePath, buildParametersContext);
-				bundleInfo.PackageFileSize = GetBundleFileSize(bundleInfo.PackageSourceFilePath, buildParametersContext);
+				string buildOutputFilePath = bundleInfo.BundleInfo.BuildOutputFilePath;
+				bundleInfo.BundleInfo.ContentHash = GetBundleContentHash(bundleInfo, context);
+				bundleInfo.BundleInfo.FileHash = GetBundleFileHash(buildOutputFilePath, buildParametersContext);
+				bundleInfo.BundleInfo.FileCRC = GetBundleFileCRC(buildOutputFilePath, buildParametersContext);
+				bundleInfo.BundleInfo.FileSize = GetBundleFileSize(buildOutputFilePath, buildParametersContext);
 			}
 
 			// 4.更新补丁包输出的文件路径
 			foreach (var bundleInfo in buildMapContext.Collection)
 			{
-				string bundleName = bundleInfo.BundleName;
-				string fileHash = bundleInfo.PackageFileHash;
-				string fileExtension = ManifestTools.GetRemoteBundleFileExtension(bundleName);
-				string fileName = ManifestTools.GetRemoteBundleFileName(outputNameStyle, bundleName, fileExtension, fileHash);
-				bundleInfo.PackageDestFilePath = $"{packageOutputDirectory}/{fileName}";
+				string fileExtension = ManifestTools.GetRemoteBundleFileExtension(bundleInfo.BundleName);
+				string fileName = ManifestTools.GetRemoteBundleFileName(outputNameStyle, bundleInfo.BundleName, fileExtension, bundleInfo.BundleInfo.FileHash);
+				bundleInfo.BundleInfo.PackageOutputFilePath = $"{packageOutputDirectory}/{fileName}";
 			}
 		}
 
-		private string GetUnityHash(BuildBundleInfo bundleInfo, BuildContext context)
+		private string GetBundleContentHash(BuildBundleInfo bundleInfo, BuildContext context)
 		{
 			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
 			var parameters = buildParametersContext.Parameters;
@@ -67,7 +64,7 @@ namespace YooAsset.Editor
 
 			if (bundleInfo.IsRawFile)
 			{
-				string filePath = bundleInfo.PackageSourceFilePath;
+				string filePath = bundleInfo.BundleInfo.BuildOutputFilePath;
 				return HashUtility.FileMD5(filePath);
 			}
 
@@ -78,7 +75,7 @@ namespace YooAsset.Editor
 				if (hash.isValid)
 					return hash.ToString();
 				else
-					throw new Exception($"Not found bundle hash in build result : {bundleInfo.BundleName}");
+					throw new Exception($"Not found bundle in build result : {bundleInfo.BundleName}");
 			}
 			else if (parameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
 			{
@@ -87,39 +84,7 @@ namespace YooAsset.Editor
 				if (buildResult.Results.BundleInfos.TryGetValue(bundleInfo.BundleName, out var value))
 					return value.Hash.ToString();
 				else
-					throw new Exception($"Not found bundle hash in build result : {bundleInfo.BundleName}");
-			}
-			else
-			{
-				throw new System.NotImplementedException();
-			}
-		}
-		private uint GetUnityCRC(BuildBundleInfo bundleInfo, BuildContext context)
-		{
-			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-			var parameters = buildParametersContext.Parameters;
-			var buildMode = parameters.BuildMode;
-			if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild)
-				return 0;
-
-			if (bundleInfo.IsRawFile)
-				return 0;
-
-			if (parameters.BuildPipeline == EBuildPipeline.BuiltinBuildPipeline)
-			{
-				string filePath = bundleInfo.BuildOutputFilePath;
-				if (BuildPipeline.GetCRCForAssetBundle(filePath, out uint crc))
-					return crc;
-				else
-					throw new Exception($"Not found bundle crc in build result : {bundleInfo.BundleName}");
-			}
-			else if (parameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
-			{
-				var buildResult = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
-				if (buildResult.Results.BundleInfos.TryGetValue(bundleInfo.BundleName, out var value))
-					return value.Crc;
-				else
-					throw new Exception($"Not found bundle crc in build result : {bundleInfo.BundleName}");
+					throw new Exception($"Not found bundle in build result : {bundleInfo.BundleName}");
 			}
 			else
 			{

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(group, assetPath))
+					if (IsValidateAsset(assetPath, isRawFilePackRule) && IsCollectAsset(assetPath))
 					{
 						if (result.ContainsKey(assetPath) == false)
 						{
@@ -183,7 +183,7 @@ namespace YooAsset.Editor
 			else
 			{
 				string assetPath = CollectPath;
-				if (IsValidateAsset(assetPath, isRawFilePackRule) && IsCollectAsset(group, assetPath))
+				if (IsValidateAsset(assetPath, isRawFilePackRule) && IsCollectAsset(assetPath))
 				{
 					var collectAssetInfo = CreateCollectAssetInfo(command, group, assetPath, isRawFilePackRule);
 					result.Add(assetPath, collectAssetInfo);
@@ -204,12 +204,6 @@ 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
@@ -294,11 +288,11 @@ namespace YooAsset.Editor
 
 			return true;
 		}
-		private bool IsCollectAsset(AssetBundleCollectorGroup group, string assetPath)
+		private bool IsCollectAsset(string assetPath)
 		{
 			// 根据规则设置过滤资源文件
 			IFilterRule filterRuleInstance = AssetBundleCollectorSettingData.GetFilterRuleInstance(FilterRuleName);
-			return filterRuleInstance.IsCollectAsset(new FilterRuleData(assetPath, CollectPath, group.GroupName, UserData));
+			return filterRuleInstance.IsCollectAsset(new FilterRuleData(assetPath));
 		}
 		private string GetAddress(CollectCommand command, AssetBundleCollectorGroup group, string assetPath)
 		{
@@ -342,13 +336,11 @@ 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/AssetBundleCollectorConfig.cs

@@ -15,8 +15,6 @@ namespace YooAsset.Editor
 		public const string XmlVersion = "Version";
 		public const string XmlCommon = "Common";
 		public const string XmlEnableAddressable = "AutoAddressable";
-		public const string XmlLocationToLower = "LocationToLower";
-		public const string XmlIncludeAssetGUID = "IncludeAssetGUID";
 		public const string XmlUniqueBundleName = "UniqueBundleName";
 		public const string XmlShowPackageView = "ShowPackageView";
 		public const string XmlShowEditorAlias = "ShowEditorAlias";
@@ -68,8 +66,6 @@ namespace YooAsset.Editor
 
 			// 读取公共配置
 			bool enableAddressable = false;
-			bool locationToLower = false;
-			bool includeAssetGUID = false;
 			bool uniqueBundleName = false;
 			bool showPackageView = false;
 			bool showEditorAlias = false;
@@ -77,18 +73,19 @@ namespace YooAsset.Editor
 			if (commonNodeList.Count > 0)
 			{
 				XmlElement commonElement = commonNodeList[0] as XmlElement;
-				if (commonElement.HasAttribute(XmlEnableAddressable))
-					enableAddressable = commonElement.GetAttribute(XmlEnableAddressable) == "True" ? true : false;
-				if (commonElement.HasAttribute(XmlLocationToLower))
-					locationToLower = commonElement.GetAttribute(XmlLocationToLower) == "True" ? true : false;
-				if (commonElement.HasAttribute(XmlIncludeAssetGUID))
-					includeAssetGUID = commonElement.GetAttribute(XmlIncludeAssetGUID) == "True" ? true : false;
-				if (commonElement.HasAttribute(XmlUniqueBundleName))
-					uniqueBundleName = commonElement.GetAttribute(XmlUniqueBundleName) == "True" ? true : false;
-				if (commonElement.HasAttribute(XmlShowPackageView))
-					showPackageView = commonElement.GetAttribute(XmlShowPackageView) == "True" ? true : false;
-				if (commonElement.HasAttribute(XmlShowEditorAlias))
-					showEditorAlias = commonElement.GetAttribute(XmlShowEditorAlias) == "True" ? true : false;
+				if (commonElement.HasAttribute(XmlEnableAddressable) == false)
+					throw new Exception($"Not found attribute {XmlEnableAddressable} in {XmlCommon}");
+				if (commonElement.HasAttribute(XmlUniqueBundleName) == false)
+					throw new Exception($"Not found attribute {XmlUniqueBundleName} in {XmlCommon}");
+				if (commonElement.HasAttribute(XmlShowPackageView) == false)
+					throw new Exception($"Not found attribute {XmlShowPackageView} in {XmlCommon}");
+				if (commonElement.HasAttribute(XmlShowEditorAlias) == false)
+					throw new Exception($"Not found attribute {XmlShowEditorAlias} in {XmlCommon}");
+
+				enableAddressable = commonElement.GetAttribute(XmlEnableAddressable) == "True" ? true : false;
+				uniqueBundleName = commonElement.GetAttribute(XmlUniqueBundleName) == "True" ? true : false;
+				showPackageView = commonElement.GetAttribute(XmlShowPackageView) == "True" ? true : false;
+				showEditorAlias = commonElement.GetAttribute(XmlShowEditorAlias) == "True" ? true : false;
 			}
 
 			// 读取包裹配置
@@ -165,7 +162,7 @@ namespace YooAsset.Editor
 			}
 
 			// 检测配置错误
-			foreach (var package in packages)
+			foreach(var package in packages)
 			{
 				package.CheckConfigError();
 			}
@@ -173,8 +170,6 @@ namespace YooAsset.Editor
 			// 保存配置数据
 			AssetBundleCollectorSettingData.ClearAll();
 			AssetBundleCollectorSettingData.Setting.EnableAddressable = enableAddressable;
-			AssetBundleCollectorSettingData.Setting.LocationToLower = locationToLower;
-			AssetBundleCollectorSettingData.Setting.IncludeAssetGUID = includeAssetGUID;
 			AssetBundleCollectorSettingData.Setting.UniqueBundleName = uniqueBundleName;
 			AssetBundleCollectorSettingData.Setting.ShowPackageView = showPackageView;
 			AssetBundleCollectorSettingData.Setting.ShowEditorAlias = showEditorAlias;
@@ -206,8 +201,6 @@ namespace YooAsset.Editor
 			// 设置公共配置
 			var commonElement = xmlDoc.CreateElement(XmlCommon);
 			commonElement.SetAttribute(XmlEnableAddressable, AssetBundleCollectorSettingData.Setting.EnableAddressable.ToString());
-			commonElement.SetAttribute(XmlLocationToLower, AssetBundleCollectorSettingData.Setting.LocationToLower.ToString());
-			commonElement.SetAttribute(XmlIncludeAssetGUID, AssetBundleCollectorSettingData.Setting.IncludeAssetGUID.ToString());
 			commonElement.SetAttribute(XmlUniqueBundleName, AssetBundleCollectorSettingData.Setting.UniqueBundleName.ToString());
 			commonElement.SetAttribute(XmlShowPackageView, AssetBundleCollectorSettingData.Setting.ShowPackageView.ToString());
 			commonElement.SetAttribute(XmlShowEditorAlias, AssetBundleCollectorSettingData.Setting.ShowEditorAlias.ToString());
@@ -366,14 +359,14 @@ namespace YooAsset.Editor
 			}
 
 			// 2.3 -> 2.4
-			if (configVersion == "2.3")
+			if(configVersion == "2.3")
 			{
 				// 获取所有分组元素
 				var groupNodeList = root.GetElementsByTagName(XmlGroup);
 				foreach (var groupNode in groupNodeList)
 				{
 					XmlElement groupElement = groupNode as XmlElement;
-					if (groupElement.HasAttribute(XmlGroupActiveRule) == false)
+					if(groupElement.HasAttribute(XmlGroupActiveRule) == false)
 						groupElement.SetAttribute(XmlGroupActiveRule, $"{nameof(EnableGroup)}");
 				}
 

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorGroup.cs

@@ -43,10 +43,7 @@ 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();
@@ -106,9 +103,6 @@ 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,9 +83,6 @@ 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

@@ -10,25 +10,15 @@ namespace YooAsset.Editor
 	public class AssetBundleCollectorSetting : ScriptableObject
 	{
 		/// <summary>
-		/// 显示包裹列表视图
+		/// 是否显示包裹列表视图
 		/// </summary>
 		public bool ShowPackageView = false;
 
 		/// <summary>
-		/// 启用可寻址资源定位
+		/// 是否启用可寻址资源定位
 		/// </summary>
 		public bool EnableAddressable = false;
 
-		/// <summary>
-		/// 资源定位地址大小写不敏感
-		/// </summary>
-		public bool LocationToLower = false;
-
-		/// <summary>
-		/// 包含资源GUID数据
-		/// </summary>
-		public bool IncludeAssetGUID = false;
-
 		/// <summary>
 		/// 资源包名唯一化
 		/// </summary>
@@ -51,28 +41,14 @@ namespace YooAsset.Editor
 		/// </summary>
 		public void ClearAll()
 		{
-			ShowPackageView = false;
 			EnableAddressable = false;
-			LocationToLower = false;
-			IncludeAssetGUID = false;
-			UniqueBundleName = false;
-			ShowEditorAlias = false;
 			Packages.Clear();
 		}
 
 		/// <summary>
-		/// 检测包裹配置错误
+		/// 检测配置错误
 		/// </summary>
-		public void CheckPackageConfigError(string packageName)
-		{
-			var package = GetPackage(packageName);
-			package.CheckConfigError();
-		}
-
-		/// <summary>
-		/// 检测所有配置错误
-		/// </summary>
-		public void CheckAllPackageConfigError()
+		public void CheckConfigError()
 		{
 			foreach (var package in Packages)
 			{
@@ -81,9 +57,9 @@ namespace YooAsset.Editor
 		}
 
 		/// <summary>
-		/// 修复所有配置错误
+		/// 修复配置错误
 		/// </summary>
-		public bool FixAllPackageConfigError()
+		public bool FixConfigError()
 		{
 			bool isFixed = false;
 			foreach (var package in Packages)
@@ -101,8 +77,16 @@ namespace YooAsset.Editor
 		/// </summary>
 		public List<string> GetPackageAllTags(string packageName)
 		{
-			var package = GetPackage(packageName);
-			return package.GetAllTags();
+			foreach (var package in Packages)
+			{
+				if (package.PackageName == packageName)
+				{
+					return package.GetAllTags();
+				}
+			}
+
+			Debug.LogWarning($"Not found package : {packageName}");
+			return new List<string>();
 		}
 
 		/// <summary>
@@ -111,27 +95,20 @@ namespace YooAsset.Editor
 		public CollectResult GetPackageAssets(EBuildMode buildMode, string packageName)
 		{
 			if (string.IsNullOrEmpty(packageName))
-				throw new Exception("Build package name is null or empty !");
+				throw new Exception("Build package name is null or mepty !");
 
-			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, 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,8 +94,7 @@ namespace YooAsset.Editor
 					typeof(AddressByFileName),
 					typeof(AddressByFilePath),
 					typeof(AddressByFolderAndFileName),
-					typeof(AddressByGroupAndFileName),
-					typeof(AddressDisable)
+					typeof(AddressByGroupAndFileName)
 				};
 
 				var customTypes = EditorTools.GetAssignableTypes(typeof(IAddressRule));
@@ -162,7 +161,7 @@ namespace YooAsset.Editor
 		/// </summary>
 		public static void FixFile()
 		{
-			bool isFixed = Setting.FixAllPackageConfigError();
+			bool isFixed = Setting.FixConfigError();
 			if (isFixed)
 			{
 				IsDirty = true;
@@ -332,16 +331,6 @@ namespace YooAsset.Editor
 			Setting.EnableAddressable = enableAddressable;
 			IsDirty = true;
 		}
-		public static void ModifyLocationToLower(bool locationToLower)
-		{
-			Setting.LocationToLower = locationToLower;
-			IsDirty = true;
-		}
-		public static void ModifyIncludeAssetGUID(bool includeAssetGUID)
-		{
-			Setting.IncludeAssetGUID = includeAssetGUID;
-			IsDirty = true;
-		}
 		public static void ModifyUniqueBundleName(bool uniqueBundleName)
 		{
 			Setting.UniqueBundleName = uniqueBundleName;

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs

@@ -25,14 +25,8 @@ namespace YooAsset.Editor
 		private List<RuleDisplayName> _packRuleList;
 		private List<RuleDisplayName> _filterRuleList;
 
-		private Button _settingsButton;
-		private VisualElement _helpBoxContainer;
-		private VisualElement _setting1Container;
-		private VisualElement _setting2Container;
 		private Toggle _showPackageToogle;
 		private Toggle _enableAddressableToogle;
-		private Toggle _locationToLowerToogle;
-		private Toggle _includeAssetGUIDToogle;
 		private Toggle _uniqueBundleNameToogle;
 		private Toggle _showEditorAliasToggle;
 
@@ -53,7 +47,6 @@ namespace YooAsset.Editor
 
 		private int _lastModifyPackageIndex = 0;
 		private int _lastModifyGroupIndex = 0;
-		private bool _showSettings = false;
 
 
 		public void CreateGUI()
@@ -83,14 +76,7 @@ namespace YooAsset.Editor
 
 				visualAsset.CloneTree(root);
 
-				// 警示栏
-				_helpBoxContainer = root.Q("HelpBoxContainer");
-
 				// 公共设置相关
-				_settingsButton = root.Q<Button>("SettingsButton");
-				_settingsButton.clicked += SettingsBtn_clicked;
-				_setting1Container = root.Q("PublicContainer1");
-				_setting2Container = root.Q("PublicContainer2");
 				_showPackageToogle = root.Q<Toggle>("ShowPackages");
 				_showPackageToogle.RegisterValueChangedCallback(evt =>
 				{
@@ -103,24 +89,13 @@ namespace YooAsset.Editor
 					AssetBundleCollectorSettingData.ModifyAddressable(evt.newValue);
 					RefreshWindow();
 				});
-				_locationToLowerToogle = root.Q<Toggle>("LocationToLower");
-				_locationToLowerToogle.RegisterValueChangedCallback(evt =>
-				{
-					AssetBundleCollectorSettingData.ModifyLocationToLower(evt.newValue);
-					RefreshWindow();
-				});
-				_includeAssetGUIDToogle = root.Q<Toggle>("IncludeAssetGUID");
-				_includeAssetGUIDToogle.RegisterValueChangedCallback(evt =>
-				{
-					AssetBundleCollectorSettingData.ModifyIncludeAssetGUID(evt.newValue);
-					RefreshWindow();
-				});
 				_uniqueBundleNameToogle = root.Q<Toggle>("UniqueBundleName");
 				_uniqueBundleNameToogle.RegisterValueChangedCallback(evt =>
 				{
 					AssetBundleCollectorSettingData.ModifyUniqueBundleName(evt.newValue);
 					RefreshWindow();
 				});
+
 				_showEditorAliasToggle = root.Q<Toggle>("ShowEditorAlias");
 				_showEditorAliasToggle.RegisterValueChangedCallback(evt =>
 				{
@@ -327,42 +302,9 @@ namespace YooAsset.Editor
 		{
 			_showPackageToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.ShowPackageView);
 			_enableAddressableToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.EnableAddressable);
-			_locationToLowerToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.LocationToLower);
-			_includeAssetGUIDToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.IncludeAssetGUID);
 			_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;
-				_setting2Container.style.display = DisplayStyle.Flex;
-			}
-			else
-			{
-				_setting1Container.style.display = DisplayStyle.None;
-				_setting2Container.style.display = DisplayStyle.None;
-			}
-
 			_groupContainer.visible = false;
 			_collectorContainer.visible = false;
 
@@ -394,11 +336,6 @@ namespace YooAsset.Editor
 		{
 			AssetBundleCollectorSettingData.SaveFile();
 		}
-		private void SettingsBtn_clicked()
-		{
-			_showSettings = !_showSettings;
-			RefreshWindow();
-		}
 		private string FormatListItemCallback(RuleDisplayName ruleDisplayName)
 		{
 			if (_showEditorAliasToggle.value)
@@ -859,8 +796,7 @@ namespace YooAsset.Editor
 
 				try
 				{
-					CollectCommand command = new CollectCommand(EBuildMode.SimulateBuild, _packageNameTxt.value,
-						_enableAddressableToogle.value, _locationToLowerToogle.value, _includeAssetGUIDToogle.value, _uniqueBundleNameToogle.value);
+					CollectCommand command = new CollectCommand(EBuildMode.SimulateBuild, _packageNameTxt.value, _enableAddressableToogle.value, _uniqueBundleNameToogle.value);
 					collectAssetInfos = collector.GetAllCollectAssets(command, group);
 				}
 				catch (System.Exception e)

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.uxml

@@ -1,23 +1,15 @@
-<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" 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:Button text="Save" display-tooltip-when-elided="true" name="SaveButton" style="width: 50px; background-color: rgb(56, 147, 58);" />
         <ui:Button text="导出" display-tooltip-when-elided="true" name="ExportButton" style="width: 50px; background-color: rgb(56, 147, 58);" />
         <ui:Button text="导入" display-tooltip-when-elided="true" name="ImportButton" style="width: 50px; background-color: rgb(56, 147, 58);" />
         <ui:Button text="修复" display-tooltip-when-elided="true" name="FixButton" style="width: 50px; background-color: rgb(56, 147, 58);" />
     </uie:Toolbar>
-    <ui:VisualElement name="PublicContainer" style="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;" />
-            <ui:Toggle label="Show Editor Alias" name="ShowEditorAlias" style="width: 196px; -unity-text-align: middle-left;" />
-            <ui:Toggle label="Enable Addressable" name="EnableAddressable" style="width: 196px; -unity-text-align: middle-left;" />
-            <ui:Toggle label="Unique Bundle Name" name="UniqueBundleName" style="width: 196px; -unity-text-align: middle-left;" />
-        </ui:VisualElement>
-        <ui:VisualElement name="PublicContainer2" style="flex-direction: row; flex-wrap: nowrap; height: 28px;">
-            <ui:Toggle label="Location To Lower" name="LocationToLower" style="width: 196px; -unity-text-align: middle-left;" />
-            <ui:Toggle label="Include Asset GUID" name="IncludeAssetGUID" style="width: 196px; -unity-text-align: middle-left;" />
-        </ui:VisualElement>
+    <ui:VisualElement name="PublicContainer" style="height: 30px; background-color: rgb(67, 67, 67); flex-direction: row; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">
+        <ui:Toggle label="Show Packages" name="ShowPackages" style="width: 196px; -unity-text-align: middle-left;" />
+        <ui:Toggle label="Show Editor Alias" name="ShowEditorAlias" style="width: 196px; -unity-text-align: middle-left;" />
+        <ui:Toggle label="Enable Addressable" name="EnableAddressable" style="width: 196px; -unity-text-align: middle-left;" />
+        <ui:Toggle label="Unique Bundle Name" name="UniqueBundleName" style="width: 196px; -unity-text-align: middle-left;" />
     </ui:VisualElement>
     <ui:VisualElement name="ContentContainer" style="flex-grow: 1; flex-direction: row;">
         <ui:VisualElement name="PackageContainer" style="width: 200px; flex-grow: 0; background-color: rgb(67, 67, 67); border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">

Assets/YooAsset/Editor/AssetBundleCollector/CollectCommand.cs

@@ -14,20 +14,10 @@ namespace YooAsset.Editor
 		public string PackageName { private set; get; }
 
 		/// <summary>
-		/// 启用可寻址资源定位
+		/// 是否启用可寻址资源定位
 		/// </summary>
 		public bool EnableAddressable { private set; get; }
 
-		/// <summary>
-		/// 资源定位地址大小写不敏感
-		/// </summary>
-		public bool LocationToLower { private set; get; }
-
-		/// <summary>
-		/// 包含资源GUID数据
-		/// </summary>
-		public bool IncludeAssetGUID { private set; get; }
-
 		/// <summary>
 		/// 资源包名唯一化
 		/// </summary>
@@ -39,13 +29,11 @@ namespace YooAsset.Editor
 		public string ShadersBundleName { private set; get; }
 
 
-		public CollectCommand(EBuildMode buildMode, string packageName, bool enableAddressable, bool locationToLower, bool includeAssetGUID, bool uniqueBundleName)
+		public CollectCommand(EBuildMode buildMode, string packageName, bool enableAddressable, bool uniqueBundleName)
 		{
 			BuildMode = buildMode;
 			PackageName = packageName;
 			EnableAddressable = enableAddressable;
-			LocationToLower = locationToLower;
-			IncludeAssetGUID = includeAssetGUID;
 			UniqueBundleName = uniqueBundleName;
 
 			// 着色器统一全名称

Assets/YooAsset/Editor/AssetBundleCollector/DefaultAddressRule.cs

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

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

@@ -1,31 +0,0 @@
-using System;
-using System.IO;
-using UnityEditor;
-
-namespace YooAsset.Editor
-{
-	/// <summary>
-	/// 零冗余的共享资源打包规则
-	/// </summary>
-	public class ZeroRedundancySharedPackRule : ISharedPackRule
-	{
-		public PackRuleResult GetPackRuleResult(string assetPath)
-		{
-			string bundleName = Path.GetDirectoryName(assetPath);
-			PackRuleResult result = new PackRuleResult(bundleName, DefaultPackRule.AssetBundleFileExtension);
-			return result;
-		}
-	}
-	
-	/// <summary>
-	/// 全部冗余的共享资源打包规则
-	/// </summary>
-	public class FullRedundancySharedPackRule : ISharedPackRule
-	{
-		public PackRuleResult GetPackRuleResult(string assetPath)
-		{
-			PackRuleResult result = new PackRuleResult(string.Empty, string.Empty);
-			return result;
-		}
-	}
-}

Assets/YooAsset/Editor/AssetBundleCollector/DefaultShareAssetPackRule.cs

@@ -0,0 +1,16 @@
+using System;
+using System.IO;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+	public class DefaultShareAssetPackRule : IShareAssetPackRule
+	{
+		public PackRuleResult GetPackRuleResult(string assetPath)
+		{
+			string bundleName = Path.GetDirectoryName(assetPath);
+			PackRuleResult result = new PackRuleResult(bundleName, DefaultPackRule.AssetBundleFileExtension);
+			return result;
+		}
+	}
+}

Assets/YooAsset/Editor/AssetBundleCollector/IFilterRule.cs

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

Assets/YooAsset/Editor/AssetBundleCollector/IPackRule.cs

@@ -8,6 +8,13 @@ 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;
@@ -41,16 +48,12 @@ namespace YooAsset.Editor
 				fullName = $"{bundleName}.{_bundleExtension}";
 			return fullName.ToLower();
 		}
-
+		
 		/// <summary>
 		/// 获取共享资源包全名称
 		/// </summary>
 		public string GetShareBundleName(string packageName, bool uniqueBundleName)
 		{
-			// 注意：冗余的共享资源包名返回空
-			if (string.IsNullOrEmpty(_bundleName) && string.IsNullOrEmpty(_bundleExtension))
-				return string.Empty;
-
 			string fullName;
 			string bundleName = EditorTools.GetRegularPath(_bundleName).Replace('/', '_').Replace('.', '_').ToLower();
 			if (uniqueBundleName)

Assets/YooAsset/Editor/AssetBundleCollector/IShareAssetPackRule.cs

@@ -4,7 +4,7 @@ namespace YooAsset.Editor
 	/// <summary>
 	/// 共享资源的打包规则
 	/// </summary>
-	public interface ISharedPackRule
+	public interface IShareAssetPackRule
 	{
 		/// <summary>
 		/// 获取打包规则结果

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

@@ -349,24 +349,10 @@ 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();
@@ -390,16 +376,6 @@ 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";
@@ -421,10 +397,6 @@ 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: 8875000dff445624da4d6a2d6ef2f446
+guid: a0319abb8eae03b4b88e8f900fe2276c
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -12,7 +12,6 @@
     <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: cf2a9340bb457594d9bc1f80b84a89f6
+guid: 56d6dbe0d65ce334a8996beb19612989
 ScriptedImporter:
   internalIDToNameTable: []
   externalObjects: {}

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

@@ -66,13 +66,11 @@ namespace YooAsset.Editor
 			_items.Add(new ItemWrapper("包裹名称", buildReport.Summary.BuildPackageName));
 			_items.Add(new ItemWrapper("包裹版本", buildReport.Summary.BuildPackageVersion));
 
-			_items.Add(new ItemWrapper(string.Empty, string.Empty));
 			_items.Add(new ItemWrapper("启用可寻址资源定位", $"{buildReport.Summary.EnableAddressable}"));
-			_items.Add(new ItemWrapper("资源定位地址大小写不敏感", $"{buildReport.Summary.LocationToLower}"));
-			_items.Add(new ItemWrapper("包含资源GUID数据", $"{buildReport.Summary.IncludeAssetGUID}"));
 			_items.Add(new ItemWrapper("资源包名唯一化", $"{buildReport.Summary.UniqueBundleName}"));
-			_items.Add(new ItemWrapper("共享资源打包规则", buildReport.Summary.SharedPackRuleClassName));
-			_items.Add(new ItemWrapper("资源加密服务类", buildReport.Summary.EncryptionServicesClassName));
+			_items.Add(new ItemWrapper("自动分析冗余资源", $"{buildReport.Summary.AutoAnalyzeRedundancy}"));
+			_items.Add(new ItemWrapper("共享资源的打包类名称", buildReport.Summary.ShareAssetPackRuleClassName));
+			_items.Add(new ItemWrapper("加密服务类名称", buildReport.Summary.EncryptionServicesClassName));
 
 			_items.Add(new ItemWrapper(string.Empty, string.Empty));
 			_items.Add(new ItemWrapper("构建参数", string.Empty));

Assets/YooAsset/Editor/EditorTools.cs

@@ -35,20 +35,10 @@ namespace YooAsset.Editor
 			TypeCache.TypeCollection collection = TypeCache.GetTypesDerivedFrom(parentType);
 			return collection.ToList();
 		}
-
-		/// <summary>
-		/// 获取带有指定属性的所有类的类型
-		/// </summary>
-		public static List<Type> GetTypesWithAttribute(System.Type attrType)
-		{
-			TypeCache.TypeCollection collection = TypeCache.GetTypesWithAttribute(attrType);
-			return collection.ToList();
-		}
 #else
 		private static readonly List<Type> _cacheTypes = new List<Type>(10000);
 		private static void InitAssembly()
 		{
-			_cacheTypes.Clear();
 			Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies();
 			foreach (Assembly assembly in assemblies)
 			{
@@ -75,23 +65,6 @@ namespace YooAsset.Editor
 			}
 			return result;
 		}
-
-		/// <summary>
-		/// 获取带有指定属性的所有类的类型
-		/// </summary>
-		public static List<Type> GetTypesWithAttribute(System.Type attrType)
-		{
-			List<Type> result = new List<Type>();
-			for (int i = 0; i < _cacheTypes.Count; i++)
-			{
-				Type type = _cacheTypes[i];
-				if (type.GetCustomAttribute(attrType) != null)
-				{
-					result.Add(type);
-				}
-			}
-			return result;
-		}
 #endif
 
 		/// <summary>
@@ -153,7 +126,7 @@ namespace YooAsset.Editor
 				guids = AssetDatabase.FindAssets($"t:{searchType}", searchInFolders);
 
 			// 注意：AssetDatabase.FindAssets()可能会获取到重复的资源
-			HashSet<string> result = new HashSet<string>();
+			List<string> result = new List<string>();
 			for (int i = 0; i < guids.Length; i++)
 			{
 				string guid = guids[i];
@@ -240,11 +213,11 @@ namespace YooAsset.Editor
 		public static void FocusUnitySceneWindow()
 		{
 			EditorWindow.FocusWindowIfItsOpen<SceneView>();
-		}
-		public static void CloseUnityGameWindow()
-		{
-			System.Type T = Assembly.Load("UnityEditor").GetType("UnityEditor.GameView");
-			EditorWindow.GetWindow(T, false, "GameView", true).Close();
+		} 
+		public static void CloseUnityGameWindow() 
+		{ 
+			System.Type T = Assembly.Load("UnityEditor").GetType("UnityEditor.GameView"); 
+			EditorWindow.GetWindow(T, false, "GameView", true).Close(); 
 		}
 		public static void FocusUnityGameWindow()
 		{
@@ -426,7 +399,7 @@ namespace YooAsset.Editor
 			FileInfo fileInfo = new FileInfo(filePath);
 			fileInfo.MoveTo(destPath);
 		}
-
+		
 		/// <summary>
 		/// 拷贝文件夹
 		/// 注意：包括所有子目录的文件

Assets/YooAsset/Editor/ShaderVariantCollector/ShaderVariantCollectionManifest.cs

@@ -30,22 +30,17 @@ namespace YooAsset.Editor
 		public class ShaderVariantInfo
 		{
 			/// <summary>
-			/// 着色器资源路径.
+			/// Shader asset path in editor.
 			/// </summary>
 			public string AssetPath;
 
 			/// <summary>
-			/// 着色器名称
+			/// Shader name.
 			/// </summary>
 			public string ShaderName;
 
 			/// <summary>
-			/// 着色器变种总数
-			/// </summary>
-			public int ShaderVariantCount = 0;
-
-			/// <summary>
-			/// 着色器变种列表
+			/// Shader variants elements list.
 			/// </summary>
 			public List<ShaderVariantElement> ShaderVariantElements = new List<ShaderVariantElement>(1000);
 		}
@@ -76,7 +71,6 @@ 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/AssetReference.cs

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

Assets/YooAsset/Runtime/AssetSystem/AssetSystem.cs

@@ -79,6 +79,30 @@ namespace YooAsset
 			_isUnloadSafe = true;
 		}
 
+		/// <summary>
+		/// 销毁
+		/// </summary>
+		public void DestroyAll()
+		{
+			foreach (var provider in _providerList)
+			{
+				provider.Destroy();
+			}
+			_providerList.Clear();
+			_providerDic.Clear();
+
+			foreach (var loader in _loaderList)
+			{
+				loader.Destroy(true);
+			}
+			_loaderList.Clear();
+			_loaderDic.Clear();
+
+			ClearSceneHandle();
+			DecryptionServices = null;
+			BundleServices = null;
+		}
+
 		/// <summary>
 		/// 资源回收（卸载引用计数为零的资源）
 		/// </summary>
@@ -111,7 +135,7 @@ namespace YooAsset
 				if (loader.CanDestroy())
 				{
 					string bundleName = loader.MainBundleInfo.Bundle.BundleName;
-					loader.Destroy();
+					loader.Destroy(false);
 					_loaderList.RemoveAt(i);
 					_loaderDic.Remove(bundleName);
 				}
@@ -123,18 +147,13 @@ namespace YooAsset
 		/// </summary>
 		public void ForceUnloadAllAssets()
 		{
-#if UNITY_WEBGL
-			throw new Exception($"WebGL not support invoke {nameof(ForceUnloadAllAssets)}");
-#else
 			foreach (var provider in _providerList)
 			{
-				provider.WaitForAsyncComplete();
 				provider.Destroy();
 			}
 			foreach (var loader in _loaderList)
 			{
-				loader.WaitForAsyncComplete();
-				loader.Destroy();
+				loader.Destroy(true);
 			}
 
 			_providerList.Clear();
@@ -145,13 +164,12 @@ namespace YooAsset
 
 			// 注意：调用底层接口释放所有资源
 			Resources.UnloadUnusedAssets();
-#endif
 		}
 
 		/// <summary>
 		/// 加载场景
 		/// </summary>
-		public SceneOperationHandle LoadSceneAsync(AssetInfo assetInfo, LoadSceneMode sceneMode, bool suspendLoad, int priority)
+		public SceneOperationHandle LoadSceneAsync(AssetInfo assetInfo, LoadSceneMode sceneMode, bool activateOnLoad, int priority)
 		{
 			if (assetInfo.IsInvalid)
 			{
@@ -172,9 +190,9 @@ namespace YooAsset
 			ProviderBase provider;
 			{
 				if (_simulationOnEditor)
-					provider = new DatabaseSceneProvider(this, providerGUID, assetInfo, sceneMode, suspendLoad, priority);
+					provider = new DatabaseSceneProvider(this, providerGUID, assetInfo, sceneMode, activateOnLoad, priority);
 				else
-					provider = new BundledSceneProvider(this, providerGUID, assetInfo, sceneMode, suspendLoad, priority);
+					provider = new BundledSceneProvider(this, providerGUID, assetInfo, sceneMode, activateOnLoad, priority);
 				provider.InitSpawnDebugInfo();
 				_providerList.Add(provider);
 				_providerDic.Add(providerGUID, provider);
@@ -242,34 +260,6 @@ namespace YooAsset
 			return provider.CreateHandle<SubAssetsOperationHandle>();
 		}
 
-		/// <summary>
-		/// 加载所有资源对象
-		/// </summary>
-		public AllAssetsOperationHandle LoadAllAssetsAsync(AssetInfo assetInfo)
-		{
-			if (assetInfo.IsInvalid)
-			{
-				YooLogger.Error($"Failed to load all assets ! {assetInfo.Error}");
-				CompletedProvider completedProvider = new CompletedProvider(assetInfo);
-				completedProvider.SetCompleted(assetInfo.Error);
-				return completedProvider.CreateHandle<AllAssetsOperationHandle>();
-			}
-
-			string providerGUID = assetInfo.GUID;
-			ProviderBase provider = TryGetProvider(providerGUID);
-			if (provider == null)
-			{
-				if (_simulationOnEditor)
-					provider = new DatabaseAllAssetsProvider(this, providerGUID, assetInfo);
-				else
-					provider = new BundledAllAssetsProvider(this, providerGUID, assetInfo);
-				provider.InitSpawnDebugInfo();
-				_providerList.Add(provider);
-				_providerDic.Add(providerGUID, provider);
-			}
-			return provider.CreateHandle<AllAssetsOperationHandle>();
-		}
-
 		/// <summary>
 		/// 加载原生文件
 		/// </summary>
@@ -387,10 +377,10 @@ namespace YooAsset
 			else
 			{
 #if UNITY_WEBGL
-				if (bundleInfo.Bundle.IsRawFile)
-					loader = new RawBundleWebLoader(this, bundleInfo);
-				else
-					loader = new AssetBundleWebLoader(this, bundleInfo);
+			if (bundleInfo.Bundle.IsRawFile)
+				loader = new RawBundleWebLoader(this, bundleInfo);
+			else
+				loader = new AssetBundleWebLoader(this, bundleInfo);
 #else
 				if (bundleInfo.Bundle.IsRawFile)
 					loader = new RawBundleFileLoader(this, bundleInfo);

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

@@ -1,80 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace YooAsset
-{
-	public sealed class AllAssetsOperationHandle : OperationHandleBase, IDisposable
-	{
-		private System.Action<AllAssetsOperationHandle> _callback;
-
-		internal AllAssetsOperationHandle(ProviderBase provider) : base(provider)
-		{
-		}
-		internal override void InvokeCallback()
-		{
-			_callback?.Invoke(this);
-		}
-		
-		/// <summary>
-		/// 完成委托
-		/// </summary>
-		public event System.Action<AllAssetsOperationHandle> Completed
-		{
-			add
-			{
-				if (IsValidWithWarning == false)
-					throw new System.Exception($"{nameof(AllAssetsOperationHandle)} is invalid");
-				if (Provider.IsDone)
-					value.Invoke(this);
-				else
-					_callback += value;
-			}
-			remove
-			{
-				if (IsValidWithWarning == false)
-					throw new System.Exception($"{nameof(AllAssetsOperationHandle)} is invalid");
-				_callback -= value;
-			}
-		}
-
-		/// <summary>
-		/// 等待异步执行完毕
-		/// </summary>
-		public void WaitForAsyncComplete()
-		{
-			if (IsValidWithWarning == false)
-				return;
-			Provider.WaitForAsyncComplete();
-		}
-
-		/// <summary>
-		/// 释放资源句柄
-		/// </summary>
-		public void Release()
-		{
-			this.ReleaseInternal();
-		}
-
-		/// <summary>
-		/// 释放资源句柄
-		/// </summary>
-		public void Dispose()
-		{
-			this.ReleaseInternal();
-		}
-
-
-		/// <summary>
-		/// 子资源对象集合
-		/// </summary>
-		public UnityEngine.Object[] AllAssetObjects
-		{
-			get
-			{
-				if (IsValidWithWarning == false)
-					return null;
-				return Provider.AllAssetObjects;
-			}
-		}
-	}
-}

Assets/YooAsset/Runtime/AssetSystem/Handles/AllAssetsOperationHandle.cs.meta

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

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

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

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

@@ -73,7 +73,9 @@ namespace YooAsset
 			if (IsValidWithWarning == false)
 				return null;
 			string filePath = Provider.RawFilePath;
-			return FileUtility.ReadAllBytes(filePath);
+			if (File.Exists(filePath) == false)
+				return null;
+			return File.ReadAllBytes(filePath);
 		}
 
 		/// <summary>

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

@@ -3,7 +3,7 @@
 namespace YooAsset
 {
 	public class SceneOperationHandle : OperationHandleBase
-	{
+	{	
 		private System.Action<SceneOperationHandle> _callback;
 		internal string PackageName { set; get; }
 
@@ -51,7 +51,7 @@ namespace YooAsset
 		}
 
 		/// <summary>
-		/// 激活场景（当同时存在多个场景时用于切换激活场景）
+		/// 激活场景
 		/// </summary>
 		public bool ActivateScene()
 		{
@@ -69,38 +69,6 @@ namespace YooAsset
 			}
 		}
 
-		/// <summary>
-		/// 解除场景加载挂起操作
-		/// </summary>
-		public bool UnSuspend()
-		{
-			if (IsValidWithWarning == false)
-				return false;
-
-			if (SceneObject.IsValid())
-			{
-				if (Provider is DatabaseSceneProvider)
-				{
-					var temp = Provider as DatabaseSceneProvider;
-					return temp.UnSuspendLoad();
-				}
-				else if (Provider is BundledSceneProvider)
-				{
-					var temp = Provider as BundledSceneProvider;
-					return temp.UnSuspendLoad();
-				}
-				else
-				{
-					throw new System.NotImplementedException();
-				}
-			}
-			else
-			{
-				YooLogger.Warning($"Scene is invalid : {SceneObject.name}");
-				return false;
-			}
-		}
-
 		/// <summary>
 		/// 是否为主场景
 		/// </summary>

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

@@ -15,8 +15,7 @@ namespace YooAsset
 			CheckDownload,
 			Unpack,
 			CheckUnpack,
-			LoadBundleFile,
-			LoadDeliveryFile,
+			LoadFile,
 			CheckLoadFile,
 			Done,
 		}
@@ -60,24 +59,19 @@ namespace YooAsset
 					}
 					else
 					{
-						_steps = ESteps.LoadBundleFile;
+						_steps = ESteps.LoadFile;
 						FileLoadPath = MainBundleInfo.Bundle.StreamingFilePath;
 					}
 #else
-					_steps = ESteps.LoadBundleFile;
+					_steps = ESteps.LoadFile;
 					FileLoadPath = MainBundleInfo.Bundle.StreamingFilePath;
 #endif
 				}
 				else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromCache)
 				{
-					_steps = ESteps.LoadBundleFile;
+					_steps = ESteps.LoadFile;
 					FileLoadPath = MainBundleInfo.Bundle.CachedDataFilePath;
 				}
-				else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromDelivery)
-				{
-					_steps = ESteps.LoadDeliveryFile;
-					FileLoadPath = MainBundleInfo.DeliveryFilePath;
-				}
 				else
 				{
 					throw new System.NotImplementedException(MainBundleInfo.LoadMode.ToString());
@@ -88,8 +82,7 @@ namespace YooAsset
 			if (_steps == ESteps.Download)
 			{
 				int failedTryAgain = Impl.DownloadFailedTryAgain;
-				_downloader = DownloadSystem.CreateDownload(MainBundleInfo, failedTryAgain);
-				_downloader.SendRequest();
+				_downloader = DownloadSystem.BeginDownload(MainBundleInfo, failedTryAgain);
 				_steps = ESteps.CheckDownload;
 			}
 
@@ -109,7 +102,7 @@ namespace YooAsset
 				}
 				else
 				{
-					_steps = ESteps.LoadBundleFile;
+					_steps = ESteps.LoadFile;
 					return; //下载完毕等待一帧再去加载！
 				}
 			}
@@ -118,9 +111,8 @@ namespace YooAsset
 			if (_steps == ESteps.Unpack)
 			{
 				int failedTryAgain = Impl.DownloadFailedTryAgain;
-				var bundleInfo = ManifestTools.ConvertToUnpackInfo(MainBundleInfo.Bundle);
-				_unpacker = DownloadSystem.CreateDownload(bundleInfo, failedTryAgain);
-				_unpacker.SendRequest();
+				var bundleInfo = ManifestTools.GetUnpackInfo(MainBundleInfo.Bundle);
+				_unpacker = DownloadSystem.BeginDownload(bundleInfo, failedTryAgain);
 				_steps = ESteps.CheckUnpack;
 			}
 
@@ -140,12 +132,12 @@ namespace YooAsset
 				}
 				else
 				{
-					_steps = ESteps.LoadBundleFile;
+					_steps = ESteps.LoadFile;
 				}
 			}
 
 			// 5. 加载AssetBundle
-			if (_steps == ESteps.LoadBundleFile)
+			if (_steps == ESteps.LoadFile)
 			{
 #if UNITY_EDITOR
 				// 注意：Unity2017.4编辑器模式下，如果AssetBundle文件不存在会导致编辑器崩溃，这里做了预判。
@@ -220,35 +212,7 @@ namespace YooAsset
 				_steps = ESteps.CheckLoadFile;
 			}
 
-			// 6. 加载AssetBundle
-			if (_steps == ESteps.LoadDeliveryFile)
-			{
-				// 设置下载进度
-				DownloadProgress = 1f;
-				DownloadedBytes = (ulong)MainBundleInfo.Bundle.FileSize;
-
-				// Load assetBundle file
-				var loadMethod = (EBundleLoadMethod)MainBundleInfo.Bundle.LoadMethod;
-				if (loadMethod == EBundleLoadMethod.Normal)
-				{
-					ulong offset = MainBundleInfo.DeliveryFileOffset;
-					if (_isWaitForAsyncComplete)
-						CacheBundle = AssetBundle.LoadFromFile(FileLoadPath, 0, offset);
-					else
-						_createRequest = AssetBundle.LoadFromFileAsync(FileLoadPath, 0, offset);
-				}
-				else
-				{
-					_steps = ESteps.Done;
-					Status = EStatus.Failed;
-					LastError = $"Delivery file not support encryption : {MainBundleInfo.Bundle.BundleName}";
-					YooLogger.Error(LastError);
-					return;
-				}
-				_steps = ESteps.CheckLoadFile;
-			}
-
-			// 7. 检测AssetBundle加载结果
+			// 6. 检测AssetBundle加载结果
 			if (_steps == ESteps.CheckLoadFile)
 			{
 				if (_createRequest != null)
@@ -298,9 +262,9 @@ namespace YooAsset
 		/// <summary>
 		/// 销毁
 		/// </summary>
-		public override void Destroy()
+		public override void Destroy(bool forceDestroy)
 		{
-			base.Destroy();
+			base.Destroy(forceDestroy);
 
 			if (_stream != null)
 			{

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

@@ -15,14 +15,21 @@ namespace YooAsset
 		private enum ESteps
 		{
 			None = 0,
-			LoadWebSiteFile,
-			LoadRemoteFile,
-			CheckLoadFile,
+			Download,
+			CheckDownload,
+			LoadCacheFile,
+			CheckLoadCacheFile,
+			LoadWebFile,
+			CheckLoadWebFile,
+			TryLoadWebFile,
 			Done,
 		}
 
 		private ESteps _steps = ESteps.None;
-		private WebDownloader _downloader;
+		private float _tryTimer = 0;
+		private DownloaderBase _downloader;
+		private UnityWebRequest _webRequest;
+		private AssetBundleCreateRequest _createRequest;
 
 
 		public AssetBundleWebLoader(AssetSystemImpl impl, BundleInfo bundleInfo) : base(impl, bundleInfo)
@@ -41,13 +48,18 @@ namespace YooAsset
 			{
 				if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromRemote)
 				{
-					_steps = ESteps.LoadRemoteFile;
-					FileLoadPath = string.Empty;
+					_steps = ESteps.Download;
+					FileLoadPath = MainBundleInfo.Bundle.CachedDataFilePath;
 				}
 				else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromStreaming)
 				{
-					_steps = ESteps.LoadWebSiteFile;
-					FileLoadPath = string.Empty;
+					_steps = ESteps.LoadWebFile;
+					FileLoadPath = MainBundleInfo.Bundle.StreamingFilePath;
+				}
+				else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromCache)
+				{
+					_steps = ESteps.LoadCacheFile;
+					FileLoadPath = MainBundleInfo.Bundle.CachedDataFilePath;
 				}
 				else
 				{
@@ -55,40 +67,96 @@ namespace YooAsset
 				}
 			}
 
-			// 1. 跨域获取资源包
-			if (_steps == ESteps.LoadRemoteFile)
+			// 1. 从服务器下载
+			if (_steps == ESteps.Download)
 			{
 				int failedTryAgain = Impl.DownloadFailedTryAgain;
-				_downloader = DownloadSystem.CreateDownload(MainBundleInfo, failedTryAgain) as WebDownloader;
-				_downloader.SendRequest(true);
-				_steps = ESteps.CheckLoadFile;
+				_downloader = DownloadSystem.BeginDownload(MainBundleInfo, failedTryAgain);
+				_steps = ESteps.CheckDownload;
 			}
 
-			// 2. 从站点获取资源包
-			if (_steps == ESteps.LoadWebSiteFile)
-			{
-				int failedTryAgain = Impl.DownloadFailedTryAgain;
-				var bundleInfo = ManifestTools.ConvertToUnpackInfo(MainBundleInfo.Bundle);
-				_downloader = DownloadSystem.CreateDownload(bundleInfo, failedTryAgain) as WebDownloader;
-				_downloader.SendRequest(true);
-				_steps = ESteps.CheckLoadFile;
-			}
-
-			// 3. 检测加载结果
-			if (_steps == ESteps.CheckLoadFile)
+			// 2. 检测服务器下载结果
+			if (_steps == ESteps.CheckDownload)
 			{
 				DownloadProgress = _downloader.DownloadProgress;
 				DownloadedBytes = _downloader.DownloadedBytes;
 				if (_downloader.IsDone() == false)
 					return;
 
-				CacheBundle = _downloader.GetAssetBundle();
+				if (_downloader.HasError())
+				{
+					_steps = ESteps.Done;
+					Status = EStatus.Failed;
+					LastError = _downloader.GetLastError();
+				}
+				else
+				{
+					_steps = ESteps.LoadCacheFile;
+					return; //下载完毕等待一帧再去加载！
+				}
+			}
+
+			// 3. 从本地缓存里加载AssetBundle
+			if (_steps == ESteps.LoadCacheFile)
+			{
+#if UNITY_EDITOR
+				// 注意：Unity2017.4编辑器模式下，如果AssetBundle文件不存在会导致编辑器崩溃，这里做了预判。
+				if (System.IO.File.Exists(FileLoadPath) == false)
+				{
+					_steps = ESteps.Done;
+					Status = EStatus.Failed;
+					LastError = $"Not found assetBundle file : {FileLoadPath}";
+					YooLogger.Error(LastError);
+					return;
+				}
+#endif
+
+				// 设置下载进度
+				DownloadProgress = 1f;
+				DownloadedBytes = (ulong)MainBundleInfo.Bundle.FileSize;
+
+				// Load assetBundle file
+				var loadMethod = (EBundleLoadMethod)MainBundleInfo.Bundle.LoadMethod;
+				if (loadMethod == EBundleLoadMethod.Normal)
+				{
+					_createRequest = AssetBundle.LoadFromFileAsync(FileLoadPath);
+				}
+				else
+				{
+					_steps = ESteps.Done;
+					Status = EStatus.Failed;
+					LastError = $"WebGL not support encrypted bundle file : {MainBundleInfo.Bundle.BundleName}";
+					YooLogger.Error(LastError);
+					return;
+				}
+				_steps = ESteps.CheckLoadCacheFile;
+			}
+
+			// 4. 检测AssetBundle加载结果
+			if (_steps == ESteps.CheckLoadCacheFile)
+			{
+				if (_createRequest.isDone == false)
+					return;
+
+				CacheBundle = _createRequest.assetBundle;
 				if (CacheBundle == null)
 				{
 					_steps = ESteps.Done;
 					Status = EStatus.Failed;
-					LastError = $"AssetBundle file is invalid : {MainBundleInfo.Bundle.BundleName}";
+					LastError = $"Failed to load AssetBundle file : {MainBundleInfo.Bundle.BundleName}";
 					YooLogger.Error(LastError);
+
+					// 注意：当缓存文件的校验等级为Low的时候，并不能保证缓存文件的完整性。
+					// 在AssetBundle文件加载失败的情况下，我们需要重新验证文件的完整性！
+					if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromCache)
+					{
+						var result = CacheSystem.VerifyingRecordFile(MainBundleInfo.Bundle.PackageName, MainBundleInfo.Bundle.CacheGUID);
+						if (result != EVerifyResult.Succeed)
+						{
+							YooLogger.Error($"Found possibly corrupt file ! {MainBundleInfo.Bundle.CacheGUID}");
+							CacheSystem.DiscardFile(MainBundleInfo.Bundle.PackageName, MainBundleInfo.Bundle.CacheGUID);
+						}
+					}
 				}
 				else
 				{
@@ -96,6 +164,63 @@ namespace YooAsset
 					Status = EStatus.Succeed;
 				}
 			}
+
+			// 5. 从WEB网站获取AssetBundle文件
+			if (_steps == ESteps.LoadWebFile)
+			{
+				var hash = Hash128.Parse(MainBundleInfo.Bundle.FileHash);
+				_webRequest = UnityWebRequestAssetBundle.GetAssetBundle(FileLoadPath, hash);
+				_webRequest.SendWebRequest();
+				_steps = ESteps.CheckLoadWebFile;
+			}
+
+			// 6. 检测AssetBundle加载结果
+			if (_steps == ESteps.CheckLoadWebFile)
+			{
+				DownloadProgress = _webRequest.downloadProgress;
+				DownloadedBytes = _webRequest.downloadedBytes;
+				if (_webRequest.isDone == false)
+					return;
+
+#if UNITY_2020_1_OR_NEWER
+				if (_webRequest.result != UnityWebRequest.Result.Success)
+#else
+				if (_webRequest.isNetworkError || _webRequest.isHttpError)
+#endif
+				{
+					YooLogger.Warning($"Failed to get asset bundle from web : {FileLoadPath} Error : {_webRequest.error}");
+					_steps = ESteps.TryLoadWebFile;
+					_tryTimer = 0;
+				}
+				else
+				{
+					CacheBundle = DownloadHandlerAssetBundle.GetContent(_webRequest);
+					if (CacheBundle == null)
+					{
+						_steps = ESteps.Done;
+						Status = EStatus.Failed;
+						LastError = $"AssetBundle file is invalid : {MainBundleInfo.Bundle.BundleName}";
+						YooLogger.Error(LastError);
+					}
+					else
+					{
+						_steps = ESteps.Done;
+						Status = EStatus.Succeed;
+					}
+				}
+			}
+
+			// 7. 如果获取失败，重新尝试
+			if (_steps == ESteps.TryLoadWebFile)
+			{
+				_tryTimer += Time.unscaledDeltaTime;
+				if (_tryTimer > 1f)
+				{
+					_webRequest.Dispose();
+					_webRequest = null;
+					_steps = ESteps.LoadWebFile;
+				}
+			}
 		}
 
 		/// <summary>

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

@@ -153,15 +153,18 @@ namespace YooAsset
 		/// <summary>
 		/// 销毁
 		/// </summary>
-		public virtual void Destroy()
+		public virtual void Destroy(bool forceDestroy)
 		{
 			IsDestroyed = true;
 
 			// Check fatal
-			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 (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)
 			{

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

@@ -4,17 +4,17 @@ using System.Collections.Generic;
 
 namespace YooAsset
 {
-	internal class DependAssetBundles
+	internal class DependAssetBundleGroup
 	{
 		/// <summary>
 		/// 依赖的资源包加载器列表
 		/// </summary>
-		internal readonly List<BundleLoaderBase> DependList;
+		internal readonly List<BundleLoaderBase> DependBundles;
 
 
-		public DependAssetBundles(List<BundleLoaderBase> dpendList)
+		public DependAssetBundleGroup(List<BundleLoaderBase> dpendBundles)
 		{
-			DependList = dpendList;
+			DependBundles = dpendBundles;
 		}
 
 		/// <summary>
@@ -22,7 +22,7 @@ namespace YooAsset
 		/// </summary>
 		public bool IsDone()
 		{
-			foreach (var loader in DependList)
+			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 DependList)
+			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 DependList)
+			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 DependList)
+			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 DependList)
+			foreach (var loader in DependBundles)
 			{
 				loader.Reference();
 			}
@@ -88,7 +88,7 @@ namespace YooAsset
 		/// </summary>
 		public void Release()
 		{
-			foreach (var loader in DependList)
+			foreach (var loader in DependBundles)
 			{
 				loader.Release();
 			}
@@ -99,7 +99,7 @@ namespace YooAsset
 		/// </summary>
 		internal void GetBundleDebugInfos(List<DebugBundleInfo> output)
 		{
-			foreach (var loader in DependList)
+			foreach (var loader in DependBundles)
 			{
 				var bundleInfo = new DebugBundleInfo();
 				bundleInfo.BundleName = loader.MainBundleInfo.Bundle.BundleName;

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

@@ -54,11 +54,6 @@ namespace YooAsset
 					_steps = ESteps.CheckFile;
 					FileLoadPath = MainBundleInfo.Bundle.CachedDataFilePath;
 				}
-				else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromDelivery)
-				{
-					_steps = ESteps.CheckFile;
-					FileLoadPath = MainBundleInfo.DeliveryFilePath;
-				}
 				else
 				{
 					throw new System.NotImplementedException(MainBundleInfo.LoadMode.ToString());
@@ -69,8 +64,7 @@ namespace YooAsset
 			if (_steps == ESteps.Download)
 			{
 				int failedTryAgain = Impl.DownloadFailedTryAgain;
-				_downloader = DownloadSystem.CreateDownload(MainBundleInfo, failedTryAgain);
-				_downloader.SendRequest();
+				_downloader = DownloadSystem.BeginDownload(MainBundleInfo, failedTryAgain);
 				_steps = ESteps.CheckDownload;
 			}
 
@@ -98,9 +92,8 @@ namespace YooAsset
 			if (_steps == ESteps.Unpack)
 			{
 				int failedTryAgain = Impl.DownloadFailedTryAgain;
-				var bundleInfo = ManifestTools.ConvertToUnpackInfo(MainBundleInfo.Bundle);
-				_unpacker = DownloadSystem.CreateDownload(bundleInfo, failedTryAgain);
-				_unpacker.SendRequest();
+				var bundleInfo = ManifestTools.GetUnpackInfo(MainBundleInfo.Bundle);
+				_unpacker = DownloadSystem.BeginDownload(bundleInfo, failedTryAgain);
 				_steps = ESteps.CheckUnpack;
 			}
 

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

@@ -47,6 +47,11 @@ namespace YooAsset
 					_steps = ESteps.Website;
 					FileLoadPath = MainBundleInfo.Bundle.CachedDataFilePath;
 				}
+				else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromCache)
+				{
+					_steps = ESteps.CheckFile;
+					FileLoadPath = MainBundleInfo.Bundle.CachedDataFilePath;
+				}
 				else
 				{
 					throw new System.NotImplementedException(MainBundleInfo.LoadMode.ToString());
@@ -57,8 +62,7 @@ namespace YooAsset
 			if (_steps == ESteps.Download)
 			{
 				int failedTryAgain = Impl.DownloadFailedTryAgain;
-				_downloader = DownloadSystem.CreateDownload(MainBundleInfo, failedTryAgain);
-				_downloader.SendRequest();
+				_downloader = DownloadSystem.BeginDownload(MainBundleInfo, failedTryAgain);
 				_steps = ESteps.CheckDownload;
 			}
 
@@ -86,9 +90,8 @@ namespace YooAsset
 			if (_steps == ESteps.Website)
 			{
 				int failedTryAgain = Impl.DownloadFailedTryAgain;
-				var bundleInfo = ManifestTools.ConvertToUnpackInfo(MainBundleInfo.Bundle);
-				_website = DownloadSystem.CreateDownload(bundleInfo, failedTryAgain);
-				_website.SendRequest();
+				var bundleInfo = ManifestTools.GetUnpackInfo(MainBundleInfo.Bundle);
+				_website = DownloadSystem.BeginDownload(bundleInfo, failedTryAgain);
 				_steps = ESteps.CheckWebsite;
 			}
 

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

@@ -1,118 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace YooAsset
-{
-	internal sealed class BundledAllAssetsProvider : ProviderBase
-	{
-		private AssetBundleRequest _cacheRequest;
-		
-		public BundledAllAssetsProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
-		{
-		}
-		public override void Update()
-		{
-			DebugBeginRecording();
-
-			if (IsDone)
-				return;
-
-			if (Status == EStatus.None)
-			{
-				Status = EStatus.CheckBundle;
-			}
-
-			// 1. 检测资源包
-			if (Status == EStatus.CheckBundle)
-			{
-				if (IsWaitForAsyncComplete)
-				{
-					DependBundles.WaitForAsyncComplete();
-					OwnerBundle.WaitForAsyncComplete();
-				}
-
-				if (DependBundles.IsDone() == false)
-					return;
-				if (OwnerBundle.IsDone() == false)
-					return;
-
-				if (DependBundles.IsSucceed() == false)
-				{
-					Status = EStatus.Failed;
-					LastError = DependBundles.GetLastError();
-					InvokeCompletion();
-					return;
-				}
-
-				if (OwnerBundle.Status != BundleLoaderBase.EStatus.Succeed)
-				{
-					Status = EStatus.Failed;
-					LastError = OwnerBundle.LastError;
-					InvokeCompletion();
-					return;
-				}
-
-				if (OwnerBundle.CacheBundle == null)
-				{
-					ProcessCacheBundleException();
-					return;
-				}
-
-				Status = EStatus.Loading;
-			}
-
-			// 2. 加载资源对象
-			if (Status == EStatus.Loading)
-			{
-				if (IsWaitForAsyncComplete)
-				{
-					if (MainAssetInfo.AssetType == null)
-						AllAssetObjects = OwnerBundle.CacheBundle.LoadAllAssets();
-					else
-						AllAssetObjects = OwnerBundle.CacheBundle.LoadAllAssets(MainAssetInfo.AssetType);
-				}
-				else
-				{
-					if (MainAssetInfo.AssetType == null)
-						_cacheRequest = OwnerBundle.CacheBundle.LoadAllAssetsAsync();
-					else
-						_cacheRequest = OwnerBundle.CacheBundle.LoadAllAssetsAsync(MainAssetInfo.AssetType);
-				}
-				Status = EStatus.Checking;
-			}
-
-			// 3. 检测加载结果
-			if (Status == EStatus.Checking)
-			{
-				if (_cacheRequest != null)
-				{
-					if (IsWaitForAsyncComplete)
-					{
-						// 强制挂起主线程（注意：该操作会很耗时）
-						YooLogger.Warning("Suspend the main thread to load unity asset.");
-						AllAssetObjects = _cacheRequest.allAssets;
-					}
-					else
-					{
-						Progress = _cacheRequest.progress;
-						if (_cacheRequest.isDone == false)
-							return;
-						AllAssetObjects = _cacheRequest.allAssets;
-					}
-				}
-
-				Status = AllAssetObjects == null ? EStatus.Failed : EStatus.Succeed;
-				if (Status == EStatus.Failed)
-				{
-					if (MainAssetInfo.AssetType == null)
-						LastError = $"Failed to load all assets : {MainAssetInfo.AssetPath} AssetType : null AssetBundle : {OwnerBundle.MainBundleInfo.Bundle.BundleName}";
-					else
-						LastError = $"Failed to load all assets : {MainAssetInfo.AssetPath} AssetType : {MainAssetInfo.AssetType} AssetBundle : {OwnerBundle.MainBundleInfo.Bundle.BundleName}";
-					YooLogger.Error(LastError);
-				}
-				InvokeCompletion();
-			}
-		}
-	}
-}

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

@@ -28,19 +28,19 @@ namespace YooAsset
 			{
 				if (IsWaitForAsyncComplete)
 				{
-					DependBundles.WaitForAsyncComplete();
+					DependBundleGroup.WaitForAsyncComplete();
 					OwnerBundle.WaitForAsyncComplete();
 				}
 
-				if (DependBundles.IsDone() == false)
+				if (DependBundleGroup.IsDone() == false)
 					return;
 				if (OwnerBundle.IsDone() == false)
 					return;
 
-				if (DependBundles.IsSucceed() == false)
+				if (DependBundleGroup.IsSucceed() == false)
 				{
 					Status = EStatus.Failed;
-					LastError = DependBundles.GetLastError();
+					LastError = DependBundleGroup.GetLastError();
 					InvokeCompletion();
 					return;
 				}
@@ -55,7 +55,12 @@ namespace YooAsset
 
 				if (OwnerBundle.CacheBundle == null)
 				{
-					ProcessCacheBundleException();
+					if (OwnerBundle.IsDestroyed)
+						throw new System.Exception("Should never get here !");
+					Status = EStatus.Failed;
+					LastError = $"The bundle {OwnerBundle.MainBundleInfo.Bundle.BundleName} has been destroyed by unity bugs !";
+					YooLogger.Error(LastError);
+					InvokeCompletion();
 					return;
 				}
 

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

@@ -10,15 +10,15 @@ namespace YooAsset
 	{
 		public readonly LoadSceneMode SceneMode;
 		private readonly string _sceneName;
-		private readonly bool _suspendLoad;
+		private readonly bool _activateOnLoad;
 		private readonly int _priority;
-		private AsyncOperation _asyncOperation;
+		private AsyncOperation _asyncOp;
 
-		public BundledSceneProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo, LoadSceneMode sceneMode, bool suspendLoad, int priority) : base(impl, providerGUID, assetInfo)
+		public BundledSceneProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo, LoadSceneMode sceneMode, bool activateOnLoad, int priority) : base(impl, providerGUID, assetInfo)
 		{
 			SceneMode = sceneMode;
 			_sceneName = Path.GetFileNameWithoutExtension(assetInfo.AssetPath);
-			_suspendLoad = suspendLoad;
+			_activateOnLoad = activateOnLoad;
 			_priority = priority;
 		}
 		public override void Update()
@@ -36,15 +36,15 @@ namespace YooAsset
 			// 1. 检测资源包
 			if (Status == EStatus.CheckBundle)
 			{
-				if (DependBundles.IsDone() == false)
+				if (DependBundleGroup.IsDone() == false)
 					return;
 				if (OwnerBundle.IsDone() == false)
 					return;
 
-				if (DependBundles.IsSucceed() == false)
+				if (DependBundleGroup.IsSucceed() == false)
 				{
 					Status = EStatus.Failed;
-					LastError = DependBundles.GetLastError();
+					LastError = DependBundleGroup.GetLastError();
 					InvokeCompletion();
 					return;
 				}
@@ -64,11 +64,11 @@ namespace YooAsset
 			if (Status == EStatus.Loading)
 			{
 				// 注意：如果场景不存在则返回NULL
-				_asyncOperation = SceneManager.LoadSceneAsync(MainAssetInfo.AssetPath, SceneMode);
-				if (_asyncOperation != null)
+				_asyncOp = SceneManager.LoadSceneAsync(MainAssetInfo.AssetPath, SceneMode);
+				if (_asyncOp != null)
 				{
-					_asyncOperation.allowSceneActivation = !_suspendLoad;
-					_asyncOperation.priority = _priority;
+					_asyncOp.allowSceneActivation = true;
+					_asyncOp.priority = _priority;
 					SceneObject = SceneManager.GetSceneAt(SceneManager.sceneCount - 1);
 					Status = EStatus.Checking;
 				}
@@ -84,9 +84,12 @@ namespace YooAsset
 			// 3. 检测加载结果
 			if (Status == EStatus.Checking)
 			{
-				Progress = _asyncOperation.progress;
-				if (_asyncOperation.isDone)
+				Progress = _asyncOp.progress;
+				if (_asyncOp.isDone)
 				{
+					if (SceneObject.IsValid() && _activateOnLoad)
+						SceneManager.SetActiveScene(SceneObject);
+
 					Status = SceneObject.IsValid() ? EStatus.Succeed : EStatus.Failed;
 					if (Status == EStatus.Failed)
 					{
@@ -97,17 +100,5 @@ namespace YooAsset
 				}
 			}
 		}
-
-		/// <summary>
-		/// 解除场景加载挂起操作
-		/// </summary>
-		public bool UnSuspendLoad()
-		{
-			if (_asyncOperation == null)
-				return false;
-
-			_asyncOperation.allowSceneActivation = true;
-			return true;
-		}
 	}
 }

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

@@ -28,19 +28,19 @@ namespace YooAsset
 			{
 				if (IsWaitForAsyncComplete)
 				{
-					DependBundles.WaitForAsyncComplete();
+					DependBundleGroup.WaitForAsyncComplete();
 					OwnerBundle.WaitForAsyncComplete();
 				}
 
-				if (DependBundles.IsDone() == false)
+				if (DependBundleGroup.IsDone() == false)
 					return;
 				if (OwnerBundle.IsDone() == false)
 					return;
 
-				if (DependBundles.IsSucceed() == false)
+				if (DependBundleGroup.IsSucceed() == false)
 				{
 					Status = EStatus.Failed;
-					LastError = DependBundles.GetLastError();
+					LastError = DependBundleGroup.GetLastError();
 					InvokeCompletion();
 					return;
 				}
@@ -53,12 +53,6 @@ namespace YooAsset
 					return;
 				}
 
-				if (OwnerBundle.CacheBundle == null)
-				{
-					ProcessCacheBundleException();
-					return;
-				}
-
 				Status = EStatus.Loading;
 			}
 

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

@@ -1,105 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace YooAsset
-{
-	internal sealed class DatabaseAllAssetsProvider : ProviderBase
-	{
-		public DatabaseAllAssetsProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
-		{
-		}
-		public override void Update()
-		{
-#if UNITY_EDITOR
-			if (IsDone)
-				return;
-
-			if (Status == EStatus.None)
-			{
-				// 检测资源文件是否存在
-				string guid = UnityEditor.AssetDatabase.AssetPathToGUID(MainAssetInfo.AssetPath);
-				if (string.IsNullOrEmpty(guid))
-				{
-					Status = EStatus.Failed;
-					LastError = $"Not found asset : {MainAssetInfo.AssetPath}";
-					YooLogger.Error(LastError);
-					InvokeCompletion();
-					return;
-				}
-
-				Status = EStatus.CheckBundle;
-
-				// 注意：模拟异步加载效果提前返回
-				if (IsWaitForAsyncComplete == false)
-					return;
-			}
-
-			// 1. 检测资源包
-			if (Status == EStatus.CheckBundle)
-			{
-				if (IsWaitForAsyncComplete)
-				{
-					OwnerBundle.WaitForAsyncComplete();
-				}
-
-				if (OwnerBundle.IsDone() == false)
-					return;
-
-				if (OwnerBundle.Status != BundleLoaderBase.EStatus.Succeed)
-				{
-					Status = EStatus.Failed;
-					LastError = OwnerBundle.LastError;
-					InvokeCompletion();
-					return;
-				}
-
-				Status = EStatus.Loading;
-			}
-
-			// 2. 加载资源对象
-			if (Status == EStatus.Loading)
-			{
-				if (MainAssetInfo.AssetType == null)
-				{
-					List<UnityEngine.Object> result = new List<Object>();
-					foreach (var assetPath in OwnerBundle.MainBundleInfo.IncludeAssets)
-					{
-						UnityEngine.Object mainAsset = UnityEditor.AssetDatabase.LoadMainAssetAtPath(assetPath);
-						if (mainAsset != null)
-							result.Add(mainAsset);
-					}
-					AllAssetObjects = result.ToArray();
-				}
-				else
-				{
-					List<UnityEngine.Object> result = new List<Object>();
-					foreach (var assetPath in OwnerBundle.MainBundleInfo.IncludeAssets)
-					{
-						UnityEngine.Object mainAsset = UnityEditor.AssetDatabase.LoadAssetAtPath(assetPath, MainAssetInfo.AssetType);
-						if (mainAsset != null)
-							result.Add(mainAsset);
-					}
-					AllAssetObjects = result.ToArray();
-				}
-				Status = EStatus.Checking;
-			}
-
-			// 3. 检测加载结果
-			if (Status == EStatus.Checking)
-			{
-				Status = AllAssetObjects == null ? EStatus.Failed : EStatus.Succeed;
-				if (Status == EStatus.Failed)
-				{
-					if (MainAssetInfo.AssetType == null)
-						LastError = $"Failed to load all assets : {MainAssetInfo.AssetPath} AssetType : null";
-					else
-						LastError = $"Failed to load all assets : {MainAssetInfo.AssetPath} AssetType : {MainAssetInfo.AssetType}";
-					YooLogger.Error(LastError);
-				}
-				InvokeCompletion();
-			}
-#endif
-		}
-	}
-}

Assets/YooAsset/Runtime/AssetSystem/Provider/DatabaseAllAssetsProvider.cs.meta

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

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

@@ -6,14 +6,14 @@ namespace YooAsset
 	internal sealed class DatabaseSceneProvider : ProviderBase
 	{
 		public readonly LoadSceneMode SceneMode;
-		private readonly bool _suspendLoad;
+		private readonly bool _activateOnLoad;
 		private readonly int _priority;
-		private AsyncOperation _asyncOperation;
+		private AsyncOperation _asyncOp;
 
-		public DatabaseSceneProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo, LoadSceneMode sceneMode, bool suspendLoad, int priority) : base(impl, providerGUID, assetInfo)
+		public DatabaseSceneProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo, LoadSceneMode sceneMode, bool activateOnLoad, int priority) : base(impl, providerGUID, assetInfo)
 		{
 			SceneMode = sceneMode;
-			_suspendLoad = suspendLoad;
+			_activateOnLoad = activateOnLoad;
 			_priority = priority;
 		}
 		public override void Update()
@@ -54,11 +54,11 @@ namespace YooAsset
 			{
 				LoadSceneParameters loadSceneParameters = new LoadSceneParameters();
 				loadSceneParameters.loadSceneMode = SceneMode;
-				_asyncOperation = UnityEditor.SceneManagement.EditorSceneManager.LoadSceneAsyncInPlayMode(MainAssetInfo.AssetPath, loadSceneParameters);
-				if (_asyncOperation != null)
+				_asyncOp = UnityEditor.SceneManagement.EditorSceneManager.LoadSceneAsyncInPlayMode(MainAssetInfo.AssetPath, loadSceneParameters);
+				if (_asyncOp != null)
 				{
-					_asyncOperation.allowSceneActivation = !_suspendLoad;
-					_asyncOperation.priority = _priority;
+					_asyncOp.allowSceneActivation = true;
+					_asyncOp.priority = _priority;
 					SceneObject = SceneManager.GetSceneAt(SceneManager.sceneCount - 1);
 					Status = EStatus.Checking;
 				}
@@ -74,9 +74,12 @@ namespace YooAsset
 			// 3. 检测加载结果
 			if (Status == EStatus.Checking)
 			{
-				Progress = _asyncOperation.progress;
-				if (_asyncOperation.isDone)
-				{
+				Progress = _asyncOp.progress;
+				if (_asyncOp.isDone)
+				{				
+					if (SceneObject.IsValid() && _activateOnLoad)
+						SceneManager.SetActiveScene(SceneObject);
+
 					Status = SceneObject.IsValid() ? EStatus.Succeed : EStatus.Failed;
 					if (Status == EStatus.Failed)
 					{
@@ -88,17 +91,5 @@ namespace YooAsset
 			}
 #endif
 		}
-
-		/// <summary>
-		/// 解除场景加载挂起操作
-		/// </summary>
-		public bool UnSuspendLoad()
-		{
-			if (_asyncOperation == null)
-				return false;
-
-			_asyncOperation.allowSceneActivation = true;
-			return true;
-		}
 	}
 }

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

@@ -91,7 +91,7 @@ namespace YooAsset
 
 
 		protected BundleLoaderBase OwnerBundle { private set; get; }
-		protected DependAssetBundles DependBundles { private set; get; }
+		protected DependAssetBundleGroup DependBundleGroup { private set; get; }
 		protected bool IsWaitForAsyncComplete { private set; get; } = false;
 		private readonly List<OperationHandleBase> _handles = new List<OperationHandleBase>();
 
@@ -109,9 +109,9 @@ namespace YooAsset
 				OwnerBundle.Reference();
 				OwnerBundle.AddProvider(this);
 
-				var dependList = impl.CreateDependAssetBundleLoaders(assetInfo);
-				DependBundles = new DependAssetBundles(dependList);
-				DependBundles.Reference();
+				var dependBundles = impl.CreateDependAssetBundleLoaders(assetInfo);
+				DependBundleGroup = new DependAssetBundleGroup(dependBundles);
+				DependBundleGroup.Reference();
 			}
 		}
 
@@ -123,7 +123,7 @@ namespace YooAsset
 		/// <summary>
 		/// 销毁资源对象
 		/// </summary>
-		public void Destroy()
+		public virtual void Destroy()
 		{
 			IsDestroyed = true;
 
@@ -133,10 +133,10 @@ namespace YooAsset
 				OwnerBundle.Release();
 				OwnerBundle = null;
 			}
-			if (DependBundles != null)
+			if (DependBundleGroup != null)
 			{
-				DependBundles.Release();
-				DependBundles = null;
+				DependBundleGroup.Release();
+				DependBundleGroup = null;
 			}
 		}
 
@@ -177,8 +177,6 @@ namespace YooAsset
 				handle = new SceneOperationHandle(this);
 			else if (typeof(T) == typeof(SubAssetsOperationHandle))
 				handle = new SubAssetsOperationHandle(this);
-			else if (typeof(T) == typeof(AllAssetsOperationHandle))
-				handle = new AllAssetsOperationHandle(this);
 			else if (typeof(T) == typeof(RawFileOperationHandle))
 				handle = new RawFileOperationHandle(this);
 			else
@@ -220,30 +218,6 @@ namespace YooAsset
 			}
 		}
 
-		/// <summary>
-		/// 处理特殊异常
-		/// </summary>
-		protected void ProcessCacheBundleException()
-		{
-			if (OwnerBundle.IsDestroyed)
-				throw new System.Exception("Should never get here !");
-
-			if (OwnerBundle.MainBundleInfo.Bundle.IsRawFile)
-			{
-				Status = EStatus.Failed;
-				LastError = $"Cannot load asset bundle file using {nameof(ResourcePackage.LoadRawFileAsync)} method !";
-				YooLogger.Error(LastError);
-				InvokeCompletion();
-			}
-			else
-			{
-				Status = EStatus.Failed;
-				LastError = $"The bundle {OwnerBundle.MainBundleInfo.Bundle.BundleName} has been destroyed by unity bugs !";
-				YooLogger.Error(LastError);
-				InvokeCompletion();
-			}
-		}
-
 		/// <summary>
 		/// 异步操作任务
 		/// </summary>
@@ -346,7 +320,7 @@ namespace YooAsset
 			DownloadReport result = new DownloadReport();
 			result.TotalSize = (ulong)OwnerBundle.MainBundleInfo.Bundle.FileSize;
 			result.DownloadedBytes = OwnerBundle.DownloadedBytes;
-			foreach (var dependBundle in DependBundles.DependList)
+			foreach (var dependBundle in DependBundleGroup.DependBundles)
 			{
 				result.TotalSize += (ulong)dependBundle.MainBundleInfo.Bundle.FileSize;
 				result.DownloadedBytes += dependBundle.DownloadedBytes;
@@ -366,7 +340,7 @@ namespace YooAsset
 			bundleInfo.Status = OwnerBundle.Status.ToString();
 			output.Add(bundleInfo);
 
-			DependBundles.GetBundleDebugInfos(output);
+			DependBundleGroup.GetBundleDebugInfos(output);
 		}
 		#endregion
 	}

Assets/YooAsset/Runtime/CacheSystem/CacheFileInfo.cs

@@ -12,7 +12,7 @@ namespace YooAsset
 		/// </summary>
 		public static void WriteInfoToFile(string filePath, string dataFileCRC, long dataFileSize)
 		{
-			using (FileStream fs = new FileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.Read))
+			using (FileStream fs = new FileStream(filePath, FileMode.Create))
 			{
 				SharedBuffer.Clear();
 				SharedBuffer.WriteUTF8(dataFileCRC);

Assets/YooAsset/Runtime/CacheSystem/CacheSystem.cs

@@ -10,11 +10,6 @@ namespace YooAsset
 	{
 		private readonly static Dictionary<string, PackageCache> _cachedDic = new Dictionary<string, PackageCache>(1000);
 
-		/// <summary>
-		/// 禁用Unity缓存系统在WebGL平台
-		/// </summary>
-		public static bool DisableUnityCacheOnWebGL = false;
-
 		/// <summary>
 		/// 初始化时的验证级别
 		/// </summary>
@@ -93,7 +88,7 @@ namespace YooAsset
 		/// <summary>
 		/// 验证缓存文件（子线程内操作）
 		/// </summary>
-		public static EVerifyResult VerifyingCacheFile(VerifyCacheFileElement element)
+		public static EVerifyResult VerifyingCacheFile(VerifyCacheElement element)
 		{
 			try
 			{
@@ -125,7 +120,7 @@ namespace YooAsset
 		/// <summary>
 		/// 验证下载文件（子线程内操作）
 		/// </summary>
-		public static EVerifyResult VerifyingTempFile(VerifyTempFileElement element)
+		public static EVerifyResult VerifyingTempFile(VerifyTempElement element)
 		{
 			return VerifyingInternal(element.TempDataFilePath, element.FileSize, element.FileCRC, EVerifyLevel.High);
 		}

Assets/YooAsset/Runtime/CacheSystem/Operations/Internal/FindCacheFilesOperation.cs

@@ -25,7 +25,7 @@ namespace YooAsset
 		/// <summary>
 		/// 需要验证的元素
 		/// </summary>
-		public readonly List<VerifyCacheFileElement> VerifyElements = new List<VerifyCacheFileElement>(5000);
+		public readonly List<VerifyCacheElement> VerifyElements = new List<VerifyCacheElement>(5000);
 
 		public FindCacheFilesOperation(string packageName)
 		{
@@ -45,7 +45,7 @@ namespace YooAsset
 			{
 				// BundleFiles
 				{
-					string rootPath = PersistentTools.GetPersistent(_packageName).SandboxCacheBundleFilesRoot;
+					string rootPath = PersistentTools.GetCachedBundleFileFolderPath(_packageName);
 					DirectoryInfo rootDirectory = new DirectoryInfo(rootPath);
 					if (rootDirectory.Exists)
 					{
@@ -56,7 +56,7 @@ namespace YooAsset
 
 				// RawFiles
 				{
-					string rootPath = PersistentTools.GetPersistent(_packageName).SandboxCacheRawFilesRoot;
+					string rootPath = PersistentTools.GetCachedRawFileFolderPath(_packageName);
 					DirectoryInfo rootDirectory = new DirectoryInfo(rootPath);
 					if (rootDirectory.Exists)
 					{
@@ -113,7 +113,7 @@ namespace YooAsset
 					string fileRootPath = chidDirectory.FullName;
 					string dataFilePath = $"{fileRootPath}/{ YooAssetSettings.CacheBundleDataFileName}";
 					string infoFilePath = $"{fileRootPath}/{ YooAssetSettings.CacheBundleInfoFileName}";
-					VerifyCacheFileElement element = new VerifyCacheFileElement(_packageName, cacheGUID, fileRootPath, dataFilePath, infoFilePath);
+					VerifyCacheElement element = new VerifyCacheElement(_packageName, cacheGUID, fileRootPath, dataFilePath, infoFilePath);
 					VerifyElements.Add(element);
 				}
 
@@ -161,7 +161,7 @@ namespace YooAsset
 					string fileRootPath = chidDirectory.FullName;
 					string dataFilePath = $"{fileRootPath}/{ YooAssetSettings.CacheBundleDataFileName}{dataFileExtension}";
 					string infoFilePath = $"{fileRootPath}/{ YooAssetSettings.CacheBundleInfoFileName}";
-					VerifyCacheFileElement element = new VerifyCacheFileElement(_packageName, cacheGUID, fileRootPath, dataFilePath, infoFilePath);
+					VerifyCacheElement element = new VerifyCacheElement(_packageName, cacheGUID, fileRootPath, dataFilePath, infoFilePath);
 					VerifyElements.Add(element);
 				}