Update CHANGELOG.md

优化了场景卸载机制，在切换场景的时候不在主动卸载资源。

Assets/YooAsset/CHANGELOG.md

@@ -2,6 +2,145 @@
 
 All notable changes to this package will be documented in this file.
 
+## [1.4.11] - 2023-04-14
+
+### Fixed
+
+- (#97)修复了着色器变种收集配置无法保存的问题。
+- (#83)修复了资源收集界面Package列表没有实时刷新的问题。
+- (#48)优化了场景卸载机制，在切换场景的时候不在主动卸载资源。
+
+### Changed
+
+- 增加了扩展属性
+
+  ```c#
+  [assembly: InternalsVisibleTo("YooAsset.EditorExtension")]
+  [assembly: InternalsVisibleTo("YooAsset.RuntimeExtension")]
+  ```
+
+## [1.4.10] - 2023-04-08
+
+### Fixed
+
+- 修复了资源文件路径无效导致异常的问题。
+- 修复了原生文件不支持ini格式文件的问题。
+- 修复了通过代码途径导入XML配置的报错问题。
+
+## [1.4.9] - 2023-03-29
+
+### Fixed
+
+- 修复了资源配置界面的GroupActiveRule保存无效的问题。
+
+### Changed
+
+- 优化了资源配置导入逻辑，增加了对XML配置文件的合法性检测。
+
+- 优化了UniTask的说明文档。
+
+- 调整构建的输出目录结构。
+
+- 调试窗口增加分屏功能。（Unity2020.3+起效）
+
+- 报告窗口增加分屏功能。（Unity2020.3+起效）
+
+- 编辑器模拟模式支持了虚拟资源包。
+
+- 扩展了Instantiate方法。
+
+  ```c#
+  public sealed class AssetOperationHandle
+  {
+      public GameObject InstantiateSync();
+      public GameObject InstantiateSync(Transform parent);
+      public GameObject InstantiateSync(Transform parent, bool worldPositionStays);
+      public GameObject InstantiateSync(Vector3 position, Quaternion rotation);
+      public GameObject InstantiateSync(Vector3 position, Quaternion rotation, Transform parent);
+  }
+  ```
+
+### Added
+
+- 优化了报告文件内容，增加了资源包内嵌的资源列表。
+
+- 可寻址规则增加了AddressByFilePath类。
+
+- 新增了新方法。
+
+  ```c#
+  /// <summary>
+  /// 向远端请求并更新清单
+  /// </summary>
+  public class UpdatePackageManifestOperation : AsyncOperationBase
+  {
+  	/// <summary>
+  	/// 保存当前清单的版本，用于下次启动时自动加载的版本。
+  	/// </summary>
+  	public void SavePackageVersion();
+  }
+  ```
+
+- 新增了初始化参数。
+
+  ```c#
+  /// <summary>
+  /// 下载失败尝试次数
+  /// 注意：默认值为MaxValue
+  /// </summary>
+  public int DownloadFailedTryAgain = int.MaxValue;
+  ```
+
+- 新增了初始化参数。
+
+  ```c#
+  /// <summary>
+  /// 资源加载每帧处理的最大时间片段
+  /// 注意：默认值为MaxValue
+  /// </summary>
+  public long LoadingMaxTimeSlice = long.MaxValue;
+  ```
+
+### Removed
+
+- 移除了代码里的Patch敏感字。
+
+  ```c#
+  //PatchManifest.cs重命名为PackageManifest.cs
+  //AssetsPackage.cs重命名为ResourcePackage.cs
+  //YooAssets.CreateAssetsPackage()重命名为YooAssets.CreatePackage()
+  //YooAssets.GetAssetsPackage()重命名为YooAssets.GetPackage()
+  //YooAssets.TryGetAssetsPackage()重命名为YooAssets.TryGetPackage()
+  //YooAssets.HasAssetsPackage()重命名为YooAssets.HasPackage()
+  ```
+
+- 移除了初始化参数：AssetLoadingMaxNumber
+
+## [1.4.8] - 2023-03-10
+
+### Fixed
+
+- 修复了同步加载原生文件，程序卡死的问题。
+- 修复了可编程构建管线，当项目里没有着色器，如果有引用内置着色器会导致打包失败的问题。
+- 修复了在Unity2021.3版本下着色器收集界面错乱的问题。
+
+### Changed
+
+- 优化了打包逻辑，提高构建速度。
+
+- 支持自定义日志处理，方便收集线上问题。
+
+  ```c#
+  public class YooAssets
+  {
+      /// <summary>
+      /// 初始化资源系统
+      /// </summary>
+      /// <param name="logger">自定义日志处理</param>
+      public static void Initialize(ILogger logger = null)
+  }
+  ```
+
 ## [1.4.7] - 2023-03-03
 
 ### Fixed

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilder.cs

@@ -39,12 +39,6 @@ namespace YooAsset.Editor
 			var buildParametersContext = new BuildParametersContext(buildParameters);
 			_buildContext.SetContextObject(buildParametersContext);
 
-			// 是否显示LOG
-			if (buildParameters.BuildMode == EBuildMode.SimulateBuild)
-				BuildLogger.EnableLog = false;
-			else
-				BuildLogger.EnableLog = true;
-
 			// 创建构建节点
 			List<IBuildTask> pipeline;
 			if (buildParameters.BuildPipeline == EBuildPipeline.BuiltinBuildPipeline)
@@ -57,10 +51,10 @@ namespace YooAsset.Editor
 					new TaskCopyRawFile(), //拷贝原生文件
 					new TaskVerifyBuildResult(), //验证构建结果
 					new TaskEncryption(), //加密资源文件
-					new TaskUpdateBuildInfo(), //更新构建信息
-					new TaskCreatePatchManifest(), //创建清单文件
+					new TaskUpdateBundleInfo(), //更新资源包信息
+					new TaskCreateManifest(), //创建清单文件
 					new TaskCreateReport(), //创建报告文件
-					new TaskCreatePatchPackage(), //制作补丁包
+					new TaskCreatePackage(), //制作包裹
 					new TaskCopyBuildinFiles(), //拷贝内置文件
 				};
 			}
@@ -74,10 +68,10 @@ namespace YooAsset.Editor
 					new TaskCopyRawFile(), //拷贝原生文件
 					new TaskVerifyBuildResult_SBP(), //验证构建结果
 					new TaskEncryption(), //加密资源文件
-					new TaskUpdateBuildInfo(), //更新构建信息
-					new TaskCreatePatchManifest(), //创建清单文件
+					new TaskUpdateBundleInfo(), //更新补丁信息
+					new TaskCreateManifest(), //创建清单文件
 					new TaskCreateReport(), //创建报告文件
-					new TaskCreatePatchPackage(), //制作补丁包
+					new TaskCreatePackage(), //制作补丁包
 					new TaskCopyBuildinFiles(), //拷贝内置文件
 				};
 			}
@@ -86,19 +80,23 @@ namespace YooAsset.Editor
 				throw new NotImplementedException();
 			}
 
+			// 初始化日志
+			BuildLogger.InitLogger(buildParameters.EnableLog);
+
 			// 执行构建流程
 			var buildResult = BuildRunner.Run(pipeline, _buildContext);
 			if (buildResult.Success)
 			{
 				buildResult.OutputPackageDirectory = buildParametersContext.GetPackageOutputDirectory();
-				Debug.Log($"{buildParameters.BuildMode} pipeline build succeed !");
+				BuildLogger.Log($"{buildParameters.BuildMode} pipeline build succeed !");
 			}
 			else
 			{
-				Debug.LogWarning($"{buildParameters.BuildMode} pipeline build failed !");
-				Debug.LogError($"Build task failed : {buildResult.FailedTask}");
-				Debug.LogError($"Build task error : {buildResult.FailedInfo}");
+				BuildLogger.Warning($"{buildParameters.BuildMode} pipeline build failed !");
+				BuildLogger.Error($"Build task failed : {buildResult.FailedTask}");
+				BuildLogger.Error($"Build task error : {buildResult.FailedInfo}");
 			}
+
 			return buildResult;
 		}
 	}

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderHelper.cs

@@ -58,14 +58,5 @@ namespace YooAsset.Editor
 				}
 			}
 		}
-
-		/// <summary>
-		/// 获取构建管线的输出目录
-		/// </summary>
-		public static string MakePipelineOutputDirectory(string outputRoot, string buildPackage, BuildTarget buildTarget, EBuildMode buildMode)
-		{
-			string outputDirectory = $"{outputRoot}/{buildPackage}/{buildTarget}/{YooAssetSettings.OutputFolderName}";
-			return outputDirectory;
-		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSettingData.cs

@@ -29,7 +29,7 @@ namespace YooAsset.Editor
 		/// </summary>
 		private static void LoadSettingData()
 		{
-			_setting = EditorHelper.LoadSettingData<AssetBundleBuilderSetting>();
+			_setting = SettingLoader.LoadSettingData<AssetBundleBuilderSetting>();
 		}
 
 		/// <summary>

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs

@@ -14,7 +14,7 @@ namespace YooAsset.Editor
 		[MenuItem("YooAsset/AssetBundle Builder", false, 102)]
 		public static void ShowExample()
 		{
-			AssetBundleBuilderWindow window = GetWindow<AssetBundleBuilderWindow>("资源包构建工具", true, EditorDefine.DockedWindowTypes);
+			AssetBundleBuilderWindow window = GetWindow<AssetBundleBuilderWindow>("资源包构建工具", true, WindowsDefine.DockedWindowTypes);
 			window.minSize = new Vector2(800, 600);
 		}
 
@@ -42,7 +42,7 @@ namespace YooAsset.Editor
 				VisualElement root = this.rootVisualElement;
 
 				// 加载布局文件
-				var visualAsset = EditorHelper.LoadWindowUXML<AssetBundleBuilderWindow>();
+				var visualAsset = UxmlLoader.LoadWindowUXML<AssetBundleBuilderWindow>();
 				if (visualAsset == null)
 					return;
 

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleSimulateBuilder.cs

@@ -18,6 +18,7 @@ namespace YooAsset.Editor
 			buildParameters.BuildMode = EBuildMode.SimulateBuild;
 			buildParameters.PackageName = packageName;
 			buildParameters.PackageVersion = "Simulate";
+			buildParameters.EnableLog = false;
 
 			AssetBundleBuilder builder = new AssetBundleBuilder();
 			var buildResult = builder.Run(buildParameters);

Assets/YooAsset/Editor/AssetBundleBuilder/BuildBundleInfo.cs

@@ -8,7 +8,7 @@ namespace YooAsset.Editor
 {
 	public class BuildBundleInfo
 	{
-		public class BuildPatchInfo
+		public class InfoWrapper
 		{
 			/// <summary>
 			/// 构建内容的哈希值
@@ -18,17 +18,17 @@ namespace YooAsset.Editor
 			/// <summary>
 			/// 文件哈希值
 			/// </summary>
-			public string PatchFileHash { set; get; }
+			public string FileHash { set; get; }
 
 			/// <summary>
 			/// 文件哈希值
 			/// </summary>
-			public string PatchFileCRC { set; get; }
+			public string FileCRC { set; get; }
 
 			/// <summary>
 			/// 文件哈希值
 			/// </summary>
-			public long PatchFileSize { set; get; }
+			public long FileSize { set; get; }
 
 
 			/// <summary>
@@ -39,7 +39,7 @@ namespace YooAsset.Editor
 			/// <summary>
 			/// 补丁包输出文件路径
 			/// </summary>
-			public string PatchOutputFilePath { set; get; }
+			public string PackageOutputFilePath { set; get; }
 		}
 
 		/// <summary>
@@ -51,12 +51,12 @@ namespace YooAsset.Editor
 		/// 参与构建的资源列表
 		/// 注意：不包含零依赖资源
 		/// </summary>
-		public readonly List<BuildAssetInfo> BuildinAssets = new List<BuildAssetInfo>();
+		public readonly List<BuildAssetInfo> AllMainAssets = new List<BuildAssetInfo>();
 
 		/// <summary>
 		/// 补丁文件信息
 		/// </summary>
-		public readonly BuildPatchInfo PatchInfo = new BuildPatchInfo();
+		public readonly InfoWrapper BundleInfo = new InfoWrapper();
 
 		/// <summary>
 		/// Bundle文件的加载方法
@@ -76,9 +76,9 @@ namespace YooAsset.Editor
 		{
 			get
 			{
-				foreach (var asset in BuildinAssets)
+				foreach (var assetInfo in AllMainAssets)
 				{
-					if (asset.IsRawAsset)
+					if (assetInfo.IsRawAsset)
 						return true;
 				}
 				return false;
@@ -113,7 +113,7 @@ namespace YooAsset.Editor
 			if (IsContainsAsset(assetInfo.AssetPath))
 				throw new System.Exception($"Asset is existed : {assetInfo.AssetPath}");
 
-			BuildinAssets.Add(assetInfo);
+			AllMainAssets.Add(assetInfo);
 		}
 
 		/// <summary>
@@ -121,7 +121,7 @@ namespace YooAsset.Editor
 		/// </summary>
 		public bool IsContainsAsset(string assetPath)
 		{
-			foreach (var assetInfo in BuildinAssets)
+			foreach (var assetInfo in AllMainAssets)
 			{
 				if (assetInfo.AssetPath == assetPath)
 				{
@@ -136,8 +136,8 @@ namespace YooAsset.Editor
 		/// </summary>
 		public string[] GetBundleTags()
 		{
-			List<string> result = new List<string>(BuildinAssets.Count);
-			foreach (var assetInfo in BuildinAssets)
+			List<string> result = new List<string>(AllMainAssets.Count);
+			foreach (var assetInfo in AllMainAssets)
 			{
 				foreach (var assetTag in assetInfo.BundleTags)
 				{
@@ -148,20 +148,43 @@ namespace YooAsset.Editor
 			return result.ToArray();
 		}
 
+		/// <summary>
+		/// 获取该资源包内的所有资源（包括零依赖资源）
+		/// </summary>
+		public List<string> GetAllBuiltinAssetPaths()
+		{
+			var packAssets = GetAllMainAssetPaths();
+			List<string> result = new List<string>(packAssets);
+			foreach (var assetInfo in AllMainAssets)
+			{
+				if (assetInfo.AllDependAssetInfos == null)
+					continue;
+				foreach (var dependAssetInfo in assetInfo.AllDependAssetInfos)
+				{
+					if (dependAssetInfo.HasBundleName() == false)
+					{
+						if (result.Contains(dependAssetInfo.AssetPath) == false)
+							result.Add(dependAssetInfo.AssetPath);
+					}
+				}
+			}
+			return result;
+		}
+
 		/// <summary>
 		/// 获取构建的资源路径列表
 		/// </summary>
-		public string[] GetBuildinAssetPaths()
+		public string[] GetAllMainAssetPaths()
 		{
-			return BuildinAssets.Select(t => t.AssetPath).ToArray();
+			return AllMainAssets.Select(t => t.AssetPath).ToArray();
 		}
 
 		/// <summary>
 		/// 获取所有写入补丁清单的资源
 		/// </summary>
-		public BuildAssetInfo[] GetAllPatchAssetInfos()
+		public BuildAssetInfo[] GetAllMainAssetInfos()
 		{
-			return BuildinAssets.Where(t => t.CollectorType == ECollectorType.MainAssetCollector).ToArray();
+			return AllMainAssets.Where(t => t.CollectorType == ECollectorType.MainAssetCollector).ToArray();
 		}
 
 		/// <summary>
@@ -173,24 +196,24 @@ namespace YooAsset.Editor
 			AssetBundleBuild build = new AssetBundleBuild();
 			build.assetBundleName = BundleName;
 			build.assetBundleVariant = string.Empty;
-			build.assetNames = GetBuildinAssetPaths();
+			build.assetNames = GetAllMainAssetPaths();
 			return build;
 		}
 
 		/// <summary>
-		/// 创建PatchBundle类
+		/// 创建PackageBundle类
 		/// </summary>
-		internal PatchBundle CreatePatchBundle()
+		internal PackageBundle CreatePackageBundle()
 		{
-			PatchBundle patchBundle = new PatchBundle();
-			patchBundle.BundleName = BundleName;
-			patchBundle.FileHash = PatchInfo.PatchFileHash;
-			patchBundle.FileCRC = PatchInfo.PatchFileCRC;
-			patchBundle.FileSize = PatchInfo.PatchFileSize;
-			patchBundle.IsRawFile = IsRawFile;
-			patchBundle.LoadMethod = (byte)LoadMethod;
-			patchBundle.Tags = GetBundleTags();
-			return patchBundle;
+			PackageBundle packageBundle = new PackageBundle();
+			packageBundle.BundleName = BundleName;
+			packageBundle.FileHash = BundleInfo.FileHash;
+			packageBundle.FileCRC = BundleInfo.FileCRC;
+			packageBundle.FileSize = BundleInfo.FileSize;
+			packageBundle.IsRawFile = IsRawFile;
+			packageBundle.LoadMethod = (byte)LoadMethod;
+			packageBundle.Tags = GetBundleTags();
+			return packageBundle;
 		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildMapContext.cs

@@ -8,6 +8,8 @@ namespace YooAsset.Editor
 {
 	public class BuildMapContext : IContextObject
 	{
+		private readonly Dictionary<string, BuildBundleInfo> _bundleInfoDic = new Dictionary<string, BuildBundleInfo>(10000);
+
 		/// <summary>
 		/// 参与构建的资源总数
 		/// 说明：包括主动收集的资源以及其依赖的所有资源
@@ -30,9 +32,15 @@ namespace YooAsset.Editor
 		public string ShadersBundleName;
 
 		/// <summary>
-		/// 资源包列表
+		/// 资源包信息列表
 		/// </summary>
-		public readonly List<BuildBundleInfo> BundleInfos = new List<BuildBundleInfo>(1000);
+		public Dictionary<string, BuildBundleInfo>.ValueCollection Collection
+		{
+			get
+			{
+				return _bundleInfoDic.Values;
+			}
+		}
 
 
 		/// <summary>
@@ -44,7 +52,7 @@ namespace YooAsset.Editor
 			if (string.IsNullOrEmpty(bundleName))
 				throw new Exception("Should never get here !");
 
-			if (TryGetBundleInfo(bundleName, out BuildBundleInfo bundleInfo))
+			if (_bundleInfoDic.TryGetValue(bundleName, out BuildBundleInfo bundleInfo))
 			{
 				bundleInfo.PackAsset(assetInfo);
 			}
@@ -52,33 +60,28 @@ namespace YooAsset.Editor
 			{
 				BuildBundleInfo newBundleInfo = new BuildBundleInfo(bundleName);
 				newBundleInfo.PackAsset(assetInfo);
-				BundleInfos.Add(newBundleInfo);
+				_bundleInfoDic.Add(bundleName, newBundleInfo);
 			}
 		}
 
 		/// <summary>
-		/// 获取所有的打包资源
+		/// 是否包含资源包
 		/// </summary>
-		public List<BuildAssetInfo> GetAllAssets()
+		public bool IsContainsBundle(string bundleName)
 		{
-			List<BuildAssetInfo> result = new List<BuildAssetInfo>(BundleInfos.Count);
-			foreach (var bundleInfo in BundleInfos)
-			{
-				result.AddRange(bundleInfo.BuildinAssets);
-			}
-			return result;
+			return _bundleInfoDic.ContainsKey(bundleName);
 		}
 
 		/// <summary>
-		/// 获取AssetBundle内构建的资源路径列表
+		/// 获取资源包信息，如果没找到返回NULL
 		/// </summary>
-		public string[] GetBuildinAssetPaths(string bundleName)
+		public BuildBundleInfo GetBundleInfo(string bundleName)
 		{
-			if (TryGetBundleInfo(bundleName, out BuildBundleInfo bundleInfo))
+			if (_bundleInfoDic.TryGetValue(bundleName, out BuildBundleInfo result))
 			{
-				return bundleInfo.GetBuildinAssetPaths();
+				return result;
 			}
-			throw new Exception($"Not found {nameof(BuildBundleInfo)} : {bundleName}");
+			throw new Exception($"Not found bundle : {bundleName}");
 		}
 
 		/// <summary>
@@ -86,8 +89,8 @@ namespace YooAsset.Editor
 		/// </summary>
 		public UnityEditor.AssetBundleBuild[] GetPipelineBuilds()
 		{
-			List<UnityEditor.AssetBundleBuild> builds = new List<UnityEditor.AssetBundleBuild>(BundleInfos.Count);
-			foreach (var bundleInfo in BundleInfos)
+			List<UnityEditor.AssetBundleBuild> builds = new List<UnityEditor.AssetBundleBuild>(_bundleInfoDic.Count);
+			foreach (var bundleInfo in _bundleInfoDic.Values)
 			{
 				if (bundleInfo.IsRawFile == false)
 					builds.Add(bundleInfo.CreatePipelineBuild());
@@ -96,25 +99,15 @@ namespace YooAsset.Editor
 		}
 
 		/// <summary>
-		/// 是否包含资源包
+		/// 创建着色器信息类
 		/// </summary>
-		public bool IsContainsBundle(string bundleName)
+		public void CreateShadersBundleInfo(string shadersBundleName)
 		{
-			return TryGetBundleInfo(bundleName, out BuildBundleInfo bundleInfo);
-		}
-
-		public bool TryGetBundleInfo(string bundleName, out BuildBundleInfo result)
-		{
-			foreach (var bundleInfo in BundleInfos)
+			if (IsContainsBundle(shadersBundleName) == false)
 			{
-				if (bundleInfo.BundleName == bundleName)
-				{
-					result = bundleInfo;
-					return true;
-				}
+				var shaderBundleInfo = new BuildBundleInfo(shadersBundleName);
+				_bundleInfoDic.Add(shadersBundleName, shaderBundleInfo);
 			}
-			result = null;
-			return false;
 		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildMapCreater.cs

@@ -1,145 +0,0 @@
-using System;
-using System.Linq;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace YooAsset.Editor
-{
-	public static class BuildMapCreater
-	{
-		/// <summary>
-		/// 执行资源构建上下文
-		/// </summary>
-		public static BuildMapContext CreateBuildMap(EBuildMode buildMode, string packageName)
-		{	
-			Dictionary<string, BuildAssetInfo> buildAssetDic = new Dictionary<string, BuildAssetInfo>(1000);
-
-			// 1. 检测配置合法性
-			AssetBundleCollectorSettingData.Setting.CheckConfigError();
-
-			// 2. 获取所有收集器收集的资源
-			var buildResult = AssetBundleCollectorSettingData.Setting.GetPackageAssets(buildMode, packageName);
-			List<CollectAssetInfo> allCollectAssets = buildResult.CollectAssets;
-
-			// 3. 剔除未被引用的依赖项资源
-			List<CollectAssetInfo> removeDependList = new List<CollectAssetInfo>();
-			foreach (var collectAssetInfo in allCollectAssets)
-			{
-				if (collectAssetInfo.CollectorType == ECollectorType.DependAssetCollector)
-				{
-					if (IsRemoveDependAsset(allCollectAssets, collectAssetInfo.AssetPath))
-						removeDependList.Add(collectAssetInfo);
-				}
-			}
-			foreach (var removeValue in removeDependList)
-			{
-				allCollectAssets.Remove(removeValue);
-			}
-
-			// 4. 录入所有收集器收集的资源
-			foreach (var collectAssetInfo in allCollectAssets)
-			{
-				if (buildAssetDic.ContainsKey(collectAssetInfo.AssetPath) == false)
-				{
-					var buildAssetInfo = new BuildAssetInfo(
-						collectAssetInfo.CollectorType, collectAssetInfo.BundleName,
-						collectAssetInfo.Address, collectAssetInfo.AssetPath, collectAssetInfo.IsRawAsset);
-					buildAssetInfo.AddAssetTags(collectAssetInfo.AssetTags);
-					buildAssetInfo.AddBundleTags(collectAssetInfo.AssetTags);
-					buildAssetDic.Add(collectAssetInfo.AssetPath, buildAssetInfo);
-				}
-				else
-				{
-					throw new Exception($"Should never get here !");
-				}
-			}
-
-			// 5. 录入所有收集资源的依赖资源
-			foreach (var collectAssetInfo in allCollectAssets)
-			{
-				string collectAssetBundleName = collectAssetInfo.BundleName;
-				foreach (var dependAssetPath in collectAssetInfo.DependAssets)
-				{
-					if (buildAssetDic.ContainsKey(dependAssetPath))
-					{
-						buildAssetDic[dependAssetPath].AddBundleTags(collectAssetInfo.AssetTags);
-						buildAssetDic[dependAssetPath].AddReferenceBundleName(collectAssetBundleName);
-					}
-					else
-					{
-						var buildAssetInfo = new BuildAssetInfo(dependAssetPath);
-						buildAssetInfo.AddBundleTags(collectAssetInfo.AssetTags);
-						buildAssetInfo.AddReferenceBundleName(collectAssetBundleName);
-						buildAssetDic.Add(dependAssetPath, buildAssetInfo);
-					}
-				}
-			}
-
-			// 6. 填充所有收集资源的依赖列表
-			foreach (var collectAssetInfo in allCollectAssets)
-			{
-				var dependAssetInfos = new List<BuildAssetInfo>(collectAssetInfo.DependAssets.Count);
-				foreach (var dependAssetPath in collectAssetInfo.DependAssets)
-				{
-					if (buildAssetDic.TryGetValue(dependAssetPath, out BuildAssetInfo value))
-						dependAssetInfos.Add(value);
-					else
-						throw new Exception("Should never get here !");
-				}
-				buildAssetDic[collectAssetInfo.AssetPath].SetAllDependAssetInfos(dependAssetInfos);
-			}
-
-			// 7. 记录关键信息
-			BuildMapContext context = new BuildMapContext();
-			context.AssetFileCount = buildAssetDic.Count;
-			context.EnableAddressable = buildResult.Command.EnableAddressable;
-			context.UniqueBundleName = buildResult.Command.UniqueBundleName;
-			context.ShadersBundleName = buildResult.ShadersBundleName;
-
-			// 8. 计算共享的资源包名
-			var command = buildResult.Command;
-			foreach (KeyValuePair<string, BuildAssetInfo> pair in buildAssetDic)
-			{
-				pair.Value.CalculateShareBundleName(command.UniqueBundleName, command.PackageName, buildResult.ShadersBundleName);
-			}
-
-			// 9. 移除不参与构建的资源
-			List<BuildAssetInfo> removeBuildList = new List<BuildAssetInfo>();
-			foreach (KeyValuePair<string, BuildAssetInfo> pair in buildAssetDic)
-			{
-				var buildAssetInfo = pair.Value;
-				if (buildAssetInfo.HasBundleName() == false)
-					removeBuildList.Add(buildAssetInfo);
-			}
-			foreach (var removeValue in removeBuildList)
-			{
-				buildAssetDic.Remove(removeValue.AssetPath);
-			}
-
-			// 10. 构建资源包
-			var allBuildinAssets = buildAssetDic.Values.ToList();
-			if (allBuildinAssets.Count == 0)
-				throw new Exception("构建的资源列表不能为空");
-			foreach (var assetInfo in allBuildinAssets)
-			{
-				context.PackAsset(assetInfo);
-			}
-			return context;
-		}
-		private static bool IsRemoveDependAsset(List<CollectAssetInfo> allCollectAssets, string dependAssetPath)
-		{
-			foreach (var collectAssetInfo in allCollectAssets)
-			{
-				var collectorType = collectAssetInfo.CollectorType;
-				if (collectorType == ECollectorType.MainAssetCollector || collectorType == ECollectorType.StaticAssetCollector)
-				{
-					if (collectAssetInfo.DependAssets.Contains(dependAssetPath))
-						return false;
-				}
-			}
-
-			BuildLogger.Log($"发现未被依赖的资源并自动移除 : {dependAssetPath}");
-			return true;
-		}
-	}
-}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs

@@ -67,6 +67,11 @@ namespace YooAsset.Editor
 		public string PackageVersion;
 
 
+		/// <summary>
+		/// 是否显示普通日志
+		/// </summary>
+		public bool EnableLog = true;
+		
 		/// <summary>
 		/// 验证构建结果
 		/// </summary>

Assets/YooAsset/Editor/AssetBundleBuilder/BuildParametersContext.cs

@@ -29,7 +29,7 @@ namespace YooAsset.Editor
 		{
 			if (string.IsNullOrEmpty(_pipelineOutputDirectory))
 			{
-				_pipelineOutputDirectory = AssetBundleBuilderHelper.MakePipelineOutputDirectory(Parameters.OutputRoot, Parameters.PackageName, Parameters.BuildTarget, Parameters.BuildMode);
+				_pipelineOutputDirectory = $"{Parameters.OutputRoot}/{Parameters.BuildTarget}/{Parameters.PackageName}/{YooAssetSettings.OutputFolderName}";
 			}
 			return _pipelineOutputDirectory;
 		}
@@ -41,7 +41,7 @@ namespace YooAsset.Editor
 		{
 			if (string.IsNullOrEmpty(_packageOutputDirectory))
 			{
-				_packageOutputDirectory = $"{Parameters.OutputRoot}/{Parameters.PackageName}/{Parameters.BuildTarget}/{Parameters.PackageVersion}";
+				_packageOutputDirectory = $"{Parameters.OutputRoot}/{Parameters.BuildTarget}/{Parameters.PackageName}/{Parameters.PackageVersion}";
 			}
 			return _packageOutputDirectory;
 		}

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

@@ -53,6 +53,11 @@ namespace YooAsset.Editor
 		/// </summary>
 		public int[] ReferenceIDs;
 
+		/// <summary>
+		/// 该资源包内包含的所有资源
+		/// </summary>
+		public List<string> AllBuiltinAssets = new List<string>();
+
 		/// <summary>
 		/// 获取资源分类标签的字符串
 		/// </summary>

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

@@ -1,30 +1,33 @@
-
+using System;
+using System.IO;
+using System.Collections.Generic;
+using UnityEngine;
+
 namespace YooAsset.Editor
 {
 	public static class BuildLogger
 	{
-		/// <summary>
-		/// 是否启用LOG
-		/// </summary>
-		public static bool EnableLog = true;
+		private static bool _enableLog = true;
 
-		/// <summary>
-		/// 日志输出
-		/// </summary>
-		public static void Log(string info)
+		public static void InitLogger(bool enableLog)
 		{
-			if (EnableLog)
-			{
-				UnityEngine.Debug.Log(info);
-			}
+			_enableLog = enableLog;
 		}
 
-		/// <summary>
-		/// 日志输出
-		/// </summary>
-		public static void Info(string info)
+		public static void Log(string message)
 		{
-			UnityEngine.Debug.Log(info);
+			if (_enableLog)
+			{
+				Debug.Log(message);
+			}
+		}
+		public static void Warning(string message)
+		{
+			Debug.LogWarning(message);
+		}
+		public static void Error(string message)
+		{
+			Debug.LogError(message);
 		}
 	}
 }

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

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

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

@@ -40,6 +40,15 @@ namespace YooAsset.Editor
 				throw new Exception($"构建过程中发生错误 : {exitCode}");
 			}
 
+			// 创建着色器信息
+			// 说明：解决因为着色器资源包导致验证失败。
+			// 例如：当项目里没有着色器，如果有依赖内置着色器就会验证失败。
+			string shadersBundleName = buildMapContext.ShadersBundleName;
+			if (buildResults.BundleInfos.ContainsKey(shadersBundleName))
+			{
+				buildMapContext.CreateShadersBundleInfo(shadersBundleName);
+			}
+
 			BuildLogger.Log("Unity引擎打包成功！");
 			BuildResultContext buildResultContext = new BuildResultContext();
 			buildResultContext.Results = buildResults;

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

@@ -12,13 +12,13 @@ namespace YooAsset.Editor
 		void IBuildTask.Run(BuildContext context)
 		{
 			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-			var patchManifestContext = context.GetContextObject<PatchManifestContext>();
+			var manifestContext = context.GetContextObject<ManifestContext>();
 			var buildMode = buildParametersContext.Parameters.BuildMode;
 			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
 			{
 				if (buildParametersContext.Parameters.CopyBuildinFileOption != ECopyBuildinFileOption.None)
 				{
-					CopyBuildinFilesToStreaming(buildParametersContext, patchManifestContext);
+					CopyBuildinFilesToStreaming(buildParametersContext, manifestContext);
 				}
 			}
 		}
@@ -26,7 +26,7 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 拷贝首包资源文件
 		/// </summary>
-		private void CopyBuildinFilesToStreaming(BuildParametersContext buildParametersContext, PatchManifestContext patchManifestContext)
+		private void CopyBuildinFilesToStreaming(BuildParametersContext buildParametersContext, ManifestContext manifestContext)
 		{
 			ECopyBuildinFileOption option = buildParametersContext.Parameters.CopyBuildinFileOption;
 			string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
@@ -35,7 +35,7 @@ namespace YooAsset.Editor
 			string buildPackageVersion = buildParametersContext.Parameters.PackageVersion;
 
 			// 加载补丁清单
-			PatchManifest patchManifest = patchManifestContext.Manifest;
+			PackageManifest manifest = manifestContext.Manifest;
 
 			// 清空流目录
 			if (option == ECopyBuildinFileOption.ClearAndCopyAll || option == ECopyBuildinFileOption.ClearAndCopyByTags)
@@ -70,10 +70,10 @@ namespace YooAsset.Editor
 			// 拷贝文件列表（所有文件）
 			if (option == ECopyBuildinFileOption.ClearAndCopyAll || option == ECopyBuildinFileOption.OnlyCopyAll)
 			{		
-				foreach (var patchBundle in patchManifest.BundleList)
+				foreach (var packageBundle in manifest.BundleList)
 				{
-					string sourcePath = $"{packageOutputDirectory}/{patchBundle.FileName}";
-					string destPath = $"{streamingAssetsDirectory}/{patchBundle.FileName}";
+					string sourcePath = $"{packageOutputDirectory}/{packageBundle.FileName}";
+					string destPath = $"{streamingAssetsDirectory}/{packageBundle.FileName}";
 					EditorTools.CopyFile(sourcePath, destPath, true);
 				}
 			}
@@ -82,12 +82,12 @@ namespace YooAsset.Editor
 			if (option == ECopyBuildinFileOption.ClearAndCopyByTags || option == ECopyBuildinFileOption.OnlyCopyByTags)
 			{
 				string[] tags = buildParametersContext.Parameters.CopyBuildinFileTags.Split(';');
-				foreach (var patchBundle in patchManifest.BundleList)
+				foreach (var packageBundle in manifest.BundleList)
 				{
-					if (patchBundle.HasTag(tags) == false)
+					if (packageBundle.HasTag(tags) == false)
 						continue;
-					string sourcePath = $"{packageOutputDirectory}/{patchBundle.FileName}";
-					string destPath = $"{streamingAssetsDirectory}/{patchBundle.FileName}";
+					string sourcePath = $"{packageOutputDirectory}/{packageBundle.FileName}";
+					string destPath = $"{streamingAssetsDirectory}/{packageBundle.FileName}";
 					EditorTools.CopyFile(sourcePath, destPath, true);
 				}
 			}

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

@@ -27,15 +27,15 @@ namespace YooAsset.Editor
 		private void CopyRawBundle(BuildMapContext buildMapContext, BuildParametersContext buildParametersContext)
 		{
 			string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
-			foreach (var bundleInfo in buildMapContext.BundleInfos)
+			foreach (var bundleInfo in buildMapContext.Collection)
 			{
 				if (bundleInfo.IsRawFile)
 				{
 					string dest = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}";
-					foreach (var buildAsset in bundleInfo.BuildinAssets)
+					foreach (var assetInfo in bundleInfo.AllMainAssets)
 					{
-						if (buildAsset.IsRawAsset)
-							EditorTools.CopyFile(buildAsset.AssetPath, dest, true);
+						if (assetInfo.IsRawAsset)
+							EditorTools.CopyFile(assetInfo.AssetPath, dest, true);
 					}
 				}
 			}

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

@@ -8,23 +8,23 @@ using UnityEditor.Build.Pipeline.Interfaces;
 
 namespace YooAsset.Editor
 {
-	public class PatchManifestContext : IContextObject
+	public class ManifestContext : IContextObject
 	{
-		internal PatchManifest Manifest;
+		internal PackageManifest Manifest;
 	}
 
-	[TaskAttribute("创建补丁清单文件")]
-	public class TaskCreatePatchManifest : IBuildTask
+	[TaskAttribute("创建清单文件")]
+	public class TaskCreateManifest : IBuildTask
 	{
 		void IBuildTask.Run(BuildContext context)
 		{
-			CreatePatchManifestFile(context);
+			CreateManifestFile(context);
 		}
 
 		/// <summary>
 		/// 创建补丁清单文件到输出目录
 		/// </summary>
-		private void CreatePatchManifestFile(BuildContext context)
+		private void CreateManifestFile(BuildContext context)
 		{
 			var buildMapContext = context.GetContextObject<BuildMapContext>();
 			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
@@ -32,14 +32,14 @@ namespace YooAsset.Editor
 			string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
 
 			// 创建新补丁清单
-			PatchManifest patchManifest = new PatchManifest();
-			patchManifest.FileVersion = YooAssetSettings.PatchManifestFileVersion;
-			patchManifest.EnableAddressable = buildMapContext.EnableAddressable;
-			patchManifest.OutputNameStyle = (int)buildParameters.OutputNameStyle;
-			patchManifest.PackageName = buildParameters.PackageName;
-			patchManifest.PackageVersion = buildParameters.PackageVersion;
-			patchManifest.BundleList = GetAllPatchBundle(context);
-			patchManifest.AssetList = GetAllPatchAsset(context, patchManifest);
+			PackageManifest manifest = new PackageManifest();
+			manifest.FileVersion = YooAssetSettings.ManifestFileVersion;
+			manifest.EnableAddressable = buildMapContext.EnableAddressable;
+			manifest.OutputNameStyle = (int)buildParameters.OutputNameStyle;
+			manifest.PackageName = buildParameters.PackageName;
+			manifest.PackageVersion = buildParameters.PackageVersion;
+			manifest.BundleList = GetAllPackageBundle(context);
+			manifest.AssetList = GetAllPackageAsset(context, manifest);
 
 			// 更新Unity内置资源包的引用关系
 			if (buildParameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
@@ -47,7 +47,7 @@ namespace YooAsset.Editor
 				if (buildParameters.BuildMode == EBuildMode.IncrementalBuild)
 				{
 					var buildResultContext = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
-					UpdateBuiltInBundleReference(patchManifest, buildResultContext, buildMapContext.ShadersBundleName);
+					UpdateBuiltInBundleReference(manifest, buildResultContext, buildMapContext.ShadersBundleName);
 				}
 			}
 
@@ -57,7 +57,7 @@ namespace YooAsset.Editor
 				if (buildParameters.BuildMode == EBuildMode.IncrementalBuild)
 				{
 					var buildResultContext = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
-					UpdateScriptPipelineReference(patchManifest, buildResultContext);
+					UpdateScriptPipelineReference(manifest, buildResultContext);
 				}
 			}
 
@@ -67,7 +67,7 @@ namespace YooAsset.Editor
 				if (buildParameters.BuildMode != EBuildMode.SimulateBuild)
 				{
 					var buildResultContext = context.GetContextObject<TaskBuilding.BuildResultContext>();
-					UpdateBuiltinPipelineReference(patchManifest, buildResultContext);
+					UpdateBuiltinPipelineReference(manifest, buildResultContext);
 				}
 			}
 
@@ -75,7 +75,7 @@ namespace YooAsset.Editor
 			{
 				string fileName = YooAssetSettingsData.GetManifestJsonFileName(buildParameters.PackageName, buildParameters.PackageVersion);
 				string filePath = $"{packageOutputDirectory}/{fileName}";
-				PatchManifestTools.SerializeToJson(filePath, patchManifest);
+				ManifestTools.SerializeToJson(filePath, manifest);
 				BuildLogger.Log($"创建补丁清单文件：{filePath}");
 			}
 
@@ -84,14 +84,14 @@ namespace YooAsset.Editor
 			{
 				string fileName = YooAssetSettingsData.GetManifestBinaryFileName(buildParameters.PackageName, buildParameters.PackageVersion);
 				string filePath = $"{packageOutputDirectory}/{fileName}";
-				PatchManifestTools.SerializeToBinary(filePath, patchManifest);
+				ManifestTools.SerializeToBinary(filePath, manifest);
 				packageHash = HashUtility.FileMD5(filePath);
 				BuildLogger.Log($"创建补丁清单文件：{filePath}");
 
-				PatchManifestContext patchManifestContext = new PatchManifestContext();
+				ManifestContext manifestContext = new ManifestContext();
 				byte[] bytesData = FileUtility.ReadAllBytes(filePath);
-				patchManifestContext.Manifest = PatchManifestTools.DeserializeFromBinary(bytesData);
-				context.SetContextObject(patchManifestContext);
+				manifestContext.Manifest = ManifestTools.DeserializeFromBinary(bytesData);
+				context.SetContextObject(manifestContext);
 			}
 
 			// 创建补丁清单哈希文件
@@ -114,15 +114,15 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 获取资源包列表
 		/// </summary>
-		private List<PatchBundle> GetAllPatchBundle(BuildContext context)
+		private List<PackageBundle> GetAllPackageBundle(BuildContext context)
 		{
 			var buildMapContext = context.GetContextObject<BuildMapContext>();
 
-			List<PatchBundle> result = new List<PatchBundle>(1000);
-			foreach (var bundleInfo in buildMapContext.BundleInfos)
+			List<PackageBundle> result = new List<PackageBundle>(1000);
+			foreach (var bundleInfo in buildMapContext.Collection)
 			{
-				var patchBundle = bundleInfo.CreatePatchBundle();
-				result.Add(patchBundle);
+				var packageBundle = bundleInfo.CreatePackageBundle();
+				result.Add(packageBundle);
 			}
 			return result;
 		}
@@ -130,38 +130,38 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 获取资源列表
 		/// </summary>
-		private List<PatchAsset> GetAllPatchAsset(BuildContext context, PatchManifest patchManifest)
+		private List<PackageAsset> GetAllPackageAsset(BuildContext context, PackageManifest manifest)
 		{
 			var buildMapContext = context.GetContextObject<BuildMapContext>();
 
-			List<PatchAsset> result = new List<PatchAsset>(1000);
-			foreach (var bundleInfo in buildMapContext.BundleInfos)
+			List<PackageAsset> result = new List<PackageAsset>(1000);
+			foreach (var bundleInfo in buildMapContext.Collection)
 			{
-				var assetInfos = bundleInfo.GetAllPatchAssetInfos();
+				var assetInfos = bundleInfo.GetAllMainAssetInfos();
 				foreach (var assetInfo in assetInfos)
 				{
-					PatchAsset patchAsset = new PatchAsset();
+					PackageAsset packageAsset = new PackageAsset();
 					if (buildMapContext.EnableAddressable)
-						patchAsset.Address = assetInfo.Address;
+						packageAsset.Address = assetInfo.Address;
 					else
-						patchAsset.Address = string.Empty;
-					patchAsset.AssetPath = assetInfo.AssetPath;
-					patchAsset.AssetTags = assetInfo.AssetTags.ToArray();
-					patchAsset.BundleID = GetAssetBundleID(assetInfo.BundleName, patchManifest);
-					patchAsset.DependIDs = GetAssetBundleDependIDs(patchAsset.BundleID, assetInfo, patchManifest);
-					result.Add(patchAsset);
+						packageAsset.Address = string.Empty;
+					packageAsset.AssetPath = assetInfo.AssetPath;
+					packageAsset.AssetTags = assetInfo.AssetTags.ToArray();
+					packageAsset.BundleID = GetAssetBundleID(assetInfo.BundleName, manifest);
+					packageAsset.DependIDs = GetAssetBundleDependIDs(packageAsset.BundleID, assetInfo, manifest);
+					result.Add(packageAsset);
 				}
 			}
 			return result;
 		}
-		private int[] GetAssetBundleDependIDs(int mainBundleID, BuildAssetInfo assetInfo, PatchManifest patchManifest)
+		private int[] GetAssetBundleDependIDs(int mainBundleID, BuildAssetInfo assetInfo, PackageManifest manifest)
 		{
 			List<int> result = new List<int>();
 			foreach (var dependAssetInfo in assetInfo.AllDependAssetInfos)
 			{
 				if (dependAssetInfo.HasBundleName())
 				{
-					int bundleID = GetAssetBundleID(dependAssetInfo.BundleName, patchManifest);
+					int bundleID = GetAssetBundleID(dependAssetInfo.BundleName, manifest);
 					if (mainBundleID != bundleID)
 					{
 						if (result.Contains(bundleID) == false)
@@ -171,11 +171,11 @@ namespace YooAsset.Editor
 			}
 			return result.ToArray();
 		}
-		private int GetAssetBundleID(string bundleName, PatchManifest patchManifest)
+		private int GetAssetBundleID(string bundleName, PackageManifest manifest)
 		{
-			for (int index = 0; index < patchManifest.BundleList.Count; index++)
+			for (int index = 0; index < manifest.BundleList.Count; index++)
 			{
-				if (patchManifest.BundleList[index].BundleName == bundleName)
+				if (manifest.BundleList[index].BundleName == bundleName)
 					return index;
 			}
 			throw new Exception($"Not found bundle name : {bundleName}");
@@ -184,7 +184,7 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 更新Unity内置资源包的引用关系
 		/// </summary>
-		private void UpdateBuiltInBundleReference(PatchManifest patchManifest, TaskBuilding_SBP.BuildResultContext buildResultContext, string shadersBunldeName)
+		private void UpdateBuiltInBundleReference(PackageManifest manifest, TaskBuilding_SBP.BuildResultContext buildResultContext, string shadersBunldeName)
 		{
 			// 获取所有依赖着色器资源包的资源包列表
 			List<string> shaderBundleReferenceList = new List<string>();
@@ -199,33 +199,33 @@ namespace YooAsset.Editor
 				return;
 
 			// 获取着色器资源包索引
-			Predicate<PatchBundle> predicate = new Predicate<PatchBundle>(s => s.BundleName == shadersBunldeName);
-			int shaderBundleId = patchManifest.BundleList.FindIndex(predicate);
+			Predicate<PackageBundle> predicate = new Predicate<PackageBundle>(s => s.BundleName == shadersBunldeName);
+			int shaderBundleId = manifest.BundleList.FindIndex(predicate);
 			if (shaderBundleId == -1)
 				throw new Exception("没有发现着色器资源包！");
 
 			// 检测依赖交集并更新依赖ID
-			foreach (var patchAsset in patchManifest.AssetList)
+			foreach (var packageAsset in manifest.AssetList)
 			{
-				List<string> dependBundles = GetPatchAssetAllDependBundles(patchManifest, patchAsset);
+				List<string> dependBundles = GetPackageAssetAllDependBundles(manifest, packageAsset);
 				List<string> conflictAssetPathList = dependBundles.Intersect(shaderBundleReferenceList).ToList();
 				if (conflictAssetPathList.Count > 0)
 				{
-					List<int> newDependIDs = new List<int>(patchAsset.DependIDs);
+					List<int> newDependIDs = new List<int>(packageAsset.DependIDs);
 					if (newDependIDs.Contains(shaderBundleId) == false)
 						newDependIDs.Add(shaderBundleId);
-					patchAsset.DependIDs = newDependIDs.ToArray();
+					packageAsset.DependIDs = newDependIDs.ToArray();
 				}
 			}
 		}
-		private List<string> GetPatchAssetAllDependBundles(PatchManifest patchManifest, PatchAsset patchAsset)
+		private List<string> GetPackageAssetAllDependBundles(PackageManifest manifest, PackageAsset packageAsset)
 		{
 			List<string> result = new List<string>();
-			string mainBundle = patchManifest.BundleList[patchAsset.BundleID].BundleName;
+			string mainBundle = manifest.BundleList[packageAsset.BundleID].BundleName;
 			result.Add(mainBundle);
-			foreach (var dependID in patchAsset.DependIDs)
+			foreach (var dependID in packageAsset.DependIDs)
 			{
-				string dependBundle = patchManifest.BundleList[dependID].BundleName;
+				string dependBundle = manifest.BundleList[dependID].BundleName;
 				result.Add(dependBundle);
 			}
 			return result;
@@ -235,18 +235,18 @@ namespace YooAsset.Editor
 		private readonly Dictionary<string, int> _cachedBundleID = new Dictionary<string, int>(10000);
 		private readonly Dictionary<string, string[]> _cachedBundleDepends = new Dictionary<string, string[]>(10000);
 
-		private void UpdateScriptPipelineReference(PatchManifest patchManifest, TaskBuilding_SBP.BuildResultContext buildResultContext)
+		private void UpdateScriptPipelineReference(PackageManifest manifest, TaskBuilding_SBP.BuildResultContext buildResultContext)
 		{
 			int progressValue;
-			int totalCount = patchManifest.BundleList.Count;
+			int totalCount = manifest.BundleList.Count;
 
 			// 缓存资源包ID
 			_cachedBundleID.Clear();
 			progressValue = 0;
-			foreach (var patchBundle in patchManifest.BundleList)
+			foreach (var packageBundle in manifest.BundleList)
 			{
-				int bundleID = GetAssetBundleID(patchBundle.BundleName, patchManifest);
-				_cachedBundleID.Add(patchBundle.BundleName, bundleID);
+				int bundleID = GetAssetBundleID(packageBundle.BundleName, manifest);
+				_cachedBundleID.Add(packageBundle.BundleName, bundleID);
 				EditorTools.DisplayProgressBar("缓存资源包索引", ++progressValue, totalCount);
 			}
 			EditorTools.ClearProgressBar();
@@ -254,40 +254,43 @@ namespace YooAsset.Editor
 			// 缓存资源包依赖
 			_cachedBundleDepends.Clear();
 			progressValue = 0;
-			foreach (var patchBundle in patchManifest.BundleList)
+			foreach (var packageBundle in manifest.BundleList)
 			{
-				if (patchBundle.IsRawFile)
+				if (packageBundle.IsRawFile)
+				{
+					_cachedBundleDepends.Add(packageBundle.BundleName, new string[] { });
 					continue;
+				}
 
-				if (buildResultContext.Results.BundleInfos.ContainsKey(patchBundle.BundleName) == false)
-					throw new Exception($"Not found bundle in SBP build results : {patchBundle.BundleName}");
+				if (buildResultContext.Results.BundleInfos.ContainsKey(packageBundle.BundleName) == false)
+					throw new Exception($"Not found bundle in SBP build results : {packageBundle.BundleName}");
 
-				var depends = buildResultContext.Results.BundleInfos[patchBundle.BundleName].Dependencies;
-				_cachedBundleDepends.Add(patchBundle.BundleName, depends);
+				var depends = buildResultContext.Results.BundleInfos[packageBundle.BundleName].Dependencies;
+				_cachedBundleDepends.Add(packageBundle.BundleName, depends);
 				EditorTools.DisplayProgressBar("缓存资源包依赖列表", ++progressValue, totalCount);
 			}
 			EditorTools.ClearProgressBar();
 
 			// 计算资源包引用列表
-			foreach (var patchBundle in patchManifest.BundleList)
+			foreach (var packageBundle in manifest.BundleList)
 			{
-				patchBundle.ReferenceIDs = GetBundleRefrenceIDs(patchManifest, patchBundle);
+				packageBundle.ReferenceIDs = GetBundleRefrenceIDs(manifest, packageBundle);
 				EditorTools.DisplayProgressBar("计算资源包引用关系", ++progressValue, totalCount);
 			}
 			EditorTools.ClearProgressBar();
 		}
-		private void UpdateBuiltinPipelineReference(PatchManifest patchManifest, TaskBuilding.BuildResultContext buildResultContext)
+		private void UpdateBuiltinPipelineReference(PackageManifest manifest, TaskBuilding.BuildResultContext buildResultContext)
 		{
 			int progressValue;
-			int totalCount = patchManifest.BundleList.Count;
+			int totalCount = manifest.BundleList.Count;
 
 			// 缓存资源包ID
 			_cachedBundleID.Clear();
 			progressValue = 0;
-			foreach (var patchBundle in patchManifest.BundleList)
+			foreach (var packageBundle in manifest.BundleList)
 			{
-				int bundleID = GetAssetBundleID(patchBundle.BundleName, patchManifest);
-				_cachedBundleID.Add(patchBundle.BundleName, bundleID);
+				int bundleID = GetAssetBundleID(packageBundle.BundleName, manifest);
+				_cachedBundleID.Add(packageBundle.BundleName, bundleID);
 				EditorTools.DisplayProgressBar("缓存资源包索引", ++progressValue, totalCount);
 			}
 			EditorTools.ClearProgressBar();
@@ -295,30 +298,36 @@ namespace YooAsset.Editor
 			// 缓存资源包依赖
 			_cachedBundleDepends.Clear();
 			progressValue = 0;
-			foreach (var patchBundle in patchManifest.BundleList)
+			foreach (var packageBundle in manifest.BundleList)
 			{
-				var depends = buildResultContext.UnityManifest.GetDirectDependencies(patchBundle.BundleName);
-				_cachedBundleDepends.Add(patchBundle.BundleName, depends);
+				if (packageBundle.IsRawFile)
+				{
+					_cachedBundleDepends.Add(packageBundle.BundleName, new string[] { } );
+					continue;
+				}
+
+				var depends = buildResultContext.UnityManifest.GetDirectDependencies(packageBundle.BundleName);
+				_cachedBundleDepends.Add(packageBundle.BundleName, depends);
 				EditorTools.DisplayProgressBar("缓存资源包依赖列表", ++progressValue, totalCount);
 			}
 			EditorTools.ClearProgressBar();
 
 			// 计算资源包引用列表
 			progressValue = 0;
-			foreach (var patchBundle in patchManifest.BundleList)
+			foreach (var packageBundle in manifest.BundleList)
 			{
-				patchBundle.ReferenceIDs = GetBundleRefrenceIDs(patchManifest, patchBundle);
+				packageBundle.ReferenceIDs = GetBundleRefrenceIDs(manifest, packageBundle);
 				EditorTools.DisplayProgressBar("计算资源包引用关系", ++progressValue, totalCount);
 			}
 			EditorTools.ClearProgressBar();
 		}
 		
-		private int[] GetBundleRefrenceIDs(PatchManifest patchManifest, PatchBundle targetBundle)
+		private int[] GetBundleRefrenceIDs(PackageManifest manifest, PackageBundle targetBundle)
 		{
 			List<string> referenceList = new List<string>();
-			foreach (var patchBundle in patchManifest.BundleList)
+			foreach (var packageBundle in manifest.BundleList)
 			{
-				string bundleName = patchBundle.BundleName;
+				string bundleName = packageBundle.BundleName;
 				if (bundleName == targetBundle.BundleName)
 					continue;
 

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

@@ -3,8 +3,8 @@ using System.Collections.Generic;
 
 namespace YooAsset.Editor
 {
-	[TaskAttribute("制作补丁包")]
-	public class TaskCreatePatchPackage : IBuildTask
+	[TaskAttribute("制作包裹")]
+	public class TaskCreatePackage : IBuildTask
 	{
 		void IBuildTask.Run(BuildContext context)
 		{
@@ -13,14 +13,14 @@ namespace YooAsset.Editor
 			var buildMode = buildParameters.Parameters.BuildMode;
 			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
 			{
-				CopyPatchFiles(buildParameters, buildMapContext);
+				CopyPackageFiles(buildParameters, buildMapContext);
 			}
 		}
 
 		/// <summary>
 		/// 拷贝补丁文件到补丁包目录
 		/// </summary>
-		private void CopyPatchFiles(BuildParametersContext buildParametersContext, BuildMapContext buildMapContext)
+		private void CopyPackageFiles(BuildParametersContext buildParametersContext, BuildMapContext buildMapContext)
 		{
 			var buildParameters = buildParametersContext.Parameters;
 			string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
@@ -67,11 +67,11 @@ namespace YooAsset.Editor
 
 			// 拷贝所有补丁文件
 			int progressValue = 0;
-			int patchFileTotalCount = buildMapContext.BundleInfos.Count;
-			foreach (var bundleInfo in buildMapContext.BundleInfos)
+			int fileTotalCount = buildMapContext.Collection.Count;
+			foreach (var bundleInfo in buildMapContext.Collection)
 			{
-				EditorTools.CopyFile(bundleInfo.PatchInfo.BuildOutputFilePath, bundleInfo.PatchInfo.PatchOutputFilePath, true);
-				EditorTools.DisplayProgressBar("拷贝补丁文件", ++progressValue, patchFileTotalCount);
+				EditorTools.CopyFile(bundleInfo.BundleInfo.BuildOutputFilePath, bundleInfo.BundleInfo.PackageOutputFilePath, true);
+				EditorTools.DisplayProgressBar("拷贝补丁文件", ++progressValue, fileTotalCount);
 			}
 			EditorTools.ClearProgressBar();
 		}

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

@@ -12,21 +12,21 @@ namespace YooAsset.Editor
 		{
 			var buildParameters = context.GetContextObject<BuildParametersContext>();
 			var buildMapContext = context.GetContextObject<BuildMapContext>();
-			var patchManifestContext = context.GetContextObject<PatchManifestContext>();
+			var manifestContext = context.GetContextObject<ManifestContext>();
 
 			var buildMode = buildParameters.Parameters.BuildMode;
 			if (buildMode != EBuildMode.SimulateBuild)
 			{
-				CreateReportFile(buildParameters, buildMapContext, patchManifestContext);
+				CreateReportFile(buildParameters, buildMapContext, manifestContext);
 			}
 		}
 
-		private void CreateReportFile(BuildParametersContext buildParametersContext, BuildMapContext buildMapContext, PatchManifestContext patchManifestContext)
+		private void CreateReportFile(BuildParametersContext buildParametersContext, BuildMapContext buildMapContext, ManifestContext manifestContext)
 		{
 			var buildParameters = buildParametersContext.Parameters;
 
 			string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
-			PatchManifest patchManifest = patchManifestContext.Manifest;
+			PackageManifest manifest = manifestContext.Manifest;
 			BuildReport buildReport = new BuildReport();
 
 			// 概述信息
@@ -57,46 +57,47 @@ namespace YooAsset.Editor
 
 				// 构建结果
 				buildReport.Summary.AssetFileTotalCount = buildMapContext.AssetFileCount;
-				buildReport.Summary.MainAssetTotalCount = GetMainAssetCount(patchManifest);
-				buildReport.Summary.AllBundleTotalCount = GetAllBundleCount(patchManifest);
-				buildReport.Summary.AllBundleTotalSize = GetAllBundleSize(patchManifest);
-				buildReport.Summary.EncryptedBundleTotalCount = GetEncryptedBundleCount(patchManifest);
-				buildReport.Summary.EncryptedBundleTotalSize = GetEncryptedBundleSize(patchManifest);
-				buildReport.Summary.RawBundleTotalCount = GetRawBundleCount(patchManifest);
-				buildReport.Summary.RawBundleTotalSize = GetRawBundleSize(patchManifest);
+				buildReport.Summary.MainAssetTotalCount = GetMainAssetCount(manifest);
+				buildReport.Summary.AllBundleTotalCount = GetAllBundleCount(manifest);
+				buildReport.Summary.AllBundleTotalSize = GetAllBundleSize(manifest);
+				buildReport.Summary.EncryptedBundleTotalCount = GetEncryptedBundleCount(manifest);
+				buildReport.Summary.EncryptedBundleTotalSize = GetEncryptedBundleSize(manifest);
+				buildReport.Summary.RawBundleTotalCount = GetRawBundleCount(manifest);
+				buildReport.Summary.RawBundleTotalSize = GetRawBundleSize(manifest);
 			}
 
 			// 资源对象列表
-			buildReport.AssetInfos = new List<ReportAssetInfo>(patchManifest.AssetList.Count);
-			foreach (var patchAsset in patchManifest.AssetList)
+			buildReport.AssetInfos = new List<ReportAssetInfo>(manifest.AssetList.Count);
+			foreach (var packageAsset in manifest.AssetList)
 			{
-				var mainBundle = patchManifest.BundleList[patchAsset.BundleID];
+				var mainBundle = manifest.BundleList[packageAsset.BundleID];
 				ReportAssetInfo reportAssetInfo = new ReportAssetInfo();
-				reportAssetInfo.Address = patchAsset.Address;
-				reportAssetInfo.AssetPath = patchAsset.AssetPath;
-				reportAssetInfo.AssetTags = patchAsset.AssetTags;
-				reportAssetInfo.AssetGUID = AssetDatabase.AssetPathToGUID(patchAsset.AssetPath);
+				reportAssetInfo.Address = packageAsset.Address;
+				reportAssetInfo.AssetPath = packageAsset.AssetPath;
+				reportAssetInfo.AssetTags = packageAsset.AssetTags;
+				reportAssetInfo.AssetGUID = AssetDatabase.AssetPathToGUID(packageAsset.AssetPath);
 				reportAssetInfo.MainBundleName = mainBundle.BundleName;
 				reportAssetInfo.MainBundleSize = mainBundle.FileSize;
-				reportAssetInfo.DependBundles = GetDependBundles(patchManifest, patchAsset);
-				reportAssetInfo.DependAssets = GetDependAssets(buildMapContext, mainBundle.BundleName, patchAsset.AssetPath);
+				reportAssetInfo.DependBundles = GetDependBundles(manifest, packageAsset);
+				reportAssetInfo.DependAssets = GetDependAssets(buildMapContext, mainBundle.BundleName, packageAsset.AssetPath);
 				buildReport.AssetInfos.Add(reportAssetInfo);
 			}
 
 			// 资源包列表
-			buildReport.BundleInfos = new List<ReportBundleInfo>(patchManifest.BundleList.Count);
-			foreach (var patchBundle in patchManifest.BundleList)
+			buildReport.BundleInfos = new List<ReportBundleInfo>(manifest.BundleList.Count);
+			foreach (var packageBundle in manifest.BundleList)
 			{
 				ReportBundleInfo reportBundleInfo = new ReportBundleInfo();
-				reportBundleInfo.BundleName = patchBundle.BundleName;
-				reportBundleInfo.FileName = patchBundle.FileName;
-				reportBundleInfo.FileHash = patchBundle.FileHash;
-				reportBundleInfo.FileCRC = patchBundle.FileCRC;
-				reportBundleInfo.FileSize = patchBundle.FileSize;
-				reportBundleInfo.Tags = patchBundle.Tags;
-				reportBundleInfo.ReferenceIDs = patchBundle.ReferenceIDs;
-				reportBundleInfo.IsRawFile = patchBundle.IsRawFile;
-				reportBundleInfo.LoadMethod = (EBundleLoadMethod)patchBundle.LoadMethod;
+				reportBundleInfo.BundleName = packageBundle.BundleName;
+				reportBundleInfo.FileName = packageBundle.FileName;
+				reportBundleInfo.FileHash = packageBundle.FileHash;
+				reportBundleInfo.FileCRC = packageBundle.FileCRC;
+				reportBundleInfo.FileSize = packageBundle.FileSize;
+				reportBundleInfo.IsRawFile = packageBundle.IsRawFile;
+				reportBundleInfo.LoadMethod = (EBundleLoadMethod)packageBundle.LoadMethod;
+				reportBundleInfo.Tags = packageBundle.Tags;
+				reportBundleInfo.ReferenceIDs = packageBundle.ReferenceIDs;
+				reportBundleInfo.AllBuiltinAssets = GetAllBuiltinAssets(buildMapContext, packageBundle.BundleName);
 				buildReport.BundleInfos.Add(reportBundleInfo);
 			}
 
@@ -110,12 +111,12 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 获取资源对象依赖的所有资源包
 		/// </summary>
-		private List<string> GetDependBundles(PatchManifest patchManifest, PatchAsset patchAsset)
+		private List<string> GetDependBundles(PackageManifest manifest, PackageAsset packageAsset)
 		{
-			List<string> dependBundles = new List<string>(patchAsset.DependIDs.Length);
-			foreach (int index in patchAsset.DependIDs)
+			List<string> dependBundles = new List<string>(packageAsset.DependIDs.Length);
+			foreach (int index in packageAsset.DependIDs)
 			{
-				string dependBundleName = patchManifest.BundleList[index].BundleName;
+				string dependBundleName = manifest.BundleList[index].BundleName;
 				dependBundles.Add(dependBundleName);
 			}
 			return dependBundles;
@@ -127,14 +128,14 @@ namespace YooAsset.Editor
 		private List<string> GetDependAssets(BuildMapContext buildMapContext, string bundleName, string assetPath)
 		{
 			List<string> result = new List<string>();
-			if (buildMapContext.TryGetBundleInfo(bundleName, out BuildBundleInfo bundleInfo))
+			var bundleInfo = buildMapContext.GetBundleInfo(bundleName);
 			{
 				BuildAssetInfo findAssetInfo = null;
-				foreach (var buildinAsset in bundleInfo.BuildinAssets)
+				foreach (var assetInfo in bundleInfo.AllMainAssets)
 				{
-					if (buildinAsset.AssetPath == assetPath)
+					if (assetInfo.AssetPath == assetPath)
 					{
-						findAssetInfo = buildinAsset;
+						findAssetInfo = assetInfo;
 						break;
 					}
 				}
@@ -147,67 +148,72 @@ namespace YooAsset.Editor
 					result.Add(dependAssetInfo.AssetPath);
 				}
 			}
-			else
-			{
-				throw new Exception($"Not found bundle : {bundleName}");
-			}
 			return result;
 		}
 
-		private int GetMainAssetCount(PatchManifest patchManifest)
+		/// <summary>
+		/// 获取该资源包内的所有资源（包括零依赖资源）
+		/// </summary>
+		private List<string> GetAllBuiltinAssets(BuildMapContext buildMapContext, string bundleName)
 		{
-			return patchManifest.AssetList.Count;
+			var bundleInfo = buildMapContext.GetBundleInfo(bundleName);
+			return bundleInfo.GetAllBuiltinAssetPaths();
 		}
-		private int GetAllBundleCount(PatchManifest patchManifest)
+
+		private int GetMainAssetCount(PackageManifest manifest)
 		{
-			return patchManifest.BundleList.Count;
+			return manifest.AssetList.Count;
 		}
-		private long GetAllBundleSize(PatchManifest patchManifest)
+		private int GetAllBundleCount(PackageManifest manifest)
+		{
+			return manifest.BundleList.Count;
+		}
+		private long GetAllBundleSize(PackageManifest manifest)
 		{
 			long fileBytes = 0;
-			foreach (var patchBundle in patchManifest.BundleList)
+			foreach (var packageBundle in manifest.BundleList)
 			{
-				fileBytes += patchBundle.FileSize;
+				fileBytes += packageBundle.FileSize;
 			}
 			return fileBytes;
 		}
-		private int GetEncryptedBundleCount(PatchManifest patchManifest)
+		private int GetEncryptedBundleCount(PackageManifest manifest)
 		{
 			int fileCount = 0;
-			foreach (var patchBundle in patchManifest.BundleList)
+			foreach (var packageBundle in manifest.BundleList)
 			{
-				if (patchBundle.LoadMethod != (byte)EBundleLoadMethod.Normal)
+				if (packageBundle.LoadMethod != (byte)EBundleLoadMethod.Normal)
 					fileCount++;
 			}
 			return fileCount;
 		}
-		private long GetEncryptedBundleSize(PatchManifest patchManifest)
+		private long GetEncryptedBundleSize(PackageManifest manifest)
 		{
 			long fileBytes = 0;
-			foreach (var patchBundle in patchManifest.BundleList)
+			foreach (var packageBundle in manifest.BundleList)
 			{
-				if (patchBundle.LoadMethod != (byte)EBundleLoadMethod.Normal)
-					fileBytes += patchBundle.FileSize;
+				if (packageBundle.LoadMethod != (byte)EBundleLoadMethod.Normal)
+					fileBytes += packageBundle.FileSize;
 			}
 			return fileBytes;
 		}
-		private int GetRawBundleCount(PatchManifest patchManifest)
+		private int GetRawBundleCount(PackageManifest manifest)
 		{
 			int fileCount = 0;
-			foreach (var patchBundle in patchManifest.BundleList)
+			foreach (var packageBundle in manifest.BundleList)
 			{
-				if (patchBundle.IsRawFile)
+				if (packageBundle.IsRawFile)
 					fileCount++;
 			}
 			return fileCount;
 		}
-		private long GetRawBundleSize(PatchManifest patchManifest)
+		private long GetRawBundleSize(PackageManifest manifest)
 		{
 			long fileBytes = 0;
-			foreach (var patchBundle in patchManifest.BundleList)
+			foreach (var packageBundle in manifest.BundleList)
 			{
-				if (patchBundle.IsRawFile)
-					fileBytes += patchBundle.FileSize;
+				if (packageBundle.IsRawFile)
+					fileBytes += packageBundle.FileSize;
 			}
 			return fileBytes;
 		}

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

@@ -35,7 +35,7 @@ namespace YooAsset.Editor
 
 			int progressValue = 0;
 			string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
-			foreach (var bundleInfo in buildMapContext.BundleInfos)
+			foreach (var bundleInfo in buildMapContext.Collection)
 			{
 				EncryptFileInfo fileInfo = new EncryptFileInfo();
 				fileInfo.BundleName = bundleInfo.BundleName;
@@ -47,7 +47,7 @@ namespace YooAsset.Editor
 					// 注意：原生文件不支持加密
 					if (bundleInfo.IsRawFile)
 					{
-						UnityEngine.Debug.LogWarning($"Encryption not support raw file : {bundleInfo.BundleName}");
+						BuildLogger.Warning($"Encryption not support raw file : {bundleInfo.BundleName}");
 						continue;
 					}
 
@@ -59,7 +59,7 @@ namespace YooAsset.Editor
 				}
 
 				// 进度条
-				EditorTools.DisplayProgressBar("加密资源包", ++progressValue, buildMapContext.BundleInfos.Count);
+				EditorTools.DisplayProgressBar("加密资源包", ++progressValue, buildMapContext.Collection.Count);
 			}
 			EditorTools.ClearProgressBar();
 		}

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

@@ -13,7 +13,7 @@ namespace YooAsset.Editor
 		void IBuildTask.Run(BuildContext context)
 		{
 			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-			var buildMapContext = BuildMapCreater.CreateBuildMap(buildParametersContext.Parameters.BuildMode, buildParametersContext.Parameters.PackageName);
+			var buildMapContext = CreateBuildMap(buildParametersContext.Parameters.BuildMode, buildParametersContext.Parameters.PackageName);
 			context.SetContextObject(buildMapContext);
 			BuildLogger.Log("构建内容准备完毕！");
 
@@ -21,24 +21,180 @@ namespace YooAsset.Editor
 			CheckBuildMapContent(buildMapContext);
 		}
 
+		/// <summary>
+		/// 资源构建上下文
+		/// </summary>
+		public BuildMapContext CreateBuildMap(EBuildMode buildMode, string packageName)
+		{
+			Dictionary<string, BuildAssetInfo> allBuildAssetInfoDic = new Dictionary<string, BuildAssetInfo>(1000);
+
+			// 1. 检测配置合法性
+			AssetBundleCollectorSettingData.Setting.CheckConfigError();
+
+			// 2. 获取所有收集器收集的资源
+			var collectResult = AssetBundleCollectorSettingData.Setting.GetPackageAssets(buildMode, packageName);
+			List<CollectAssetInfo> allCollectAssetInfos = collectResult.CollectAssets;
+
+			// 3. 剔除未被引用的依赖项资源
+			RemoveZeroReferenceAssets(allCollectAssetInfos);
+
+			// 4. 录入所有收集器收集的资源
+			foreach (var collectAssetInfo in allCollectAssetInfos)
+			{
+				if (allBuildAssetInfoDic.ContainsKey(collectAssetInfo.AssetPath) == false)
+				{
+					var buildAssetInfo = new BuildAssetInfo(collectAssetInfo.CollectorType, collectAssetInfo.BundleName,
+						collectAssetInfo.Address, collectAssetInfo.AssetPath, collectAssetInfo.IsRawAsset);
+					buildAssetInfo.AddAssetTags(collectAssetInfo.AssetTags);
+					buildAssetInfo.AddBundleTags(collectAssetInfo.AssetTags);
+					allBuildAssetInfoDic.Add(collectAssetInfo.AssetPath, buildAssetInfo);
+				}
+				else
+				{
+					throw new Exception($"Should never get here !");
+				}
+			}
+
+			// 5. 录入所有收集资源的依赖资源
+			foreach (var collectAssetInfo in allCollectAssetInfos)
+			{
+				string collectAssetBundleName = collectAssetInfo.BundleName;
+				foreach (var dependAssetPath in collectAssetInfo.DependAssets)
+				{
+					if (allBuildAssetInfoDic.ContainsKey(dependAssetPath))
+					{
+						allBuildAssetInfoDic[dependAssetPath].AddBundleTags(collectAssetInfo.AssetTags);
+						allBuildAssetInfoDic[dependAssetPath].AddReferenceBundleName(collectAssetBundleName);
+					}
+					else
+					{
+						var buildAssetInfo = new BuildAssetInfo(dependAssetPath);
+						buildAssetInfo.AddBundleTags(collectAssetInfo.AssetTags);
+						buildAssetInfo.AddReferenceBundleName(collectAssetBundleName);
+						allBuildAssetInfoDic.Add(dependAssetPath, buildAssetInfo);
+					}
+				}
+			}
+
+			// 6. 填充所有收集资源的依赖列表
+			foreach (var collectAssetInfo in allCollectAssetInfos)
+			{
+				var dependAssetInfos = new List<BuildAssetInfo>(collectAssetInfo.DependAssets.Count);
+				foreach (var dependAssetPath in collectAssetInfo.DependAssets)
+				{
+					if (allBuildAssetInfoDic.TryGetValue(dependAssetPath, out BuildAssetInfo value))
+						dependAssetInfos.Add(value);
+					else
+						throw new Exception("Should never get here !");
+				}
+				allBuildAssetInfoDic[collectAssetInfo.AssetPath].SetAllDependAssetInfos(dependAssetInfos);
+			}
+
+			// 7. 记录关键信息
+			BuildMapContext context = new BuildMapContext();
+			context.AssetFileCount = allBuildAssetInfoDic.Count;
+			context.EnableAddressable = collectResult.Command.EnableAddressable;
+			context.UniqueBundleName = collectResult.Command.UniqueBundleName;
+			context.ShadersBundleName = collectResult.Command.ShadersBundleName;
+
+			// 8. 计算共享的资源包名
+			var command = collectResult.Command;
+			foreach (var buildAssetInfo in allBuildAssetInfoDic.Values)
+			{
+				buildAssetInfo.CalculateShareBundleName(command.UniqueBundleName, command.PackageName, command.ShadersBundleName);
+			}
+
+			// 9. 移除不参与构建的资源
+			List<BuildAssetInfo> removeBuildList = new List<BuildAssetInfo>();
+			foreach (var buildAssetInfo in allBuildAssetInfoDic.Values)
+			{
+				if (buildAssetInfo.HasBundleName() == false)
+					removeBuildList.Add(buildAssetInfo);
+			}
+			foreach (var removeValue in removeBuildList)
+			{
+				allBuildAssetInfoDic.Remove(removeValue.AssetPath);
+			}
+
+			// 10. 构建资源包
+			var allPackAssets = allBuildAssetInfoDic.Values.ToList();
+			if (allPackAssets.Count == 0)
+				throw new Exception("构建的资源列表不能为空");
+			foreach (var assetInfo in allPackAssets)
+			{
+				context.PackAsset(assetInfo);
+			}
+			return context;
+		}
+		private void RemoveZeroReferenceAssets(List<CollectAssetInfo> allCollectAssetInfos)
+		{
+			// 1. 检测是否任何存在依赖资源
+			bool hasAnyDependAsset = false;
+			foreach (var collectAssetInfo in allCollectAssetInfos)
+			{
+				var collectorType = collectAssetInfo.CollectorType;
+				if (collectorType == ECollectorType.DependAssetCollector)
+				{
+					hasAnyDependAsset = true;
+					break;
+				}
+			}
+			if (hasAnyDependAsset == false)
+				return;
+
+			// 2. 获取所有主资源的依赖资源集合
+			HashSet<string> allDependAsset = new HashSet<string>();
+			foreach (var collectAssetInfo in allCollectAssetInfos)
+			{
+				var collectorType = collectAssetInfo.CollectorType;
+				if (collectorType == ECollectorType.MainAssetCollector || collectorType == ECollectorType.StaticAssetCollector)
+				{
+					foreach (var dependAsset in collectAssetInfo.DependAssets)
+					{
+						if (allDependAsset.Contains(dependAsset) == false)
+							allDependAsset.Add(dependAsset);
+					}
+				}
+			}
+
+			// 3. 找出所有零引用的依赖资源集合
+			List<CollectAssetInfo> removeList = new List<CollectAssetInfo>();
+			foreach (var collectAssetInfo in allCollectAssetInfos)
+			{
+				var collectorType = collectAssetInfo.CollectorType;
+				if (collectorType == ECollectorType.DependAssetCollector)
+				{
+					if (allDependAsset.Contains(collectAssetInfo.AssetPath) == false)
+						removeList.Add(collectAssetInfo);
+				}
+			}
+
+			// 4. 移除所有零引用的依赖资源
+			foreach (var removeValue in removeList)
+			{
+				BuildLogger.Log($"发现未被依赖的资源并自动移除 : {removeValue.AssetPath}");
+				allCollectAssetInfos.Remove(removeValue);
+			}
+		}
+
 		/// <summary>
 		/// 检测构建结果
 		/// </summary>
 		private void CheckBuildMapContent(BuildMapContext buildMapContext)
 		{
-			foreach (var bundleInfo in buildMapContext.BundleInfos)
+			foreach (var bundleInfo in buildMapContext.Collection)
 			{
 				// 注意：原生文件资源包只能包含一个原生文件
 				bool isRawFile = bundleInfo.IsRawFile;
 				if (isRawFile)
 				{
-					if (bundleInfo.BuildinAssets.Count != 1)
+					if (bundleInfo.AllMainAssets.Count != 1)
 						throw new Exception($"The bundle does not support multiple raw asset : {bundleInfo.BundleName}");
 					continue;
 				}
 
 				// 注意：原生文件不能被其它资源文件依赖
-				foreach (var assetInfo in bundleInfo.BuildinAssets)
+				foreach (var assetInfo in bundleInfo.AllMainAssets)
 				{
 					if (assetInfo.AllDependAssetInfos != null)
 					{

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

@@ -51,8 +51,8 @@ namespace YooAsset.Editor
 
 			if (buildParameters.BuildMode == EBuildMode.ForceRebuild)
 			{
-				// 删除平台总目录
-				string platformDirectory = $"{buildParameters.OutputRoot}/{buildParameters.PackageName}/{buildParameters.BuildTarget}";
+				// 删除总目录
+				string platformDirectory = $"{buildParameters.OutputRoot}/{buildParameters.BuildTarget}/{buildParameters.PackageName}";
 				if (EditorTools.DeleteDirectory(platformDirectory))
 				{
 					BuildLogger.Log($"删除平台总目录：{platformDirectory}");

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

@@ -6,8 +6,8 @@ using UnityEditor;
 
 namespace YooAsset.Editor
 {
-	[TaskAttribute("更新构建信息")]
-	public class TaskUpdateBuildInfo : IBuildTask
+	[TaskAttribute("更新资源包信息")]
+	public class TaskUpdateBundleInfo : IBuildTask
 	{
 		void IBuildTask.Run(BuildContext context)
 		{
@@ -17,40 +17,40 @@ namespace YooAsset.Editor
 			string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
 			int outputNameStyle = (int)buildParametersContext.Parameters.OutputNameStyle;
 
-			// 1.检测路径长度
-			foreach (var bundleInfo in buildMapContext.BundleInfos)
+			// 1.检测文件名长度
+			foreach (var bundleInfo in buildMapContext.Collection)
 			{
-				// NOTE：检测路径长度不要超过260字符。
-				string filePath = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}";
-				if (filePath.Length >= 260)
-					throw new Exception($"The output bundle name is too long {filePath.Length} chars : {filePath}");
+				// NOTE：检测文件名长度不要超过260字符。
+				string fileName = bundleInfo.BundleName;
+				if (fileName.Length >= 260)
+					throw new Exception($"The output bundle name is too long {fileName.Length} chars : {fileName}");
 			}
 
 			// 2.更新构建输出的文件路径
-			foreach (var bundleInfo in buildMapContext.BundleInfos)
+			foreach (var bundleInfo in buildMapContext.Collection)
 			{
 				if (bundleInfo.IsEncryptedFile)
-					bundleInfo.PatchInfo.BuildOutputFilePath = bundleInfo.EncryptedFilePath;
+					bundleInfo.BundleInfo.BuildOutputFilePath = bundleInfo.EncryptedFilePath;
 				else
-					bundleInfo.PatchInfo.BuildOutputFilePath = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}";
+					bundleInfo.BundleInfo.BuildOutputFilePath = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}";
 			}
 
 			// 3.更新文件其它信息
-			foreach (var bundleInfo in buildMapContext.BundleInfos)
+			foreach (var bundleInfo in buildMapContext.Collection)
 			{
-				string buildOutputFilePath = bundleInfo.PatchInfo.BuildOutputFilePath;
-				bundleInfo.PatchInfo.ContentHash = GetBundleContentHash(bundleInfo, context);
-				bundleInfo.PatchInfo.PatchFileHash = GetBundleFileHash(buildOutputFilePath, buildParametersContext);
-				bundleInfo.PatchInfo.PatchFileCRC = GetBundleFileCRC(buildOutputFilePath, buildParametersContext);
-				bundleInfo.PatchInfo.PatchFileSize = GetBundleFileSize(buildOutputFilePath, buildParametersContext);
+				string buildOutputFilePath = bundleInfo.BundleInfo.BuildOutputFilePath;
+				bundleInfo.BundleInfo.ContentHash = GetBundleContentHash(bundleInfo, context);
+				bundleInfo.BundleInfo.FileHash = GetBundleFileHash(buildOutputFilePath, buildParametersContext);
+				bundleInfo.BundleInfo.FileCRC = GetBundleFileCRC(buildOutputFilePath, buildParametersContext);
+				bundleInfo.BundleInfo.FileSize = GetBundleFileSize(buildOutputFilePath, buildParametersContext);
 			}
 
 			// 4.更新补丁包输出的文件路径
-			foreach (var bundleInfo in buildMapContext.BundleInfos)
+			foreach (var bundleInfo in buildMapContext.Collection)
 			{
-				string patchFileExtension = PatchManifestTools.GetRemoteBundleFileExtension(bundleInfo.BundleName);
-				string patchFileName = PatchManifestTools.GetRemoteBundleFileName(outputNameStyle, bundleInfo.BundleName, patchFileExtension, bundleInfo.PatchInfo.PatchFileHash);
-				bundleInfo.PatchInfo.PatchOutputFilePath = $"{packageOutputDirectory}/{patchFileName}";
+				string fileExtension = ManifestTools.GetRemoteBundleFileExtension(bundleInfo.BundleName);
+				string fileName = ManifestTools.GetRemoteBundleFileName(outputNameStyle, bundleInfo.BundleName, fileExtension, bundleInfo.BundleInfo.FileHash);
+				bundleInfo.BundleInfo.PackageOutputFilePath = $"{packageOutputDirectory}/{fileName}";
 			}
 		}
 
@@ -64,7 +64,7 @@ namespace YooAsset.Editor
 
 			if (bundleInfo.IsRawFile)
 			{
-				string filePath = bundleInfo.PatchInfo.BuildOutputFilePath;
+				string filePath = bundleInfo.BundleInfo.BuildOutputFilePath;
 				return HashUtility.FileMD5(filePath);
 			}
 

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

@@ -34,29 +34,29 @@ namespace YooAsset.Editor
 		{
 			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
 			var buildMapContext = context.GetContextObject<BuildMapContext>();
-			string[] buildedBundles = unityManifest.GetAllAssetBundles();
+			string[] unityCreateBundles = unityManifest.GetAllAssetBundles();
 
 			// 1. 过滤掉原生Bundle
-			string[] mapBundles = buildMapContext.BundleInfos.Where(t => t.IsRawFile == false).Select(t => t.BundleName).ToArray();
+			string[] mapBundles = buildMapContext.Collection.Where(t => t.IsRawFile == false).Select(t => t.BundleName).ToArray();
 
 			// 2. 验证Bundle
-			List<string> exceptBundleList1 = buildedBundles.Except(mapBundles).ToList();
+			List<string> exceptBundleList1 = unityCreateBundles.Except(mapBundles).ToList();
 			if (exceptBundleList1.Count > 0)
 			{
 				foreach (var exceptBundle in exceptBundleList1)
 				{
-					Debug.LogWarning($"差异资源包: {exceptBundle}");
+					BuildLogger.Warning($"差异资源包: {exceptBundle}");
 				}
 				throw new System.Exception("存在差异资源包！请查看警告信息！");
 			}
 
 			// 3. 验证Bundle
-			List<string> exceptBundleList2 = mapBundles.Except(buildedBundles).ToList();
+			List<string> exceptBundleList2 = mapBundles.Except(unityCreateBundles).ToList();
 			if (exceptBundleList2.Count > 0)
 			{
 				foreach (var exceptBundle in exceptBundleList2)
 				{
-					Debug.LogWarning($"差异资源包: {exceptBundle}");
+					BuildLogger.Warning($"差异资源包: {exceptBundle}");
 				}
 				throw new System.Exception("存在差异资源包！请查看警告信息！");
 			}
@@ -76,16 +76,16 @@ namespace YooAsset.Editor
 					string[] mapAssetPaths = buildMapContext.GetBuildinAssetPaths(buildedBundle);
 					if (mapAssetPaths.Length != buildedAssetPaths.Length)
 					{
-						Debug.LogWarning($"构建的Bundle文件内的资源对象数量和预期不匹配 : {buildedBundle}");
+						BuildLogger.Warning($"构建的Bundle文件内的资源对象数量和预期不匹配 : {buildedBundle}");
 						var exceptAssetList1 = mapAssetPaths.Except(buildedAssetPaths).ToList();
 						foreach (var excpetAsset in exceptAssetList1)
 						{
-							Debug.LogWarning($"构建失败的资源对象路径为 : {excpetAsset}");
+							BuildLogger.Warning($"构建失败的资源对象路径为 : {excpetAsset}");
 						}
 						var exceptAssetList2 = buildedAssetPaths.Except(mapAssetPaths).ToList();
 						foreach (var excpetAsset in exceptAssetList2)
 						{
-							Debug.LogWarning($"构建失败的资源对象路径为 : {excpetAsset}");
+							BuildLogger.Warning($"构建失败的资源对象路径为 : {excpetAsset}");
 						}
 						isPass = false;
 						continue;

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

@@ -35,29 +35,29 @@ namespace YooAsset.Editor
 		{
 			var buildParameters = context.GetContextObject<BuildParametersContext>();
 			var buildMapContext = context.GetContextObject<BuildMapContext>();
-			List<string> buildedBundles = buildResults.BundleInfos.Keys.ToList();
+			List<string> unityCreateBundles = buildResults.BundleInfos.Keys.ToList();
 
 			// 1. 过滤掉原生Bundle
-			List<string> expectBundles = buildMapContext.BundleInfos.Where(t => t.IsRawFile == false).Select(t => t.BundleName).ToList();
+			List<string> expectBundles = buildMapContext.Collection.Where(t => t.IsRawFile == false).Select(t => t.BundleName).ToList();
 
 			// 2. 验证Bundle
-			List<string> exceptBundleList1 = buildedBundles.Except(expectBundles).ToList();
+			List<string> exceptBundleList1 = unityCreateBundles.Except(expectBundles).ToList();
 			if (exceptBundleList1.Count > 0)
 			{
 				foreach (var exceptBundle in exceptBundleList1)
 				{
-					Debug.LogWarning($"差异资源包: {exceptBundle}");
+					BuildLogger.Warning($"差异资源包: {exceptBundle}");
 				}
 				throw new System.Exception("存在差异资源包！请查看警告信息！");
 			}
 
 			// 3. 验证Bundle
-			List<string> exceptBundleList2 = expectBundles.Except(buildedBundles).ToList();
+			List<string> exceptBundleList2 = expectBundles.Except(unityCreateBundles).ToList();
 			if (exceptBundleList2.Count > 0)
 			{
 				foreach (var exceptBundle in exceptBundleList2)
 				{
-					Debug.LogWarning($"差异资源包: {exceptBundle}");
+					BuildLogger.Warning($"差异资源包: {exceptBundle}");
 				}
 				throw new System.Exception("存在差异资源包！请查看警告信息！");
 			}

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollector.cs

@@ -217,7 +217,7 @@ namespace YooAsset.Editor
 
 		private CollectAssetInfo CreateCollectAssetInfo(CollectCommand command, AssetBundleCollectorGroup group, string assetPath, bool isRawFilePackRule)
 		{
-			string address = GetAddress(group, assetPath);
+			string address = GetAddress(command, group, assetPath);
 			string bundleName = GetBundleName(command, group, assetPath);
 			List<string> assetTags = GetAssetTags(group);
 			CollectAssetInfo collectAssetInfo = new CollectAssetInfo(CollectorType, bundleName, address, assetPath, isRawFilePackRule, assetTags);
@@ -226,7 +226,7 @@ namespace YooAsset.Editor
 			if (command.BuildMode == EBuildMode.SimulateBuild)
 				collectAssetInfo.DependAssets = new List<string>();
 			else
-				collectAssetInfo.DependAssets = GetAllDependencies(assetPath, isRawFilePackRule);
+				collectAssetInfo.DependAssets = GetAllDependencies(assetPath);
 
 			return collectAssetInfo;
 		}
@@ -243,8 +243,8 @@ namespace YooAsset.Editor
 				return false;
 
 			// 忽略编辑器下的类型资源
-			Type type = AssetDatabase.GetMainAssetTypeAtPath(assetPath);
-			if (type == typeof(LightingDataAsset))
+			Type assetType = AssetDatabase.GetMainAssetTypeAtPath(assetPath);
+			if (assetType == typeof(LightingDataAsset))
 				return false;
 
 			// 检测原生文件是否合规
@@ -252,27 +252,29 @@ namespace YooAsset.Editor
 			{
 				string extension = StringUtility.RemoveFirstChar(System.IO.Path.GetExtension(assetPath));
 				if (extension == EAssetFileExtension.unity.ToString() || extension == EAssetFileExtension.prefab.ToString() ||
-					extension == EAssetFileExtension.mat.ToString() || extension == EAssetFileExtension.controller.ToString() ||
-					extension == EAssetFileExtension.fbx.ToString() || extension == EAssetFileExtension.anim.ToString() ||
-					extension == EAssetFileExtension.shader.ToString())
+					extension == EAssetFileExtension.fbx.ToString() || extension == EAssetFileExtension.mat.ToString() ||
+					extension == EAssetFileExtension.controller.ToString() || extension == EAssetFileExtension.anim.ToString() ||
+					extension == EAssetFileExtension.ttf.ToString() || extension == EAssetFileExtension.shader.ToString())
 				{
 					UnityEngine.Debug.LogWarning($"Raw file pack rule can not support file estension : {extension}");
 					return false;
 				}
 
 				// 注意：原生文件只支持无依赖关系的资源
+				/*
 				string[] depends = AssetDatabase.GetDependencies(assetPath, true);
 				if (depends.Length != 1)
 				{
 					UnityEngine.Debug.LogWarning($"Raw file pack rule can not support estension : {extension}");
 					return false;
 				}
+				*/
 			}
 			else
 			{
 				// 忽略Unity无法识别的无效文件
 				// 注意：只对非原生文件收集器处理
-				if (type == typeof(UnityEditor.DefaultAsset))
+				if (assetType == typeof(UnityEditor.DefaultAsset))
 				{
 					UnityEngine.Debug.LogWarning($"Cannot pack default asset : {assetPath}");
 					return false;
@@ -280,20 +282,11 @@ namespace YooAsset.Editor
 			}
 
 			string fileExtension = System.IO.Path.GetExtension(assetPath);
-			if (IsIgnoreFile(fileExtension))
+			if (DefaultFilterRule.IsIgnoreFile(fileExtension))
 				return false;
 
 			return true;
 		}
-		private bool IsIgnoreFile(string fileExtension)
-		{
-			foreach (var extension in DefaultFilterRule.IgnoreFileExtensions)
-			{
-				if (extension == fileExtension)
-					return true;
-			}
-			return false;
-		}
 		private bool IsCollectAsset(string assetPath)
 		{
 			Type assetType = AssetDatabase.GetMainAssetTypeAtPath(assetPath);
@@ -304,8 +297,11 @@ namespace YooAsset.Editor
 			IFilterRule filterRuleInstance = AssetBundleCollectorSettingData.GetFilterRuleInstance(FilterRuleName);
 			return filterRuleInstance.IsCollectAsset(new FilterRuleData(assetPath));
 		}
-		private string GetAddress(AssetBundleCollectorGroup group, string assetPath)
+		private string GetAddress(CollectCommand command, AssetBundleCollectorGroup group, string assetPath)
 		{
+			if (command.EnableAddressable == false)
+				return string.Empty;
+
 			if (CollectorType != ECollectorType.MainAssetCollector)
 				return string.Empty;
 
@@ -337,13 +333,13 @@ namespace YooAsset.Editor
 			tags.AddRange(temper);
 			return tags;
 		}
-		private List<string> GetAllDependencies(string mainAssetPath, bool isRawFilePackRule)
+		private List<string> GetAllDependencies(string mainAssetPath)
 		{
-			List<string> result = new List<string>();
 			string[] depends = AssetDatabase.GetDependencies(mainAssetPath, true);
+			List<string> result = new List<string>(depends.Length);
 			foreach (string assetPath in depends)
 			{
-				if (IsValidateAsset(assetPath, isRawFilePackRule))
+				if (IsValidateAsset(assetPath, false))
 				{
 					// 注意：排除主资源对象
 					if (assetPath != mainAssetPath)

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorConfig.cs

@@ -10,7 +10,7 @@ namespace YooAsset.Editor
 {
 	public class AssetBundleCollectorConfig
 	{
-		public const string ConfigVersion = "2.3";
+		public const string ConfigVersion = "2.4";
 
 		public const string XmlVersion = "Version";
 		public const string XmlCommon = "Common";
@@ -24,6 +24,7 @@ namespace YooAsset.Editor
 		public const string XmlPackageDesc = "PackageDesc";
 
 		public const string XmlGroup = "Group";
+		public const string XmlGroupActiveRule = "GroupActiveRule";
 		public const string XmlGroupName = "GroupName";
 		public const string XmlGroupDesc = "GroupDesc";
 
@@ -108,6 +109,8 @@ namespace YooAsset.Editor
 				foreach (var groupNode in groupNodeList)
 				{
 					XmlElement groupElement = groupNode as XmlElement;
+					if (groupElement.HasAttribute(XmlGroupActiveRule) == false)
+						throw new Exception($"Not found attribute {XmlGroupActiveRule} in {XmlGroup}");
 					if (groupElement.HasAttribute(XmlGroupName) == false)
 						throw new Exception($"Not found attribute {XmlGroupName} in {XmlGroup}");
 					if (groupElement.HasAttribute(XmlGroupDesc) == false)
@@ -116,6 +119,7 @@ namespace YooAsset.Editor
 						throw new Exception($"Not found attribute {XmlAssetTags} in {XmlGroup}");
 
 					AssetBundleCollectorGroup group = new AssetBundleCollectorGroup();
+					group.ActiveRuleName = groupElement.GetAttribute(XmlGroupActiveRule);
 					group.GroupName = groupElement.GetAttribute(XmlGroupName);
 					group.GroupDesc = groupElement.GetAttribute(XmlGroupDesc);
 					group.AssetTags = groupElement.GetAttribute(XmlAssetTags);
@@ -157,6 +161,12 @@ namespace YooAsset.Editor
 				}
 			}
 
+			// 检测配置错误
+			foreach(var package in packages)
+			{
+				package.CheckConfigError();
+			}
+
 			// 保存配置数据
 			AssetBundleCollectorSettingData.ClearAll();
 			AssetBundleCollectorSettingData.Setting.EnableAddressable = enableAddressable;
@@ -208,6 +218,7 @@ namespace YooAsset.Editor
 				foreach (var group in package.Groups)
 				{
 					var groupElement = xmlDoc.CreateElement(XmlGroup);
+					groupElement.SetAttribute(XmlGroupActiveRule, group.ActiveRuleName);
 					groupElement.SetAttribute(XmlGroupName, group.GroupName);
 					groupElement.SetAttribute(XmlGroupDesc, group.GroupDesc);
 					groupElement.SetAttribute(XmlAssetTags, group.AssetTags);
@@ -347,6 +358,23 @@ namespace YooAsset.Editor
 				return UpdateXmlConfig(xmlDoc);
 			}
 
+			// 2.3 -> 2.4
+			if(configVersion == "2.3")
+			{
+				// 获取所有分组元素
+				var groupNodeList = root.GetElementsByTagName(XmlGroup);
+				foreach (var groupNode in groupNodeList)
+				{
+					XmlElement groupElement = groupNode as XmlElement;
+					if(groupElement.HasAttribute(XmlGroupActiveRule) == false)
+						groupElement.SetAttribute(XmlGroupActiveRule, $"{nameof(EnableGroup)}");
+				}
+
+				// 更新版本
+				root.SetAttribute(XmlVersion, "2.4");
+				return UpdateXmlConfig(xmlDoc);
+			}
+
 			return false;
 		}
 	}

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSetting.cs

@@ -100,7 +100,7 @@ namespace YooAsset.Editor
 			{
 				if (package.PackageName == packageName)
 				{
-					CollectCommand command = new CollectCommand(buildMode, package.PackageName, EnableAddressable, UniqueBundleName);
+					CollectCommand command = new CollectCommand(buildMode, packageName, EnableAddressable, UniqueBundleName);
 					CollectResult collectResult = new CollectResult(command);
 					collectResult.SetCollectAssets(package.GetAllCollectAssets(command));
 					return collectResult;
@@ -109,21 +109,5 @@ namespace YooAsset.Editor
 
 			throw new Exception($"Not found collector pacakge : {packageName}");
 		}
-
-		/// <summary>
-		/// 获取所有包裹收集的资源文件
-		/// </summary>
-		public List<CollectResult> GetAllPackageAssets(EBuildMode buildMode)
-		{
-			List<CollectResult> collectResultList = new List<CollectResult>(1000);
-			foreach (var package in Packages)
-			{
-				CollectCommand command = new CollectCommand(buildMode, package.PackageName, EnableAddressable, UniqueBundleName);
-				CollectResult collectResult = new CollectResult(command);
-				collectResult.SetCollectAssets(package.GetAllCollectAssets(command));
-				collectResultList.Add(collectResult);
-			}
-			return collectResultList;
-		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSettingData.cs

@@ -27,24 +27,8 @@ namespace YooAsset.Editor
 		public static bool IsDirty { private set; get; } = false;
 
 
-		private static AssetBundleCollectorSetting _setting = null;
-		public static AssetBundleCollectorSetting Setting
+		static AssetBundleCollectorSettingData()
 		{
-			get
-			{
-				if (_setting == null)
-					LoadSettingData();
-				return _setting;
-			}
-		}
-
-		/// <summary>
-		/// 加载配置文件
-		/// </summary>
-		private static void LoadSettingData()
-		{
-			_setting = EditorHelper.LoadSettingData<AssetBundleCollectorSetting>();
-
 			// IPackRule
 			{
 				// 清空缓存集合
@@ -108,6 +92,7 @@ namespace YooAsset.Editor
 				List<Type> types = new List<Type>(100)
 				{
 					typeof(AddressByFileName),
+					typeof(AddressByFilePath),
 					typeof(AddressByFolderAndFileName),
 					typeof(AddressByGroupAndFileName)
 				};
@@ -146,6 +131,17 @@ namespace YooAsset.Editor
 			}
 		}
 
+		private static AssetBundleCollectorSetting _setting = null;
+		public static AssetBundleCollectorSetting Setting
+		{
+			get
+			{
+				if (_setting == null)
+					_setting = SettingLoader.LoadSettingData<AssetBundleCollectorSetting>();
+				return _setting;
+			}
+		}
+
 		/// <summary>
 		/// 存储配置文件
 		/// </summary>
@@ -183,9 +179,6 @@ namespace YooAsset.Editor
 
 		public static List<RuleDisplayName> GetActiveRuleNames()
 		{
-			if (_setting == null)
-				LoadSettingData();
-
 			List<RuleDisplayName> names = new List<RuleDisplayName>();
 			foreach (var pair in _cacheActiveRuleTypes)
 			{
@@ -198,9 +191,6 @@ namespace YooAsset.Editor
 		}
 		public static List<RuleDisplayName> GetAddressRuleNames()
 		{
-			if (_setting == null)
-				LoadSettingData();
-
 			List<RuleDisplayName> names = new List<RuleDisplayName>();
 			foreach (var pair in _cacheAddressRuleTypes)
 			{
@@ -213,9 +203,6 @@ namespace YooAsset.Editor
 		}
 		public static List<RuleDisplayName> GetPackRuleNames()
 		{
-			if (_setting == null)
-				LoadSettingData();
-
 			List<RuleDisplayName> names = new List<RuleDisplayName>();
 			foreach (var pair in _cachePackRuleTypes)
 			{
@@ -228,9 +215,6 @@ namespace YooAsset.Editor
 		}
 		public static List<RuleDisplayName> GetFilterRuleNames()
 		{
-			if (_setting == null)
-				LoadSettingData();
-
 			List<RuleDisplayName> names = new List<RuleDisplayName>();
 			foreach (var pair in _cacheFilterRuleTypes)
 			{
@@ -243,7 +227,7 @@ namespace YooAsset.Editor
 		}
 		private static string GetRuleDisplayName(string name, Type type)
 		{
-			var attribute = EditorAttribute.GetAttribute<DisplayNameAttribute>(type);
+			var attribute = DisplayNameAttributeHelper.GetAttribute<DisplayNameAttribute>(type);
 			if (attribute != null && string.IsNullOrEmpty(attribute.DisplayName) == false)
 				return attribute.DisplayName;
 			else

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs

@@ -14,7 +14,7 @@ namespace YooAsset.Editor
 		[MenuItem("YooAsset/AssetBundle Collector", false, 101)]
 		public static void ShowExample()
 		{
-			AssetBundleCollectorWindow window = GetWindow<AssetBundleCollectorWindow>("资源包收集工具", true, EditorDefine.DockedWindowTypes);
+			AssetBundleCollectorWindow window = GetWindow<AssetBundleCollectorWindow>("资源包收集工具", true, WindowsDefine.DockedWindowTypes);
 			window.minSize = new Vector2(800, 600);
 		}
 
@@ -70,7 +70,7 @@ namespace YooAsset.Editor
 				VisualElement root = this.rootVisualElement;
 
 				// 加载布局文件
-				var visualAsset = EditorHelper.LoadWindowUXML<AssetBundleCollectorWindow>();
+				var visualAsset = UxmlLoader.LoadWindowUXML<AssetBundleCollectorWindow>();
 				if (visualAsset == null)
 					return;
 
@@ -148,6 +148,7 @@ namespace YooAsset.Editor
 					{
 						selectPackage.PackageName = evt.newValue;
 						AssetBundleCollectorSettingData.ModifyPackage(selectPackage);
+						FillPackageViewData();
 					}
 				});
 
@@ -160,6 +161,7 @@ namespace YooAsset.Editor
 					{
 						selectPackage.PackageDesc = evt.newValue;
 						AssetBundleCollectorSettingData.ModifyPackage(selectPackage);
+						FillPackageViewData();
 					}
 				});
 

Assets/YooAsset/Editor/AssetBundleCollector/CollectCommand.cs

@@ -23,12 +23,22 @@ namespace YooAsset.Editor
 		/// </summary>
 		public bool UniqueBundleName { private set; get; }
 
+		/// <summary>
+		/// 着色器统一全名称
+		/// </summary>
+		public string ShadersBundleName { private set; get; }
+
+
 		public CollectCommand(EBuildMode buildMode, string packageName, bool enableAddressable, bool uniqueBundleName)
 		{
 			BuildMode = buildMode;
 			PackageName = packageName;
 			EnableAddressable = enableAddressable;
 			UniqueBundleName = uniqueBundleName;
+
+			// 着色器统一全名称
+			var packRuleResult = DefaultPackRule.CreateShadersPackRuleResult();
+			ShadersBundleName = packRuleResult.GetMainBundleName(packageName, uniqueBundleName);
 		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleCollector/CollectResult.cs

@@ -10,26 +10,15 @@ namespace YooAsset.Editor
 		/// </summary>
 		public CollectCommand Command { private set; get; }
 
-		/// <summary>
-		/// 着色器统一全名称
-		/// </summary>
-		public string ShadersBundleName { private set; get; }
-
 		/// <summary>
 		/// 收集的资源信息列表
 		/// </summary>
 		public List<CollectAssetInfo> CollectAssets { private set; get; }
 
-
 		public CollectResult(CollectCommand command)
 		{
 			Command = command;
-
-			// 着色器统一全名称
-			var packRuleResult = DefaultPackRule.CreateShadersPackRuleResult();
-			ShadersBundleName = packRuleResult.GetMainBundleName(command.PackageName, command.UniqueBundleName);
 		}
-
 		public void SetCollectAssets(List<CollectAssetInfo> collectAssets)
 		{
 			CollectAssets = collectAssets;

Assets/YooAsset/Editor/AssetBundleCollector/DefaultAddressRule.cs

@@ -11,6 +11,15 @@ namespace YooAsset.Editor
 		}
 	}
 
+	[DisplayName("定位地址: 文件路径")]
+	public class AddressByFilePath : IAddressRule
+	{
+		string IAddressRule.GetAssetAddress(AddressRuleData data)
+		{
+			return data.AssetPath;
+		}
+	}
+
 	[DisplayName("定位地址: 分组名+文件名")]
 	public class AddressByGroupAndFileName : IAddressRule
 	{
@@ -27,8 +36,8 @@ namespace YooAsset.Editor
 		string IAddressRule.GetAssetAddress(AddressRuleData data)
 		{
 			string fileName = Path.GetFileNameWithoutExtension(data.AssetPath);
-			string collectorName = Path.GetFileNameWithoutExtension(data.CollectPath);
-			return $"{collectorName}_{fileName}";
+			FileInfo fileInfo = new FileInfo(data.AssetPath);
+			return $"{fileInfo.Directory.Name}_{fileName}";
 		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleCollector/DefaultFilterRule.cs

@@ -1,6 +1,8 @@
-using UnityEngine;
-using UnityEditor;
+using System.Collections;
+using System.Collections.Generic;
 using System.IO;
+using UnityEngine;
+using UnityEditor;
 
 namespace YooAsset.Editor
 {
@@ -9,7 +11,15 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 忽略的文件类型
 		/// </summary>
-		public static readonly string[] IgnoreFileExtensions = { "", ".so", ".dll", ".cs", ".js", ".boo", ".meta", ".cginc", ".hlsl" };
+		private readonly static HashSet<string> _ignoreFileExtensions = new HashSet<string>() { "", ".so", ".dll", ".cs", ".js", ".boo", ".meta", ".cginc", ".hlsl" };
+
+		/// <summary>
+		/// 查询是否为忽略文件
+		/// </summary>
+		public static bool IsIgnoreFile(string fileExtension)
+		{
+			return _ignoreFileExtensions.Contains(fileExtension);
+		}
 	}
 
 	[DisplayName("收集所有资源")]

Assets/YooAsset/Editor/AssetBundleCollector/DisplayNameAttribute.cs

@@ -16,7 +16,7 @@ namespace YooAsset.Editor
 		}
 	}
 
-	public static class EditorAttribute
+	public static class DisplayNameAttributeHelper
 	{
 		internal static T GetAttribute<T>(Type type) where T : Attribute
 		{

Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebuggerWindow.cs

@@ -15,7 +15,7 @@ namespace YooAsset.Editor
 		[MenuItem("YooAsset/AssetBundle Debugger", false, 104)]
 		public static void ShowExample()
 		{
-			AssetBundleDebuggerWindow wnd = GetWindow<AssetBundleDebuggerWindow>("资源包调试工具", true, EditorDefine.DockedWindowTypes);
+			AssetBundleDebuggerWindow wnd = GetWindow<AssetBundleDebuggerWindow>("资源包调试工具", true, WindowsDefine.DockedWindowTypes);
 			wnd.minSize = new Vector2(800, 600);
 		}
 
@@ -63,7 +63,7 @@ namespace YooAsset.Editor
 				VisualElement root = rootVisualElement;
 
 				// 加载布局文件
-				var visualAsset = EditorHelper.LoadWindowUXML<AssetBundleDebuggerWindow>();
+				var visualAsset = UxmlLoader.LoadWindowUXML<AssetBundleDebuggerWindow>();
 				if (visualAsset == null)
 					return;
 

Assets/YooAsset/Editor/AssetBundleDebugger/VisualViewers/DebuggerAssetListViewer.cs

@@ -24,7 +24,7 @@ namespace YooAsset.Editor
 		public void InitViewer()
 		{
 			// 加载布局文件		
-			_visualAsset = EditorHelper.LoadWindowUXML<DebuggerAssetListViewer>();
+			_visualAsset = UxmlLoader.LoadWindowUXML<DebuggerAssetListViewer>();
 			if (_visualAsset == null)
 				return;
 
@@ -45,6 +45,10 @@ namespace YooAsset.Editor
 			_dependListView = _root.Q<ListView>("BottomListView");
 			_dependListView.makeItem = MakeDependListViewItem;
 			_dependListView.bindItem = BindDependListViewItem;
+
+#if UNITY_2020_3_OR_NEWER
+			SplitView.Adjuster(_root);
+#endif
 		}
 
 		/// <summary>

Assets/YooAsset/Editor/AssetBundleDebugger/VisualViewers/DebuggerBundleListViewer.cs

@@ -24,7 +24,7 @@ namespace YooAsset.Editor
 		public void InitViewer()
 		{
 			// 加载布局文件
-			_visualAsset = EditorHelper.LoadWindowUXML<DebuggerBundleListViewer>();
+			_visualAsset = UxmlLoader.LoadWindowUXML<DebuggerBundleListViewer>();
 			if (_visualAsset == null)
 				return;
 
@@ -45,6 +45,10 @@ namespace YooAsset.Editor
 			_usingListView = _root.Q<ListView>("BottomListView");
 			_usingListView.makeItem = MakeIncludeListViewItem;
 			_usingListView.bindItem = BindIncludeListViewItem;
+
+#if UNITY_2020_3_OR_NEWER
+			SplitView.Adjuster(_root);
+#endif
 		}
 
 		/// <summary>

Assets/YooAsset/Editor/AssetBundleReporter/AssetBundleReporterWindow.cs

@@ -12,7 +12,7 @@ namespace YooAsset.Editor
 		[MenuItem("YooAsset/AssetBundle Reporter", false, 103)]
 		public static void ShowExample()
 		{
-			AssetBundleReporterWindow window = GetWindow<AssetBundleReporterWindow>("资源包报告工具", true, EditorDefine.DockedWindowTypes);
+			AssetBundleReporterWindow window = GetWindow<AssetBundleReporterWindow>("资源包报告工具", true, WindowsDefine.DockedWindowTypes);
 			window.minSize = new Vector2(800, 600);
 		}
 
@@ -55,7 +55,7 @@ namespace YooAsset.Editor
 				VisualElement root = this.rootVisualElement;
 
 				// 加载布局文件
-				var visualAsset =  EditorHelper.LoadWindowUXML<AssetBundleReporterWindow>();
+				var visualAsset = UxmlLoader.LoadWindowUXML<AssetBundleReporterWindow>();
 				if (visualAsset == null)
 					return;
 				

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

@@ -38,7 +38,7 @@ namespace YooAsset.Editor
 		public void InitViewer()
 		{
 			// 加载布局文件
-			_visualAsset = EditorHelper.LoadWindowUXML<ReporterAssetListViewer>();
+			_visualAsset = UxmlLoader.LoadWindowUXML<ReporterAssetListViewer>();
 			if (_visualAsset == null)
 				return;
 
@@ -68,6 +68,10 @@ namespace YooAsset.Editor
 			_dependListView = _root.Q<ListView>("BottomListView");
 			_dependListView.makeItem = MakeDependListViewItem;
 			_dependListView.bindItem = BindDependListViewItem;
+
+#if UNITY_2020_3_OR_NEWER
+			SplitView.Adjuster(_root);
+#endif
 		}
 
 		/// <summary>

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

@@ -42,7 +42,7 @@ namespace YooAsset.Editor
 		public void InitViewer()
 		{
 			// 加载布局文件
-			_visualAsset = EditorHelper.LoadWindowUXML<ReporterBundleListViewer>();
+			_visualAsset = UxmlLoader.LoadWindowUXML<ReporterBundleListViewer>();
 			if (_visualAsset == null)
 				return;
 
@@ -76,6 +76,10 @@ namespace YooAsset.Editor
 			_includeListView = _root.Q<ListView>("BottomListView");
 			_includeListView.makeItem = MakeIncludeListViewItem;
 			_includeListView.bindItem = BindIncludeListViewItem;
+
+#if UNITY_2020_3_OR_NEWER
+			SplitView.Adjuster(_root);
+#endif
 		}
 
 		/// <summary>

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

@@ -1,21 +1,19 @@
-<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements">
-    <ui:VisualElement name="Viewer" style="flex-grow: 1; display: flex;">
-        <ui:VisualElement name="TopGroup" style="flex-grow: 1; border-left-width: 1px; border-right-width: 1px; border-top-width: 1px; border-bottom-width: 1px; border-left-color: rgb(0, 0, 0); border-right-color: rgb(0, 0, 0); border-top-color: rgb(0, 0, 0); border-bottom-color: rgb(0, 0, 0); margin-left: 0; margin-right: 0; margin-top: 2px; margin-bottom: 1px; display: flex;">
-            <uie:Toolbar name="TopBar" style="height: 25px; margin-left: 1px; margin-right: 1px;">
-                <uie:ToolbarButton text="Bundle Name" display-tooltip-when-elided="true" name="TopBar1" style="width: 280px; -unity-text-align: middle-left; flex-grow: 1;" />
-                <uie:ToolbarButton text="Size" display-tooltip-when-elided="true" name="TopBar2" style="width: 100px; -unity-text-align: middle-left; flex-grow: 0;" />
-                <uie:ToolbarButton text="Hash" display-tooltip-when-elided="true" name="TopBar3" style="width: 280px; -unity-text-align: middle-left;" />
-                <uie:ToolbarButton text="LoadMethod" display-tooltip-when-elided="true" name="TopBar4" style="width: 150px; -unity-text-align: middle-left; flex-grow: 0;" />
-                <uie:ToolbarButton text="Tags" display-tooltip-when-elided="true" name="TopBar5" style="width: 80px; -unity-text-align: middle-left; flex-grow: 1;" />
-            </uie:Toolbar>
-            <ui:ListView focusable="true" name="TopListView" item-height="18" virtualization-method="DynamicHeight" style="flex-grow: 1; flex-basis: 60px;" />
-        </ui:VisualElement>
-        <ui:VisualElement name="BottomGroup" style="height: 200px; border-left-width: 1px; border-right-width: 1px; border-top-width: 1px; border-bottom-width: 1px; border-left-color: rgb(0, 0, 0); border-right-color: rgb(0, 0, 0); border-top-color: rgb(0, 0, 0); border-bottom-color: rgb(0, 0, 0); margin-left: 0; margin-right: 0; margin-top: 1px; margin-bottom: 1px; display: flex;">
-            <uie:Toolbar name="BottomBar" style="height: 25px; margin-left: 1px; margin-right: 1px;">
-                <uie:ToolbarButton text="Include Assets" display-tooltip-when-elided="true" name="BottomBar1" style="width: 280px; -unity-text-align: middle-left; flex-grow: 1;" />
-                <uie:ToolbarButton text="GUID" display-tooltip-when-elided="true" name="BottomBar2" style="width: 280px; -unity-text-align: middle-left;" />
-            </uie:Toolbar>
-            <ui:ListView focusable="true" name="BottomListView" item-height="18" virtualization-method="DynamicHeight" style="flex-grow: 1;" />
-        </ui:VisualElement>
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
+    <ui:VisualElement name="TopGroup" style="flex-grow: 1; border-left-width: 1px; border-right-width: 1px; border-top-width: 1px; border-bottom-width: 1px; border-left-color: rgb(0, 0, 0); border-right-color: rgb(0, 0, 0); border-top-color: rgb(0, 0, 0); border-bottom-color: rgb(0, 0, 0); margin-left: 0; margin-right: 0; margin-top: 2px; margin-bottom: 1px; display: flex;">
+        <uie:Toolbar name="TopBar" style="height: 25px; margin-left: 1px; margin-right: 1px;">
+            <uie:ToolbarButton text="Bundle Name" display-tooltip-when-elided="true" name="TopBar1" style="width: 280px; -unity-text-align: middle-left; flex-grow: 1;" />
+            <uie:ToolbarButton text="Size" display-tooltip-when-elided="true" name="TopBar2" style="width: 100px; -unity-text-align: middle-left; flex-grow: 0;" />
+            <uie:ToolbarButton text="Hash" display-tooltip-when-elided="true" name="TopBar3" style="width: 280px; -unity-text-align: middle-left;" />
+            <uie:ToolbarButton text="LoadMethod" display-tooltip-when-elided="true" name="TopBar4" style="width: 150px; -unity-text-align: middle-left; flex-grow: 0;" />
+            <uie:ToolbarButton text="Tags" display-tooltip-when-elided="true" name="TopBar5" style="width: 80px; -unity-text-align: middle-left; flex-grow: 1;" />
+        </uie:Toolbar>
+        <ui:ListView focusable="true" name="TopListView" item-height="18" virtualization-method="DynamicHeight" style="flex-grow: 1; flex-basis: 60px;" />
+    </ui:VisualElement>
+    <ui:VisualElement name="BottomGroup" style="height: 200px; border-left-width: 1px; border-right-width: 1px; border-top-width: 1px; border-bottom-width: 1px; border-left-color: rgb(0, 0, 0); border-right-color: rgb(0, 0, 0); border-top-color: rgb(0, 0, 0); border-bottom-color: rgb(0, 0, 0); margin-left: 0; margin-right: 0; margin-top: 1px; margin-bottom: 1px; display: flex;">
+        <uie:Toolbar name="BottomBar" style="height: 25px; margin-left: 1px; margin-right: 1px;">
+            <uie:ToolbarButton text="Include Assets" display-tooltip-when-elided="true" name="BottomBar1" style="width: 280px; -unity-text-align: middle-left; flex-grow: 1;" />
+            <uie:ToolbarButton text="GUID" display-tooltip-when-elided="true" name="BottomBar2" style="width: 280px; -unity-text-align: middle-left;" />
+        </uie:Toolbar>
+        <ui:ListView focusable="true" name="BottomListView" item-height="18" virtualization-method="DynamicHeight" style="flex-grow: 1;" />
     </ui:VisualElement>
 </ui:UXML>

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

@@ -36,7 +36,7 @@ namespace YooAsset.Editor
 		public void InitViewer()
 		{
 			// 加载布局文件
-			_visualAsset = EditorHelper.LoadWindowUXML<ReporterSummaryViewer>();
+			_visualAsset = UxmlLoader.LoadWindowUXML<ReporterSummaryViewer>();
 			if (_visualAsset == null)
 				return;
 

Assets/YooAsset/Editor/EditorDefine.cs

@@ -2,13 +2,13 @@
 
 namespace YooAsset.Editor
 {
-	public class EditorDefine
+	public class WindowsDefine
 	{
 #if UNITY_2019_4_OR_NEWER
 		/// <summary>
 		/// 停靠窗口类型集合
 		/// </summary>
-		public static readonly Type[] DockedWindowTypes = 
+		public static readonly Type[] DockedWindowTypes =
 		{
 			typeof(AssetBundleBuilderWindow),
 			typeof(AssetBundleCollectorWindow),

Assets/YooAsset/Editor/EditorHelper.cs

@@ -1,132 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEditor;
-
-namespace YooAsset.Editor
-{
-	public class EditorHelper
-	{
-#if UNITY_2019_4_OR_NEWER
-		private readonly static Dictionary<System.Type, string> _uxmlDic = new Dictionary<System.Type, string>();
-
-		/*
-		static EditorHelper()
-		{
-			// 资源包收集
-			_uxmlDic.Add(typeof(AssetBundleCollectorWindow), "355c4ac5cdebddc4c8362bed6f17a79e");
-
-			// 资源包构建
-			_uxmlDic.Add(typeof(AssetBundleBuilderWindow), "28ba29adb4949284e8c48893218b0d9a");
-
-			// 资源包调试
-			_uxmlDic.Add(typeof(AssetBundleDebuggerWindow), "790db12999afd334e8fb6ba70ef0a947");
-			_uxmlDic.Add(typeof(DebuggerAssetListViewer), "31c6096c1cb29b4469096b7b4942a322");
-			_uxmlDic.Add(typeof(DebuggerBundleListViewer), "932a25ffd05c13c47994d66e9d73bc37");
-
-			// 构建报告
-			_uxmlDic.Add(typeof(AssetBundleReporterWindow), "9052b72c383e95043a0c7e7f369b1ad7");
-			_uxmlDic.Add(typeof(ReporterSummaryViewer), "f8929271050855e42a1ccc6b14993a04");
-			_uxmlDic.Add(typeof(ReporterAssetListViewer), "5f81bc15a55ee0a49a266f9d71e2372b");
-			_uxmlDic.Add(typeof(ReporterBundleListViewer), "56d6dbe0d65ce334a8996beb19612989");
-		}
-
-		/// <summary>
-		/// 加载窗口的布局文件
-		/// </summary>
-		public static UnityEngine.UIElements.VisualTreeAsset LoadWindowUXML<TWindow>() where TWindow : class
-		{
-			var windowType = typeof(TWindow);
-			if (_uxmlDic.TryGetValue(windowType, out string uxmlGUID))
-			{
-				string assetPath = AssetDatabase.GUIDToAssetPath(uxmlGUID);
-				if (string.IsNullOrEmpty(assetPath))
-					throw new System.Exception($"Invalid YooAsset uxml guid : {uxmlGUID}");
-				var visualTreeAsset = AssetDatabase.LoadAssetAtPath<UnityEngine.UIElements.VisualTreeAsset>(assetPath);
-				if (visualTreeAsset == null)
-					throw new System.Exception($"Failed to load {windowType}.uxml");
-				return visualTreeAsset;
-			}
-			else
-			{
-				throw new System.Exception($"Invalid YooAsset window type : {windowType}");
-			}
-		}
-		*/
-
-		/// <summary>
-		/// 加载窗口的布局文件
-		/// </summary>
-		public static UnityEngine.UIElements.VisualTreeAsset LoadWindowUXML<TWindow>() where TWindow : class
-		{
-			var windowType = typeof(TWindow);
-
-			// 缓存里查询并加载
-			if (_uxmlDic.TryGetValue(windowType, out string uxmlGUID))
-			{
-				string assetPath = AssetDatabase.GUIDToAssetPath(uxmlGUID);
-				if (string.IsNullOrEmpty(assetPath))
-				{
-					_uxmlDic.Clear();
-					throw new System.Exception($"Invalid UXML GUID : {uxmlGUID} ! Please close the window and open it again !");
-				}
-				var treeAsset = AssetDatabase.LoadAssetAtPath<UnityEngine.UIElements.VisualTreeAsset>(assetPath);
-				return treeAsset;
-			}
-
-			// 全局搜索并加载
-			string[] guids = AssetDatabase.FindAssets(windowType.Name);
-			if (guids.Length == 0)
-				throw new System.Exception($"Not found any assets : {windowType.Name}");
-
-			foreach (string assetGUID in guids)
-			{
-				string assetPath = AssetDatabase.GUIDToAssetPath(assetGUID);
-				var assetType = AssetDatabase.GetMainAssetTypeAtPath(assetPath);
-				if (assetType == typeof(UnityEngine.UIElements.VisualTreeAsset))
-				{
-					_uxmlDic.Add(windowType, assetGUID);
-					var treeAsset = AssetDatabase.LoadAssetAtPath<UnityEngine.UIElements.VisualTreeAsset>(assetPath);
-					return treeAsset;
-				}
-			}
-			throw new System.Exception($"Not found UXML file : {windowType.Name}");
-		}
-#endif
-
-		/// <summary>
-		/// 加载相关的配置文件
-		/// </summary>
-		public static TSetting LoadSettingData<TSetting>() where TSetting : ScriptableObject
-		{
-			var settingType = typeof(TSetting);
-			var guids = AssetDatabase.FindAssets($"t:{settingType.Name}");
-			if (guids.Length == 0)
-			{
-				Debug.LogWarning($"Create new {settingType.Name}.asset");
-				var setting = ScriptableObject.CreateInstance<TSetting>();
-				string filePath = $"Assets/{settingType.Name}.asset";
-				AssetDatabase.CreateAsset(setting, filePath);
-				AssetDatabase.SaveAssets();
-				AssetDatabase.Refresh();
-				return setting;
-			}
-			else
-			{
-				if (guids.Length != 1)
-				{
-					foreach (var guid in guids)
-					{
-						string path = AssetDatabase.GUIDToAssetPath(guid);
-						Debug.LogWarning($"Found multiple file : {path}");
-					}
-					throw new System.Exception($"Found multiple {settingType.Name} files !");
-				}
-
-				string filePath = AssetDatabase.GUIDToAssetPath(guids[0]);
-				var setting = AssetDatabase.LoadAssetAtPath<TSetting>(filePath);
-				return setting;
-			}
-		}
-	}
-}

Assets/YooAsset/Editor/EditorTools.cs

@@ -582,7 +582,7 @@ namespace YooAsset.Editor
 		/// <param name="key">关键字</param>
 		/// <param name="includeKey">分割的结果里是否包含关键字</param>
 		/// <param name="searchBegin">是否使用初始匹配的位置，否则使用末尾匹配的位置</param>
-		private static string Substring(string content, string key, bool includeKey, bool firstMatch = true)
+		public static string Substring(string content, string key, bool includeKey, bool firstMatch = true)
 		{
 			if (string.IsNullOrEmpty(key))
 				return content;

Assets/YooAsset/Editor/SettingLoader.cs

@@ -0,0 +1,45 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+	public class SettingLoader
+	{
+		/// <summary>
+		/// 加载相关的配置文件
+		/// </summary>
+		public static TSetting LoadSettingData<TSetting>() where TSetting : ScriptableObject
+		{
+			var settingType = typeof(TSetting);
+			var guids = AssetDatabase.FindAssets($"t:{settingType.Name}");
+			if (guids.Length == 0)
+			{
+				Debug.LogWarning($"Create new {settingType.Name}.asset");
+				var setting = ScriptableObject.CreateInstance<TSetting>();
+				string filePath = $"Assets/{settingType.Name}.asset";
+				AssetDatabase.CreateAsset(setting, filePath);
+				AssetDatabase.SaveAssets();
+				AssetDatabase.Refresh();
+				return setting;
+			}
+			else
+			{
+				if (guids.Length != 1)
+				{
+					foreach (var guid in guids)
+					{
+						string path = AssetDatabase.GUIDToAssetPath(guid);
+						Debug.LogWarning($"Found multiple file : {path}");
+					}
+					throw new System.Exception($"Found multiple {settingType.Name} files !");
+				}
+
+				string filePath = AssetDatabase.GUIDToAssetPath(guids[0]);
+				var setting = AssetDatabase.LoadAssetAtPath<TSetting>(filePath);
+				return setting;
+			}
+		}
+	}
+}

Assets/YooAsset/Editor/ShaderVariantCollector/ShaderVariantCollectorSettingData.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 using UnityEngine;
 using UnityEditor;
 
@@ -20,12 +19,17 @@ namespace YooAsset.Editor
 			}
 		}
 
+		/// <summary>
+		/// 配置数据是否被修改
+		/// </summary>
+		public static bool IsDirty { set; get; } = false;
+
 		/// <summary>
 		/// 加载配置文件
 		/// </summary>
 		private static void LoadSettingData()
 		{
-			_setting = EditorHelper.LoadSettingData<ShaderVariantCollectorSetting>();
+			_setting = SettingLoader.LoadSettingData<ShaderVariantCollectorSetting>();
 		}
 
 		/// <summary>
@@ -35,6 +39,7 @@ namespace YooAsset.Editor
 		{
 			if (Setting != null)
 			{
+				IsDirty = false;
 				EditorUtility.SetDirty(Setting);
 				AssetDatabase.SaveAssets();
 				Debug.Log($"{nameof(ShaderVariantCollectorSetting)}.asset is saved!");

Assets/YooAsset/Editor/ShaderVariantCollector/ShaderVariantCollectorWindow.cs

@@ -14,12 +14,13 @@ namespace YooAsset.Editor
 		[MenuItem("YooAsset/ShaderVariant Collector", false, 201)]
 		public static void ShowExample()
 		{
-			ShaderVariantCollectorWindow window = GetWindow<ShaderVariantCollectorWindow>("着色器变种收集工具", true, EditorDefine.DockedWindowTypes);
+			ShaderVariantCollectorWindow window = GetWindow<ShaderVariantCollectorWindow>("着色器变种收集工具", true, WindowsDefine.DockedWindowTypes);
 			window.minSize = new Vector2(800, 600);
 		}
 
 		private List<string> _packageNames;
 
+		private Button _saveButton;
 		private Button _collectButton;
 		private TextField _collectOutputField;
 		private Label _currentShaderCountField;
@@ -34,12 +35,16 @@ namespace YooAsset.Editor
 				VisualElement root = this.rootVisualElement;
 
 				// 加载布局文件
-				var visualAsset = EditorHelper.LoadWindowUXML<ShaderVariantCollectorWindow>();
+				var visualAsset = UxmlLoader.LoadWindowUXML<ShaderVariantCollectorWindow>();
 				if (visualAsset == null)
 					return;
 
 				visualAsset.CloneTree(root);
 
+				// 配置保存按钮
+				_saveButton = root.Q<Button>("SaveButton");
+				_saveButton.clicked += SaveBtn_clicked;
+
 				// 包裹名称列表
 				_packageNames = GetBuildPackageNames();
 
@@ -48,6 +53,7 @@ namespace YooAsset.Editor
 				_collectOutputField.SetValueWithoutNotify(ShaderVariantCollectorSettingData.Setting.SavePath);
 				_collectOutputField.RegisterValueChangedCallback(evt =>
 				{
+					ShaderVariantCollectorSettingData.IsDirty = true;
 					ShaderVariantCollectorSettingData.Setting.SavePath = _collectOutputField.value;
 				});
 
@@ -61,6 +67,7 @@ namespace YooAsset.Editor
 					_packageField.style.width = 350;
 					_packageField.RegisterValueChangedCallback(evt =>
 					{
+						ShaderVariantCollectorSettingData.IsDirty = true;
 						ShaderVariantCollectorSettingData.Setting.CollectPackage = _packageField.value;
 					});
 					packageContainer.Add(_packageField);
@@ -80,12 +87,14 @@ namespace YooAsset.Editor
 				_processCapacitySlider.label = $"Capacity ({_processCapacitySlider.value})";
 				_processCapacitySlider.RegisterValueChangedCallback(evt =>
 				{
+					ShaderVariantCollectorSettingData.IsDirty = true;
 					ShaderVariantCollectorSettingData.Setting.ProcessCapacity = _processCapacitySlider.value;
 					_processCapacitySlider.label = $"Capacity ({_processCapacitySlider.value})";
 				});
 #else
 				_processCapacitySlider.RegisterValueChangedCallback(evt =>
 				{
+					ShaderVariantCollectorSettingData.IsDirty = true;
 					ShaderVariantCollectorSettingData.Setting.ProcessCapacity = _processCapacitySlider.value;
 				});
 #endif
@@ -102,8 +111,27 @@ namespace YooAsset.Editor
 				Debug.LogError(e.ToString());
 			}
 		}
+		public void OnDestroy()
+		{
+			if (ShaderVariantCollectorSettingData.IsDirty)
+				ShaderVariantCollectorSettingData.SaveFile();
+		}
 		private void Update()
 		{
+			if (_saveButton != null)
+			{
+				if (ShaderVariantCollectorSettingData.IsDirty)
+				{
+					if (_saveButton.enabledSelf == false)
+						_saveButton.SetEnabled(true);
+				}
+				else
+				{
+					if (_saveButton.enabledSelf)
+						_saveButton.SetEnabled(false);
+				}
+			}
+
 			if (_currentShaderCountField != null)
 			{
 				int currentShaderCount = ShaderVariantCollectionHelper.GetCurrentShaderVariantCollectionShaderCount();
@@ -117,6 +145,10 @@ namespace YooAsset.Editor
 			}
 		}
 
+		private void SaveBtn_clicked()
+		{
+			ShaderVariantCollectorSettingData.SaveFile();
+		}
 		private void CollectButton_clicked()
 		{
 			string savePath = ShaderVariantCollectorSettingData.Setting.SavePath;

Assets/YooAsset/Editor/ShaderVariantCollector/ShaderVariantCollectorWindow.uxml

@@ -1,9 +1,10 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
+    <uie:Toolbar name="Toolbar" style="display: flex; flex-direction: row-reverse;">
+        <ui:Button text="Save" display-tooltip-when-elided="true" name="SaveButton" style="background-color: rgb(40, 106, 42);" />
+    </uie:Toolbar>
     <ui:VisualElement name="CollectContainer">
         <ui:TextField picking-mode="Ignore" label="文件保存路径" name="CollectOutput" style="height: 22px;" />
-        <ui:VisualElement name="PackageContainer" style="height: 24px;">
-            <uie:Toolbar name="Toolbar" style="display: flex; flex-direction: row-reverse;" />
-        </ui:VisualElement>
+        <ui:VisualElement name="PackageContainer" style="height: 24px;" />
         <ui:Label text="Current Shader Count" display-tooltip-when-elided="true" name="CurrentShaderCount" style="height: 20px; padding-left: 4px;" />
         <ui:Label text="Current Variant Count" display-tooltip-when-elided="true" name="CurrentVariantCount" style="height: 20px; padding-left: 4px;" />
         <ui:SliderInt picking-mode="Ignore" label="Capacity" value="9999" high-value="1000" name="ProcessCapacity" low-value="10" show-input-field="true" />

Assets/YooAsset/Editor/UxmlDefine.cs

@@ -0,0 +1,39 @@
+#if UNITY_2020_3_OR_NEWER
+using System;
+using UnityEditor;
+using UnityEngine;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+namespace YooAsset.Editor
+{
+	/// <summary>
+	/// 分屏控件
+	/// </summary>
+	public class SplitView : TwoPaneSplitView
+	{
+		public new class UxmlFactory : UxmlFactory<SplitView, TwoPaneSplitView.UxmlTraits>
+		{
+		}
+
+		/// <summary>
+		/// 窗口分屏适配
+		/// </summary>
+		public static void Adjuster(VisualElement root)
+		{
+			var topGroup = root.Q<VisualElement>("TopGroup");
+			var bottomGroup = root.Q<VisualElement>("BottomGroup");
+			topGroup.style.minHeight = 100f;
+			bottomGroup.style.minHeight = 100f;
+			root.Remove(topGroup);
+			root.Remove(bottomGroup);
+			var spliteView = new SplitView();
+			spliteView.fixedPaneInitialDimension = 300;
+			spliteView.orientation = TwoPaneSplitViewOrientation.Vertical;
+			spliteView.contentContainer.Add(topGroup);
+			spliteView.contentContainer.Add(bottomGroup);
+			root.Add(spliteView);
+		}
+	}
+}
+#endif

Assets/YooAsset/Editor/UxmlDefine.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4eacb00a7e3873740b599112dfcf0123
+guid: 0c3f4136cf7142346ae33e8a82cbdb27
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/YooAsset/Editor/UxmlLoader.cs

@@ -0,0 +1,55 @@
+#if UNITY_2019_4_OR_NEWER
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+namespace YooAsset.Editor
+{
+	public class UxmlLoader
+	{
+		private readonly static Dictionary<System.Type, string> _uxmlDic = new Dictionary<System.Type, string>();
+
+		/// <summary>
+		/// 加载窗口的布局文件
+		/// </summary>
+		public static UnityEngine.UIElements.VisualTreeAsset LoadWindowUXML<TWindow>() where TWindow : class
+		{
+			var windowType = typeof(TWindow);
+
+			// 缓存里查询并加载
+			if (_uxmlDic.TryGetValue(windowType, out string uxmlGUID))
+			{
+				string assetPath = AssetDatabase.GUIDToAssetPath(uxmlGUID);
+				if (string.IsNullOrEmpty(assetPath))
+				{
+					_uxmlDic.Clear();
+					throw new System.Exception($"Invalid UXML GUID : {uxmlGUID} ! Please close the window and open it again !");
+				}
+				var treeAsset = AssetDatabase.LoadAssetAtPath<UnityEngine.UIElements.VisualTreeAsset>(assetPath);
+				return treeAsset;
+			}
+
+			// 全局搜索并加载
+			string[] guids = AssetDatabase.FindAssets(windowType.Name);
+			if (guids.Length == 0)
+				throw new System.Exception($"Not found any assets : {windowType.Name}");
+
+			foreach (string assetGUID in guids)
+			{
+				string assetPath = AssetDatabase.GUIDToAssetPath(assetGUID);
+				var assetType = AssetDatabase.GetMainAssetTypeAtPath(assetPath);
+				if (assetType == typeof(UnityEngine.UIElements.VisualTreeAsset))
+				{
+					_uxmlDic.Add(windowType, assetGUID);
+					var treeAsset = AssetDatabase.LoadAssetAtPath<UnityEngine.UIElements.VisualTreeAsset>(assetPath);
+					return treeAsset;
+				}
+			}
+			throw new System.Exception($"Not found UXML file : {windowType.Name}");
+		}
+	}
+}
+#endif

Assets/YooAsset/Editor/UxmlLoader.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e9274735f1f14af4b893c21a4240b816
+guid: ed843f102c2467845b34fdce5d537e47
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/YooAsset/Runtime/AssetReference.cs

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

Assets/YooAsset/Runtime/AssetSystem/AssetSystem.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 
@@ -20,22 +21,37 @@ namespace YooAsset
 		private bool _isUnloadSafe = true;
 		private string _packageName;
 		private bool _simulationOnEditor;
-		private int _loadingMaxNumber;
+		private long _loadingMaxTimeSlice;
+		public int DownloadFailedTryAgain { private set; get; }
 		public IDecryptionServices DecryptionServices { private set; get; }
 		public IBundleServices BundleServices { private set; get; }
 
+		// 计时器相关
+		private Stopwatch _watch;
+		private long _frameTime;
+		private bool IsBusy
+		{
+			get
+			{
+				return _watch.ElapsedMilliseconds - _frameTime >= _loadingMaxTimeSlice;
+			}
+		}
+
 
 		/// <summary>
 		/// 初始化
 		/// 注意：在使用AssetSystem之前需要初始化
 		/// </summary>
-		public void Initialize(string packageName, bool simulationOnEditor, int loadingMaxNumber, IDecryptionServices decryptionServices, IBundleServices bundleServices)
+		public void Initialize(string packageName, bool simulationOnEditor, long loadingMaxTimeSlice, int downloadFailedTryAgain,
+			IDecryptionServices decryptionServices, IBundleServices bundleServices)
 		{
 			_packageName = packageName;
 			_simulationOnEditor = simulationOnEditor;
-			_loadingMaxNumber = loadingMaxNumber;
+			_loadingMaxTimeSlice = loadingMaxTimeSlice;
+			DownloadFailedTryAgain = downloadFailedTryAgain;
 			DecryptionServices = decryptionServices;
 			BundleServices = bundleServices;
+			_watch = Stopwatch.StartNew();
 		}
 
 		/// <summary>
@@ -43,6 +59,8 @@ namespace YooAsset
 		/// </summary>
 		public void Update()
 		{
+			_frameTime = _watch.ElapsedMilliseconds;
+
 			// 更新加载器	
 			foreach (var loader in _loaderList)
 			{
@@ -51,24 +69,12 @@ namespace YooAsset
 
 			// 更新资源提供者
 			// 注意：循环更新的时候，可能会扩展列表
-			// 注意：不能限制场景对象的加载
 			_isUnloadSafe = false;
-			int loadingCount = 0;
 			for (int i = 0; i < _providerList.Count; i++)
 			{
-				var provider = _providerList[i];
-				if (provider.IsSceneProvider())
-				{
-					provider.Update();
-				}
-				else
-				{
-					if (loadingCount < _loadingMaxNumber)
-						provider.Update();
-
-					if (provider.IsDone == false)
-						loadingCount++;
-				}
+				if (IsBusy)
+					break;
+				_providerList[i].Update();
 			}
 			_isUnloadSafe = true;
 		}
@@ -117,36 +123,21 @@ namespace YooAsset
 		}
 		private void UnloadUnusedAssetsInternal()
 		{
-			if (_simulationOnEditor)
+			for (int i = _loaderList.Count - 1; i >= 0; i--)
 			{
-				for (int i = _providerList.Count - 1; i >= 0; i--)
-				{
-					var provider = _providerList[i];
-					if (provider.CanDestroy())
-					{
-						provider.Destroy();
-						_providerList.RemoveAt(i);
-						_providerDic.Remove(provider.ProviderGUID);
-					}
-				}
+				BundleLoaderBase loader = _loaderList[i];
+				loader.TryDestroyAllProviders();
 			}
-			else
+
+			for (int i = _loaderList.Count - 1; i >= 0; i--)
 			{
-				for (int i = _loaderList.Count - 1; i >= 0; i--)
+				BundleLoaderBase loader = _loaderList[i];
+				if (loader.CanDestroy())
 				{
-					BundleLoaderBase loader = _loaderList[i];
-					loader.TryDestroyAllProviders();
-				}
-				for (int i = _loaderList.Count - 1; i >= 0; i--)
-				{
-					BundleLoaderBase loader = _loaderList[i];
-					if (loader.CanDestroy())
-					{
-						string bundleName = loader.MainBundleInfo.Bundle.BundleName;
-						loader.Destroy(false);
-						_loaderList.RemoveAt(i);
-						_loaderDic.Remove(bundleName);
-					}
+					string bundleName = loader.MainBundleInfo.Bundle.BundleName;
+					loader.Destroy(false);
+					_loaderList.RemoveAt(i);
+					_loaderDic.Remove(bundleName);
 				}
 			}
 		}
@@ -306,9 +297,6 @@ namespace YooAsset
 			// 释放子场景句柄
 			_sceneHandles[providerGUID].ReleaseInternal();
 			_sceneHandles.Remove(providerGUID);
-
-			// 卸载未被使用的资源（包括场景）
-			UnloadUnusedAssets();
 		}
 		internal void UnloadAllScene()
 		{
@@ -318,9 +306,6 @@ namespace YooAsset
 				valuePair.Value.ReleaseInternal();
 			}
 			_sceneHandles.Clear();
-
-			// 卸载未被使用的资源（包括场景）
-			UnloadUnusedAssets();
 		}
 		internal void ClearSceneHandle()
 		{
@@ -385,17 +370,24 @@ namespace YooAsset
 				return loader;
 
 			// 新增下载需求
+			if (_simulationOnEditor)
+			{
+				loader = new VirtualBundleFileLoader(this, bundleInfo);
+			}
+			else
+			{
 #if UNITY_WEBGL
 			if (bundleInfo.Bundle.IsRawFile)
-				loader = new RawBundleFileLoader(this, bundleInfo);
+				loader = new RawBundleWebLoader(this, bundleInfo);
 			else
 				loader = new AssetBundleWebLoader(this, bundleInfo);
 #else
-			if (bundleInfo.Bundle.IsRawFile)
-				loader = new RawBundleFileLoader(this, bundleInfo);
-			else
-				loader = new AssetBundleFileLoader(this, bundleInfo);
+				if (bundleInfo.Bundle.IsRawFile)
+					loader = new RawBundleFileLoader(this, bundleInfo);
+				else
+					loader = new AssetBundleFileLoader(this, bundleInfo);
 #endif
+			}
 
 			_loaderList.Add(loader);
 			_loaderDic.Add(bundleName, loader);
@@ -430,13 +422,8 @@ namespace YooAsset
 				providerInfo.RefCount = provider.RefCount;
 				providerInfo.Status = provider.Status.ToString();
 				providerInfo.DependBundleInfos = new List<DebugBundleInfo>();
+				provider.GetBundleDebugInfos(providerInfo.DependBundleInfos);
 				result.Add(providerInfo);
-
-				if (provider is BundledProvider)
-				{
-					BundledProvider temp = provider as BundledProvider;
-					temp.GetBundleDebugInfos(providerInfo.DependBundleInfos);
-				}
 			}
 			return result;
 		}

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

@@ -92,58 +92,63 @@ namespace YooAsset
 		/// <summary>
 		/// 同步初始化游戏对象
 		/// </summary>
-		/// <param name="parent">父类对象</param>
-		/// <returns></returns>
-		public GameObject InstantiateSync(Transform parent = null)
+		public GameObject InstantiateSync()
 		{
-			return InstantiateSyncInternal(Vector3.zero, Quaternion.identity, parent);
+			return InstantiateSyncInternal(false, Vector3.zero, Quaternion.identity, null, false);
 		}
-
-		/// <summary>
-		/// 同步初始化游戏对象
-		/// </summary>
-		/// <param name="position">坐标</param>
-		/// <param name="rotation">角度</param>
-		/// <param name="parent">父类对象</param>
-		public GameObject InstantiateSync(Vector3 position, Quaternion rotation, Transform parent = null)
+		public GameObject InstantiateSync(Transform parent)
 		{
-			return InstantiateSyncInternal(position, rotation, parent);
+			return InstantiateSyncInternal(false, Vector3.zero, Quaternion.identity, parent, false);
+		}
+		public GameObject InstantiateSync(Transform parent, bool worldPositionStays)
+		{
+			return InstantiateSyncInternal(false, Vector3.zero, Quaternion.identity, parent, worldPositionStays);
+		}
+		public GameObject InstantiateSync(Vector3 position, Quaternion rotation)
+		{
+			return InstantiateSyncInternal(true, position, rotation, null, false);
+		}
+		public GameObject InstantiateSync(Vector3 position, Quaternion rotation, Transform parent)
+		{
+			return InstantiateSyncInternal(true, position, rotation, parent, false);
 		}
 
 		/// <summary>
 		/// 异步初始化游戏对象
 		/// </summary>
-		/// <param name="parent">父类对象</param>
-		public InstantiateOperation InstantiateAsync(Transform parent = null)
+		public InstantiateOperation InstantiateAsync()
 		{
-			return InstantiateAsyncInternal(Vector3.zero, Quaternion.identity, parent);
+			return InstantiateAsyncInternal(false, Vector3.zero, Quaternion.identity, null, false);
+		}
+		public InstantiateOperation InstantiateAsync(Transform parent)
+		{
+			return InstantiateAsyncInternal(false, Vector3.zero, Quaternion.identity, parent, false);
+		}
+		public InstantiateOperation InstantiateAsync(Transform parent, bool worldPositionStays)
+		{
+			return InstantiateAsyncInternal(false, Vector3.zero, Quaternion.identity, parent, worldPositionStays);
+		}
+		public InstantiateOperation InstantiateAsync(Vector3 position, Quaternion rotation)
+		{
+			return InstantiateAsyncInternal(true, position, rotation, null, false);
+		}
+		public InstantiateOperation InstantiateAsync(Vector3 position, Quaternion rotation, Transform parent)
+		{
+			return InstantiateAsyncInternal(true, position, rotation, parent, false);
 		}
 
-		/// <summary>
-		/// 异步初始化游戏对象
-		/// </summary>
-		/// <param name="position">坐标</param>
-		/// <param name="rotation">角度</param>
-		/// <param name="parent">父类对象</param>
-		public InstantiateOperation InstantiateAsync(Vector3 position, Quaternion rotation, Transform parent = null)
-		{
-			return InstantiateAsyncInternal(position, rotation, parent);
-		}
-
-
-		private GameObject InstantiateSyncInternal(Vector3 position, Quaternion rotation, Transform parent)
+		private GameObject InstantiateSyncInternal(bool setPositionAndRotation, Vector3 position, Quaternion rotation, Transform parent, bool worldPositionStays)
 		{
 			if (IsValidWithWarning == false)
 				return null;
 			if (Provider.AssetObject == null)
 				return null;
 
-			GameObject clone = UnityEngine.Object.Instantiate(Provider.AssetObject as GameObject, position, rotation, parent);			
-			return clone;
+			return InstantiateOperation.InstantiateInternal(Provider.AssetObject, setPositionAndRotation, position, rotation, parent, worldPositionStays);
 		}
-		private InstantiateOperation InstantiateAsyncInternal(Vector3 position, Quaternion rotation, Transform parent)
+		private InstantiateOperation InstantiateAsyncInternal(bool setPositionAndRotation, Vector3 position, Quaternion rotation, Transform parent, bool worldPositionStays)
 		{
-			InstantiateOperation operation = new InstantiateOperation(this, position, rotation, parent);
+			InstantiateOperation operation = new InstantiateOperation(this, setPositionAndRotation, position, rotation, parent, worldPositionStays);
 			OperationSystem.StartOperation(operation);
 			return operation;
 		}

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

@@ -26,7 +26,7 @@ namespace YooAsset
 		private DownloaderBase _unpacker;
 		private DownloaderBase _downloader;
 		private AssetBundleCreateRequest _createRequest;
-		private FileStream _fileStream;
+		private Stream _stream;
 
 
 		public AssetBundleFileLoader(AssetSystemImpl impl, BundleInfo bundleInfo) : base(impl, bundleInfo)
@@ -81,7 +81,7 @@ namespace YooAsset
 			// 1. 从服务器下载
 			if (_steps == ESteps.Download)
 			{
-				int failedTryAgain = int.MaxValue;
+				int failedTryAgain = Impl.DownloadFailedTryAgain;
 				_downloader = DownloadSystem.BeginDownload(MainBundleInfo, failedTryAgain);
 				_steps = ESteps.CheckDownload;
 			}
@@ -110,7 +110,7 @@ namespace YooAsset
 			if (_steps == ESteps.Unpack)
 			{
 				int failedTryAgain = 1;
-				var bundleInfo = PatchManifestTools.GetUnpackInfo(MainBundleInfo.Bundle);
+				var bundleInfo = ManifestTools.GetUnpackInfo(MainBundleInfo.Bundle);
 				_unpacker = DownloadSystem.BeginDownload(bundleInfo, failedTryAgain);
 				_steps = ESteps.CheckUnpack;
 			}
@@ -196,12 +196,12 @@ namespace YooAsset
 					}
 					else if (loadMethod == EBundleLoadMethod.LoadFromStream)
 					{
-						_fileStream = Impl.DecryptionServices.LoadFromStream(fileInfo);
+						_stream = Impl.DecryptionServices.LoadFromStream(fileInfo);
 						uint managedReadBufferSize = Impl.DecryptionServices.GetManagedReadBufferSize();
 						if (_isWaitForAsyncComplete)
-							CacheBundle = AssetBundle.LoadFromStream(_fileStream, 0, managedReadBufferSize);
+							CacheBundle = AssetBundle.LoadFromStream(_stream, 0, managedReadBufferSize);
 						else
-							_createRequest = AssetBundle.LoadFromStreamAsync(_fileStream, 0, managedReadBufferSize);
+							_createRequest = AssetBundle.LoadFromStreamAsync(_stream, 0, managedReadBufferSize);
 					}
 					else
 					{
@@ -265,11 +265,11 @@ namespace YooAsset
 		{
 			base.Destroy(forceDestroy);
 
-			if (_fileStream != null)
+			if (_stream != null)
 			{
-				_fileStream.Close();
-				_fileStream.Dispose();
-				_fileStream = null;
+				_stream.Close();
+				_stream.Dispose();
+				_stream = null;
 			}
 		}
 
@@ -286,9 +286,12 @@ namespace YooAsset
 				// 文件解压
 				if (_unpacker != null)
 				{
-					_unpacker.Update();
 					if (_unpacker.IsDone() == false)
+					{
+						_unpacker.WaitForAsyncComplete = true;
+						_unpacker.Update();
 						continue;
+					}
 				}
 
 				// 保险机制
@@ -299,7 +302,7 @@ namespace YooAsset
 					if (_isShowWaitForAsyncError == false)
 					{
 						_isShowWaitForAsyncError = true;
-						YooLogger.Error($"WaitForAsyncComplete failed ! Try load bundle : {MainBundleInfo.Bundle.BundleName} from remote with sync load method !");
+						YooLogger.Error($"{nameof(WaitForAsyncComplete)} failed ! Try load bundle : {MainBundleInfo.Bundle.BundleName} from remote with sync load method !");
 					}
 					break;
 				}

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

@@ -7,6 +7,9 @@ using UnityEngine.Networking;
 
 namespace YooAsset
 {
+	/// <summary>
+	/// WebGL平台加载器
+	/// </summary>
 	internal sealed class AssetBundleWebLoader : BundleLoaderBase
 	{
 		private enum ESteps
@@ -24,7 +27,6 @@ namespace YooAsset
 
 		private ESteps _steps = ESteps.None;
 		private float _tryTimer = 0;
-		private bool _isShowWaitForAsyncError = false;
 		private DownloaderBase _downloader;
 		private UnityWebRequest _webRequest;
 		private AssetBundleCreateRequest _createRequest;
@@ -68,7 +70,7 @@ namespace YooAsset
 			// 1. 从服务器下载
 			if (_steps == ESteps.Download)
 			{
-				int failedTryAgain = int.MaxValue;
+				int failedTryAgain = Impl.DownloadFailedTryAgain;
 				_downloader = DownloadSystem.BeginDownload(MainBundleInfo, failedTryAgain);
 				_steps = ESteps.CheckDownload;
 			}
@@ -225,10 +227,11 @@ namespace YooAsset
 		/// </summary>
 		public override void WaitForAsyncComplete()
 		{
-			if (_isShowWaitForAsyncError == false)
+			if (IsDone() == false)
 			{
-				_isShowWaitForAsyncError = true;
-				YooLogger.Error($"WebGL platform not support {nameof(WaitForAsyncComplete)} ! Use the async load method instead of the sync load method !");
+				Status = EStatus.Failed;
+				LastError = $"{nameof(WaitForAsyncComplete)} failed ! WebGL platform not support sync load method !";
+				YooLogger.Error(LastError);
 			}
 		}
 	}

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

@@ -16,7 +16,6 @@ namespace YooAsset
 		}
 
 		private ESteps _steps = ESteps.None;
-		private bool _isShowWaitForAsyncError = false;
 		private DownloaderBase _unpacker;
 		private DownloaderBase _downloader;
 
@@ -42,7 +41,7 @@ namespace YooAsset
 				}
 				else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromStreaming)
 				{
-#if UNITY_ANDROID || UNITY_WEBGL
+#if UNITY_ANDROID
 					_steps = ESteps.Unpack;
 					FileLoadPath = MainBundleInfo.Bundle.CachedDataFilePath;
 #else
@@ -64,7 +63,7 @@ namespace YooAsset
 			// 1. 下载远端文件
 			if (_steps == ESteps.Download)
 			{
-				int failedTryAgain = int.MaxValue;
+				int failedTryAgain = Impl.DownloadFailedTryAgain;
 				_downloader = DownloadSystem.BeginDownload(MainBundleInfo, failedTryAgain);
 				_steps = ESteps.CheckDownload;
 			}
@@ -93,7 +92,7 @@ namespace YooAsset
 			if (_steps == ESteps.Unpack)
 			{
 				int failedTryAgain = 1;
-				var bundleInfo = PatchManifestTools.GetUnpackInfo(MainBundleInfo.Bundle);
+				var bundleInfo = ManifestTools.GetUnpackInfo(MainBundleInfo.Bundle);
 				_unpacker = DownloadSystem.BeginDownload(bundleInfo, failedTryAgain);
 				_steps = ESteps.CheckUnpack;
 			}
@@ -125,13 +124,14 @@ namespace YooAsset
 				DownloadProgress = 1f;
 				DownloadedBytes = (ulong)MainBundleInfo.Bundle.FileSize;
 
-				_steps = ESteps.Done;
 				if (File.Exists(FileLoadPath))
 				{
+					_steps = ESteps.Done;
 					Status = EStatus.Succeed;
 				}
 				else
 				{
+					_steps = ESteps.Done;
 					Status = EStatus.Failed;
 					LastError = $"Raw file not found : {FileLoadPath}";
 				}
@@ -149,20 +149,24 @@ namespace YooAsset
 				// 文件解压
 				if (_unpacker != null)
 				{
-					_unpacker.Update();
 					if (_unpacker.IsDone() == false)
+					{
+						_unpacker.WaitForAsyncComplete = true;
+						_unpacker.Update();
 						continue;
+					}
 				}
 
 				// 保险机制
-				// 注意：如果需要从WEB端下载资源，可能会触发保险机制！
+				// 注意：如果需要从远端下载资源，可能会触发保险机制！
 				frame--;
 				if (frame == 0)
 				{
-					if (_isShowWaitForAsyncError == false)
+					if (IsDone() == false)
 					{
-						_isShowWaitForAsyncError = true;
-						YooLogger.Error($"WaitForAsyncComplete failed ! Try load bundle : {MainBundleInfo.Bundle.BundleName} from remote with sync load method !");
+						Status = EStatus.Failed;
+						LastError = $"WaitForAsyncComplete failed ! Try load bundle : {MainBundleInfo.Bundle.BundleName} from remote with sync load method !";
+						YooLogger.Error(LastError);
 					}
 					break;
 				}

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

@@ -0,0 +1,151 @@
+using System.IO;
+
+namespace YooAsset
+{
+	/// <summary>
+	/// WebGL平台加载器
+	/// </summary>
+	internal class RawBundleWebLoader : BundleLoaderBase
+	{
+		private enum ESteps
+		{
+			None,
+			Download,
+			CheckDownload,
+			Website,
+			CheckWebsite,
+			CheckFile,
+			Done,
+		}
+
+		private ESteps _steps = ESteps.None;
+		private DownloaderBase _website;
+		private DownloaderBase _downloader;
+
+
+		public RawBundleWebLoader(AssetSystemImpl impl, BundleInfo bundleInfo) : base(impl, bundleInfo)
+		{
+		}
+
+		/// <summary>
+		/// 轮询更新
+		/// </summary>
+		public override void Update()
+		{
+			if (_steps == ESteps.Done)
+				return;
+
+			if (_steps == ESteps.None)
+			{
+				if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromRemote)
+				{
+					_steps = ESteps.Download;
+					FileLoadPath = MainBundleInfo.Bundle.CachedDataFilePath;
+				}
+				else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromStreaming)
+				{
+					_steps = ESteps.Website;
+					FileLoadPath = MainBundleInfo.Bundle.CachedDataFilePath;
+				}
+				else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromCache)
+				{
+					_steps = ESteps.CheckFile;
+					FileLoadPath = MainBundleInfo.Bundle.CachedDataFilePath;
+				}
+				else
+				{
+					throw new System.NotImplementedException(MainBundleInfo.LoadMode.ToString());
+				}
+			}
+
+			// 1. 下载远端文件
+			if (_steps == ESteps.Download)
+			{
+				int failedTryAgain = Impl.DownloadFailedTryAgain;
+				_downloader = DownloadSystem.BeginDownload(MainBundleInfo, failedTryAgain);
+				_steps = ESteps.CheckDownload;
+			}
+
+			// 2. 检测下载结果
+			if (_steps == ESteps.CheckDownload)
+			{
+				DownloadProgress = _downloader.DownloadProgress;
+				DownloadedBytes = _downloader.DownloadedBytes;
+				if (_downloader.IsDone() == false)
+					return;
+
+				if (_downloader.HasError())
+				{
+					_steps = ESteps.Done;
+					Status = EStatus.Failed;
+					LastError = _downloader.GetLastError();
+				}
+				else
+				{
+					_steps = ESteps.CheckFile;
+				}
+			}
+
+			// 3. 从站点下载
+			if (_steps == ESteps.Website)
+			{
+				int failedTryAgain = 1;
+				var bundleInfo = ManifestTools.GetUnpackInfo(MainBundleInfo.Bundle);
+				_website = DownloadSystem.BeginDownload(bundleInfo, failedTryAgain);
+				_steps = ESteps.CheckWebsite;
+			}
+
+			// 4. 检测站点下载
+			if (_steps == ESteps.CheckWebsite)
+			{
+				DownloadProgress = _website.DownloadProgress;
+				DownloadedBytes = _website.DownloadedBytes;
+				if (_website.IsDone() == false)
+					return;
+
+				if (_website.HasError())
+				{
+					_steps = ESteps.Done;
+					Status = EStatus.Failed;
+					LastError = _website.GetLastError();
+				}
+				else
+				{
+					_steps = ESteps.CheckFile;
+				}
+			}
+
+			// 5. 检测结果
+			if (_steps == ESteps.CheckFile)
+			{
+				// 设置下载进度
+				DownloadProgress = 1f;
+				DownloadedBytes = (ulong)MainBundleInfo.Bundle.FileSize;
+
+				_steps = ESteps.Done;
+				if (File.Exists(FileLoadPath))
+				{
+					Status = EStatus.Succeed;
+				}
+				else
+				{
+					Status = EStatus.Failed;
+					LastError = $"Raw file not found : {FileLoadPath}";
+				}
+			}
+		}
+
+		/// <summary>
+		/// 主线程等待异步操作完毕
+		/// </summary>
+		public override void WaitForAsyncComplete()
+		{
+			if (IsDone() == false)
+			{
+				Status = EStatus.Failed;
+				LastError = $"{nameof(WaitForAsyncComplete)} failed ! WebGL platform not support sync load method !";
+				YooLogger.Error(LastError);
+			}
+		}
+	}
+}

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b6c8230c0d097534e950f4e84ce01e96
+guid: 1d16b689f73611e44bd01a4cc429a6ac
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -0,0 +1,82 @@
+
+namespace YooAsset
+{
+	internal class VirtualBundleFileLoader : BundleLoaderBase
+	{
+		private enum ESteps
+		{
+			None,
+			CheckFile,
+			Done,
+		}
+
+		private ESteps _steps = ESteps.None;
+
+		public VirtualBundleFileLoader(AssetSystemImpl impl, BundleInfo bundleInfo) : base(impl, bundleInfo)
+		{
+		}
+
+		/// <summary>
+		/// 轮询更新
+		/// </summary>
+		public override void Update()
+		{
+			if (_steps == ESteps.Done)
+				return;
+
+			if (_steps == ESteps.None)
+			{
+				if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromEditor)
+				{
+					_steps = ESteps.CheckFile;
+				}
+				else
+				{
+					throw new System.NotImplementedException(MainBundleInfo.LoadMode.ToString());
+				}
+			}
+
+			// 1. 检测结果
+			if (_steps == ESteps.CheckFile)
+			{
+				// 设置下载进度
+				DownloadProgress = 1f;
+				DownloadedBytes = (ulong)MainBundleInfo.Bundle.FileSize;
+
+				_steps = ESteps.Done;
+				Status = EStatus.Succeed;
+			}
+		}
+
+		/// <summary>
+		/// 主线程等待异步操作完毕
+		/// </summary>
+		public override void WaitForAsyncComplete()
+		{
+			int frame = 1000;
+			while (true)
+			{
+				// 保险机制
+				// 注意：如果需要从远端下载资源，可能会触发保险机制！
+				frame--;
+				if (frame == 0)
+				{
+					if (IsDone() == false)
+					{
+						Status = EStatus.Failed;
+						LastError = $"WaitForAsyncComplete failed ! Try load bundle : {MainBundleInfo.Bundle.BundleName} from remote with sync load method !";
+						YooLogger.Error(LastError);
+					}
+					break;
+				}
+
+				// 驱动流程
+				Update();
+
+				// 完成后退出
+				if (IsDone())
+					break;
+			}
+		}
+	}
+}

Assets/YooAsset/Runtime/AssetSystem/Loader/VirtualBundleFileLoader.cs.meta

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

Assets/YooAsset/Runtime/AssetSystem/Operations/InstantiateOperation.cs

@@ -12,9 +12,11 @@ namespace YooAsset
 		}
 
 		private readonly AssetOperationHandle _handle;
+		private readonly bool _setPositionAndRotation;
 		private readonly Vector3 _position;
 		private readonly Quaternion _rotation;
 		private readonly Transform _parent;
+		private readonly bool _worldPositionStays;
 		private ESteps _steps = ESteps.None;
 
 		/// <summary>
@@ -23,12 +25,14 @@ namespace YooAsset
 		public GameObject Result = null;
 
 
-		internal InstantiateOperation(AssetOperationHandle handle, Vector3 position, Quaternion rotation, Transform parent)
+		internal InstantiateOperation(AssetOperationHandle handle, bool setPositionAndRotation, Vector3 position, Quaternion rotation, Transform parent, bool worldPositionStays)
 		{
 			_handle = handle;
+			_setPositionAndRotation = setPositionAndRotation;
 			_position = position;
 			_rotation = rotation;
 			_parent = parent;
+			_worldPositionStays = worldPositionStays;
 		}
 		internal override void Start()
 		{
@@ -61,7 +65,7 @@ namespace YooAsset
 				}
 
 				// 实例化游戏对象
-				Result = Object.Instantiate(_handle.AssetObject as GameObject, _position, _rotation, _parent);
+				Result = InstantiateInternal(_handle.AssetObject, _setPositionAndRotation, _position, _rotation, _parent, _worldPositionStays);
 
 				_steps = ESteps.Done;
 				Status = EOperationStatus.Succeed;
@@ -91,5 +95,38 @@ namespace YooAsset
 			_handle.WaitForAsyncComplete();
 			Update();
 		}
+
+		internal static GameObject InstantiateInternal(UnityEngine.Object assetObject, bool setPositionAndRotation, Vector3 position, Quaternion rotation, Transform parent, bool worldPositionStays)
+		{
+			if (assetObject == null)
+				return null;
+
+			if (setPositionAndRotation)
+			{
+				if (parent != null)
+				{
+					GameObject clone = UnityEngine.Object.Instantiate(assetObject as GameObject, position, rotation, parent);
+					return clone;
+				}
+				else
+				{
+					GameObject clone = UnityEngine.Object.Instantiate(assetObject as GameObject, position, rotation);
+					return clone;
+				}
+			}
+			else
+			{
+				if (parent != null)
+				{
+					GameObject clone = UnityEngine.Object.Instantiate(assetObject as GameObject, parent, worldPositionStays);
+					return clone;
+				}
+				else
+				{
+					GameObject clone = UnityEngine.Object.Instantiate(assetObject as GameObject);
+					return clone;
+				}
+			}
+		}
 	}
 }

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

@@ -4,7 +4,7 @@ using UnityEngine;
 
 namespace YooAsset
 {
-	internal sealed class BundledAssetProvider : BundledProvider
+	internal sealed class BundledAssetProvider : ProviderBase
 	{
 		private AssetBundleRequest _cacheRequest;
 

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

@@ -1,69 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-
-namespace YooAsset
-{
-	internal abstract class BundledProvider : ProviderBase
-	{
-		protected BundleLoaderBase OwnerBundle { private set; get; }
-		protected DependAssetBundleGroup DependBundleGroup { private set; get; }
-
-		public BundledProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
-		{
-			OwnerBundle = impl.CreateOwnerAssetBundleLoader(assetInfo);
-			OwnerBundle.Reference();
-			OwnerBundle.AddProvider(this);
-
-			var dependBundles = impl.CreateDependAssetBundleLoaders(assetInfo);
-			DependBundleGroup = new DependAssetBundleGroup(dependBundles);
-			DependBundleGroup.Reference();
-		}
-		public override void Destroy()
-		{
-			base.Destroy();
-
-			// 释放资源包
-			if (OwnerBundle != null)
-			{
-				OwnerBundle.Release();
-				OwnerBundle = null;
-			}
-			if (DependBundleGroup != null)
-			{
-				DependBundleGroup.Release();
-				DependBundleGroup = null;
-			}
-		}
-
-		/// <summary>
-		/// 获取下载报告
-		/// </summary>
-		public override DownloadReport GetDownloadReport()
-		{
-			DownloadReport result = new DownloadReport();
-			result.TotalSize = (ulong)OwnerBundle.MainBundleInfo.Bundle.FileSize;
-			result.DownloadedBytes = OwnerBundle.DownloadedBytes;
-			foreach (var dependBundle in DependBundleGroup.DependBundles)
-			{
-				result.TotalSize += (ulong)dependBundle.MainBundleInfo.Bundle.FileSize;
-				result.DownloadedBytes += dependBundle.DownloadedBytes;
-			}
-			result.Progress = (float)result.DownloadedBytes / result.TotalSize;
-			return result;
-		}
-
-		/// <summary>
-		/// 获取资源包的调试信息列表
-		/// </summary>
-		internal void GetBundleDebugInfos(List<DebugBundleInfo> output)
-		{
-			var bundleInfo = new DebugBundleInfo();
-			bundleInfo.BundleName = OwnerBundle.MainBundleInfo.Bundle.BundleName;
-			bundleInfo.RefCount = OwnerBundle.RefCount;
-			bundleInfo.Status = OwnerBundle.Status.ToString();
-			output.Add(bundleInfo);
-
-			DependBundleGroup.GetBundleDebugInfos(output);
-		}
-	}
-}

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

@@ -1,7 +1,7 @@
 
 namespace YooAsset
 {
-	internal class BundledRawFileProvider : BundledProvider
+	internal class BundledRawFileProvider : ProviderBase
 	{
 		public BundledRawFileProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
 		{
@@ -18,6 +18,7 @@ namespace YooAsset
 				Status = EStatus.CheckBundle;
 			}
 
+			// 1. 检测资源包
 			if (Status == EStatus.CheckBundle)
 			{
 				if (IsWaitForAsyncComplete)
@@ -39,6 +40,7 @@ namespace YooAsset
 				Status = EStatus.Checking;
 			}
 
+			// 2. 检测加载结果
 			if (Status == EStatus.Checking)
 			{
 				RawFilePath = OwnerBundle.FileLoadPath;

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

@@ -6,7 +6,7 @@ using UnityEngine.SceneManagement;
 
 namespace YooAsset
 {
-	internal sealed class BundledSceneProvider : BundledProvider
+	internal sealed class BundledSceneProvider : ProviderBase
 	{
 		public readonly LoadSceneMode SceneMode;
 		private readonly string _sceneName;

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

@@ -4,7 +4,7 @@ using UnityEngine;
 
 namespace YooAsset
 {
-	internal sealed class BundledSubAssetsProvider : BundledProvider
+	internal sealed class BundledSubAssetsProvider : ProviderBase
 	{
 		private AssetBundleRequest _cacheRequest;
 

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

@@ -28,14 +28,36 @@ namespace YooAsset
 					return;
 				}
 
-				Status = EStatus.Loading;
+				Status = EStatus.CheckBundle;
 
 				// 注意：模拟异步加载效果提前返回
 				if (IsWaitForAsyncComplete == false)
 					return;
 			}
 
-			// 1. 加载资源对象
+			// 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)
@@ -45,7 +67,7 @@ namespace YooAsset
 				Status = EStatus.Checking;
 			}
 
-			// 2. 检测加载结果
+			// 3. 检测加载结果
 			if (Status == EStatus.Checking)
 			{
 				Status = AssetObject == null ? EStatus.Failed : EStatus.Succeed;

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

@@ -25,14 +25,37 @@ namespace YooAsset
 					return;
 				}
 
-				Status = EStatus.Checking;
+				Status = EStatus.CheckBundle;
 
 				// 注意：模拟异步加载效果提前返回
 				if (IsWaitForAsyncComplete == false)
 					return;
 			}
 
-			if(Status == EStatus.Checking)
+			// 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.Checking;
+			}
+
+			// 2. 检测加载结果
+			if (Status == EStatus.Checking)
 			{
 				RawFilePath = MainAssetInfo.AssetPath;
 				Status = EStatus.Succeed;

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

@@ -24,10 +24,32 @@ namespace YooAsset
 
 			if (Status == EStatus.None)
 			{
+				Status = EStatus.CheckBundle;
+			}
+
+			// 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;
 			}
 
-			// 1. 加载资源对象
+			// 2. 加载资源对象
 			if (Status == EStatus.Loading)
 			{
 				LoadSceneParameters loadSceneParameters = new LoadSceneParameters();
@@ -49,7 +71,7 @@ namespace YooAsset
 				}
 			}
 
-			// 2. 检测加载结果
+			// 3. 检测加载结果
 			if (Status == EStatus.Checking)
 			{
 				Progress = _asyncOp.progress;

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

@@ -28,14 +28,36 @@ namespace YooAsset
 					return;
 				}
 
-				Status = EStatus.Loading;
+				Status = EStatus.CheckBundle;
 
 				// 注意：模拟异步加载效果提前返回
 				if (IsWaitForAsyncComplete == false)
 					return;
 			}
 
-			// 1. 加载资源对象
+			// 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)
@@ -56,7 +78,7 @@ namespace YooAsset
 				Status = EStatus.Checking;
 			}
 
-			// 2. 检测加载结果
+			// 3. 检测加载结果
 			if (Status == EStatus.Checking)
 			{
 				Status = AllAssetObjects == null ? EStatus.Failed : EStatus.Succeed;

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

@@ -90,6 +90,8 @@ namespace YooAsset
 		}
 
 
+		protected BundleLoaderBase OwnerBundle { private set; get; }
+		protected DependAssetBundleGroup DependBundleGroup { private set; get; }
 		protected bool IsWaitForAsyncComplete { private set; get; } = false;
 		private readonly List<OperationHandleBase> _handles = new List<OperationHandleBase>();
 
@@ -99,6 +101,18 @@ namespace YooAsset
 			Impl = impl;
 			ProviderGUID = providerGUID;
 			MainAssetInfo = assetInfo;
+
+			// 创建资源包加载器
+			if (impl != null)
+			{
+				OwnerBundle = impl.CreateOwnerAssetBundleLoader(assetInfo);
+				OwnerBundle.Reference();
+				OwnerBundle.AddProvider(this);
+
+				var dependBundles = impl.CreateDependAssetBundleLoaders(assetInfo);
+				DependBundleGroup = new DependAssetBundleGroup(dependBundles);
+				DependBundleGroup.Reference();
+			}
 		}
 
 		/// <summary>
@@ -112,14 +126,18 @@ namespace YooAsset
 		public virtual void Destroy()
 		{
 			IsDestroyed = true;
-		}
 
-		/// <summary>
-		/// 获取下载进度
-		/// </summary>
-		public virtual DownloadReport GetDownloadReport()
-		{
-			return DownloadReport.CreateDefaultReport();
+			// 释放资源包加载器
+			if (OwnerBundle != null)
+			{
+				OwnerBundle.Release();
+				OwnerBundle = null;
+			}
+			if (DependBundleGroup != null)
+			{
+				DependBundleGroup.Release();
+				DependBundleGroup = null;
+			}
 		}
 
 		/// <summary>
@@ -227,6 +245,7 @@ namespace YooAsset
 			Progress = 1f;
 
 			// 注意：创建临时列表是为了防止外部逻辑在回调函数内创建或者释放资源句柄。
+			// 注意：回调方法如果发生异常，会阻断列表里的后续回调方法！
 			List<OperationHandleBase> tempers = new List<OperationHandleBase>(_handles);
 			foreach (var hande in tempers)
 			{
@@ -292,6 +311,37 @@ namespace YooAsset
 				_watch = null;
 			}
 		}
+
+		/// <summary>
+		/// 获取下载报告
+		/// </summary>
+		internal DownloadReport GetDownloadReport()
+		{
+			DownloadReport result = new DownloadReport();
+			result.TotalSize = (ulong)OwnerBundle.MainBundleInfo.Bundle.FileSize;
+			result.DownloadedBytes = OwnerBundle.DownloadedBytes;
+			foreach (var dependBundle in DependBundleGroup.DependBundles)
+			{
+				result.TotalSize += (ulong)dependBundle.MainBundleInfo.Bundle.FileSize;
+				result.DownloadedBytes += dependBundle.DownloadedBytes;
+			}
+			result.Progress = (float)result.DownloadedBytes / result.TotalSize;
+			return result;
+		}
+
+		/// <summary>
+		/// 获取资源包的调试信息列表
+		/// </summary>
+		internal void GetBundleDebugInfos(List<DebugBundleInfo> output)
+		{
+			var bundleInfo = new DebugBundleInfo();
+			bundleInfo.BundleName = OwnerBundle.MainBundleInfo.Bundle.BundleName;
+			bundleInfo.RefCount = OwnerBundle.RefCount;
+			bundleInfo.Status = OwnerBundle.Status.ToString();
+			output.Add(bundleInfo);
+
+			DependBundleGroup.GetBundleDebugInfos(output);
+		}
 		#endregion
 	}
 }

Assets/YooAsset/Runtime/CacheSystem/CacheSystem.cs

@@ -133,7 +133,7 @@ namespace YooAsset
 		/// <summary>
 		/// 获取未被使用的缓存文件
 		/// </summary>
-		public static List<string> GetUnusedCacheGUIDs(AssetsPackage package)
+		public static List<string> GetUnusedCacheGUIDs(ResourcePackage package)
 		{
 			var cache = GetOrCreateCache(package.PackageName);
 			var keys = cache.GetAllKeys();

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

@@ -17,12 +17,12 @@ namespace YooAsset
 			Done,
 		}
 
-		private readonly AssetsPackage _package;
+		private readonly ResourcePackage _package;
 		private List<string> _unusedCacheGUIDs;
 		private int _unusedFileTotalCount = 0;
 		private ESteps _steps = ESteps.None;
 
-		internal ClearUnusedCacheFilesOperation(AssetsPackage package)
+		internal ClearUnusedCacheFilesOperation(ResourcePackage package)
 		{
 			_package = package;
 		}

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

@@ -57,6 +57,25 @@ namespace YooAsset
 					_steps = ESteps.Waiting;
 				}
 			}
+
+			if (_steps == ESteps.Waiting)
+			{
+				if (_element.IsDone == false)
+					return;
+
+				VerifyResult = _element.Result;
+				if (_element.Result == EVerifyResult.Succeed)
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Succeed;
+				}
+				else
+				{
+					_steps = ESteps.Done;
+					Status = EOperationStatus.Failed;
+					Error = $"Failed verify file : {_element.TempDataFilePath} ! ErrorCode : {_element.Result}";
+				}
+			}
 		}
 
 		private bool BeginVerifyFileWithThread(VerifyTempElement element)
@@ -67,23 +86,7 @@ namespace YooAsset
 		{
 			VerifyTempElement element = (VerifyTempElement)obj;
 			element.Result = CacheSystem.VerifyingTempFile(element);
-			DownloadSystem.SyncContext.Post(VerifyCallback, element);
-		}
-		private void VerifyCallback(object obj)
-		{
-			VerifyTempElement element = (VerifyTempElement)obj;
-			VerifyResult = element.Result;
-			if (element.Result == EVerifyResult.Succeed)
-			{
-				_steps = ESteps.Done;
-				Status = EOperationStatus.Succeed;
-			}
-			else
-			{
-				_steps = ESteps.Done;
-				Status = EOperationStatus.Failed;
-				Error = $"Failed verify file : {element.TempDataFilePath} ! ErrorCode : {element.Result}";
-			}
+			element.IsDone = true;
 		}
 	}
 
@@ -101,7 +104,7 @@ namespace YooAsset
 
 		private readonly VerifyTempElement _element;
 		private ESteps _steps = ESteps.None;
-		
+
 		public VerifyTempFileWithoutThreadOperation(VerifyTempElement element)
 		{
 			_element = element;
@@ -118,6 +121,8 @@ namespace YooAsset
 			if (_steps == ESteps.VerifyFile)
 			{
 				_element.Result = CacheSystem.VerifyingTempFile(_element);
+				_element.IsDone = true;
+
 				VerifyResult = _element.Result;
 				if (_element.Result == EVerifyResult.Succeed)
 				{

Assets/YooAsset/Runtime/CacheSystem/VerifyElement.cs

@@ -49,6 +49,7 @@ namespace YooAsset
 		public string FileCRC { private set; get; }
 		public long FileSize { private set; get; }
 
+		public bool IsDone = false;
 		public EVerifyResult Result;
 
 		public VerifyTempElement(string tempDataFilePath, string fileCRC, long fileSize)

Assets/YooAsset/Runtime/DownloadSystem/DownloadSystem.cs

@@ -22,11 +22,6 @@ namespace YooAsset
 		private static readonly Dictionary<string, DownloaderBase> _downloaderDic = new Dictionary<string, DownloaderBase>();
 		private static readonly List<string> _removeList = new List<string>(100);
 
-		/// <summary>
-		/// 线程同步
-		/// </summary>
-		public static ThreadSyncContext SyncContext { set; get; }
-
 		/// <summary>
 		/// 自定义下载器的请求委托
 		/// </summary>
@@ -53,7 +48,6 @@ namespace YooAsset
 		/// </summary>
 		public static void Initialize()
 		{
-			SyncContext = new ThreadSyncContext();
 		}
 
 		/// <summary>
@@ -61,9 +55,6 @@ namespace YooAsset
 		/// </summary>
 		public static void Update()
 		{
-			if (SyncContext != null)
-				SyncContext.Update();
-
 			// 更新下载器
 			_removeList.Clear();
 			foreach (var valuePair in _downloaderDic)
@@ -94,7 +85,6 @@ namespace YooAsset
 			_downloaderDic.Clear();
 			_removeList.Clear();
 
-			SyncContext = null;
 			RequestDelegate = null;
 			CertificateHandlerInstance = null;
 			BreakpointResumeFileSize = int.MaxValue;

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

@@ -34,6 +34,11 @@ namespace YooAsset
 		protected float _downloadProgress = 0f;
 		protected ulong _downloadedBytes = 0;
 
+		/// <summary>
+		/// 是否等待异步结束
+		/// 警告：只能用于解压APP内部资源
+		/// </summary>
+		public bool WaitForAsyncComplete = false;
 
 		/// <summary>
 		/// 下载进度（0f~1f）

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

@@ -48,6 +48,9 @@ namespace YooAsset
 			// 等待检测结果
 			if (_steps == ESteps.WaitingCheckTempFile)
 			{
+				if (WaitForAsyncComplete)
+					_checkFileOp.Update();
+
 				if (_checkFileOp.IsDone == false)
 					return;
 
@@ -220,6 +223,9 @@ namespace YooAsset
 			// 等待验证完成
 			if (_steps == ESteps.WaitingVerifyTempFile)
 			{
+				if (WaitForAsyncComplete)
+					_verifyFileOp.Update();
+
 				if (_verifyFileOp.IsDone == false)
 					return;
 

Assets/YooAsset/Runtime/InitializeParameters.cs

@@ -39,10 +39,16 @@ namespace YooAsset
 		public IDecryptionServices DecryptionServices = null;
 
 		/// <summary>
-		/// 资源加载的最大数量
+		/// 资源加载每帧处理的最大时间片段
 		/// 注意：默认值为MaxValue
 		/// </summary>
-		public int AssetLoadingMaxNumber = int.MaxValue;
+		public long LoadingMaxTimeSlice = long.MaxValue;
+		
+		/// <summary>
+		/// 下载失败尝试次数
+		/// 注意：默认值为MaxValue
+		/// </summary>
+		public int DownloadFailedTryAgain = int.MaxValue;
 	}
 
 	/// <summary>
@@ -53,7 +59,7 @@ namespace YooAsset
 		/// <summary>
 		/// 用于模拟运行的资源清单路径
 		/// </summary>
-		public string SimulatePatchManifestPath = string.Empty;
+		public string SimulateManifestFilePath = string.Empty;
 	}
 
 	/// <summary>

Assets/YooAsset/Runtime/OperationSystem/OperationSystem.cs

@@ -61,7 +61,7 @@ namespace YooAsset
 			foreach (var operation in _operations)
 			{
 				if (IsBusy)
-					return;
+					break;
 
 				operation.Update();
 				if (operation.IsDone)

Assets/YooAsset/Runtime/PackageSystem/AssetInfo.cs

@@ -3,9 +3,20 @@ namespace YooAsset
 {
 	public class AssetInfo
 	{
-		private readonly PatchAsset _patchAsset;
+		private readonly PackageAsset _packageAsset;
 		private string _providerGUID;
 
+		/// <summary>
+		/// 资源类型
+		/// </summary>
+		public System.Type AssetType { private set; get; }
+
+		/// <summary>
+		/// 错误信息
+		/// </summary>
+		public string Error { private set; get; }
+
+
 		/// <summary>
 		/// 唯一标识符
 		/// </summary>
@@ -31,63 +42,66 @@ namespace YooAsset
 		{
 			get
 			{
-				return _patchAsset == null;
+				return _packageAsset == null;
 			}
 		}
 
-		/// <summary>
-		/// 错误信息
-		/// </summary>
-		internal string Error { private set; get; }
-
 		/// <summary>
 		/// 可寻址地址
 		/// </summary>
-		public string Address { private set; get; }
+		public string Address
+		{
+			get
+			{
+				if (_packageAsset == null)
+					return string.Empty;
+				return _packageAsset.Address;
+			}
+		}
 
 		/// <summary>
 		/// 资源路径
 		/// </summary>
-		public string AssetPath { private set; get; }
-		
-		/// <summary>
-		/// 资源类型
-		/// </summary>
-		public System.Type AssetType { private set; get; }
+		public string AssetPath
+		{
+			get
+			{
+				if (_packageAsset == null)
+					return string.Empty;
+				return _packageAsset.AssetPath;
+			}
+		}
 
 
-		// 注意：这是一个内部类，严格限制外部创建。
 		private AssetInfo()
 		{
+			// 注意：禁止从外部创建该类
 		}
-		internal AssetInfo(PatchAsset patchAsset, System.Type assetType)
+		internal AssetInfo(PackageAsset packageAsset, System.Type assetType)
 		{
-			if (patchAsset == null)
+			if (packageAsset == null)
 				throw new System.Exception("Should never get here !");
 
-			_patchAsset = patchAsset;
+			_providerGUID = string.Empty;
+			_packageAsset = packageAsset;
 			AssetType = assetType;
-			Address = patchAsset.Address;
-			AssetPath = patchAsset.AssetPath;
 			Error = string.Empty;
 		}
-		internal AssetInfo(PatchAsset patchAsset)
+		internal AssetInfo(PackageAsset packageAsset)
 		{
-			if (patchAsset == null)
+			if (packageAsset == null)
 				throw new System.Exception("Should never get here !");
 
-			_patchAsset = patchAsset;
+			_providerGUID = string.Empty;
+			_packageAsset = packageAsset;
 			AssetType = null;
-			Address = patchAsset.Address;
-			AssetPath = patchAsset.AssetPath;
 			Error = string.Empty;
 		}
 		internal AssetInfo(string error)
 		{
-			_patchAsset = null;
+			_providerGUID = string.Empty;
+			_packageAsset = null;
 			AssetType = null;
-			Address = string.Empty;
-			AssetPath = string.Empty;
 			Error = error;
 		}
 	}

Assets/YooAsset/Runtime/PackageSystem/BundleInfo.cs

@@ -12,7 +12,7 @@ namespace YooAsset
 			LoadFromEditor,
 		}
 
-		public readonly PatchBundle Bundle;
+		public readonly PackageBundle Bundle;
 		public readonly ELoadMode LoadMode;
 
 		/// <summary>
@@ -34,25 +34,25 @@ namespace YooAsset
 		private BundleInfo()
 		{
 		}
-		public BundleInfo(PatchBundle patchBundle, ELoadMode loadMode, string mainURL, string fallbackURL)
+		public BundleInfo(PackageBundle bundle, ELoadMode loadMode, string mainURL, string fallbackURL)
 		{
-			Bundle = patchBundle;
+			Bundle = bundle;
 			LoadMode = loadMode;
 			RemoteMainURL = mainURL;
 			RemoteFallbackURL = fallbackURL;
 			EditorAssetPath = string.Empty;
 		}
-		public BundleInfo(PatchBundle patchBundle, ELoadMode loadMode, string editorAssetPath)
+		public BundleInfo(PackageBundle bundle, ELoadMode loadMode, string editorAssetPath)
 		{
-			Bundle = patchBundle;
+			Bundle = bundle;
 			LoadMode = loadMode;
 			RemoteMainURL = string.Empty;
 			RemoteFallbackURL = string.Empty;
 			EditorAssetPath = editorAssetPath;
 		}
-		public BundleInfo(PatchBundle patchBundle, ELoadMode loadMode)
+		public BundleInfo(PackageBundle bundle, ELoadMode loadMode)
 		{
-			Bundle = patchBundle;
+			Bundle = bundle;
 			LoadMode = loadMode;
 			RemoteMainURL = string.Empty;
 			RemoteFallbackURL = string.Empty;

Assets/YooAsset/Runtime/PackageSystem/ManifestTools.cs

@@ -0,0 +1,201 @@
+using System;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace YooAsset
+{
+	internal static class ManifestTools
+	{
+
+#if UNITY_EDITOR
+		/// <summary>
+		/// 序列化（JSON文件）
+		/// </summary>
+		public static void SerializeToJson(string savePath, PackageManifest manifest)
+		{
+			string json = JsonUtility.ToJson(manifest, true);
+			FileUtility.CreateFile(savePath, json);
+		}
+
+		/// <summary>
+		/// 序列化（二进制文件）
+		/// </summary>
+		public static void SerializeToBinary(string savePath, PackageManifest manifest)
+		{
+			using (FileStream fs = new FileStream(savePath, FileMode.Create))
+			{
+				// 创建缓存器
+				BufferWriter buffer = new BufferWriter(YooAssetSettings.ManifestFileMaxSize);
+
+				// 写入文件标记
+				buffer.WriteUInt32(YooAssetSettings.ManifestFileSign);
+
+				// 写入文件版本
+				buffer.WriteUTF8(manifest.FileVersion);
+
+				// 写入文件头信息
+				buffer.WriteBool(manifest.EnableAddressable);
+				buffer.WriteInt32(manifest.OutputNameStyle);
+				buffer.WriteUTF8(manifest.PackageName);
+				buffer.WriteUTF8(manifest.PackageVersion);
+
+				// 写入资源列表
+				buffer.WriteInt32(manifest.AssetList.Count);
+				for (int i = 0; i < manifest.AssetList.Count; i++)
+				{
+					var packageAsset = manifest.AssetList[i];
+					buffer.WriteUTF8(packageAsset.Address);
+					buffer.WriteUTF8(packageAsset.AssetPath);
+					buffer.WriteUTF8Array(packageAsset.AssetTags);
+					buffer.WriteInt32(packageAsset.BundleID);
+					buffer.WriteInt32Array(packageAsset.DependIDs);
+				}
+
+				// 写入资源包列表
+				buffer.WriteInt32(manifest.BundleList.Count);
+				for (int i = 0; i < manifest.BundleList.Count; i++)
+				{
+					var packageBundle = manifest.BundleList[i];
+					buffer.WriteUTF8(packageBundle.BundleName);
+					buffer.WriteUTF8(packageBundle.FileHash);
+					buffer.WriteUTF8(packageBundle.FileCRC);
+					buffer.WriteInt64(packageBundle.FileSize);
+					buffer.WriteBool(packageBundle.IsRawFile);
+					buffer.WriteByte(packageBundle.LoadMethod);
+					buffer.WriteUTF8Array(packageBundle.Tags);
+					buffer.WriteInt32Array(packageBundle.ReferenceIDs);
+				}
+
+				// 写入文件流
+				buffer.WriteToStream(fs);
+				fs.Flush();
+			}
+		}
+
+		/// <summary>
+		/// 反序列化（JSON文件）
+		/// </summary>
+		public static PackageManifest DeserializeFromJson(string jsonContent)
+		{
+			return JsonUtility.FromJson<PackageManifest>(jsonContent);
+		}
+
+		/// <summary>
+		/// 反序列化（二进制文件）
+		/// </summary>
+		public static PackageManifest DeserializeFromBinary(byte[] binaryData)
+		{
+			// 创建缓存器
+			BufferReader buffer = new BufferReader(binaryData);
+
+			// 读取文件标记
+			uint fileSign = buffer.ReadUInt32();
+			if (fileSign != YooAssetSettings.ManifestFileSign)
+				throw new Exception("Invalid manifest file !");
+
+			// 读取文件版本
+			string fileVersion = buffer.ReadUTF8();
+			if (fileVersion != YooAssetSettings.ManifestFileVersion)
+				throw new Exception($"The manifest file version are not compatible : {fileVersion} != {YooAssetSettings.ManifestFileVersion}");
+
+			PackageManifest manifest = new PackageManifest();
+			{
+				// 读取文件头信息
+				manifest.FileVersion = fileVersion;
+				manifest.EnableAddressable = buffer.ReadBool();
+				manifest.OutputNameStyle = buffer.ReadInt32();
+				manifest.PackageName = buffer.ReadUTF8();
+				manifest.PackageVersion = buffer.ReadUTF8();
+
+				// 读取资源列表
+				int packageAssetCount = buffer.ReadInt32();
+				manifest.AssetList = new List<PackageAsset>(packageAssetCount);
+				for (int i = 0; i < packageAssetCount; i++)
+				{
+					var packageAsset = new PackageAsset();
+					packageAsset.Address = buffer.ReadUTF8();
+					packageAsset.AssetPath = buffer.ReadUTF8();
+					packageAsset.AssetTags = buffer.ReadUTF8Array();
+					packageAsset.BundleID = buffer.ReadInt32();
+					packageAsset.DependIDs = buffer.ReadInt32Array();
+					manifest.AssetList.Add(packageAsset);
+				}
+
+				// 读取资源包列表
+				int packageBundleCount = buffer.ReadInt32();
+				manifest.BundleList = new List<PackageBundle>(packageBundleCount);
+				for (int i = 0; i < packageBundleCount; i++)
+				{
+					var packageBundle = new PackageBundle();
+					packageBundle.BundleName = buffer.ReadUTF8();
+					packageBundle.FileHash = buffer.ReadUTF8();
+					packageBundle.FileCRC = buffer.ReadUTF8();
+					packageBundle.FileSize = buffer.ReadInt64();
+					packageBundle.IsRawFile = buffer.ReadBool();
+					packageBundle.LoadMethod = buffer.ReadByte();
+					packageBundle.Tags = buffer.ReadUTF8Array();
+					packageBundle.ReferenceIDs = buffer.ReadInt32Array();
+					manifest.BundleList.Add(packageBundle);
+				}
+			}
+
+			// BundleDic
+			manifest.BundleDic = new Dictionary<string, PackageBundle>(manifest.BundleList.Count);
+			foreach (var packageBundle in manifest.BundleList)
+			{
+				packageBundle.ParseBundle(manifest.PackageName, manifest.OutputNameStyle);
+				manifest.BundleDic.Add(packageBundle.BundleName, packageBundle);
+			}
+
+			// AssetDic
+			manifest.AssetDic = new Dictionary<string, PackageAsset>(manifest.AssetList.Count);
+			foreach (var packageAsset in manifest.AssetList)
+			{
+				// 注意：我们不允许原始路径存在重名
+				string assetPath = packageAsset.AssetPath;
+				if (manifest.AssetDic.ContainsKey(assetPath))
+					throw new Exception($"AssetPath have existed : {assetPath}");
+				else
+					manifest.AssetDic.Add(assetPath, packageAsset);
+			}
+
+			return manifest;
+		}
+#endif
+
+		public static string GetRemoteBundleFileExtension(string bundleName)
+		{
+			string fileExtension = Path.GetExtension(bundleName);
+			return fileExtension;
+		}
+		public static string GetRemoteBundleFileName(int nameStyle, string bundleName, string fileExtension, string fileHash)
+		{
+			if (nameStyle == 1) //HashName
+			{
+				return StringUtility.Format("{0}{1}", fileHash, fileExtension);
+			}
+			else if (nameStyle == 4) //BundleName_HashName
+			{
+				string fileName = bundleName.Remove(bundleName.LastIndexOf('.'));
+				return StringUtility.Format("{0}_{1}{2}", fileName, fileHash, fileExtension);
+			}
+			else
+			{
+				throw new NotImplementedException($"Invalid name style : {nameStyle}");
+			}
+		}
+
+		/// <summary>
+		/// 获取解压BundleInfo
+		/// </summary>
+		public static BundleInfo GetUnpackInfo(PackageBundle packageBundle)
+		{
+			// 注意：我们把流加载路径指定为远端下载地址
+			string streamingPath = PathHelper.ConvertToWWWPath(packageBundle.StreamingFilePath);
+			BundleInfo bundleInfo = new BundleInfo(packageBundle, BundleInfo.ELoadMode.LoadFromStreaming, streamingPath, streamingPath);
+			return bundleInfo;
+		}
+	}
+}