Update CHANGELOG.md

变更IQueryServices.QueryStreamingAssets(string packageName, string fileName)方法

Assets/YooAsset/CHANGELOG.md

@@ -2,6 +2,315 @@
 
 All notable changes to this package will be documented in this file.
 
+## [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
+
+- 增加了自动分析冗余资源的开关
+
+  ```c#
+  /// <summary>
+  /// 构建参数
+  /// </summary>
+  public class BuildParameters
+  {
+      /// <summary>
+      /// 自动分析冗余资源
+      /// </summary>
+      public bool AutoAnalyzeRedundancy = true;
+  }
+  ```
+
+- 太空战机DEMO启用了新的内置资源查询机制。
+
+## [1.4.15] - 2023-06-09
+
+### Fixed
+
+- 修复了安卓平台，解压内置文件到沙盒失败后不再重新尝试的问题。
+- 修复了验证远端下载文件，极小概率失败的问题。
+- 修复了太空战机DEMO在IOS平台流解密失败的问题。
+
+## [1.4.14] - 2023-05-26
+
+### Fixed
+
+- 修复了收集器对着色器未过滤的问题。
+- 修复了内置着色器Tag特殊情况下未正确传染给依赖资源包的问题。
+
+### Changed
+
+- Unity2021版本及以上推荐使用可编程构建管线（SBP）
+
+## [1.4.13] - 2023-05-12
+
+### Changed
+
+- 可寻址地址冲突时，打印冲突地址的资源路径。
+- 销毁Package的时候清空该Package的缓存记录。
+
+### Added
+
+- 新增方法ResoucePackage.ClearAllCacheFilesAsync()
+
+  ```c#
+  public class ResoucePackage
+  {
+      /// <summary>
+      /// 清理包裹本地所有的缓存文件
+      /// </summary>
+      public ClearAllCacheFilesOperation ClearAllCacheFilesAsync();   
+  }
+  ```
+
+- 新增方法YooAssets.SetCacheSystemSandboxPath()
+
+  ```c#
+  public class YooAssets
+  {
+      /// <summary>
+      /// 设置缓存系统参数，沙盒目录的存储路径
+      /// </summary>
+      public static void SetCacheSystemSandboxPath(string sandboxPath);
+  }
+  ```
+
+## [1.4.12] - 2023-04-22
+
+### Changed
+
+- 增加了对WEBGL平台加密选项的检测。
+
+- 增加了YooAsset/Home Page菜单栏。
+
+- 增加了鼠标右键创建配置的菜单。
+
+- 增加了YooAssets.DestroyPackage()方法。
+
+  ```c#
+  class YooAssets
+  {
+      /// <summary>
+      /// 销毁资源包
+      /// </summary>
+      /// <param name="package">资源包对象</param>
+      public static void DestroyPackage(string packageName);
+  }
+  ```
+
+- UpdatePackageManifestAsync方法增加了新参数autoSaveVersion
+
+  ```c#
+  class ResourcePackage
+  {
+      /// <summary>
+      /// 向网络端请求并更新清单
+      /// </summary>
+      /// <param name="packageVersion">更新的包裹版本</param>
+      /// <param name="autoSaveVersion">更新成功后自动保存版本号，作为下次初始化的版本。</param>
+      /// <param name="timeout">超时时间（默认值：60秒）</param>
+      public UpdatePackageManifestOperation UpdatePackageManifestAsync(string packageVersion, bool autoSaveVersion = true, int timeout = 60)   
+  }
+  ```
+
+- BuildParameters类增加了新字段。
+
+  可以自定义共享资源文件的打包规则。
+
+  ```c#
+  class BuildParameters
+  {
+      /// <summary>
+      /// 共享资源的打包规则
+      /// </summary>
+      public IShareAssetPackRule ShareAssetPackRule = null;
+  }
+  ```
+
 ## [1.4.11] - 2023-04-14
 
 ### Fixed

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilder.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Reflection;
+using System.Linq;
 using UnityEngine;
 using UnityEditor;
 
@@ -11,39 +13,63 @@ namespace YooAsset.Editor
 		private readonly BuildContext _buildContext = new BuildContext();
 
 		/// <summary>
-		/// 开始构建
+		/// 构建资源包
 		/// </summary>
-		public BuildResult Run(BuildParameters buildParameters)
+		public BuildResult Run(BuildParameters buildParameters, List<IBuildTask> buildPipeline)
 		{
-			// 清空旧数据
-			_buildContext.ClearAllContext();
-
 			// 检测构建参数是否为空
 			if (buildParameters == null)
 				throw new Exception($"{nameof(buildParameters)} is null !");
 
-			// 检测可编程构建管线参数
-			if (buildParameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
-			{
-				if (buildParameters.SBPParameters == null)
-					throw new Exception($"{nameof(BuildParameters.SBPParameters)} is null !");
+			// 检测构建参数是否为空
+			if (buildPipeline.Count == 0)
+				throw new Exception($"Build pipeline is empty !");	
 
-				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 !");
-			}
+			// 清空旧数据
+			_buildContext.ClearAllContext();
 
 			// 构建参数
 			var buildParametersContext = new BuildParametersContext(buildParameters);
 			_buildContext.SetContextObject(buildParametersContext);
 
-			// 创建构建节点
-			List<IBuildTask> pipeline;
-			if (buildParameters.BuildPipeline == EBuildPipeline.BuiltinBuildPipeline)
+			// 初始化日志
+			BuildLogger.InitLogger(buildParameters.EnableLog);
+
+			// 执行构建流程
+			var buildResult = BuildRunner.Run(buildPipeline, _buildContext);
+			if (buildResult.Success)
 			{
-				pipeline = new List<IBuildTask>
+				buildResult.OutputPackageDirectory = buildParametersContext.GetPackageOutputDirectory();
+				BuildLogger.Log($"{buildParameters.BuildMode} pipeline build succeed !");
+			}
+			else
+			{
+				BuildLogger.Warning($"{buildParameters.BuildMode} pipeline build failed !");
+				BuildLogger.Error($"Build task failed : {buildResult.FailedTask}");
+				BuildLogger.Error(buildResult.ErrorInfo);
+			}
+
+			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(), //获取构建列表
@@ -57,10 +83,11 @@ namespace YooAsset.Editor
 					new TaskCreatePackage(), //制作包裹
 					new TaskCopyBuildinFiles(), //拷贝内置文件
 				};
+				return pipeline;
 			}
-			else if (buildParameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
+			else if (buildPipeline == EBuildPipeline.ScriptableBuildPipeline)
 			{
-				pipeline = new List<IBuildTask>
+				List<IBuildTask> pipeline = new List<IBuildTask>
 				{
 					new TaskPrepare(), //前期准备工作
 					new TaskGetBuildMap(), //获取构建列表
@@ -74,30 +101,12 @@ namespace YooAsset.Editor
 					new TaskCreatePackage(), //制作补丁包
 					new TaskCopyBuildinFiles(), //拷贝内置文件
 				};
+				return pipeline;
 			}
 			else
 			{
 				throw new NotImplementedException();
 			}
-
-			// 初始化日志
-			BuildLogger.InitLogger(buildParameters.EnableLog);
-
-			// 执行构建流程
-			var buildResult = BuildRunner.Run(pipeline, _buildContext);
-			if (buildResult.Success)
-			{
-				buildResult.OutputPackageDirectory = buildParametersContext.GetPackageOutputDirectory();
-				BuildLogger.Log($"{buildParameters.BuildMode} pipeline build succeed !");
-			}
-			else
-			{
-				BuildLogger.Warning($"{buildParameters.BuildMode} pipeline build failed !");
-				BuildLogger.Error($"Build task failed : {buildResult.FailedTask}");
-				BuildLogger.Error($"Build task error : {buildResult.FailedInfo}");
-			}
-
-			return buildResult;
 		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderHelper.cs

@@ -11,7 +11,7 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 获取默认的输出根路录
 		/// </summary>
-		public static string GetDefaultOutputRoot()
+		public static string GetDefaultBuildOutputRoot()
 		{
 			string projectPath = EditorTools.GetProjectPath();
 			return $"{projectPath}/Bundles";
@@ -20,43 +20,9 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 获取流文件夹路径
 		/// </summary>
-		public static string GetStreamingAssetsFolderPath()
+		public static string GetDefaultStreamingAssetsRoot()
 		{
-			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();
-				}
-			}
+			return $"{Application.dataPath}/StreamingAssets/{YooAssetSettings.DefaultYooFolderName}/";
 		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSetting.cs

@@ -3,6 +3,7 @@ using UnityEngine;
 
 namespace YooAsset.Editor
 {
+	[CreateAssetMenu(fileName = "AssetBundleBuilderSetting", menuName = "YooAsset/Create AssetBundle Builder Settings")]
 	public class AssetBundleBuilderSetting : ScriptableObject
 	{
 		/// <summary>

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs

@@ -12,7 +12,7 @@ namespace YooAsset.Editor
 	public class AssetBundleBuilderWindow : EditorWindow
 	{
 		[MenuItem("YooAsset/AssetBundle Builder", false, 102)]
-		public static void ShowExample()
+		public static void OpenWindow()
 		{
 			AssetBundleBuilderWindow window = GetWindow<AssetBundleBuilderWindow>("资源包构建工具", true, WindowsDefine.DockedWindowTypes);
 			window.minSize = new Vector2(800, 600);
@@ -63,7 +63,7 @@ namespace YooAsset.Editor
 				_encryptionServicesClassNames = _encryptionServicesClassTypes.Select(t => t.Name).ToList();
 
 				// 输出目录
-				string defaultOutputRoot = AssetBundleBuilderHelper.GetDefaultOutputRoot();
+				string defaultOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
 				_buildOutputField = root.Q<TextField>("BuildOutput");
 				_buildOutputField.SetValueWithoutNotify(defaultOutputRoot);
 				_buildOutputField.SetEnabled(false);
@@ -266,15 +266,16 @@ namespace YooAsset.Editor
 		/// </summary>
 		private void ExecuteBuild()
 		{
-			string defaultOutputRoot = AssetBundleBuilderHelper.GetDefaultOutputRoot();
 			BuildParameters buildParameters = new BuildParameters();
-			buildParameters.OutputRoot = defaultOutputRoot;
+			buildParameters.StreamingAssetsRoot = AssetBundleBuilderHelper.GetDefaultStreamingAssetsRoot();
+			buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
 			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.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.OutputRoot = defaultOutputRoot;
+			buildParameters.StreamingAssetsRoot = AssetBundleBuilderHelper.GetDefaultStreamingAssetsRoot();
+			buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
 			buildParameters.BuildTarget = EditorUserBuildSettings.activeBuildTarget;
 			buildParameters.BuildMode = EBuildMode.SimulateBuild;
 			buildParameters.PackageName = packageName;

Assets/YooAsset/Editor/AssetBundleBuilder/BuildAssetInfo.cs

@@ -30,6 +30,11 @@ namespace YooAsset.Editor
 		/// </summary>
 		public string AssetPath { private set; get; }
 
+		/// <summary>
+		/// 资源GUID
+		/// </summary>
+		public string AssetGUID { private set; get; }
+
 		/// <summary>
 		/// 是否为原生资源
 		/// </summary>
@@ -65,6 +70,7 @@ 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;
@@ -78,6 +84,7 @@ 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;
@@ -157,7 +164,7 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 计算共享资源包的完整包名
 		/// </summary>
-		public void CalculateShareBundleName(bool uniqueBundleName, string packageName, string shadersBundleName)
+		public void CalculateShareBundleName(ISharedPackRule sharedPackRule, bool uniqueBundleName, string packageName, string shadersBundleName)
 		{
 			if (CollectorType != ECollectorType.None)
 				return;
@@ -173,8 +180,7 @@ namespace YooAsset.Editor
 			{
 				if (_referenceBundleNames.Count > 1)
 				{
-					IPackRule packRule = PackDirectory.StaticPackRule;
-					PackRuleResult packRuleResult = packRule.GetPackRuleResult(new PackRuleData(AssetPath));
+					PackRuleResult packRuleResult = sharedPackRule.GetPackRuleResult(AssetPath);
 					BundleName = packRuleResult.GetShareBundleName(packageName, uniqueBundleName);
 				}
 				else
@@ -184,5 +190,24 @@ namespace YooAsset.Editor
 				}
 			}
 		}
+
+		/// <summary>
+		/// 判断是否为冗余资源
+		/// </summary>
+		public bool IsRedundancyAsset()
+		{
+			if (HasBundleName())
+				return false;
+
+			return _referenceBundleNames.Count > 1;
+		}
+
+		/// <summary>
+		/// 获取关联资源包的数量
+		/// </summary>
+		public int GetReferenceBundleCount()
+		{
+			return _referenceBundleNames.Count;
+		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildBundleInfo.cs

@@ -49,7 +49,7 @@ namespace YooAsset.Editor
 
 		/// <summary>
 		/// 参与构建的资源列表
-		/// 注意：不包含零依赖资源
+		/// 注意：不包含零依赖资源和冗余资源
 		/// </summary>
 		public readonly List<BuildAssetInfo> AllMainAssets = new List<BuildAssetInfo>();
 
@@ -149,7 +149,15 @@ namespace YooAsset.Editor
 		}
 
 		/// <summary>
-		/// 获取该资源包内的所有资源（包括零依赖资源）
+		/// 获取构建的资源路径列表
+		/// </summary>
+		public string[] GetAllMainAssetPaths()
+		{
+			return AllMainAssets.Select(t => t.AssetPath).ToArray();
+		}
+
+		/// <summary>
+		/// 获取该资源包内的所有资源（包括零依赖资源和冗余资源）
 		/// </summary>
 		public List<string> GetAllBuiltinAssetPaths()
 		{
@@ -161,6 +169,7 @@ namespace YooAsset.Editor
 					continue;
 				foreach (var dependAssetInfo in assetInfo.AllDependAssetInfos)
 				{
+					// 注意：依赖资源里只添加零依赖资源和冗余资源
 					if (dependAssetInfo.HasBundleName() == false)
 					{
 						if (result.Contains(dependAssetInfo.AssetPath) == false)
@@ -171,22 +180,6 @@ 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>
@@ -200,6 +193,14 @@ namespace YooAsset.Editor
 			return build;
 		}
 
+		/// <summary>
+		/// 获取所有写入补丁清单的资源
+		/// </summary>
+		public BuildAssetInfo[] GetAllManifestAssetInfos()
+		{
+			return AllMainAssets.Where(t => t.CollectorType == ECollectorType.MainAssetCollector).ToArray();
+		}
+
 		/// <summary>
 		/// 创建PackageBundle类
 		/// </summary>

Assets/YooAsset/Editor/AssetBundleBuilder/BuildMapContext.cs

@@ -10,6 +10,11 @@ namespace YooAsset.Editor
 	{
 		private readonly Dictionary<string, BuildBundleInfo> _bundleInfoDic = new Dictionary<string, BuildBundleInfo>(10000);
 
+		/// <summary>
+		/// 冗余的资源列表
+		/// </summary>
+		public readonly List<ReportRedundancyInfo> RedundancyInfos= new List<ReportRedundancyInfo>(1000);
+		
 		/// <summary>
 		/// 参与构建的资源总数
 		/// 说明：包括主动收集的资源以及其依赖的所有资源
@@ -17,19 +22,9 @@ namespace YooAsset.Editor
 		public int AssetFileCount;
 
 		/// <summary>
-		/// 是否启用可寻址资源定位
+		/// 收集命令
 		/// </summary>
-		public bool EnableAddressable;
-
-		/// <summary>
-		/// 资源包名唯一化
-		/// </summary>
-		public bool UniqueBundleName;
-
-		/// <summary>
-		/// 着色器统一的全名称
-		/// </summary>
-		public string ShadersBundleName;
+		public CollectCommand Command { set; get; }
 
 		/// <summary>
 		/// 资源包信息列表

Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs

@@ -37,9 +37,14 @@ namespace YooAsset.Editor
 
 
 		/// <summary>
-		/// 输出的根目录
+		/// 内置资源的根目录
 		/// </summary>
-		public string OutputRoot;
+		public string StreamingAssetsRoot;
+
+		/// <summary>
+		/// 构建输出的根目录
+		/// </summary>
+		public string BuildOutputRoot;
 
 		/// <summary>
 		/// 构建的平台
@@ -78,7 +83,12 @@ namespace YooAsset.Editor
 		public bool VerifyBuildingResult = false;
 		
 		/// <summary>
-		/// 加密类
+		/// 共享资源的打包规则
+		/// </summary>
+		public ISharedPackRule SharedPackRule = null;
+
+		/// <summary>
+		/// 资源的加密接口
 		/// </summary>
 		public IEncryptionServices EncryptionServices = null;
 

Assets/YooAsset/Editor/AssetBundleBuilder/BuildParametersContext.cs

@@ -9,6 +9,8 @@ namespace YooAsset.Editor
 	{
 		private string _pipelineOutputDirectory = string.Empty;
 		private string _packageOutputDirectory = string.Empty;
+		private string _packageRootDirectory = string.Empty;
+		private string _streamingAssetsDirectory = string.Empty;
 
 		/// <summary>
 		/// 构建参数
@@ -29,23 +31,47 @@ namespace YooAsset.Editor
 		{
 			if (string.IsNullOrEmpty(_pipelineOutputDirectory))
 			{
-				_pipelineOutputDirectory = $"{Parameters.OutputRoot}/{Parameters.BuildTarget}/{Parameters.PackageName}/{YooAssetSettings.OutputFolderName}";
+				_pipelineOutputDirectory = $"{Parameters.BuildOutputRoot}/{Parameters.BuildTarget}/{Parameters.PackageName}/{YooAssetSettings.OutputFolderName}";
 			}
 			return _pipelineOutputDirectory;
 		}
 
 		/// <summary>
-		/// 获取本次构建的补丁目录
+		/// 获取本次构建的补丁输出目录
 		/// </summary>
 		public string GetPackageOutputDirectory()
 		{
 			if (string.IsNullOrEmpty(_packageOutputDirectory))
 			{
-				_packageOutputDirectory = $"{Parameters.OutputRoot}/{Parameters.BuildTarget}/{Parameters.PackageName}/{Parameters.PackageVersion}";
+				_packageOutputDirectory = $"{Parameters.BuildOutputRoot}/{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/BuildReport.cs

@@ -27,6 +27,11 @@ namespace YooAsset.Editor
 		/// </summary>
 		public List<ReportBundleInfo> BundleInfos = new List<ReportBundleInfo>();
 
+		/// <summary>
+		/// 冗余的资源列表
+		/// </summary>
+		public List<ReportRedundancyInfo> RedundancyInfos = new List<ReportRedundancyInfo>();
+		
 
 		/// <summary>
 		/// 获取资源包信息类
@@ -61,7 +66,7 @@ namespace YooAsset.Editor
 				File.Delete(savePath);
 
 			string json = JsonUtility.ToJson(buildReport, true);
-			FileUtility.CreateFile(savePath, json);
+			FileUtility.WriteAllText(savePath, json);
 		}
 		public static BuildReport Deserialize(string jsonData)
 		{

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

@@ -0,0 +1,36 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset.Editor
+{
+	[Serializable]
+	public class ReportRedundancyInfo
+	{
+		/// <summary>
+		/// 资源路径
+		/// </summary>
+		public string AssetPath;
+
+		/// <summary>
+		/// 资源类型
+		/// </summary>
+		public string AssetType;
+
+		/// <summary>
+		/// 资源GUID
+		/// 说明：Meta文件记录的GUID
+		/// </summary>
+		public string AssetGUID;
+
+		/// <summary>
+		/// 资源文件大小
+		/// </summary>
+		public long FileSize;
+
+		/// <summary>
+		/// 冗余的资源包数量
+		/// </summary>
+		public int Number;
+	}
+}

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7bfd05221983858429246096617dff1d
+guid: 7fbb7b27f54d3b0439a951348fd9d785
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -22,7 +22,7 @@ namespace YooAsset.Editor
 		/// 构建时间
 		/// </summary>
 		public string BuildDate;
-		
+
 		/// <summary>
 		/// 构建耗时（单位：秒）
 		/// </summary>
@@ -58,11 +58,26 @@ 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;
+
 		/// <summary>
 		/// 加密服务类名称
 		/// </summary>

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

@@ -19,7 +19,7 @@ namespace YooAsset.Editor
         /// <summary>
         /// 构建失败的信息
         /// </summary>
-        public string FailedInfo;
+        public string ErrorInfo;
 
         /// <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.Desc}<---------------------------------------");
+						BuildLogger.Log($"---------------------------------------->{taskAttribute.TaskDesc}<---------------------------------------");
 					task.Run(context);
 					_buildWatch.Stop();
 
@@ -46,13 +46,13 @@ namespace YooAsset.Editor
 					int seconds = GetBuildSeconds();
 					TotalSeconds += seconds;
 					if (taskAttribute != null)
-						BuildLogger.Log($"{taskAttribute.Desc}耗时：{seconds}秒");
+						BuildLogger.Log($"{taskAttribute.TaskDesc}耗时：{seconds}秒");
 				}
 				catch (Exception e)
 				{
 					EditorTools.ClearProgressBar();
 					buildResult.FailedTask = task.GetType().Name;
-					buildResult.FailedInfo = e.ToString();
+					buildResult.ErrorInfo = e.ToString();
 					buildResult.Success = false;
 					break;
 				}

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

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

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

@@ -33,7 +33,7 @@ namespace YooAsset.Editor
 			// 开始构建
 			IBundleBuildResults buildResults;
 			var buildParameters = buildParametersContext.GetSBPBuildParameters();
-			var taskList = SBPBuildTasks.Create(buildMapContext.ShadersBundleName);
+			var taskList = SBPBuildTasks.Create(buildMapContext.Command.ShadersBundleName);
 			ReturnCode exitCode = ContentPipeline.BuildAssetBundles(buildParameters, buildContent, out buildResults, taskList);
 			if (exitCode < 0)
 			{
@@ -43,7 +43,7 @@ namespace YooAsset.Editor
 			// 创建着色器信息
 			// 说明：解决因为着色器资源包导致验证失败。
 			// 例如：当项目里没有着色器，如果有依赖内置着色器就会验证失败。
-			string shadersBundleName = buildMapContext.ShadersBundleName;
+			string shadersBundleName = buildMapContext.Command.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 = AssetBundleBuilderHelper.GetStreamingAssetsFolderPath();
+			string streamingAssetsDirectory = buildParametersContext.GetStreamingAssetsDirectory();
 			string buildPackageName = buildParametersContext.Parameters.PackageName;
 			string buildPackageVersion = buildParametersContext.Parameters.PackageVersion;
 
@@ -40,7 +40,7 @@ namespace YooAsset.Editor
 			// 清空流目录
 			if (option == ECopyBuildinFileOption.ClearAndCopyAll || option == ECopyBuildinFileOption.ClearAndCopyByTags)
 			{
-				AssetBundleBuilderHelper.ClearStreamingAssetsFolder();
+				EditorTools.ClearFolder(streamingAssetsDirectory);
 			}
 
 			// 拷贝补丁清单文件
@@ -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,7 +34,9 @@ namespace YooAsset.Editor
 			// 创建新补丁清单
 			PackageManifest manifest = new PackageManifest();
 			manifest.FileVersion = YooAssetSettings.ManifestFileVersion;
-			manifest.EnableAddressable = buildMapContext.EnableAddressable;
+			manifest.EnableAddressable = buildMapContext.Command.EnableAddressable;
+			manifest.LocationToLower = buildMapContext.Command.LocationToLower;
+			manifest.IncludeAssetGUID = buildMapContext.Command.IncludeAssetGUID;
 			manifest.OutputNameStyle = (int)buildParameters.OutputNameStyle;
 			manifest.PackageName = buildParameters.PackageName;
 			manifest.PackageVersion = buildParameters.PackageVersion;
@@ -47,7 +49,7 @@ namespace YooAsset.Editor
 				if (buildParameters.BuildMode == EBuildMode.IncrementalBuild)
 				{
 					var buildResultContext = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
-					UpdateBuiltInBundleReference(manifest, buildResultContext, buildMapContext.ShadersBundleName);
+					UpdateBuiltInBundleReference(manifest, buildResultContext, buildMapContext.Command.ShadersBundleName);
 				}
 			}
 
@@ -98,7 +100,7 @@ namespace YooAsset.Editor
 			{
 				string fileName = YooAssetSettingsData.GetPackageHashFileName(buildParameters.PackageName, buildParameters.PackageVersion);
 				string filePath = $"{packageOutputDirectory}/{fileName}";
-				FileUtility.CreateFile(filePath, packageHash);
+				FileUtility.WriteAllText(filePath, packageHash);
 				BuildLogger.Log($"创建补丁清单哈希文件：{filePath}");
 			}
 
@@ -106,7 +108,7 @@ namespace YooAsset.Editor
 			{
 				string fileName = YooAssetSettingsData.GetPackageVersionFileName(buildParameters.PackageName);
 				string filePath = $"{packageOutputDirectory}/{fileName}";
-				FileUtility.CreateFile(filePath, buildParameters.PackageVersion);
+				FileUtility.WriteAllText(filePath, buildParameters.PackageVersion);
 				BuildLogger.Log($"创建补丁清单版本文件：{filePath}");
 			}
 		}
@@ -137,15 +139,13 @@ namespace YooAsset.Editor
 			List<PackageAsset> result = new List<PackageAsset>(1000);
 			foreach (var bundleInfo in buildMapContext.Collection)
 			{
-				var assetInfos = bundleInfo.GetAllMainAssetInfos();
+				var assetInfos = bundleInfo.GetAllManifestAssetInfos();
 				foreach (var assetInfo in assetInfos)
 				{
 					PackageAsset packageAsset = new PackageAsset();
-					if (buildMapContext.EnableAddressable)
-						packageAsset.Address = assetInfo.Address;
-					else
-						packageAsset.Address = string.Empty;
+					packageAsset.Address = buildMapContext.Command.EnableAddressable ? assetInfo.Address : string.Empty;
 					packageAsset.AssetPath = assetInfo.AssetPath;
+					packageAsset.AssetGUID = buildMapContext.Command.IncludeAssetGUID ? assetInfo.AssetGUID : string.Empty;
 					packageAsset.AssetTags = assetInfo.AssetTags.ToArray();
 					packageAsset.BundleID = GetAssetBundleID(assetInfo.BundleName, manifest);
 					packageAsset.DependIDs = GetAssetBundleDependIDs(packageAsset.BundleID, assetInfo, manifest);
@@ -205,6 +205,7 @@ namespace YooAsset.Editor
 				throw new Exception("没有发现着色器资源包！");
 
 			// 检测依赖交集并更新依赖ID
+			HashSet<string> tagTemps = new HashSet<string>();
 			foreach (var packageAsset in manifest.AssetList)
 			{
 				List<string> dependBundles = GetPackageAssetAllDependBundles(manifest, packageAsset);
@@ -215,8 +216,23 @@ namespace YooAsset.Editor
 					if (newDependIDs.Contains(shaderBundleId) == false)
 						newDependIDs.Add(shaderBundleId);
 					packageAsset.DependIDs = newDependIDs.ToArray();
+					foreach (var tag in packageAsset.AssetTags)
+					{
+						if (tagTemps.Contains(tag) == false)
+							tagTemps.Add(tag);
+					}
 				}
 			}
+
+			// 更新资源包标签
+			var packageBundle = manifest.BundleList[shaderBundleId];
+			List<string> newTags = new List<string>(packageBundle.Tags);
+			foreach (var tag in tagTemps)
+			{
+				if (newTags.Contains(tag) == false)
+					newTags.Add(tag);
+			}
+			packageBundle.Tags = newTags.ToArray();
 		}
 		private List<string> GetPackageAssetAllDependBundles(PackageManifest manifest, PackageAsset packageAsset)
 		{
@@ -302,7 +318,7 @@ namespace YooAsset.Editor
 			{
 				if (packageBundle.IsRawFile)
 				{
-					_cachedBundleDepends.Add(packageBundle.BundleName, new string[] { } );
+					_cachedBundleDepends.Add(packageBundle.BundleName, new string[] { });
 					continue;
 				}
 
@@ -321,7 +337,7 @@ namespace YooAsset.Editor
 			}
 			EditorTools.ClearProgressBar();
 		}
-		
+
 		private int[] GetBundleRefrenceIDs(PackageManifest manifest, PackageBundle targetBundle)
 		{
 			List<string> referenceList = new List<string>();

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

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using UnityEditor;
 
 namespace YooAsset.Editor
@@ -44,8 +45,12 @@ namespace YooAsset.Editor
 				buildReport.Summary.BuildMode = buildParameters.BuildMode;
 				buildReport.Summary.BuildPackageName = buildParameters.PackageName;
 				buildReport.Summary.BuildPackageVersion = buildParameters.PackageVersion;
-				buildReport.Summary.EnableAddressable = buildMapContext.EnableAddressable;
-				buildReport.Summary.UniqueBundleName = buildMapContext.UniqueBundleName;
+				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.EncryptionServicesClassName = buildParameters.EncryptionServices == null ?
 					"null" : buildParameters.EncryptionServices.GetType().FullName;
 
@@ -101,6 +106,9 @@ namespace YooAsset.Editor
 				buildReport.BundleInfos.Add(reportBundleInfo);
 			}
 
+			// 冗余资源列表
+			buildReport.RedundancyInfos = new List<ReportRedundancyInfo>(buildMapContext.RedundancyInfos);
+
 			// 序列化文件
 			string fileName = YooAssetSettingsData.GetReportFileName(buildParameters.PackageName, buildParameters.PackageVersion);
 			string filePath = $"{packageOutputDirectory}/{fileName}";
@@ -152,7 +160,7 @@ namespace YooAsset.Editor
 		}
 
 		/// <summary>
-		/// 获取该资源包内的所有资源（包括零依赖资源）
+		/// 获取该资源包内的所有资源
 		/// </summary>
 		private List<string> GetAllBuiltinAssets(BuildMapContext buildMapContext, string bundleName)
 		{

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

@@ -52,7 +52,7 @@ namespace YooAsset.Editor
 					}
 
 					string filePath = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}.encrypt";
-					FileUtility.CreateFile(filePath, encryptResult.EncryptedData);
+					FileUtility.WriteAllBytes(filePath, encryptResult.EncryptedData);
 					bundleInfo.EncryptedFilePath = filePath;
 					bundleInfo.LoadMethod = encryptResult.LoadMethod;
 					BuildLogger.Log($"Bundle文件加密完成：{filePath}");

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

@@ -13,7 +13,7 @@ namespace YooAsset.Editor
 		void IBuildTask.Run(BuildContext context)
 		{
 			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-			var buildMapContext = CreateBuildMap(buildParametersContext.Parameters.BuildMode, buildParametersContext.Parameters.PackageName);
+			var buildMapContext = CreateBuildMap(buildParametersContext.Parameters);
 			context.SetContextObject(buildMapContext);
 			BuildLogger.Log("构建内容准备完毕！");
 
@@ -24,8 +24,12 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 资源构建上下文
 		/// </summary>
-		public BuildMapContext CreateBuildMap(EBuildMode buildMode, string packageName)
+		public BuildMapContext CreateBuildMap(BuildParameters buildParameters)
 		{
+			var buildMode = buildParameters.BuildMode;
+			var packageName = buildParameters.PackageName;
+			var sharedPackRule = buildParameters.SharedPackRule;
+
 			Dictionary<string, BuildAssetInfo> allBuildAssetInfoDic = new Dictionary<string, BuildAssetInfo>(1000);
 
 			// 1. 检测配置合法性
@@ -93,18 +97,31 @@ namespace YooAsset.Editor
 			// 7. 记录关键信息
 			BuildMapContext context = new BuildMapContext();
 			context.AssetFileCount = allBuildAssetInfoDic.Count;
-			context.EnableAddressable = collectResult.Command.EnableAddressable;
-			context.UniqueBundleName = collectResult.Command.UniqueBundleName;
-			context.ShadersBundleName = collectResult.Command.ShadersBundleName;
+			context.Command = collectResult.Command;
 
-			// 8. 计算共享的资源包名
+			// 8. 计算共享资源的包名		
 			var command = collectResult.Command;
 			foreach (var buildAssetInfo in allBuildAssetInfoDic.Values)
 			{
-				buildAssetInfo.CalculateShareBundleName(command.UniqueBundleName, command.PackageName, command.ShadersBundleName);
+				buildAssetInfo.CalculateShareBundleName(sharedPackRule, command.UniqueBundleName, command.PackageName, command.ShadersBundleName);
 			}
 
-			// 9. 移除不参与构建的资源
+			// 9. 记录冗余资源
+			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. 移除不参与构建的资源
 			List<BuildAssetInfo> removeBuildList = new List<BuildAssetInfo>();
 			foreach (var buildAssetInfo in allBuildAssetInfoDic.Values)
 			{
@@ -116,7 +133,7 @@ namespace YooAsset.Editor
 				allBuildAssetInfoDic.Remove(removeValue.AssetPath);
 			}
 
-			// 10. 构建资源包
+			// 11. 构建资源列表
 			var allPackAssets = allBuildAssetInfoDic.Values.ToList();
 			if (allPackAssets.Count == 0)
 				throw new Exception("构建的资源列表不能为空");
@@ -124,22 +141,23 @@ namespace YooAsset.Editor
 			{
 				context.PackAsset(assetInfo);
 			}
+
 			return context;
 		}
 		private void RemoveZeroReferenceAssets(List<CollectAssetInfo> allCollectAssetInfos)
 		{
 			// 1. 检测是否任何存在依赖资源
-			bool hasAnyDependAsset = false;
+			bool hasAnyDependCollector = false;
 			foreach (var collectAssetInfo in allCollectAssetInfos)
 			{
 				var collectorType = collectAssetInfo.CollectorType;
 				if (collectorType == ECollectorType.DependAssetCollector)
 				{
-					hasAnyDependAsset = true;
+					hasAnyDependCollector = true;
 					break;
 				}
 			}
-			if (hasAnyDependAsset == false)
+			if (hasAnyDependCollector == false)
 				return;
 
 			// 2. 获取所有主资源的依赖资源集合

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

@@ -16,14 +16,37 @@ 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("包裹版本不能为空");
+				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 !");
+			}
 
 			if (buildParameters.BuildMode != EBuildMode.SimulateBuild)
 			{
+#if UNITY_2021_3_OR_NEWER
+				if (buildParameters.BuildPipeline == EBuildPipeline.BuiltinBuildPipeline)
+				{
+					BuildLogger.Warning("推荐使用可编程构建管线（SBP）！");
+				}
+#endif
+
 				// 检测当前是否正在构建资源包
 				if (BuildPipeline.isBuildingPlayer)
 					throw new Exception("当前正在构建资源包，请结束后再试");
@@ -40,6 +63,20 @@ namespace YooAsset.Editor
 						throw new Exception("首包资源标签不能为空！");
 				}
 
+				// 检测共享资源打包规则
+				if (buildParameters.SharedPackRule == null)
+					throw new Exception("共享资源打包规则不能为空！");
+
+#if UNITY_WEBGL
+				if (buildParameters.EncryptionServices != null)
+				{
+					if (buildParameters.EncryptionServices.GetType() != typeof(EncryptionNone))
+					{
+						throw new Exception("WebGL平台不支持加密！");
+					}
+				}
+#endif
+
 				// 检测包裹输出目录是否存在
 				string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
 				if (Directory.Exists(packageOutputDirectory))
@@ -51,11 +88,10 @@ namespace YooAsset.Editor
 
 			if (buildParameters.BuildMode == EBuildMode.ForceRebuild)
 			{
-				// 删除总目录
-				string platformDirectory = $"{buildParameters.OutputRoot}/{buildParameters.BuildTarget}/{buildParameters.PackageName}";
-				if (EditorTools.DeleteDirectory(platformDirectory))
+				string packageRootDirectory = buildParametersContext.GetPackageRootDirectory();
+				if (EditorTools.DeleteDirectory(packageRootDirectory))
 				{
-					BuildLogger.Log($"删除平台总目录：{platformDirectory}");
+					BuildLogger.Log($"删除包裹目录：{packageRootDirectory}");
 				}
 			}
 

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollector.cs

@@ -197,16 +197,17 @@ namespace YooAsset.Editor
 			// 检测可寻址地址是否重复
 			if (command.EnableAddressable)
 			{
-				HashSet<string> adressTemper = new HashSet<string>();
+				var addressTemper = new Dictionary<string, string>();
 				foreach (var collectInfoPair in result)
 				{
 					if (collectInfoPair.Value.CollectorType == ECollectorType.MainAssetCollector)
 					{
 						string address = collectInfoPair.Value.Address;
-						if (adressTemper.Contains(address) == false)
-							adressTemper.Add(address);
+						string assetPath = collectInfoPair.Value.AssetPath;
+						if (addressTemper.TryGetValue(address, out var existed) == false)
+							addressTemper.Add(address, assetPath);
 						else
-							throw new Exception($"The address is existed : {address} in collector : {CollectPath}");
+							throw new Exception($"The address is existed : {address} in collector : {CollectPath} \nAssetPath:\n     {existed}\n     {assetPath}");
 					}
 				}
 			}
@@ -250,7 +251,7 @@ namespace YooAsset.Editor
 			// 检测原生文件是否合规
 			if (isRawFilePackRule)
 			{
-				string extension = StringUtility.RemoveFirstChar(System.IO.Path.GetExtension(assetPath));
+				string extension = EditorTools.RemoveFirstChar(System.IO.Path.GetExtension(assetPath));
 				if (extension == EAssetFileExtension.unity.ToString() || extension == EAssetFileExtension.prefab.ToString() ||
 					extension == EAssetFileExtension.fbx.ToString() || extension == EAssetFileExtension.mat.ToString() ||
 					extension == EAssetFileExtension.controller.ToString() || extension == EAssetFileExtension.anim.ToString() ||
@@ -289,10 +290,6 @@ namespace YooAsset.Editor
 		}
 		private bool IsCollectAsset(string assetPath)
 		{
-			Type assetType = AssetDatabase.GetMainAssetTypeAtPath(assetPath);
-			if (assetType == typeof(UnityEngine.Shader) || assetType == typeof(UnityEngine.ShaderVariantCollection))
-				return true;
-
 			// 根据规则设置过滤资源文件
 			IFilterRule filterRuleInstance = AssetBundleCollectorSettingData.GetFilterRuleInstance(FilterRuleName);
 			return filterRuleInstance.IsCollectAsset(new FilterRuleData(assetPath));

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorConfig.cs

@@ -15,6 +15,8 @@ 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";
@@ -66,6 +68,8 @@ namespace YooAsset.Editor
 
 			// 读取公共配置
 			bool enableAddressable = false;
+			bool locationToLower = false;
+			bool includeAssetGUID = false;
 			bool uniqueBundleName = false;
 			bool showPackageView = false;
 			bool showEditorAlias = false;
@@ -73,19 +77,18 @@ namespace YooAsset.Editor
 			if (commonNodeList.Count > 0)
 			{
 				XmlElement commonElement = commonNodeList[0] as XmlElement;
-				if (commonElement.HasAttribute(XmlEnableAddressable) == false)
-					throw new Exception($"Not found attribute {XmlEnableAddressable} in {XmlCommon}");
-				if (commonElement.HasAttribute(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;
+				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;
 			}
 
 			// 读取包裹配置
@@ -162,7 +165,7 @@ namespace YooAsset.Editor
 			}
 
 			// 检测配置错误
-			foreach(var package in packages)
+			foreach (var package in packages)
 			{
 				package.CheckConfigError();
 			}
@@ -170,6 +173,8 @@ 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;
@@ -201,6 +206,8 @@ 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());
@@ -359,14 +366,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

@@ -96,16 +96,17 @@ namespace YooAsset.Editor
 			// 检测可寻址地址是否重复
 			if (command.EnableAddressable)
 			{
-				HashSet<string> adressTemper = new HashSet<string>();
+				var addressTemper = new Dictionary<string, string>();
 				foreach (var collectInfoPair in result)
 				{
 					if (collectInfoPair.Value.CollectorType == ECollectorType.MainAssetCollector)
 					{
 						string address = collectInfoPair.Value.Address;
-						if (adressTemper.Contains(address) == false)
-							adressTemper.Add(address);
+						string assetPath = collectInfoPair.Value.AssetPath;
+						if (addressTemper.TryGetValue(address, out var existed) == false)
+							addressTemper.Add(address, assetPath);
 						else
-							throw new Exception($"The address is existed : {address} in group : {GroupName}");
+							throw new Exception($"The address is existed : {address} in group : {GroupName} \nAssetPath:\n     {existed}\n     {assetPath}");
 					}
 				}
 			}

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorPackage.cs

@@ -76,16 +76,17 @@ namespace YooAsset.Editor
 			// 检测可寻址地址是否重复
 			if (command.EnableAddressable)
 			{
-				HashSet<string> adressTemper = new HashSet<string>();
+				var addressTemper = new Dictionary<string, string>();
 				foreach (var collectInfoPair in result)
 				{
 					if (collectInfoPair.Value.CollectorType == ECollectorType.MainAssetCollector)
 					{
 						string address = collectInfoPair.Value.Address;
-						if (adressTemper.Contains(address) == false)
-							adressTemper.Add(address);
+						string assetPath = collectInfoPair.Value.AssetPath;
+						if (addressTemper.TryGetValue(address, out var existed) == false)
+							addressTemper.Add(address, assetPath);
 						else
-							throw new Exception($"The address is existed : {address}");
+							throw new Exception($"The address is existed : {address} \nAssetPath:\n     {existed}\n     {assetPath}");
 					}
 				}
 			}

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSetting.cs

@@ -6,18 +6,29 @@ using UnityEngine;
 
 namespace YooAsset.Editor
 {
+	[CreateAssetMenu(fileName = "AssetBundleCollectorSetting", menuName = "YooAsset/Create AssetBundle Collector Settings")]
 	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>
@@ -40,7 +51,12 @@ namespace YooAsset.Editor
 		/// </summary>
 		public void ClearAll()
 		{
+			ShowPackageView = false;
 			EnableAddressable = false;
+			LocationToLower = false;
+			IncludeAssetGUID = false;
+			UniqueBundleName = false;
+			ShowEditorAlias = false;
 			Packages.Clear();
 		}
 
@@ -100,7 +116,8 @@ namespace YooAsset.Editor
 			{
 				if (package.PackageName == packageName)
 				{
-					CollectCommand command = new CollectCommand(buildMode, packageName, EnableAddressable, UniqueBundleName);
+					CollectCommand command = new CollectCommand(buildMode, packageName,
+						EnableAddressable, LocationToLower, IncludeAssetGUID, UniqueBundleName);
 					CollectResult collectResult = new CollectResult(command);
 					collectResult.SetCollectAssets(package.GetAllCollectAssets(command));
 					return collectResult;

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSettingData.cs

@@ -331,6 +331,16 @@ 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

@@ -12,7 +12,7 @@ namespace YooAsset.Editor
 	public class AssetBundleCollectorWindow : EditorWindow
 	{
 		[MenuItem("YooAsset/AssetBundle Collector", false, 101)]
-		public static void ShowExample()
+		public static void OpenWindow()
 		{
 			AssetBundleCollectorWindow window = GetWindow<AssetBundleCollectorWindow>("资源包收集工具", true, WindowsDefine.DockedWindowTypes);
 			window.minSize = new Vector2(800, 600);
@@ -25,8 +25,13 @@ namespace YooAsset.Editor
 		private List<RuleDisplayName> _packRuleList;
 		private List<RuleDisplayName> _filterRuleList;
 
+		private Button _settingsButton;
+		private VisualElement _setting1Container;
+		private VisualElement _setting2Container;
 		private Toggle _showPackageToogle;
 		private Toggle _enableAddressableToogle;
+		private Toggle _locationToLowerToogle;
+		private Toggle _includeAssetGUIDToogle;
 		private Toggle _uniqueBundleNameToogle;
 		private Toggle _showEditorAliasToggle;
 
@@ -47,6 +52,7 @@ namespace YooAsset.Editor
 
 		private int _lastModifyPackageIndex = 0;
 		private int _lastModifyGroupIndex = 0;
+		private bool _showSettings = false;
 
 
 		public void CreateGUI()
@@ -77,6 +83,10 @@ namespace YooAsset.Editor
 				visualAsset.CloneTree(root);
 
 				// 公共设置相关
+				_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 =>
 				{
@@ -89,13 +99,24 @@ 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 =>
 				{
@@ -302,9 +323,22 @@ 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 (_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;
 
@@ -336,6 +370,11 @@ namespace YooAsset.Editor
 		{
 			AssetBundleCollectorSettingData.SaveFile();
 		}
+		private void SettingsBtn_clicked()
+		{
+			_showSettings = !_showSettings;
+			RefreshWindow();
+		}
 		private string FormatListItemCallback(RuleDisplayName ruleDisplayName)
 		{
 			if (_showEditorAliasToggle.value)
@@ -796,7 +835,8 @@ namespace YooAsset.Editor
 
 				try
 				{
-					CollectCommand command = new CollectCommand(EBuildMode.SimulateBuild, _packageNameTxt.value, _enableAddressableToogle.value, _uniqueBundleNameToogle.value);
+					CollectCommand command = new CollectCommand(EBuildMode.SimulateBuild, _packageNameTxt.value,
+						_enableAddressableToogle.value, _locationToLowerToogle.value, _includeAssetGUIDToogle.value, _uniqueBundleNameToogle.value);
 					collectAssetInfos = collector.GetAllCollectAssets(command, group);
 				}
 				catch (System.Exception e)

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.uxml

@@ -1,15 +1,22 @@
-<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements">
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
     <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="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 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: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>
     <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,10 +14,20 @@ 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>
@@ -29,11 +39,13 @@ namespace YooAsset.Editor
 		public string ShadersBundleName { private set; get; }
 
 
-		public CollectCommand(EBuildMode buildMode, string packageName, bool enableAddressable, bool uniqueBundleName)
+		public CollectCommand(EBuildMode buildMode, string packageName, bool enableAddressable, bool locationToLower, bool includeAssetGUID, bool uniqueBundleName)
 		{
 			BuildMode = buildMode;
 			PackageName = packageName;
 			EnableAddressable = enableAddressable;
+			LocationToLower = locationToLower;
+			IncludeAssetGUID = includeAssetGUID;
 			UniqueBundleName = uniqueBundleName;
 
 			// 着色器统一全名称

Assets/YooAsset/Editor/AssetBundleCollector/CollectRules.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4b1fa97e8bb8c5c46ad030b9554e1b5c
+guid: 28c5def11c9035443b6251933ffa6a30
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

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

@@ -48,12 +48,16 @@ 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/CollectRules/ISharedPackRule.cs

@@ -0,0 +1,14 @@
+
+namespace YooAsset.Editor
+{
+	/// <summary>
+	/// 共享资源的打包规则
+	/// </summary>
+	public interface ISharedPackRule
+	{
+		/// <summary>
+		/// 获取打包规则结果
+		/// </summary>
+		PackRuleResult GetPackRuleResult(string assetPath);
+	}
+}

Assets/YooAsset/Editor/AssetBundleCollector/CollectRules/ISharedPackRule.cs.meta

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

Assets/YooAsset/Editor/AssetBundleCollector/DefaultRules.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a44aabee880cce943b52fe806464be0d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -20,7 +20,7 @@ namespace YooAsset.Editor
 		}
 	}
 
-	[DisplayName("定位地址: 分组名+文件名")]
+	[DisplayName("定位地址: 分组名_文件名")]
 	public class AddressByGroupAndFileName : IAddressRule
 	{
 		string IAddressRule.GetAssetAddress(AddressRuleData data)
@@ -30,7 +30,7 @@ namespace YooAsset.Editor
 		}
 	}
 
-	[DisplayName("定位地址: 文件夹名+文件名")]
+	[DisplayName("定位地址: 文件夹名_文件名")]
 	public class AddressByFolderAndFileName : IAddressRule
 	{
 		string IAddressRule.GetAssetAddress(AddressRuleData data)

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

@@ -40,7 +40,7 @@ namespace YooAsset.Editor
 	{
 		PackRuleResult IPackRule.GetPackRuleResult(PackRuleData data)
 		{
-			string bundleName = StringUtility.RemoveExtension(data.AssetPath);
+			string bundleName = PathUtility.RemoveExtension(data.AssetPath);
 			PackRuleResult result = new PackRuleResult(bundleName, DefaultPackRule.AssetBundleFileExtension);
 			return result;
 		}
@@ -60,8 +60,6 @@ namespace YooAsset.Editor
 	[DisplayName("资源包名: 父类文件夹路径")]
 	public class PackDirectory : IPackRule
 	{
-		public static PackDirectory StaticPackRule = new PackDirectory();
-
 		PackRuleResult IPackRule.GetPackRuleResult(PackRuleData data)
 		{
 			string bundleName = Path.GetDirectoryName(data.AssetPath);
@@ -127,7 +125,7 @@ namespace YooAsset.Editor
 			}
 			else
 			{
-				bundleName = StringUtility.RemoveExtension(collectPath);
+				bundleName = PathUtility.RemoveExtension(collectPath);
 			}
 
 			PackRuleResult result = new PackRuleResult(bundleName, DefaultPackRule.AssetBundleFileExtension);

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

@@ -0,0 +1,31 @@
+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/DefaultRules/DefaultSharedPackRule.cs.meta

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

Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebuggerWindow.cs

@@ -13,7 +13,7 @@ namespace YooAsset.Editor
 	public class AssetBundleDebuggerWindow : EditorWindow
 	{
 		[MenuItem("YooAsset/AssetBundle Debugger", false, 104)]
-		public static void ShowExample()
+		public static void OpenWindow()
 		{
 			AssetBundleDebuggerWindow wnd = GetWindow<AssetBundleDebuggerWindow>("资源包调试工具", true, WindowsDefine.DockedWindowTypes);
 			wnd.minSize = new Vector2(800, 600);
@@ -278,7 +278,7 @@ namespace YooAsset.Editor
 
 				string filePath = $"{resultPath}/{nameof(DebugReport)}_{_currentReport.FrameCount}.json";
 				string fileContent = JsonUtility.ToJson(_currentReport, true);
-				FileUtility.CreateFile(filePath, fileContent);
+				FileUtility.WriteAllText(filePath, fileContent);
 			}
 		}
 		private void OnSearchKeyWordChange(ChangeEvent<string> e)

Assets/YooAsset/Editor/AssetBundleReporter/AssetBundleReporterWindow.cs

@@ -10,7 +10,7 @@ namespace YooAsset.Editor
 	public class AssetBundleReporterWindow : EditorWindow
 	{
 		[MenuItem("YooAsset/AssetBundle Reporter", false, 103)]
-		public static void ShowExample()
+		public static void OpenWindow()
 		{
 			AssetBundleReporterWindow window = GetWindow<AssetBundleReporterWindow>("资源包报告工具", true, WindowsDefine.DockedWindowTypes);
 			window.minSize = new Vector2(800, 600);
@@ -35,12 +35,18 @@ namespace YooAsset.Editor
 			/// 资源包视图
 			/// </summary>
 			BundleView,
+
+			/// <summary>
+			/// 冗余资源试图
+			/// </summary>
+			Redundancy,
 		}
 
 		private ToolbarMenu _viewModeMenu;
 		private ReporterSummaryViewer _summaryViewer;
 		private ReporterAssetListViewer _assetListViewer;
 		private ReporterBundleListViewer _bundleListViewer;
+		private ReporterRedundancyListViewer _redundancyListViewer;
 
 		private EViewMode _viewMode;
 		private BuildReport _buildReport;
@@ -70,6 +76,7 @@ namespace YooAsset.Editor
 				_viewModeMenu.menu.AppendAction(EViewMode.Summary.ToString(), ViewModeMenuAction0, ViewModeMenuFun0);
 				_viewModeMenu.menu.AppendAction(EViewMode.AssetView.ToString(), ViewModeMenuAction1, ViewModeMenuFun1);
 				_viewModeMenu.menu.AppendAction(EViewMode.BundleView.ToString(), ViewModeMenuAction2, ViewModeMenuFun2);
+				_viewModeMenu.menu.AppendAction(EViewMode.Redundancy.ToString(), ViewModeMenuAction3, ViewModeMenuFun3);
 
 				// 搜索栏
 				var searchField = root.Q<ToolbarSearchField>("SearchField");
@@ -87,6 +94,10 @@ namespace YooAsset.Editor
 				_bundleListViewer = new ReporterBundleListViewer();
 				_bundleListViewer.InitViewer();
 
+				// 加载试图
+				_redundancyListViewer = new ReporterRedundancyListViewer();
+				_redundancyListViewer.InitViewer();
+
 				// 显示视图
 				_viewMode = EViewMode.Summary;
 				_viewModeMenu.text = EViewMode.Summary.ToString();
@@ -111,9 +122,10 @@ namespace YooAsset.Editor
 			_reportFilePath = selectFilePath;
 			string jsonData = FileUtility.ReadAllText(_reportFilePath);
 			_buildReport = BuildReport.Deserialize(jsonData);
+			_summaryViewer.FillViewData(_buildReport);
 			_assetListViewer.FillViewData(_buildReport, _searchKeyWord);
 			_bundleListViewer.FillViewData(_buildReport, _reportFilePath, _searchKeyWord);
-			_summaryViewer.FillViewData(_buildReport);
+			_redundancyListViewer.FillViewData(_buildReport, _searchKeyWord);
 		}
 		private void OnSearchKeyWordChange(ChangeEvent<string> e)
 		{
@@ -134,6 +146,7 @@ namespace YooAsset.Editor
 				_summaryViewer.AttachParent(root);
 				_assetListViewer.DetachParent();
 				_bundleListViewer.DetachParent();
+				_redundancyListViewer.DetachParent();
 			}
 		}
 		private void ViewModeMenuAction1(DropdownMenuAction action)
@@ -146,6 +159,7 @@ namespace YooAsset.Editor
 				_summaryViewer.DetachParent();
 				_assetListViewer.AttachParent(root);
 				_bundleListViewer.DetachParent();
+				_redundancyListViewer.DetachParent();
 			}
 		}
 		private void ViewModeMenuAction2(DropdownMenuAction action)
@@ -158,6 +172,20 @@ namespace YooAsset.Editor
 				_summaryViewer.DetachParent();
 				_assetListViewer.DetachParent();
 				_bundleListViewer.AttachParent(root);
+				_redundancyListViewer.DetachParent();
+			}
+		}
+		private void ViewModeMenuAction3(DropdownMenuAction action)
+		{
+			if (_viewMode != EViewMode.Redundancy)
+			{
+				_viewMode = EViewMode.Redundancy;
+				VisualElement root = this.rootVisualElement;
+				_viewModeMenu.text = EViewMode.Redundancy.ToString();
+				_summaryViewer.DetachParent();
+				_assetListViewer.DetachParent();
+				_bundleListViewer.DetachParent();
+				_redundancyListViewer.AttachParent(root);
 			}
 		}
 		private DropdownMenuAction.Status ViewModeMenuFun0(DropdownMenuAction action)
@@ -181,6 +209,13 @@ namespace YooAsset.Editor
 			else
 				return DropdownMenuAction.Status.Normal;
 		}
+		private DropdownMenuAction.Status ViewModeMenuFun3(DropdownMenuAction action)
+		{
+			if (_viewMode == EViewMode.Redundancy)
+				return DropdownMenuAction.Status.Checked;
+			else
+				return DropdownMenuAction.Status.Normal;
+		}
 	}
 }
 #endif

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

@@ -0,0 +1,317 @@
+#if UNITY_2019_4_OR_NEWER
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+namespace YooAsset.Editor
+{
+	internal class ReporterRedundancyListViewer
+	{
+		private enum ESortMode
+		{
+			AssetPath,
+			AssetType,
+			FileSize,
+			Number,
+		}
+
+		private VisualTreeAsset _visualAsset;
+		private TemplateContainer _root;
+
+		private ToolbarButton _topBar1;
+		private ToolbarButton _topBar2;
+		private ToolbarButton _topBar3;
+		private ToolbarButton _topBar4;
+		private ListView _assetListView;
+
+		private BuildReport _buildReport;
+		private string _searchKeyWord;
+		private ESortMode _sortMode = ESortMode.AssetPath;
+		private bool _descendingSort = false;
+
+
+		/// <summary>
+		/// 初始化页面
+		/// </summary>
+		public void InitViewer()
+		{
+			// 加载布局文件
+			_visualAsset = UxmlLoader.LoadWindowUXML<ReporterRedundancyListViewer>();
+			if (_visualAsset == null)
+				return;
+
+			_root = _visualAsset.CloneTree();
+			_root.style.flexGrow = 1f;
+
+			// 顶部按钮栏
+			_topBar1 = _root.Q<ToolbarButton>("TopBar1");
+			_topBar2 = _root.Q<ToolbarButton>("TopBar2");
+			_topBar3 = _root.Q<ToolbarButton>("TopBar3");
+			_topBar4 = _root.Q<ToolbarButton>("TopBar4");
+			_topBar1.clicked += TopBar1_clicked;
+			_topBar2.clicked += TopBar2_clicked;
+			_topBar3.clicked += TopBar3_clicked;
+			_topBar4.clicked += TopBar4_clicked;
+
+			// 资源列表
+			_assetListView = _root.Q<ListView>("TopListView");
+			_assetListView.makeItem = MakeAssetListViewItem;
+			_assetListView.bindItem = BindAssetListViewItem;
+		}
+
+		/// <summary>
+		/// 填充页面数据
+		/// </summary>
+		public void FillViewData(BuildReport buildReport, string searchKeyWord)
+		{
+			_buildReport = buildReport;
+			_searchKeyWord = searchKeyWord;
+			RefreshView();
+		}
+		private void RefreshView()
+		{
+			_assetListView.Clear();
+			_assetListView.ClearSelection();
+			_assetListView.itemsSource = FilterAndSortViewItems();
+			_assetListView.Rebuild();
+			RefreshSortingSymbol();
+		}
+		private List<ReportRedundancyInfo> FilterAndSortViewItems()
+		{
+			List<ReportRedundancyInfo> result = new List<ReportRedundancyInfo>(_buildReport.RedundancyInfos.Count);
+
+			// 过滤列表
+			foreach (var redundancyInfo in _buildReport.RedundancyInfos)
+			{
+				if (string.IsNullOrEmpty(_searchKeyWord) == false)
+				{
+					if (redundancyInfo.AssetPath.Contains(_searchKeyWord) == false)
+						continue;
+				}
+				result.Add(redundancyInfo);
+			}
+
+			// 排序列表
+			if (_sortMode == ESortMode.AssetPath)
+			{
+				if (_descendingSort)
+					return result.OrderByDescending(a => a.AssetPath).ToList();
+				else
+					return result.OrderBy(a => a.AssetPath).ToList();
+			}
+			else if(_sortMode == ESortMode.AssetType)
+			{
+				if (_descendingSort)
+					return result.OrderByDescending(a => a.AssetType).ToList();
+				else
+					return result.OrderBy(a => a.AssetType).ToList();
+			}
+			else if (_sortMode == ESortMode.FileSize)
+			{
+				if (_descendingSort)
+					return result.OrderByDescending(a => a.FileSize).ToList();
+				else
+					return result.OrderBy(a => a.FileSize).ToList();
+			}
+			else if (_sortMode == ESortMode.Number)
+			{
+				if (_descendingSort)
+					return result.OrderByDescending(a => a.Number).ToList();
+				else
+					return result.OrderBy(a => a.Number).ToList();
+			}
+			else
+			{
+				throw new System.NotImplementedException();
+			}
+		}
+		private void RefreshSortingSymbol()
+		{
+			_topBar1.text = $"Asset Path ({_assetListView.itemsSource.Count})";
+			_topBar2.text = "Asset Type";
+			_topBar3.text = "File Size";
+			_topBar4.text = "Redundancy Num";
+
+			if (_sortMode == ESortMode.AssetPath)
+			{
+				if (_descendingSort)
+					_topBar1.text = $"Asset Path ({_assetListView.itemsSource.Count}) ↓";
+				else
+					_topBar1.text = $"Asset Path ({_assetListView.itemsSource.Count}) ↑";
+			}
+			else if(_sortMode == ESortMode.AssetType)
+			{
+				if (_descendingSort)
+					_topBar2.text = "Asset Type ↓";
+				else
+					_topBar2.text = "Asset Type ↑";
+			}
+			else if (_sortMode == ESortMode.FileSize)
+			{
+				if (_descendingSort)
+					_topBar3.text = "File Size ↓";
+				else
+					_topBar3.text = "File Size ↑";
+			}
+			else if (_sortMode == ESortMode.Number)
+			{
+				if (_descendingSort)
+					_topBar4.text = "Redundancy Num ↓";
+				else
+					_topBar4.text = "Redundancy Num ↑";
+			}
+			else
+			{
+				throw new System.NotImplementedException();
+			}
+		}
+
+		/// <summary>
+		/// 挂接到父类页面上
+		/// </summary>
+		public void AttachParent(VisualElement parent)
+		{
+			parent.Add(_root);
+		}
+
+		/// <summary>
+		/// 从父类页面脱离开
+		/// </summary>
+		public void DetachParent()
+		{
+			_root.RemoveFromHierarchy();
+		}
+
+
+		// 资源列表相关
+		private VisualElement MakeAssetListViewItem()
+		{
+			VisualElement element = new VisualElement();
+			element.style.flexDirection = FlexDirection.Row;
+
+			{
+				var label = new Label();
+				label.name = "Label1";
+				label.style.unityTextAlign = TextAnchor.MiddleLeft;
+				label.style.marginLeft = 3f;
+				label.style.flexGrow = 1f;
+				label.style.width = 280;
+				element.Add(label);
+			}
+
+			{
+				var label = new Label();
+				label.name = "Label2";
+				label.style.unityTextAlign = TextAnchor.MiddleLeft;
+				label.style.marginLeft = 3f;
+				label.style.flexGrow = 0;
+				label.style.width = 125;
+				element.Add(label);
+			}
+
+			{
+				var label = new Label();
+				label.name = "Label3";
+				label.style.unityTextAlign = TextAnchor.MiddleLeft;
+				label.style.marginLeft = 3f;
+				label.style.flexGrow = 0;
+				label.style.width = 125;
+				element.Add(label);
+			}
+
+			{
+				var label = new Label();
+				label.name = "Label4";
+				label.style.unityTextAlign = TextAnchor.MiddleLeft;
+				label.style.marginLeft = 3f;
+				label.style.flexGrow = 0;
+				label.style.width = 125;
+				element.Add(label);
+			}
+
+			return element;
+		}
+		private void BindAssetListViewItem(VisualElement element, int index)
+		{
+			var sourceData = _assetListView.itemsSource as List<ReportRedundancyInfo>;
+			var redundancyInfo = sourceData[index];
+
+			// Asset Path
+			var label1 = element.Q<Label>("Label1");
+			label1.text = redundancyInfo.AssetPath;
+
+			// Asset Type
+			var label2 = element.Q<Label>("Label2");
+			label2.text = redundancyInfo.AssetType;
+
+			// File Size
+			var label3 = element.Q<Label>("Label3");
+			label3.text = EditorUtility.FormatBytes(redundancyInfo.FileSize);
+
+			// Number
+			var label4 = element.Q<Label>("Label4");
+			label4.text = redundancyInfo.Number.ToString();
+		}
+		private void TopBar1_clicked()
+		{
+			if (_sortMode != ESortMode.AssetPath)
+			{
+				_sortMode = ESortMode.AssetPath;
+				_descendingSort = false;
+				RefreshView();
+			}
+			else
+			{
+				_descendingSort = !_descendingSort;
+				RefreshView();
+			}
+		}
+		private void TopBar2_clicked()
+		{
+			if (_sortMode != ESortMode.AssetType)
+			{
+				_sortMode = ESortMode.AssetType;
+				_descendingSort = false;
+				RefreshView();
+			}
+			else
+			{
+				_descendingSort = !_descendingSort;
+				RefreshView();
+			}
+		}
+		private void TopBar3_clicked()
+		{
+			if (_sortMode != ESortMode.FileSize)
+			{
+				_sortMode = ESortMode.FileSize;
+				_descendingSort = false;
+				RefreshView();
+			}
+			else
+			{
+				_descendingSort = !_descendingSort;
+				RefreshView();
+			}
+		}
+		private void TopBar4_clicked()
+		{
+			if (_sortMode != ESortMode.Number)
+			{
+				_sortMode = ESortMode.Number;
+				_descendingSort = false;
+				RefreshView();
+			}
+			else
+			{
+				_descendingSort = !_descendingSort;
+				RefreshView();
+			}
+		}
+	}
+}
+#endif

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

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

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

@@ -0,0 +1,11 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
+    <ui:VisualElement name="TopGroup" style="flex-grow: 1; border-left-width: 1px; border-right-width: 1px; border-top-width: 1px; border-bottom-width: 1px; border-left-color: rgb(0, 0, 0); border-right-color: rgb(0, 0, 0); border-top-color: rgb(0, 0, 0); border-bottom-color: rgb(0, 0, 0); margin-left: 0; margin-right: 0; margin-top: 2px; margin-bottom: 1px; display: flex;">
+        <uie:Toolbar name="TopBar" style="height: 25px; margin-left: 1px; margin-right: 1px;">
+            <uie:ToolbarButton text="Asset Path" display-tooltip-when-elided="true" name="TopBar1" style="width: 280px; -unity-text-align: middle-left; flex-grow: 1;" />
+            <uie:ToolbarButton text="Asset Type" display-tooltip-when-elided="true" name="TopBar2" style="width: 125px; -unity-text-align: middle-left; flex-grow: 0; flex-shrink: 1;" />
+            <uie:ToolbarButton text="File Size" display-tooltip-when-elided="true" name="TopBar3" style="width: 125px; -unity-text-align: middle-left; flex-grow: 0; flex-shrink: 1;" />
+            <uie:ToolbarButton text="Redundancy Num" display-tooltip-when-elided="true" name="TopBar4" style="width: 125px; -unity-text-align: middle-left; flex-grow: 0; flex-shrink: 1;" />
+        </uie:Toolbar>
+        <ui:ListView focusable="true" name="TopListView" item-height="18" virtualization-method="DynamicHeight" style="flex-grow: 1; flex-basis: 60px;" />
+    </ui:VisualElement>
+</ui:UXML>

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

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: a5296d9c037ce3944b5c197cbdd78a8b
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}

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

@@ -66,9 +66,13 @@ 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.EncryptionServicesClassName}"));
+			_items.Add(new ItemWrapper("共享资源打包规则", buildReport.Summary.SharedPackRuleClassName));
+			_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,10 +35,20 @@ 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)
 			{
@@ -65,6 +75,23 @@ 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>
@@ -213,11 +240,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()
 		{
@@ -286,6 +313,18 @@ namespace YooAsset.Editor
 		#endregion
 
 		#region StringUtility
+		public static string RemoveFirstChar(string str)
+		{
+			if (string.IsNullOrEmpty(str))
+				return str;
+			return str.Substring(1);
+		}
+		public static string RemoveLastChar(string str)
+		{
+			if (string.IsNullOrEmpty(str))
+				return str;
+			return str.Substring(0, str.Length - 1);
+		}
 		public static List<string> StringToStringList(string str, char separator)
 		{
 			List<string> result = new List<string>();
@@ -303,7 +342,6 @@ namespace YooAsset.Editor
 			}
 			return result;
 		}
-
 		public static T NameToEnum<T>(string name)
 		{
 			if (Enum.IsDefined(typeof(T), name) == false)
@@ -388,7 +426,7 @@ namespace YooAsset.Editor
 			FileInfo fileInfo = new FileInfo(filePath);
 			fileInfo.MoveTo(destPath);
 		}
-		
+
 		/// <summary>
 		/// 拷贝文件夹
 		/// 注意：包括所有子目录的文件

Assets/YooAsset/Editor/HomePage.cs

@@ -0,0 +1,17 @@
+#if UNITY_2019_4_OR_NEWER
+using System;
+using UnityEditor;
+using UnityEngine;
+
+namespace YooAsset.Editor
+{
+	internal class HomePageWindow
+	{
+		[MenuItem("YooAsset/Home Page", false, 1)]
+		public static void OpenWindow()
+		{
+			Application.OpenURL("https://www.yooasset.com/");
+		}
+	}
+}
+#endif

Assets/YooAsset/Editor/HomePage.cs.meta

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

Assets/YooAsset/Editor/ShaderVariantCollector/ShaderVariantCollectorSetting.cs

@@ -2,6 +2,7 @@
 
 namespace YooAsset.Editor
 {
+	[CreateAssetMenu(fileName = "ShaderVariantCollectorSetting", menuName = "YooAsset/Create ShaderVariant Collector Settings")]
 	public class ShaderVariantCollectorSetting : ScriptableObject
 	{
 		/// <summary>

Assets/YooAsset/Editor/ShaderVariantCollector/ShaderVariantCollectorWindow.cs

@@ -12,7 +12,7 @@ namespace YooAsset.Editor
 	public class ShaderVariantCollectorWindow : EditorWindow
 	{
 		[MenuItem("YooAsset/ShaderVariant Collector", false, 201)]
-		public static void ShowExample()
+		public static void OpenWindow()
 		{
 			ShaderVariantCollectorWindow window = GetWindow<ShaderVariantCollectorWindow>("着色器变种收集工具", true, WindowsDefine.DockedWindowTypes);
 			window.minSize = new Vector2(800, 600);

Assets/YooAsset/LICENSE.md

@@ -187,7 +187,7 @@
       identification within third-party archives.
 
    Copyright 2018-2021 何冠峰
-   Copyright 2021-2022 TuYoo Games
+   Copyright 2021-2023 TuYoo Games
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

Assets/YooAsset/Runtime/AssetReference.cs

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

Assets/YooAsset/Runtime/AssetSystem/AssetSystem.cs

@@ -169,7 +169,7 @@ namespace YooAsset
 		/// <summary>
 		/// 加载场景
 		/// </summary>
-		public SceneOperationHandle LoadSceneAsync(AssetInfo assetInfo, LoadSceneMode sceneMode, bool activateOnLoad, int priority)
+		public SceneOperationHandle LoadSceneAsync(AssetInfo assetInfo, LoadSceneMode sceneMode, bool suspendLoad, int priority)
 		{
 			if (assetInfo.IsInvalid)
 			{
@@ -190,9 +190,9 @@ namespace YooAsset
 			ProviderBase provider;
 			{
 				if (_simulationOnEditor)
-					provider = new DatabaseSceneProvider(this, providerGUID, assetInfo, sceneMode, activateOnLoad, priority);
+					provider = new DatabaseSceneProvider(this, providerGUID, assetInfo, sceneMode, suspendLoad, priority);
 				else
-					provider = new BundledSceneProvider(this, providerGUID, assetInfo, sceneMode, activateOnLoad, priority);
+					provider = new BundledSceneProvider(this, providerGUID, assetInfo, sceneMode, suspendLoad, priority);
 				provider.InitSpawnDebugInfo();
 				_providerList.Add(provider);
 				_providerDic.Add(providerGUID, provider);
@@ -260,6 +260,34 @@ 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>
@@ -377,10 +405,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

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

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

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

@@ -86,9 +86,7 @@ namespace YooAsset
 			if (IsValidWithWarning == false)
 				return null;
 			string filePath = Provider.RawFilePath;
-			if (File.Exists(filePath) == false)
-				return null;
-			return File.ReadAllText(filePath, Encoding.UTF8);
+			return FileUtility.ReadAllText(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,6 +69,38 @@ 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/Handles/SubAssetsOperationHandle.cs

@@ -112,8 +112,6 @@ namespace YooAsset
 				var retObject = assetObject as TObject;
 				if (retObject != null)
 					ret.Add(retObject);
-				else
-					YooLogger.Warning($"The type conversion failed : {assetObject.name}");
 			}
 			return ret.ToArray();
 		}

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

@@ -103,14 +103,15 @@ namespace YooAsset
 				else
 				{
 					_steps = ESteps.LoadFile;
+					return; //下载完毕等待一帧再去加载！
 				}
 			}
 
 			// 3. 内置文件解压
 			if (_steps == ESteps.Unpack)
 			{
-				int failedTryAgain = 1;
-				var bundleInfo = ManifestTools.GetUnpackInfo(MainBundleInfo.Bundle);
+				int failedTryAgain = Impl.DownloadFailedTryAgain;
+				var bundleInfo = ManifestTools.ConvertToUnpackInfo(MainBundleInfo.Bundle);
 				_unpacker = DownloadSystem.BeginDownload(bundleInfo, failedTryAgain);
 				_steps = ESteps.CheckUnpack;
 			}
@@ -245,7 +246,7 @@ namespace YooAsset
 						var result = CacheSystem.VerifyingRecordFile(MainBundleInfo.Bundle.PackageName, MainBundleInfo.Bundle.CacheGUID);
 						if (result != EVerifyResult.Succeed)
 						{
-							YooLogger.Error($"Found possibly corrupt file ! {MainBundleInfo.Bundle.CacheGUID}");
+							YooLogger.Error($"Found possibly corrupt file ! {MainBundleInfo.Bundle.CacheGUID} Verify result : {result}");
 							CacheSystem.DiscardFile(MainBundleInfo.Bundle.PackageName, MainBundleInfo.Bundle.CacheGUID);
 						}
 					}

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

@@ -92,6 +92,7 @@ namespace YooAsset
 				else
 				{
 					_steps = ESteps.LoadCacheFile;
+					return; //下载完毕等待一帧再去加载！
 				}
 			}
 
@@ -167,8 +168,17 @@ namespace YooAsset
 			// 5. 从WEB网站获取AssetBundle文件
 			if (_steps == ESteps.LoadWebFile)
 			{
-				var hash = Hash128.Parse(MainBundleInfo.Bundle.FileHash);
-				_webRequest = UnityWebRequestAssetBundle.GetAssetBundle(FileLoadPath, hash);
+				if (CacheSystem.DisableUnityCacheOnWebGL)
+				{
+					_webRequest = UnityWebRequestAssetBundle.GetAssetBundle(FileLoadPath);
+				}
+				else
+				{
+					var hash = Hash128.Parse(MainBundleInfo.Bundle.FileHash);
+					_webRequest = UnityWebRequestAssetBundle.GetAssetBundle(FileLoadPath, hash);
+				}
+
+				DownloadSystem.SetUnityWebRequest(_webRequest);
 				_webRequest.SendWebRequest();
 				_steps = ESteps.CheckLoadWebFile;
 			}

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

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

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

@@ -91,8 +91,8 @@ namespace YooAsset
 			// 3. 解压内置文件
 			if (_steps == ESteps.Unpack)
 			{
-				int failedTryAgain = 1;
-				var bundleInfo = ManifestTools.GetUnpackInfo(MainBundleInfo.Bundle);
+				int failedTryAgain = Impl.DownloadFailedTryAgain;
+				var bundleInfo = ManifestTools.ConvertToUnpackInfo(MainBundleInfo.Bundle);
 				_unpacker = DownloadSystem.BeginDownload(bundleInfo, failedTryAgain);
 				_steps = ESteps.CheckUnpack;
 			}

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

@@ -89,8 +89,8 @@ namespace YooAsset
 			// 3. 从站点下载
 			if (_steps == ESteps.Website)
 			{
-				int failedTryAgain = 1;
-				var bundleInfo = ManifestTools.GetUnpackInfo(MainBundleInfo.Bundle);
+				int failedTryAgain = Impl.DownloadFailedTryAgain;
+				var bundleInfo = ManifestTools.ConvertToUnpackInfo(MainBundleInfo.Bundle);
 				_website = DownloadSystem.BeginDownload(bundleInfo, failedTryAgain);
 				_steps = ESteps.CheckWebsite;
 			}

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

@@ -0,0 +1,112 @@
+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;
+				}
+
+				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/BundledAllAssetsProvider.cs.meta

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

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

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

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

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

@@ -0,0 +1,11 @@
+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 _activateOnLoad;
+		private readonly bool _suspendLoad;
 		private readonly int _priority;
-		private AsyncOperation _asyncOp;
+		private AsyncOperation _asyncOperation;
 
-		public DatabaseSceneProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo, LoadSceneMode sceneMode, bool activateOnLoad, int priority) : base(impl, providerGUID, assetInfo)
+		public DatabaseSceneProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo, LoadSceneMode sceneMode, bool suspendLoad, int priority) : base(impl, providerGUID, assetInfo)
 		{
 			SceneMode = sceneMode;
-			_activateOnLoad = activateOnLoad;
+			_suspendLoad = suspendLoad;
 			_priority = priority;
 		}
 		public override void Update()
@@ -54,11 +54,11 @@ namespace YooAsset
 			{
 				LoadSceneParameters loadSceneParameters = new LoadSceneParameters();
 				loadSceneParameters.loadSceneMode = SceneMode;
-				_asyncOp = UnityEditor.SceneManagement.EditorSceneManager.LoadSceneAsyncInPlayMode(MainAssetInfo.AssetPath, loadSceneParameters);
-				if (_asyncOp != null)
+				_asyncOperation = UnityEditor.SceneManagement.EditorSceneManager.LoadSceneAsyncInPlayMode(MainAssetInfo.AssetPath, loadSceneParameters);
+				if (_asyncOperation != null)
 				{
-					_asyncOp.allowSceneActivation = true;
-					_asyncOp.priority = _priority;
+					_asyncOperation.allowSceneActivation = !_suspendLoad;
+					_asyncOperation.priority = _priority;
 					SceneObject = SceneManager.GetSceneAt(SceneManager.sceneCount - 1);
 					Status = EStatus.Checking;
 				}
@@ -74,12 +74,9 @@ namespace YooAsset
 			// 3. 检测加载结果
 			if (Status == EStatus.Checking)
 			{
-				Progress = _asyncOp.progress;
-				if (_asyncOp.isDone)
-				{				
-					if (SceneObject.IsValid() && _activateOnLoad)
-						SceneManager.SetActiveScene(SceneObject);
-
+				Progress = _asyncOperation.progress;
+				if (_asyncOperation.isDone)
+				{
 					Status = SceneObject.IsValid() ? EStatus.Succeed : EStatus.Failed;
 					if (Status == EStatus.Failed)
 					{
@@ -91,5 +88,17 @@ 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 DependAssetBundleGroup DependBundleGroup { private set; get; }
+		protected DependAssetBundles DependBundles { 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 dependBundles = impl.CreateDependAssetBundleLoaders(assetInfo);
-				DependBundleGroup = new DependAssetBundleGroup(dependBundles);
-				DependBundleGroup.Reference();
+				var dependList = impl.CreateDependAssetBundleLoaders(assetInfo);
+				DependBundles = new DependAssetBundles(dependList);
+				DependBundles.Reference();
 			}
 		}
 
@@ -133,10 +133,10 @@ namespace YooAsset
 				OwnerBundle.Release();
 				OwnerBundle = null;
 			}
-			if (DependBundleGroup != null)
+			if (DependBundles != null)
 			{
-				DependBundleGroup.Release();
-				DependBundleGroup = null;
+				DependBundles.Release();
+				DependBundles = null;
 			}
 		}
 
@@ -177,6 +177,8 @@ 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
@@ -320,7 +322,7 @@ namespace YooAsset
 			DownloadReport result = new DownloadReport();
 			result.TotalSize = (ulong)OwnerBundle.MainBundleInfo.Bundle.FileSize;
 			result.DownloadedBytes = OwnerBundle.DownloadedBytes;
-			foreach (var dependBundle in DependBundleGroup.DependBundles)
+			foreach (var dependBundle in DependBundles.DependList)
 			{
 				result.TotalSize += (ulong)dependBundle.MainBundleInfo.Bundle.FileSize;
 				result.DownloadedBytes += dependBundle.DownloadedBytes;
@@ -340,7 +342,7 @@ namespace YooAsset
 			bundleInfo.Status = OwnerBundle.Status.ToString();
 			output.Add(bundleInfo);
 
-			DependBundleGroup.GetBundleDebugInfos(output);
+			DependBundles.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))
+			using (FileStream fs = new FileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.Read))
 			{
 				SharedBuffer.Clear();
 				SharedBuffer.WriteUTF8(dataFileCRC);

Assets/YooAsset/Runtime/CacheSystem/CacheSystem.cs

@@ -10,6 +10,11 @@ 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>
@@ -23,6 +28,15 @@ namespace YooAsset
 			_cachedDic.Clear();
 		}
 
+		/// <summary>
+		/// 清空指定包裹的所有缓存数据
+		/// </summary>
+		public static void ClearPackage(string packageName)
+		{
+			var cache = GetOrCreateCache(packageName);
+			cache.ClearAll();
+		}
+
 		/// <summary>
 		/// 获取缓存文件总数
 		/// </summary>
@@ -115,7 +129,7 @@ namespace YooAsset
 		{
 			return VerifyingInternal(element.TempDataFilePath, element.FileSize, element.FileCRC, EVerifyLevel.High);
 		}
-		
+
 		/// <summary>
 		/// 验证记录文件（主线程内操作）
 		/// </summary>
@@ -148,6 +162,14 @@ namespace YooAsset
 			return result;
 		}
 
+		/// <summary>
+		/// 获取所有的缓存文件
+		/// </summary>
+		public static List<string> GetAllCacheGUIDs(ResourcePackage package)
+		{
+			var cache = GetOrCreateCache(package.PackageName);
+			return cache.GetAllKeys();
+		}
 
 		private static EVerifyResult VerifyingInternal(string filePath, long fileSize, string fileCRC, EVerifyLevel verifyLevel)
 		{

Assets/YooAsset/Runtime/CacheSystem/EVerifyResult.cs

@@ -6,6 +6,11 @@ namespace YooAsset
 	/// </summary>
 	internal enum EVerifyResult
 	{
+		/// <summary>
+		/// 验证异常
+		/// </summary>
+		Exception = -7,
+
 		/// <summary>
 		/// 未找到缓存信息
 		/// </summary>
@@ -37,9 +42,9 @@ namespace YooAsset
 		FileCrcError = -1,
 
 		/// <summary>
-		/// 验证异常
+		/// 默认状态（校验未完成）
 		/// </summary>
-		Exception = 0,
+		None = 0,
 
 		/// <summary>
 		/// 验证成功

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

@@ -0,0 +1,71 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+
+namespace YooAsset
+{
+	/// <summary>
+	/// 清理本地包裹所有的缓存文件
+	/// </summary>
+	public sealed class ClearAllCacheFilesOperation : AsyncOperationBase
+	{
+		private enum ESteps
+		{
+			None,
+			GetAllCacheFiles,
+			ClearAllCacheFiles,
+			Done,
+		}
+
+		private readonly ResourcePackage _package;
+		private List<string> _allCacheGUIDs;
+		private int _fileTotalCount = 0;
+		private ESteps _steps = ESteps.None;
+		
+		internal ClearAllCacheFilesOperation(ResourcePackage package)
+		{
+			_package = package;
+		}
+		internal override void Start()
+		{
+			_steps = ESteps.GetAllCacheFiles;
+		}
+		internal override void Update()
+		{
+			if (_steps == ESteps.None || _steps == ESteps.Done)
+				return;
+
+			if (_steps == ESteps.GetAllCacheFiles)
+			{
+				_allCacheGUIDs = CacheSystem.GetAllCacheGUIDs(_package);
+				_fileTotalCount = _allCacheGUIDs.Count;
+				YooLogger.Log($"Found all cache file count : {_fileTotalCount}");
+				_steps = ESteps.ClearAllCacheFiles;
+			}
+
+			if (_steps == ESteps.ClearAllCacheFiles)
+			{
+				for (int i = _allCacheGUIDs.Count - 1; i >= 0; i--)
+				{
+					string cacheGUID = _allCacheGUIDs[i];
+					CacheSystem.DiscardFile(_package.PackageName, cacheGUID);
+					_allCacheGUIDs.RemoveAt(i);
+
+					if (OperationSystem.IsBusy)
+						break;
+				}
+
+				if (_fileTotalCount == 0)
+					Progress = 1.0f;
+				else
+					Progress = 1.0f - (_allCacheGUIDs.Count / _fileTotalCount);
+
+				if (_allCacheGUIDs.Count == 0)
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Succeed;
+				}
+			}
+		}
+	}
+}

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

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

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

@@ -45,7 +45,7 @@ namespace YooAsset
 			{
 				// BundleFiles
 				{
-					string rootPath = PersistentHelper.GetCachedBundleFileFolderPath(_packageName);
+					string rootPath = PersistentTools.GetPersistent(_packageName).SandboxCacheBundleFilesRoot;
 					DirectoryInfo rootDirectory = new DirectoryInfo(rootPath);
 					if (rootDirectory.Exists)
 					{
@@ -56,7 +56,7 @@ namespace YooAsset
 
 				// RawFiles
 				{
-					string rootPath = PersistentHelper.GetCachedRawFileFolderPath(_packageName);
+					string rootPath = PersistentTools.GetPersistent(_packageName).SandboxCacheRawFilesRoot;
 					DirectoryInfo rootDirectory = new DirectoryInfo(rootPath);
 					if (rootDirectory.Exists)
 					{

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

@@ -60,11 +60,12 @@ namespace YooAsset
 
 			if (_steps == ESteps.Waiting)
 			{
-				if (_element.IsDone == false)
+				int result = _element.Result;
+				if (result == 0)
 					return;
 
-				VerifyResult = _element.Result;
-				if (_element.Result == EVerifyResult.Succeed)
+				VerifyResult = (EVerifyResult)result;
+				if (VerifyResult == EVerifyResult.Succeed)
 				{
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Succeed;
@@ -73,7 +74,7 @@ namespace YooAsset
 				{
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Failed;
-					Error = $"Failed verify file : {_element.TempDataFilePath} ! ErrorCode : {_element.Result}";
+					Error = $"Failed verify file : {_element.TempDataFilePath} ! ErrorCode : {VerifyResult}";
 				}
 			}
 		}
@@ -85,8 +86,8 @@ namespace YooAsset
 		private void VerifyInThread(object obj)
 		{
 			VerifyTempElement element = (VerifyTempElement)obj;
-			element.Result = CacheSystem.VerifyingTempFile(element);
-			element.IsDone = true;
+			int result = (int)CacheSystem.VerifyingTempFile(element);
+			element.Result = result;
 		}
 	}
 
@@ -120,11 +121,10 @@ namespace YooAsset
 
 			if (_steps == ESteps.VerifyFile)
 			{
-				_element.Result = CacheSystem.VerifyingTempFile(_element);
-				_element.IsDone = true;
+				_element.Result = (int)CacheSystem.VerifyingTempFile(_element);
 
-				VerifyResult = _element.Result;
-				if (_element.Result == EVerifyResult.Succeed)
+				VerifyResult = (EVerifyResult)_element.Result;
+				if (VerifyResult == EVerifyResult.Succeed)
 				{
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Succeed;
@@ -133,7 +133,7 @@ namespace YooAsset
 				{
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Failed;
-					Error = $"Failed verify file : {_element.TempDataFilePath} ! ErrorCode : {_element.Result}";
+					Error = $"Failed verify file : {_element.TempDataFilePath} ! ErrorCode : {VerifyResult}";
 				}
 			}
 		}

Assets/YooAsset/Runtime/CacheSystem/Persistent.cs

@@ -0,0 +1,163 @@
+using System.IO;
+
+namespace YooAsset
+{
+	internal class Persistent
+	{
+		private readonly string _packageName;
+
+		public string BuildinRoot { private set; get; }
+		public string BuildinPackageRoot { private set; get; }
+
+		public string SandboxRoot { private set; get; }
+		public string SandboxPackageRoot { private set; get; }
+		public string SandboxCacheBundleFilesRoot { private set; get; }
+		public string SandboxCacheRawFilesRoot { private set; get; }
+		public string SandboxManifestFilesRoot { private set; get; }
+		public string SandboxAppFootPrintFilePath { private set; get; }
+
+
+		public Persistent(string packageName)
+		{
+			_packageName = packageName;
+		}
+
+		/// <summary>
+		/// 重写根路径
+		/// </summary>
+		public void OverwriteRootDirectory(string buildinRoot, string sandboxRoot)
+		{
+			if (string.IsNullOrEmpty(buildinRoot))
+				BuildinRoot = CreateDefaultBuildinRoot();
+			else
+				BuildinRoot = buildinRoot;
+
+			if (string.IsNullOrEmpty(sandboxRoot))
+				SandboxRoot = CreateDefaultSandboxRoot();
+			else
+				SandboxRoot = sandboxRoot;
+
+			BuildinPackageRoot = PathUtility.Combine(BuildinRoot, _packageName);
+			SandboxPackageRoot = PathUtility.Combine(SandboxRoot, _packageName);
+			SandboxCacheBundleFilesRoot = PathUtility.Combine(SandboxPackageRoot, YooAssetSettings.CachedBundleFileFolder);
+			SandboxCacheRawFilesRoot = PathUtility.Combine(SandboxPackageRoot, YooAssetSettings.CachedRawFileFolder);
+			SandboxManifestFilesRoot = PathUtility.Combine(SandboxPackageRoot, YooAssetSettings.ManifestFolderName);
+			SandboxAppFootPrintFilePath = PathUtility.Combine(SandboxPackageRoot, YooAssetSettings.AppFootPrintFileName);
+		}
+		private static string CreateDefaultBuildinRoot()
+		{
+			return PathUtility.Combine(UnityEngine.Application.streamingAssetsPath, YooAssetSettings.DefaultYooFolderName);
+		}
+		private static string CreateDefaultSandboxRoot()
+		{
+#if UNITY_EDITOR
+			// 注意：为了方便调试查看，编辑器下把存储目录放到项目里。
+			string projectPath = Path.GetDirectoryName(UnityEngine.Application.dataPath);
+			projectPath = PathUtility.RegularPath(projectPath);
+			return PathUtility.Combine(projectPath, YooAssetSettings.DefaultYooFolderName);
+#elif UNITY_STANDALONE
+			return PathUtility.Combine(UnityEngine.Application.dataPath, YooAssetSettings.DefaultYooFolderName);
+#else
+			return PathUtility.Combine(UnityEngine.Application.persistentDataPath, YooAssetSettings.DefaultYooFolderName);	
+#endif
+		}
+
+
+		/// <summary>
+		/// 删除沙盒里的包裹目录
+		/// </summary>
+		public void DeleteSandboxPackageFolder()
+		{
+			if (Directory.Exists(SandboxPackageRoot))
+				Directory.Delete(SandboxPackageRoot, true);
+		}
+		
+		/// <summary>
+		/// 删除沙盒内的缓存文件夹
+		/// </summary>
+		public void DeleteSandboxCacheFilesFolder()
+		{
+			// CacheBundleFiles
+			if (Directory.Exists(SandboxCacheBundleFilesRoot))
+				Directory.Delete(SandboxCacheBundleFilesRoot, true);
+
+			// CacheRawFiles
+			if (Directory.Exists(SandboxCacheRawFilesRoot))
+				Directory.Delete(SandboxCacheRawFilesRoot, true);
+		}
+
+		/// <summary>
+		/// 删除沙盒内的清单文件夹
+		/// </summary>
+		public void DeleteSandboxManifestFilesFolder()
+		{
+			if (Directory.Exists(SandboxManifestFilesRoot))
+				Directory.Delete(SandboxManifestFilesRoot, true);
+		}
+
+
+		/// <summary>
+		/// 获取沙盒内包裹的清单文件的路径
+		/// </summary>
+		public string GetSandboxPackageManifestFilePath(string packageVersion)
+		{
+			string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_packageName, packageVersion);
+			return PathUtility.Combine(SandboxManifestFilesRoot, fileName);
+		}
+
+		/// <summary>
+		/// 获取沙盒内包裹的哈希文件的路径
+		/// </summary>
+		public string GetSandboxPackageHashFilePath(string packageVersion)
+		{
+			string fileName = YooAssetSettingsData.GetPackageHashFileName(_packageName, packageVersion);
+			return PathUtility.Combine(SandboxManifestFilesRoot, fileName);
+		}
+
+		/// <summary>
+		/// 获取沙盒内包裹的版本文件的路径
+		/// </summary>
+		public string GetSandboxPackageVersionFilePath()
+		{
+			string fileName = YooAssetSettingsData.GetPackageVersionFileName(_packageName);
+			return PathUtility.Combine(SandboxManifestFilesRoot, fileName);
+		}
+
+		/// <summary>
+		/// 保存沙盒内默认的包裹版本
+		/// </summary>
+		public void SaveSandboxPackageVersionFile(string version)
+		{
+			string filePath = GetSandboxPackageVersionFilePath();
+			FileUtility.WriteAllText(filePath, version);
+		}
+
+
+		/// <summary>
+		/// 获取APP内包裹的清单文件的路径
+		/// </summary>
+		public string GetBuildinPackageManifestFilePath(string packageVersion)
+		{
+			string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_packageName, packageVersion);
+			return PathUtility.Combine(BuildinPackageRoot, fileName);
+		}
+
+		/// <summary>
+		/// 获取APP内包裹的哈希文件的路径
+		/// </summary>
+		public string GetBuildinPackageHashFilePath(string packageVersion)
+		{
+			string fileName = YooAssetSettingsData.GetPackageHashFileName(_packageName, packageVersion);
+			return PathUtility.Combine(BuildinPackageRoot, fileName);
+		}
+
+		/// <summary>
+		/// 获取APP内包裹的版本文件的路径
+		/// </summary>
+		public string GetBuildinPackageVersionFilePath()
+		{
+			string fileName = YooAssetSettingsData.GetPackageVersionFileName(_packageName);
+			return PathUtility.Combine(BuildinPackageRoot, fileName);
+		}
+	}
+}

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

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