Assets/YooAsset/CHANGELOG.md

@@ -2,190 +2,6 @@
 
 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

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilder.cs

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

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderHelper.cs

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

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs

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

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleSimulateBuilder.cs

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

Assets/YooAsset/Editor/AssetBundleBuilder/BuildAssetInfo.cs

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

Assets/YooAsset/Editor/AssetBundleBuilder/BuildBundleInfo.cs

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

Assets/YooAsset/Editor/AssetBundleBuilder/BuildMapContext.cs

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

Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs

@@ -37,14 +37,9 @@ namespace YooAsset.Editor
 
 
 		/// <summary>
-		/// 内置资源的根目录
+		/// 输出的根目录
 		/// </summary>
-		public string StreamingAssetsRoot;
-
-		/// <summary>
-		/// 构建输出的根目录
-		/// </summary>
-		public string BuildOutputRoot;
+		public string OutputRoot;
 
 		/// <summary>
 		/// 构建的平台
@@ -82,10 +77,15 @@ namespace YooAsset.Editor
 		/// </summary>
 		public bool VerifyBuildingResult = false;
 
+		/// <summary>
+		/// 自动分析冗余资源
+		/// </summary>
+		public bool AutoAnalyzeRedundancy = true;
+		
 		/// <summary>
 		/// 共享资源的打包规则
 		/// </summary>
-		public ISharedPackRule SharedPackRule = null;
+		public IShareAssetPackRule ShareAssetPackRule = null;
 
 		/// <summary>
 		/// 资源的加密接口

Assets/YooAsset/Editor/AssetBundleBuilder/BuildParametersContext.cs

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

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

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

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

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

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

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

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

@@ -33,7 +33,7 @@ namespace YooAsset.Editor
 			// 开始构建
 			IBundleBuildResults buildResults;
 			var buildParameters = buildParametersContext.GetSBPBuildParameters();
-			var taskList = SBPBuildTasks.Create(buildMapContext.Command.ShadersBundleName);
+			var taskList = SBPBuildTasks.Create(buildMapContext.ShadersBundleName);
 			ReturnCode exitCode = ContentPipeline.BuildAssetBundles(buildParameters, buildContent, out buildResults, taskList);
 			if (exitCode < 0)
 			{
@@ -43,7 +43,7 @@ namespace YooAsset.Editor
 			// 创建着色器信息
 			// 说明：解决因为着色器资源包导致验证失败。
 			// 例如：当项目里没有着色器，如果有依赖内置着色器就会验证失败。
-			string shadersBundleName = buildMapContext.Command.ShadersBundleName;
+			string shadersBundleName = buildMapContext.ShadersBundleName;
 			if (buildResults.BundleInfos.ContainsKey(shadersBundleName))
 			{
 				buildMapContext.CreateShadersBundleInfo(shadersBundleName);

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

@@ -30,7 +30,7 @@ namespace YooAsset.Editor
 		{
 			ECopyBuildinFileOption option = buildParametersContext.Parameters.CopyBuildinFileOption;
 			string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
-			string streamingAssetsDirectory = buildParametersContext.GetStreamingAssetsDirectory();
+			string streamingAssetsDirectory = AssetBundleBuilderHelper.GetStreamingAssetsFolderPath();
 			string buildPackageName = buildParametersContext.Parameters.PackageName;
 			string buildPackageVersion = buildParametersContext.Parameters.PackageVersion;
 
@@ -40,7 +40,7 @@ namespace YooAsset.Editor
 			// 清空流目录
 			if (option == ECopyBuildinFileOption.ClearAndCopyAll || option == ECopyBuildinFileOption.ClearAndCopyByTags)
 			{
-				EditorTools.ClearFolder(streamingAssetsDirectory);
+				AssetBundleBuilderHelper.ClearStreamingAssetsFolder();
 			}
 
 			// 拷贝补丁清单文件

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

@@ -34,9 +34,7 @@ namespace YooAsset.Editor
 			// 创建新补丁清单
 			PackageManifest manifest = new PackageManifest();
 			manifest.FileVersion = YooAssetSettings.ManifestFileVersion;
-			manifest.EnableAddressable = buildMapContext.Command.EnableAddressable;
-			manifest.LocationToLower = buildMapContext.Command.LocationToLower;
-			manifest.IncludeAssetGUID = buildMapContext.Command.IncludeAssetGUID;
+			manifest.EnableAddressable = buildMapContext.EnableAddressable;
 			manifest.OutputNameStyle = (int)buildParameters.OutputNameStyle;
 			manifest.PackageName = buildParameters.PackageName;
 			manifest.PackageVersion = buildParameters.PackageVersion;
@@ -49,7 +47,7 @@ namespace YooAsset.Editor
 				if (buildParameters.BuildMode == EBuildMode.IncrementalBuild)
 				{
 					var buildResultContext = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
-					UpdateBuiltInBundleReference(manifest, buildResultContext, buildMapContext.Command.ShadersBundleName);
+					UpdateBuiltInBundleReference(manifest, buildResultContext, buildMapContext.ShadersBundleName);
 				}
 			}
 
@@ -139,13 +137,15 @@ namespace YooAsset.Editor
 			List<PackageAsset> result = new List<PackageAsset>(1000);
 			foreach (var bundleInfo in buildMapContext.Collection)
 			{
-				var assetInfos = bundleInfo.GetAllManifestAssetInfos();
+				var assetInfos = bundleInfo.GetAllMainAssetInfos();
 				foreach (var assetInfo in assetInfos)
 				{
 					PackageAsset packageAsset = new PackageAsset();
-					packageAsset.Address = buildMapContext.Command.EnableAddressable ? assetInfo.Address : string.Empty;
+					if (buildMapContext.EnableAddressable)
+						packageAsset.Address = assetInfo.Address;
+					else
+						packageAsset.Address = string.Empty;
 					packageAsset.AssetPath = assetInfo.AssetPath;
-					packageAsset.AssetGUID = buildMapContext.Command.IncludeAssetGUID ? assetInfo.AssetGUID : string.Empty;
 					packageAsset.AssetTags = assetInfo.AssetTags.ToArray();
 					packageAsset.BundleID = GetAssetBundleID(assetInfo.BundleName, manifest);
 					packageAsset.DependIDs = GetAssetBundleDependIDs(packageAsset.BundleID, assetInfo, manifest);

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

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

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

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

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

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

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorConfig.cs

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

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSetting.cs

@@ -10,25 +10,15 @@ namespace YooAsset.Editor
 	public class AssetBundleCollectorSetting : ScriptableObject
 	{
 		/// <summary>
-		/// 显示包裹列表视图
+		/// 是否显示包裹列表视图
 		/// </summary>
 		public bool ShowPackageView = false;
 
 		/// <summary>
-		/// 启用可寻址资源定位
+		/// 是否启用可寻址资源定位
 		/// </summary>
 		public bool EnableAddressable = false;
 
-		/// <summary>
-		/// 资源定位地址大小写不敏感
-		/// </summary>
-		public bool LocationToLower = false;
-
-		/// <summary>
-		/// 包含资源GUID数据
-		/// </summary>
-		public bool IncludeAssetGUID = false;
-
 		/// <summary>
 		/// 资源包名唯一化
 		/// </summary>
@@ -51,12 +41,7 @@ namespace YooAsset.Editor
 		/// </summary>
 		public void ClearAll()
 		{
-			ShowPackageView = false;
 			EnableAddressable = false;
-			LocationToLower = false;
-			IncludeAssetGUID = false;
-			UniqueBundleName = false;
-			ShowEditorAlias = false;
 			Packages.Clear();
 		}
 
@@ -116,8 +101,7 @@ namespace YooAsset.Editor
 			{
 				if (package.PackageName == packageName)
 				{
-					CollectCommand command = new CollectCommand(buildMode, packageName,
-						EnableAddressable, LocationToLower, IncludeAssetGUID, UniqueBundleName);
+					CollectCommand command = new CollectCommand(buildMode, packageName, EnableAddressable, UniqueBundleName);
 					CollectResult collectResult = new CollectResult(command);
 					collectResult.SetCollectAssets(package.GetAllCollectAssets(command));
 					return collectResult;

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSettingData.cs

@@ -331,16 +331,6 @@ namespace YooAsset.Editor
 			Setting.EnableAddressable = enableAddressable;
 			IsDirty = true;
 		}
-		public static void ModifyLocationToLower(bool locationToLower)
-		{
-			Setting.LocationToLower = locationToLower;
-			IsDirty = true;
-		}
-		public static void ModifyIncludeAssetGUID(bool includeAssetGUID)
-		{
-			Setting.IncludeAssetGUID = includeAssetGUID;
-			IsDirty = true;
-		}
 		public static void ModifyUniqueBundleName(bool uniqueBundleName)
 		{
 			Setting.UniqueBundleName = uniqueBundleName;

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs

@@ -25,13 +25,8 @@ 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;
 
@@ -52,7 +47,6 @@ namespace YooAsset.Editor
 
 		private int _lastModifyPackageIndex = 0;
 		private int _lastModifyGroupIndex = 0;
-		private bool _showSettings = false;
 
 
 		public void CreateGUI()
@@ -83,10 +77,6 @@ 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 =>
 				{
@@ -99,24 +89,13 @@ namespace YooAsset.Editor
 					AssetBundleCollectorSettingData.ModifyAddressable(evt.newValue);
 					RefreshWindow();
 				});
-				_locationToLowerToogle = root.Q<Toggle>("LocationToLower");
-				_locationToLowerToogle.RegisterValueChangedCallback(evt =>
-				{
-					AssetBundleCollectorSettingData.ModifyLocationToLower(evt.newValue);
-					RefreshWindow();
-				});
-				_includeAssetGUIDToogle = root.Q<Toggle>("IncludeAssetGUID");
-				_includeAssetGUIDToogle.RegisterValueChangedCallback(evt =>
-				{
-					AssetBundleCollectorSettingData.ModifyIncludeAssetGUID(evt.newValue);
-					RefreshWindow();
-				});
 				_uniqueBundleNameToogle = root.Q<Toggle>("UniqueBundleName");
 				_uniqueBundleNameToogle.RegisterValueChangedCallback(evt =>
 				{
 					AssetBundleCollectorSettingData.ModifyUniqueBundleName(evt.newValue);
 					RefreshWindow();
 				});
+
 				_showEditorAliasToggle = root.Q<Toggle>("ShowEditorAlias");
 				_showEditorAliasToggle.RegisterValueChangedCallback(evt =>
 				{
@@ -323,22 +302,9 @@ namespace YooAsset.Editor
 		{
 			_showPackageToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.ShowPackageView);
 			_enableAddressableToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.EnableAddressable);
-			_locationToLowerToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.LocationToLower);
-			_includeAssetGUIDToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.IncludeAssetGUID);
 			_uniqueBundleNameToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.UniqueBundleName);
 			_showEditorAliasToggle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.ShowEditorAlias);
 
-			if (_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;
 
@@ -370,11 +336,6 @@ namespace YooAsset.Editor
 		{
 			AssetBundleCollectorSettingData.SaveFile();
 		}
-		private void SettingsBtn_clicked()
-		{
-			_showSettings = !_showSettings;
-			RefreshWindow();
-		}
 		private string FormatListItemCallback(RuleDisplayName ruleDisplayName)
 		{
 			if (_showEditorAliasToggle.value)
@@ -835,8 +796,7 @@ namespace YooAsset.Editor
 
 				try
 				{
-					CollectCommand command = new CollectCommand(EBuildMode.SimulateBuild, _packageNameTxt.value,
-						_enableAddressableToogle.value, _locationToLowerToogle.value, _includeAssetGUIDToogle.value, _uniqueBundleNameToogle.value);
+					CollectCommand command = new CollectCommand(EBuildMode.SimulateBuild, _packageNameTxt.value, _enableAddressableToogle.value, _uniqueBundleNameToogle.value);
 					collectAssetInfos = collector.GetAllCollectAssets(command, group);
 				}
 				catch (System.Exception e)

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.uxml

@@ -1,23 +1,16 @@
-<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements">
     <uie:Toolbar name="Toolbar" style="display: flex; flex-direction: row-reverse;">
         <ui:Button text="Save" display-tooltip-when-elided="true" name="SaveButton" style="width: 50px; background-color: rgb(56, 147, 58);" />
         <ui:Button text="导出" display-tooltip-when-elided="true" name="ExportButton" style="width: 50px; background-color: rgb(56, 147, 58);" />
         <ui:Button text="导入" display-tooltip-when-elided="true" name="ImportButton" style="width: 50px; background-color: rgb(56, 147, 58);" />
         <ui:Button text="修复" display-tooltip-when-elided="true" name="FixButton" style="width: 50px; background-color: rgb(56, 147, 58);" />
     </uie:Toolbar>
-    <ui:VisualElement name="PublicContainer" style="background-color: rgb(79, 79, 79); flex-direction: column; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">
-        <ui:Button text="Settings" display-tooltip-when-elided="true" name="SettingsButton" />
-        <ui:VisualElement name="PublicContainer1" style="flex-direction: row; flex-wrap: nowrap; height: 28px;">
+    <ui:VisualElement name="PublicContainer" style="height: 30px; background-color: rgb(67, 67, 67); flex-direction: row; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">
         <ui:Toggle label="Show Packages" name="ShowPackages" style="width: 196px; -unity-text-align: middle-left;" />
         <ui:Toggle label="Show Editor Alias" name="ShowEditorAlias" style="width: 196px; -unity-text-align: middle-left;" />
         <ui:Toggle label="Enable Addressable" name="EnableAddressable" style="width: 196px; -unity-text-align: middle-left;" />
         <ui:Toggle label="Unique Bundle Name" name="UniqueBundleName" style="width: 196px; -unity-text-align: middle-left;" />
     </ui:VisualElement>
-        <ui:VisualElement name="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;">
             <ui:Label text="Packages" display-tooltip-when-elided="true" name="PackageTitle" style="background-color: rgb(89, 89, 89); -unity-text-align: upper-center; -unity-font-style: bold; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px; font-size: 12px;" />

Assets/YooAsset/Editor/AssetBundleCollector/CollectCommand.cs

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

Assets/YooAsset/Editor/AssetBundleCollector/CollectRules.meta

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

Assets/YooAsset/Editor/AssetBundleCollector/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.meta

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

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

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

Assets/YooAsset/Editor/AssetBundleCollector/DefaultShareAssetPackRule.cs

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

Assets/YooAsset/Editor/AssetBundleCollector/IPackRule.cs

@@ -54,10 +54,6 @@ namespace YooAsset.Editor
 		/// </summary>
 		public string GetShareBundleName(string packageName, bool uniqueBundleName)
 		{
-			// 注意：冗余的共享资源包名返回空
-			if (string.IsNullOrEmpty(_bundleName) && string.IsNullOrEmpty(_bundleExtension))
-				return string.Empty;
-
 			string fullName;
 			string bundleName = EditorTools.GetRegularPath(_bundleName).Replace('/', '_').Replace('.', '_').ToLower();
 			if (uniqueBundleName)

Assets/YooAsset/Editor/AssetBundleCollector/IShareAssetPackRule.cs

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

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

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

Assets/YooAsset/Editor/EditorTools.cs

@@ -35,20 +35,10 @@ namespace YooAsset.Editor
 			TypeCache.TypeCollection collection = TypeCache.GetTypesDerivedFrom(parentType);
 			return collection.ToList();
 		}
-
-		/// <summary>
-		/// 获取带有指定属性的所有类的类型
-		/// </summary>
-		public static List<Type> GetTypesWithAttribute(System.Type attrType)
-		{
-			TypeCache.TypeCollection collection = TypeCache.GetTypesWithAttribute(attrType);
-			return collection.ToList();
-		}
 #else
 		private static readonly List<Type> _cacheTypes = new List<Type>(10000);
 		private static void InitAssembly()
 		{
-			_cacheTypes.Clear();
 			Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies();
 			foreach (Assembly assembly in assemblies)
 			{
@@ -75,23 +65,6 @@ namespace YooAsset.Editor
 			}
 			return result;
 		}
-
-		/// <summary>
-		/// 获取带有指定属性的所有类的类型
-		/// </summary>
-		public static List<Type> GetTypesWithAttribute(System.Type attrType)
-		{
-			List<Type> result = new List<Type>();
-			for (int i = 0; i < _cacheTypes.Count; i++)
-			{
-				Type type = _cacheTypes[i];
-				if (type.GetCustomAttribute(attrType) != null)
-				{
-					result.Add(type);
-				}
-			}
-			return result;
-		}
 #endif
 
 		/// <summary>

Assets/YooAsset/Runtime/AssetReference.cs

@@ -0,0 +1,8 @@
+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 suspendLoad, int priority)
+		public SceneOperationHandle LoadSceneAsync(AssetInfo assetInfo, LoadSceneMode sceneMode, bool activateOnLoad, int priority)
 		{
 			if (assetInfo.IsInvalid)
 			{
@@ -190,9 +190,9 @@ namespace YooAsset
 			ProviderBase provider;
 			{
 				if (_simulationOnEditor)
-					provider = new DatabaseSceneProvider(this, providerGUID, assetInfo, sceneMode, suspendLoad, priority);
+					provider = new DatabaseSceneProvider(this, providerGUID, assetInfo, sceneMode, activateOnLoad, priority);
 				else
-					provider = new BundledSceneProvider(this, providerGUID, assetInfo, sceneMode, suspendLoad, priority);
+					provider = new BundledSceneProvider(this, providerGUID, assetInfo, sceneMode, activateOnLoad, priority);
 				provider.InitSpawnDebugInfo();
 				_providerList.Add(provider);
 				_providerDic.Add(providerGUID, provider);
@@ -260,34 +260,6 @@ namespace YooAsset
 			return provider.CreateHandle<SubAssetsOperationHandle>();
 		}
 
-		/// <summary>
-		/// 加载所有资源对象
-		/// </summary>
-		public AllAssetsOperationHandle LoadAllAssetsAsync(AssetInfo assetInfo)
-		{
-			if (assetInfo.IsInvalid)
-			{
-				YooLogger.Error($"Failed to load all assets ! {assetInfo.Error}");
-				CompletedProvider completedProvider = new CompletedProvider(assetInfo);
-				completedProvider.SetCompleted(assetInfo.Error);
-				return completedProvider.CreateHandle<AllAssetsOperationHandle>();
-			}
-
-			string providerGUID = assetInfo.GUID;
-			ProviderBase provider = TryGetProvider(providerGUID);
-			if (provider == null)
-			{
-				if (_simulationOnEditor)
-					provider = new DatabaseAllAssetsProvider(this, providerGUID, assetInfo);
-				else
-					provider = new BundledAllAssetsProvider(this, providerGUID, assetInfo);
-				provider.InitSpawnDebugInfo();
-				_providerList.Add(provider);
-				_providerDic.Add(providerGUID, provider);
-			}
-			return provider.CreateHandle<AllAssetsOperationHandle>();
-		}
-
 		/// <summary>
 		/// 加载原生文件
 		/// </summary>

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

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

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

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

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

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

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

@@ -111,7 +111,7 @@ namespace YooAsset
 			if (_steps == ESteps.Unpack)
 			{
 				int failedTryAgain = Impl.DownloadFailedTryAgain;
-				var bundleInfo = ManifestTools.ConvertToUnpackInfo(MainBundleInfo.Bundle);
+				var bundleInfo = ManifestTools.GetUnpackInfo(MainBundleInfo.Bundle);
 				_unpacker = DownloadSystem.BeginDownload(bundleInfo, failedTryAgain);
 				_steps = ESteps.CheckUnpack;
 			}

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

@@ -167,18 +167,9 @@ namespace YooAsset
 
 			// 5. 从WEB网站获取AssetBundle文件
 			if (_steps == ESteps.LoadWebFile)
-			{
-				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/DependAssetBundleGrouper.cs

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

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

@@ -92,7 +92,7 @@ namespace YooAsset
 			if (_steps == ESteps.Unpack)
 			{
 				int failedTryAgain = Impl.DownloadFailedTryAgain;
-				var bundleInfo = ManifestTools.ConvertToUnpackInfo(MainBundleInfo.Bundle);
+				var bundleInfo = ManifestTools.GetUnpackInfo(MainBundleInfo.Bundle);
 				_unpacker = DownloadSystem.BeginDownload(bundleInfo, failedTryAgain);
 				_steps = ESteps.CheckUnpack;
 			}

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

@@ -90,7 +90,7 @@ namespace YooAsset
 			if (_steps == ESteps.Website)
 			{
 				int failedTryAgain = Impl.DownloadFailedTryAgain;
-				var bundleInfo = ManifestTools.ConvertToUnpackInfo(MainBundleInfo.Bundle);
+				var bundleInfo = ManifestTools.GetUnpackInfo(MainBundleInfo.Bundle);
 				_website = DownloadSystem.BeginDownload(bundleInfo, failedTryAgain);
 				_steps = ESteps.CheckWebsite;
 			}

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

@@ -1,112 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace YooAsset
-{
-	internal sealed class BundledAllAssetsProvider : ProviderBase
-	{
-		private AssetBundleRequest _cacheRequest;
-		
-		public BundledAllAssetsProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
-		{
-		}
-		public override void Update()
-		{
-			DebugBeginRecording();
-
-			if (IsDone)
-				return;
-
-			if (Status == EStatus.None)
-			{
-				Status = EStatus.CheckBundle;
-			}
-
-			// 1. 检测资源包
-			if (Status == EStatus.CheckBundle)
-			{
-				if (IsWaitForAsyncComplete)
-				{
-					DependBundles.WaitForAsyncComplete();
-					OwnerBundle.WaitForAsyncComplete();
-				}
-
-				if (DependBundles.IsDone() == false)
-					return;
-				if (OwnerBundle.IsDone() == false)
-					return;
-
-				if (DependBundles.IsSucceed() == false)
-				{
-					Status = EStatus.Failed;
-					LastError = DependBundles.GetLastError();
-					InvokeCompletion();
-					return;
-				}
-
-				if (OwnerBundle.Status != BundleLoaderBase.EStatus.Succeed)
-				{
-					Status = EStatus.Failed;
-					LastError = OwnerBundle.LastError;
-					InvokeCompletion();
-					return;
-				}
-
-				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

@@ -1,11 +0,0 @@
-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)
 				{
-					DependBundles.WaitForAsyncComplete();
+					DependBundleGroup.WaitForAsyncComplete();
 					OwnerBundle.WaitForAsyncComplete();
 				}
 
-				if (DependBundles.IsDone() == false)
+				if (DependBundleGroup.IsDone() == false)
 					return;
 				if (OwnerBundle.IsDone() == false)
 					return;
 
-				if (DependBundles.IsSucceed() == false)
+				if (DependBundleGroup.IsSucceed() == false)
 				{
 					Status = EStatus.Failed;
-					LastError = DependBundles.GetLastError();
+					LastError = DependBundleGroup.GetLastError();
 					InvokeCompletion();
 					return;
 				}

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

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

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

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

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

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

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

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

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

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

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

@@ -91,7 +91,7 @@ namespace YooAsset
 
 
 		protected BundleLoaderBase OwnerBundle { private set; get; }
-		protected DependAssetBundles DependBundles { private set; get; }
+		protected DependAssetBundleGroup DependBundleGroup { private set; get; }
 		protected bool IsWaitForAsyncComplete { private set; get; } = false;
 		private readonly List<OperationHandleBase> _handles = new List<OperationHandleBase>();
 
@@ -109,9 +109,9 @@ namespace YooAsset
 				OwnerBundle.Reference();
 				OwnerBundle.AddProvider(this);
 
-				var dependList = impl.CreateDependAssetBundleLoaders(assetInfo);
-				DependBundles = new DependAssetBundles(dependList);
-				DependBundles.Reference();
+				var dependBundles = impl.CreateDependAssetBundleLoaders(assetInfo);
+				DependBundleGroup = new DependAssetBundleGroup(dependBundles);
+				DependBundleGroup.Reference();
 			}
 		}
 
@@ -133,10 +133,10 @@ namespace YooAsset
 				OwnerBundle.Release();
 				OwnerBundle = null;
 			}
-			if (DependBundles != null)
+			if (DependBundleGroup != null)
 			{
-				DependBundles.Release();
-				DependBundles = null;
+				DependBundleGroup.Release();
+				DependBundleGroup = null;
 			}
 		}
 
@@ -177,8 +177,6 @@ namespace YooAsset
 				handle = new SceneOperationHandle(this);
 			else if (typeof(T) == typeof(SubAssetsOperationHandle))
 				handle = new SubAssetsOperationHandle(this);
-			else if (typeof(T) == typeof(AllAssetsOperationHandle))
-				handle = new AllAssetsOperationHandle(this);
 			else if (typeof(T) == typeof(RawFileOperationHandle))
 				handle = new RawFileOperationHandle(this);
 			else
@@ -322,7 +320,7 @@ namespace YooAsset
 			DownloadReport result = new DownloadReport();
 			result.TotalSize = (ulong)OwnerBundle.MainBundleInfo.Bundle.FileSize;
 			result.DownloadedBytes = OwnerBundle.DownloadedBytes;
-			foreach (var dependBundle in DependBundles.DependList)
+			foreach (var dependBundle in DependBundleGroup.DependBundles)
 			{
 				result.TotalSize += (ulong)dependBundle.MainBundleInfo.Bundle.FileSize;
 				result.DownloadedBytes += dependBundle.DownloadedBytes;
@@ -342,7 +340,7 @@ namespace YooAsset
 			bundleInfo.Status = OwnerBundle.Status.ToString();
 			output.Add(bundleInfo);
 
-			DependBundles.GetBundleDebugInfos(output);
+			DependBundleGroup.GetBundleDebugInfos(output);
 		}
 		#endregion
 	}

Assets/YooAsset/Runtime/CacheSystem/CacheFileInfo.cs

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

Assets/YooAsset/Runtime/CacheSystem/CacheSystem.cs

@@ -10,11 +10,6 @@ namespace YooAsset
 	{
 		private readonly static Dictionary<string, PackageCache> _cachedDic = new Dictionary<string, PackageCache>(1000);
 
-		/// <summary>
-		/// 禁用Unity缓存系统在WebGL平台
-		/// </summary>
-		public static bool DisableUnityCacheOnWebGL = false;
-
 		/// <summary>
 		/// 初始化时的验证级别
 		/// </summary>

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

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

Assets/YooAsset/Runtime/CacheSystem/Persistent.cs

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

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

Assets/YooAsset/Runtime/CacheSystem/PersistentTools.cs

@@ -3,31 +3,84 @@ using System.Collections.Generic;
 
 namespace YooAsset
 {
-	internal class PersistentTools
+	internal static class PersistentTools
 	{
-		private static readonly Dictionary<string, Persistent> _persitentDic = new Dictionary<string, Persistent>(100);
+		private const string SandboxFolderName = "Sandbox";
+		private const string CacheFolderName = "CacheFiles";
+		private const string CachedBundleFileFolder = "BundleFiles";
+		private const string CachedRawFileFolder = "RawFiles";
+		private const string ManifestFolderName = "ManifestFiles";
+		private const string AppFootPrintFileName = "ApplicationFootPrint.bytes";
+
+		private static string _buildinPath;
+		private static string _sandboxPath;
+
 
 		/// <summary>
-		/// 获取包裹的持久化类
+		/// 重写沙盒跟路径
 		/// </summary>
-		public static Persistent GetPersistent(string packageName)
+		public static void OverwriteSandboxPath(string sandboxPath)
 		{
-			if (_persitentDic.ContainsKey(packageName) == false)
-				throw new System.Exception("Should never get here !");
-			return _persitentDic[packageName];
+			_sandboxPath = sandboxPath;
 		}
 
 		/// <summary>
-		/// 获取或创建包裹的持久化类
+		/// 获取沙盒文件夹路径
 		/// </summary>
-		public static Persistent GetOrCreatePersistent(string packageName)
+		public static string GetPersistentRootPath()
 		{
-			if (_persitentDic.ContainsKey(packageName) == false)
+#if UNITY_EDITOR
+			// 注意：为了方便调试查看，编辑器下把存储目录放到项目里
+			if (string.IsNullOrEmpty(_sandboxPath))
 			{
-				Persistent persistent = new Persistent(packageName);
-				_persitentDic.Add(packageName, persistent);
+				string projectPath = Path.GetDirectoryName(UnityEngine.Application.dataPath);
+				projectPath = PathUtility.RegularPath(projectPath);
+				_sandboxPath = PathUtility.Combine(projectPath, SandboxFolderName);
 			}
-			return _persitentDic[packageName];
+#elif UNITY_STANDALONE
+			if (string.IsNullOrEmpty(_sandboxPath))
+			{
+				_sandboxPath = PathUtility.Combine(UnityEngine.Application.dataPath, SandboxFolderName);
+			}
+#else
+			if (string.IsNullOrEmpty(_sandboxPath))
+			{
+				_sandboxPath = PathUtility.Combine(UnityEngine.Application.persistentDataPath, SandboxFolderName);
+			}
+#endif
+
+			return _sandboxPath;
+		}
+
+		/// <summary>
+		/// 获取基于流文件夹的加载路径
+		/// </summary>
+		public static string MakeStreamingLoadPath(string path)
+		{
+			if (string.IsNullOrEmpty(_buildinPath))
+			{
+				_buildinPath = PathUtility.Combine(UnityEngine.Application.streamingAssetsPath, YooAssetSettings.StreamingAssetsBuildinFolder);
+			}
+			return PathUtility.Combine(_buildinPath, path);
+		}
+
+		/// <summary>
+		/// 获取基于沙盒文件夹的加载路径
+		/// </summary>
+		public static string MakePersistentLoadPath(string path)
+		{
+			string root = GetPersistentRootPath();
+			return PathUtility.Combine(root, path);
+		}
+		public static string MakePersistentLoadPath(string path1, string path2)
+		{
+			string root = GetPersistentRootPath();
+			return PathUtility.Combine(root, path1, path2);
+		}
+		public static string MakePersistentLoadPath(string path1, string path2, string path3)
+		{
+			string root = GetPersistentRootPath();
+			return PathUtility.Combine(root, path1, path2, path3);
 		}
 
 		/// <summary>
@@ -47,5 +100,109 @@ namespace YooAsset
 			return path;
 #endif
 		}
+
+
+		/// <summary>
+		/// 删除沙盒总目录
+		/// </summary>
+		public static void DeleteSandbox()
+		{
+			string directoryPath = GetPersistentRootPath();
+			if (Directory.Exists(directoryPath))
+				Directory.Delete(directoryPath, true);
+		}
+
+		/// <summary>
+		/// 删除沙盒内的缓存文件夹
+		/// </summary>
+		public static void DeleteCacheFolder()
+		{
+			string root = MakePersistentLoadPath(CacheFolderName);
+			if (Directory.Exists(root))
+				Directory.Delete(root, true);
+		}
+
+		/// <summary>
+		/// 删除沙盒内的清单文件夹
+		/// </summary>
+		public static void DeleteManifestFolder()
+		{
+			string root = MakePersistentLoadPath(ManifestFolderName);
+			if (Directory.Exists(root))
+				Directory.Delete(root, true);
+		}
+
+
+		/// <summary>
+		/// 获取缓存的BundleFile文件夹路径
+		/// </summary>
+		private readonly static Dictionary<string, string> _cachedBundleFileFolder = new Dictionary<string, string>(100);
+		public static string GetCachedBundleFileFolderPath(string packageName)
+		{
+			if (_cachedBundleFileFolder.TryGetValue(packageName, out string value) == false)
+			{
+				value = MakePersistentLoadPath(CacheFolderName, packageName, CachedBundleFileFolder);
+				_cachedBundleFileFolder.Add(packageName, value);
+			}
+			return value;
+		}
+
+		/// <summary>
+		/// 获取缓存的RawFile文件夹路径
+		/// </summary>
+		private readonly static Dictionary<string, string> _cachedRawFileFolder = new Dictionary<string, string>(100);
+		public static string GetCachedRawFileFolderPath(string packageName)
+		{
+			if (_cachedRawFileFolder.TryGetValue(packageName, out string value) == false)
+			{
+				value = MakePersistentLoadPath(CacheFolderName, packageName, CachedRawFileFolder);
+				_cachedRawFileFolder.Add(packageName, value);
+			}
+			return value;
+		}
+
+		/// <summary>
+		/// 获取应用程序的水印文件路径
+		/// </summary>
+		public static string GetAppFootPrintFilePath()
+		{
+			return MakePersistentLoadPath(AppFootPrintFileName);
+		}
+
+		/// <summary>
+		/// 获取沙盒内清单文件的路径
+		/// </summary>
+		public static string GetCacheManifestFilePath(string packageName, string packageVersion)
+		{
+			string fileName = YooAssetSettingsData.GetManifestBinaryFileName(packageName, packageVersion);
+			return MakePersistentLoadPath(ManifestFolderName, fileName);
+		}
+
+		/// <summary>
+		/// 获取沙盒内包裹的哈希文件的路径
+		/// </summary>
+		public static string GetCachePackageHashFilePath(string packageName, string packageVersion)
+		{
+			string fileName = YooAssetSettingsData.GetPackageHashFileName(packageName, packageVersion);
+			return MakePersistentLoadPath(ManifestFolderName, fileName);
+		}
+
+		/// <summary>
+		/// 获取沙盒内包裹的版本文件的路径
+		/// </summary>
+		public static string GetCachePackageVersionFilePath(string packageName)
+		{
+			string fileName = YooAssetSettingsData.GetPackageVersionFileName(packageName);
+			return MakePersistentLoadPath(ManifestFolderName, fileName);
+		}
+
+		/// <summary>
+		/// 保存默认的包裹版本
+		/// </summary>
+		public static void SaveCachePackageVersionFile(string packageName, string version)
+		{
+			string filePath = GetCachePackageVersionFilePath(packageName);
+			FileUtility.WriteAllText(filePath, version);
+		}
 	}
 }

Assets/YooAsset/Runtime/DownloadSystem/DownloadSystem.cs

@@ -32,11 +32,6 @@ namespace YooAsset
 		/// </summary>
 		public static CertificateHandler CertificateHandlerInstance = null;
 
-		/// <summary>
-		/// 网络重定向次数
-		/// </summary>
-		public static int RedirectLimit { set; get; } = -1;
-
 		/// <summary>
 		/// 启用断点续传功能文件的最小字节数
 		/// </summary>
@@ -133,29 +128,11 @@ namespace YooAsset
 		/// </summary>
 		public static UnityWebRequest NewRequest(string requestURL)
 		{
-			UnityWebRequest webRequest;
 			if (RequestDelegate != null)
-				webRequest = RequestDelegate.Invoke(requestURL);
-			else
-				webRequest = new UnityWebRequest(requestURL, UnityWebRequest.kHttpVerbGET);
+				return RequestDelegate.Invoke(requestURL);
 
-			SetUnityWebRequest(webRequest);
-			return webRequest;
-		}
-
-		/// <summary>
-		/// 设置网络请求的自定义参数
-		/// </summary>
-		public static void SetUnityWebRequest(UnityWebRequest webRequest)
-		{
-			if (RedirectLimit >= 0)
-				webRequest.redirectLimit = RedirectLimit;
-
-			if (CertificateHandlerInstance != null)
-			{
-				webRequest.certificateHandler = CertificateHandlerInstance;
-				webRequest.disposeCertificateHandlerOnDispose = false;
-			}
+			var request = new UnityWebRequest(requestURL, UnityWebRequest.kHttpVerbGET);
+			return request;
 		}
 
 		/// <summary>

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

@@ -101,6 +101,13 @@ namespace YooAsset
 				handler.removeFileOnAbort = true;
 				_webRequest.downloadHandler = handler;
 				_webRequest.disposeDownloadHandlerOnDispose = true;
+
+				if (DownloadSystem.CertificateHandlerInstance != null)
+				{
+					_webRequest.certificateHandler = DownloadSystem.CertificateHandlerInstance;
+					_webRequest.disposeCertificateHandlerOnDispose = false;
+				}
+
 				_webRequest.SendWebRequest();
 				_steps = ESteps.CheckDownload;
 			}
@@ -130,6 +137,13 @@ namespace YooAsset
 				_webRequest.disposeDownloadHandlerOnDispose = true;
 				if (fileLength > 0)
 					_webRequest.SetRequestHeader("Range", $"bytes={fileLength}-");
+
+				if (DownloadSystem.CertificateHandlerInstance != null)
+				{
+					_webRequest.certificateHandler = DownloadSystem.CertificateHandlerInstance;
+					_webRequest.disposeCertificateHandlerOnDispose = false;
+				}
+
 				_webRequest.SendWebRequest();
 				_steps = ESteps.CheckDownload;
 			}

Assets/YooAsset/Runtime/InitializeParameters.cs

@@ -27,23 +27,17 @@ namespace YooAsset
 	/// </summary>
 	public abstract class InitializeParameters
 	{
+		/// <summary>
+		/// 资源定位地址大小写不敏感
+		/// 注意：默认值为False
+		/// </summary>
+		public bool LocationToLower = false;
+
 		/// <summary>
 		/// 文件解密服务接口
 		/// </summary>
 		public IDecryptionServices DecryptionServices = null;
 
-		/// <summary>
-		/// 内置文件的根路径
-		/// 注意：当参数为空的时候会使用默认的根目录。
-		/// </summary>
-		public string BuildinRootDirectory = string.Empty;
-
-		/// <summary>
-		/// 沙盒文件的根路径
-		/// 注意：当参数为空的时候会使用默认的根目录。
-		/// </summary>
-		public string SandboxRootDirectory = string.Empty;
-		
 		/// <summary>
 		/// 资源加载每帧处理的最大时间片段
 		/// 注意：默认值为MaxValue

Assets/YooAsset/Runtime/PackageSystem/BundleInfo.cs

@@ -26,9 +26,9 @@ namespace YooAsset
 		public string RemoteFallbackURL { private set; get; }
 
 		/// <summary>
-		/// 注意：该字段只用于帮助编辑器下的模拟模式。
+		/// 编辑器资源路径
 		/// </summary>
-		public string[] IncludeAssets;
+		public string EditorAssetPath { private set; get; }
 
 
 		private BundleInfo()
@@ -40,6 +40,15 @@ namespace YooAsset
 			LoadMode = loadMode;
 			RemoteMainURL = mainURL;
 			RemoteFallbackURL = fallbackURL;
+			EditorAssetPath = string.Empty;
+		}
+		public BundleInfo(PackageBundle bundle, ELoadMode loadMode, string editorAssetPath)
+		{
+			Bundle = bundle;
+			LoadMode = loadMode;
+			RemoteMainURL = string.Empty;
+			RemoteFallbackURL = string.Empty;
+			EditorAssetPath = editorAssetPath;
 		}
 		public BundleInfo(PackageBundle bundle, ELoadMode loadMode)
 		{
@@ -47,8 +56,10 @@ namespace YooAsset
 			LoadMode = loadMode;
 			RemoteMainURL = string.Empty;
 			RemoteFallbackURL = string.Empty;
+			EditorAssetPath = string.Empty;
 		}
 
+
 		/// <summary>
 		/// 是否为JAR包内文件
 		/// </summary>

Assets/YooAsset/Runtime/PackageSystem/ManifestTools.cs

@@ -8,6 +8,7 @@ namespace YooAsset
 {
 	internal static class ManifestTools
 	{
+
 #if UNITY_EDITOR
 		/// <summary>
 		/// 序列化（JSON文件）
@@ -36,8 +37,6 @@ namespace YooAsset
 
 				// 写入文件头信息
 				buffer.WriteBool(manifest.EnableAddressable);
-				buffer.WriteBool(manifest.LocationToLower);
-				buffer.WriteBool(manifest.IncludeAssetGUID);
 				buffer.WriteInt32(manifest.OutputNameStyle);
 				buffer.WriteUTF8(manifest.PackageName);
 				buffer.WriteUTF8(manifest.PackageVersion);
@@ -49,7 +48,6 @@ namespace YooAsset
 					var packageAsset = manifest.AssetList[i];
 					buffer.WriteUTF8(packageAsset.Address);
 					buffer.WriteUTF8(packageAsset.AssetPath);
-					buffer.WriteUTF8(packageAsset.AssetGUID);
 					buffer.WriteUTF8Array(packageAsset.AssetTags);
 					buffer.WriteInt32(packageAsset.BundleID);
 					buffer.WriteInt32Array(packageAsset.DependIDs);
@@ -107,16 +105,10 @@ namespace YooAsset
 				// 读取文件头信息
 				manifest.FileVersion = fileVersion;
 				manifest.EnableAddressable = buffer.ReadBool();
-				manifest.LocationToLower = buffer.ReadBool();
-				manifest.IncludeAssetGUID = buffer.ReadBool();
 				manifest.OutputNameStyle = buffer.ReadInt32();
 				manifest.PackageName = buffer.ReadUTF8();
 				manifest.PackageVersion = buffer.ReadUTF8();
 
-				// 检测配置
-				if (manifest.EnableAddressable && manifest.LocationToLower)
-					throw new Exception("Addressable not support location to lower !");
-
 				// 读取资源列表
 				int packageAssetCount = buffer.ReadInt32();
 				manifest.AssetList = new List<PackageAsset>(packageAssetCount);
@@ -125,7 +117,6 @@ namespace YooAsset
 					var packageAsset = new PackageAsset();
 					packageAsset.Address = buffer.ReadUTF8();
 					packageAsset.AssetPath = buffer.ReadUTF8();
-					packageAsset.AssetGUID = buffer.ReadUTF8();
 					packageAsset.AssetTags = buffer.ReadUTF8Array();
 					packageAsset.BundleID = buffer.ReadInt32();
 					packageAsset.DependIDs = buffer.ReadInt32Array();
@@ -150,7 +141,7 @@ namespace YooAsset
 				}
 			}
 
-			// 填充BundleDic
+			// BundleDic
 			manifest.BundleDic = new Dictionary<string, PackageBundle>(manifest.BundleList.Count);
 			foreach (var packageBundle in manifest.BundleList)
 			{
@@ -158,7 +149,7 @@ namespace YooAsset
 				manifest.BundleDic.Add(packageBundle.BundleName, packageBundle);
 			}
 
-			// 填充AssetDic
+			// AssetDic
 			manifest.AssetDic = new Dictionary<string, PackageAsset>(manifest.AssetList.Count);
 			foreach (var packageAsset in manifest.AssetList)
 			{
@@ -197,28 +188,14 @@ namespace YooAsset
 		}
 
 		/// <summary>
-		/// 转换为解压BundleInfo
+		/// 获取解压BundleInfo
 		/// </summary>
-		public static BundleInfo ConvertToUnpackInfo(PackageBundle packageBundle)
+		public static BundleInfo GetUnpackInfo(PackageBundle packageBundle)
 		{
 			// 注意：我们把流加载路径指定为远端下载地址
 			string streamingPath = PersistentTools.ConvertToWWWPath(packageBundle.StreamingFilePath);
 			BundleInfo bundleInfo = new BundleInfo(packageBundle, BundleInfo.ELoadMode.LoadFromStreaming, streamingPath, streamingPath);
 			return bundleInfo;
 		}
-
-		/// <summary>
-		/// 批量转换解压为BundleInfo
-		/// </summary>
-		public static List<BundleInfo> ConvertToUnpackInfos(List<PackageBundle> unpackList)
-		{
-			List<BundleInfo> result = new List<BundleInfo>(unpackList.Count);
-			foreach (var packageBundle in unpackList)
-			{
-				var bundleInfo = ConvertToUnpackInfo(packageBundle);
-				result.Add(bundleInfo);
-			}
-			return result;
-		}
 	}
 }

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

@@ -217,13 +217,13 @@ namespace YooAsset
 			if (_steps == ESteps.CheckAppFootPrint)
 			{
 				var appFootPrint = new AppFootPrint();
-				appFootPrint.Load(_packageName);
+				appFootPrint.Load();
 
 				// 如果水印发生变化，则说明覆盖安装后首次打开游戏
 				if (appFootPrint.IsDirty())
 				{
-					PersistentTools.GetPersistent(_packageName).DeleteSandboxManifestFilesFolder();
-					appFootPrint.Coverage(_packageName);
+					PersistentTools.DeleteManifestFolder();
+					appFootPrint.Coverage();
 					YooLogger.Log("Delete manifest files when application foot print dirty !");
 				}
 				_steps = ESteps.QueryCachePackageVersion;
@@ -374,16 +374,16 @@ namespace YooAsset
 		/// <summary>
 		/// 读取应用程序水印
 		/// </summary>
-		public void Load(string packageName)
+		public void Load()
 		{
-			string footPrintFilePath = PersistentTools.GetPersistent(packageName).SandboxAppFootPrintFilePath;
+			string footPrintFilePath = PersistentTools.GetAppFootPrintFilePath();
 			if (File.Exists(footPrintFilePath))
 			{
 				_footPrint = FileUtility.ReadAllText(footPrintFilePath);
 			}
 			else
 			{
-				Coverage(packageName);
+				Coverage();
 			}
 		}
 
@@ -402,14 +402,14 @@ namespace YooAsset
 		/// <summary>
 		/// 覆盖掉水印
 		/// </summary>
-		public void Coverage(string packageName)
+		public void Coverage()
 		{
 #if UNITY_EDITOR
 			_footPrint = Application.version;
 #else
 			_footPrint = Application.buildGUID;
 #endif
-			string footPrintFilePath = PersistentTools.GetPersistent(packageName).SandboxAppFootPrintFilePath;
+			string footPrintFilePath = PersistentTools.GetAppFootPrintFilePath();
 			FileUtility.WriteAllText(footPrintFilePath, _footPrint);
 			YooLogger.Log($"Save application foot print : {_footPrint}");
 		}

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

@@ -77,16 +77,10 @@ namespace YooAsset
 					Manifest = new PackageManifest();
 					Manifest.FileVersion = fileVersion;
 					Manifest.EnableAddressable = _buffer.ReadBool();
-					Manifest.LocationToLower = _buffer.ReadBool();
-					Manifest.IncludeAssetGUID = _buffer.ReadBool();
 					Manifest.OutputNameStyle = _buffer.ReadInt32();
 					Manifest.PackageName = _buffer.ReadUTF8();
 					Manifest.PackageVersion = _buffer.ReadUTF8();
 
-					// 检测配置
-					if (Manifest.EnableAddressable && Manifest.LocationToLower)
-						throw new System.Exception("Addressable not support location to lower !");
-
 					_steps = ESteps.PrepareAssetList;
 				}
 
@@ -95,17 +89,6 @@ namespace YooAsset
 					_packageAssetCount = _buffer.ReadInt32();
 					Manifest.AssetList = new List<PackageAsset>(_packageAssetCount);
 					Manifest.AssetDic = new Dictionary<string, PackageAsset>(_packageAssetCount);
-
-					if (Manifest.EnableAddressable)
-						Manifest.AssetPathMapping1 = new Dictionary<string, string>(_packageAssetCount);
-					else
-						Manifest.AssetPathMapping1 = new Dictionary<string, string>(_packageAssetCount * 2);
-
-					if (Manifest.IncludeAssetGUID)
-						Manifest.AssetPathMapping2 = new Dictionary<string, string>(_packageAssetCount);
-					else
-						Manifest.AssetPathMapping2 = new Dictionary<string, string>();
-
 					_progressTotalValue = _packageAssetCount;
 					_steps = ESteps.DeserializeAssetList;
 				}
@@ -116,7 +99,6 @@ namespace YooAsset
 						var packageAsset = new PackageAsset();
 						packageAsset.Address = _buffer.ReadUTF8();
 						packageAsset.AssetPath = _buffer.ReadUTF8();
-						packageAsset.AssetGUID = _buffer.ReadUTF8();
 						packageAsset.AssetTags = _buffer.ReadUTF8Array();
 						packageAsset.BundleID = _buffer.ReadInt32();
 						packageAsset.DependIDs = _buffer.ReadInt32Array();
@@ -129,47 +111,6 @@ namespace YooAsset
 						else
 							Manifest.AssetDic.Add(assetPath, packageAsset);
 
-						// 填充AssetPathMapping1
-						if (Manifest.EnableAddressable)
-						{
-							string location = packageAsset.Address;
-							if (Manifest.AssetPathMapping1.ContainsKey(location))
-								throw new System.Exception($"Address have existed : {location}");
-							else
-								Manifest.AssetPathMapping1.Add(location, packageAsset.AssetPath);
-						}
-						else
-						{
-							string location = packageAsset.AssetPath;
-							if (Manifest.LocationToLower)
-								location = location.ToLower();
-
-							// 添加原生路径的映射
-							if (Manifest.AssetPathMapping1.ContainsKey(location))
-								throw new System.Exception($"AssetPath have existed : {location}");
-							else
-								Manifest.AssetPathMapping1.Add(location, packageAsset.AssetPath);
-
-							// 添加无后缀名路径的映射
-							if (Path.HasExtension(location))
-							{
-								string locationWithoutExtension = PathUtility.RemoveExtension(location);
-								if (Manifest.AssetPathMapping1.ContainsKey(locationWithoutExtension))
-									YooLogger.Warning($"AssetPath have existed : {locationWithoutExtension}");
-								else
-									Manifest.AssetPathMapping1.Add(locationWithoutExtension, packageAsset.AssetPath);
-							}
-						}
-
-						// 填充AssetPathMapping2
-						if (Manifest.IncludeAssetGUID)
-						{
-							if (Manifest.AssetPathMapping2.ContainsKey(packageAsset.AssetGUID))
-								throw new System.Exception($"AssetGUID have existed : {packageAsset.AssetGUID}");
-							else
-								Manifest.AssetPathMapping2.Add(packageAsset.AssetGUID, packageAsset.AssetPath);
-						}
-
 						_packageAssetCount--;
 						Progress = 1f - _packageAssetCount / _progressTotalValue;
 						if (OperationSystem.IsBusy)

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

@@ -41,7 +41,7 @@ namespace YooAsset
 			{
 				if (_downloader1 == null)
 				{
-					string savePath = PersistentTools.GetPersistent(_packageName).GetSandboxPackageHashFilePath(_packageVersion);
+					string savePath = PersistentTools.GetCachePackageHashFilePath(_packageName, _packageVersion);
 					string fileName = YooAssetSettingsData.GetPackageHashFileName(_packageName, _packageVersion);
 					string webURL = GetDownloadRequestURL(fileName);
 					YooLogger.Log($"Beginning to download package hash file : {webURL}");
@@ -71,7 +71,7 @@ namespace YooAsset
 			{
 				if (_downloader2 == null)
 				{
-					string savePath = PersistentTools.GetPersistent(_packageName).GetSandboxPackageManifestFilePath(_packageVersion);
+					string savePath = PersistentTools.GetCacheManifestFilePath(_packageName, _packageVersion);
 					string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_packageName, _packageVersion);
 					string webURL = GetDownloadRequestURL(fileName);
 					YooLogger.Log($"Beginning to download manifest file : {webURL}");

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

@@ -41,7 +41,8 @@ namespace YooAsset
 			{
 				if (_downloader == null)
 				{
-					string filePath = PersistentTools.GetPersistent(_buildinPackageName).GetBuildinPackageManifestFilePath(_buildinPackageVersion);
+					string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_buildinPackageName, _buildinPackageVersion);
+					string filePath = PersistentTools.MakeStreamingLoadPath(fileName);
 					string url = PersistentTools.ConvertToWWWPath(filePath);
 					_downloader = new UnityWebDataRequester();
 					_downloader.SendRequest(url);

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

@@ -67,7 +67,7 @@ namespace YooAsset
 
 			if (_steps == ESteps.VerifyFileHash)
 			{
-				_manifestFilePath = PersistentTools.GetPersistent(_packageName).GetSandboxPackageManifestFilePath(_packageVersion);
+				_manifestFilePath = PersistentTools.GetCacheManifestFilePath(_packageName, _packageVersion);
 				if (File.Exists(_manifestFilePath) == false)
 				{
 					_steps = ESteps.Done;
@@ -131,7 +131,7 @@ namespace YooAsset
 				File.Delete(_manifestFilePath);
 			}
 
-			string hashFilePath = PersistentTools.GetPersistent(_packageName).GetSandboxPackageHashFilePath(_packageVersion);
+			string hashFilePath = PersistentTools.GetCachePackageHashFilePath(_packageName, _packageVersion);
 			if (File.Exists(hashFilePath))
 			{
 				File.Delete(hashFilePath);

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

@@ -37,7 +37,8 @@ namespace YooAsset
 			{
 				if (_downloader == null)
 				{
-					string filePath = PersistentTools.GetPersistent(_packageName).GetBuildinPackageVersionFilePath();
+					string fileName = YooAssetSettingsData.GetPackageVersionFileName(_packageName);
+					string filePath = PersistentTools.MakeStreamingLoadPath(fileName);
 					string url = PersistentTools.ConvertToWWWPath(filePath);
 					_downloader = new UnityWebDataRequester();
 					_downloader.SendRequest(url);

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

@@ -37,7 +37,7 @@ namespace YooAsset
 
 			if (_steps == ESteps.LoadCachePackageHashFile)
 			{
-				string filePath = PersistentTools.GetPersistent(_packageName).GetSandboxPackageHashFilePath(_packageVersion);
+				string filePath = PersistentTools.GetCachePackageHashFilePath(_packageName, _packageVersion);
 				if (File.Exists(filePath) == false)
 				{
 					_steps = ESteps.Done;

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

@@ -35,7 +35,7 @@ namespace YooAsset
 
 			if (_steps == ESteps.LoadCachePackageVersionFile)
 			{
-				string filePath = PersistentTools.GetPersistent(_packageName).GetSandboxPackageVersionFilePath();
+				string filePath = PersistentTools.GetCachePackageVersionFilePath(_packageName);
 				if (File.Exists(filePath) == false)
 				{
 					_steps = ESteps.Done;

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

@@ -31,13 +31,13 @@ namespace YooAsset
 			if (_steps == ESteps.None || _steps == ESteps.Done)
 				return;
 
-			if (_steps == ESteps.UnpackManifestHashFile)
+			if(_steps == ESteps.UnpackManifestHashFile)
 			{
 				if (_downloader1 == null)
 				{
-					var persistent = PersistentTools.GetPersistent(_buildinPackageName);
-					string savePath = persistent.GetSandboxPackageHashFilePath(_buildinPackageVersion);
-					string filePath = persistent.GetBuildinPackageHashFilePath(_buildinPackageVersion);
+					string savePath = PersistentTools.GetCachePackageHashFilePath(_buildinPackageName, _buildinPackageVersion);
+					string fileName = YooAssetSettingsData.GetPackageHashFileName(_buildinPackageName, _buildinPackageVersion);
+					string filePath = PersistentTools.MakeStreamingLoadPath(fileName);
 					string url = PersistentTools.ConvertToWWWPath(filePath);
 					_downloader1 = new UnityWebFileRequester();
 					_downloader1.SendRequest(url, savePath);
@@ -64,9 +64,9 @@ namespace YooAsset
 			{
 				if (_downloader2 == null)
 				{
-					var persistent = PersistentTools.GetPersistent(_buildinPackageName);
-					string savePath = persistent.GetSandboxPackageManifestFilePath(_buildinPackageVersion);
-					string filePath = persistent.GetBuildinPackageManifestFilePath(_buildinPackageVersion);
+					string savePath = PersistentTools.GetCacheManifestFilePath(_buildinPackageName, _buildinPackageVersion);
+					string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_buildinPackageName, _buildinPackageVersion);
+					string filePath = PersistentTools.MakeStreamingLoadPath(fileName);
 					string url = PersistentTools.ConvertToWWWPath(filePath);
 					_downloader2 = new UnityWebFileRequester();
 					_downloader2.SendRequest(url, savePath);

Assets/YooAsset/Runtime/PackageSystem/PackageAsset.cs

@@ -16,11 +16,6 @@ namespace YooAsset
 		/// </summary>
 		public string AssetPath;
 
-		/// <summary>
-		/// 资源GUID
-		/// </summary>
-		public string AssetGUID;
-
 		/// <summary>
 		/// 资源的分类标签
 		/// </summary>

Assets/YooAsset/Runtime/PackageSystem/PackageBundle.cs

@@ -74,13 +74,13 @@ namespace YooAsset
 				string folderName = FileHash.Substring(0, 2);
 				if (IsRawFile)
 				{
-					string cacheRoot = PersistentTools.GetPersistent(PackageName).SandboxCacheRawFilesRoot;
+					string cacheRoot = PersistentTools.GetCachedRawFileFolderPath(PackageName);
 					_cachedDataFilePath = PathUtility.Combine(cacheRoot, folderName, CacheGUID, YooAssetSettings.CacheBundleDataFileName);
 					_cachedDataFilePath += _fileExtension;
 				}
 				else
 				{
-					string cacheRoot = PersistentTools.GetPersistent(PackageName).SandboxCacheBundleFilesRoot;
+					string cacheRoot = PersistentTools.GetCachedBundleFileFolderPath(PackageName);
 					_cachedDataFilePath = PathUtility.Combine(cacheRoot, folderName, CacheGUID, YooAssetSettings.CacheBundleDataFileName);
 				}
 				return _cachedDataFilePath;
@@ -101,12 +101,12 @@ namespace YooAsset
 				string folderName = FileHash.Substring(0, 2);
 				if (IsRawFile)
 				{
-					string cacheRoot = PersistentTools.GetPersistent(PackageName).SandboxCacheRawFilesRoot;
+					string cacheRoot = PersistentTools.GetCachedRawFileFolderPath(PackageName);
 					_cachedInfoFilePath = PathUtility.Combine(cacheRoot, folderName, CacheGUID, YooAssetSettings.CacheBundleInfoFileName);
 				}
 				else
 				{
-					string cacheRoot = PersistentTools.GetPersistent(PackageName).SandboxCacheBundleFilesRoot;
+					string cacheRoot = PersistentTools.GetCachedBundleFileFolderPath(PackageName);
 					_cachedInfoFilePath = PathUtility.Combine(cacheRoot, folderName, CacheGUID, YooAssetSettings.CacheBundleInfoFileName);
 				}
 				return _cachedInfoFilePath;
@@ -140,8 +140,7 @@ namespace YooAsset
 				if (string.IsNullOrEmpty(_streamingFilePath) == false)
 					return _streamingFilePath;
 
-				string root = PersistentTools.GetPersistent(PackageName).BuildinPackageRoot;
-				_streamingFilePath = PathUtility.Combine(root, FileName);
+				_streamingFilePath = PersistentTools.MakeStreamingLoadPath(FileName);
 				return _streamingFilePath;
 			}
 		}

Assets/YooAsset/Runtime/PackageSystem/PackageManifest.cs

@@ -22,16 +22,6 @@ namespace YooAsset
 		/// </summary>
 		public bool EnableAddressable;
 
-		/// <summary>
-		/// 资源定位地址大小写不敏感
-		/// </summary>
-		public bool LocationToLower;
-
-		/// <summary>
-		/// 包含资源GUID数据
-		/// </summary>
-		public bool IncludeAssetGUID;
-
 		/// <summary>
 		/// 文件名称样式
 		/// </summary>
@@ -71,17 +61,93 @@ namespace YooAsset
 		public Dictionary<string, PackageAsset> AssetDic;
 
 		/// <summary>
-		/// 资源路径映射集合（提供Location获取AssetPath）
+		/// 资源路径映射集合
 		/// </summary>
 		[NonSerialized]
-		public Dictionary<string, string> AssetPathMapping1;
+		public Dictionary<string, string> AssetPathMapping;
+
+		// 资源路径映射相关
+		private bool _isInitAssetPathMapping = false;
+		private bool _locationToLower = false;
+
 
 		/// <summary>
-		/// 资源路径映射集合（提供AssetGUID获取AssetPath）
+		/// 初始化资源路径映射
 		/// </summary>
-		[NonSerialized]
-		public Dictionary<string, string> AssetPathMapping2;
+		public void InitAssetPathMapping(bool locationToLower)
+		{
+			if (_isInitAssetPathMapping)
+				return;
+			_isInitAssetPathMapping = true;
 
+			if (EnableAddressable)
+			{
+				if (locationToLower)
+					YooLogger.Error("Addressable not support location to lower !");
+
+				AssetPathMapping = new Dictionary<string, string>(AssetList.Count);
+				foreach (var packageAsset in AssetList)
+				{
+					string location = packageAsset.Address;
+					if (AssetPathMapping.ContainsKey(location))
+						throw new Exception($"Address have existed : {location}");
+					else
+						AssetPathMapping.Add(location, packageAsset.AssetPath);
+				}
+			}
+			else
+			{
+				_locationToLower = locationToLower;
+				AssetPathMapping = new Dictionary<string, string>(AssetList.Count * 2);
+				foreach (var packageAsset in AssetList)
+				{
+					string location = packageAsset.AssetPath;
+					if (locationToLower)
+						location = location.ToLower();
+
+					// 添加原生路径的映射
+					if (AssetPathMapping.ContainsKey(location))
+						throw new Exception($"AssetPath have existed : {location}");
+					else
+						AssetPathMapping.Add(location, packageAsset.AssetPath);
+
+					// 添加无后缀名路径的映射
+					if (Path.HasExtension(location))
+					{
+						string locationWithoutExtension = PathUtility.RemoveExtension(location);
+						if (AssetPathMapping.ContainsKey(locationWithoutExtension))
+							YooLogger.Warning($"AssetPath have existed : {locationWithoutExtension}");
+						else
+							AssetPathMapping.Add(locationWithoutExtension, packageAsset.AssetPath);
+					}
+				}
+			}
+		}
+
+		/// <summary>
+		/// 映射为资源路径
+		/// </summary>
+		public string MappingToAssetPath(string location)
+		{
+			if (string.IsNullOrEmpty(location))
+			{
+				YooLogger.Error("Failed to mapping location to asset path, The location is null or empty.");
+				return string.Empty;
+			}
+
+			if (_locationToLower)
+				location = location.ToLower();
+
+			if (AssetPathMapping.TryGetValue(location, out string assetPath))
+			{
+				return assetPath;
+			}
+			else
+			{
+				YooLogger.Warning($"Failed to mapping location to asset path : {location}");
+				return string.Empty;
+			}
+		}
 
 		/// <summary>
 		/// 尝试映射为资源路径
@@ -91,10 +157,10 @@ namespace YooAsset
 			if (string.IsNullOrEmpty(location))
 				return string.Empty;
 
-			if (LocationToLower)
+			if (_locationToLower)
 				location = location.ToLower();
 
-			if (AssetPathMapping1.TryGetValue(location, out string assetPath))
+			if (AssetPathMapping.TryGetValue(location, out string assetPath))
 				return assetPath;
 			else
 				return string.Empty;
@@ -217,14 +283,14 @@ namespace YooAsset
 		}
 
 		/// <summary>
-		/// 资源定位地址转换为资源信息。
+		/// 资源定位地址转换为资源信息类，失败时内部会发出错误日志。
 		/// </summary>
 		/// <returns>如果转换失败会返回一个无效的资源信息类</returns>
 		public AssetInfo ConvertLocationToAssetInfo(string location, System.Type assetType)
 		{
 			DebugCheckLocation(location);
 
-			string assetPath = ConvertLocationToAssetInfoMapping(location);
+			string assetPath = MappingToAssetPath(location);
 			if (TryGetPackageAsset(assetPath, out PackageAsset packageAsset))
 			{
 				AssetInfo assetInfo = new AssetInfo(packageAsset, assetType);
@@ -241,95 +307,6 @@ namespace YooAsset
 				return assetInfo;
 			}
 		}
-		private string ConvertLocationToAssetInfoMapping(string location)
-		{
-			if (string.IsNullOrEmpty(location))
-			{
-				YooLogger.Error("Failed to mapping location to asset path, The location is null or empty.");
-				return string.Empty;
-			}
-
-			if (LocationToLower)
-				location = location.ToLower();
-
-			if (AssetPathMapping1.TryGetValue(location, out string assetPath))
-			{
-				return assetPath;
-			}
-			else
-			{
-				YooLogger.Warning($"Failed to mapping location to asset path : {location}");
-				return string.Empty;
-			}
-		}
-
-		/// <summary>
-		/// 资源GUID转换为资源信息。
-		/// </summary>
-		/// <returns>如果转换失败会返回一个无效的资源信息类</returns>
-		public AssetInfo ConvertAssetGUIDToAssetInfo(string assetGUID, System.Type assetType)
-		{
-			if (IncludeAssetGUID == false)
-			{
-				YooLogger.Warning("Package manifest not include asset guid ! Please check asset bundle collector settings.");
-				AssetInfo assetInfo = new AssetInfo("AssetGUID data is empty !");
-				return assetInfo;
-			}
-
-			string assetPath = ConvertAssetGUIDToAssetInfoMapping(assetGUID);
-			if (TryGetPackageAsset(assetPath, out PackageAsset packageAsset))
-			{
-				AssetInfo assetInfo = new AssetInfo(packageAsset, assetType);
-				return assetInfo;
-			}
-			else
-			{
-				string error;
-				if (string.IsNullOrEmpty(assetGUID))
-					error = $"The assetGUID is null or empty !";
-				else
-					error = $"The assetGUID is invalid : {assetGUID}";
-				AssetInfo assetInfo = new AssetInfo(error);
-				return assetInfo;
-			}
-		}
-		private string ConvertAssetGUIDToAssetInfoMapping(string assetGUID)
-		{
-			if (string.IsNullOrEmpty(assetGUID))
-			{
-				YooLogger.Error("Failed to mapping assetGUID to asset path, The assetGUID is null or empty.");
-				return string.Empty;
-			}
-
-			if (AssetPathMapping2.TryGetValue(assetGUID, out string assetPath))
-			{
-				return assetPath;
-			}
-			else
-			{
-				YooLogger.Warning($"Failed to mapping assetGUID to asset path : {assetGUID}");
-				return string.Empty;
-			}
-		}
-
-		/// <summary>
-		/// 获取资源包内的主资源列表
-		/// </summary>
-		public string[] GetBundleIncludeAssets(string assetPath)
-		{
-			List<string> assetList = new List<string>();
-			if (TryGetPackageAsset(assetPath, out PackageAsset result))
-			{
-				foreach (var packageAsset in AssetList)
-				{
-					if (packageAsset.BundleID == result.BundleID)
-					{
-						assetList.Add(packageAsset.AssetPath);
-					}
-				}
-			}
-			return assetList.ToArray();
-		}
 
 		#region 调试方法
 		[Conditional("DEBUG")]

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

@@ -7,12 +7,14 @@ namespace YooAsset
 	internal class EditorSimulateModeImpl : IPlayModeServices, IBundleServices
 	{
 		private PackageManifest _activeManifest;
+		private bool _locationToLower;
 
 		/// <summary>
 		/// 异步初始化
 		/// </summary>
-		public InitializationOperation InitializeAsync(string simulateManifestFilePath)
+		public InitializationOperation InitializeAsync(bool locationToLower, string simulateManifestFilePath)
 		{
+			_locationToLower = locationToLower;
 			var operation = new EditorSimulateModeInitializationOperation(this, simulateManifestFilePath);
 			OperationSystem.StartOperation(operation);
 			return operation;
@@ -24,6 +26,7 @@ namespace YooAsset
 			set
 			{
 				_activeManifest = value;
+				_activeManifest.InitAssetPathMapping(_locationToLower);
 			}
 			get
 			{
@@ -82,8 +85,7 @@ namespace YooAsset
 			if (packageBundle == null)
 				throw new Exception("Should never get here !");
 
-			BundleInfo bundleInfo = new BundleInfo(packageBundle, BundleInfo.ELoadMode.LoadFromEditor);
-			bundleInfo.IncludeAssets = _activeManifest.GetBundleIncludeAssets(assetInfo.AssetPath);
+			BundleInfo bundleInfo = new BundleInfo(packageBundle, BundleInfo.ELoadMode.LoadFromEditor, assetInfo.AssetPath);
 			return bundleInfo;
 		}
 		BundleInfo IBundleServices.GetBundleInfo(AssetInfo assetInfo)

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

@@ -10,6 +10,7 @@ namespace YooAsset
 
 		// 参数相关
 		private string _packageName;
+		private bool _locationToLower;
 		private string _defaultHostServer;
 		private string _fallbackHostServer;
 		private IQueryServices _queryServices;
@@ -17,9 +18,10 @@ namespace YooAsset
 		/// <summary>
 		/// 异步初始化
 		/// </summary>
-		public InitializationOperation InitializeAsync(string packageName, string defaultHostServer, string fallbackHostServer, IQueryServices queryServices)
+		public InitializationOperation InitializeAsync(string packageName, bool locationToLower, string defaultHostServer, string fallbackHostServer, IQueryServices queryServices)
 		{
 			_packageName = packageName;
+			_locationToLower = locationToLower;
 			_defaultHostServer = defaultHostServer;
 			_fallbackHostServer = fallbackHostServer;
 			_queryServices = queryServices;
@@ -48,6 +50,22 @@ namespace YooAsset
 			return bundleInfo;
 		}
 
+		// 解压相关
+		private List<BundleInfo> ConvertToUnpackList(List<PackageBundle> unpackList)
+		{
+			List<BundleInfo> result = new List<BundleInfo>(unpackList.Count);
+			foreach (var packageBundle in unpackList)
+			{
+				var bundleInfo = ConvertToUnpackInfo(packageBundle);
+				result.Add(bundleInfo);
+			}
+			return result;
+		}
+		private BundleInfo ConvertToUnpackInfo(PackageBundle packageBundle)
+		{
+			return ManifestTools.GetUnpackInfo(packageBundle);
+		}
+
 		#region IRemoteServices接口
 		public string GetRemoteMainURL(string fileName)
 		{
@@ -65,6 +83,7 @@ namespace YooAsset
 			set
 			{
 				_activeManifest = value;
+				_activeManifest.InitAssetPathMapping(_locationToLower);
 			}
 			get
 			{
@@ -74,14 +93,12 @@ namespace YooAsset
 		public void FlushManifestVersionFile()
 		{
 			if (_activeManifest != null)
-			{
-				PersistentTools.GetPersistent(_packageName).SaveSandboxPackageVersionFile(_activeManifest.PackageVersion);
-			}			
+				PersistentTools.SaveCachePackageVersionFile(_packageName, _activeManifest.PackageVersion);
 		}
 
 		private bool IsBuildinPackageBundle(PackageBundle packageBundle)
 		{
-			return _queryServices.QueryStreamingAssets(_packageName, packageBundle.FileName);
+			return _queryServices.QueryStreamingAssets(packageBundle.FileName);
 		}
 		private bool IsCachedPackageBundle(PackageBundle packageBundle)
 		{
@@ -239,7 +256,7 @@ namespace YooAsset
 				}
 			}
 
-			return ManifestTools.ConvertToUnpackInfos(downloadList);
+			return ConvertToUnpackList(downloadList);
 		}
 
 		ResourceUnpackerOperation IPlayModeServices.CreateResourceUnpackerByTags(string[] tags, int upackingMaxNumber, int failedTryAgain, int timeout)
@@ -267,7 +284,7 @@ namespace YooAsset
 				}
 			}
 
-			return ManifestTools.ConvertToUnpackInfos(downloadList);
+			return ConvertToUnpackList(downloadList);
 		}
 		#endregion
 

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

@@ -7,12 +7,14 @@ namespace YooAsset
 	internal class OfflinePlayModeImpl : IPlayModeServices, IBundleServices
 	{
 		private PackageManifest _activeManifest;
+		private bool _locationToLower;
 
 		/// <summary>
 		/// 异步初始化
 		/// </summary>
-		public InitializationOperation InitializeAsync(string packageName)
+		public InitializationOperation InitializeAsync(string packageName, bool locationToLower)
 		{
+			_locationToLower = locationToLower;
 			var operation = new OfflinePlayModeInitializationOperation(this, packageName);
 			OperationSystem.StartOperation(operation);
 			return operation;
@@ -24,6 +26,7 @@ namespace YooAsset
 			set
 			{
 				_activeManifest = value;
+				_activeManifest.InitAssetPathMapping(_locationToLower);
 			}
 			get
 			{
@@ -34,11 +37,6 @@ namespace YooAsset
 		{
 		}
 
-		private bool IsCachedPackageBundle(PackageBundle packageBundle)
-		{
-			return CacheSystem.IsCached(packageBundle.PackageName, packageBundle.CacheGUID);
-		}
-
 		UpdatePackageVersionOperation IPlayModeServices.UpdatePackageVersionAsync(bool appendTimeTicks, int timeout)
 		{
 			var operation = new OfflinePlayModeUpdatePackageVersionOperation();
@@ -73,48 +71,11 @@ namespace YooAsset
 
 		ResourceUnpackerOperation IPlayModeServices.CreateResourceUnpackerByAll(int upackingMaxNumber, int failedTryAgain, int timeout)
 		{
-			List<BundleInfo> unpcakList = GetUnpackListByAll(_activeManifest);
-			var operation = new ResourceUnpackerOperation(unpcakList, upackingMaxNumber, failedTryAgain, timeout);
-			return operation;
+			return ResourceUnpackerOperation.CreateEmptyUnpacker(upackingMaxNumber, failedTryAgain, timeout);
 		}
-		private List<BundleInfo> GetUnpackListByAll(PackageManifest manifest)
-		{
-			List<PackageBundle> downloadList = new List<PackageBundle>(1000);
-			foreach (var packageBundle in manifest.BundleList)
-			{
-				// 忽略缓存文件
-				if (IsCachedPackageBundle(packageBundle))
-					continue;
-
-				downloadList.Add(packageBundle);
-			}
-
-			return ManifestTools.ConvertToUnpackInfos(downloadList);
-		}
-
 		ResourceUnpackerOperation IPlayModeServices.CreateResourceUnpackerByTags(string[] tags, int upackingMaxNumber, int failedTryAgain, int timeout)
 		{
-			List<BundleInfo> unpcakList = GetUnpackListByTags(_activeManifest, tags);
-			var operation = new ResourceUnpackerOperation(unpcakList, upackingMaxNumber, failedTryAgain, timeout);
-			return operation;
-		}
-		private List<BundleInfo> GetUnpackListByTags(PackageManifest manifest, string[] tags)
-		{
-			List<PackageBundle> downloadList = new List<PackageBundle>(1000);
-			foreach (var packageBundle in manifest.BundleList)
-			{
-				// 忽略缓存文件
-				if (IsCachedPackageBundle(packageBundle))
-					continue;
-
-				// 查询DLC资源
-				if (packageBundle.HasTag(tags))
-				{
-					downloadList.Add(packageBundle);
-				}
-			}
-
-			return ManifestTools.ConvertToUnpackInfos(downloadList);
+			return ResourceUnpackerOperation.CreateEmptyUnpacker(upackingMaxNumber, failedTryAgain, timeout);
 		}
 		#endregion
 

Assets/YooAsset/Runtime/PackageSystem/ResourcePackage.cs

@@ -79,10 +79,6 @@ namespace YooAsset
 			// 检测初始化参数合法性
 			CheckInitializeParameters(parameters);
 
-			// 重写持久化根目录
-			var persistent = PersistentTools.GetOrCreatePersistent(PackageName);
-			persistent.OverwriteRootDirectory(parameters.BuildinRootDirectory, parameters.SandboxRootDirectory);
-
 			// 初始化资源系统
 			InitializationOperation initializeOperation;
 			_assetSystemImpl = new AssetSystemImpl();
@@ -96,7 +92,7 @@ namespace YooAsset
 					parameters.DecryptionServices, _bundleServices);
 
 				var initializeParameters = parameters as EditorSimulateModeParameters;
-				initializeOperation = editorSimulateModeImpl.InitializeAsync(initializeParameters.SimulateManifestFilePath);
+				initializeOperation = editorSimulateModeImpl.InitializeAsync(initializeParameters.LocationToLower, initializeParameters.SimulateManifestFilePath);
 			}
 			else if (_playMode == EPlayMode.OfflinePlayMode)
 			{
@@ -108,7 +104,7 @@ namespace YooAsset
 					parameters.DecryptionServices, _bundleServices);
 
 				var initializeParameters = parameters as OfflinePlayModeParameters;
-				initializeOperation = offlinePlayModeImpl.InitializeAsync(PackageName);
+				initializeOperation = offlinePlayModeImpl.InitializeAsync(PackageName, initializeParameters.LocationToLower);
 			}
 			else if (_playMode == EPlayMode.HostPlayMode)
 			{
@@ -122,6 +118,7 @@ namespace YooAsset
 				var initializeParameters = parameters as HostPlayModeParameters;
 				initializeOperation = hostPlayModeImpl.InitializeAsync(
 					PackageName,
+					initializeParameters.LocationToLower,
 					initializeParameters.DefaultHostServer,
 					initializeParameters.FallbackHostServer,
 					initializeParameters.QueryServices
@@ -295,37 +292,6 @@ namespace YooAsset
 			_assetSystemImpl.ForceUnloadAllAssets();
 		}
 
-		#region 沙盒相关
-		/// <summary>
-		/// 获取包裹的内置文件根路径
-		/// </summary>
-		public string GetPackageBuildinRootDirectory()
-		{
-			DebugCheckInitialize();
-			var persistent = PersistentTools.GetPersistent(PackageName);
-			return persistent.BuildinRoot;
-		}
-
-		/// <summary>
-		/// 获取包裹的沙盒文件根路径
-		/// </summary>
-		public string GetPackageSandboxRootDirectory()
-		{
-			DebugCheckInitialize();
-			var persistent = PersistentTools.GetPersistent(PackageName);
-			return persistent.SandboxRoot;
-		}
-
-		/// <summary>
-		/// 清空包裹的沙盒目录
-		/// </summary>
-		public void ClearPackageSandbox()
-		{
-			DebugCheckInitialize();
-			var persistent = PersistentTools.GetPersistent(PackageName);
-			persistent.DeleteSandboxPackageFolder();
-		}
-		#endregion
 
 		#region 资源信息
 		/// <summary>
@@ -397,17 +363,8 @@ namespace YooAsset
 		public AssetInfo GetAssetInfo(string location)
 		{
 			DebugCheckInitialize();
-			return ConvertLocationToAssetInfo(location, null);
-		}
-
-		/// <summary>
-		/// 获取资源信息
-		/// </summary>
-		/// <param name="assetGUID">资源GUID</param>
-		public AssetInfo GetAssetInfoByGUID(string assetGUID)
-		{
-			DebugCheckInitialize();
-			return ConvertAssetGUIDToAssetInfo(assetGUID, null);
+			AssetInfo assetInfo = ConvertLocationToAssetInfo(location, null);
+			return assetInfo;
 		}
 
 		/// <summary>
@@ -490,13 +447,13 @@ namespace YooAsset
 		/// </summary>
 		/// <param name="location">场景的定位地址</param>
 		/// <param name="sceneMode">场景加载模式</param>
-		/// <param name="suspendLoad">场景加载到90%自动挂起</param>
+		/// <param name="activateOnLoad">加载完毕时是否主动激活</param>
 		/// <param name="priority">优先级</param>
-		public SceneOperationHandle LoadSceneAsync(string location, LoadSceneMode sceneMode = LoadSceneMode.Single, bool suspendLoad = false, int priority = 100)
+		public SceneOperationHandle LoadSceneAsync(string location, LoadSceneMode sceneMode = LoadSceneMode.Single, bool activateOnLoad = true, int priority = 100)
 		{
 			DebugCheckInitialize();
 			AssetInfo assetInfo = ConvertLocationToAssetInfo(location, null);
-			var handle = _assetSystemImpl.LoadSceneAsync(assetInfo, sceneMode, suspendLoad, priority);
+			var handle = _assetSystemImpl.LoadSceneAsync(assetInfo, sceneMode, activateOnLoad, priority);
 			return handle;
 		}
 
@@ -505,12 +462,12 @@ namespace YooAsset
 		/// </summary>
 		/// <param name="assetInfo">场景的资源信息</param>
 		/// <param name="sceneMode">场景加载模式</param>
-		/// <param name="suspendLoad">场景加载到90%自动挂起</param>
+		/// <param name="activateOnLoad">加载完毕时是否主动激活</param>
 		/// <param name="priority">优先级</param>
-		public SceneOperationHandle LoadSceneAsync(AssetInfo assetInfo, LoadSceneMode sceneMode = LoadSceneMode.Single, bool suspendLoad = false, int priority = 100)
+		public SceneOperationHandle LoadSceneAsync(AssetInfo assetInfo, LoadSceneMode sceneMode = LoadSceneMode.Single, bool activateOnLoad = true, int priority = 100)
 		{
 			DebugCheckInitialize();
-			var handle = _assetSystemImpl.LoadSceneAsync(assetInfo, sceneMode, suspendLoad, priority);
+			var handle = _assetSystemImpl.LoadSceneAsync(assetInfo, sceneMode, activateOnLoad, priority);
 			return handle;
 		}
 		#endregion
@@ -693,95 +650,6 @@ namespace YooAsset
 		}
 		#endregion
 
-		#region 资源加载
-		/// <summary>
-		/// 同步加载资源包内所有资源对象
-		/// </summary>
-		/// <param name="assetInfo">资源信息</param>
-		public AllAssetsOperationHandle LoadAllAssetsSync(AssetInfo assetInfo)
-		{
-			DebugCheckInitialize();
-			return LoadAllAssetsInternal(assetInfo, true);
-		}
-
-		/// <summary>
-		/// 同步加载资源包内所有资源对象
-		/// </summary>
-		/// <typeparam name="TObject">资源类型</typeparam>
-		/// <param name="location">资源的定位地址</param>
-		public AllAssetsOperationHandle LoadAllAssetsSync<TObject>(string location) where TObject : UnityEngine.Object
-		{
-			DebugCheckInitialize();
-			AssetInfo assetInfo = ConvertLocationToAssetInfo(location, typeof(TObject));
-			return LoadAllAssetsInternal(assetInfo, true);
-		}
-
-		/// <summary>
-		/// 同步加载资源包内所有资源对象
-		/// </summary>
-		/// <param name="location">资源的定位地址</param>
-		/// <param name="type">子对象类型</param>
-		public AllAssetsOperationHandle LoadAllAssetsSync(string location, System.Type type)
-		{
-			DebugCheckInitialize();
-			AssetInfo assetInfo = ConvertLocationToAssetInfo(location, type);
-			return LoadAllAssetsInternal(assetInfo, true);
-		}
-
-
-		/// <summary>
-		/// 异步加载资源包内所有资源对象
-		/// </summary>
-		/// <param name="assetInfo">资源信息</param>
-		public AllAssetsOperationHandle LoadAllAssetsAsync(AssetInfo assetInfo)
-		{
-			DebugCheckInitialize();
-			return LoadAllAssetsInternal(assetInfo, false);
-		}
-
-		/// <summary>
-		/// 异步加载资源包内所有资源对象
-		/// </summary>
-		/// <typeparam name="TObject">资源类型</typeparam>
-		/// <param name="location">资源的定位地址</param>
-		public AllAssetsOperationHandle LoadAllAssetsAsync<TObject>(string location) where TObject : UnityEngine.Object
-		{
-			DebugCheckInitialize();
-			AssetInfo assetInfo = ConvertLocationToAssetInfo(location, typeof(TObject));
-			return LoadAllAssetsInternal(assetInfo, false);
-		}
-
-		/// <summary>
-		/// 异步加载资源包内所有资源对象
-		/// </summary>
-		/// <param name="location">资源的定位地址</param>
-		/// <param name="type">子对象类型</param>
-		public AllAssetsOperationHandle LoadAllAssetsAsync(string location, System.Type type)
-		{
-			DebugCheckInitialize();
-			AssetInfo assetInfo = ConvertLocationToAssetInfo(location, type);
-			return LoadAllAssetsInternal(assetInfo, false);
-		}
-
-
-		private AllAssetsOperationHandle LoadAllAssetsInternal(AssetInfo assetInfo, bool waitForAsyncComplete)
-		{
-#if UNITY_EDITOR
-			if (assetInfo.IsInvalid == false)
-			{
-				BundleInfo bundleInfo = _bundleServices.GetBundleInfo(assetInfo);
-				if (bundleInfo.Bundle.IsRawFile)
-					throw new Exception($"Cannot load raw file using {nameof(LoadAllAssetsAsync)} method !");
-			}
-#endif
-
-			var handle = _assetSystemImpl.LoadAllAssetsAsync(assetInfo);
-			if (waitForAsyncComplete)
-				handle.WaitForAsyncComplete();
-			return handle;
-		}
-		#endregion
-
 		#region 资源下载
 		/// <summary>
 		/// 创建资源下载器，用于下载当前资源版本所有的资源包文件
@@ -932,14 +800,13 @@ namespace YooAsset
 			return _playModeServices.ActiveManifest.IsIncludeBundleFile(cacheGUID);
 		}
 
+		/// <summary>
+		/// 资源定位地址转换为资源信息类
+		/// </summary>
 		private AssetInfo ConvertLocationToAssetInfo(string location, System.Type assetType)
 		{
 			return _playModeServices.ActiveManifest.ConvertLocationToAssetInfo(location, assetType);
 		}
-		private AssetInfo ConvertAssetGUIDToAssetInfo(string assetGUID, System.Type assetType)
-		{
-			return _playModeServices.ActiveManifest.ConvertAssetGUIDToAssetInfo(assetGUID, assetType);
-		}
 		#endregion
 
 		#region 调试方法

Assets/YooAsset/Runtime/Services/IQueryServices.cs

@@ -6,6 +6,6 @@ namespace YooAsset
 		/// <summary>
 		/// 查询内置资源
 		/// </summary>
-		bool QueryStreamingAssets(string packageName, string fileName);
+		bool QueryStreamingAssets(string fileName);
 	}
 }

Assets/YooAsset/Runtime/Settings/YooAssetSettings.cs

@@ -24,7 +24,7 @@ namespace YooAsset
 		/// <summary>
 		/// 清单文件格式版本
 		/// </summary>
-		public const string ManifestFileVersion = "1.4.17";
+		public const string ManifestFileVersion = "1.4.6";
 
 
 		/// <summary>
@@ -37,31 +37,6 @@ namespace YooAsset
 		/// </summary>
 		public const string CacheBundleInfoFileName = "__info";
 
-		/// <summary>
-		/// 默认的YooAsset文件夹名称
-		/// </summary>
-		public const string DefaultYooFolderName = "yoo";
-
-		/// <summary>
-		/// 缓存的资源文件的文件夹名称
-		/// </summary>
-		public const string CachedBundleFileFolder = "CacheBundleFiles";
-
-		/// <summary>
-		/// 缓存的原生文件的文件夹名称
-		/// </summary>
-		public const string CachedRawFileFolder = "CacheRawFiles";
-
-		/// <summary>
-		/// 缓存的清单文件的文件夹名称
-		/// </summary>
-		public const string ManifestFolderName = "ManifestFiles";
-
-		/// <summary>
-		/// 记录应用程序版本的文件名称
-		/// </summary>
-		public const string AppFootPrintFileName = "ApplicationFootPrint.bytes";
-
 
 		/// <summary>
 		/// 构建输出文件夹名称
@@ -72,5 +47,10 @@ namespace YooAsset
 		/// 构建输出的报告文件
 		/// </summary>
 		public const string ReportFileName = "BuildReport";
+
+		/// <summary>
+		/// 内置资源目录名称
+		/// </summary>
+		public const string StreamingAssetsBuildinFolder = "BuildinFiles";
 	}
 }