update asset system

启用了新的内置资源查询机制。

Assets/UniTask.YooAsset~/README.md

@@ -1,19 +0,0 @@
-# UniTask 扩展
-
-[仓库链接](https://github.com/Cysharp/UniTask) 
-- 请去下载对应的源码，并删除此目录最后的波浪线
-- 在 UniTask `_InternalVisibleTo.cs` 文件中增加 `[assembly: InternalsVisibleTo("UniTask.YooAsset")]` 后即可使用
-
-## 代码示例
-
-```csharp
-var handle = YooAssets.LoadAssetAsync<GameObject>("Assets/Res/Prefabs/TestImg.prefab");
-
-await handle.ToUniTask();
-
-var obj = handle.AssetObject as GameObject;
-var go  = Instantiate(obj, transform);
-
-go.transform.localPosition = Vector3.zero;
-go.transform.localScale    = Vector3.one;
-```

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilder.cs

@@ -8,135 +8,96 @@ namespace YooAsset.Editor
 {
 	public class AssetBundleBuilder
 	{
-		public class BuildParametersContext : IContextObject
-		{
-			private readonly System.Diagnostics.Stopwatch _buildWatch = new System.Diagnostics.Stopwatch();
-
-			/// <summary>
-			/// 构建参数
-			/// </summary>
-			public BuildParameters Parameters { private set; get; }
-
-			/// <summary>
-			/// 构建管线的输出目录
-			/// </summary>
-			public string PipelineOutputDirectory { private set; get; }
-
-
-			public BuildParametersContext(BuildParameters parameters)
-			{
-				Parameters = parameters;
-
-				PipelineOutputDirectory = AssetBundleBuilderHelper.MakePipelineOutputDirectory(parameters.OutputRoot, parameters.BuildTarget);
-				if (parameters.BuildMode == EBuildMode.DryRunBuild)
-					PipelineOutputDirectory += $"_{EBuildMode.DryRunBuild}";
-				else if (parameters.BuildMode == EBuildMode.SimulateBuild)
-					PipelineOutputDirectory += $"_{EBuildMode.SimulateBuild}";
-			}
-
-			/// <summary>
-			/// 获取本次构建的补丁目录
-			/// </summary>
-			public string GetPackageDirectory()
-			{
-				return $"{Parameters.OutputRoot}/{Parameters.BuildTarget}/{Parameters.BuildVersion}";
-			}
-
-			/// <summary>
-			/// 获取构建选项
-			/// </summary>
-			public BuildAssetBundleOptions GetPipelineBuildOptions()
-			{
-				// For the new build system, unity always need BuildAssetBundleOptions.CollectDependencies and BuildAssetBundleOptions.DeterministicAssetBundle
-				// 除非设置ForceRebuildAssetBundle标记，否则会进行增量打包
-
-				BuildAssetBundleOptions opt = BuildAssetBundleOptions.None;
-				opt |= BuildAssetBundleOptions.StrictMode; //Do not allow the build to succeed if any errors are reporting during it.
-
-				if (Parameters.BuildMode == EBuildMode.SimulateBuild)
-					throw new Exception("Should never get here !");
-
-				if (Parameters.BuildMode == EBuildMode.DryRunBuild)
-				{
-					opt |= BuildAssetBundleOptions.DryRunBuild;
-					return opt;
-				}
-
-				if (Parameters.CompressOption == ECompressOption.Uncompressed)
-					opt |= BuildAssetBundleOptions.UncompressedAssetBundle;
-				else if (Parameters.CompressOption == ECompressOption.LZ4)
-					opt |= BuildAssetBundleOptions.ChunkBasedCompression;
-
-				if (Parameters.BuildMode == EBuildMode.ForceRebuild)
-					opt |= BuildAssetBundleOptions.ForceRebuildAssetBundle; //Force rebuild the asset bundles
-				if (Parameters.DisableWriteTypeTree)
-					opt |= BuildAssetBundleOptions.DisableWriteTypeTree; //Do not include type information within the asset bundle (don't write type tree).
-				if (Parameters.IgnoreTypeTreeChanges)
-					opt |= BuildAssetBundleOptions.IgnoreTypeTreeChanges; //Ignore the type tree changes when doing the incremental build check.
-
-				opt |= BuildAssetBundleOptions.DisableLoadAssetByFileName; //Disables Asset Bundle LoadAsset by file name.
-				opt |= BuildAssetBundleOptions.DisableLoadAssetByFileNameWithExtension; //Disables Asset Bundle LoadAsset by file name with extension.			
-
-				return opt;
-			}
-
-			/// <summary>
-			/// 获取构建的耗时（单位：秒）
-			/// </summary>
-			public float GetBuildingSeconds()
-			{
-				float seconds = _buildWatch.ElapsedMilliseconds / 1000f;
-				return seconds;
-			}
-			public void BeginWatch()
-			{
-				_buildWatch.Start();
-			}
-			public void StopWatch()
-			{
-				_buildWatch.Stop();
-			}
-		}
-
 		private readonly BuildContext _buildContext = new BuildContext();
 
 		/// <summary>
 		/// 开始构建
 		/// </summary>
-		public bool Run(BuildParameters buildParameters)
+		public BuildResult Run(BuildParameters buildParameters)
 		{
 			// 清空旧数据
 			_buildContext.ClearAllContext();
 
+			// 检测构建参数是否为空
+			if (buildParameters == null)
+				throw new Exception($"{nameof(buildParameters)} is null !");
+
+			// 检测可编程构建管线参数
+			if (buildParameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
+			{
+				if (buildParameters.SBPParameters == null)
+					throw new Exception($"{nameof(BuildParameters.SBPParameters)} is null !");
+
+				if (buildParameters.BuildMode == EBuildMode.DryRunBuild)
+					throw new Exception($"{nameof(EBuildPipeline.ScriptableBuildPipeline)} not support {nameof(EBuildMode.DryRunBuild)} build mode !");
+
+				if (buildParameters.BuildMode == EBuildMode.ForceRebuild)
+					throw new Exception($"{nameof(EBuildPipeline.ScriptableBuildPipeline)} not support {nameof(EBuildMode.ForceRebuild)} build mode !");
+			}
+
 			// 构建参数
 			var buildParametersContext = new BuildParametersContext(buildParameters);
 			_buildContext.SetContextObject(buildParametersContext);
 
-			// 执行构建流程
-			List<IBuildTask> pipeline = new List<IBuildTask>
+			// 创建构建节点
+			List<IBuildTask> pipeline;
+			if (buildParameters.BuildPipeline == EBuildPipeline.BuiltinBuildPipeline)
+			{
+				pipeline = new List<IBuildTask>
 				{
 					new TaskPrepare(), //前期准备工作
 					new TaskGetBuildMap(), //获取构建列表
 					new TaskBuilding(), //开始执行构建
+					new TaskCopyRawFile(), //拷贝原生文件
 					new TaskVerifyBuildResult(), //验证构建结果
 					new TaskEncryption(), //加密资源文件
-				new TaskCreatePatchManifest(), //创建清单文件
+					new TaskUpdateBundleInfo(), //更新资源包信息
+					new TaskCreateManifest(), //创建清单文件
 					new TaskCreateReport(), //创建报告文件
-				new TaskCreatePatchPackage(), //制作补丁包
+					new TaskCreatePackage(), //制作包裹
 					new TaskCopyBuildinFiles(), //拷贝内置文件
 				};
-
-			if (buildParameters.BuildMode == EBuildMode.SimulateBuild)
-				BuildRunner.EnableLog = false;
+			}
+			else if (buildParameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
+			{
+				pipeline = new List<IBuildTask>
+				{
+					new TaskPrepare(), //前期准备工作
+					new TaskGetBuildMap(), //获取构建列表
+					new TaskBuilding_SBP(), //开始执行构建
+					new TaskCopyRawFile(), //拷贝原生文件
+					new TaskVerifyBuildResult_SBP(), //验证构建结果
+					new TaskEncryption(), //加密资源文件
+					new TaskUpdateBundleInfo(), //更新补丁信息
+					new TaskCreateManifest(), //创建清单文件
+					new TaskCreateReport(), //创建报告文件
+					new TaskCreatePackage(), //制作补丁包
+					new TaskCopyBuildinFiles(), //拷贝内置文件
+				};
+			}
 			else
-				BuildRunner.EnableLog = true;
+			{
+				throw new NotImplementedException();
+			}
 
-			bool succeed = BuildRunner.Run(pipeline, _buildContext);
-			if (succeed)
-				Debug.Log($"{buildParameters.BuildMode} pipeline build succeed !");
+			// 初始化日志
+			BuildLogger.InitLogger(buildParameters.EnableLog);
+
+			// 执行构建流程
+			var buildResult = BuildRunner.Run(pipeline, _buildContext);
+			if (buildResult.Success)
+			{
+				buildResult.OutputPackageDirectory = buildParametersContext.GetPackageOutputDirectory();
+				BuildLogger.Log($"{buildParameters.BuildMode} pipeline build succeed !");
+			}
 			else
-				Debug.LogWarning($"{buildParameters.BuildMode} pipeline build failed !");
-			return succeed;
+			{
+				BuildLogger.Warning($"{buildParameters.BuildMode} pipeline build failed !");
+				BuildLogger.Error($"Build task failed : {buildResult.FailedTask}");
+				BuildLogger.Error(buildResult.ErrorInfo);
+			}
+
+			return buildResult;
 		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderHelper.cs

@@ -22,15 +22,7 @@ namespace YooAsset.Editor
 		/// </summary>
 		public static string GetStreamingAssetsFolderPath()
 		{
-			return $"{Application.dataPath}/StreamingAssets/YooAssets/";
-		}
-
-		/// <summary>
-		/// 获取构建管线的输出目录
-		/// </summary>
-		public static string MakePipelineOutputDirectory(string outputRoot, BuildTarget buildTarget)
-		{
-			return $"{outputRoot}/{buildTarget}/{YooAssetSettingsData.Setting.UnityManifestFileName}";
+			return $"{Application.dataPath}/StreamingAssets/{YooAssetSettings.StreamingAssetsBuildinFolder}/";
 		}
 
 		/// <summary>
@@ -66,80 +58,5 @@ namespace YooAsset.Editor
 				}
 			}
 		}
-
-
-		/// <summary>
-		/// 获取所有补丁包版本列表
-		/// 注意：列表会按照版本号从小到大排序
-		/// </summary>
-		private static List<int> GetPackageVersionList(BuildTarget buildTarget, string outputRoot)
-		{
-			List<int> versionList = new List<int>();
-
-			string parentPath = $"{outputRoot}/{buildTarget}";
-			if (Directory.Exists(parentPath) == false)
-				return versionList;
-
-			// 获取所有补丁包文件夹
-			string[] allFolders = Directory.GetDirectories(parentPath);
-			for (int i = 0; i < allFolders.Length; i++)
-			{
-				string folderName = Path.GetFileNameWithoutExtension(allFolders[i]);
-				if (int.TryParse(folderName, out int version))
-					versionList.Add(version);
-			}
-
-			// 从小到大排序
-			versionList.Sort();
-			return versionList;
-		}
-
-		/// <summary>
-		/// 获取当前最大的补丁包版本号
-		/// </summary>
-		/// <returns>如果没有任何补丁版本，那么返回-1</returns>
-		public static int GetMaxPackageVersion(BuildTarget buildTarget, string outputRoot)
-		{
-			List<int> versionList = GetPackageVersionList(buildTarget, outputRoot);
-			if (versionList.Count == 0)
-				return -1;
-			return versionList[versionList.Count - 1];
-		}
-
-		/// <summary>
-		/// 是否存在任何补丁包版本
-		/// </summary>
-		public static bool HasAnyPackageVersion(BuildTarget buildTarget, string outputRoot)
-		{
-			List<int> versionList = GetPackageVersionList(buildTarget, outputRoot);
-			return versionList.Count > 0;
-		}
-
-
-		/// <summary>
-		/// 加载补丁清单文件
-		/// </summary>
-		internal static PatchManifest LoadPatchManifestFile(string fileDirectory, int resourceVersion)
-		{
-			string filePath = $"{fileDirectory}/{YooAssetSettingsData.GetPatchManifestFileName(resourceVersion)}";
-			if (File.Exists(filePath) == false)
-			{
-				throw new System.Exception($"Not found patch manifest file : {filePath}");
-			}
-
-			string jsonData = FileUtility.ReadFile(filePath);
-			return PatchManifest.Deserialize(jsonData);
-		}
-
-		/// <summary>
-		/// 获取旧的补丁清单
-		/// </summary>
-		internal static PatchManifest GetOldPatchManifest(string pipelineOutputDirectory)
-		{
-			string staticVersionFilePath = $"{pipelineOutputDirectory}/{YooAssetSettings.VersionFileName}";
-			string staticVersionContent = FileUtility.ReadFile(staticVersionFilePath);
-			int staticVersion = int.Parse(staticVersionContent);
-			return LoadPatchManifestFile(pipelineOutputDirectory, staticVersion);
-		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSetting.cs

@@ -3,12 +3,13 @@ using UnityEngine;
 
 namespace YooAsset.Editor
 {
+	[CreateAssetMenu(fileName = "AssetBundleBuilderSetting", menuName = "YooAsset/Create AssetBundle Builder Settings")]
 	public class AssetBundleBuilderSetting : ScriptableObject
 	{
 		/// <summary>
-		/// 构建版本号
+		/// 构建管线
 		/// </summary>
-		public int BuildVersion = 0;
+		public EBuildPipeline BuildPipeline = EBuildPipeline.BuiltinBuildPipeline;
 
 		/// <summary>
 		/// 构建模式
@@ -16,23 +17,33 @@ namespace YooAsset.Editor
 		public EBuildMode BuildMode = EBuildMode.ForceRebuild;
 
 		/// <summary>
-		/// 内置资源标签
+		/// 构建的包裹名称
 		/// </summary>
-		public string BuildTags = string.Empty;
+		public string BuildPackage = string.Empty;
 
 		/// <summary>
 		/// 压缩方式
 		/// </summary>
 		public ECompressOption CompressOption = ECompressOption.LZ4;
 
+		/// <summary>
+		/// 输出文件名称样式
+		/// </summary>
+		public EOutputNameStyle OutputNameStyle = EOutputNameStyle.HashName;
+
+		/// <summary>
+		/// 首包资源文件的拷贝方式
+		/// </summary>
+		public ECopyBuildinFileOption CopyBuildinFileOption = ECopyBuildinFileOption.None;
+
+		/// <summary>
+		/// 首包资源文件的标签集合
+		/// </summary>
+		public string CopyBuildinFileTags = string.Empty;
+
 		/// <summary>
 		/// 加密类名称
 		/// </summary>
 		public string EncyptionClassName = string.Empty;
-
-		/// <summary>
-		/// 附加后缀格式
-		/// </summary>
-		public bool AppendExtension = false;
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSettingData.cs

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

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs

@@ -12,23 +12,28 @@ namespace YooAsset.Editor
 	public class AssetBundleBuilderWindow : EditorWindow
 	{
 		[MenuItem("YooAsset/AssetBundle Builder", false, 102)]
-		public static void ShowExample()
+		public static void OpenWindow()
 		{
-			AssetBundleBuilderWindow window = GetWindow<AssetBundleBuilderWindow>("资源包构建工具", true, EditorDefine.DockedWindowTypes);
+			AssetBundleBuilderWindow window = GetWindow<AssetBundleBuilderWindow>("资源包构建工具", true, WindowsDefine.DockedWindowTypes);
 			window.minSize = new Vector2(800, 600);
 		}
 
 		private BuildTarget _buildTarget;
 		private List<Type> _encryptionServicesClassTypes;
 		private List<string> _encryptionServicesClassNames;
+		private List<string> _buildPackageNames;
 
+		private Button _saveButton;
 		private TextField _buildOutputField;
-		private IntegerField _buildVersionField;
+		private EnumField _buildPipelineField;
 		private EnumField _buildModeField;
-		private TextField _buildTagsField;
+		private TextField _buildVersionField;
+		private PopupField<string> _buildPackageField;
 		private PopupField<string> _encryptionField;
 		private EnumField _compressionField;
-		private Toggle _appendExtensionToggle;
+		private EnumField _outputNameStyleField;
+		private EnumField _copyBuildinFileOptionField;
+		private TextField _copyBuildinFileTagsField;
 
 		public void CreateGUI()
 		{
@@ -37,62 +42,94 @@ namespace YooAsset.Editor
 				VisualElement root = this.rootVisualElement;
 
 				// 加载布局文件
-				var visualAsset = YooAssetEditorSettingsData.Setting.AssetBundleBuilderUXML;
+				var visualAsset = UxmlLoader.LoadWindowUXML<AssetBundleBuilderWindow>();
 				if (visualAsset == null)
-				{
-					Debug.LogError($"Not found {nameof(AssetBundleBuilderWindow)}.uxml in settings.");
 					return;
-				}
+
 				visualAsset.CloneTree(root);
 
+				// 配置保存按钮
+				_saveButton = root.Q<Button>("SaveButton");
+				_saveButton.clicked += SaveBtn_clicked;
+
+				// 构建平台
 				_buildTarget = EditorUserBuildSettings.activeBuildTarget;
+
+				// 包裹名称列表
+				_buildPackageNames = GetBuildPackageNames();
+
+				// 加密服务类
 				_encryptionServicesClassTypes = GetEncryptionServicesClassTypes();
-				_encryptionServicesClassNames = _encryptionServicesClassTypes.Select(t => t.FullName).ToList();
+				_encryptionServicesClassNames = _encryptionServicesClassTypes.Select(t => t.Name).ToList();
 
 				// 输出目录
 				string defaultOutputRoot = AssetBundleBuilderHelper.GetDefaultOutputRoot();
-				string pipelineOutputDirectory = AssetBundleBuilderHelper.MakePipelineOutputDirectory(defaultOutputRoot, _buildTarget);
 				_buildOutputField = root.Q<TextField>("BuildOutput");
-				_buildOutputField.SetValueWithoutNotify(pipelineOutputDirectory);
+				_buildOutputField.SetValueWithoutNotify(defaultOutputRoot);
 				_buildOutputField.SetEnabled(false);
 
-				// 构建版本
-				_buildVersionField = root.Q<IntegerField>("BuildVersion");
-				_buildVersionField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.BuildVersion);
-				_buildVersionField.RegisterValueChangedCallback(evt =>
+				// 构建管线
+				_buildPipelineField = root.Q<EnumField>("BuildPipeline");
+				_buildPipelineField.Init(AssetBundleBuilderSettingData.Setting.BuildPipeline);
+				_buildPipelineField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.BuildPipeline);
+				_buildPipelineField.style.width = 350;
+				_buildPipelineField.RegisterValueChangedCallback(evt =>
 				{
-					AssetBundleBuilderSettingData.Setting.BuildVersion = _buildVersionField.value;
+					AssetBundleBuilderSettingData.IsDirty = true;
+					AssetBundleBuilderSettingData.Setting.BuildPipeline = (EBuildPipeline)_buildPipelineField.value;
+					RefreshWindow();
 				});
 
 				// 构建模式
 				_buildModeField = root.Q<EnumField>("BuildMode");
 				_buildModeField.Init(AssetBundleBuilderSettingData.Setting.BuildMode);
 				_buildModeField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.BuildMode);
-				_buildModeField.style.width = 300;
+				_buildModeField.style.width = 350;
 				_buildModeField.RegisterValueChangedCallback(evt =>
 				{
+					AssetBundleBuilderSettingData.IsDirty = true;
 					AssetBundleBuilderSettingData.Setting.BuildMode = (EBuildMode)_buildModeField.value;
 					RefreshWindow();
 				});
 
-				// 内置资源标签
-				_buildTagsField = root.Q<TextField>("BuildinTags");
-				_buildTagsField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.BuildTags);
-				_buildTagsField.RegisterValueChangedCallback(evt =>
+				// 构建版本
+				_buildVersionField = root.Q<TextField>("BuildVersion");
+				_buildVersionField.SetValueWithoutNotify(GetBuildPackageVersion());
+
+				// 构建包裹
+				var buildPackageContainer = root.Q("BuildPackageContainer");
+				if (_buildPackageNames.Count > 0)
 				{
-					AssetBundleBuilderSettingData.Setting.BuildTags = _buildTagsField.value;
+					int defaultIndex = GetDefaultPackageIndex(AssetBundleBuilderSettingData.Setting.BuildPackage);
+					_buildPackageField = new PopupField<string>(_buildPackageNames, defaultIndex);
+					_buildPackageField.label = "Build Package";
+					_buildPackageField.style.width = 350;
+					_buildPackageField.RegisterValueChangedCallback(evt =>
+					{
+						AssetBundleBuilderSettingData.IsDirty = true;
+						AssetBundleBuilderSettingData.Setting.BuildPackage = _buildPackageField.value;
 					});
+					buildPackageContainer.Add(_buildPackageField);
+				}
+				else
+				{
+					_buildPackageField = new PopupField<string>();
+					_buildPackageField.label = "Build Package";
+					_buildPackageField.style.width = 350;
+					buildPackageContainer.Add(_buildPackageField);
+				}
 
 				// 加密方法
 				var encryptionContainer = root.Q("EncryptionContainer");
 				if (_encryptionServicesClassNames.Count > 0)
 				{
-					int defaultIndex = GetEncryptionDefaultIndex(AssetBundleBuilderSettingData.Setting.EncyptionClassName);
+					int defaultIndex = GetDefaultEncryptionIndex(AssetBundleBuilderSettingData.Setting.EncyptionClassName);
 					_encryptionField = new PopupField<string>(_encryptionServicesClassNames, defaultIndex);
 					_encryptionField.label = "Encryption";
-					_encryptionField.style.width = 300;
+					_encryptionField.style.width = 350;
 					_encryptionField.RegisterValueChangedCallback(evt =>
 					{
+						AssetBundleBuilderSettingData.IsDirty = true;
 						AssetBundleBuilderSettingData.Setting.EncyptionClassName = _encryptionField.value;
 					});
 					encryptionContainer.Add(_encryptionField);
@@ -101,26 +138,51 @@ namespace YooAsset.Editor
 				{
 					_encryptionField = new PopupField<string>();
 					_encryptionField.label = "Encryption";
-					_encryptionField.style.width = 300;
+					_encryptionField.style.width = 350;
 					encryptionContainer.Add(_encryptionField);
 				}
 
-				// 压缩方式
+				// 压缩方式选项
 				_compressionField = root.Q<EnumField>("Compression");
 				_compressionField.Init(AssetBundleBuilderSettingData.Setting.CompressOption);
 				_compressionField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.CompressOption);
-				_compressionField.style.width = 300;	
+				_compressionField.style.width = 350;
 				_compressionField.RegisterValueChangedCallback(evt =>
 				{
+					AssetBundleBuilderSettingData.IsDirty = true;
 					AssetBundleBuilderSettingData.Setting.CompressOption = (ECompressOption)_compressionField.value;
 				});
 
-				// 附加后缀格式
-				_appendExtensionToggle = root.Q<Toggle>("AppendExtension");
-				_appendExtensionToggle.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.AppendExtension);
-				_appendExtensionToggle.RegisterValueChangedCallback(evt =>
+				// 输出文件名称样式
+				_outputNameStyleField = root.Q<EnumField>("OutputNameStyle");
+				_outputNameStyleField.Init(AssetBundleBuilderSettingData.Setting.OutputNameStyle);
+				_outputNameStyleField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.OutputNameStyle);
+				_outputNameStyleField.style.width = 350;
+				_outputNameStyleField.RegisterValueChangedCallback(evt =>
 				{
-					AssetBundleBuilderSettingData.Setting.AppendExtension = _appendExtensionToggle.value;
+					AssetBundleBuilderSettingData.IsDirty = true;
+					AssetBundleBuilderSettingData.Setting.OutputNameStyle = (EOutputNameStyle)_outputNameStyleField.value;
+				});
+
+				// 首包文件拷贝选项
+				_copyBuildinFileOptionField = root.Q<EnumField>("CopyBuildinFileOption");
+				_copyBuildinFileOptionField.Init(AssetBundleBuilderSettingData.Setting.CopyBuildinFileOption);
+				_copyBuildinFileOptionField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.CopyBuildinFileOption);
+				_copyBuildinFileOptionField.style.width = 350;
+				_copyBuildinFileOptionField.RegisterValueChangedCallback(evt =>
+				{
+					AssetBundleBuilderSettingData.IsDirty = true;
+					AssetBundleBuilderSettingData.Setting.CopyBuildinFileOption = (ECopyBuildinFileOption)_copyBuildinFileOptionField.value;
+					RefreshWindow();
+				});
+
+				// 首包文件的资源标签
+				_copyBuildinFileTagsField = root.Q<TextField>("CopyBuildinFileTags");
+				_copyBuildinFileTagsField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.CopyBuildinFileTags);
+				_copyBuildinFileTagsField.RegisterValueChangedCallback(evt =>
+				{
+					AssetBundleBuilderSettingData.IsDirty = true;
+					AssetBundleBuilderSettingData.Setting.CopyBuildinFileTags = _copyBuildinFileTagsField.value;
 				});
 
 				// 构建按钮
@@ -136,16 +198,54 @@ namespace YooAsset.Editor
 		}
 		public void OnDestroy()
 		{
+			if (AssetBundleBuilderSettingData.IsDirty)
 				AssetBundleBuilderSettingData.SaveFile();
 		}
+		public void Update()
+		{
+			if (_saveButton != null)
+			{
+				if (AssetBundleBuilderSettingData.IsDirty)
+				{
+					if (_saveButton.enabledSelf == false)
+						_saveButton.SetEnabled(true);
+				}
+				else
+				{
+					if (_saveButton.enabledSelf)
+						_saveButton.SetEnabled(false);
+				}
+			}
+		}
 
 		private void RefreshWindow()
 		{
-			bool enableElement = AssetBundleBuilderSettingData.Setting.BuildMode == EBuildMode.ForceRebuild;
-			_buildTagsField.SetEnabled(enableElement);
-			_encryptionField.SetEnabled(enableElement);
+			var buildPipeline = AssetBundleBuilderSettingData.Setting.BuildPipeline;
+			var buildMode = AssetBundleBuilderSettingData.Setting.BuildMode;
+			var copyOption = AssetBundleBuilderSettingData.Setting.CopyBuildinFileOption;
+			bool enableElement = buildMode == EBuildMode.ForceRebuild;
+			bool tagsFiledVisible = copyOption == ECopyBuildinFileOption.ClearAndCopyByTags || copyOption == ECopyBuildinFileOption.OnlyCopyByTags;
+
+			if (buildPipeline == EBuildPipeline.BuiltinBuildPipeline)
+			{
 				_compressionField.SetEnabled(enableElement);
-			_appendExtensionToggle.SetEnabled(enableElement);
+				_outputNameStyleField.SetEnabled(enableElement);
+				_copyBuildinFileOptionField.SetEnabled(enableElement);
+				_copyBuildinFileTagsField.SetEnabled(enableElement);
+			}
+			else
+			{
+				_compressionField.SetEnabled(true);
+				_outputNameStyleField.SetEnabled(true);
+				_copyBuildinFileOptionField.SetEnabled(true);
+				_copyBuildinFileTagsField.SetEnabled(true);
+			}
+
+			_copyBuildinFileTagsField.visible = tagsFiledVisible;
+		}
+		private void SaveBtn_clicked()
+		{
+			AssetBundleBuilderSettingData.SaveFile();
 		}
 		private void BuildButton_clicked()
 		{
@@ -170,21 +270,67 @@ namespace YooAsset.Editor
 			BuildParameters buildParameters = new BuildParameters();
 			buildParameters.OutputRoot = defaultOutputRoot;
 			buildParameters.BuildTarget = _buildTarget;
-			buildParameters.BuildMode = (EBuildMode)_buildModeField.value;
-			buildParameters.BuildVersion = _buildVersionField.value;
-			buildParameters.BuildinTags = _buildTagsField.value;
+			buildParameters.BuildPipeline = AssetBundleBuilderSettingData.Setting.BuildPipeline;
+			buildParameters.BuildMode = AssetBundleBuilderSettingData.Setting.BuildMode;
+			buildParameters.PackageName = AssetBundleBuilderSettingData.Setting.BuildPackage;
+			buildParameters.PackageVersion = _buildVersionField.value;
 			buildParameters.VerifyBuildingResult = true;
-			buildParameters.EnableAddressable = AssetBundleCollectorSettingData.Setting.EnableAddressable;
-			buildParameters.AppendFileExtension = _appendExtensionToggle.value;
+			buildParameters.AutoAnalyzeRedundancy = true;
+			buildParameters.ShareAssetPackRule = new DefaultShareAssetPackRule();
 			buildParameters.EncryptionServices = CreateEncryptionServicesInstance();
-			buildParameters.CompressOption = (ECompressOption)_compressionField.value;
+			buildParameters.CompressOption = AssetBundleBuilderSettingData.Setting.CompressOption;
+			buildParameters.OutputNameStyle = AssetBundleBuilderSettingData.Setting.OutputNameStyle;
+			buildParameters.CopyBuildinFileOption = AssetBundleBuilderSettingData.Setting.CopyBuildinFileOption;
+			buildParameters.CopyBuildinFileTags = AssetBundleBuilderSettingData.Setting.CopyBuildinFileTags;
 
-			AssetBundleBuilder builder = new AssetBundleBuilder();
-			builder.Run(buildParameters);
+			if (AssetBundleBuilderSettingData.Setting.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
+			{
+				buildParameters.SBPParameters = new BuildParameters.SBPBuildParameters();
+				buildParameters.SBPParameters.WriteLinkXML = true;
+			}
+
+			var builder = new AssetBundleBuilder();
+			var buildResult = builder.Run(buildParameters);
+			if (buildResult.Success)
+			{
+				EditorUtility.RevealInFinder(buildResult.OutputPackageDirectory);
+			}
+		}
+
+		// 构建版本相关
+		private string GetBuildPackageVersion()
+		{
+			int totalMinutes = DateTime.Now.Hour * 60 + DateTime.Now.Minute;
+			return DateTime.Now.ToString("yyyy-MM-dd") + "-" + totalMinutes;
+		}
+
+		// 构建包裹相关
+		private int GetDefaultPackageIndex(string packageName)
+		{
+			for (int index = 0; index < _buildPackageNames.Count; index++)
+			{
+				if (_buildPackageNames[index] == packageName)
+				{
+					return index;
+				}
+			}
+
+			AssetBundleBuilderSettingData.IsDirty = true;
+			AssetBundleBuilderSettingData.Setting.BuildPackage = _buildPackageNames[0];
+			return 0;
+		}
+		private List<string> GetBuildPackageNames()
+		{
+			List<string> result = new List<string>();
+			foreach (var package in AssetBundleCollectorSettingData.Setting.Packages)
+			{
+				result.Add(package.PackageName);
+			}
+			return result;
 		}
 
 		// 加密类相关
-		private int GetEncryptionDefaultIndex(string className)
+		private int GetDefaultEncryptionIndex(string className)
 		{
 			for (int index = 0; index < _encryptionServicesClassNames.Count; index++)
 			{
@@ -193,6 +339,9 @@ namespace YooAsset.Editor
 					return index;
 				}
 			}
+
+			AssetBundleBuilderSettingData.IsDirty = true;
+			AssetBundleBuilderSettingData.Setting.EncyptionClassName = _encryptionServicesClassNames[0];
 			return 0;
 		}
 		private List<Type> GetEncryptionServicesClassTypes()

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.uxml

@@ -1,13 +1,18 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
-    <uie:Toolbar name="Toolbar" style="display: flex;" />
+    <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(56, 147, 58);" />
+    </uie:Toolbar>
     <ui:VisualElement name="BuildContainer">
         <ui:TextField picking-mode="Ignore" label="Build Output" name="BuildOutput" />
-        <uie:IntegerField label="Build Version" value="0" name="BuildVersion" />
+        <uie:EnumField label="Build Pipeline" name="BuildPipeline" />
         <uie:EnumField label="Build Mode" name="BuildMode" />
+        <ui:TextField picking-mode="Ignore" label="Build Version" name="BuildVersion" style="width: 350px;" />
+        <ui:VisualElement name="BuildPackageContainer" style="height: 24px;" />
         <ui:VisualElement name="EncryptionContainer" style="height: 24px;" />
         <uie:EnumField label="Compression" value="Center" name="Compression" />
-        <ui:Toggle label="Append Extension" name="AppendExtension" style="height: 15px;" />
-        <ui:TextField picking-mode="Ignore" label="Buildin Tags" name="BuildinTags" />
+        <uie:EnumField label="Output Name Style" value="Center" name="OutputNameStyle" />
+        <uie:EnumField label="Copy Buildin File Option" value="Center" name="CopyBuildinFileOption" />
+        <ui:TextField picking-mode="Ignore" label="Copy Buildin File Tags" name="CopyBuildinFileTags" />
         <ui:Button text="构建" display-tooltip-when-elided="true" name="Build" style="height: 50px; background-color: rgb(40, 106, 42); margin-top: 10px;" />
     </ui:VisualElement>
 </ui:UXML>

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleSimulateBuilder.cs

@@ -1,43 +1,37 @@
 using UnityEditor;
+using UnityEngine;
 
 namespace YooAsset.Editor
 {
 	public static class AssetBundleSimulateBuilder
 	{
-		private static string _manifestFilePath = string.Empty;
-
 		/// <summary>
 		/// 模拟构建
 		/// </summary>
-		public static void SimulateBuild()
+		public static string SimulateBuild(string packageName)
 		{
+			Debug.Log($"Begin to create simulate package : {packageName}");
 			string defaultOutputRoot = AssetBundleBuilderHelper.GetDefaultOutputRoot();
 			BuildParameters buildParameters = new BuildParameters();
 			buildParameters.OutputRoot = defaultOutputRoot;
 			buildParameters.BuildTarget = EditorUserBuildSettings.activeBuildTarget;
 			buildParameters.BuildMode = EBuildMode.SimulateBuild;
-			buildParameters.BuildVersion = 999;
-			buildParameters.EnableAddressable = AssetBundleCollectorSettingData.Setting.EnableAddressable;
+			buildParameters.PackageName = packageName;
+			buildParameters.PackageVersion = "Simulate";
+			buildParameters.EnableLog = false;
 
 			AssetBundleBuilder builder = new AssetBundleBuilder();
-			bool buildResult = builder.Run(buildParameters);
-			if (buildResult)
+			var buildResult = builder.Run(buildParameters);
+			if (buildResult.Success)
 			{
-				string pipelineOutputDirectory = AssetBundleBuilderHelper.MakePipelineOutputDirectory(buildParameters.OutputRoot, buildParameters.BuildTarget);
-				_manifestFilePath = $"{pipelineOutputDirectory}_{EBuildMode.SimulateBuild}/{YooAssetSettingsData.GetPatchManifestFileName(buildParameters.BuildVersion)}";
+				string manifestFileName = YooAssetSettingsData.GetManifestBinaryFileName(buildParameters.PackageName, buildParameters.PackageVersion);
+				string manifestFilePath = $"{buildResult.OutputPackageDirectory}/{manifestFileName}";
+				return manifestFilePath;
 			}
 			else
 			{
-				_manifestFilePath = null;
-			}
-		}
-		
-		/// <summary>
-		/// 获取构建的补丁清单路径
-		/// </summary>
-		public static string GetPatchManifestPath()
-		{
-			return _manifestFilePath;
+				return null;
+			}
 		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildAssetInfo.cs

@@ -7,16 +7,19 @@ namespace YooAsset.Editor
 {
 	public class BuildAssetInfo
 	{
-		private string _mainBundleName;
-		private string _shareBundleName;
-		private readonly HashSet<string> _referenceBundleNames = new HashSet<string>();
 		private bool _isAddAssetTags = false;
+		private readonly HashSet<string> _referenceBundleNames = new HashSet<string>();
 
 		/// <summary>
 		/// 收集器类型
 		/// </summary>
 		public ECollectorType CollectorType { private set; get; }
 
+		/// <summary>
+		/// 资源包完整名称
+		/// </summary>
+		public string BundleName { private set; get; }
+
 		/// <summary>
 		/// 可寻址地址
 		/// </summary>
@@ -54,29 +57,29 @@ namespace YooAsset.Editor
 		public List<BuildAssetInfo> AllDependAssetInfos { private set; get; }
 
 
-		public BuildAssetInfo(ECollectorType collectorType, string mainBundleName, string address, string assetPath, bool isRawAsset)
+		public BuildAssetInfo(ECollectorType collectorType, string bundleName, string address, string assetPath, bool isRawAsset)
 		{
-			_mainBundleName = mainBundleName;
 			CollectorType = collectorType;
+			BundleName = bundleName;
 			Address = address;
 			AssetPath = assetPath;
 			IsRawAsset = isRawAsset;
 
 			System.Type assetType = UnityEditor.AssetDatabase.GetMainAssetTypeAtPath(assetPath);
-			if (assetType == typeof(UnityEngine.Shader))
+			if (assetType == typeof(UnityEngine.Shader) || assetType == typeof(UnityEngine.ShaderVariantCollection))
 				IsShaderAsset = true;
 			else
 				IsShaderAsset = false;
 		}
-		public BuildAssetInfo(ECollectorType collectorType, string assetPath)
+		public BuildAssetInfo(string assetPath)
 		{
-			CollectorType = collectorType;
+			CollectorType = ECollectorType.None;
 			Address = string.Empty;
 			AssetPath = assetPath;
 			IsRawAsset = false;
 
 			System.Type assetType = UnityEditor.AssetDatabase.GetMainAssetTypeAtPath(assetPath);
-			if (assetType == typeof(UnityEngine.Shader))
+			if (assetType == typeof(UnityEngine.Shader) || assetType == typeof(UnityEngine.ShaderVariantCollection))
 				IsShaderAsset = true;
 			else
 				IsShaderAsset = false;
@@ -133,24 +136,12 @@ namespace YooAsset.Editor
 		/// </summary>
 		public bool HasBundleName()
 		{
-			string bundleName = GetBundleName();
-			if (string.IsNullOrEmpty(bundleName))
+			if (string.IsNullOrEmpty(BundleName))
 				return false;
 			else
 				return true;
 		}
 
-		/// <summary>
-		/// 获取资源包名称
-		/// </summary>
-		public string GetBundleName()
-		{
-			if (CollectorType == ECollectorType.None)
-				return _shareBundleName;
-			else
-				return _mainBundleName;
-		}
-
 		/// <summary>
 		/// 添加关联的资源包名称
 		/// </summary>
@@ -164,48 +155,55 @@ namespace YooAsset.Editor
 		}
 
 		/// <summary>
-		/// 计算主资源或共享资源的完整包名
+		/// 计算共享资源包的完整包名
 		/// </summary>
-		public void CalculateFullBundleName()
-		{
-			if (CollectorType == ECollectorType.None)
+		public void CalculateShareBundleName(IShareAssetPackRule packRule, bool uniqueBundleName, string packageName, string shadersBundleName)
 		{
+			if (CollectorType != ECollectorType.None)
+				return;
+
 			if (IsRawAsset)
 				throw new Exception("Should never get here !");
 
-				if (AssetBundleCollectorSettingData.Setting.AutoCollectShaders)
-				{
 			if (IsShaderAsset)
 			{
-						string shareBundleName = $"{AssetBundleCollectorSettingData.Setting.ShadersBundleName}.{YooAssetSettingsData.Setting.AssetBundleFileVariant}";
-						_shareBundleName = EditorTools.GetRegularPath(shareBundleName).ToLower();
-						return;
+				BundleName = shadersBundleName;
+			}
+			else
+			{
+				if (_referenceBundleNames.Count > 1)
+				{
+					PackRuleResult packRuleResult = packRule.GetPackRuleResult(AssetPath);
+					BundleName = packRuleResult.GetShareBundleName(packageName, uniqueBundleName);
+				}
+				else
+				{
+					// 注意：被引用次数小于1的资源不需要设置资源包名称
+					BundleName = string.Empty;
+				}
 			}
 		}
 
-				if (_referenceBundleNames.Count > 1)
-				{
-					var bundleNameList = _referenceBundleNames.ToList();
-					bundleNameList.Sort();
-					string combineName = string.Join("|", bundleNameList);
-					var combineNameHash = HashUtility.StringSHA1(combineName);
-					var shareBundleName = $"share_{combineNameHash}.{YooAssetSettingsData.Setting.AssetBundleFileVariant}";
-					_shareBundleName = EditorTools.GetRegularPath(shareBundleName).ToLower();
-				}
-			}
-			else
+		/// <summary>
+		/// 判断是否为冗余资源
+		/// </summary>
+		public bool IsRedundancyAsset()
 		{
+			if (CollectorType != ECollectorType.None)
+				return false;
+
 			if (IsRawAsset)
+				throw new Exception("Should never get here !");
+
+			return _referenceBundleNames.Count > 1;
+		}
+
+		/// <summary>
+		/// 获取关联资源包的数量
+		/// </summary>
+		public int GetReferenceBundleCount()
 		{
-					string mainBundleName = $"{_mainBundleName}.{YooAssetSettingsData.Setting.RawFileVariant}";
-					_mainBundleName = EditorTools.GetRegularPath(mainBundleName).ToLower();
-				}
-				else
-				{
-					string mainBundleName = $"{_mainBundleName}.{YooAssetSettingsData.Setting.AssetBundleFileVariant}";
-					_mainBundleName = EditorTools.GetRegularPath(mainBundleName).ToLower(); ;
-				}
-			}
+			return _referenceBundleNames.Count;
 		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildBundleInfo.cs

@@ -8,6 +8,40 @@ namespace YooAsset.Editor
 {
 	public class BuildBundleInfo
 	{
+		public class InfoWrapper
+		{
+			/// <summary>
+			/// 构建内容的哈希值
+			/// </summary>
+			public string ContentHash { set; get; }
+
+			/// <summary>
+			/// 文件哈希值
+			/// </summary>
+			public string FileHash { set; get; }
+
+			/// <summary>
+			/// 文件哈希值
+			/// </summary>
+			public string FileCRC { set; get; }
+
+			/// <summary>
+			/// 文件哈希值
+			/// </summary>
+			public long FileSize { set; get; }
+
+
+			/// <summary>
+			/// 构建输出的文件路径
+			/// </summary>
+			public string BuildOutputFilePath { set; get; }
+
+			/// <summary>
+			/// 补丁包输出文件路径
+			/// </summary>
+			public string PackageOutputFilePath { set; get; }
+		}
+
 		/// <summary>
 		/// 资源包名称
 		/// </summary>
@@ -17,7 +51,23 @@ namespace YooAsset.Editor
 		/// 参与构建的资源列表
 		/// 注意：不包含零依赖资源
 		/// </summary>
-		public readonly List<BuildAssetInfo> BuildinAssets = new List<BuildAssetInfo>();
+		public readonly List<BuildAssetInfo> AllMainAssets = new List<BuildAssetInfo>();
+
+		/// <summary>
+		/// 补丁文件信息
+		/// </summary>
+		public readonly InfoWrapper BundleInfo = new InfoWrapper();
+
+		/// <summary>
+		/// Bundle文件的加载方法
+		/// </summary>
+		public EBundleLoadMethod LoadMethod { set; get; }
+
+		/// <summary>
+		/// 加密生成文件的路径
+		/// 注意：如果未加密该路径为空
+		/// </summary>
+		public string EncryptedFilePath { set; get; }
 
 		/// <summary>
 		/// 是否为原生文件
@@ -26,15 +76,29 @@ namespace YooAsset.Editor
 		{
 			get
 			{
-				foreach (var asset in BuildinAssets)
+				foreach (var assetInfo in AllMainAssets)
 				{
-					if (asset.IsRawAsset)
+					if (assetInfo.IsRawAsset)
 						return true;
 				}
 				return false;
 			}
 		}
 
+		/// <summary>
+		/// 是否为加密文件
+		/// </summary>
+		public bool IsEncryptedFile
+		{
+			get
+			{
+				if (string.IsNullOrEmpty(EncryptedFilePath))
+					return false;
+				else
+					return true;
+			}
+		}
+
 
 		public BuildBundleInfo(string bundleName)
 		{
@@ -49,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>
@@ -57,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)
 				{
@@ -72,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)
 				{
@@ -85,27 +149,42 @@ namespace YooAsset.Editor
 		}
 
 		/// <summary>
-		/// 获取文件的扩展名
+		/// 获取该资源包内的所有资源（包括零依赖资源）
 		/// </summary>
-		public string GetAppendExtension()
+		public List<string> GetAllBuiltinAssetPaths()
 		{
-			return System.IO.Path.GetExtension(BundleName);
+			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>
@@ -117,8 +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>
+		/// 创建PackageBundle类
+		/// </summary>
+		internal PackageBundle CreatePackageBundle()
+		{
+			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,13 @@ namespace YooAsset.Editor
 {
 	public class BuildMapContext : IContextObject
 	{
+		private readonly Dictionary<string, BuildBundleInfo> _bundleInfoDic = new Dictionary<string, BuildBundleInfo>(10000);
+
+		/// <summary>
+		/// 冗余的资源列表
+		/// </summary>
+		public readonly List<ReportRedundancyInfo> RedundancyInfos= new List<ReportRedundancyInfo>(1000);
+		
 		/// <summary>
 		/// 参与构建的资源总数
 		/// 说明：包括主动收集的资源以及其依赖的所有资源
@@ -15,9 +22,30 @@ namespace YooAsset.Editor
 		public int AssetFileCount;
 
 		/// <summary>
-		/// 资源包列表
+		/// 是否启用可寻址资源定位
 		/// </summary>
-		public readonly List<BuildBundleInfo> BundleInfos = new List<BuildBundleInfo>(1000);
+		public bool EnableAddressable;
+
+		/// <summary>
+		/// 资源包名唯一化
+		/// </summary>
+		public bool UniqueBundleName;
+
+		/// <summary>
+		/// 着色器统一的全名称
+		/// </summary>
+		public string ShadersBundleName;
+
+		/// <summary>
+		/// 资源包信息列表
+		/// </summary>
+		public Dictionary<string, BuildBundleInfo>.ValueCollection Collection
+		{
+			get
+			{
+				return _bundleInfoDic.Values;
+			}
+		}
 
 
 		/// <summary>
@@ -25,11 +53,11 @@ namespace YooAsset.Editor
 		/// </summary>
 		public void PackAsset(BuildAssetInfo assetInfo)
 		{
-			string bundleName = assetInfo.GetBundleName();
+			string bundleName = assetInfo.BundleName;
 			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);
 			}
@@ -37,45 +65,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 _bundleInfoDic.ContainsKey(bundleName);
 		}
+
+		/// <summary>
+		/// 获取资源包信息，如果没找到返回NULL
+		/// </summary>
+		public BuildBundleInfo GetBundleInfo(string bundleName)
+		{
+			if (_bundleInfoDic.TryGetValue(bundleName, out BuildBundleInfo result))
+			{
 				return result;
 			}
-
-		/// <summary>
-		/// 获取资源包的分类标签列表
-		/// </summary>
-		public string[] GetBundleTags(string bundleName)
-		{
-			if (TryGetBundleInfo(bundleName, out BuildBundleInfo bundleInfo))
-			{
-				return bundleInfo.GetBundleTags();
-			}
-			throw new Exception($"Not found {nameof(BuildBundleInfo)} : {bundleName}");
-		}
-
-		/// <summary>
-		/// 获取AssetBundle内构建的资源路径列表
-		/// </summary>
-		public string[] GetBuildinAssetPaths(string bundleName)
-		{
-			if (TryGetBundleInfo(bundleName, out BuildBundleInfo bundleInfo))
-			{
-				return bundleInfo.GetBuildinAssetPaths();
-			}
-			throw new Exception($"Not found {nameof(BuildBundleInfo)} : {bundleName}");
+			throw new Exception($"Not found bundle : {bundleName}");
 		}
 
 		/// <summary>
@@ -83,8 +94,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());
@@ -93,25 +104,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)
+			if (IsContainsBundle(shadersBundleName) == false)
 			{
-			foreach (var bundleInfo in BundleInfos)
-			{
-				if (bundleInfo.BundleName == bundleName)
-				{
-					result = bundleInfo;
-					return true;
-				}
-			}
-			result = null;
-			return false;
+				var shaderBundleInfo = new BuildBundleInfo(shadersBundleName);
+				_bundleInfoDic.Add(shadersBundleName, shaderBundleInfo);
+			}
 		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildMapCreater.cs

@@ -1,136 +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)
-		{
-			BuildMapContext context = new BuildMapContext();
-			Dictionary<string, BuildAssetInfo> buildAssetDic = new Dictionary<string, BuildAssetInfo>(1000);
-
-			// 1. 检测配置合法性
-			AssetBundleCollectorSettingData.Setting.CheckConfigError();
-
-			// 2. 获取所有收集器收集的资源
-			List<CollectAssetInfo> allCollectAssets = AssetBundleCollectorSettingData.Setting.GetAllCollectAssets(buildMode);
-
-			// 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)
-			{
-				foreach (var dependAssetPath in collectAssetInfo.DependAssets)
-				{
-					if (buildAssetDic.ContainsKey(dependAssetPath))
-					{
-						buildAssetDic[dependAssetPath].AddBundleTags(collectAssetInfo.AssetTags);
-						buildAssetDic[dependAssetPath].AddReferenceBundleName(collectAssetInfo.BundleName);
-					}
-					else
-					{
-						var buildAssetInfo = new BuildAssetInfo(ECollectorType.None, dependAssetPath);
-						buildAssetInfo.AddBundleTags(collectAssetInfo.AssetTags);
-						buildAssetInfo.AddReferenceBundleName(collectAssetInfo.BundleName);
-						buildAssetDic.Add(dependAssetPath, buildAssetInfo);
-					}
-				}
-			}
-			context.AssetFileCount = buildAssetDic.Count;
-
-			// 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. 计算完整的资源包名
-			foreach (KeyValuePair<string, BuildAssetInfo> pair in buildAssetDic)
-			{
-				pair.Value.CalculateFullBundleName();
-			}
-
-			// 8. 移除不参与构建的资源
-			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);
-			}
-
-			// 9. 构建资源包
-			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;
-				}
-			}
-
-			BuildRunner.Log($"发现未被依赖的资源并自动移除 : {dependAssetPath}");
-			return true;
-		}
-	}
-}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs

@@ -9,6 +9,33 @@ namespace YooAsset.Editor
 	/// </summary>
 	public class BuildParameters
 	{
+		/// <summary>
+		/// SBP构建参数
+		/// </summary>
+		public class SBPBuildParameters
+		{
+			/// <summary>
+			/// 生成代码防裁剪配置
+			/// </summary>
+			public bool WriteLinkXML = true;
+
+			/// <summary>
+			/// 缓存服务器地址
+			/// </summary>
+			public string CacheServerHost;
+
+			/// <summary>
+			/// 缓存服务器端口
+			/// </summary>
+			public int CacheServerPort;
+		}
+
+		/// <summary>
+		/// 可编程构建管线的参数
+		/// </summary>
+		public SBPBuildParameters SBPParameters;
+
+
 		/// <summary>
 		/// 输出的根目录
 		/// </summary>
@@ -19,44 +46,67 @@ namespace YooAsset.Editor
 		/// </summary>
 		public BuildTarget BuildTarget;
 
+		/// <summary>
+		/// 构建管线
+		/// </summary>
+		public EBuildPipeline BuildPipeline;
+
 		/// <summary>
 		/// 构建模式
 		/// </summary>
 		public EBuildMode BuildMode;
 
 		/// <summary>
-		/// 构建的版本（资源版本号）
+		/// 构建的包裹名称
 		/// </summary>
-		public int BuildVersion;
+		public string PackageName;
 
 		/// <summary>
-		/// 内置资源的标记列表
-		/// 注意：分号为分隔符
+		/// 构建的包裹版本
 		/// </summary>
-		public string BuildinTags;
+		public string PackageVersion;
 
 
+		/// <summary>
+		/// 是否显示普通日志
+		/// </summary>
+		public bool EnableLog = true;
+		
 		/// <summary>
 		/// 验证构建结果
 		/// </summary>
 		public bool VerifyBuildingResult = false;
 
 		/// <summary>
-		/// 启用可寻址资源定位
+		/// 自动分析冗余资源
 		/// </summary>
-		public bool EnableAddressable = false;
+		public bool AutoAnalyzeRedundancy = true;
 		
 		/// <summary>
-		/// 追加文件扩展名
+		/// 共享资源的打包规则
 		/// </summary>
-		public bool AppendFileExtension = false;
-
+		public IShareAssetPackRule ShareAssetPackRule = null;
 
 		/// <summary>
-		/// 加密类
+		/// 资源的加密接口
 		/// </summary>
 		public IEncryptionServices EncryptionServices = null;
 
+		/// <summary>
+		/// 补丁文件名称的样式
+		/// </summary>
+		public EOutputNameStyle OutputNameStyle = EOutputNameStyle.HashName;
+
+		/// <summary>
+		/// 拷贝内置资源选项
+		/// </summary>
+		public ECopyBuildinFileOption CopyBuildinFileOption = ECopyBuildinFileOption.None;
+
+		/// <summary>
+		/// 拷贝内置资源的标签
+		/// </summary>
+		public string CopyBuildinFileTags = string.Empty;
+
 		/// <summary>
 		/// 压缩选项
 		/// </summary>
@@ -71,14 +121,5 @@ namespace YooAsset.Editor
 		/// 忽略类型树变化
 		/// </summary>
 		public bool IgnoreTypeTreeChanges = true;
-
-
-		/// <summary>
-		/// 获取内置标记列表
-		/// </summary>
-		public List<string> GetBuildinTags()
-		{
-			return StringUtility.StringToStringList(BuildinTags, ';');
-		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildParametersContext.cs

@@ -0,0 +1,119 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+	public class BuildParametersContext : IContextObject
+	{
+		private string _pipelineOutputDirectory = string.Empty;
+		private string _packageOutputDirectory = string.Empty;
+
+		/// <summary>
+		/// 构建参数
+		/// </summary>
+		public BuildParameters Parameters { private set; get; }
+
+
+		public BuildParametersContext(BuildParameters parameters)
+		{
+			Parameters = parameters;
+		}
+
+		/// <summary>
+		/// 获取构建管线的输出目录
+		/// </summary>
+		/// <returns></returns>
+		public string GetPipelineOutputDirectory()
+		{
+			if (string.IsNullOrEmpty(_pipelineOutputDirectory))
+			{
+				_pipelineOutputDirectory = $"{Parameters.OutputRoot}/{Parameters.BuildTarget}/{Parameters.PackageName}/{YooAssetSettings.OutputFolderName}";
+			}
+			return _pipelineOutputDirectory;
+		}
+
+		/// <summary>
+		/// 获取本次构建的补丁目录
+		/// </summary>
+		public string GetPackageOutputDirectory()
+		{
+			if (string.IsNullOrEmpty(_packageOutputDirectory))
+			{
+				_packageOutputDirectory = $"{Parameters.OutputRoot}/{Parameters.BuildTarget}/{Parameters.PackageName}/{Parameters.PackageVersion}";
+			}
+			return _packageOutputDirectory;
+		}
+
+		/// <summary>
+		/// 获取内置构建管线的构建选项
+		/// </summary>
+		public BuildAssetBundleOptions GetPipelineBuildOptions()
+		{
+			// For the new build system, unity always need BuildAssetBundleOptions.CollectDependencies and BuildAssetBundleOptions.DeterministicAssetBundle
+			// 除非设置ForceRebuildAssetBundle标记，否则会进行增量打包
+
+			if (Parameters.BuildMode == EBuildMode.SimulateBuild)
+				throw new Exception("Should never get here !");
+
+			BuildAssetBundleOptions opt = BuildAssetBundleOptions.None;
+			opt |= BuildAssetBundleOptions.StrictMode; //Do not allow the build to succeed if any errors are reporting during it.
+
+			if (Parameters.BuildMode == EBuildMode.DryRunBuild)
+			{
+				opt |= BuildAssetBundleOptions.DryRunBuild;
+				return opt;
+			}
+
+			if (Parameters.CompressOption == ECompressOption.Uncompressed)
+				opt |= BuildAssetBundleOptions.UncompressedAssetBundle;
+			else if (Parameters.CompressOption == ECompressOption.LZ4)
+				opt |= BuildAssetBundleOptions.ChunkBasedCompression;
+
+			if (Parameters.BuildMode == EBuildMode.ForceRebuild)
+				opt |= BuildAssetBundleOptions.ForceRebuildAssetBundle; //Force rebuild the asset bundles
+			if (Parameters.DisableWriteTypeTree)
+				opt |= BuildAssetBundleOptions.DisableWriteTypeTree; //Do not include type information within the asset bundle (don't write type tree).
+			if (Parameters.IgnoreTypeTreeChanges)
+				opt |= BuildAssetBundleOptions.IgnoreTypeTreeChanges; //Ignore the type tree changes when doing the incremental build check.
+
+			opt |= BuildAssetBundleOptions.DisableLoadAssetByFileName; //Disables Asset Bundle LoadAsset by file name.
+			opt |= BuildAssetBundleOptions.DisableLoadAssetByFileNameWithExtension; //Disables Asset Bundle LoadAsset by file name with extension.			
+
+			return opt;
+		}
+
+		/// <summary>
+		/// 获取可编程构建管线的构建参数
+		/// </summary>
+		public UnityEditor.Build.Pipeline.BundleBuildParameters GetSBPBuildParameters()
+		{
+			if (Parameters.BuildMode == EBuildMode.SimulateBuild)
+				throw new Exception("Should never get here !");
+
+			var targetGroup = BuildPipeline.GetBuildTargetGroup(Parameters.BuildTarget);
+			var pipelineOutputDirectory = GetPipelineOutputDirectory();
+			var buildParams = new UnityEditor.Build.Pipeline.BundleBuildParameters(Parameters.BuildTarget, targetGroup, pipelineOutputDirectory);
+
+			if (Parameters.CompressOption == ECompressOption.Uncompressed)
+				buildParams.BundleCompression = UnityEngine.BuildCompression.Uncompressed;
+			else if (Parameters.CompressOption == ECompressOption.LZMA)
+				buildParams.BundleCompression = UnityEngine.BuildCompression.LZMA;
+			else if (Parameters.CompressOption == ECompressOption.LZ4)
+				buildParams.BundleCompression = UnityEngine.BuildCompression.LZ4;
+			else
+				throw new System.NotImplementedException(Parameters.CompressOption.ToString());
+
+			if (Parameters.DisableWriteTypeTree)
+				buildParams.ContentBuildFlags |= UnityEditor.Build.Content.ContentBuildFlags.DisableWriteTypeTree;
+
+			buildParams.UseCache = true;
+			buildParams.CacheServerHost = Parameters.SBPParameters.CacheServerHost;
+			buildParams.CacheServerPort = Parameters.SBPParameters.CacheServerPort;
+			buildParams.WriteLinkXML = Parameters.SBPParameters.WriteLinkXML;
+
+			return buildParams;
+		}
+	}
+}

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

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

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

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.IO;
 using UnityEngine;
 
 namespace YooAsset.Editor
@@ -26,6 +27,11 @@ namespace YooAsset.Editor
 		/// </summary>
 		public List<ReportBundleInfo> BundleInfos = new List<ReportBundleInfo>();
 
+		/// <summary>
+		/// 冗余的资源列表
+		/// </summary>
+		public List<ReportRedundancyInfo> RedundancyInfos = new List<ReportRedundancyInfo>();
+		
 
 		/// <summary>
 		/// 获取资源包信息类
@@ -56,8 +62,11 @@ namespace YooAsset.Editor
 
 		public static void Serialize(string savePath, BuildReport buildReport)
 		{
+			if (File.Exists(savePath))
+				File.Delete(savePath);
+
 			string json = JsonUtility.ToJson(buildReport, true);
-			FileUtility.CreateFile(savePath, json);
+			FileUtility.WriteAllText(savePath, json);
 		}
 		public static BuildReport Deserialize(string jsonData)
 		{

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

@@ -8,40 +8,40 @@ namespace YooAsset.Editor
 	[Serializable]
 	public class ReportBundleInfo
 	{
-		public class FlagsData
-		{
-			public bool IsEncrypted { private set; get; }
-			public bool IsBuildin { private set; get; }
-			public bool IsRawFile { private set; get; }
-			public FlagsData(bool isEncrypted, bool isBuildin, bool isRawFile)
-			{
-				IsEncrypted = isEncrypted;
-				IsBuildin = isBuildin;
-				IsRawFile = isRawFile;
-			}
-		}
-
-		private FlagsData _flagData;
-
 		/// <summary>
 		/// 资源包名称
 		/// </summary>
 		public string BundleName;
 
 		/// <summary>
-		/// 哈希值
+		/// 文件名称
 		/// </summary>
-		public string Hash;
+		public string FileName;
+
+		/// <summary>
+		/// 文件哈希值
+		/// </summary>
+		public string FileHash;
 
 		/// <summary>
 		/// 文件校验码
 		/// </summary>
-		public string CRC;
+		public string FileCRC;
 
 		/// <summary>
 		/// 文件大小（字节数）
 		/// </summary>
-		public long SizeBytes;
+		public long FileSize;
+
+		/// <summary>
+		/// 是否为原生文件
+		/// </summary>
+		public bool IsRawFile;
+
+		/// <summary>
+		/// 加载方法
+		/// </summary>
+		public EBundleLoadMethod LoadMethod;
 
 		/// <summary>
 		/// Tags
@@ -49,26 +49,14 @@ namespace YooAsset.Editor
 		public string[] Tags;
 
 		/// <summary>
-		/// Flags
+		/// 引用该资源包的ID列表
 		/// </summary>
-		public int Flags;
-
+		public int[] ReferenceIDs;
 
 		/// <summary>
-		/// 获取标志位的解析数据
+		/// 该资源包内包含的所有资源
 		/// </summary>
-		public FlagsData GetFlagData()
-		{
-			if (_flagData == null)
-			{
-				BitMask32 value = Flags;
-				bool isEncrypted = value.Test(0);
-				bool isBuildin = value.Test(1);
-				bool isRawFile = value.Test(2);
-				_flagData = new FlagsData(isEncrypted, isBuildin, isRawFile);
-			}
-			return _flagData;
-		}
+		public List<string> AllBuiltinAssets = new List<string>();
 
 		/// <summary>
 		/// 获取资源分类标签的字符串
@@ -80,16 +68,5 @@ namespace YooAsset.Editor
 			else
 				return string.Empty;
 		}
-
-		/// <summary>
-		/// 是否为原生文件
-		/// </summary>
-		public bool IsRawFile()
-		{
-			if (System.IO.Path.GetExtension(BundleName) == $".{YooAssetSettingsData.Setting.RawFileVariant}")
-				return true;
-			else
-				return false;
-		}
 	}
 }

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

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

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

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

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

@@ -8,6 +8,11 @@ namespace YooAsset.Editor
 	[Serializable]
 	public class ReportSummary
 	{
+		/// <summary>
+		/// YooAsset版本
+		/// </summary>
+		public string YooVersion;
+
 		/// <summary>
 		/// 引擎版本
 		/// </summary>
@@ -16,7 +21,7 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 构建时间
 		/// </summary>
-		public string BuildTime;
+		public string BuildDate;
 
 		/// <summary>
 		/// 构建耗时（单位：秒）
@@ -28,20 +33,25 @@ namespace YooAsset.Editor
 		/// </summary>
 		public BuildTarget BuildTarget;
 
+		/// <summary>
+		/// 构建管线
+		/// </summary>
+		public EBuildPipeline BuildPipeline;
+
 		/// <summary>
 		/// 构建模式
 		/// </summary>
 		public EBuildMode BuildMode;
 
 		/// <summary>
-		/// 构建版本
+		/// 构建包裹名称
 		/// </summary>
-		public int BuildVersion;
+		public string BuildPackageName;
 
 		/// <summary>
-		/// 内置资源标签
+		/// 构建包裹版本
 		/// </summary>
-		public string BuildinTags;
+		public string BuildPackageVersion;
 
 		/// <summary>
 		/// 启用可寻址资源定位
@@ -49,19 +59,19 @@ namespace YooAsset.Editor
 		public bool EnableAddressable;
 
 		/// <summary>
-		/// 追加文件扩展名
+		/// 资源包名唯一化
 		/// </summary>
-		public bool AppendFileExtension;
+		public bool UniqueBundleName;
 
 		/// <summary>
-		/// 自动收集着色器
+		/// 自动分析冗余
 		/// </summary>
-		public bool AutoCollectShaders;
+		public bool AutoAnalyzeRedundancy;
 
 		/// <summary>
-		/// 自动收集的着色器资源包名称
+		/// 共享资源的打包类名称
 		/// </summary>
-		public string ShadersBundleName;
+		public string ShareAssetPackRuleClassName;
 
 		/// <summary>
 		/// 加密服务类名称
@@ -69,16 +79,16 @@ namespace YooAsset.Editor
 		public string EncryptionServicesClassName;
 
 		// 构建参数
+		public EOutputNameStyle OutputNameStyle;
 		public ECompressOption CompressOption;
 		public bool DisableWriteTypeTree;
 		public bool IgnoreTypeTreeChanges;
 
 		// 构建结果
 		public int AssetFileTotalCount;
+		public int MainAssetTotalCount;
 		public int AllBundleTotalCount;
 		public long AllBundleTotalSize;
-		public int BuildinBundleTotalCount;
-		public long BuildinBundleTotalSize;
 		public int EncryptedBundleTotalCount;
 		public long EncryptedBundleTotalSize;
 		public int RawBundleTotalCount;

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

@@ -0,0 +1,33 @@
+using System;
+using System.IO;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace YooAsset.Editor
+{
+	public static class BuildLogger
+	{
+		private static bool _enableLog = true;
+
+		public static void InitLogger(bool enableLog)
+		{
+			_enableLog = enableLog;
+		}
+
+		public static void Log(string message)
+		{
+			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/BuildLogger.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4eff45040ac501b4fa978c46f72f2e64
+guid: 2bc82466a51f50141975e4424095aa09
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -0,0 +1,29 @@
+
+namespace YooAsset.Editor
+{
+    /// <summary>
+    /// 构建结果
+    /// </summary>
+    public class BuildResult
+    {
+        /// <summary>
+        /// 构建是否成功
+        /// </summary>
+        public bool Success;
+
+        /// <summary>
+        /// 构建失败的任务
+        /// </summary>
+        public string FailedTask;
+
+        /// <summary>
+        /// 构建失败的信息
+        /// </summary>
+        public string ErrorInfo;
+
+        /// <summary>
+        /// 输出的补丁包目录
+        /// </summary>
+        public string OutputPackageDirectory;
+    }
+}

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e26f14db9addb4c49b4f0f520bf75d9d
+guid: e0855c4b5eaa26942bd7ad177fe3c288
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -2,65 +2,71 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
+using System.Diagnostics;
 using UnityEngine;
 
 namespace YooAsset.Editor
 {
 	public class BuildRunner
 	{
-		public static bool EnableLog = true;
+		private static Stopwatch _buildWatch;
+
+		/// <summary>
+		/// 总耗时
+		/// </summary>
+		public static int TotalSeconds = 0;
 
 		/// <summary>
 		/// 执行构建流程
 		/// </summary>
 		/// <returns>如果成功返回TRUE，否则返回FALSE</returns>
-		public static bool Run(List<IBuildTask> pipeline, BuildContext context)
+		public static BuildResult Run(List<IBuildTask> pipeline, BuildContext context)
 		{
 			if (pipeline == null)
 				throw new ArgumentNullException("pipeline");
 			if (context == null)
 				throw new ArgumentNullException("context");
 
-			bool succeed = true;
+			BuildResult buildResult = new BuildResult();
+			buildResult.Success = true;
+			TotalSeconds = 0;
 			for (int i = 0; i < pipeline.Count; i++)
 			{
 				IBuildTask task = pipeline[i];
 				try
 				{
+					_buildWatch = Stopwatch.StartNew();
 					var taskAttribute = task.GetType().GetCustomAttribute<TaskAttribute>();
-					Log($"---------------------------------------->{taskAttribute.Desc}");
+					if (taskAttribute != null)
+						BuildLogger.Log($"---------------------------------------->{taskAttribute.Desc}<---------------------------------------");
 					task.Run(context);
+					_buildWatch.Stop();
+
+					// 统计耗时
+					int seconds = GetBuildSeconds();
+					TotalSeconds += seconds;
+					if (taskAttribute != null)
+						BuildLogger.Log($"{taskAttribute.Desc}耗时：{seconds}秒");
 				}
 				catch (Exception e)
 				{
-					Debug.LogError($"Build task {task.GetType().Name} failed !");
-					Debug.LogError($"Build error : {e}");
-					succeed = false;
+					EditorTools.ClearProgressBar();
+					buildResult.FailedTask = task.GetType().Name;
+					buildResult.ErrorInfo = e.ToString();
+					buildResult.Success = false;
 					break;
 				}
 			}
 
 			// 返回运行结果
-			return succeed;
+			BuildLogger.Log($"构建过程总计耗时：{TotalSeconds}秒");
+			return buildResult;
 		}
 
-		/// <summary>
-		/// 日志输出
-		/// </summary>
-		public static void Log(string info)
+		private static int GetBuildSeconds()
 		{
-			if (EnableLog)
-			{
-				UnityEngine.Debug.Log(info);
-			}
-		}
-
-		/// <summary>
-		/// 日志输出
-		/// </summary>
-		public static void Info(string info)
-		{
-			UnityEngine.Debug.Log(info);
+			float seconds = _buildWatch.ElapsedMilliseconds / 1000f;
+			return (int)seconds;
 		}
 	}
 }

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

@@ -0,0 +1,52 @@
+using System;
+using System.Linq;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor.Build.Pipeline;
+using UnityEditor.Build.Pipeline.Interfaces;
+
+namespace UnityEditor.Build.Pipeline.Tasks
+{
+	public static class SBPBuildTasks
+	{
+		public static IList<IBuildTask> Create(string builtInShaderBundleName)
+		{
+			var buildTasks = new List<IBuildTask>();
+			
+			// Setup
+			buildTasks.Add(new SwitchToBuildPlatform());
+			buildTasks.Add(new RebuildSpriteAtlasCache());
+
+			// Player Scripts
+			buildTasks.Add(new BuildPlayerScripts());
+			buildTasks.Add(new PostScriptsCallback());
+
+			// Dependency
+			buildTasks.Add(new CalculateSceneDependencyData());
+#if UNITY_2019_3_OR_NEWER
+			buildTasks.Add(new CalculateCustomDependencyData());
+#endif
+			buildTasks.Add(new CalculateAssetDependencyData());
+			buildTasks.Add(new StripUnusedSpriteSources());
+			buildTasks.Add(new CreateBuiltInShadersBundle(builtInShaderBundleName));
+			buildTasks.Add(new PostDependencyCallback());
+
+			// Packing
+			buildTasks.Add(new GenerateBundlePacking());
+			buildTasks.Add(new UpdateBundleObjectLayout());
+			buildTasks.Add(new GenerateBundleCommands());
+			buildTasks.Add(new GenerateSubAssetPathMaps());
+			buildTasks.Add(new GenerateBundleMaps());
+			buildTasks.Add(new PostPackingCallback());
+
+			// Writing
+			buildTasks.Add(new WriteSerializedFiles());
+			buildTasks.Add(new ArchiveAndCompressBundles());
+			buildTasks.Add(new AppendBundleHash());
+			buildTasks.Add(new GenerateLinkXml());
+			buildTasks.Add(new PostWritingCallback());
+
+			return buildTasks;
+		}
+	}
+}

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

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

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

@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.IO;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEditor;
@@ -11,14 +10,14 @@ namespace YooAsset.Editor
 	[TaskAttribute("资源构建内容打包")]
 	public class TaskBuilding : IBuildTask
 	{
-		public class UnityManifestContext : IContextObject
+		public class BuildResultContext : IContextObject
 		{
 			public AssetBundleManifest UnityManifest;
 		}
 
 		void IBuildTask.Run(BuildContext context)
 		{
-			var buildParametersContext = context.GetContextObject<AssetBundleBuilder.BuildParametersContext>();
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
 			var buildMapContext = context.GetContextObject<BuildMapContext>();
 
 			// 模拟构建模式下跳过引擎构建
@@ -26,40 +25,26 @@ namespace YooAsset.Editor
 			if (buildMode == EBuildMode.SimulateBuild)
 				return;
 
-			BuildAssetBundleOptions opt = buildParametersContext.GetPipelineBuildOptions();
-			AssetBundleManifest unityManifest = BuildPipeline.BuildAssetBundles(buildParametersContext.PipelineOutputDirectory, buildMapContext.GetPipelineBuilds(), opt, buildParametersContext.Parameters.BuildTarget);
-			if (unityManifest == null)
+			// 开始构建
+			string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
+			BuildAssetBundleOptions buildOptions = buildParametersContext.GetPipelineBuildOptions();
+			AssetBundleManifest buildResults = BuildPipeline.BuildAssetBundles(pipelineOutputDirectory, buildMapContext.GetPipelineBuilds(), buildOptions, buildParametersContext.Parameters.BuildTarget);
+			if (buildResults == null)
+			{
 				throw new Exception("构建过程中发生错误！");
+			}
 
-			BuildRunner.Log("Unity引擎打包成功！");
-			UnityManifestContext unityManifestContext = new UnityManifestContext();
-			unityManifestContext.UnityManifest = unityManifest;
-			context.SetContextObject(unityManifestContext);
-
-			// 拷贝原生文件
 			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
 			{
-				CopyRawBundle(buildMapContext, buildParametersContext);
-			}
+				string unityOutputManifestFilePath = $"{pipelineOutputDirectory}/{YooAssetSettings.OutputFolderName}";
+				if (System.IO.File.Exists(unityOutputManifestFilePath) == false)
+					throw new Exception("构建过程中发生严重错误！请查阅上下文日志！");
 			}
 
-		/// <summary>
-		/// 拷贝原生文件
-		/// </summary>
-		private void CopyRawBundle(BuildMapContext buildMapContext, AssetBundleBuilder.BuildParametersContext buildParametersContext)
-		{
-			foreach (var bundleInfo in buildMapContext.BundleInfos)
-			{
-				if (bundleInfo.IsRawFile)
-				{
-					string dest = $"{buildParametersContext.PipelineOutputDirectory}/{bundleInfo.BundleName}";
-					foreach (var buildAsset in bundleInfo.BuildinAssets)
-					{
-						if (buildAsset.IsRawAsset)
-							EditorTools.CopyFile(buildAsset.AssetPath, dest, true);
-					}
-				}
-			}
+			BuildLogger.Log("Unity引擎打包成功！");
+			BuildResultContext buildResultContext = new BuildResultContext();
+			buildResultContext.UnityManifest = buildResults;
+			context.SetContextObject(buildResultContext);
 		}
 	}
 }

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

@@ -0,0 +1,58 @@
+using System;
+using System.Linq;
+using System.Collections;
+using System.Collections.Generic;
+
+using UnityEditor.Build.Pipeline;
+using UnityEditor.Build.Pipeline.Interfaces;
+using UnityEditor.Build.Pipeline.Tasks;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("资源构建内容打包")]
+	public class TaskBuilding_SBP : IBuildTask
+	{
+		public class BuildResultContext : IContextObject
+		{
+			public IBundleBuildResults Results;
+		}
+
+		void IBuildTask.Run(BuildContext context)
+		{
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			var buildMapContext = context.GetContextObject<BuildMapContext>();
+
+			// 模拟构建模式下跳过引擎构建
+			var buildMode = buildParametersContext.Parameters.BuildMode;
+			if (buildMode == EBuildMode.SimulateBuild)
+				return;
+
+			// 构建内容
+			var buildContent = new BundleBuildContent(buildMapContext.GetPipelineBuilds());
+
+			// 开始构建
+			IBundleBuildResults buildResults;
+			var buildParameters = buildParametersContext.GetSBPBuildParameters();
+			var taskList = SBPBuildTasks.Create(buildMapContext.ShadersBundleName);
+			ReturnCode exitCode = ContentPipeline.BuildAssetBundles(buildParameters, buildContent, out buildResults, taskList);
+			if (exitCode < 0)
+			{
+				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;
+			context.SetContextObject(buildResultContext);
+		}
+	}
+}

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

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

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

@@ -11,58 +11,90 @@ namespace YooAsset.Editor
 	{
 		void IBuildTask.Run(BuildContext context)
 		{
-			// 注意：我们只有在强制重建的时候才会拷贝
-			var buildParameters = context.GetContextObject<AssetBundleBuilder.BuildParametersContext>();
-			if (buildParameters.Parameters.BuildMode == EBuildMode.ForceRebuild)
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			var manifestContext = context.GetContextObject<ManifestContext>();
+			var buildMode = buildParametersContext.Parameters.BuildMode;
+			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
 			{
-				// 清空流目录
-				AssetBundleBuilderHelper.ClearStreamingAssetsFolder();
-
-				// 拷贝内置文件
-				CopyBuildinFilesToStreaming(buildParameters.PipelineOutputDirectory, buildParameters.Parameters.BuildVersion);
+				if (buildParametersContext.Parameters.CopyBuildinFileOption != ECopyBuildinFileOption.None)
+				{
+					CopyBuildinFilesToStreaming(buildParametersContext, manifestContext);
+				}
 			}
 		}
 
-		private void CopyBuildinFilesToStreaming(string pipelineOutputDirectory, int buildVersion)
+		/// <summary>
+		/// 拷贝首包资源文件
+		/// </summary>
+		private void CopyBuildinFilesToStreaming(BuildParametersContext buildParametersContext, ManifestContext manifestContext)
 		{
+			ECopyBuildinFileOption option = buildParametersContext.Parameters.CopyBuildinFileOption;
+			string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
+			string streamingAssetsDirectory = AssetBundleBuilderHelper.GetStreamingAssetsFolderPath();
+			string buildPackageName = buildParametersContext.Parameters.PackageName;
+			string buildPackageVersion = buildParametersContext.Parameters.PackageVersion;
+
 			// 加载补丁清单
-			PatchManifest patchManifest = AssetBundleBuilderHelper.LoadPatchManifestFile(pipelineOutputDirectory, buildVersion);
+			PackageManifest manifest = manifestContext.Manifest;
 
-			// 拷贝文件列表
-			foreach (var patchBundle in patchManifest.BundleList)
+			// 清空流目录
+			if (option == ECopyBuildinFileOption.ClearAndCopyAll || option == ECopyBuildinFileOption.ClearAndCopyByTags)
 			{
-				if (patchBundle.IsBuildin == false)
+				AssetBundleBuilderHelper.ClearStreamingAssetsFolder();
+			}
+
+			// 拷贝补丁清单文件
+			{
+				string fileName = YooAssetSettingsData.GetManifestBinaryFileName(buildPackageName, buildPackageVersion);
+				string sourcePath = $"{packageOutputDirectory}/{fileName}";
+				string destPath = $"{streamingAssetsDirectory}/{fileName}";
+				EditorTools.CopyFile(sourcePath, destPath, true);
+			}
+
+			// 拷贝补丁清单哈希文件
+			{
+				string fileName = YooAssetSettingsData.GetPackageHashFileName(buildPackageName, buildPackageVersion);
+				string sourcePath = $"{packageOutputDirectory}/{fileName}";
+				string destPath = $"{streamingAssetsDirectory}/{fileName}";
+				EditorTools.CopyFile(sourcePath, destPath, true);
+			}
+
+			// 拷贝补丁清单版本文件
+			{
+				string fileName = YooAssetSettingsData.GetPackageVersionFileName(buildPackageName);
+				string sourcePath = $"{packageOutputDirectory}/{fileName}";
+				string destPath = $"{streamingAssetsDirectory}/{fileName}";
+				EditorTools.CopyFile(sourcePath, destPath, true);
+			}
+
+			// 拷贝文件列表（所有文件）
+			if (option == ECopyBuildinFileOption.ClearAndCopyAll || option == ECopyBuildinFileOption.OnlyCopyAll)
+			{		
+				foreach (var packageBundle in manifest.BundleList)
+				{
+					string sourcePath = $"{packageOutputDirectory}/{packageBundle.FileName}";
+					string destPath = $"{streamingAssetsDirectory}/{packageBundle.FileName}";
+					EditorTools.CopyFile(sourcePath, destPath, true);
+				}
+			}
+
+			// 拷贝文件列表（带标签的文件）
+			if (option == ECopyBuildinFileOption.ClearAndCopyByTags || option == ECopyBuildinFileOption.OnlyCopyByTags)
+			{
+				string[] tags = buildParametersContext.Parameters.CopyBuildinFileTags.Split(';');
+				foreach (var packageBundle in manifest.BundleList)
+				{
+					if (packageBundle.HasTag(tags) == false)
 						continue;
-
-				string sourcePath = $"{pipelineOutputDirectory}/{patchBundle.BundleName}";
-				string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsFolderPath()}/{patchBundle.Hash}";
+					string sourcePath = $"{packageOutputDirectory}/{packageBundle.FileName}";
+					string destPath = $"{streamingAssetsDirectory}/{packageBundle.FileName}";
 					EditorTools.CopyFile(sourcePath, destPath, true);
 				}
-
-			// 拷贝清单文件
-			{
-				string sourcePath = $"{pipelineOutputDirectory}/{YooAssetSettingsData.GetPatchManifestFileName(buildVersion)}";
-				string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsFolderPath()}/{YooAssetSettingsData.GetPatchManifestFileName(buildVersion)}";
-				EditorTools.CopyFile(sourcePath, destPath, true);
-			}
-
-			// 拷贝清单哈希文件
-			{
-				string sourcePath = $"{pipelineOutputDirectory}/{YooAssetSettingsData.GetPatchManifestHashFileName(buildVersion)}";
-				string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsFolderPath()}/{YooAssetSettingsData.GetPatchManifestHashFileName(buildVersion)}";
-				EditorTools.CopyFile(sourcePath, destPath, true);
-			}
-
-			// 拷贝静态版本文件
-			{
-				string sourcePath = $"{pipelineOutputDirectory}/{YooAssetSettings.VersionFileName}";
-				string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsFolderPath()}/{YooAssetSettings.VersionFileName}";
-				EditorTools.CopyFile(sourcePath, destPath, true);
 			}
 
 			// 刷新目录
 			AssetDatabase.Refresh();
-			BuildRunner.Log($"内置文件拷贝完成：{AssetBundleBuilderHelper.GetStreamingAssetsFolderPath()}");
+			BuildLogger.Log($"内置文件拷贝完成：{streamingAssetsDirectory}");
 		}
 	}
 }

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

@@ -0,0 +1,44 @@
+using System;
+using System.Linq;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("拷贝原生文件")]
+	public class TaskCopyRawFile : IBuildTask
+	{
+		void IBuildTask.Run(BuildContext context)
+		{
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			var buildParameters = context.GetContextObject<BuildParametersContext>();
+			var buildMapContext = context.GetContextObject<BuildMapContext>();
+
+			var buildMode = buildParameters.Parameters.BuildMode;
+			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
+			{
+				CopyRawBundle(buildMapContext, buildParametersContext);
+			}
+		}
+
+		/// <summary>
+		/// 拷贝原生文件
+		/// </summary>
+		private void CopyRawBundle(BuildMapContext buildMapContext, BuildParametersContext buildParametersContext)
+		{
+			string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
+			foreach (var bundleInfo in buildMapContext.Collection)
+			{
+				if (bundleInfo.IsRawFile)
+				{
+					string dest = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}";
+					foreach (var assetInfo in bundleInfo.AllMainAssets)
+					{
+						if (assetInfo.IsRawAsset)
+							EditorTools.CopyFile(assetInfo.AssetPath, dest, true);
+					}
+				}
+			}
+		}
+	}
+}

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

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

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

@@ -0,0 +1,384 @@
+using System;
+using System.Linq;
+using System.Collections;
+using System.Collections.Generic;
+
+using UnityEditor.Build.Pipeline;
+using UnityEditor.Build.Pipeline.Interfaces;
+
+namespace YooAsset.Editor
+{
+	public class ManifestContext : IContextObject
+	{
+		internal PackageManifest Manifest;
+	}
+
+	[TaskAttribute("创建清单文件")]
+	public class TaskCreateManifest : IBuildTask
+	{
+		void IBuildTask.Run(BuildContext context)
+		{
+			CreateManifestFile(context);
+		}
+
+		/// <summary>
+		/// 创建补丁清单文件到输出目录
+		/// </summary>
+		private void CreateManifestFile(BuildContext context)
+		{
+			var buildMapContext = context.GetContextObject<BuildMapContext>();
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			var buildParameters = buildParametersContext.Parameters;
+			string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
+
+			// 创建新补丁清单
+			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)
+			{
+				if (buildParameters.BuildMode == EBuildMode.IncrementalBuild)
+				{
+					var buildResultContext = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
+					UpdateBuiltInBundleReference(manifest, buildResultContext, buildMapContext.ShadersBundleName);
+				}
+			}
+
+			// 更新资源包之间的引用关系
+			if (buildParameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
+			{
+				if (buildParameters.BuildMode == EBuildMode.IncrementalBuild)
+				{
+					var buildResultContext = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
+					UpdateScriptPipelineReference(manifest, buildResultContext);
+				}
+			}
+
+			// 更新资源包之间的引用关系
+			if (buildParameters.BuildPipeline == EBuildPipeline.BuiltinBuildPipeline)
+			{
+				if (buildParameters.BuildMode != EBuildMode.SimulateBuild)
+				{
+					var buildResultContext = context.GetContextObject<TaskBuilding.BuildResultContext>();
+					UpdateBuiltinPipelineReference(manifest, buildResultContext);
+				}
+			}
+
+			// 创建补丁清单文本文件
+			{
+				string fileName = YooAssetSettingsData.GetManifestJsonFileName(buildParameters.PackageName, buildParameters.PackageVersion);
+				string filePath = $"{packageOutputDirectory}/{fileName}";
+				ManifestTools.SerializeToJson(filePath, manifest);
+				BuildLogger.Log($"创建补丁清单文件：{filePath}");
+			}
+
+			// 创建补丁清单二进制文件
+			string packageHash;
+			{
+				string fileName = YooAssetSettingsData.GetManifestBinaryFileName(buildParameters.PackageName, buildParameters.PackageVersion);
+				string filePath = $"{packageOutputDirectory}/{fileName}";
+				ManifestTools.SerializeToBinary(filePath, manifest);
+				packageHash = HashUtility.FileMD5(filePath);
+				BuildLogger.Log($"创建补丁清单文件：{filePath}");
+
+				ManifestContext manifestContext = new ManifestContext();
+				byte[] bytesData = FileUtility.ReadAllBytes(filePath);
+				manifestContext.Manifest = ManifestTools.DeserializeFromBinary(bytesData);
+				context.SetContextObject(manifestContext);
+			}
+
+			// 创建补丁清单哈希文件
+			{
+				string fileName = YooAssetSettingsData.GetPackageHashFileName(buildParameters.PackageName, buildParameters.PackageVersion);
+				string filePath = $"{packageOutputDirectory}/{fileName}";
+				FileUtility.WriteAllText(filePath, packageHash);
+				BuildLogger.Log($"创建补丁清单哈希文件：{filePath}");
+			}
+
+			// 创建补丁清单版本文件
+			{
+				string fileName = YooAssetSettingsData.GetPackageVersionFileName(buildParameters.PackageName);
+				string filePath = $"{packageOutputDirectory}/{fileName}";
+				FileUtility.WriteAllText(filePath, buildParameters.PackageVersion);
+				BuildLogger.Log($"创建补丁清单版本文件：{filePath}");
+			}
+		}
+
+		/// <summary>
+		/// 获取资源包列表
+		/// </summary>
+		private List<PackageBundle> GetAllPackageBundle(BuildContext context)
+		{
+			var buildMapContext = context.GetContextObject<BuildMapContext>();
+
+			List<PackageBundle> result = new List<PackageBundle>(1000);
+			foreach (var bundleInfo in buildMapContext.Collection)
+			{
+				var packageBundle = bundleInfo.CreatePackageBundle();
+				result.Add(packageBundle);
+			}
+			return result;
+		}
+
+		/// <summary>
+		/// 获取资源列表
+		/// </summary>
+		private List<PackageAsset> GetAllPackageAsset(BuildContext context, PackageManifest manifest)
+		{
+			var buildMapContext = context.GetContextObject<BuildMapContext>();
+
+			List<PackageAsset> result = new List<PackageAsset>(1000);
+			foreach (var bundleInfo in buildMapContext.Collection)
+			{
+				var assetInfos = bundleInfo.GetAllMainAssetInfos();
+				foreach (var assetInfo in assetInfos)
+				{
+					PackageAsset packageAsset = new PackageAsset();
+					if (buildMapContext.EnableAddressable)
+						packageAsset.Address = assetInfo.Address;
+					else
+						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, PackageManifest manifest)
+		{
+			List<int> result = new List<int>();
+			foreach (var dependAssetInfo in assetInfo.AllDependAssetInfos)
+			{
+				if (dependAssetInfo.HasBundleName())
+				{
+					int bundleID = GetAssetBundleID(dependAssetInfo.BundleName, manifest);
+					if (mainBundleID != bundleID)
+					{
+						if (result.Contains(bundleID) == false)
+							result.Add(bundleID);
+					}
+				}
+			}
+			return result.ToArray();
+		}
+		private int GetAssetBundleID(string bundleName, PackageManifest manifest)
+		{
+			for (int index = 0; index < manifest.BundleList.Count; index++)
+			{
+				if (manifest.BundleList[index].BundleName == bundleName)
+					return index;
+			}
+			throw new Exception($"Not found bundle name : {bundleName}");
+		}
+
+		/// <summary>
+		/// 更新Unity内置资源包的引用关系
+		/// </summary>
+		private void UpdateBuiltInBundleReference(PackageManifest manifest, TaskBuilding_SBP.BuildResultContext buildResultContext, string shadersBunldeName)
+		{
+			// 获取所有依赖着色器资源包的资源包列表
+			List<string> shaderBundleReferenceList = new List<string>();
+			foreach (var valuePair in buildResultContext.Results.BundleInfos)
+			{
+				if (valuePair.Value.Dependencies.Any(t => t == shadersBunldeName))
+					shaderBundleReferenceList.Add(valuePair.Key);
+			}
+
+			// 注意：没有任何资源依赖着色器
+			if (shaderBundleReferenceList.Count == 0)
+				return;
+
+			// 获取着色器资源包索引
+			Predicate<PackageBundle> predicate = new Predicate<PackageBundle>(s => s.BundleName == shadersBunldeName);
+			int shaderBundleId = manifest.BundleList.FindIndex(predicate);
+			if (shaderBundleId == -1)
+				throw new Exception("没有发现着色器资源包！");
+
+			// 检测依赖交集并更新依赖ID
+			HashSet<string> tagTemps = new HashSet<string>();
+			foreach (var packageAsset in manifest.AssetList)
+			{
+				List<string> dependBundles = GetPackageAssetAllDependBundles(manifest, packageAsset);
+				List<string> conflictAssetPathList = dependBundles.Intersect(shaderBundleReferenceList).ToList();
+				if (conflictAssetPathList.Count > 0)
+				{
+					List<int> newDependIDs = new List<int>(packageAsset.DependIDs);
+					if (newDependIDs.Contains(shaderBundleId) == false)
+						newDependIDs.Add(shaderBundleId);
+					packageAsset.DependIDs = newDependIDs.ToArray();
+					foreach (var tag in packageAsset.AssetTags)
+					{
+						if (tagTemps.Contains(tag) == false)
+							tagTemps.Add(tag);
+					}
+				}
+			}
+
+			// 更新资源包标签
+			var packageBundle = manifest.BundleList[shaderBundleId];
+			List<string> newTags = new List<string>(packageBundle.Tags);
+			foreach (var tag in tagTemps)
+			{
+				if (newTags.Contains(tag) == false)
+					newTags.Add(tag);
+			}
+			packageBundle.Tags = newTags.ToArray();
+		}
+		private List<string> GetPackageAssetAllDependBundles(PackageManifest manifest, PackageAsset packageAsset)
+		{
+			List<string> result = new List<string>();
+			string mainBundle = manifest.BundleList[packageAsset.BundleID].BundleName;
+			result.Add(mainBundle);
+			foreach (var dependID in packageAsset.DependIDs)
+			{
+				string dependBundle = manifest.BundleList[dependID].BundleName;
+				result.Add(dependBundle);
+			}
+			return result;
+		}
+
+		#region 资源包引用关系相关
+		private readonly Dictionary<string, int> _cachedBundleID = new Dictionary<string, int>(10000);
+		private readonly Dictionary<string, string[]> _cachedBundleDepends = new Dictionary<string, string[]>(10000);
+
+		private void UpdateScriptPipelineReference(PackageManifest manifest, TaskBuilding_SBP.BuildResultContext buildResultContext)
+		{
+			int progressValue;
+			int totalCount = manifest.BundleList.Count;
+
+			// 缓存资源包ID
+			_cachedBundleID.Clear();
+			progressValue = 0;
+			foreach (var packageBundle in manifest.BundleList)
+			{
+				int bundleID = GetAssetBundleID(packageBundle.BundleName, manifest);
+				_cachedBundleID.Add(packageBundle.BundleName, bundleID);
+				EditorTools.DisplayProgressBar("缓存资源包索引", ++progressValue, totalCount);
+			}
+			EditorTools.ClearProgressBar();
+
+			// 缓存资源包依赖
+			_cachedBundleDepends.Clear();
+			progressValue = 0;
+			foreach (var packageBundle in manifest.BundleList)
+			{
+				if (packageBundle.IsRawFile)
+				{
+					_cachedBundleDepends.Add(packageBundle.BundleName, new string[] { });
+					continue;
+				}
+
+				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[packageBundle.BundleName].Dependencies;
+				_cachedBundleDepends.Add(packageBundle.BundleName, depends);
+				EditorTools.DisplayProgressBar("缓存资源包依赖列表", ++progressValue, totalCount);
+			}
+			EditorTools.ClearProgressBar();
+
+			// 计算资源包引用列表
+			foreach (var packageBundle in manifest.BundleList)
+			{
+				packageBundle.ReferenceIDs = GetBundleRefrenceIDs(manifest, packageBundle);
+				EditorTools.DisplayProgressBar("计算资源包引用关系", ++progressValue, totalCount);
+			}
+			EditorTools.ClearProgressBar();
+		}
+		private void UpdateBuiltinPipelineReference(PackageManifest manifest, TaskBuilding.BuildResultContext buildResultContext)
+		{
+			int progressValue;
+			int totalCount = manifest.BundleList.Count;
+
+			// 缓存资源包ID
+			_cachedBundleID.Clear();
+			progressValue = 0;
+			foreach (var packageBundle in manifest.BundleList)
+			{
+				int bundleID = GetAssetBundleID(packageBundle.BundleName, manifest);
+				_cachedBundleID.Add(packageBundle.BundleName, bundleID);
+				EditorTools.DisplayProgressBar("缓存资源包索引", ++progressValue, totalCount);
+			}
+			EditorTools.ClearProgressBar();
+
+			// 缓存资源包依赖
+			_cachedBundleDepends.Clear();
+			progressValue = 0;
+			foreach (var packageBundle in manifest.BundleList)
+			{
+				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 packageBundle in manifest.BundleList)
+			{
+				packageBundle.ReferenceIDs = GetBundleRefrenceIDs(manifest, packageBundle);
+				EditorTools.DisplayProgressBar("计算资源包引用关系", ++progressValue, totalCount);
+			}
+			EditorTools.ClearProgressBar();
+		}
+
+		private int[] GetBundleRefrenceIDs(PackageManifest manifest, PackageBundle targetBundle)
+		{
+			List<string> referenceList = new List<string>();
+			foreach (var packageBundle in manifest.BundleList)
+			{
+				string bundleName = packageBundle.BundleName;
+				if (bundleName == targetBundle.BundleName)
+					continue;
+
+				string[] dependencies = GetCachedBundleDepends(bundleName);
+				if (dependencies.Contains(targetBundle.BundleName))
+				{
+					referenceList.Add(bundleName);
+				}
+			}
+
+			List<int> result = new List<int>();
+			foreach (var bundleName in referenceList)
+			{
+				int bundleID = GetCachedBundleID(bundleName);
+				if (result.Contains(bundleID) == false)
+					result.Add(bundleID);
+			}
+			return result.ToArray();
+		}
+		private int GetCachedBundleID(string bundleName)
+		{
+			if (_cachedBundleID.TryGetValue(bundleName, out int value) == false)
+			{
+				throw new Exception($"Not found cached bundle ID : {bundleName}");
+			}
+			return value;
+		}
+		private string[] GetCachedBundleDepends(string bundleName)
+		{
+			if (_cachedBundleDepends.TryGetValue(bundleName, out string[] value) == false)
+			{
+				throw new Exception($"Not found cached bundle depends : {bundleName}");
+			}
+			return value;
+		}
+		#endregion
+	}
+}

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

@@ -0,0 +1,79 @@
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("制作包裹")]
+	public class TaskCreatePackage : IBuildTask
+	{
+		void IBuildTask.Run(BuildContext context)
+		{
+			var buildParameters = context.GetContextObject<BuildParametersContext>();
+			var buildMapContext = context.GetContextObject<BuildMapContext>();
+			var buildMode = buildParameters.Parameters.BuildMode;
+			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
+			{
+				CopyPackageFiles(buildParameters, buildMapContext);
+			}
+		}
+
+		/// <summary>
+		/// 拷贝补丁文件到补丁包目录
+		/// </summary>
+		private void CopyPackageFiles(BuildParametersContext buildParametersContext, BuildMapContext buildMapContext)
+		{
+			var buildParameters = buildParametersContext.Parameters;
+			string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
+			string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
+			BuildLogger.Log($"开始拷贝补丁文件到补丁包目录：{packageOutputDirectory}");
+
+			if (buildParameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
+			{
+				// 拷贝构建日志
+				{
+					string sourcePath = $"{pipelineOutputDirectory}/buildlogtep.json";
+					string destPath = $"{packageOutputDirectory}/buildlogtep.json";
+					EditorTools.CopyFile(sourcePath, destPath, true);
+				}
+
+				// 拷贝代码防裁剪配置
+				if (buildParameters.SBPParameters.WriteLinkXML)
+				{
+					string sourcePath = $"{pipelineOutputDirectory}/link.xml";
+					string destPath = $"{packageOutputDirectory}/link.xml";
+					EditorTools.CopyFile(sourcePath, destPath, true);
+				}
+			}
+			else if (buildParameters.BuildPipeline == EBuildPipeline.BuiltinBuildPipeline)
+			{
+				// 拷贝UnityManifest序列化文件
+				{
+					string sourcePath = $"{pipelineOutputDirectory}/{YooAssetSettings.OutputFolderName}";
+					string destPath = $"{packageOutputDirectory}/{YooAssetSettings.OutputFolderName}";
+					EditorTools.CopyFile(sourcePath, destPath, true);
+				}
+
+				// 拷贝UnityManifest文本文件
+				{
+					string sourcePath = $"{pipelineOutputDirectory}/{YooAssetSettings.OutputFolderName}.manifest";
+					string destPath = $"{packageOutputDirectory}/{YooAssetSettings.OutputFolderName}.manifest";
+					EditorTools.CopyFile(sourcePath, destPath, true);
+				}
+			}
+			else
+			{
+				throw new System.NotImplementedException();
+			}
+
+			// 拷贝所有补丁文件
+			int progressValue = 0;
+			int fileTotalCount = buildMapContext.Collection.Count;
+			foreach (var bundleInfo in buildMapContext.Collection)
+			{
+				EditorTools.CopyFile(bundleInfo.BundleInfo.BuildOutputFilePath, bundleInfo.BundleInfo.PackageOutputFilePath, true);
+				EditorTools.DisplayProgressBar("拷贝补丁文件", ++progressValue, fileTotalCount);
+			}
+			EditorTools.ClearProgressBar();
+		}
+	}
+}

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

@@ -1,179 +0,0 @@
-using System;
-using System.IO;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace YooAsset.Editor
-{
-	[TaskAttribute("创建补丁清单文件")]
-	public class TaskCreatePatchManifest : IBuildTask
-	{
-		void IBuildTask.Run(BuildContext context)
-		{
-			var buildParameters = context.GetContextObject<AssetBundleBuilder.BuildParametersContext>();
-			var encryptionContext = context.GetContextObject<TaskEncryption.EncryptionContext>();
-			var buildMapContext = context.GetContextObject<BuildMapContext>();
-			CreatePatchManifestFile(buildParameters, buildMapContext, encryptionContext);
-		}
-
-		/// <summary>
-		/// 创建补丁清单文件到输出目录
-		/// </summary>
-		private void CreatePatchManifestFile(AssetBundleBuilder.BuildParametersContext buildParameters,
-			BuildMapContext buildMapContext, TaskEncryption.EncryptionContext encryptionContext)
-		{
-			int resourceVersion = buildParameters.Parameters.BuildVersion;
-
-			// 创建新补丁清单
-			PatchManifest patchManifest = new PatchManifest();
-			patchManifest.EnableAddressable = buildParameters.Parameters.EnableAddressable;
-			patchManifest.ResourceVersion = buildParameters.Parameters.BuildVersion;
-			patchManifest.BuildinTags = buildParameters.Parameters.BuildinTags;
-			patchManifest.BundleList = GetAllPatchBundle(buildParameters, buildMapContext, encryptionContext);
-			patchManifest.AssetList = GetAllPatchAsset(buildParameters, buildMapContext, patchManifest);
-
-			// 创建补丁清单文件
-			string manifestFilePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.GetPatchManifestFileName(resourceVersion)}";
-			BuildRunner.Log($"创建补丁清单文件：{manifestFilePath}");
-			PatchManifest.Serialize(manifestFilePath, patchManifest);
-
-			// 创建补丁清单哈希文件
-			string manifestHashFilePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.GetPatchManifestHashFileName(resourceVersion)}";
-			string manifestHash = HashUtility.FileMD5(manifestFilePath);
-			BuildRunner.Log($"创建补丁清单哈希文件：{manifestHashFilePath}");
-			FileUtility.CreateFile(manifestHashFilePath, manifestHash);
-
-			// 创建静态版本文件
-			string staticVersionFilePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettings.VersionFileName}";
-			string staticVersion = resourceVersion.ToString();
-			BuildRunner.Log($"创建静态版本文件：{staticVersionFilePath}");
-			FileUtility.CreateFile(staticVersionFilePath, staticVersion);
-		}
-
-		/// <summary>
-		/// 获取资源包列表
-		/// </summary>
-		private List<PatchBundle> GetAllPatchBundle(AssetBundleBuilder.BuildParametersContext buildParameters,
-			BuildMapContext buildMapContext, TaskEncryption.EncryptionContext encryptionContext)
-		{
-			List<PatchBundle> result = new List<PatchBundle>(1000);
-
-			// 内置标记列表
-			List<string> buildinTags = buildParameters.Parameters.GetBuildinTags();
-
-			var buildMode = buildParameters.Parameters.BuildMode;
-			bool standardBuild = buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild;
-			foreach (var bundleInfo in buildMapContext.BundleInfos)
-			{
-				var bundleName = bundleInfo.BundleName;
-				string filePath = $"{buildParameters.PipelineOutputDirectory}/{bundleName}";
-				string hash = GetFileHash(filePath, standardBuild);
-				string crc32 = GetFileCRC(filePath, standardBuild);
-				long size = GetFileSize(filePath, standardBuild);
-				string[] tags = buildMapContext.GetBundleTags(bundleName);
-				bool isEncrypted = encryptionContext.IsEncryptFile(bundleName);
-				bool isBuildin = IsBuildinBundle(tags, buildinTags);
-				bool isRawFile = bundleInfo.IsRawFile;
-
-				// 附加文件扩展名
-				if (buildParameters.Parameters.AppendFileExtension)
-				{
-					hash += bundleInfo.GetAppendExtension();
-				}
-
-				PatchBundle patchBundle = new PatchBundle(bundleName, hash, crc32, size, tags);
-				patchBundle.SetFlagsValue(isEncrypted, isBuildin, isRawFile);
-				result.Add(patchBundle);
-			}
-
-			return result;
-		}
-		private bool IsBuildinBundle(string[] bundleTags, List<string> buildinTags)
-		{
-			// 注意：没有任何标记的Bundle文件默认为内置文件
-			if (bundleTags.Length == 0)
-				return true;
-
-			foreach (var tag in bundleTags)
-			{
-				if (buildinTags.Contains(tag))
-					return true;
-			}
-			return false;
-		}
-		private string GetFileHash(string filePath, bool standardBuild)
-		{
-			if (standardBuild)
-				return HashUtility.FileMD5(filePath);
-			else
-				return "00000000000000000000000000000000"; //32位
-		}
-		private string GetFileCRC(string filePath, bool standardBuild)
-		{
-			if (standardBuild)
-				return HashUtility.FileCRC32(filePath);
-			else
-				return "00000000"; //8位
-		}
-		private long GetFileSize(string filePath, bool standardBuild)
-		{
-			if (standardBuild)
-				return FileUtility.GetFileSize(filePath);
-			else
-				return 0;
-		}
-
-		/// <summary>
-		/// 获取资源列表
-		/// </summary>
-		private List<PatchAsset> GetAllPatchAsset(AssetBundleBuilder.BuildParametersContext buildParameters,
-			BuildMapContext buildMapContext, PatchManifest patchManifest)
-		{
-			List<PatchAsset> result = new List<PatchAsset>(1000);
-			foreach (var bundleInfo in buildMapContext.BundleInfos)
-			{
-				var assetInfos = bundleInfo.GetAllPatchAssetInfos();
-				foreach (var assetInfo in assetInfos)
-				{
-					PatchAsset patchAsset = new PatchAsset();
-					if (buildParameters.Parameters.EnableAddressable)
-						patchAsset.Address = assetInfo.Address;
-					else
-						patchAsset.Address = string.Empty;
-					patchAsset.AssetPath = assetInfo.AssetPath;
-					patchAsset.AssetTags = assetInfo.AssetTags.ToArray();
-					patchAsset.BundleID = GetAssetBundleID(assetInfo.GetBundleName(), patchManifest);
-					patchAsset.DependIDs = GetAssetBundleDependIDs(patchAsset.BundleID, assetInfo, patchManifest);
-					result.Add(patchAsset);
-				}
-			}
-			return result;
-		}
-		private int[] GetAssetBundleDependIDs(int mainBundleID, BuildAssetInfo assetInfo, PatchManifest patchManifest)
-		{
-			List<int> result = new List<int>();
-			foreach (var dependAssetInfo in assetInfo.AllDependAssetInfos)
-			{
-				if (dependAssetInfo.HasBundleName())
-				{
-					int bundleID = GetAssetBundleID(dependAssetInfo.GetBundleName(), patchManifest);
-					if (mainBundleID != bundleID)
-					{
-						if (result.Contains(bundleID) == false)
-							result.Add(bundleID);
-					}
-				}
-			}
-			return result.ToArray();
-		}
-		private int GetAssetBundleID(string bundleName, PatchManifest patchManifest)
-		{
-			for (int index = 0; index < patchManifest.BundleList.Count; index++)
-			{
-				if (patchManifest.BundleList[index].BundleName == bundleName)
-					return index;
-			}
-			throw new Exception($"Not found bundle name : {bundleName}");
-		}
-	}
-}

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

@@ -1,85 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-
-namespace YooAsset.Editor
-{
-	[TaskAttribute("制作补丁包")]
-	public class TaskCreatePatchPackage : IBuildTask
-	{
-		void IBuildTask.Run(BuildContext context)
-		{
-			var buildParameters = context.GetContextObject<AssetBundleBuilder.BuildParametersContext>();
-			var buildMode = buildParameters.Parameters.BuildMode;
-			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
-			{
-				CopyPatchFiles(buildParameters);
-			}
-		}
-
-		/// <summary>
-		/// 拷贝补丁文件到补丁包目录
-		/// </summary>
-		private void CopyPatchFiles(AssetBundleBuilder.BuildParametersContext buildParameters)
-		{
-			int resourceVersion = buildParameters.Parameters.BuildVersion;
-			string packageDirectory = buildParameters.GetPackageDirectory();
-			BuildRunner.Log($"开始拷贝补丁文件到补丁包目录：{packageDirectory}");
-
-			// 拷贝Report文件
-			{
-				string reportFileName = YooAssetSettingsData.GetReportFileName(buildParameters.Parameters.BuildVersion);
-				string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{reportFileName}";
-				string destPath = $"{packageDirectory}/{reportFileName}";
-				EditorTools.CopyFile(sourcePath, destPath, true);
-			}
-
-			// 拷贝补丁清单文件
-			{
-				string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.GetPatchManifestFileName(resourceVersion)}";
-				string destPath = $"{packageDirectory}/{YooAssetSettingsData.GetPatchManifestFileName(resourceVersion)}";
-				EditorTools.CopyFile(sourcePath, destPath, true);
-			}
-
-			// 拷贝补丁清单哈希文件
-			{
-				string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.GetPatchManifestHashFileName(resourceVersion)}";
-				string destPath = $"{packageDirectory}/{YooAssetSettingsData.GetPatchManifestHashFileName(resourceVersion)}";
-				EditorTools.CopyFile(sourcePath, destPath, true);
-			}
-
-			// 拷贝静态版本文件
-			{
-				string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettings.VersionFileName}";
-				string destPath = $"{packageDirectory}/{YooAssetSettings.VersionFileName}";
-				EditorTools.CopyFile(sourcePath, destPath, true);
-			}
-
-			// 拷贝UnityManifest序列化文件
-			{
-				string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.Setting.UnityManifestFileName}";
-				string destPath = $"{packageDirectory}/{YooAssetSettingsData.Setting.UnityManifestFileName}";
-				EditorTools.CopyFile(sourcePath, destPath, true);
-			}
-
-			// 拷贝UnityManifest文本文件
-			{
-				string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.Setting.UnityManifestFileName}.manifest";
-				string destPath = $"{packageDirectory}/{YooAssetSettingsData.Setting.UnityManifestFileName}.manifest";
-				EditorTools.CopyFile(sourcePath, destPath, true);
-			}
-
-			// 拷贝所有补丁文件
-			int progressValue = 0;
-			PatchManifest patchManifest = AssetBundleBuilderHelper.LoadPatchManifestFile(buildParameters.PipelineOutputDirectory, buildParameters.Parameters.BuildVersion);
-			int patchFileTotalCount = patchManifest.BundleList.Count;
-			foreach (var patchBundle in patchManifest.BundleList)
-			{
-				string sourcePath = $"{buildParameters.PipelineOutputDirectory}/{patchBundle.BundleName}";
-				string destPath = $"{packageDirectory}/{patchBundle.Hash}";
-				EditorTools.CopyFile(sourcePath, destPath, true);
-				EditorTools.DisplayProgressBar("拷贝补丁文件", ++progressValue, patchFileTotalCount);
-			}
-			EditorTools.ClearProgressBar();
-		}
-	}
-}

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

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using UnityEditor;
 
 namespace YooAsset.Editor
@@ -10,110 +11,119 @@ namespace YooAsset.Editor
 	{
 		void IBuildTask.Run(BuildContext context)
 		{
-			var buildParameters = context.GetContextObject<AssetBundleBuilder.BuildParametersContext>();
+			var buildParameters = context.GetContextObject<BuildParametersContext>();
 			var buildMapContext = context.GetContextObject<BuildMapContext>();
-			buildParameters.StopWatch();
+			var manifestContext = context.GetContextObject<ManifestContext>();
 
 			var buildMode = buildParameters.Parameters.BuildMode;
 			if (buildMode != EBuildMode.SimulateBuild)
 			{
-				CreateReportFile(buildParameters, buildMapContext);
-			}
-			else
-			{
-				float buildSeconds = buildParameters.GetBuildingSeconds();
-				BuildRunner.Info($"Build time consuming {buildSeconds} seconds.");
+				CreateReportFile(buildParameters, buildMapContext, manifestContext);
 			}
 		}
 
-		private void CreateReportFile(AssetBundleBuilder.BuildParametersContext buildParameters, BuildMapContext buildMapContext)
+		private void CreateReportFile(BuildParametersContext buildParametersContext, BuildMapContext buildMapContext, ManifestContext manifestContext)
 		{
-			PatchManifest patchManifest = AssetBundleBuilderHelper.LoadPatchManifestFile(buildParameters.PipelineOutputDirectory, buildParameters.Parameters.BuildVersion);
+			var buildParameters = buildParametersContext.Parameters;
+
+			string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
+			PackageManifest manifest = manifestContext.Manifest;
 			BuildReport buildReport = new BuildReport();
 
 			// 概述信息
 			{
+#if UNITY_2019_4_OR_NEWER
+				UnityEditor.PackageManager.PackageInfo packageInfo = UnityEditor.PackageManager.PackageInfo.FindForAssembly(typeof(BuildReport).Assembly);
+				if (packageInfo != null)
+					buildReport.Summary.YooVersion = packageInfo.version;
+#endif
 				buildReport.Summary.UnityVersion = UnityEngine.Application.unityVersion;
-				buildReport.Summary.BuildTime = DateTime.Now.ToString();
-				buildReport.Summary.BuildSeconds = (int)buildParameters.GetBuildingSeconds();
-				buildReport.Summary.BuildTarget = buildParameters.Parameters.BuildTarget;
-				buildReport.Summary.BuildMode = buildParameters.Parameters.BuildMode;
-				buildReport.Summary.BuildVersion = buildParameters.Parameters.BuildVersion;
-				buildReport.Summary.BuildinTags = buildParameters.Parameters.BuildinTags;
-				buildReport.Summary.EnableAddressable = buildParameters.Parameters.EnableAddressable;
-				buildReport.Summary.AppendFileExtension = buildParameters.Parameters.AppendFileExtension;
-				buildReport.Summary.AutoCollectShaders = AssetBundleCollectorSettingData.Setting.AutoCollectShaders;
-				buildReport.Summary.ShadersBundleName = AssetBundleCollectorSettingData.Setting.ShadersBundleName;
-				buildReport.Summary.EncryptionServicesClassName = buildParameters.Parameters.EncryptionServices == null ?
-					"null" : buildParameters.Parameters.EncryptionServices.GetType().FullName;
+				buildReport.Summary.BuildDate = DateTime.Now.ToString();
+				buildReport.Summary.BuildSeconds = BuildRunner.TotalSeconds;
+				buildReport.Summary.BuildTarget = buildParameters.BuildTarget;
+				buildReport.Summary.BuildPipeline = buildParameters.BuildPipeline;
+				buildReport.Summary.BuildMode = buildParameters.BuildMode;
+				buildReport.Summary.BuildPackageName = buildParameters.PackageName;
+				buildReport.Summary.BuildPackageVersion = buildParameters.PackageVersion;
+				buildReport.Summary.EnableAddressable = buildMapContext.EnableAddressable;
+				buildReport.Summary.UniqueBundleName = buildMapContext.UniqueBundleName;
+				buildReport.Summary.AutoAnalyzeRedundancy = buildParameters.AutoAnalyzeRedundancy;
+				buildReport.Summary.ShareAssetPackRuleClassName = buildParameters.ShareAssetPackRule == null ?
+					"null" : buildParameters.ShareAssetPackRule.GetType().FullName;
+				buildReport.Summary.EncryptionServicesClassName = buildParameters.EncryptionServices == null ?
+					"null" : buildParameters.EncryptionServices.GetType().FullName;
 
 				// 构建参数
-				buildReport.Summary.CompressOption = buildParameters.Parameters.CompressOption;
-				buildReport.Summary.DisableWriteTypeTree = buildParameters.Parameters.DisableWriteTypeTree;
-				buildReport.Summary.IgnoreTypeTreeChanges = buildParameters.Parameters.IgnoreTypeTreeChanges;
+				buildReport.Summary.OutputNameStyle = buildParameters.OutputNameStyle;
+				buildReport.Summary.CompressOption = buildParameters.CompressOption;
+				buildReport.Summary.DisableWriteTypeTree = buildParameters.DisableWriteTypeTree;
+				buildReport.Summary.IgnoreTypeTreeChanges = buildParameters.IgnoreTypeTreeChanges;
 
 				// 构建结果
 				buildReport.Summary.AssetFileTotalCount = buildMapContext.AssetFileCount;
-				buildReport.Summary.AllBundleTotalCount = GetAllBundleCount(patchManifest);
-				buildReport.Summary.AllBundleTotalSize = GetAllBundleSize(patchManifest);
-				buildReport.Summary.BuildinBundleTotalCount = GetBuildinBundleCount(patchManifest);
-				buildReport.Summary.BuildinBundleTotalSize = GetBuildinBundleSize(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.SizeBytes;
-				reportAssetInfo.DependBundles = GetDependBundles(patchManifest, patchAsset);
-				reportAssetInfo.DependAssets = GetDependAssets(buildMapContext, mainBundle.BundleName, patchAsset.AssetPath);
+				reportAssetInfo.MainBundleSize = mainBundle.FileSize;
+				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.Hash = patchBundle.Hash;
-				reportBundleInfo.CRC = patchBundle.CRC;
-				reportBundleInfo.SizeBytes = patchBundle.SizeBytes;
-				reportBundleInfo.Tags = patchBundle.Tags;
-				reportBundleInfo.Flags = patchBundle.Flags;
+				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);
 			}
 
-			// 删除旧文件
-			string filePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.GetReportFileName(buildParameters.Parameters.BuildVersion)}";
-			if (File.Exists(filePath))
-				File.Delete(filePath);
+			// 冗余资源列表
+			buildReport.RedundancyInfos = new List<ReportRedundancyInfo>(buildMapContext.RedundancyInfos);
 
 			// 序列化文件
+			string fileName = YooAssetSettingsData.GetReportFileName(buildParameters.PackageName, buildParameters.PackageVersion);
+			string filePath = $"{packageOutputDirectory}/{fileName}";
 			BuildReport.Serialize(filePath, buildReport);
-			BuildRunner.Log($"资源构建报告文件创建完成：{filePath}");
+			BuildLogger.Log($"资源构建报告文件创建完成：{filePath}");
 		}
 
 		/// <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;
@@ -125,14 +135,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;
 					}
 				}
@@ -145,83 +155,72 @@ namespace YooAsset.Editor
 					result.Add(dependAssetInfo.AssetPath);
 				}
 			}
-			else
-			{
-				throw new Exception($"Not found bundle : {bundleName}");
-			}
 			return result;
 		}
 
-		private int GetAllBundleCount(PatchManifest patchManifest)
+		/// <summary>
+		/// 获取该资源包内的所有资源（包括零依赖资源）
+		/// </summary>
+		private List<string> GetAllBuiltinAssets(BuildMapContext buildMapContext, string bundleName)
 		{
-			return patchManifest.BundleList.Count;
+			var bundleInfo = buildMapContext.GetBundleInfo(bundleName);
+			return bundleInfo.GetAllBuiltinAssetPaths();
 		}
-		private long GetAllBundleSize(PatchManifest patchManifest)
+
+		private int GetMainAssetCount(PackageManifest manifest)
+		{
+			return manifest.AssetList.Count;
+		}
+		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.SizeBytes;
+				fileBytes += packageBundle.FileSize;
 			}
 			return fileBytes;
 		}
-		private int GetBuildinBundleCount(PatchManifest patchManifest)
+		private int GetEncryptedBundleCount(PackageManifest manifest)
 		{
 			int fileCount = 0;
-			foreach (var patchBundle in patchManifest.BundleList)
+			foreach (var packageBundle in manifest.BundleList)
 			{
-				if (patchBundle.IsBuildin)
+				if (packageBundle.LoadMethod != (byte)EBundleLoadMethod.Normal)
 					fileCount++;
 			}
 			return fileCount;
 		}
-		private long GetBuildinBundleSize(PatchManifest patchManifest)
+		private long GetEncryptedBundleSize(PackageManifest manifest)
 		{
 			long fileBytes = 0;
-			foreach (var patchBundle in patchManifest.BundleList)
+			foreach (var packageBundle in manifest.BundleList)
 			{
-				if (patchBundle.IsBuildin)
-					fileBytes += patchBundle.SizeBytes;
+				if (packageBundle.LoadMethod != (byte)EBundleLoadMethod.Normal)
+					fileBytes += packageBundle.FileSize;
 			}
 			return fileBytes;
 		}
-		private int GetEncryptedBundleCount(PatchManifest patchManifest)
+		private int GetRawBundleCount(PackageManifest manifest)
 		{
 			int fileCount = 0;
-			foreach (var patchBundle in patchManifest.BundleList)
+			foreach (var packageBundle in manifest.BundleList)
 			{
-				if (patchBundle.IsEncrypted)
+				if (packageBundle.IsRawFile)
 					fileCount++;
 			}
 			return fileCount;
 		}
-		private long GetEncryptedBundleSize(PatchManifest patchManifest)
+		private long GetRawBundleSize(PackageManifest manifest)
 		{
 			long fileBytes = 0;
-			foreach (var patchBundle in patchManifest.BundleList)
+			foreach (var packageBundle in manifest.BundleList)
 			{
-				if (patchBundle.IsEncrypted)
-					fileBytes += patchBundle.SizeBytes;
-			}
-			return fileBytes;
-		}
-		private int GetRawBundleCount(PatchManifest patchManifest)
-		{
-			int fileCount = 0;
-			foreach (var patchBundle in patchManifest.BundleList)
-			{
-				if (patchBundle.IsRawFile)
-					fileCount++;
-			}
-			return fileCount;
-		}
-		private long GetRawBundleSize(PatchManifest patchManifest)
-		{
-			long fileBytes = 0;
-			foreach (var patchBundle in patchManifest.BundleList)
-			{
-				if (patchBundle.IsRawFile)
-					fileBytes += patchBundle.SizeBytes;
+				if (packageBundle.IsRawFile)
+					fileBytes += packageBundle.FileSize;
 			}
 			return fileBytes;
 		}

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

@@ -9,85 +9,59 @@ namespace YooAsset.Editor
 	[TaskAttribute("资源包加密")]
 	public class TaskEncryption : IBuildTask
 	{
-		public class EncryptionContext : IContextObject
-		{
-			public List<string> EncryptList;
-
-			/// <summary>
-			/// 检测是否为加密文件
-			/// </summary>
-			public bool IsEncryptFile(string bundleName)
-			{
-				return EncryptList.Contains(bundleName);
-			}
-		}
-
 		void IBuildTask.Run(BuildContext context)
 		{
-			var buildParameters = context.GetContextObject<AssetBundleBuilder.BuildParametersContext>();
+			var buildParameters = context.GetContextObject<BuildParametersContext>();
 			var buildMapContext = context.GetContextObject<BuildMapContext>();
 
 			var buildMode = buildParameters.Parameters.BuildMode;
 			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
 			{
-				EncryptionContext encryptionContext = new EncryptionContext();
-				encryptionContext.EncryptList = EncryptFiles(buildParameters, buildMapContext);
-				context.SetContextObject(encryptionContext);
-			}
-			else
-			{
-				EncryptionContext encryptionContext = new EncryptionContext();
-				encryptionContext.EncryptList = new List<string>();
-				context.SetContextObject(encryptionContext);
+				EncryptingBundleFiles(buildParameters, buildMapContext);
 			}
 		}
 
 		/// <summary>
 		/// 加密文件
 		/// </summary>
-		private List<string> EncryptFiles(AssetBundleBuilder.BuildParametersContext buildParameters, BuildMapContext buildMapContext)
+		private void EncryptingBundleFiles(BuildParametersContext buildParametersContext, BuildMapContext buildMapContext)
 		{
-			var encryptionServices = buildParameters.Parameters.EncryptionServices;
-
-			// 加密资源列表
-			List<string> encryptList = new List<string>();
-
-			// 如果没有设置加密类
+			var encryptionServices = buildParametersContext.Parameters.EncryptionServices;
 			if (encryptionServices == null)
-				return encryptList;
+				return;
+
+			if (encryptionServices.GetType() == typeof(EncryptionNone))
+				return;
 
 			int progressValue = 0;
-			foreach (var bundleInfo in buildMapContext.BundleInfos)
+			string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
+			foreach (var bundleInfo in buildMapContext.Collection)
 			{
-				if (encryptionServices.Check(bundleInfo.BundleName))
+				EncryptFileInfo fileInfo = new EncryptFileInfo();
+				fileInfo.BundleName = bundleInfo.BundleName;
+				fileInfo.FilePath = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}";
+
+				var encryptResult = encryptionServices.Encrypt(fileInfo);		
+				if (encryptResult.LoadMethod != EBundleLoadMethod.Normal)
 				{
+					// 注意：原生文件不支持加密
 					if (bundleInfo.IsRawFile)
 					{
-						UnityEngine.Debug.LogWarning($"Encryption not support raw file : {bundleInfo.BundleName}");
+						BuildLogger.Warning($"Encryption not support raw file : {bundleInfo.BundleName}");
 						continue;
 					}
 
-					encryptList.Add(bundleInfo.BundleName);
-
-					// 注意：通过判断文件合法性，规避重复加密一个文件
-					string filePath = $"{buildParameters.PipelineOutputDirectory}/{bundleInfo.BundleName}";
-					byte[] fileData = File.ReadAllBytes(filePath);
-					if (EditorTools.CheckBundleFileValid(fileData))
-					{
-						byte[] bytes = encryptionServices.Encrypt(fileData);
-						File.WriteAllBytes(filePath, bytes);
-						BuildRunner.Log($"文件加密完成：{filePath}");
-					}
+					string filePath = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}.encrypt";
+					FileUtility.WriteAllBytes(filePath, encryptResult.EncryptedData);
+					bundleInfo.EncryptedFilePath = filePath;
+					bundleInfo.LoadMethod = encryptResult.LoadMethod;
+					BuildLogger.Log($"Bundle文件加密完成：{filePath}");
 				}
 
 				// 进度条
-				EditorTools.DisplayProgressBar("加密资源包", ++progressValue, buildMapContext.BundleInfos.Count);
+				EditorTools.DisplayProgressBar("加密资源包", ++progressValue, buildMapContext.Collection.Count);
 			}
 			EditorTools.ClearProgressBar();
-
-			if(encryptList.Count == 0)
-				UnityEngine.Debug.LogWarning($"没有发现需要加密的文件！");
-			return encryptList;
 		}
 	}
 }

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

@@ -12,33 +12,214 @@ namespace YooAsset.Editor
 	{
 		void IBuildTask.Run(BuildContext context)
 		{
-			var buildParametersContext = context.GetContextObject<AssetBundleBuilder.BuildParametersContext>();
-			var buildMapContext = BuildMapCreater.CreateBuildMap(buildParametersContext.Parameters.BuildMode);
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			var buildMapContext = CreateBuildMap(buildParametersContext.Parameters);
 			context.SetContextObject(buildMapContext);
-			BuildRunner.Log("构建内容准备完毕！");
+			BuildLogger.Log("构建内容准备完毕！");
 
 			// 检测构建结果
 			CheckBuildMapContent(buildMapContext);
 		}
 
+		/// <summary>
+		/// 资源构建上下文
+		/// </summary>
+		public BuildMapContext CreateBuildMap(BuildParameters buildParameters)
+		{
+			EBuildMode buildMode = buildParameters.BuildMode;
+			string packageName = buildParameters.PackageName;
+			IShareAssetPackRule sharePackRule = buildParameters.ShareAssetPackRule;
+			bool autoAnalyzeRedundancy = buildParameters.AutoAnalyzeRedundancy;
+
+			Dictionary<string, BuildAssetInfo> allBuildAssetInfoDic = new Dictionary<string, BuildAssetInfo>(1000);
+
+			// 1. 检测配置合法性
+			AssetBundleCollectorSettingData.Setting.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. 计算共享的资源包名
+			if (autoAnalyzeRedundancy)
+			{
+				var command = collectResult.Command;
+				foreach (var buildAssetInfo in allBuildAssetInfoDic.Values)
+				{
+					buildAssetInfo.CalculateShareBundleName(sharePackRule, command.UniqueBundleName, command.PackageName, command.ShadersBundleName);
+				}
+			}
+			else
+			{
+				// 记录冗余资源
+				foreach (var buildAssetInfo in allBuildAssetInfoDic.Values)
+				{
+					if (buildAssetInfo.IsRedundancyAsset())
+					{
+						var redundancyInfo = new ReportRedundancyInfo();
+						redundancyInfo.AssetPath = buildAssetInfo.AssetPath;
+						redundancyInfo.AssetType = AssetDatabase.GetMainAssetTypeAtPath(buildAssetInfo.AssetPath).Name;
+						redundancyInfo.AssetGUID = AssetDatabase.AssetPathToGUID(buildAssetInfo.AssetPath);
+						redundancyInfo.FileSize = FileUtility.GetFileSize(buildAssetInfo.AssetPath);
+						redundancyInfo.Number = buildAssetInfo.GetReferenceBundleCount();
+						context.RedundancyInfos.Add(redundancyInfo);
+					}
+				}
+			}
+
+			// 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

@@ -11,60 +11,80 @@ namespace YooAsset.Editor
 	{
 		void IBuildTask.Run(BuildContext context)
 		{
-			var buildParameters = context.GetContextObject<AssetBundleBuilder.BuildParametersContext>();
-			buildParameters.BeginWatch();
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			var buildParameters = buildParametersContext.Parameters;
 
-			// 检测构建平台是否合法
-			if (buildParameters.Parameters.BuildTarget == BuildTarget.NoTarget)
+			// 检测构建参数合法性
+			if (buildParameters.BuildTarget == BuildTarget.NoTarget)
 				throw new Exception("请选择目标平台");
+			if (string.IsNullOrEmpty(buildParameters.PackageName))
+				throw new Exception("包裹名称不能为空");
+			if (string.IsNullOrEmpty(buildParameters.PackageVersion))
+				throw new Exception("包裹版本不能为空");
 
-			// 检测构建版本是否合法
-			if (buildParameters.Parameters.BuildVersion <= 0)
-				throw new Exception("请先设置版本号");
-
-			// 检测输出目录是否为空
-			if (string.IsNullOrEmpty(buildParameters.PipelineOutputDirectory))
-				throw new Exception("输出目录不能为空");
-
-			// 增量更新时候的必要检测
-			var buildMode = buildParameters.Parameters.BuildMode;
-			if (buildMode == EBuildMode.IncrementalBuild)
+			if (buildParameters.BuildMode != EBuildMode.SimulateBuild)
 			{
-				// 检测历史版本是否存在
-				if (AssetBundleBuilderHelper.HasAnyPackageVersion(buildParameters.Parameters.BuildTarget, buildParameters.Parameters.OutputRoot) == false)
-					throw new Exception("没有发现任何历史版本，请尝试强制重建");
+#if UNITY_2021_3_OR_NEWER
+				if (buildParameters.BuildPipeline == EBuildPipeline.BuiltinBuildPipeline)
+				{
+					BuildLogger.Warning("推荐使用可编程构建管线（SBP）！");
+				}
+#endif
 
-				// 检测构建版本是否合法
-				int maxPackageVersion = AssetBundleBuilderHelper.GetMaxPackageVersion(buildParameters.Parameters.BuildTarget, buildParameters.Parameters.OutputRoot);
-				if (buildParameters.Parameters.BuildVersion <= maxPackageVersion)
-					throw new Exception("构建版本不能小于历史版本");
+				// 检测当前是否正在构建资源包
+				if (BuildPipeline.isBuildingPlayer)
+					throw new Exception("当前正在构建资源包，请结束后再试");
 
-				// 检测补丁包是否已经存在
-				string packageDirectory = buildParameters.GetPackageDirectory();
-				if (Directory.Exists(packageDirectory))
-					throw new Exception($"补丁包已经存在：{packageDirectory}");
+				// 检测是否有未保存场景
+				if (EditorTools.HasDirtyScenes())
+					throw new Exception("检测到未保存的场景文件");
 
-				// 检测内置资源分类标签是否一致
-				var oldPatchManifest = AssetBundleBuilderHelper.GetOldPatchManifest(buildParameters.PipelineOutputDirectory);
-				if (buildParameters.Parameters.BuildinTags != oldPatchManifest.BuildinTags)
-					throw new Exception($"增量更新时内置资源标签必须一致：{buildParameters.Parameters.BuildinTags} != {oldPatchManifest.BuildinTags}");
+				// 检测首包资源标签
+				if (buildParameters.CopyBuildinFileOption == ECopyBuildinFileOption.ClearAndCopyByTags
+					|| buildParameters.CopyBuildinFileOption == ECopyBuildinFileOption.OnlyCopyByTags)
+				{
+					if (string.IsNullOrEmpty(buildParameters.CopyBuildinFileTags))
+						throw new Exception("首包资源标签不能为空！");
 				}
 
-			// 如果是强制重建
-			if (buildMode == EBuildMode.ForceRebuild)
+				// 检测共享资源打包规则
+				if (buildParameters.ShareAssetPackRule == null)
+					throw new Exception("共享资源打包规则不能为空！");
+
+#if UNITY_WEBGL
+				if (buildParameters.EncryptionServices != null)
 				{
-				// 删除平台总目录
-				string platformDirectory = $"{buildParameters.Parameters.OutputRoot}/{buildParameters.Parameters.BuildTarget}";
+					if (buildParameters.EncryptionServices.GetType() != typeof(EncryptionNone))
+					{
+						throw new Exception("WebGL平台不支持加密！");
+					}
+				}
+#endif
+
+				// 检测包裹输出目录是否存在
+				string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
+				if (Directory.Exists(packageOutputDirectory))
+					throw new Exception($"本次构建的补丁目录已经存在：{packageOutputDirectory}");
+
+				// 保存改动的资源
+				AssetDatabase.SaveAssets();
+			}
+
+			if (buildParameters.BuildMode == EBuildMode.ForceRebuild)
+			{
+				// 删除总目录
+				string platformDirectory = $"{buildParameters.OutputRoot}/{buildParameters.BuildTarget}/{buildParameters.PackageName}";
 				if (EditorTools.DeleteDirectory(platformDirectory))
 				{
-					BuildRunner.Log($"删除平台总目录：{platformDirectory}");
+					BuildLogger.Log($"删除平台总目录：{platformDirectory}");
 				}
 			}
 
 			// 如果输出目录不存在
-			if (EditorTools.CreateDirectory(buildParameters.PipelineOutputDirectory))
+			string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
+			if (EditorTools.CreateDirectory(pipelineOutputDirectory))
 			{
-				BuildRunner.Log($"创建输出目录：{buildParameters.PipelineOutputDirectory}");
+				BuildLogger.Log($"创建输出目录：{pipelineOutputDirectory}");
 			}
 		}
 	}

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

@@ -0,0 +1,119 @@
+using System;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("更新资源包信息")]
+	public class TaskUpdateBundleInfo : IBuildTask
+	{
+		void IBuildTask.Run(BuildContext context)
+		{
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			var buildMapContext = context.GetContextObject<BuildMapContext>();
+			string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
+			string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
+			int outputNameStyle = (int)buildParametersContext.Parameters.OutputNameStyle;
+
+			// 1.检测文件名长度
+			foreach (var bundleInfo in buildMapContext.Collection)
+			{
+				// 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.Collection)
+			{
+				if (bundleInfo.IsEncryptedFile)
+					bundleInfo.BundleInfo.BuildOutputFilePath = bundleInfo.EncryptedFilePath;
+				else
+					bundleInfo.BundleInfo.BuildOutputFilePath = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}";
+			}
+
+			// 3.更新文件其它信息
+			foreach (var bundleInfo in buildMapContext.Collection)
+			{
+				string buildOutputFilePath = bundleInfo.BundleInfo.BuildOutputFilePath;
+				bundleInfo.BundleInfo.ContentHash = GetBundleContentHash(bundleInfo, context);
+				bundleInfo.BundleInfo.FileHash = GetBundleFileHash(buildOutputFilePath, buildParametersContext);
+				bundleInfo.BundleInfo.FileCRC = GetBundleFileCRC(buildOutputFilePath, buildParametersContext);
+				bundleInfo.BundleInfo.FileSize = GetBundleFileSize(buildOutputFilePath, buildParametersContext);
+			}
+
+			// 4.更新补丁包输出的文件路径
+			foreach (var bundleInfo in buildMapContext.Collection)
+			{
+				string fileExtension = ManifestTools.GetRemoteBundleFileExtension(bundleInfo.BundleName);
+				string fileName = ManifestTools.GetRemoteBundleFileName(outputNameStyle, bundleInfo.BundleName, fileExtension, bundleInfo.BundleInfo.FileHash);
+				bundleInfo.BundleInfo.PackageOutputFilePath = $"{packageOutputDirectory}/{fileName}";
+			}
+		}
+
+		private string GetBundleContentHash(BuildBundleInfo bundleInfo, BuildContext context)
+		{
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			var parameters = buildParametersContext.Parameters;
+			var buildMode = parameters.BuildMode;
+			if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild)
+				return "00000000000000000000000000000000"; //32位
+
+			if (bundleInfo.IsRawFile)
+			{
+				string filePath = bundleInfo.BundleInfo.BuildOutputFilePath;
+				return HashUtility.FileMD5(filePath);
+			}
+
+			if (parameters.BuildPipeline == EBuildPipeline.BuiltinBuildPipeline)
+			{
+				var buildResult = context.GetContextObject<TaskBuilding.BuildResultContext>();
+				var hash = buildResult.UnityManifest.GetAssetBundleHash(bundleInfo.BundleName);
+				if (hash.isValid)
+					return hash.ToString();
+				else
+					throw new Exception($"Not found bundle in build result : {bundleInfo.BundleName}");
+			}
+			else if (parameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
+			{
+				// 注意：当资源包的依赖列表发生变化的时候，ContentHash也会发生变化！
+				var buildResult = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
+				if (buildResult.Results.BundleInfos.TryGetValue(bundleInfo.BundleName, out var value))
+					return value.Hash.ToString();
+				else
+					throw new Exception($"Not found bundle in build result : {bundleInfo.BundleName}");
+			}
+			else
+			{
+				throw new System.NotImplementedException();
+			}
+		}
+		private string GetBundleFileHash(string filePath, BuildParametersContext buildParametersContext)
+		{
+			var buildMode = buildParametersContext.Parameters.BuildMode;
+			if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild)
+				return "00000000000000000000000000000000"; //32位
+			else
+				return HashUtility.FileMD5(filePath);
+		}
+		private string GetBundleFileCRC(string filePath, BuildParametersContext buildParametersContext)
+		{
+			var buildMode = buildParametersContext.Parameters.BuildMode;
+			if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild)
+				return "00000000"; //8位
+			else
+				return HashUtility.FileCRC32(filePath);
+		}
+		private long GetBundleFileSize(string filePath, BuildParametersContext buildParametersContext)
+		{
+			var buildMode = buildParametersContext.Parameters.BuildMode;
+			if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild)
+				return 0;
+			else
+				return FileUtility.GetFileSize(filePath);
+		}
+	}
+}

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

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

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

@@ -13,7 +13,7 @@ namespace YooAsset.Editor
 	{
 		void IBuildTask.Run(BuildContext context)
 		{
-			var buildParametersContext = context.GetContextObject<AssetBundleBuilder.BuildParametersContext>();
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
 
 			// 模拟构建模式下跳过验证
 			if (buildParametersContext.Parameters.BuildMode == EBuildMode.SimulateBuild)
@@ -22,8 +22,8 @@ namespace YooAsset.Editor
 			// 验证构建结果
 			if (buildParametersContext.Parameters.VerifyBuildingResult)
 			{
-				var unityManifestContext = context.GetContextObject<TaskBuilding.UnityManifestContext>();
-				VerifyingBuildingResult(context, unityManifestContext.UnityManifest);
+				var buildResultContext = context.GetContextObject<TaskBuilding.BuildResultContext>();
+				VerifyingBuildingResult(context, buildResultContext.UnityManifest);
 			}
 		}
 
@@ -32,113 +32,76 @@ namespace YooAsset.Editor
 		/// </summary>
 		private void VerifyingBuildingResult(BuildContext context, AssetBundleManifest unityManifest)
 		{
-			var buildParameters = context.GetContextObject<AssetBundleBuilder.BuildParametersContext>();
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
 			var buildMapContext = context.GetContextObject<BuildMapContext>();
-			string[] buildedBundles = unityManifest.GetAllAssetBundles();
+			string[] unityCreateBundles = unityManifest.GetAllAssetBundles();
 
 			// 1. 过滤掉原生Bundle
-			List<BuildBundleInfo> expectBundles = new List<BuildBundleInfo>(buildedBundles.Length);
-			foreach(var bundleInfo in buildMapContext.BundleInfos)
+			string[] mapBundles = buildMapContext.Collection.Where(t => t.IsRawFile == false).Select(t => t.BundleName).ToArray();
+
+			// 2. 验证Bundle
+			List<string> exceptBundleList1 = unityCreateBundles.Except(mapBundles).ToList();
+			if (exceptBundleList1.Count > 0)
 			{
-				if (bundleInfo.IsRawFile == false)
-					expectBundles.Add(bundleInfo);
+				foreach (var exceptBundle in exceptBundleList1)
+				{
+					BuildLogger.Warning($"差异资源包: {exceptBundle}");
+				}
+				throw new System.Exception("存在差异资源包！请查看警告信息！");
 			}
 
-			// 2. 验证数量		
-			if (buildedBundles.Length != expectBundles.Count)
+			// 3. 验证Bundle
+			List<string> exceptBundleList2 = mapBundles.Except(unityCreateBundles).ToList();
+			if (exceptBundleList2.Count > 0)
 			{
-				Debug.LogWarning($"构建过程中可能存在无效的资源，导致和预期构建的Bundle数量不一致！");
+				foreach (var exceptBundle in exceptBundleList2)
+				{
+					BuildLogger.Warning($"差异资源包: {exceptBundle}");
+				}
+				throw new System.Exception("存在差异资源包！请查看警告信息！");
 			}
 
-			// 3. 正向验证Bundle
-			foreach (var bundleName in buildedBundles)
-			{
-				if (buildMapContext.IsContainsBundle(bundleName) == false)
-				{
-					throw new Exception($"Should never get here !");
-				}
-			}
-
-			// 4. 反向验证Bundle
+			// 4. 验证Asset
+			/*
 			bool isPass = true;
-			foreach (var expectBundle in expectBundles)
-			{
-				bool isMatch = false;
-				foreach (var buildedBundle in buildedBundles)
-				{
-					if (buildedBundle == expectBundle.BundleName)
-					{
-						isMatch = true;
-						break;
-					}
-				}
-				if (isMatch == false)
-				{
-					isPass = false;
-					Debug.LogWarning($"没有找到预期构建的Bundle文件 : {expectBundle.BundleName}");
-				}
-			}
-			if(isPass == false)
-			{
-				throw new Exception("构建结果验证没有通过，请参考警告日志！");
-			}
-
-			// 5. 验证Asset
-			var buildMode = buildParameters.Parameters.BuildMode;
+			var buildMode = buildParametersContext.Parameters.BuildMode;
 			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
 			{
 				int progressValue = 0;
+				string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
 				foreach (var buildedBundle in buildedBundles)
 				{
-					string filePath = $"{buildParameters.PipelineOutputDirectory}/{buildedBundle}";
-					string[] allBuildinAssetPaths = GetAssetBundleAllAssets(filePath);
-					string[] expectBuildinAssetPaths = buildMapContext.GetBuildinAssetPaths(buildedBundle);
-					if (expectBuildinAssetPaths.Length != allBuildinAssetPaths.Length)
+					string filePath = $"{pipelineOutputDirectory}/{buildedBundle}";
+					string[] buildedAssetPaths = GetAssetBundleAllAssets(filePath);
+					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)
+						{
+							BuildLogger.Warning($"构建失败的资源对象路径为 : {excpetAsset}");
+						}
+						var exceptAssetList2 = buildedAssetPaths.Except(mapAssetPaths).ToList();
+						foreach (var excpetAsset in exceptAssetList2)
+						{
+							BuildLogger.Warning($"构建失败的资源对象路径为 : {excpetAsset}");
+						}
 						isPass = false;
 						continue;
 					}
-
-					foreach (var buildinAssetPath in allBuildinAssetPaths)
-					{
-						var guid = AssetDatabase.AssetPathToGUID(buildinAssetPath);
-						if (string.IsNullOrEmpty(guid))
-						{
-							Debug.LogWarning($"无效的资源路径，请检查路径是否带有特殊符号或中文：{buildinAssetPath}");
-							isPass = false;
-							continue;
-						}
-
-						bool isMatch = false;
-						foreach (var exceptBuildAssetPath in expectBuildinAssetPaths)
-						{
-							var guidExcept = AssetDatabase.AssetPathToGUID(exceptBuildAssetPath);
-							if (guid == guidExcept)
-							{
-								isMatch = true;
-								break;
-							}
-						}
-						if (isMatch == false)
-						{
-							Debug.LogWarning($"在构建的Bundle文件里发现了没有匹配的资源对象：{buildinAssetPath}");
-							isPass = false;
-							continue;
-						}
-					}
-
 					EditorTools.DisplayProgressBar("验证构建结果", ++progressValue, buildedBundles.Length);
 				}
 				EditorTools.ClearProgressBar();
+
 				if (isPass == false)
 				{
 					throw new Exception("构建结果验证没有通过，请参考警告日志！");
 				}
 			}
+			*/
 
-			// 卸载所有加载的Bundle
-			BuildRunner.Log("构建结果验证成功！");
+			BuildLogger.Log("构建结果验证成功！");
 		}
 
 		/// <summary>

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

@@ -0,0 +1,68 @@
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+using UnityEditor.Build.Pipeline.Interfaces;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("验证构建结果")]
+	public class TaskVerifyBuildResult_SBP : IBuildTask
+	{
+		void IBuildTask.Run(BuildContext context)
+		{
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+
+			// 模拟构建模式下跳过验证
+			if (buildParametersContext.Parameters.BuildMode == EBuildMode.SimulateBuild)
+				return;
+
+			// 验证构建结果
+			if (buildParametersContext.Parameters.VerifyBuildingResult)
+			{
+				var buildResultContext = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
+				VerifyingBuildingResult(context, buildResultContext.Results);
+			}
+		}
+
+		/// <summary>
+		/// 验证构建结果
+		/// </summary>
+		private void VerifyingBuildingResult(BuildContext context, IBundleBuildResults buildResults)
+		{
+			var buildParameters = context.GetContextObject<BuildParametersContext>();
+			var buildMapContext = context.GetContextObject<BuildMapContext>();
+			List<string> unityCreateBundles = buildResults.BundleInfos.Keys.ToList();
+
+			// 1. 过滤掉原生Bundle
+			List<string> expectBundles = buildMapContext.Collection.Where(t => t.IsRawFile == false).Select(t => t.BundleName).ToList();
+
+			// 2. 验证Bundle
+			List<string> exceptBundleList1 = unityCreateBundles.Except(expectBundles).ToList();
+			if (exceptBundleList1.Count > 0)
+			{
+				foreach (var exceptBundle in exceptBundleList1)
+				{
+					BuildLogger.Warning($"差异资源包: {exceptBundle}");
+				}
+				throw new System.Exception("存在差异资源包！请查看警告信息！");
+			}
+
+			// 3. 验证Bundle
+			List<string> exceptBundleList2 = expectBundles.Except(unityCreateBundles).ToList();
+			if (exceptBundleList2.Count > 0)
+			{
+				foreach (var exceptBundle in exceptBundleList2)
+				{
+					BuildLogger.Warning($"差异资源包: {exceptBundle}");
+				}
+				throw new System.Exception("存在差异资源包！请查看警告信息！");
+			}
+
+			BuildLogger.Log("构建结果验证成功！");
+		}
+	}
+}

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

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

Assets/YooAsset/Editor/AssetBundleBuilder/DefaultEncryption.cs

@@ -0,0 +1,11 @@
+
+namespace YooAsset.Editor
+{
+	public class EncryptionNone : IEncryptionServices
+	{
+		public EncryptResult Encrypt(EncryptFileInfo fileInfo)
+		{
+			throw new System.NotImplementedException();
+		}
+	}
+}

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

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

Assets/YooAsset/Editor/AssetBundleBuilder/EBuildPipeline.cs

@@ -0,0 +1,19 @@
+
+namespace YooAsset.Editor
+{
+	/// <summary>
+	/// 构建管线类型
+	/// </summary>
+	public enum EBuildPipeline
+	{
+		/// <summary>
+		/// 传统内置构建管线
+		/// </summary>
+		BuiltinBuildPipeline,
+		
+		/// <summary>
+		/// 可编程构建管线
+		/// </summary>
+		ScriptableBuildPipeline,
+	}
+}

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

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

Assets/YooAsset/Editor/AssetBundleBuilder/ECopyBuildinFileOption.cs

@@ -0,0 +1,34 @@
+
+namespace YooAsset.Editor
+{
+	/// <summary>
+	/// 首包资源文件的拷贝方式
+	/// </summary>
+	public enum ECopyBuildinFileOption
+	{
+		/// <summary>
+		/// 不拷贝任何文件
+		/// </summary>
+		None = 0,
+
+		/// <summary>
+		/// 先清空已有文件，然后拷贝所有文件
+		/// </summary>
+		ClearAndCopyAll,
+
+		/// <summary>
+		/// 先清空已有文件，然后按照资源标签拷贝文件
+		/// </summary>
+		ClearAndCopyByTags,
+
+		/// <summary>
+		/// 不清空已有文件，直接拷贝所有文件
+		/// </summary>
+		OnlyCopyAll,
+
+		/// <summary>
+		/// 不清空已有文件，直接按照资源标签拷贝文件
+		/// </summary>
+		OnlyCopyByTags,
+	}
+}

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

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

Assets/YooAsset/Editor/AssetBundleBuilder/EOutputNameStyle.cs

@@ -0,0 +1,19 @@
+
+namespace YooAsset.Editor
+{
+	/// <summary>
+	/// 输出文件名称的样式
+	/// </summary>
+	public enum EOutputNameStyle
+	{
+		/// <summary>
+		/// 哈希值名称
+		/// </summary>
+		HashName = 1,
+
+		/// <summary>
+		/// 资源包名称 + 哈希值名称
+		/// </summary>
+		BundleName_HashName = 4,
+	}
+}

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

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

Assets/YooAsset/Editor/AssetBundleBuilder/IEncryptionServices.cs

@@ -1,18 +0,0 @@
-
-namespace YooAsset.Editor
-{
-	public interface IEncryptionServices
-	{
-		/// <summary>
-		/// 检测是否需要加密
-		/// </summary>
-		bool Check(string bundleName);
-		
-		/// <summary>
-		/// 加密方法
-		/// </summary>
-		/// <param name="fileData">要加密的文件数据</param>
-		/// <returns>返回加密后的字节数据</returns>
-		byte[] Encrypt(byte[] fileData);
-	}
-}

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollector.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using UnityEditor;
+using UnityEngine;
 
 namespace YooAsset.Editor
 {
@@ -14,6 +15,11 @@ namespace YooAsset.Editor
 		/// </summary>
 		public string CollectPath = string.Empty;
 
+		/// <summary>
+		/// 收集器的GUID
+		/// </summary>
+		public string CollectorGUID = string.Empty;
+
 		/// <summary>
 		/// 收集器类型
 		/// </summary>
@@ -39,6 +45,11 @@ namespace YooAsset.Editor
 		/// </summary>
 		public string AssetTags = string.Empty;
 
+		/// <summary>
+		/// 用户自定义数据
+		/// </summary>
+		public string UserData = string.Empty;
+
 
 		/// <summary>
 		/// 收集器是否有效
@@ -68,7 +79,8 @@ namespace YooAsset.Editor
 		/// </summary>
 		public void CheckConfigError()
 		{
-			if (AssetDatabase.LoadAssetAtPath<UnityEngine.Object>(CollectPath) == null)
+			string assetGUID = AssetDatabase.AssetPathToGUID(CollectPath);
+			if (string.IsNullOrEmpty(assetGUID))
 				throw new Exception($"Invalid collect path : {CollectPath}");
 
 			if (CollectorType == ECollectorType.None)
@@ -84,24 +96,65 @@ namespace YooAsset.Editor
 				throw new Exception($"Invalid {nameof(IAddressRule)} class type : {AddressRuleName} in collector : {CollectPath}");
 		}
 
+		/// <summary>
+		/// 修复配置错误
+		/// </summary>
+		public bool FixConfigError()
+		{
+			bool isFixed = false;
+
+			if (string.IsNullOrEmpty(CollectorGUID) == false)
+			{
+				string convertAssetPath = AssetDatabase.GUIDToAssetPath(CollectorGUID);
+				if (string.IsNullOrEmpty(convertAssetPath))
+				{
+					Debug.LogWarning($"Collector GUID {CollectorGUID} is invalid and has been auto removed !");
+					CollectorGUID = string.Empty;
+					isFixed = true;
+				}
+				else
+				{
+					if (CollectPath != convertAssetPath)
+					{
+						CollectPath = convertAssetPath;
+						isFixed = true;
+						Debug.LogWarning($"Fix collect path : {CollectPath} -> {convertAssetPath}");
+					}
+				}
+			}
+
+			/*
+			string convertGUID = AssetDatabase.AssetPathToGUID(CollectPath);
+			if(string.IsNullOrEmpty(convertGUID) == false)
+			{
+				CollectorGUID = convertGUID;
+			}
+			*/
+
+			return isFixed;
+		}
+
 		/// <summary>
 		/// 获取打包收集的资源文件
 		/// </summary>
-		public List<CollectAssetInfo> GetAllCollectAssets(AssetBundleCollectorGroup group)
+		public List<CollectAssetInfo> GetAllCollectAssets(CollectCommand command, AssetBundleCollectorGroup group)
 		{
 			// 注意：模拟构建模式下只收集主资源
-			if (AssetBundleCollectorSetting.BuildMode == EBuildMode.SimulateBuild)
+			if (command.BuildMode == EBuildMode.SimulateBuild)
 			{
 				if (CollectorType != ECollectorType.MainAssetCollector)
 					return new List<CollectAssetInfo>();
 			}
 
 			Dictionary<string, CollectAssetInfo> result = new Dictionary<string, CollectAssetInfo>(1000);
-			bool isRawAsset = PackRuleName == nameof(PackRawFile);
+
+			// 检测是否为原生资源打包规则
+			IPackRule packRuleInstance = AssetBundleCollectorSettingData.GetPackRuleInstance(PackRuleName);
+			bool isRawFilePackRule = packRuleInstance.IsRawFilePackRule();
 
 			// 检测原生资源包的收集器类型
-			if (isRawAsset && CollectorType != ECollectorType.MainAssetCollector)
-				throw new Exception($"The raw file must be set to {nameof(ECollectorType)}.{ECollectorType.MainAssetCollector} : {CollectPath}");
+			if (isRawFilePackRule && CollectorType != ECollectorType.MainAssetCollector)
+				throw new Exception($"The raw file pack rule must be set to {nameof(ECollectorType)}.{ECollectorType.MainAssetCollector} : {CollectPath}");
 
 			if (string.IsNullOrEmpty(CollectPath))
 				throw new Exception($"The collect path is null or empty in group : {group.GroupName}");
@@ -113,11 +166,11 @@ namespace YooAsset.Editor
 				string[] findAssets = EditorTools.FindAssets(EAssetSearchType.All, collectDirectory);
 				foreach (string assetPath in findAssets)
 				{
-					if (IsValidateAsset(assetPath) && IsCollectAsset(assetPath))
+					if (IsValidateAsset(assetPath, isRawFilePackRule) && IsCollectAsset(assetPath))
 					{
 						if (result.ContainsKey(assetPath) == false)
 						{
-							var collectAssetInfo = CreateCollectAssetInfo(group, assetPath, isRawAsset);
+							var collectAssetInfo = CreateCollectAssetInfo(command, group, assetPath, isRawFilePackRule);
 							result.Add(assetPath, collectAssetInfo);
 						}
 						else
@@ -130,9 +183,9 @@ namespace YooAsset.Editor
 			else
 			{
 				string assetPath = CollectPath;
-				if (IsValidateAsset(assetPath) && IsCollectAsset(assetPath))
+				if (IsValidateAsset(assetPath, isRawFilePackRule) && IsCollectAsset(assetPath))
 				{
-					var collectAssetInfo = CreateCollectAssetInfo(group, assetPath, isRawAsset);
+					var collectAssetInfo = CreateCollectAssetInfo(command, group, assetPath, isRawFilePackRule);
 					result.Add(assetPath, collectAssetInfo);
 				}
 				else
@@ -142,18 +195,19 @@ namespace YooAsset.Editor
 			}
 
 			// 检测可寻址地址是否重复
-			if (AssetBundleCollectorSettingData.Setting.EnableAddressable)
+			if (command.EnableAddressable)
 			{
-				HashSet<string> adressTemper = new HashSet<string>();
+				var addressTemper = new Dictionary<string, string>();
 				foreach (var collectInfoPair in result)
 				{
 					if (collectInfoPair.Value.CollectorType == ECollectorType.MainAssetCollector)
 					{
 						string address = collectInfoPair.Value.Address;
-						if (adressTemper.Contains(address) == false)
-							adressTemper.Add(address);
+						string assetPath = collectInfoPair.Value.AssetPath;
+						if (addressTemper.TryGetValue(address, out var existed) == false)
+							addressTemper.Add(address, assetPath);
 						else
-							throw new Exception($"The address is existed : {address} in collector : {CollectPath}");
+							throw new Exception($"The address is existed : {address} in collector : {CollectPath} \nAssetPath:\n     {existed}\n     {assetPath}");
 					}
 				}
 			}
@@ -162,95 +216,127 @@ namespace YooAsset.Editor
 			return result.Values.ToList();
 		}
 
-		private CollectAssetInfo CreateCollectAssetInfo(AssetBundleCollectorGroup group, string assetPath, bool isRawAsset)
+		private CollectAssetInfo CreateCollectAssetInfo(CollectCommand command, AssetBundleCollectorGroup group, string assetPath, bool isRawFilePackRule)
 		{
-			string address = GetAddress(group, assetPath);
-			string bundleName = GetBundleName(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, assetTags, isRawAsset);
+			CollectAssetInfo collectAssetInfo = new CollectAssetInfo(CollectorType, bundleName, address, assetPath, isRawFilePackRule, assetTags);
+
+			// 注意：模拟构建模式下不需要收集依赖资源
+			if (command.BuildMode == EBuildMode.SimulateBuild)
+				collectAssetInfo.DependAssets = new List<string>();
+			else
 				collectAssetInfo.DependAssets = GetAllDependencies(assetPath);
+
 			return collectAssetInfo;
 		}
-		private bool IsValidateAsset(string assetPath)
+		private bool IsValidateAsset(string assetPath, bool isRawFilePackRule)
 		{
 			if (assetPath.StartsWith("Assets/") == false && assetPath.StartsWith("Packages/") == false)
+			{
+				UnityEngine.Debug.LogError($"Invalid asset path : {assetPath}");
 				return false;
+			}
 
+			// 忽略文件夹
 			if (AssetDatabase.IsValidFolder(assetPath))
 				return false;
 
-			// 注意：忽略编辑器下的类型资源
-			Type type = AssetDatabase.GetMainAssetTypeAtPath(assetPath);
-			if (type == typeof(LightingDataAsset))
+			// 忽略编辑器下的类型资源
+			Type assetType = AssetDatabase.GetMainAssetTypeAtPath(assetPath);
+			if (assetType == typeof(LightingDataAsset))
 				return false;
 
-			string ext = System.IO.Path.GetExtension(assetPath);
-			if (ext == "" || ext == ".dll" || ext == ".cs" || ext == ".js" || ext == ".boo" || ext == ".meta" || ext == ".cginc")
+			// 检测原生文件是否合规
+			if (isRawFilePackRule)
+			{
+				string extension = EditorTools.RemoveFirstChar(System.IO.Path.GetExtension(assetPath));
+				if (extension == EAssetFileExtension.unity.ToString() || extension == EAssetFileExtension.prefab.ToString() ||
+					extension == EAssetFileExtension.fbx.ToString() || extension == EAssetFileExtension.mat.ToString() ||
+					extension == EAssetFileExtension.controller.ToString() || extension == EAssetFileExtension.anim.ToString() ||
+					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 (assetType == typeof(UnityEditor.DefaultAsset))
+				{
+					UnityEngine.Debug.LogWarning($"Cannot pack default asset : {assetPath}");
+					return false;
+				}
+			}
+
+			string fileExtension = System.IO.Path.GetExtension(assetPath);
+			if (DefaultFilterRule.IsIgnoreFile(fileExtension))
 				return false;
 
 			return true;
 		}
 		private bool IsCollectAsset(string assetPath)
 		{
-			// 如果收集全路径着色器
-			if (AssetBundleCollectorSettingData.Setting.AutoCollectShaders)
-			{
-				Type assetType = AssetDatabase.GetMainAssetTypeAtPath(assetPath);
-				if (assetType == typeof(UnityEngine.Shader))
-					return true;
-			}
-
 			// 根据规则设置过滤资源文件
 			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;
 
 			IAddressRule addressRuleInstance = AssetBundleCollectorSettingData.GetAddressRuleInstance(AddressRuleName);
-			string adressValue = addressRuleInstance.GetAssetAddress(new AddressRuleData(assetPath, CollectPath, group.GroupName));
+			string adressValue = addressRuleInstance.GetAssetAddress(new AddressRuleData(assetPath, CollectPath, group.GroupName, UserData));
 			return adressValue;
 		}
-		private string GetBundleName(AssetBundleCollectorGroup group, string assetPath)
-		{
-			// 如果自动收集所有的着色器
-			if (AssetBundleCollectorSettingData.Setting.AutoCollectShaders)
+		private string GetBundleName(CollectCommand command, AssetBundleCollectorGroup group, string assetPath)
 		{
 			System.Type assetType = AssetDatabase.GetMainAssetTypeAtPath(assetPath);
-				if (assetType == typeof(UnityEngine.Shader))
+			if (assetType == typeof(UnityEngine.Shader) || assetType == typeof(UnityEngine.ShaderVariantCollection))
 			{
-					string bundleName = AssetBundleCollectorSettingData.Setting.ShadersBundleName;
-					return EditorTools.GetRegularPath(bundleName).ToLower();
+				// 获取着色器打包规则结果
+				PackRuleResult packRuleResult = DefaultPackRule.CreateShadersPackRuleResult();
+				return packRuleResult.GetMainBundleName(command.PackageName, command.UniqueBundleName);
 			}
-			}
-
-			// 根据规则设置获取资源包名称
+			else
 			{
+				// 获取其它资源打包规则结果
 				IPackRule packRuleInstance = AssetBundleCollectorSettingData.GetPackRuleInstance(PackRuleName);
-				string bundleName = packRuleInstance.GetBundleName(new PackRuleData(assetPath, CollectPath, group.GroupName));
-				return EditorTools.GetRegularPath(bundleName).ToLower();
+				PackRuleResult packRuleResult = packRuleInstance.GetPackRuleResult(new PackRuleData(assetPath, CollectPath, group.GroupName, UserData));
+				return packRuleResult.GetMainBundleName(command.PackageName, command.UniqueBundleName);
 			}
 		}
 		private List<string> GetAssetTags(AssetBundleCollectorGroup group)
 		{
-			List<string> tags = StringUtility.StringToStringList(group.AssetTags, ';');
-			List<string> temper = StringUtility.StringToStringList(AssetTags, ';');
+			List<string> tags = EditorTools.StringToStringList(group.AssetTags, ';');
+			List<string> temper = EditorTools.StringToStringList(AssetTags, ';');
 			tags.AddRange(temper);
 			return tags;
 		}
 		private List<string> GetAllDependencies(string mainAssetPath)
 		{
-			// 注意：模拟构建模式下不需要收集依赖资源
-			if(AssetBundleCollectorSetting.BuildMode == EBuildMode.SimulateBuild)
-				return new List<string>();
-
-			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))
+				if (IsValidateAsset(assetPath, false))
 				{
 					// 注意：排除主资源对象
 					if (assetPath != mainAssetPath)

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorConfig.cs

@@ -10,22 +10,32 @@ namespace YooAsset.Editor
 {
 	public class AssetBundleCollectorConfig
 	{
-		public const string ConfigVersion = "1.0";
+		public const string ConfigVersion = "2.4";
 
 		public const string XmlVersion = "Version";
 		public const string XmlCommon = "Common";
 		public const string XmlEnableAddressable = "AutoAddressable";
-		public const string XmlAutoCollectShader = "AutoCollectShader";
-		public const string XmlShaderBundleName = "ShaderBundleName";
+		public const string XmlUniqueBundleName = "UniqueBundleName";
+		public const string XmlShowPackageView = "ShowPackageView";
+		public const string XmlShowEditorAlias = "ShowEditorAlias";
+
+		public const string XmlPackage = "Package";
+		public const string XmlPackageName = "PackageName";
+		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";
+
 		public const string XmlCollector = "Collector";
 		public const string XmlCollectPath = "CollectPath";
+		public const string XmlCollectorGUID = "CollectGUID";
 		public const string XmlCollectorType = "CollectType";
 		public const string XmlAddressRule = "AddressRule";
 		public const string XmlPackRule = "PackRule";
 		public const string XmlFilterRule = "FilterRule";
+		public const string XmlUserData = "UserData";
 		public const string XmlAssetTags = "AssetTags";
 
 		/// <summary>
@@ -40,43 +50,67 @@ namespace YooAsset.Editor
 				throw new Exception($"Only support xml : {filePath}");
 
 			// 加载配置文件
-			XmlDocument xml = new XmlDocument();
-			xml.Load(filePath);
-			XmlElement root = xml.DocumentElement;
+			XmlDocument xmlDoc = new XmlDocument();
+			xmlDoc.Load(filePath);
+			XmlElement root = xmlDoc.DocumentElement;
 
 			// 读取配置版本
 			string configVersion = root.GetAttribute(XmlVersion);
 			if (configVersion != ConfigVersion)
 			{
-				throw new Exception($"The config version is invalid : {configVersion}");
+				if (UpdateXmlConfig(xmlDoc) == false)
+					throw new Exception($"The config version update failed : {configVersion} -> {ConfigVersion}");
+				else
+					Debug.Log($"The config version update succeed : {configVersion} -> {ConfigVersion}");
 			}
 
 			// 读取公共配置
 			bool enableAddressable = false;
-			bool autoCollectShaders = false;
-			string shaderBundleName = string.Empty;
+			bool uniqueBundleName = false;
+			bool showPackageView = false;
+			bool showEditorAlias = false;
 			var commonNodeList = root.GetElementsByTagName(XmlCommon);
 			if (commonNodeList.Count > 0)
 			{
 				XmlElement commonElement = commonNodeList[0] as XmlElement;
 				if (commonElement.HasAttribute(XmlEnableAddressable) == false)
 					throw new Exception($"Not found attribute {XmlEnableAddressable} in {XmlCommon}");
-				if (commonElement.HasAttribute(XmlAutoCollectShader) == false)
-					throw new Exception($"Not found attribute {XmlAutoCollectShader} in {XmlCommon}");
-				if (commonElement.HasAttribute(XmlShaderBundleName) == false)
-					throw new Exception($"Not found attribute {XmlShaderBundleName} in {XmlCommon}");
+				if (commonElement.HasAttribute(XmlUniqueBundleName) == false)
+					throw new Exception($"Not found attribute {XmlUniqueBundleName} in {XmlCommon}");
+				if (commonElement.HasAttribute(XmlShowPackageView) == false)
+					throw new Exception($"Not found attribute {XmlShowPackageView} in {XmlCommon}");
+				if (commonElement.HasAttribute(XmlShowEditorAlias) == false)
+					throw new Exception($"Not found attribute {XmlShowEditorAlias} in {XmlCommon}");
 
 				enableAddressable = commonElement.GetAttribute(XmlEnableAddressable) == "True" ? true : false;
-				autoCollectShaders = commonElement.GetAttribute(XmlAutoCollectShader) == "True" ? true : false;
-				shaderBundleName = commonElement.GetAttribute(XmlShaderBundleName);
+				uniqueBundleName = commonElement.GetAttribute(XmlUniqueBundleName) == "True" ? true : false;
+				showPackageView = commonElement.GetAttribute(XmlShowPackageView) == "True" ? true : false;
+				showEditorAlias = commonElement.GetAttribute(XmlShowEditorAlias) == "True" ? true : false;
 			}
 
+			// 读取包裹配置
+			List<AssetBundleCollectorPackage> packages = new List<AssetBundleCollectorPackage>();
+			var packageNodeList = root.GetElementsByTagName(XmlPackage);
+			foreach (var packageNode in packageNodeList)
+			{
+				XmlElement packageElement = packageNode as XmlElement;
+				if (packageElement.HasAttribute(XmlPackageName) == false)
+					throw new Exception($"Not found attribute {XmlPackageName} in {XmlPackage}");
+				if (packageElement.HasAttribute(XmlPackageDesc) == false)
+					throw new Exception($"Not found attribute {XmlPackageDesc} in {XmlPackage}");
+
+				AssetBundleCollectorPackage package = new AssetBundleCollectorPackage();
+				package.PackageName = packageElement.GetAttribute(XmlPackageName);
+				package.PackageDesc = packageElement.GetAttribute(XmlPackageDesc);
+				packages.Add(package);
+
 				// 读取分组配置
-			List<AssetBundleCollectorGroup> groupTemper = new List<AssetBundleCollectorGroup>();
-			var groupNodeList = root.GetElementsByTagName(XmlGroup);
+				var groupNodeList = packageElement.GetElementsByTagName(XmlGroup);
 				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)
@@ -85,10 +119,11 @@ 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);
-				groupTemper.Add(group);
+					package.Groups.Add(group);
 
 					// 读取收集器配置
 					var collectorNodeList = groupElement.GetElementsByTagName(XmlCollector);
@@ -97,6 +132,8 @@ namespace YooAsset.Editor
 						XmlElement collectorElement = collectorNode as XmlElement;
 						if (collectorElement.HasAttribute(XmlCollectPath) == false)
 							throw new Exception($"Not found attribute {XmlCollectPath} in {XmlCollector}");
+						if (collectorElement.HasAttribute(XmlCollectorGUID) == false)
+							throw new Exception($"Not found attribute {XmlCollectorGUID} in {XmlCollector}");
 						if (collectorElement.HasAttribute(XmlCollectorType) == false)
 							throw new Exception($"Not found attribute {XmlCollectorType} in {XmlCollector}");
 						if (collectorElement.HasAttribute(XmlAddressRule) == false)
@@ -105,26 +142,38 @@ namespace YooAsset.Editor
 							throw new Exception($"Not found attribute {XmlPackRule} in {XmlCollector}");
 						if (collectorElement.HasAttribute(XmlFilterRule) == false)
 							throw new Exception($"Not found attribute {XmlFilterRule} in {XmlCollector}");
+						if (collectorElement.HasAttribute(XmlUserData) == false)
+							throw new Exception($"Not found attribute {XmlUserData} in {XmlCollector}");
 						if (collectorElement.HasAttribute(XmlAssetTags) == false)
 							throw new Exception($"Not found attribute {XmlAssetTags} in {XmlCollector}");
 
 						AssetBundleCollector collector = new AssetBundleCollector();
 						collector.CollectPath = collectorElement.GetAttribute(XmlCollectPath);
-					collector.CollectorType = StringUtility.NameToEnum<ECollectorType>(collectorElement.GetAttribute(XmlCollectorType));
+						collector.CollectorGUID = collectorElement.GetAttribute(XmlCollectorGUID);
+						collector.CollectorType = EditorTools.NameToEnum<ECollectorType>(collectorElement.GetAttribute(XmlCollectorType));
 						collector.AddressRuleName = collectorElement.GetAttribute(XmlAddressRule);
 						collector.PackRuleName = collectorElement.GetAttribute(XmlPackRule);
 						collector.FilterRuleName = collectorElement.GetAttribute(XmlFilterRule);
-					collector.AssetTags = collectorElement.GetAttribute(XmlAssetTags); ;
+						collector.UserData = collectorElement.GetAttribute(XmlUserData);
+						collector.AssetTags = collectorElement.GetAttribute(XmlAssetTags);
 						group.Collectors.Add(collector);
 					}
 				}
+			}
+
+			// 检测配置错误
+			foreach(var package in packages)
+			{
+				package.CheckConfigError();
+			}
 
 			// 保存配置数据
 			AssetBundleCollectorSettingData.ClearAll();
 			AssetBundleCollectorSettingData.Setting.EnableAddressable = enableAddressable;
-			AssetBundleCollectorSettingData.Setting.AutoCollectShaders = autoCollectShaders;
-			AssetBundleCollectorSettingData.Setting.ShadersBundleName = shaderBundleName;
-			AssetBundleCollectorSettingData.Setting.Groups.AddRange(groupTemper);
+			AssetBundleCollectorSettingData.Setting.UniqueBundleName = uniqueBundleName;
+			AssetBundleCollectorSettingData.Setting.ShowPackageView = showPackageView;
+			AssetBundleCollectorSettingData.Setting.ShowEditorAlias = showEditorAlias;
+			AssetBundleCollectorSettingData.Setting.Packages.AddRange(packages);
 			AssetBundleCollectorSettingData.SaveFile();
 			Debug.Log($"导入配置完毕！");
 		}
@@ -152,36 +201,181 @@ namespace YooAsset.Editor
 			// 设置公共配置
 			var commonElement = xmlDoc.CreateElement(XmlCommon);
 			commonElement.SetAttribute(XmlEnableAddressable, AssetBundleCollectorSettingData.Setting.EnableAddressable.ToString());
-			commonElement.SetAttribute(XmlAutoCollectShader, AssetBundleCollectorSettingData.Setting.AutoCollectShaders.ToString());
-			commonElement.SetAttribute(XmlShaderBundleName, AssetBundleCollectorSettingData.Setting.ShadersBundleName);
+			commonElement.SetAttribute(XmlUniqueBundleName, AssetBundleCollectorSettingData.Setting.UniqueBundleName.ToString());
+			commonElement.SetAttribute(XmlShowPackageView, AssetBundleCollectorSettingData.Setting.ShowPackageView.ToString());
+			commonElement.SetAttribute(XmlShowEditorAlias, AssetBundleCollectorSettingData.Setting.ShowEditorAlias.ToString());
 			root.AppendChild(commonElement);
 
+			// 设置Package配置
+			foreach (var package in AssetBundleCollectorSettingData.Setting.Packages)
+			{
+				var packageElement = xmlDoc.CreateElement(XmlPackage);
+				packageElement.SetAttribute(XmlPackageName, package.PackageName);
+				packageElement.SetAttribute(XmlPackageDesc, package.PackageDesc);
+				root.AppendChild(packageElement);
+
 				// 设置分组配置
-			foreach (var group in AssetBundleCollectorSettingData.Setting.Groups)
+				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);
-				root.AppendChild(groupElement);
+					packageElement.AppendChild(groupElement);
 
 					// 设置收集器配置
 					foreach (var collector in group.Collectors)
 					{
 						var collectorElement = xmlDoc.CreateElement(XmlCollector);
 						collectorElement.SetAttribute(XmlCollectPath, collector.CollectPath);
+						collectorElement.SetAttribute(XmlCollectorGUID, collector.CollectorGUID);
 						collectorElement.SetAttribute(XmlCollectorType, collector.CollectorType.ToString());
 						collectorElement.SetAttribute(XmlAddressRule, collector.AddressRuleName);
 						collectorElement.SetAttribute(XmlPackRule, collector.PackRuleName);
 						collectorElement.SetAttribute(XmlFilterRule, collector.FilterRuleName);
+						collectorElement.SetAttribute(XmlUserData, collector.UserData);
 						collectorElement.SetAttribute(XmlAssetTags, collector.AssetTags);
 						groupElement.AppendChild(collectorElement);
 					}
 				}
+			}
 
 			// 生成配置文件
 			xmlDoc.Save(savePath);
 			Debug.Log($"导出配置完毕！");
 		}
+
+		/// <summary>
+		/// 升级XML配置表
+		/// </summary>
+		private static bool UpdateXmlConfig(XmlDocument xmlDoc)
+		{
+			XmlElement root = xmlDoc.DocumentElement;
+			string configVersion = root.GetAttribute(XmlVersion);
+			if (configVersion == ConfigVersion)
+				return true;
+
+			// 1.0 -> 2.0
+			if (configVersion == "1.0")
+			{
+				// 添加公共元素属性
+				var commonNodeList = root.GetElementsByTagName(XmlCommon);
+				if (commonNodeList.Count > 0)
+				{
+					XmlElement commonElement = commonNodeList[0] as XmlElement;
+					if (commonElement.HasAttribute(XmlShowPackageView) == false)
+						commonElement.SetAttribute(XmlShowPackageView, "False");
+				}
+
+				// 添加包裹元素
+				var packageElement = xmlDoc.CreateElement(XmlPackage);
+				packageElement.SetAttribute(XmlPackageName, "DefaultPackage");
+				packageElement.SetAttribute(XmlPackageDesc, string.Empty);
+				root.AppendChild(packageElement);
+
+				// 获取所有分组元素
+				var groupNodeList = root.GetElementsByTagName(XmlGroup);
+				List<XmlElement> temper = new List<XmlElement>(groupNodeList.Count);
+				foreach (var groupNode in groupNodeList)
+				{
+					XmlElement groupElement = groupNode as XmlElement;
+					var collectorNodeList = groupElement.GetElementsByTagName(XmlCollector);
+					foreach (var collectorNode in collectorNodeList)
+					{
+						XmlElement collectorElement = collectorNode as XmlElement;
+						if (collectorElement.HasAttribute(XmlCollectorGUID) == false)
+							collectorElement.SetAttribute(XmlCollectorGUID, string.Empty);
+					}
+					temper.Add(groupElement);
+				}
+
+				// 将分组元素转移至包裹元素下
+				foreach (var groupElement in temper)
+				{
+					root.RemoveChild(groupElement);
+					packageElement.AppendChild(groupElement);
+				}
+
+				// 更新版本
+				root.SetAttribute(XmlVersion, "2.0");
+				return UpdateXmlConfig(xmlDoc);
+			}
+
+			// 2.0 -> 2.1
+			if (configVersion == "2.0")
+			{
+				// 添加公共元素属性
+				var commonNodeList = root.GetElementsByTagName(XmlCommon);
+				if (commonNodeList.Count > 0)
+				{
+					XmlElement commonElement = commonNodeList[0] as XmlElement;
+					if (commonElement.HasAttribute(XmlUniqueBundleName) == false)
+						commonElement.SetAttribute(XmlUniqueBundleName, "False");
+				}
+
+				// 更新版本
+				root.SetAttribute(XmlVersion, "2.1");
+				return UpdateXmlConfig(xmlDoc);
+			}
+
+			// 2.1 -> 2.2
+			if (configVersion == "2.1")
+			{
+				// 添加公共元素属性
+				var commonNodeList = root.GetElementsByTagName(XmlCommon);
+				if (commonNodeList.Count > 0)
+				{
+					XmlElement commonElement = commonNodeList[0] as XmlElement;
+					if (commonElement.HasAttribute(XmlShowEditorAlias) == false)
+						commonElement.SetAttribute(XmlShowEditorAlias, "False");
+				}
+
+				// 更新版本
+				root.SetAttribute(XmlVersion, "2.2");
+				return UpdateXmlConfig(xmlDoc);
+			}
+
+			// 2.2 -> 2.3
+			if (configVersion == "2.2")
+			{
+				// 获取所有分组元素
+				var groupNodeList = root.GetElementsByTagName(XmlGroup);
+				foreach (var groupNode in groupNodeList)
+				{
+					XmlElement groupElement = groupNode as XmlElement;
+					var collectorNodeList = groupElement.GetElementsByTagName(XmlCollector);
+					foreach (var collectorNode in collectorNodeList)
+					{
+						XmlElement collectorElement = collectorNode as XmlElement;
+						if (collectorElement.HasAttribute(XmlUserData) == false)
+							collectorElement.SetAttribute(XmlUserData, string.Empty);
+					}
+				}
+
+				// 更新版本
+				root.SetAttribute(XmlVersion, "2.3");
+				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/AssetBundleCollectorGroup.cs

@@ -25,6 +25,11 @@ namespace YooAsset.Editor
 		/// </summary>
 		public string AssetTags = string.Empty;
 
+		/// <summary>
+		/// 分组激活规则
+		/// </summary>
+		public string ActiveRuleName = nameof(EnableGroup);
+
 		/// <summary>
 		/// 分组的收集器列表
 		/// </summary>
@@ -36,23 +41,49 @@ namespace YooAsset.Editor
 		/// </summary>
 		public void CheckConfigError()
 		{
+			if (AssetBundleCollectorSettingData.HasActiveRuleName(ActiveRuleName) == false)
+				throw new Exception($"Invalid {nameof(IActiveRule)} class type : {ActiveRuleName} in group : {GroupName}");
+
 			foreach (var collector in Collectors)
 			{
 				collector.CheckConfigError();
 			}
 		}
 
+		/// <summary>
+		/// 修复配置错误
+		/// </summary>
+		public bool FixConfigError()
+		{
+			bool isFixed = false;
+			foreach (var collector in Collectors)
+			{
+				if (collector.FixConfigError())
+				{
+					isFixed = true;
+				}
+			}
+			return isFixed;
+		}
+
 		/// <summary>
 		/// 获取打包收集的资源文件
 		/// </summary>
-		public List<CollectAssetInfo> GetAllCollectAssets()
+		public List<CollectAssetInfo> GetAllCollectAssets(CollectCommand command)
 		{
 			Dictionary<string, CollectAssetInfo> result = new Dictionary<string, CollectAssetInfo>(10000);
 
+			// 检测分组是否激活
+			IActiveRule activeRule = AssetBundleCollectorSettingData.GetActiveRuleInstance(ActiveRuleName);
+			if (activeRule.IsActiveGroup() == false)
+			{
+				return new List<CollectAssetInfo>();
+			}
+
 			// 收集打包资源
 			foreach (var collector in Collectors)
 			{
-				var temper = collector.GetAllCollectAssets(this);
+				var temper = collector.GetAllCollectAssets(command, this);
 				foreach (var assetInfo in temper)
 				{
 					if (result.ContainsKey(assetInfo.AssetPath) == false)
@@ -63,18 +94,19 @@ namespace YooAsset.Editor
 			}
 
 			// 检测可寻址地址是否重复
-			if (AssetBundleCollectorSettingData.Setting.EnableAddressable)
+			if (command.EnableAddressable)
 			{
-				HashSet<string> adressTemper = new HashSet<string>();
+				var addressTemper = new Dictionary<string, string>();
 				foreach (var collectInfoPair in result)
 				{
 					if (collectInfoPair.Value.CollectorType == ECollectorType.MainAssetCollector)
 					{
 						string address = collectInfoPair.Value.Address;
-						if (adressTemper.Contains(address) == false)
-							adressTemper.Add(address);
+						string assetPath = collectInfoPair.Value.AssetPath;
+						if (addressTemper.TryGetValue(address, out var existed) == false)
+							addressTemper.Add(address, assetPath);
 						else
-							throw new Exception($"The address is existed : {address} in group : {GroupName}");
+							throw new Exception($"The address is existed : {address} in group : {GroupName} \nAssetPath:\n     {existed}\n     {assetPath}");
 					}
 				}
 			}

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorPackage.cs

@@ -0,0 +1,126 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+	[Serializable]
+	public class AssetBundleCollectorPackage
+	{
+		/// <summary>
+		/// 包裹名称
+		/// </summary>
+		public string PackageName = string.Empty;
+
+		/// <summary>
+		/// 包裹描述
+		/// </summary>
+		public string PackageDesc = string.Empty;
+
+		/// <summary>
+		/// 分组列表
+		/// </summary>
+		public List<AssetBundleCollectorGroup> Groups = new List<AssetBundleCollectorGroup>();
+
+
+		/// <summary>
+		/// 检测配置错误
+		/// </summary>
+		public void CheckConfigError()
+		{
+			foreach (var group in Groups)
+			{
+				group.CheckConfigError();
+			}
+		}
+
+		/// <summary>
+		/// 修复配置错误
+		/// </summary>
+		public bool FixConfigError()
+		{
+			bool isFixed = false;
+			foreach (var group in Groups)
+			{
+				if (group.FixConfigError())
+				{
+					isFixed = true;
+				}
+			}
+			return isFixed;
+		}
+
+		/// <summary>
+		/// 获取打包收集的资源文件
+		/// </summary>
+		public List<CollectAssetInfo> GetAllCollectAssets(CollectCommand command)
+		{
+			Dictionary<string, CollectAssetInfo> result = new Dictionary<string, CollectAssetInfo>(10000);
+
+			// 收集打包资源
+			foreach (var group in Groups)
+			{
+				var temper = group.GetAllCollectAssets(command);
+				foreach (var assetInfo in temper)
+				{
+					if (result.ContainsKey(assetInfo.AssetPath) == false)
+						result.Add(assetInfo.AssetPath, assetInfo);
+					else
+						throw new Exception($"The collecting asset file is existed : {assetInfo.AssetPath}");
+				}
+			}
+
+			// 检测可寻址地址是否重复
+			if (command.EnableAddressable)
+			{
+				var addressTemper = new Dictionary<string, string>();
+				foreach (var collectInfoPair in result)
+				{
+					if (collectInfoPair.Value.CollectorType == ECollectorType.MainAssetCollector)
+					{
+						string address = collectInfoPair.Value.Address;
+						string assetPath = collectInfoPair.Value.AssetPath;
+						if (addressTemper.TryGetValue(address, out var existed) == false)
+							addressTemper.Add(address, assetPath);
+						else
+							throw new Exception($"The address is existed : {address} \nAssetPath:\n     {existed}\n     {assetPath}");
+					}
+				}
+			}
+
+			// 返回列表
+			return result.Values.ToList();
+		}
+
+		/// <summary>
+		/// 获取所有的资源标签
+		/// </summary>
+		public List<string> GetAllTags()
+		{
+			HashSet<string> result = new HashSet<string>();
+			foreach (var group in Groups)
+			{
+				List<string> groupTags = EditorTools.StringToStringList(group.AssetTags, ';');
+				foreach (var tag in groupTags)
+				{
+					if (result.Contains(tag) == false)
+						result.Add(tag);
+				}
+
+				foreach (var collector in group.Collectors)
+				{
+					List<string> collectorTags = EditorTools.StringToStringList(collector.AssetTags, ';');
+					foreach (var tag in collectorTags)
+					{
+						if (result.Contains(tag) == false)
+							result.Add(tag);
+					}
+				}
+			}
+			return result.ToList();
+		}
+	}
+}

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorPackage.cs.meta

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

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSetting.cs

@@ -6,9 +6,13 @@ using UnityEngine;
 
 namespace YooAsset.Editor
 {
+	[CreateAssetMenu(fileName = "AssetBundleCollectorSetting", menuName = "YooAsset/Create AssetBundle Collector Settings")]
 	public class AssetBundleCollectorSetting : ScriptableObject
 	{
-		public static EBuildMode BuildMode;
+		/// <summary>
+		/// 是否显示包裹列表视图
+		/// </summary>
+		public bool ShowPackageView = false;
 
 		/// <summary>
 		/// 是否启用可寻址资源定位
@@ -16,73 +20,95 @@ namespace YooAsset.Editor
 		public bool EnableAddressable = false;
 
 		/// <summary>
-		/// 自动收集着色器
+		/// 资源包名唯一化
 		/// </summary>
-		public bool AutoCollectShaders = true;
+		public bool UniqueBundleName = false;
 
 		/// <summary>
-		/// 自动收集的着色器资源包名称
+		/// 是否显示编辑器别名
 		/// </summary>
-		public string ShadersBundleName = "myshaders";
+		public bool ShowEditorAlias = false;
+
 
 		/// <summary>
-		/// 分组列表
+		/// 包裹列表
 		/// </summary>
-		public List<AssetBundleCollectorGroup> Groups = new List<AssetBundleCollectorGroup>();
+		public List<AssetBundleCollectorPackage> Packages = new List<AssetBundleCollectorPackage>();
 
 
+		/// <summary>
+		/// 清空所有数据
+		/// </summary>
+		public void ClearAll()
+		{
+			EnableAddressable = false;
+			Packages.Clear();
+		}
+
 		/// <summary>
 		/// 检测配置错误
 		/// </summary>
 		public void CheckConfigError()
 		{
-			foreach (var group in Groups)
+			foreach (var package in Packages)
 			{
-				group.CheckConfigError();
+				package.CheckConfigError();
 			}
 		}
 
 		/// <summary>
-		/// 获取打包收集的资源文件
+		/// 修复配置错误
 		/// </summary>
-		public List<CollectAssetInfo> GetAllCollectAssets(EBuildMode buildMode)
+		public bool FixConfigError()
 		{
-			BuildMode = buildMode;
+			bool isFixed = false;
+			foreach (var package in Packages)
+			{
+				if (package.FixConfigError())
+				{
+					isFixed = true;
+				}
+			}
+			return isFixed;
+		}
 
-			Dictionary<string, CollectAssetInfo> result = new Dictionary<string, CollectAssetInfo>(10000);
-
-			// 收集打包资源
-			foreach (var group in Groups)
+		/// <summary>
+		/// 获取所有的资源标签
+		/// </summary>
+		public List<string> GetPackageAllTags(string packageName)
 		{
-				var temper = group.GetAllCollectAssets();
-				foreach (var assetInfo in temper)
+			foreach (var package in Packages)
 			{
-					if (result.ContainsKey(assetInfo.AssetPath) == false)
-						result.Add(assetInfo.AssetPath, assetInfo);
-					else
-						throw new Exception($"The collecting asset file is existed : {assetInfo.AssetPath} in group setting.");
+				if (package.PackageName == packageName)
+				{
+					return package.GetAllTags();
 				}
 			}
 
-			// 检测可寻址地址是否重复
-			if (EnableAddressable)
-			{
-				HashSet<string> adressTemper = new HashSet<string>();
-				foreach (var collectInfoPair in result)
-				{
-					if (collectInfoPair.Value.CollectorType == ECollectorType.MainAssetCollector)
-					{
-						string address = collectInfoPair.Value.Address;
-						if (adressTemper.Contains(address) == false)
-							adressTemper.Add(address);
-						else
-							throw new Exception($"The address is existed : {address} in group setting.");
+			Debug.LogWarning($"Not found package : {packageName}");
+			return new List<string>();
 		}
+
+		/// <summary>
+		/// 获取包裹收集的资源文件
+		/// </summary>
+		public CollectResult GetPackageAssets(EBuildMode buildMode, string packageName)
+		{
+			if (string.IsNullOrEmpty(packageName))
+				throw new Exception("Build package name is null or mepty !");
+
+			foreach (var package in Packages)
+			{
+				if (package.PackageName == packageName)
+				{
+					CollectCommand command = new CollectCommand(buildMode, packageName, EnableAddressable, UniqueBundleName);
+					CollectResult collectResult = new CollectResult(command);
+					collectResult.SetCollectAssets(package.GetAllCollectAssets(command));
+					return collectResult;
 				}
 			}
 
-			// 返回列表
-			return result.Values.ToList();
+			throw new Exception($"Not found collector pacakge : {packageName}");
 		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSettingData.cs

@@ -9,6 +9,9 @@ namespace YooAsset.Editor
 {
 	public class AssetBundleCollectorSettingData
 	{
+		private static readonly Dictionary<string, System.Type> _cacheActiveRuleTypes = new Dictionary<string, Type>();
+		private static readonly Dictionary<string, IActiveRule> _cacheActiveRuleInstance = new Dictionary<string, IActiveRule>();
+
 		private static readonly Dictionary<string, System.Type> _cacheAddressRuleTypes = new Dictionary<string, System.Type>();
 		private static readonly Dictionary<string, IAddressRule> _cacheAddressRuleInstance = new Dictionary<string, IAddressRule>();
 
@@ -24,89 +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;
-			}
-		}
-
-		public static List<string> GetAddressRuleNames()
-		{
-			if (_setting == null)
-				LoadSettingData();
-
-			List<string> names = new List<string>();
-			foreach (var pair in _cacheAddressRuleTypes)
-			{
-				names.Add(pair.Key);
-			}
-			return names;
-		}
-		public static List<string> GetPackRuleNames()
-		{
-			if (_setting == null)
-				LoadSettingData();
-
-			List<string> names = new List<string>();
-			foreach (var pair in _cachePackRuleTypes)
-			{
-				names.Add(pair.Key);
-			}
-			return names;
-		}
-		public static List<string> GetFilterRuleNames()
-		{
-			if (_setting == null)
-				LoadSettingData();
-
-			List<string> names = new List<string>();
-			foreach (var pair in _cacheFilterRuleTypes)
-			{
-				names.Add(pair.Key);
-			}
-			return names;
-		}
-		public static bool HasAddressRuleName(string ruleName)
-		{
-			foreach (var pair in _cacheAddressRuleTypes)
-			{
-				if (pair.Key == ruleName)
-					return true;
-			}
-			return false;
-		}
-		public static bool HasPackRuleName(string ruleName)
-		{
-			foreach (var pair in _cachePackRuleTypes)
-			{
-				if (pair.Key == ruleName)
-					return true;
-			}
-			return false;
-		}
-		public static bool HasFilterRuleName(string ruleName)
-		{
-			foreach (var pair in _cacheFilterRuleTypes)
-			{
-				if (pair.Key == ruleName)
-					return true;
-			}
-			return false;
-		}
-
-
-		/// <summary>
-		/// 加载配置文件
-		/// </summary>
-		private static void LoadSettingData()
-		{
-			_setting = YooAssetEditorSettingsHelper.LoadSettingData<AssetBundleCollectorSetting>();
-
 			// IPackRule
 			{
 				// 清空缓存集合
@@ -122,6 +44,7 @@ namespace YooAsset.Editor
 					typeof(PackCollector),
 					typeof(PackGroup),
 					typeof(PackRawFile),
+					typeof(PackShaderVariants)
 				};
 
 				var customTypes = EditorTools.GetAssignableTypes(typeof(IPackRule));
@@ -169,7 +92,8 @@ namespace YooAsset.Editor
 				List<Type> types = new List<Type>(100)
 				{
 					typeof(AddressByFileName),
-					typeof(AddressByCollectorAndFileName),
+					typeof(AddressByFilePath),
+					typeof(AddressByFolderAndFileName),
 					typeof(AddressByGroupAndFileName)
 				};
 
@@ -182,10 +106,44 @@ namespace YooAsset.Editor
 						_cacheAddressRuleTypes.Add(type.Name, type);
 				}
 			}
+
+			// IActiveRule
+			{
+				// 清空缓存集合
+				_cacheActiveRuleTypes.Clear();
+				_cacheActiveRuleInstance.Clear();
+
+				// 获取所有类型
+				List<Type> types = new List<Type>(100)
+				{
+					typeof(EnableGroup),
+					typeof(DisableGroup),
+				};
+
+				var customTypes = EditorTools.GetAssignableTypes(typeof(IActiveRule));
+				types.AddRange(customTypes);
+				for (int i = 0; i < types.Count; i++)
+				{
+					Type type = types[i];
+					if (_cacheActiveRuleTypes.ContainsKey(type.Name) == false)
+						_cacheActiveRuleTypes.Add(type.Name, type);
+				}
+			}
+		}
+
+		private static AssetBundleCollectorSetting _setting = null;
+		public static AssetBundleCollectorSetting Setting
+		{
+			get
+			{
+				if (_setting == null)
+					_setting = SettingLoader.LoadSettingData<AssetBundleCollectorSetting>();
+				return _setting;
+			}
 		}
 
 		/// <summary>
-		/// 存储文件
+		/// 存储配置文件
 		/// </summary>
 		public static void SaveFile()
 		{
@@ -198,18 +156,118 @@ namespace YooAsset.Editor
 			}
 		}
 
+		/// <summary>
+		/// 修复配置文件
+		/// </summary>
+		public static void FixFile()
+		{
+			bool isFixed = Setting.FixConfigError();
+			if (isFixed)
+			{
+				IsDirty = true;
+			}
+		}
+
 		/// <summary>
 		/// 清空所有数据
 		/// </summary>
 		public static void ClearAll()
 		{
-			Setting.AutoCollectShaders = false;
-			Setting.ShadersBundleName = string.Empty;
-			Setting.Groups.Clear();
+			Setting.ClearAll();
 			SaveFile();
 		}
 
-		// 实例类相关
+		public static List<RuleDisplayName> GetActiveRuleNames()
+		{
+			List<RuleDisplayName> names = new List<RuleDisplayName>();
+			foreach (var pair in _cacheActiveRuleTypes)
+			{
+				RuleDisplayName ruleName = new RuleDisplayName();
+				ruleName.ClassName = pair.Key;
+				ruleName.DisplayName = GetRuleDisplayName(pair.Key, pair.Value);
+				names.Add(ruleName);
+			}
+			return names;
+		}
+		public static List<RuleDisplayName> GetAddressRuleNames()
+		{
+			List<RuleDisplayName> names = new List<RuleDisplayName>();
+			foreach (var pair in _cacheAddressRuleTypes)
+			{
+				RuleDisplayName ruleName = new RuleDisplayName();
+				ruleName.ClassName = pair.Key;
+				ruleName.DisplayName = GetRuleDisplayName(pair.Key, pair.Value);
+				names.Add(ruleName);
+			}
+			return names;
+		}
+		public static List<RuleDisplayName> GetPackRuleNames()
+		{
+			List<RuleDisplayName> names = new List<RuleDisplayName>();
+			foreach (var pair in _cachePackRuleTypes)
+			{
+				RuleDisplayName ruleName = new RuleDisplayName();
+				ruleName.ClassName = pair.Key;
+				ruleName.DisplayName = GetRuleDisplayName(pair.Key, pair.Value);
+				names.Add(ruleName);
+			}
+			return names;
+		}
+		public static List<RuleDisplayName> GetFilterRuleNames()
+		{
+			List<RuleDisplayName> names = new List<RuleDisplayName>();
+			foreach (var pair in _cacheFilterRuleTypes)
+			{
+				RuleDisplayName ruleName = new RuleDisplayName();
+				ruleName.ClassName = pair.Key;
+				ruleName.DisplayName = GetRuleDisplayName(pair.Key, pair.Value);
+				names.Add(ruleName);
+			}
+			return names;
+		}
+		private static string GetRuleDisplayName(string name, Type type)
+		{
+			var attribute = DisplayNameAttributeHelper.GetAttribute<DisplayNameAttribute>(type);
+			if (attribute != null && string.IsNullOrEmpty(attribute.DisplayName) == false)
+				return attribute.DisplayName;
+			else
+				return name;
+		}
+
+		public static bool HasActiveRuleName(string ruleName)
+		{
+			return _cacheActiveRuleTypes.Keys.Contains(ruleName);
+		}
+		public static bool HasAddressRuleName(string ruleName)
+		{
+			return _cacheAddressRuleTypes.Keys.Contains(ruleName);
+		}
+		public static bool HasPackRuleName(string ruleName)
+		{
+			return _cachePackRuleTypes.Keys.Contains(ruleName);
+		}
+		public static bool HasFilterRuleName(string ruleName)
+		{
+			return _cacheFilterRuleTypes.Keys.Contains(ruleName);
+		}
+
+		public static IActiveRule GetActiveRuleInstance(string ruleName)
+		{
+			if (_cacheActiveRuleInstance.TryGetValue(ruleName, out IActiveRule instance))
+				return instance;
+
+			// 如果不存在创建类的实例
+			if (_cacheActiveRuleTypes.TryGetValue(ruleName, out Type type))
+			{
+				instance = (IActiveRule)Activator.CreateInstance(type);
+				_cacheActiveRuleInstance.Add(ruleName, instance);
+				return instance;
+			}
+			else
+			{
+				throw new Exception($"{nameof(IActiveRule)}类型无效：{ruleName}");
+			}
+		}
 		public static IAddressRule GetAddressRuleInstance(string ruleName)
 		{
 			if (_cacheAddressRuleInstance.TryGetValue(ruleName, out IAddressRule instance))
@@ -262,32 +320,68 @@ namespace YooAsset.Editor
 			}
 		}
 
-		// 可寻址编辑相关
+		// 公共参数编辑相关
+		public static void ModifyPackageView(bool showPackageView)
+		{
+			Setting.ShowPackageView = showPackageView;
+			IsDirty = true;
+		}
 		public static void ModifyAddressable(bool enableAddressable)
 		{
 			Setting.EnableAddressable = enableAddressable;
 			IsDirty = true;
 		}
-
-		// 着色器编辑相关
-		public static void ModifyShader(bool isCollectAllShaders, string shadersBundleName)
+		public static void ModifyUniqueBundleName(bool uniqueBundleName)
 		{
-			Setting.AutoCollectShaders = isCollectAllShaders;
-			Setting.ShadersBundleName = shadersBundleName;
+			Setting.UniqueBundleName = uniqueBundleName;
 			IsDirty = true;
 		}
+		public static void ModifyShowEditorAlias(bool showAlias)
+		{
+			Setting.ShowEditorAlias = showAlias;
+			IsDirty = true;
+		}
+
+		// 资源包裹编辑相关
+		public static AssetBundleCollectorPackage CreatePackage(string packageName)
+		{
+			AssetBundleCollectorPackage package = new AssetBundleCollectorPackage();
+			package.PackageName = packageName;
+			Setting.Packages.Add(package);
+			IsDirty = true;
+			return package;
+		}
+		public static void RemovePackage(AssetBundleCollectorPackage package)
+		{
+			if (Setting.Packages.Remove(package))
+			{
+				IsDirty = true;
+			}
+			else
+			{
+				Debug.LogWarning($"Failed remove package : {package.PackageName}");
+			}
+		}
+		public static void ModifyPackage(AssetBundleCollectorPackage package)
+		{
+			if (package != null)
+			{
+				IsDirty = true;
+			}
+		}
 
 		// 资源分组编辑相关
-		public static void CreateGroup(string groupName)
+		public static AssetBundleCollectorGroup CreateGroup(AssetBundleCollectorPackage package, string groupName)
 		{
 			AssetBundleCollectorGroup group = new AssetBundleCollectorGroup();
 			group.GroupName = groupName;
-			Setting.Groups.Add(group);
+			package.Groups.Add(group);
 			IsDirty = true;
+			return group;
 		}
-		public static void RemoveGroup(AssetBundleCollectorGroup group)
+		public static void RemoveGroup(AssetBundleCollectorPackage package, AssetBundleCollectorGroup group)
 		{
-			if (Setting.Groups.Remove(group))
+			if (package.Groups.Remove(group))
 			{
 				IsDirty = true;
 			}
@@ -296,19 +390,17 @@ namespace YooAsset.Editor
 				Debug.LogWarning($"Failed remove group : {group.GroupName}");
 			}
 		}
-		public static void ModifyGroup(AssetBundleCollectorGroup group)
+		public static void ModifyGroup(AssetBundleCollectorPackage package, AssetBundleCollectorGroup group)
 		{
-			if (group != null)
+			if (package != null && group != null)
 			{
 				IsDirty = true;
 			}
 		}
 
 		// 资源收集器编辑相关
-		public static void CreateCollector(AssetBundleCollectorGroup group, string collectPath)
+		public static void CreateCollector(AssetBundleCollectorGroup group, AssetBundleCollector collector)
 		{
-			AssetBundleCollector collector = new AssetBundleCollector();
-			collector.CollectPath = collectPath;
 			group.Collectors.Add(collector);
 			IsDirty = true;
 		}
@@ -330,5 +422,14 @@ namespace YooAsset.Editor
 				IsDirty = true;
 			}
 		}
+
+		/// <summary>
+		/// 获取所有的资源标签
+		/// </summary>
+		public static string GetPackageAllTags(string packageName)
+		{
+			var allTags = Setting.GetPackageAllTags(packageName);
+			return string.Join(";", allTags);
+		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs

@@ -12,76 +12,157 @@ namespace YooAsset.Editor
 	public class AssetBundleCollectorWindow : EditorWindow
 	{
 		[MenuItem("YooAsset/AssetBundle Collector", false, 101)]
-		public static void ShowExample()
+		public static void OpenWindow()
 		{
-			AssetBundleCollectorWindow window = GetWindow<AssetBundleCollectorWindow>("资源包收集工具", true, EditorDefine.DockedWindowTypes);
+			AssetBundleCollectorWindow window = GetWindow<AssetBundleCollectorWindow>("资源包收集工具", true, WindowsDefine.DockedWindowTypes);
 			window.minSize = new Vector2(800, 600);
 		}
 
+		private Button _saveButton;
 		private List<string> _collectorTypeList;
-		private List<string> _addressRuleList;
-		private List<string> _packRuleList;
-		private List<string> _filterRuleList;
-		private ListView _groupListView;
-		private ScrollView _collectorScrollView;
+		private List<RuleDisplayName> _activeRuleList;
+		private List<RuleDisplayName> _addressRuleList;
+		private List<RuleDisplayName> _packRuleList;
+		private List<RuleDisplayName> _filterRuleList;
+
+		private Toggle _showPackageToogle;
 		private Toggle _enableAddressableToogle;
-		private Toggle _autoCollectShaderToogle;
-		private TextField _shaderBundleNameTxt;
+		private Toggle _uniqueBundleNameToogle;
+		private Toggle _showEditorAliasToggle;
+
+		private VisualElement _packageContainer;
+		private ListView _packageListView;
+		private TextField _packageNameTxt;
+		private TextField _packageDescTxt;
+
+		private VisualElement _groupContainer;
+		private ListView _groupListView;
 		private TextField _groupNameTxt;
 		private TextField _groupDescTxt;
 		private TextField _groupAssetTagsTxt;
-		private VisualElement _groupContainer;
+
+		private VisualElement _collectorContainer;
+		private ScrollView _collectorScrollView;
+		private PopupField<RuleDisplayName> _activeRulePopupField;
+
+		private int _lastModifyPackageIndex = 0;
+		private int _lastModifyGroupIndex = 0;
+
 
 		public void CreateGUI()
 		{
 			Undo.undoRedoPerformed -= RefreshWindow;
 			Undo.undoRedoPerformed += RefreshWindow;
 
+			try
+			{
 				_collectorTypeList = new List<string>()
 				{
 					$"{nameof(ECollectorType.MainAssetCollector)}",
 					$"{nameof(ECollectorType.StaticAssetCollector)}",
 					$"{nameof(ECollectorType.DependAssetCollector)}"
 				};
+				_activeRuleList = AssetBundleCollectorSettingData.GetActiveRuleNames();
 				_addressRuleList = AssetBundleCollectorSettingData.GetAddressRuleNames();
 				_packRuleList = AssetBundleCollectorSettingData.GetPackRuleNames();
 				_filterRuleList = AssetBundleCollectorSettingData.GetFilterRuleNames();
 
-			try
-			{
 				VisualElement root = this.rootVisualElement;
 
 				// 加载布局文件
-				var visualAsset = YooAssetEditorSettingsData.Setting.AssetBundleCollectorUXML;
+				var visualAsset = UxmlLoader.LoadWindowUXML<AssetBundleCollectorWindow>();
 				if (visualAsset == null)
-				{
-					Debug.LogError($"Not found {nameof(AssetBundleCollectorWindow)}.uxml in settings.");
 					return;
-				}
+
 				visualAsset.CloneTree(root);
 
+				// 公共设置相关
+				_showPackageToogle = root.Q<Toggle>("ShowPackages");
+				_showPackageToogle.RegisterValueChangedCallback(evt =>
+				{
+					AssetBundleCollectorSettingData.ModifyPackageView(evt.newValue);
+					RefreshWindow();
+				});
+				_enableAddressableToogle = root.Q<Toggle>("EnableAddressable");
+				_enableAddressableToogle.RegisterValueChangedCallback(evt =>
+				{
+					AssetBundleCollectorSettingData.ModifyAddressable(evt.newValue);
+					RefreshWindow();
+				});
+				_uniqueBundleNameToogle = root.Q<Toggle>("UniqueBundleName");
+				_uniqueBundleNameToogle.RegisterValueChangedCallback(evt =>
+				{
+					AssetBundleCollectorSettingData.ModifyUniqueBundleName(evt.newValue);
+					RefreshWindow();
+				});
+
+				_showEditorAliasToggle = root.Q<Toggle>("ShowEditorAlias");
+				_showEditorAliasToggle.RegisterValueChangedCallback(evt =>
+				{
+					AssetBundleCollectorSettingData.ModifyShowEditorAlias(evt.newValue);
+					RefreshWindow();
+				});
+
+				// 配置修复按钮
+				var fixBtn = root.Q<Button>("FixButton");
+				fixBtn.clicked += FixBtn_clicked;
+
 				// 导入导出按钮
 				var exportBtn = root.Q<Button>("ExportButton");
 				exportBtn.clicked += ExportBtn_clicked;
 				var importBtn = root.Q<Button>("ImportButton");
 				importBtn.clicked += ImportBtn_clicked;
 
-				// 公共设置相关
-				_enableAddressableToogle = root.Q<Toggle>("EnableAddressable");
-				_enableAddressableToogle.RegisterValueChangedCallback(evt =>
+				// 配置保存按钮
+				_saveButton = root.Q<Button>("SaveButton");
+				_saveButton.clicked += SaveBtn_clicked;
+
+				// 包裹容器
+				_packageContainer = root.Q("PackageContainer");
+
+				// 包裹列表相关
+				_packageListView = root.Q<ListView>("PackageListView");
+				_packageListView.makeItem = MakePackageListViewItem;
+				_packageListView.bindItem = BindPackageListViewItem;
+#if UNITY_2020_1_OR_NEWER
+				_packageListView.onSelectionChange += PackageListView_onSelectionChange;
+#else
+				_packageListView.onSelectionChanged += PackageListView_onSelectionChange;
+#endif
+
+				// 包裹添加删除按钮
+				var packageAddContainer = root.Q("PackageAddContainer");
 				{
-					AssetBundleCollectorSettingData.ModifyAddressable(evt.newValue);
+					var addBtn = packageAddContainer.Q<Button>("AddBtn");
+					addBtn.clicked += AddPackageBtn_clicked;
+					var removeBtn = packageAddContainer.Q<Button>("RemoveBtn");
+					removeBtn.clicked += RemovePackageBtn_clicked;
+				}
+
+				// 包裹名称
+				_packageNameTxt = root.Q<TextField>("PackageName");
+				_packageNameTxt.RegisterValueChangedCallback(evt =>
+				{
+					var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
+					if (selectPackage != null)
+					{
+						selectPackage.PackageName = evt.newValue;
+						AssetBundleCollectorSettingData.ModifyPackage(selectPackage);
+						FillPackageViewData();
+					}
 				});
-				_autoCollectShaderToogle = root.Q<Toggle>("AutoCollectShader");
-				_autoCollectShaderToogle.RegisterValueChangedCallback(evt =>
+
+				// 包裹备注
+				_packageDescTxt = root.Q<TextField>("PackageDesc");
+				_packageDescTxt.RegisterValueChangedCallback(evt =>
 				{
-					AssetBundleCollectorSettingData.ModifyShader(evt.newValue, _shaderBundleNameTxt.value);
-					_shaderBundleNameTxt.SetEnabled(evt.newValue);
-				});
-				_shaderBundleNameTxt = root.Q<TextField>("ShaderBundleName");
-				_shaderBundleNameTxt.RegisterValueChangedCallback(evt =>
+					var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
+					if (selectPackage != null)
 					{
-					AssetBundleCollectorSettingData.ModifyShader(_autoCollectShaderToogle.value, evt.newValue);
+						selectPackage.PackageDesc = evt.newValue;
+						AssetBundleCollectorSettingData.ModifyPackage(selectPackage);
+						FillPackageViewData();
+					}
 				});
 
 				// 分组列表相关
@@ -110,11 +191,13 @@ namespace YooAsset.Editor
 				_groupNameTxt = root.Q<TextField>("GroupName");
 				_groupNameTxt.RegisterValueChangedCallback(evt =>
 				{
+					var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
 					var selectGroup = _groupListView.selectedItem as AssetBundleCollectorGroup;
-					if (selectGroup != null)
+					if (selectPackage != null && selectGroup != null)
 					{
 						selectGroup.GroupName = evt.newValue;
-						AssetBundleCollectorSettingData.ModifyGroup(selectGroup);
+						AssetBundleCollectorSettingData.ModifyGroup(selectPackage, selectGroup);
+						FillGroupViewData();
 					}
 				});
 
@@ -122,11 +205,13 @@ namespace YooAsset.Editor
 				_groupDescTxt = root.Q<TextField>("GroupDesc");
 				_groupDescTxt.RegisterValueChangedCallback(evt =>
 				{
+					var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
 					var selectGroup = _groupListView.selectedItem as AssetBundleCollectorGroup;
-					if (selectGroup != null)
+					if (selectPackage != null && selectGroup != null)
 					{
 						selectGroup.GroupDesc = evt.newValue;
-						AssetBundleCollectorSettingData.ModifyGroup(selectGroup);
+						AssetBundleCollectorSettingData.ModifyGroup(selectPackage, selectGroup);
+						FillGroupViewData();
 					}
 				});
 
@@ -134,14 +219,18 @@ namespace YooAsset.Editor
 				_groupAssetTagsTxt = root.Q<TextField>("GroupAssetTags");
 				_groupAssetTagsTxt.RegisterValueChangedCallback(evt =>
 				{
+					var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
 					var selectGroup = _groupListView.selectedItem as AssetBundleCollectorGroup;
-					if (selectGroup != null)
+					if (selectPackage != null && selectGroup != null)
 					{
 						selectGroup.AssetTags = evt.newValue;
-						AssetBundleCollectorSettingData.ModifyGroup(selectGroup);
+						AssetBundleCollectorSettingData.ModifyGroup(selectPackage, selectGroup);
 					}
 				});
 
+				// 收集列表容器
+				_collectorContainer = root.Q("CollectorContainer");
+
 				// 收集列表相关
 				_collectorScrollView = root.Q<ScrollView>("CollectorScrollView");
 				_collectorScrollView.style.height = new Length(100, LengthUnit.Percent);
@@ -154,6 +243,28 @@ namespace YooAsset.Editor
 					addBtn.clicked += AddCollectorBtn_clicked;
 				}
 
+				// 分组激活规则
+				var activeRuleContainer = root.Q("ActiveRuleContainer");
+				{
+					_activeRulePopupField = new PopupField<RuleDisplayName>("Active Rule", _activeRuleList, 0);
+					_activeRulePopupField.name = "ActiveRuleMaskField";
+					_activeRulePopupField.style.unityTextAlign = TextAnchor.MiddleLeft;
+					_activeRulePopupField.formatListItemCallback = FormatListItemCallback;
+					_activeRulePopupField.formatSelectedValueCallback = FormatSelectedValueCallback;
+					_activeRulePopupField.RegisterValueChangedCallback(evt =>
+					{
+						var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
+						var selectGroup = _groupListView.selectedItem as AssetBundleCollectorGroup;
+						if (selectPackage != null && selectGroup != null)
+						{
+							selectGroup.ActiveRuleName = evt.newValue.ClassName;
+							AssetBundleCollectorSettingData.ModifyGroup(selectPackage, selectGroup);
+							FillGroupViewData();
+						}
+					});
+					activeRuleContainer.Add(_activeRulePopupField);
+				}
+
 				// 刷新窗体
 				RefreshWindow();
 			}
@@ -164,19 +275,45 @@ namespace YooAsset.Editor
 		}
 		public void OnDestroy()
 		{
+			// 注意：清空所有撤销操作
+			Undo.ClearAll();
+
 			if (AssetBundleCollectorSettingData.IsDirty)
 				AssetBundleCollectorSettingData.SaveFile();
 		}
+		public void Update()
+		{
+			if (_saveButton != null)
+			{
+				if (AssetBundleCollectorSettingData.IsDirty)
+				{
+					if (_saveButton.enabledSelf == false)
+						_saveButton.SetEnabled(true);
+				}
+				else
+				{
+					if (_saveButton.enabledSelf)
+						_saveButton.SetEnabled(false);
+				}
+			}
+		}
 
 		private void RefreshWindow()
 		{
+			_showPackageToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.ShowPackageView);
 			_enableAddressableToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.EnableAddressable);
-			_autoCollectShaderToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.AutoCollectShaders);
-			_shaderBundleNameTxt.SetEnabled(AssetBundleCollectorSettingData.Setting.AutoCollectShaders);
-			_shaderBundleNameTxt.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.ShadersBundleName);
-			_groupContainer.visible = false;
+			_uniqueBundleNameToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.UniqueBundleName);
+			_showEditorAliasToggle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.ShowEditorAlias);
 
-			FillGroupViewData();
+			_groupContainer.visible = false;
+			_collectorContainer.visible = false;
+
+			FillPackageViewData();
+		}
+		private void FixBtn_clicked()
+		{
+			AssetBundleCollectorSettingData.FixFile();
+			RefreshWindow();
 		}
 		private void ExportBtn_clicked()
 		{
@@ -195,14 +332,117 @@ namespace YooAsset.Editor
 				RefreshWindow();
 			}
 		}
+		private void SaveBtn_clicked()
+		{
+			AssetBundleCollectorSettingData.SaveFile();
+		}
+		private string FormatListItemCallback(RuleDisplayName ruleDisplayName)
+		{
+			if (_showEditorAliasToggle.value)
+				return ruleDisplayName.DisplayName;
+			else
+				return ruleDisplayName.ClassName;
+		}
+		private string FormatSelectedValueCallback(RuleDisplayName ruleDisplayName)
+		{
+			if (_showEditorAliasToggle.value)
+				return ruleDisplayName.DisplayName;
+			else
+				return ruleDisplayName.ClassName;
+		}
+
+		// 包裹列表相关
+		private void FillPackageViewData()
+		{
+			_packageListView.Clear();
+			_packageListView.ClearSelection();
+			_packageListView.itemsSource = AssetBundleCollectorSettingData.Setting.Packages;
+			_packageListView.Rebuild();
+
+			if (_lastModifyPackageIndex >= 0 && _lastModifyPackageIndex < _packageListView.itemsSource.Count)
+			{
+				_packageListView.selectedIndex = _lastModifyPackageIndex;
+			}
+
+			if (_showPackageToogle.value)
+				_packageContainer.style.display = DisplayStyle.Flex;
+			else
+				_packageContainer.style.display = DisplayStyle.None;
+		}
+		private VisualElement MakePackageListViewItem()
+		{
+			VisualElement element = new VisualElement();
+
+			{
+				var label = new Label();
+				label.name = "Label1";
+				label.style.unityTextAlign = TextAnchor.MiddleLeft;
+				label.style.flexGrow = 1f;
+				label.style.height = 20f;
+				element.Add(label);
+			}
+
+			return element;
+		}
+		private void BindPackageListViewItem(VisualElement element, int index)
+		{
+			var package = AssetBundleCollectorSettingData.Setting.Packages[index];
+
+			var textField1 = element.Q<Label>("Label1");
+			if (string.IsNullOrEmpty(package.PackageDesc))
+				textField1.text = package.PackageName;
+			else
+				textField1.text = $"{package.PackageName} ({package.PackageDesc})";
+		}
+		private void PackageListView_onSelectionChange(IEnumerable<object> objs)
+		{
+			var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
+			if (selectPackage == null)
+			{
+				_groupContainer.visible = false;
+				_collectorContainer.visible = false;
+				return;
+			}
+
+			_groupContainer.visible = true;
+			_lastModifyPackageIndex = _packageListView.selectedIndex;
+			_packageNameTxt.SetValueWithoutNotify(selectPackage.PackageName);
+			_packageDescTxt.SetValueWithoutNotify(selectPackage.PackageDesc);
+			FillGroupViewData();
+		}
+		private void AddPackageBtn_clicked()
+		{
+			Undo.RecordObject(AssetBundleCollectorSettingData.Setting, "YooAsset.AssetBundleCollectorWindow AddPackage");
+			AssetBundleCollectorSettingData.CreatePackage("DefaultPackage");
+			FillPackageViewData();
+		}
+		private void RemovePackageBtn_clicked()
+		{
+			var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
+			if (selectPackage == null)
+				return;
+
+			Undo.RecordObject(AssetBundleCollectorSettingData.Setting, "YooAsset.AssetBundleCollectorWindow RemovePackage");
+			AssetBundleCollectorSettingData.RemovePackage(selectPackage);
+			FillPackageViewData();
+		}
 
 		// 分组列表相关
 		private void FillGroupViewData()
 		{
+			var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
+			if (selectPackage == null)
+				return;
+
 			_groupListView.Clear();
 			_groupListView.ClearSelection();
-			_groupListView.itemsSource = AssetBundleCollectorSettingData.Setting.Groups;
+			_groupListView.itemsSource = selectPackage.Groups;
 			_groupListView.Rebuild();
+
+			if (_lastModifyGroupIndex >= 0 && _lastModifyGroupIndex < _groupListView.itemsSource.Count)
+			{
+				_groupListView.selectedIndex = _lastModifyGroupIndex;
+			}
 		}
 		private VisualElement MakeGroupListViewItem()
 		{
@@ -221,34 +461,63 @@ namespace YooAsset.Editor
 		}
 		private void BindGroupListViewItem(VisualElement element, int index)
 		{
-			var group = AssetBundleCollectorSettingData.Setting.Groups[index];
+			var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
+			if (selectPackage == null)
+				return;
+
+			var group = selectPackage.Groups[index];
 
-			// Group Name
 			var textField1 = element.Q<Label>("Label1");
 			if (string.IsNullOrEmpty(group.GroupDesc))
 				textField1.text = group.GroupName;
 			else
 				textField1.text = $"{group.GroupName} ({group.GroupDesc})";
+
+			// 激活状态
+			IActiveRule activeRule = AssetBundleCollectorSettingData.GetActiveRuleInstance(group.ActiveRuleName);
+			bool isActive = activeRule.IsActiveGroup();
+			textField1.SetEnabled(isActive);
 		}
 		private void GroupListView_onSelectionChange(IEnumerable<object> objs)
 		{
+			var selectGroup = _groupListView.selectedItem as AssetBundleCollectorGroup;
+			if (selectGroup == null)
+			{
+				_collectorContainer.visible = false;
+				return;
+			}
+
+			_collectorContainer.visible = true;
+			_lastModifyGroupIndex = _groupListView.selectedIndex;
+			_activeRulePopupField.SetValueWithoutNotify(GetActiveRuleIndex(selectGroup.ActiveRuleName));
+			_groupNameTxt.SetValueWithoutNotify(selectGroup.GroupName);
+			_groupDescTxt.SetValueWithoutNotify(selectGroup.GroupDesc);
+			_groupAssetTagsTxt.SetValueWithoutNotify(selectGroup.AssetTags);
+
 			FillCollectorViewData();
 		}
 		private void AddGroupBtn_clicked()
 		{
-			Undo.RecordObject(AssetBundleCollectorSettingData.Setting, "YooAsset AddGroup");
-			AssetBundleCollectorSettingData.CreateGroup("Default Group");
+			var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
+			if (selectPackage == null)
+				return;
+
+			Undo.RecordObject(AssetBundleCollectorSettingData.Setting, "YooAsset.AssetBundleCollectorWindow AddGroup");
+			AssetBundleCollectorSettingData.CreateGroup(selectPackage, "Default Group");
 			FillGroupViewData();
 		}
 		private void RemoveGroupBtn_clicked()
 		{
+			var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
+			if (selectPackage == null)
+				return;
+
 			var selectGroup = _groupListView.selectedItem as AssetBundleCollectorGroup;
 			if (selectGroup == null)
 				return;
 
-			Undo.RecordObject(AssetBundleCollectorSettingData.Setting, "YooAsset RemoveGroup");
-
-			AssetBundleCollectorSettingData.RemoveGroup(selectGroup);
+			Undo.RecordObject(AssetBundleCollectorSettingData.Setting, "YooAsset.AssetBundleCollectorWindow RemoveGroup");
+			AssetBundleCollectorSettingData.RemoveGroup(selectPackage, selectGroup);
 			FillGroupViewData();
 		}
 
@@ -257,15 +526,7 @@ namespace YooAsset.Editor
 		{
 			var selectGroup = _groupListView.selectedItem as AssetBundleCollectorGroup;
 			if (selectGroup == null)
-			{
-				_groupContainer.visible = false;
 				return;
-			}
-
-			_groupContainer.visible = true;
-			_groupNameTxt.SetValueWithoutNotify(selectGroup.GroupName);
-			_groupDescTxt.SetValueWithoutNotify(selectGroup.GroupDesc);
-			_groupAssetTagsTxt.SetValueWithoutNotify(selectGroup.AssetTags);
 
 			// 填充数据
 			_collectorScrollView.Clear();
@@ -332,26 +593,35 @@ namespace YooAsset.Editor
 			}
 			if (_enableAddressableToogle.value)
 			{
-				var popupField = new PopupField<string>(_addressRuleList, 0);
+				var popupField = new PopupField<RuleDisplayName>(_addressRuleList, 0);
 				popupField.name = "PopupField1";
 				popupField.style.unityTextAlign = TextAnchor.MiddleLeft;
-				popupField.style.width = 200;
+				popupField.style.width = 220;
 				elementBottom.Add(popupField);
 			}
 			{
-				var popupField = new PopupField<string>(_packRuleList, 0);
+				var popupField = new PopupField<RuleDisplayName>(_packRuleList, 0);
 				popupField.name = "PopupField2";
 				popupField.style.unityTextAlign = TextAnchor.MiddleLeft;
-				popupField.style.width = 150;
+				popupField.style.width = 220;
 				elementBottom.Add(popupField);
 			}
 			{
-				var popupField = new PopupField<string>(_filterRuleList, 0);
+				var popupField = new PopupField<RuleDisplayName>(_filterRuleList, 0);
 				popupField.name = "PopupField3";
 				popupField.style.unityTextAlign = TextAnchor.MiddleLeft;
 				popupField.style.width = 150;
 				elementBottom.Add(popupField);
 			}
+			{
+				var textField = new TextField();
+				textField.name = "TextField0";
+				textField.label = "UserData";
+				textField.style.width = 200;
+				elementBottom.Add(textField);
+				var label = textField.Q<Label>();
+				label.style.minWidth = 63;
+			}
 			{
 				var textField = new TextField();
 				textField.name = "TextField1";
@@ -421,6 +691,7 @@ namespace YooAsset.Editor
 			objectField1.RegisterValueChangedCallback(evt =>
 			{
 				collector.CollectPath = AssetDatabase.GetAssetPath(evt.newValue);
+				collector.CollectorGUID = AssetDatabase.AssetPathToGUID(collector.CollectPath);
 				objectField1.value.name = collector.CollectPath;
 				AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
 				if (foldout.value)
@@ -434,7 +705,7 @@ namespace YooAsset.Editor
 			popupField0.index = GetCollectorTypeIndex(collector.CollectorType.ToString());
 			popupField0.RegisterValueChangedCallback(evt =>
 			{
-				collector.CollectorType = StringUtility.NameToEnum<ECollectorType>(evt.newValue);
+				collector.CollectorType = EditorTools.NameToEnum<ECollectorType>(evt.newValue);
 				AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
 				if (foldout.value)
 				{
@@ -443,13 +714,15 @@ namespace YooAsset.Editor
 			});
 
 			// Address Rule
-			var popupField1 = element.Q<PopupField<string>>("PopupField1");
+			var popupField1 = element.Q<PopupField<RuleDisplayName>>("PopupField1");
 			if (popupField1 != null)
 			{
 				popupField1.index = GetAddressRuleIndex(collector.AddressRuleName);
+				popupField1.formatListItemCallback = FormatListItemCallback;
+				popupField1.formatSelectedValueCallback = FormatSelectedValueCallback;
 				popupField1.RegisterValueChangedCallback(evt =>
 				{
-					collector.AddressRuleName = evt.newValue;
+					collector.AddressRuleName = evt.newValue.ClassName;
 					AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
 					if (foldout.value)
 					{
@@ -459,11 +732,13 @@ namespace YooAsset.Editor
 			}
 
 			// Pack Rule
-			var popupField2 = element.Q<PopupField<string>>("PopupField2");
+			var popupField2 = element.Q<PopupField<RuleDisplayName>>("PopupField2");
 			popupField2.index = GetPackRuleIndex(collector.PackRuleName);
+			popupField2.formatListItemCallback = FormatListItemCallback;
+			popupField2.formatSelectedValueCallback = FormatSelectedValueCallback;
 			popupField2.RegisterValueChangedCallback(evt =>
 			{
-				collector.PackRuleName = evt.newValue;
+				collector.PackRuleName = evt.newValue.ClassName;
 				AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
 				if (foldout.value)
 				{
@@ -472,11 +747,13 @@ namespace YooAsset.Editor
 			});
 
 			// Filter Rule
-			var popupField3 = element.Q<PopupField<string>>("PopupField3");
+			var popupField3 = element.Q<PopupField<RuleDisplayName>>("PopupField3");
 			popupField3.index = GetFilterRuleIndex(collector.FilterRuleName);
+			popupField3.formatListItemCallback = FormatListItemCallback;
+			popupField3.formatSelectedValueCallback = FormatSelectedValueCallback;
 			popupField3.RegisterValueChangedCallback(evt =>
 			{
-				collector.FilterRuleName = evt.newValue;
+				collector.FilterRuleName = evt.newValue.ClassName;
 				AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
 				if (foldout.value)
 				{
@@ -484,6 +761,15 @@ namespace YooAsset.Editor
 				}
 			});
 
+			// UserData
+			var textFiled0 = element.Q<TextField>("TextField0");
+			textFiled0.SetValueWithoutNotify(collector.UserData);
+			textFiled0.RegisterValueChangedCallback(evt =>
+			{
+				collector.UserData = evt.newValue;
+				AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
+			});
+
 			// Tags
 			var textFiled1 = element.Q<TextField>("TextField1");
 			textFiled1.SetValueWithoutNotify(collector.AssetTags);
@@ -510,7 +796,8 @@ namespace YooAsset.Editor
 
 				try
 				{
-					collectAssetInfos = collector.GetAllCollectAssets(group);
+					CollectCommand command = new CollectCommand(EBuildMode.SimulateBuild, _packageNameTxt.value, _enableAddressableToogle.value, _uniqueBundleNameToogle.value);
+					collectAssetInfos = collector.GetAllCollectAssets(command, group);
 				}
 				catch (System.Exception e)
 				{
@@ -527,12 +814,7 @@ namespace YooAsset.Editor
 
 						string showInfo = collectAssetInfo.AssetPath;
 						if (_enableAddressableToogle.value)
-						{
-							IAddressRule instance = AssetBundleCollectorSettingData.GetAddressRuleInstance(collector.AddressRuleName);
-							AddressRuleData ruleData = new AddressRuleData(collectAssetInfo.AssetPath, collector.CollectPath, group.GroupName);
-							string addressValue = instance.GetAssetAddress(ruleData);
-							showInfo = $"[{addressValue}] {showInfo}";
-						}
+							showInfo = $"[{collectAssetInfo.Address}] {collectAssetInfo.AssetPath}";
 
 						var label = new Label();
 						label.text = showInfo;
@@ -550,7 +832,9 @@ namespace YooAsset.Editor
 			if (selectGroup == null)
 				return;
 
-			AssetBundleCollectorSettingData.CreateCollector(selectGroup, string.Empty);
+			Undo.RecordObject(AssetBundleCollectorSettingData.Setting, "YooAsset.AssetBundleCollectorWindow AddCollector");
+			AssetBundleCollector collector = new AssetBundleCollector();
+			AssetBundleCollectorSettingData.CreateCollector(selectGroup, collector);
 			FillCollectorViewData();
 		}
 		private void RemoveCollectorBtn_clicked(AssetBundleCollector selectCollector)
@@ -560,6 +844,8 @@ namespace YooAsset.Editor
 				return;
 			if (selectCollector == null)
 				return;
+
+			Undo.RecordObject(AssetBundleCollectorSettingData.Setting, "YooAsset.AssetBundleCollectorWindow RemoveCollector");
 			AssetBundleCollectorSettingData.RemoveCollector(selectGroup, selectCollector);
 			FillCollectorViewData();
 		}
@@ -577,7 +863,7 @@ namespace YooAsset.Editor
 		{
 			for (int i = 0; i < _addressRuleList.Count; i++)
 			{
-				if (_addressRuleList[i] == ruleName)
+				if (_addressRuleList[i].ClassName == ruleName)
 					return i;
 			}
 			return 0;
@@ -586,7 +872,7 @@ namespace YooAsset.Editor
 		{
 			for (int i = 0; i < _packRuleList.Count; i++)
 			{
-				if (_packRuleList[i] == ruleName)
+				if (_packRuleList[i].ClassName == ruleName)
 					return i;
 			}
 			return 0;
@@ -595,11 +881,20 @@ namespace YooAsset.Editor
 		{
 			for (int i = 0; i < _filterRuleList.Count; i++)
 			{
-				if (_filterRuleList[i] == ruleName)
+				if (_filterRuleList[i].ClassName == ruleName)
 					return i;
 			}
 			return 0;
 		}
+		private RuleDisplayName GetActiveRuleIndex(string ruleName)
+		{
+			for (int i = 0; i < _activeRuleList.Count; i++)
+			{
+				if (_activeRuleList[i].ClassName == ruleName)
+					return _activeRuleList[i];
+			}
+			return _activeRuleList[0];
+		}
 	}
 }
 #endif

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.uxml

@@ -1,23 +1,38 @@
-<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements">
     <uie:Toolbar name="Toolbar" style="display: flex; flex-direction: row-reverse;">
+        <ui:Button text="Save" display-tooltip-when-elided="true" name="SaveButton" style="width: 50px; background-color: rgb(56, 147, 58);" />
         <ui:Button text="导出" display-tooltip-when-elided="true" name="ExportButton" style="width: 50px; background-color: rgb(56, 147, 58);" />
         <ui:Button text="导入" display-tooltip-when-elided="true" name="ImportButton" style="width: 50px; background-color: rgb(56, 147, 58);" />
+        <ui:Button text="修复" display-tooltip-when-elided="true" name="FixButton" style="width: 50px; background-color: rgb(56, 147, 58);" />
     </uie:Toolbar>
+    <ui:VisualElement name="PublicContainer" style="height: 30px; background-color: rgb(67, 67, 67); flex-direction: row; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">
+        <ui:Toggle label="Show Packages" name="ShowPackages" style="width: 196px; -unity-text-align: middle-left;" />
+        <ui:Toggle label="Show Editor Alias" name="ShowEditorAlias" style="width: 196px; -unity-text-align: middle-left;" />
+        <ui:Toggle label="Enable Addressable" name="EnableAddressable" style="width: 196px; -unity-text-align: middle-left;" />
+        <ui:Toggle label="Unique Bundle Name" name="UniqueBundleName" style="width: 196px; -unity-text-align: middle-left;" />
+    </ui:VisualElement>
     <ui:VisualElement name="ContentContainer" style="flex-grow: 1; flex-direction: row;">
-        <ui:VisualElement name="LeftContainer" style="width: 200px; flex-grow: 0; background-color: rgb(67, 67, 67); border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">
+        <ui:VisualElement name="PackageContainer" style="width: 200px; flex-grow: 0; background-color: rgb(67, 67, 67); border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">
+            <ui:Label text="Packages" display-tooltip-when-elided="true" name="PackageTitle" style="background-color: rgb(89, 89, 89); -unity-text-align: upper-center; -unity-font-style: bold; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px; font-size: 12px;" />
+            <ui:ListView focusable="true" name="PackageListView" item-height="20" virtualization-method="DynamicHeight" style="flex-grow: 1;" />
+            <ui:VisualElement name="PackageAddContainer" style="height: 20px; flex-direction: row; justify-content: center;">
+                <ui:Button text=" - " display-tooltip-when-elided="true" name="RemoveBtn" />
+                <ui:Button text=" + " display-tooltip-when-elided="true" name="AddBtn" />
+            </ui:VisualElement>
+        </ui:VisualElement>
+        <ui:VisualElement name="GroupContainer" style="width: 200px; flex-grow: 0; background-color: rgb(67, 67, 67); border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">
+            <ui:Label text="Groups" display-tooltip-when-elided="true" name="GroupTitle" style="background-color: rgb(89, 89, 89); -unity-text-align: upper-center; -unity-font-style: bold; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px; font-size: 12px;" />
+            <ui:TextField picking-mode="Ignore" label="Package Name" value="filler text" name="PackageName" style="flex-direction: column;" />
+            <ui:TextField picking-mode="Ignore" label="Package Desc" value="filler text" name="PackageDesc" style="flex-direction: column;" />
             <ui:ListView focusable="true" name="GroupListView" item-height="20" virtualization-method="DynamicHeight" style="flex-grow: 1;" />
             <ui:VisualElement name="GroupAddContainer" style="height: 20px; flex-direction: row; justify-content: center;">
                 <ui:Button text=" - " display-tooltip-when-elided="true" name="RemoveBtn" />
                 <ui:Button text=" + " display-tooltip-when-elided="true" name="AddBtn" />
             </ui:VisualElement>
         </ui:VisualElement>
-        <ui:VisualElement name="RightContainer" style="flex-direction: column; flex-grow: 1;">
-            <ui:VisualElement name="PublicContainer" style="height: 30px; background-color: rgb(67, 67, 67); flex-direction: row; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">
-                <ui:Toggle label="Enable Addressable" name="EnableAddressable" style="width: 196px; -unity-text-align: middle-left;" />
-                <ui:Toggle label="Auto Collect Shaders" name="AutoCollectShader" style="width: 196px; -unity-text-align: middle-left;" />
-                <ui:TextField picking-mode="Ignore" label="Shader Bundle Name" name="ShaderBundleName" style="flex-grow: 1; -unity-text-align: middle-left;" />
-            </ui:VisualElement>
-            <ui:VisualElement name="GroupContainer" style="flex-grow: 1; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">
+        <ui:VisualElement name="CollectorContainer" style="flex-grow: 1; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">
+            <ui:Label text="Collectors" display-tooltip-when-elided="true" name="CollectorTitle" style="background-color: rgb(89, 89, 89); -unity-text-align: upper-center; -unity-font-style: bold; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px; font-size: 12px;" />
+            <ui:VisualElement name="ActiveRuleContainer" style="height: 20px;" />
             <ui:TextField picking-mode="Ignore" label="Group Name" name="GroupName" />
             <ui:TextField picking-mode="Ignore" label="Group Desc" name="GroupDesc" />
             <ui:TextField picking-mode="Ignore" label="Group Asset Tags" name="GroupAssetTags" />
@@ -27,5 +42,4 @@
             <ui:ScrollView name="CollectorScrollView" style="flex-grow: 1;" />
         </ui:VisualElement>
     </ui:VisualElement>
-    </ui:VisualElement>
 </ui:UXML>

Assets/YooAsset/Editor/AssetBundleCollector/CollectAssetInfo.cs

@@ -25,30 +25,30 @@ namespace YooAsset.Editor
 		/// </summary>
 		public string AssetPath { private set; get; }
 
-		/// <summary>
-		/// 资源分类标签
-		/// </summary>
-		public List<string> AssetTags { private set; get; }
-
 		/// <summary>
 		/// 是否为原生资源
 		/// </summary>
 		public bool IsRawAsset { private set; get; }
 
+		/// <summary>
+		/// 资源分类标签
+		/// </summary>
+		public List<string> AssetTags { private set; get; }
+
 		/// <summary>
 		/// 依赖的资源列表
 		/// </summary>
 		public List<string> DependAssets = new List<string>();
 
 
-		public CollectAssetInfo(ECollectorType collectorType, string bundleName, string address, string assetPath, List<string> assetTags, bool isRawAsset)
+		public CollectAssetInfo(ECollectorType collectorType, string bundleName, string address, string assetPath, bool isRawAsset, List<string> assetTags)
 		{
 			CollectorType = collectorType;
 			BundleName = bundleName;
 			Address = address;
 			AssetPath = assetPath;
-			AssetTags = assetTags;
 			IsRawAsset = isRawAsset;
+			AssetTags = assetTags;		
 		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleCollector/CollectCommand.cs

@@ -0,0 +1,44 @@
+
+namespace YooAsset.Editor
+{
+	public class CollectCommand
+	{
+		/// <summary>
+		/// 构建模式
+		/// </summary>
+		public EBuildMode BuildMode { private set; get; }
+
+		/// <summary>
+		/// 包裹名称
+		/// </summary>
+		public string PackageName { private set; get; }
+
+		/// <summary>
+		/// 是否启用可寻址资源定位
+		/// </summary>
+		public bool EnableAddressable { private set; get; }
+
+		/// <summary>
+		/// 资源包名唯一化
+		/// </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/CollectCommand.cs.meta

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

Assets/YooAsset/Editor/AssetBundleCollector/CollectResult.cs

@@ -0,0 +1,27 @@
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset.Editor
+{
+	public class CollectResult
+	{
+		/// <summary>
+		/// 收集命令
+		/// </summary>
+		public CollectCommand Command { private set; get; }
+
+		/// <summary>
+		/// 收集的资源信息列表
+		/// </summary>
+		public List<CollectAssetInfo> CollectAssets { private set; get; }
+
+		public CollectResult(CollectCommand command)
+		{
+			Command = command;
+		}
+		public void SetCollectAssets(List<CollectAssetInfo> collectAssets)
+		{
+			CollectAssets = collectAssets;
+		}
+	}
+}

Assets/YooAsset/Editor/AssetBundleCollector/CollectResult.cs.meta

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

Assets/YooAsset/Editor/AssetBundleCollector/DefaultActiveRule.cs

@@ -0,0 +1,21 @@
+
+namespace YooAsset.Editor
+{
+	[DisplayName("启用分组")]
+	public class EnableGroup : IActiveRule
+	{
+		public bool IsActiveGroup()
+		{
+			return true;
+		}
+	}
+
+	[DisplayName("禁用分组")]
+	public class DisableGroup : IActiveRule
+	{
+		public bool IsActiveGroup()
+		{
+			return false;
+		}
+	}
+}

Assets/YooAsset/Editor/AssetBundleCollector/DefaultActiveRule.cs.meta

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

Assets/YooAsset/Editor/AssetBundleCollector/DefaultAddressRule.cs

@@ -2,9 +2,7 @@
 
 namespace YooAsset.Editor
 {
-	/// <summary>
-	/// 以文件名为定位地址
-	/// </summary>
+	[DisplayName("定位地址: 文件名")]
 	public class AddressByFileName : IAddressRule
 	{
 		string IAddressRule.GetAssetAddress(AddressRuleData data)
@@ -13,9 +11,16 @@ namespace YooAsset.Editor
 		}
 	}
 
-	/// <summary>
-	/// 以组名+文件名为定位地址
-	/// </summary>
+	[DisplayName("定位地址: 文件路径")]
+	public class AddressByFilePath : IAddressRule
+	{
+		string IAddressRule.GetAssetAddress(AddressRuleData data)
+		{
+			return data.AssetPath;
+		}
+	}
+
+	[DisplayName("定位地址: 分组名+文件名")]
 	public class AddressByGroupAndFileName : IAddressRule
 	{
 		string IAddressRule.GetAssetAddress(AddressRuleData data)
@@ -25,16 +30,14 @@ namespace YooAsset.Editor
 		}
 	}
 
-	/// <summary>
-	/// 以收集器名+文件名为定位地址
-	/// </summary>
-	public class AddressByCollectorAndFileName : IAddressRule
+	[DisplayName("定位地址: 文件夹名+文件名")]
+	public class AddressByFolderAndFileName : IAddressRule
 	{
 		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,12 +1,28 @@
-using UnityEngine;
-using UnityEditor;
+using System.Collections;
+using System.Collections.Generic;
 using System.IO;
+using UnityEngine;
+using UnityEditor;
 
 namespace YooAsset.Editor
+{
+	public class DefaultFilterRule
 	{
 		/// <summary>
-	/// 收集所有资源
+		/// 忽略的文件类型
 		/// </summary>
+		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("收集所有资源")]
 	public class CollectAll : IFilterRule
 	{
 		public bool IsCollectAsset(FilterRuleData data)
@@ -15,9 +31,7 @@ namespace YooAsset.Editor
 		}
 	}
 
-	/// <summary>
-	/// 只收集场景
-	/// </summary>
+	[DisplayName("收集场景")]
 	public class CollectScene : IFilterRule
 	{
 		public bool IsCollectAsset(FilterRuleData data)
@@ -26,9 +40,7 @@ namespace YooAsset.Editor
 		}
 	}
 
-	/// <summary>
-	/// 只收集预制体
-	/// </summary>
+	[DisplayName("收集预制体")]
 	public class CollectPrefab : IFilterRule
 	{
 		public bool IsCollectAsset(FilterRuleData data)
@@ -37,17 +49,33 @@ namespace YooAsset.Editor
 		}
 	}
 
-	/// <summary>
-	/// 只收集精灵类型的资源
-	/// </summary>
+	[DisplayName("收集精灵类型的纹理")]
 	public class CollectSprite : IFilterRule
 	{
 		public bool IsCollectAsset(FilterRuleData data)
 		{
-			if (AssetDatabase.GetMainAssetTypeAtPath(data.AssetPath) == typeof(Sprite))
+			var mainAssetType = AssetDatabase.GetMainAssetTypeAtPath(data.AssetPath);
+			if (mainAssetType == typeof(Texture2D))
+			{
+				var texImporter = AssetImporter.GetAtPath(data.AssetPath) as TextureImporter;
+				if (texImporter != null && texImporter.textureType == TextureImporterType.Sprite)
 					return true;
 				else
 					return false;
 			}
+			else
+			{
+				return false;
+			}
+		}
+	}
+
+	[DisplayName("收集着色器变种集合")]
+	public class CollectShaderVariants : IFilterRule
+	{
+		public bool IsCollectAsset(FilterRuleData data)
+		{
+			return Path.GetExtension(data.AssetPath) == ".shadervariants";
+		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleCollector/DefaultPackRule.cs

@@ -4,33 +4,72 @@ using UnityEditor;
 
 namespace YooAsset.Editor
 {
+	public class DefaultPackRule
+	{
+		/// <summary>
+		/// AssetBundle文件的后缀名
+		/// </summary>
+		public const string AssetBundleFileExtension = "bundle";
+
+		/// <summary>
+		/// 原生文件的后缀名
+		/// </summary>
+		public const string RawFileExtension = "rawfile";
+
+		/// <summary>
+		/// Unity着色器资源包名称
+		/// </summary>
+		public const string ShadersBundleName = "unityshaders";
+
+
+		public static PackRuleResult CreateShadersPackRuleResult()
+		{
+			PackRuleResult result = new PackRuleResult(ShadersBundleName, AssetBundleFileExtension);
+			return result;
+		}
+	}
+
 	/// <summary>
 	/// 以文件路径作为资源包名
 	/// 注意：每个文件独自打资源包
-	/// 例如：收集器路径为 "Assets/UIPanel"
-	/// 例如："Assets/UIPanel/Shop/Image/backgroud.png" --> "assets/uipanel/shop/image/backgroud.bundle"
-	/// 例如："Assets/UIPanel/Shop/View/main.prefab" --> "assets/uipanel/shop/view/main.bundle"
+	/// 例如："Assets/UIPanel/Shop/Image/backgroud.png" --> "assets_uipanel_shop_image_backgroud.bundle"
+	/// 例如："Assets/UIPanel/Shop/View/main.prefab" --> "assets_uipanel_shop_view_main.bundle"
 	/// </summary>
+	[DisplayName("资源包名: 文件路径")]
 	public class PackSeparately : IPackRule
 	{
-		string IPackRule.GetBundleName(PackRuleData data)
+		PackRuleResult IPackRule.GetPackRuleResult(PackRuleData data)
 		{
-			return StringUtility.RemoveExtension(data.AssetPath);
+			string bundleName = PathUtility.RemoveExtension(data.AssetPath);
+			PackRuleResult result = new PackRuleResult(bundleName, DefaultPackRule.AssetBundleFileExtension);
+			return result;
+		}
+
+		bool IPackRule.IsRawFilePackRule()
+		{
+			return false;
 		}
 	}
 
 	/// <summary>
 	/// 以父类文件夹路径作为资源包名
 	/// 注意：文件夹下所有文件打进一个资源包
-	/// 例如：收集器路径为 "Assets/UIPanel"
-	/// 例如："Assets/UIPanel/Shop/Image/backgroud.png" --> "assets/uipanel/shop/image.bundle"
-	/// 例如："Assets/UIPanel/Shop/View/main.prefab" --> "assets/uipanel/shop/view.bundle"
+	/// 例如："Assets/UIPanel/Shop/Image/backgroud.png" --> "assets_uipanel_shop_image.bundle"
+	/// 例如："Assets/UIPanel/Shop/View/main.prefab" --> "assets_uipanel_shop_view.bundle"
 	/// </summary>
+	[DisplayName("资源包名: 父类文件夹路径")]
 	public class PackDirectory : IPackRule
 	{
-		string IPackRule.GetBundleName(PackRuleData data)
+		PackRuleResult IPackRule.GetPackRuleResult(PackRuleData data)
 		{
-			return Path.GetDirectoryName(data.AssetPath);
+			string bundleName = Path.GetDirectoryName(data.AssetPath);
+			PackRuleResult result = new PackRuleResult(bundleName, DefaultPackRule.AssetBundleFileExtension);
+			return result;
+		}
+
+		bool IPackRule.IsRawFilePackRule()
+		{
+			return false;
 		}
 	}
 
@@ -38,12 +77,13 @@ namespace YooAsset.Editor
 	/// 以收集器路径下顶级文件夹为资源包名
 	/// 注意：文件夹下所有文件打进一个资源包
 	/// 例如：收集器路径为 "Assets/UIPanel"
-	/// 例如："Assets/UIPanel/Shop/Image/backgroud.png" --> "assets/uipanel/shop.bundle"
-	/// 例如："Assets/UIPanel/Shop/View/main.prefab" --> "assets/uipanel/shop.bundle"
+	/// 例如："Assets/UIPanel/Shop/Image/backgroud.png" --> "assets_uipanel_shop.bundle"
+	/// 例如："Assets/UIPanel/Shop/View/main.prefab" --> "assets_uipanel_shop.bundle"
 	/// </summary>
+	[DisplayName("资源包名: 收集器下顶级文件夹路径")]
 	public class PackTopDirectory : IPackRule
 	{
-		string IPackRule.GetBundleName(PackRuleData data)
+		PackRuleResult IPackRule.GetPackRuleResult(PackRuleData data)
 		{
 			string assetPath = data.AssetPath.Replace(data.CollectPath, string.Empty);
 			assetPath = assetPath.TrimStart('/');
@@ -53,24 +93,48 @@ namespace YooAsset.Editor
 				if (Path.HasExtension(splits[0]))
 					throw new Exception($"Not found root directory : {assetPath}");
 				string bundleName = $"{data.CollectPath}/{splits[0]}";
-				return bundleName;
+				PackRuleResult result = new PackRuleResult(bundleName, DefaultPackRule.AssetBundleFileExtension);
+				return result;
 			}
 			else
 			{
 				throw new Exception($"Not found root directory : {assetPath}");
 			}
 		}
+
+		bool IPackRule.IsRawFilePackRule()
+		{
+			return false;
+		}
 	}
 
 	/// <summary>
 	/// 以收集器路径作为资源包名
 	/// 注意：收集的所有文件打进一个资源包
 	/// </summary>
+	[DisplayName("资源包名: 收集器路径")]
 	public class PackCollector : IPackRule
 	{
-		string IPackRule.GetBundleName(PackRuleData data)
+		PackRuleResult IPackRule.GetPackRuleResult(PackRuleData data)
 		{
-			return StringUtility.RemoveExtension(data.CollectPath);
+			string bundleName;
+			string collectPath = data.CollectPath;
+			if (AssetDatabase.IsValidFolder(collectPath))
+			{
+				bundleName = collectPath;
+			}
+			else
+			{
+				bundleName = PathUtility.RemoveExtension(collectPath);
+			}
+
+			PackRuleResult result = new PackRuleResult(bundleName, DefaultPackRule.AssetBundleFileExtension);
+			return result;
+		}
+
+		bool IPackRule.IsRawFilePackRule()
+		{
+			return false;
 		}
 	}
 
@@ -78,37 +142,55 @@ namespace YooAsset.Editor
 	/// 以分组名称作为资源包名
 	/// 注意：收集的所有文件打进一个资源包
 	/// </summary>
+	[DisplayName("资源包名: 分组名称")]
 	public class PackGroup : IPackRule
 	{
-		string IPackRule.GetBundleName(PackRuleData data)
+		PackRuleResult IPackRule.GetPackRuleResult(PackRuleData data)
 		{
-			return data.GroupName;
+			string bundleName = data.GroupName;
+			PackRuleResult result = new PackRuleResult(bundleName, DefaultPackRule.AssetBundleFileExtension);
+			return result;
+		}
+
+		bool IPackRule.IsRawFilePackRule()
+		{
+			return false;
 		}
 	}
 
 	/// <summary>
-	/// 原生文件打包模式
-	/// 注意：原生文件打包支持：图片，音频，视频，文本
+	/// 打包原生文件
 	/// </summary>
+	[DisplayName("打包原生文件")]
 	public class PackRawFile : IPackRule
 	{
-		string IPackRule.GetBundleName(PackRuleData data)
+		PackRuleResult IPackRule.GetPackRuleResult(PackRuleData data)
 		{
-			string extension = StringUtility.RemoveFirstChar(Path.GetExtension(data.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())
-			{
-				throw new Exception($"{nameof(PackRawFile)} is not support file estension : {extension}");
+			string bundleName = data.AssetPath;
+			PackRuleResult result = new PackRuleResult(bundleName, DefaultPackRule.RawFileExtension);
+			return result;
 		}
 
-			// 注意：原生文件只支持无依赖关系的资源
-			string[] depends = AssetDatabase.GetDependencies(data.AssetPath, true);
-			if (depends.Length != 1)
-				throw new Exception($"{nameof(PackRawFile)} is not support estension : {extension}");
+		bool IPackRule.IsRawFilePackRule()
+		{
+			return true;
+		}
+	}
 
-			return StringUtility.RemoveExtension(data.AssetPath);
+	/// <summary>
+	/// 打包着色器变种集合
+	/// </summary>
+	[DisplayName("打包着色器变种集合文件")]
+	public class PackShaderVariants : IPackRule
+	{
+		public PackRuleResult GetPackRuleResult(PackRuleData data)
+		{
+			return DefaultPackRule.CreateShadersPackRuleResult();
+		}
+
+		bool IPackRule.IsRawFilePackRule()
+		{
+			return false;
 		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleCollector/DefaultShareAssetPackRule.cs

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

Assets/YooAsset/Editor/AssetBundleCollector/DefaultShareAssetPackRule.cs.meta

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

Assets/YooAsset/Editor/AssetBundleCollector/DisplayNameAttribute.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Reflection;
+
+namespace YooAsset.Editor
+{
+	/// <summary>
+	/// 编辑器显示名字
+	/// </summary>
+	public class DisplayNameAttribute : Attribute
+	{
+		public string DisplayName;
+
+		public DisplayNameAttribute(string name)
+		{
+			this.DisplayName = name;
+		}
+	}
+
+	public static class DisplayNameAttributeHelper
+	{
+		internal static T GetAttribute<T>(Type type) where T : Attribute
+		{
+			return (T)type.GetCustomAttribute(typeof(T), false);
+		}
+
+		internal static T GetAttribute<T>(MethodInfo methodInfo) where T : Attribute
+		{
+			return (T)methodInfo.GetCustomAttribute(typeof(T), false);
+		}
+
+		internal static T GetAttribute<T>(FieldInfo field) where T : Attribute
+		{
+			return (T)field.GetCustomAttribute(typeof(T), false);
+		}
+	}
+}

Assets/YooAsset/Editor/AssetBundleCollector/DisplayNameAttribute.cs.meta

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

Assets/YooAsset/Editor/AssetBundleCollector/IActiveRule.cs

@@ -0,0 +1,14 @@
+
+namespace YooAsset.Editor
+{
+	/// <summary>
+	/// 资源分组激活规则接口
+	/// </summary>
+	public interface IActiveRule
+	{
+		/// <summary>
+		/// 是否激活分组
+		/// </summary>
+		bool IsActiveGroup();
+	}
+}

Assets/YooAsset/Editor/AssetBundleCollector/IActiveRule.cs.meta

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

Assets/YooAsset/Editor/AssetBundleCollector/IAddressRule.cs

@@ -6,12 +6,14 @@ namespace YooAsset.Editor
 		public string AssetPath;
 		public string CollectPath;
 		public string GroupName;
+		public string UserData;
 
-		public AddressRuleData(string assetPath, string collectPath, string groupName)
+		public AddressRuleData(string assetPath, string collectPath, string groupName, string userData)
 		{
 			AssetPath = assetPath;
 			CollectPath = collectPath;
 			GroupName = groupName;
+			UserData = userData;
 		}
 	}
 

Assets/YooAsset/Editor/AssetBundleCollector/IPackRule.cs

@@ -6,18 +6,61 @@ namespace YooAsset.Editor
 		public string AssetPath;
 		public string CollectPath;
 		public string GroupName;
+		public string UserData;
 
 		public PackRuleData(string assetPath)
 		{
 			AssetPath = assetPath;
 			CollectPath = string.Empty;
 			GroupName = string.Empty;
+			UserData = string.Empty;
 		}
-		public PackRuleData(string assetPath, string collectPath, string groupName)
+		public PackRuleData(string assetPath, string collectPath, string groupName, string userData)
 		{
 			AssetPath = assetPath;
 			CollectPath = collectPath;
 			GroupName = groupName;
+			UserData = userData;
+		}
+	}
+
+	public struct PackRuleResult
+	{
+		private readonly string _bundleName;
+		private readonly string _bundleExtension;
+
+		public PackRuleResult(string bundleName, string bundleExtension)
+		{
+			_bundleName = bundleName;
+			_bundleExtension = bundleExtension;
+		}
+
+		/// <summary>
+		/// 获取主资源包全名称
+		/// </summary>
+		public string GetMainBundleName(string packageName, bool uniqueBundleName)
+		{
+			string fullName;
+			string bundleName = EditorTools.GetRegularPath(_bundleName).Replace('/', '_').Replace('.', '_').ToLower();
+			if (uniqueBundleName)
+				fullName = $"{packageName}_{bundleName}.{_bundleExtension}";
+			else
+				fullName = $"{bundleName}.{_bundleExtension}";
+			return fullName.ToLower();
+		}
+		
+		/// <summary>
+		/// 获取共享资源包全名称
+		/// </summary>
+		public string GetShareBundleName(string packageName, bool uniqueBundleName)
+		{
+			string fullName;
+			string bundleName = EditorTools.GetRegularPath(_bundleName).Replace('/', '_').Replace('.', '_').ToLower();
+			if (uniqueBundleName)
+				fullName = $"{packageName}_share_{bundleName}.{_bundleExtension}";
+			else
+				fullName = $"share_{bundleName}.{_bundleExtension}";
+			return fullName.ToLower();
 		}
 	}
 
@@ -27,8 +70,13 @@ namespace YooAsset.Editor
 	public interface IPackRule
 	{
 		/// <summary>
-		/// 获取资源打包所属的资源包名称
+		/// 获取打包规则结果
 		/// </summary>
-		string GetBundleName(PackRuleData data);
+		PackRuleResult GetPackRuleResult(PackRuleData data);
+
+		/// <summary>
+		/// 是否为原生文件打包规则
+		/// </summary>
+		bool IsRawFilePackRule();
 	}
 }

Assets/YooAsset/Editor/AssetBundleCollector/IShareAssetPackRule.cs

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

Assets/YooAsset/Editor/AssetBundleCollector/IShareAssetPackRule.cs.meta

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

Assets/YooAsset/Editor/AssetBundleCollector/RuleDisplayName.cs

@@ -0,0 +1,9 @@
+
+namespace YooAsset.Editor
+{
+	public class RuleDisplayName
+	{
+		public string ClassName;
+		public string DisplayName;
+	}
+}

Assets/YooAsset/Editor/AssetBundleCollector/RuleDisplayName.cs.meta

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

Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebuggerWindow.cs

@@ -1,18 +1,21 @@
 #if UNITY_2019_4_OR_NEWER
 using System;
+using System.Collections.Generic;
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.UIElements;
 using UnityEditor.UIElements;
+using UnityEditor.Networking.PlayerConnection;
+using UnityEngine.Networking.PlayerConnection;
 
 namespace YooAsset.Editor
 {
 	public class AssetBundleDebuggerWindow : EditorWindow
 	{
 		[MenuItem("YooAsset/AssetBundle Debugger", false, 104)]
-        public static void ShowExample()
+		public static void OpenWindow()
 		{
-            AssetBundleDebuggerWindow wnd = GetWindow<AssetBundleDebuggerWindow>("资源包调试工具", true, EditorDefine.DockedWindowTypes);
+			AssetBundleDebuggerWindow wnd = GetWindow<AssetBundleDebuggerWindow>("资源包调试工具", true, WindowsDefine.DockedWindowTypes);
 			wnd.minSize = new Vector2(800, 600);
 		}
 
@@ -37,13 +40,20 @@ namespace YooAsset.Editor
 			BundleView,
 		}
 
+
+		private readonly Dictionary<int, RemotePlayerSession> _playerSessions = new Dictionary<int, RemotePlayerSession>();
+
+		private Label _playerName;
 		private ToolbarMenu _viewModeMenu;
+		private SliderInt _frameSlider;
 		private DebuggerAssetListViewer _assetListViewer;
 		private DebuggerBundleListViewer _bundleListViewer;
 
 		private EViewMode _viewMode;
-        private readonly DebugReport _debugReport = new DebugReport();
 		private string _searchKeyWord;
+		private DebugReport _currentReport;
+		private RemotePlayerSession _currentPlayerSession;
+		private int _rangeIndex = 0;
 
 
 		public void CreateGUI()
@@ -53,28 +63,56 @@ namespace YooAsset.Editor
 				VisualElement root = rootVisualElement;
 
 				// 加载布局文件
-                var visualAsset = YooAssetEditorSettingsData.Setting.AssetBundleDebuggerUXML;
+				var visualAsset = UxmlLoader.LoadWindowUXML<AssetBundleDebuggerWindow>();
 				if (visualAsset == null)
-                {
-                    Debug.LogError($"Not found {nameof(AssetBundleDebuggerWindow)}.uxml in settings.");
 					return;
-                }
+
 				visualAsset.CloneTree(root);
 
 				// 采样按钮
 				var sampleBtn = root.Q<Button>("SampleButton");
 				sampleBtn.clicked += SampleBtn_onClick;
 
+				// 导出按钮
+				var exportBtn = root.Q<Button>("ExportButton");
+				exportBtn.clicked += ExportBtn_clicked;
+
+				// 用户列表菜单
+				_playerName = root.Q<Label>("PlayerName");
+				_playerName.text = "Editor player";
+
 				// 视口模式菜单
 				_viewModeMenu = root.Q<ToolbarMenu>("ViewModeMenu");
-                //_viewModeMenu.menu.AppendAction(EViewMode.MemoryView.ToString(), ViewModeMenuAction0, ViewModeMenuFun0);
-                _viewModeMenu.menu.AppendAction(EViewMode.AssetView.ToString(), ViewModeMenuAction1, ViewModeMenuFun1);
-                _viewModeMenu.menu.AppendAction(EViewMode.BundleView.ToString(), ViewModeMenuAction2, ViewModeMenuFun2);
+				_viewModeMenu.menu.AppendAction(EViewMode.AssetView.ToString(), OnViewModeMenuChange, OnViewModeMenuStatusUpdate, EViewMode.AssetView);
+				_viewModeMenu.menu.AppendAction(EViewMode.BundleView.ToString(), OnViewModeMenuChange, OnViewModeMenuStatusUpdate, EViewMode.BundleView);
+				_viewModeMenu.text = EViewMode.AssetView.ToString();
 
 				// 搜索栏
 				var searchField = root.Q<ToolbarSearchField>("SearchField");
 				searchField.RegisterValueChangedCallback(OnSearchKeyWordChange);
 
+				// 帧数相关
+				{
+					_frameSlider = root.Q<SliderInt>("FrameSlider");
+					_frameSlider.label = "Frame:";
+					_frameSlider.highValue = 0;
+					_frameSlider.lowValue = 0;
+					_frameSlider.value = 0;
+					_frameSlider.RegisterValueChangedCallback(evt =>
+					{
+						OnFrameSliderChange(evt.newValue);
+					});
+
+					var frameLast = root.Q<ToolbarButton>("FrameLast");
+					frameLast.clicked += OnFrameLast_clicked;
+
+					var frameNext = root.Q<ToolbarButton>("FrameNext");
+					frameNext.clicked += OnFrameNext_clicked;
+
+					var frameClear = root.Q<ToolbarButton>("FrameClear");
+					frameClear.clicked += OnFrameClear_clicked;
+				}
+
 				// 加载视图
 				_assetListViewer = new DebuggerAssetListViewer();
 				_assetListViewer.InitViewer();
@@ -85,58 +123,202 @@ namespace YooAsset.Editor
 
 				// 显示视图
 				_viewMode = EViewMode.AssetView;
-                _viewModeMenu.text = EViewMode.AssetView.ToString();
 				_assetListViewer.AttachParent(root);
+
+				// 远程调试
+				EditorConnection.instance.Initialize();
+				EditorConnection.instance.RegisterConnection(OnHandleConnectionEvent);
+				EditorConnection.instance.RegisterDisconnection(OnHandleDisconnectionEvent);
+				EditorConnection.instance.Register(RemoteDebuggerDefine.kMsgSendPlayerToEditor, OnHandlePlayerMessage);
+				RemoteDebuggerInRuntime.EditorHandleDebugReportCallback = OnHandleDebugReport;
 			}
 			catch (Exception e)
 			{
 				Debug.LogError(e.ToString());
 			}
 		}
+		public void OnDestroy()
+		{
+			// 远程调试
+			EditorConnection.instance.UnregisterConnection(OnHandleConnectionEvent);
+			EditorConnection.instance.UnregisterDisconnection(OnHandleDisconnectionEvent);
+			EditorConnection.instance.Unregister(RemoteDebuggerDefine.kMsgSendPlayerToEditor, OnHandlePlayerMessage);
+			_playerSessions.Clear();
+		}
+
+		private void OnHandleConnectionEvent(int playerId)
+		{
+			Debug.Log($"Game player connection : {playerId}");
+			_playerName.text = $"Connected player : {playerId}";
+		}
+		private void OnHandleDisconnectionEvent(int playerId)
+		{
+			Debug.Log($"Game player disconnection : {playerId}");
+			_playerName.text = $"Disconneced player : {playerId}";
+		}
+		private void OnHandlePlayerMessage(MessageEventArgs args)
+		{
+			var debugReport = DebugReport.Deserialize(args.data);
+			OnHandleDebugReport(args.playerId, debugReport);
+		}
+		private void OnHandleDebugReport(int playerId, DebugReport debugReport)
+		{
+			Debug.Log($"Handle player {playerId} debug report !");
+			_currentPlayerSession = GetOrCreatePlayerSession(playerId);
+			_currentPlayerSession.AddDebugReport(debugReport);
+			_frameSlider.highValue = _currentPlayerSession.MaxRangeValue;
+			_frameSlider.value = _currentPlayerSession.MaxRangeValue;
+			UpdateFrameView(_currentPlayerSession);
+		}
+		private void OnFrameSliderChange(int sliderValue)
+		{
+			if (_currentPlayerSession != null)
+			{
+				_rangeIndex = _currentPlayerSession.ClampRangeIndex(sliderValue); ;
+				UpdateFrameView(_currentPlayerSession, _rangeIndex);
+			}
+		}
+		private void OnFrameLast_clicked()
+		{
+			if (_currentPlayerSession != null)
+			{
+				_rangeIndex = _currentPlayerSession.ClampRangeIndex(_rangeIndex - 1);
+				_frameSlider.value = _rangeIndex;
+				UpdateFrameView(_currentPlayerSession, _rangeIndex);
+			}
+		}
+		private void OnFrameNext_clicked()
+		{
+			if (_currentPlayerSession != null)
+			{
+				_rangeIndex = _currentPlayerSession.ClampRangeIndex(_rangeIndex + 1);
+				_frameSlider.value = _rangeIndex;
+				UpdateFrameView(_currentPlayerSession, _rangeIndex);
+			}
+		}
+		private void OnFrameClear_clicked()
+		{
+			if (_currentPlayerSession != null)
+			{
+				_frameSlider.label = $"Frame:";
+				_frameSlider.value = 0;
+				_frameSlider.lowValue = 0;
+				_frameSlider.highValue = 0;
+				_currentPlayerSession.ClearDebugReport();
+				_assetListViewer.ClearView();
+				_bundleListViewer.ClearView();
+			}
+		}
+
+		private RemotePlayerSession GetOrCreatePlayerSession(int playerId)
+		{
+			if (_playerSessions.TryGetValue(playerId, out RemotePlayerSession session))
+			{
+				return session;
+			}
+			else
+			{
+				RemotePlayerSession newSession = new RemotePlayerSession(playerId);
+				_playerSessions.Add(playerId, newSession);
+				return newSession;
+			}
+		}
+		private void UpdateFrameView(RemotePlayerSession playerSession)
+		{
+			if (playerSession != null)
+			{
+				UpdateFrameView(playerSession, playerSession.MaxRangeValue);
+			}
+		}
+		private void UpdateFrameView(RemotePlayerSession playerSession, int rangeIndex)
+		{
+			if (playerSession == null)
+				return;
+
+			var debugReport = playerSession.GetDebugReport(rangeIndex);
+			if (debugReport != null)
+			{
+				_currentReport = debugReport;
+				_frameSlider.label = $"Frame: {debugReport.FrameCount}";
+				_assetListViewer.FillViewData(debugReport, _searchKeyWord);
+				_bundleListViewer.FillViewData(debugReport, _searchKeyWord);
+			}
+		}
+
 		private void SampleBtn_onClick()
 		{
-            YooAssets.GetDebugReport(_debugReport);
-            _assetListViewer.FillViewData(_debugReport, _searchKeyWord);
-            _bundleListViewer.FillViewData(_debugReport, _searchKeyWord);
+			// 发送采集数据的命令
+			RemoteCommand command = new RemoteCommand();
+			command.CommandType = (int)ERemoteCommand.SampleOnce;
+			command.CommandParam = string.Empty;
+			byte[] data = RemoteCommand.Serialize(command);
+			EditorConnection.instance.Send(RemoteDebuggerDefine.kMsgSendEditorToPlayer, data);
+			RemoteDebuggerInRuntime.EditorRequestDebugReport();
+		}
+		private void ExportBtn_clicked()
+		{
+			if (_currentReport == null)
+			{
+				Debug.LogWarning("Debug report is null.");
+				return;
+			}
+
+			string resultPath = EditorTools.OpenFolderPanel("Export JSON", "Assets/");
+			if (resultPath != null)
+			{
+				// 注意：排序保证生成配置的稳定性
+				foreach (var packageData in _currentReport.PackageDatas)
+				{
+					packageData.ProviderInfos.Sort();
+					foreach (var providerInfo in packageData.ProviderInfos)
+					{
+						providerInfo.DependBundleInfos.Sort();
+					}
+				}
+
+				string filePath = $"{resultPath}/{nameof(DebugReport)}_{_currentReport.FrameCount}.json";
+				string fileContent = JsonUtility.ToJson(_currentReport, true);
+				FileUtility.WriteAllText(filePath, fileContent);
+			}
 		}
 		private void OnSearchKeyWordChange(ChangeEvent<string> e)
 		{
 			_searchKeyWord = e.newValue;
-            _assetListViewer.FillViewData(_debugReport, _searchKeyWord);
-            _bundleListViewer.FillViewData(_debugReport, _searchKeyWord);
+			if (_currentReport != null)
+			{
+				_assetListViewer.FillViewData(_currentReport, _searchKeyWord);
+				_bundleListViewer.FillViewData(_currentReport, _searchKeyWord);
 			}
-        private void ViewModeMenuAction1(DropdownMenuAction action)
+		}
+		private void OnViewModeMenuChange(DropdownMenuAction action)
 		{
-            if (_viewMode != EViewMode.AssetView)
+			var viewMode = (EViewMode)action.userData;
+			if (_viewMode != viewMode)
 			{
-                _viewMode = EViewMode.AssetView;
+				_viewMode = viewMode;
 				VisualElement root = this.rootVisualElement;
-                _viewModeMenu.text = EViewMode.AssetView.ToString();
+				_viewModeMenu.text = viewMode.ToString();
+
+				if (viewMode == EViewMode.AssetView)
+				{
 					_assetListViewer.AttachParent(root);
 					_bundleListViewer.DetachParent();
 				}
-        }
-        private void ViewModeMenuAction2(DropdownMenuAction action)
+				else if (viewMode == EViewMode.BundleView)
 				{
-            if (_viewMode != EViewMode.BundleView)
-            {
-                _viewMode = EViewMode.BundleView;
-                VisualElement root = this.rootVisualElement;
-                _viewModeMenu.text = EViewMode.BundleView.ToString();
 					_assetListViewer.DetachParent();
 					_bundleListViewer.AttachParent(root);
 				}
-        }
-        private DropdownMenuAction.Status ViewModeMenuFun1(DropdownMenuAction action)
-        {
-            if (_viewMode == EViewMode.AssetView)
-                return DropdownMenuAction.Status.Checked;
 				else
-                return DropdownMenuAction.Status.Normal;
-        }
-        private DropdownMenuAction.Status ViewModeMenuFun2(DropdownMenuAction action)
 				{
-            if (_viewMode == EViewMode.BundleView)
+					throw new NotImplementedException(viewMode.ToString());
+				}
+			}
+		}
+		private DropdownMenuAction.Status OnViewModeMenuStatusUpdate(DropdownMenuAction action)
+		{
+			var viewMode = (EViewMode)action.userData;
+			if (_viewMode == viewMode)
 				return DropdownMenuAction.Status.Checked;
 			else
 				return DropdownMenuAction.Status.Normal;

Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebuggerWindow.uxml

@@ -1,7 +1,15 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
-    <uie:Toolbar name="Toolbar" style="display: flex;">
+    <uie:Toolbar name="TopToolbar" style="display: flex;">
+        <ui:Label text="Player" display-tooltip-when-elided="true" name="PlayerName" style="width: 200px; -unity-text-align: middle-left; padding-left: 5px;" />
         <uie:ToolbarMenu display-tooltip-when-elided="true" name="ViewModeMenu" text="ViewMode" style="width: 100px; flex-grow: 0;" />
         <uie:ToolbarSearchField focusable="true" name="SearchField" style="flex-grow: 1;" />
         <uie:ToolbarButton text="刷新" display-tooltip-when-elided="true" name="SampleButton" style="width: 70px; background-color: rgb(15, 118, 31); -unity-text-align: middle-center; border-top-left-radius: 2px; border-bottom-left-radius: 2px; border-top-right-radius: 2px; border-bottom-right-radius: 2px; border-left-width: 1px; border-right-width: 1px;" />
+        <uie:ToolbarButton text="导出" display-tooltip-when-elided="true" name="ExportButton" style="width: 70px; background-color: rgb(15, 118, 31); -unity-text-align: middle-center; border-top-left-radius: 2px; border-bottom-left-radius: 2px; border-top-right-radius: 2px; border-bottom-right-radius: 2px; border-left-width: 1px; border-right-width: 1px;" />
+    </uie:Toolbar>
+    <uie:Toolbar name="FrameToolbar">
+        <ui:SliderInt picking-mode="Ignore" label="Frame:" value="42" high-value="100" name="FrameSlider" style="flex-grow: 1;" />
+        <uie:ToolbarButton text=" &lt;&lt; " display-tooltip-when-elided="true" name="FrameLast" />
+        <uie:ToolbarButton text=" &gt;&gt; " display-tooltip-when-elided="true" name="FrameNext" />
+        <uie:ToolbarButton text="Clear" display-tooltip-when-elided="true" name="FrameClear" />
     </uie:Toolbar>
 </ui:UXML>

Assets/YooAsset/Editor/AssetBundleDebugger/RemotePlayerSession.cs

@@ -0,0 +1,93 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace YooAsset.Editor
+{
+	internal class RemotePlayerSession
+	{
+		private readonly List<DebugReport> _reportList = new List<DebugReport>();
+
+		/// <summary>
+		/// 用户ID
+		/// </summary>
+		public int PlayerId { private set; get; }
+
+		/// <summary>
+		/// 保存的报告最大数量
+		/// </summary>
+		public int MaxReportCount { private set; get; }
+
+		public int MinRangeValue
+		{
+			get
+			{
+				return 0;
+			}
+		}
+		public int MaxRangeValue
+		{
+			get
+			{
+				int index = _reportList.Count - 1;
+				if (index < 0)
+					index = 0;
+				return index;
+			}
+		}
+
+
+		public RemotePlayerSession(int playerId, int maxReportCount = 1000)
+		{
+			PlayerId = playerId;
+			MaxReportCount = maxReportCount;
+		}
+
+		/// <summary>
+		/// 清理缓存数据
+		/// </summary>
+		public void ClearDebugReport()
+		{
+			_reportList.Clear();
+		}
+
+		/// <summary>
+		/// 添加一个调试报告
+		/// </summary>
+		public void AddDebugReport(DebugReport report)
+		{
+			if (report == null)
+				Debug.LogWarning("Invalid debug report data !");
+
+			if (_reportList.Count >= MaxReportCount)
+				_reportList.RemoveAt(0);
+			_reportList.Add(report);
+		}
+
+		/// <summary>
+		/// 获取调试报告
+		/// </summary>
+		public DebugReport GetDebugReport(int rangeIndex)
+		{
+			if (_reportList.Count == 0)
+				return null;
+			if (rangeIndex < 0 || rangeIndex >= _reportList.Count)
+				return null;
+			return _reportList[rangeIndex];
+		}
+
+		/// <summary>
+		/// 规范索引值
+		/// </summary>
+		public int ClampRangeIndex(int rangeIndex)
+		{
+			if (rangeIndex < 0)
+				return 0;
+
+			if (rangeIndex > MaxRangeValue)
+				return MaxRangeValue;
+
+			return rangeIndex;
+		}
+	}
+}

Assets/YooAsset/Editor/AssetBundleDebugger/RemotePlayerSession.cs.meta

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

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

@@ -24,12 +24,10 @@ namespace YooAsset.Editor
 		public void InitViewer()
 		{
 			// 加载布局文件		
-			_visualAsset = YooAssetEditorSettingsData.Setting.DebuggerAssetListViewerUXML;
+			_visualAsset = UxmlLoader.LoadWindowUXML<DebuggerAssetListViewer>();
 			if (_visualAsset == null)
-			{
-				Debug.LogError($"Not found {nameof(DebuggerAssetListViewer)}.uxml in settings.");
 				return;
-			}
+
 			_root = _visualAsset.CloneTree();
 			_root.style.flexGrow = 1f;
 
@@ -47,6 +45,22 @@ 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>
+		/// 清空页面
+		/// </summary>
+		public void ClearView()
+		{
+			_debugReport = null;
+			_assetListView.Clear();
+			_assetListView.ClearSelection();
+			_assetListView.itemsSource.Clear();
+			_assetListView.Rebuild();
 		}
 
 		/// <summary>
@@ -62,15 +76,24 @@ namespace YooAsset.Editor
 		}
 		private List<DebugProviderInfo> FilterViewItems(DebugReport debugReport, string searchKeyWord)
 		{
-			var result = new List<DebugProviderInfo>(debugReport.ProviderInfos.Count);
-			foreach (var providerInfo in debugReport.ProviderInfos)
+			List<DebugProviderInfo> result = new List<DebugProviderInfo>(1000);
+			foreach (var packageData in debugReport.PackageDatas)
+			{
+				var tempList = new List<DebugProviderInfo>(packageData.ProviderInfos.Count);
+				foreach (var providerInfo in packageData.ProviderInfos)
 				{
 					if (string.IsNullOrEmpty(searchKeyWord) == false)
 					{
 						if (providerInfo.AssetPath.Contains(searchKeyWord) == false)
 							continue;
 					}
-				result.Add(providerInfo);
+
+					providerInfo.PackageName = packageData.PackageName;
+					tempList.Add(providerInfo);
+				}
+
+				tempList.Sort();
+				result.AddRange(tempList);
 			}
 			return result;
 		}
@@ -92,12 +115,22 @@ namespace YooAsset.Editor
 		}
 
 
-		// 资源列表相关
+		// 顶部列表相关
 		private VisualElement MakeAssetListViewItem()
 		{
 			VisualElement element = new VisualElement();
 			element.style.flexDirection = FlexDirection.Row;
 
+			{
+				var label = new Label();
+				label.name = "Label0";
+				label.style.unityTextAlign = TextAnchor.MiddleLeft;
+				label.style.marginLeft = 3f;
+				//label.style.flexGrow = 1f;
+				label.style.width = 150;
+				element.Add(label);
+			}
+
 			{
 				var label = new Label();
 				label.name = "Label1";
@@ -134,7 +167,7 @@ namespace YooAsset.Editor
 				label.style.unityTextAlign = TextAnchor.MiddleLeft;
 				label.style.marginLeft = 3f;
 				//label.style.flexGrow = 1f;
-				label.style.width = 100;
+				label.style.width = 150;
 				element.Add(label);
 			}
 
@@ -144,6 +177,16 @@ namespace YooAsset.Editor
 				label.style.unityTextAlign = TextAnchor.MiddleLeft;
 				label.style.marginLeft = 3f;
 				//label.style.flexGrow = 1f;
+				label.style.width = 100;
+				element.Add(label);
+			}
+
+			{
+				var label = new Label();
+				label.name = "Label6";
+				label.style.unityTextAlign = TextAnchor.MiddleLeft;
+				label.style.marginLeft = 3f;
+				//label.style.flexGrow = 1f;
 				label.style.width = 120;
 				element.Add(label);
 			}
@@ -155,6 +198,10 @@ namespace YooAsset.Editor
 			var sourceData = _assetListView.itemsSource as List<DebugProviderInfo>;
 			var providerInfo = sourceData[index];
 
+			// Package Name
+			var label0 = element.Q<Label>("Label0");
+			label0.text = providerInfo.PackageName;
+
 			// Asset Path
 			var label1 = element.Q<Label>("Label1");
 			label1.text = providerInfo.AssetPath;
@@ -167,19 +214,23 @@ namespace YooAsset.Editor
 			var label3 = element.Q<Label>("Label3");
 			label3.text = providerInfo.SpawnTime;
 
-			// Ref Count
+			// Loading Time
 			var label4 = element.Q<Label>("Label4");
-			label4.text = providerInfo.RefCount.ToString();
+			label4.text = providerInfo.LoadingTime.ToString();
+
+			// Ref Count
+			var label5 = element.Q<Label>("Label5");
+			label5.text = providerInfo.RefCount.ToString();
 
 			// Status
 			StyleColor textColor;
-			if (providerInfo.Status == ProviderBase.EStatus.Fail)
+			if (providerInfo.Status == ProviderBase.EStatus.Failed.ToString())
 				textColor = new StyleColor(Color.yellow);
 			else
 				textColor = label1.style.color;
-			var label5 = element.Q<Label>("Label5");
-			label5.text = providerInfo.Status.ToString();
-			label5.style.color = textColor;
+			var label6 = element.Q<Label>("Label6");
+			label6.text = providerInfo.Status.ToString();
+			label6.style.color = textColor;
 		}
 		private void AssetListView_onSelectionChange(IEnumerable<object> objs)
 		{
@@ -190,7 +241,7 @@ namespace YooAsset.Editor
 			}
 		}
 
-		// 依赖列表相关
+		// 底部列表相关
 		private VisualElement MakeDependListViewItem()
 		{
 			VisualElement element = new VisualElement();
@@ -245,11 +296,11 @@ namespace YooAsset.Editor
 			var label4 = element.Q<Label>("Label4");
 			label4.text = bundleInfo.Status.ToString();
 		}
-		private void FillDependListView(DebugProviderInfo providerInfo)
+		private void FillDependListView(DebugProviderInfo selectedProviderInfo)
 		{
 			_dependListView.Clear();
 			_dependListView.ClearSelection();
-			_dependListView.itemsSource = providerInfo.BundleInfos;
+			_dependListView.itemsSource = selectedProviderInfo.DependBundleInfos;
 			_dependListView.Rebuild();
 		}
 	}

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

@@ -1,11 +1,13 @@
 <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="Package Name" display-tooltip-when-elided="true" name="TopBar0" style="width: 150px; -unity-text-align: middle-left; flex-grow: 0;" />
             <uie:ToolbarButton text="Asset Path" display-tooltip-when-elided="true" name="TopBar1" style="width: 280px; -unity-text-align: middle-left; flex-grow: 1;" />
             <uie:ToolbarButton text="Spawn Scene" display-tooltip-when-elided="true" name="TopBar2" style="width: 150px; -unity-text-align: middle-left; flex-grow: 0;" />
             <uie:ToolbarButton text="Spawn Time" display-tooltip-when-elided="true" name="TopBar3" style="width: 150px; -unity-text-align: middle-left; flex-grow: 0;" />
-            <uie:ToolbarButton text="Ref Count" display-tooltip-when-elided="true" name="TopBar4" style="width: 100px; -unity-text-align: middle-left; flex-grow: 0;" />
-            <uie:ToolbarButton text="Status" display-tooltip-when-elided="true" name="TopBar5" style="width: 120px; -unity-text-align: middle-left;" />
+            <uie:ToolbarButton text="Loading Time (ms)" display-tooltip-when-elided="true" name="TopBar4" style="width: 150px; -unity-text-align: middle-left; flex-grow: 0;" />
+            <uie:ToolbarButton text="Ref Count" display-tooltip-when-elided="true" name="TopBar5" style="width: 100px; -unity-text-align: middle-left; flex-grow: 0;" />
+            <uie:ToolbarButton text="Status" display-tooltip-when-elided="true" name="TopBar6" style="width: 120px; -unity-text-align: middle-left;" />
         </uie:Toolbar>
         <ui:ListView focusable="true" name="TopListView" item-height="18" virtualization-method="DynamicHeight" style="flex-grow: 1;" />
     </ui:VisualElement>

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

@@ -24,29 +24,43 @@ namespace YooAsset.Editor
 		public void InitViewer()
 		{
 			// 加载布局文件
-			_visualAsset = YooAssetEditorSettingsData.Setting.DebuggerBundleListViewerUXML;
+			_visualAsset = UxmlLoader.LoadWindowUXML<DebuggerBundleListViewer>();
 			if (_visualAsset == null)
-			{
-				Debug.LogError($"Not found {nameof(DebuggerBundleListViewer)}.uxml in settings.");
 				return;
-			}
+
 			_root = _visualAsset.CloneTree();
 			_root.style.flexGrow = 1f;
 
 			// 资源包列表
 			_bundleListView = _root.Q<ListView>("TopListView");
-			_bundleListView.makeItem = MakeAssetListViewItem;
-			_bundleListView.bindItem = BindAssetListViewItem;
-
+			_bundleListView.makeItem = MakeBundleListViewItem;
+			_bundleListView.bindItem = BindBundleListViewItem;
 #if UNITY_2020_1_OR_NEWER
 			_bundleListView.onSelectionChange += BundleListView_onSelectionChange;
 #else
 			_bundleListView.onSelectionChanged += BundleListView_onSelectionChange;
 #endif
+
 			// 使用列表
 			_usingListView = _root.Q<ListView>("BottomListView");
 			_usingListView.makeItem = MakeIncludeListViewItem;
 			_usingListView.bindItem = BindIncludeListViewItem;
+
+#if UNITY_2020_3_OR_NEWER
+			SplitView.Adjuster(_root);
+#endif
+		}
+
+		/// <summary>
+		/// 清空页面
+		/// </summary>
+		public void ClearView()
+		{
+			_debugReport = null;
+			_bundleListView.Clear();
+			_bundleListView.ClearSelection();
+			_bundleListView.itemsSource.Clear();
+			_bundleListView.Rebuild();
 		}
 
 		/// <summary>
@@ -62,21 +76,33 @@ namespace YooAsset.Editor
 		}
 		private List<DebugBundleInfo> FilterViewItems(DebugReport debugReport, string searchKeyWord)
 		{
-			Dictionary<string, DebugBundleInfo> result = new Dictionary<string, DebugBundleInfo>(debugReport.ProviderInfos.Count);
-			foreach (var providerInfo in debugReport.ProviderInfos)
+			List<DebugBundleInfo> result = new List<DebugBundleInfo>(1000);
+			foreach (var pakcageData in debugReport.PackageDatas)
 			{
-				foreach (var bundleInfo in providerInfo.BundleInfos)
+				Dictionary<string, DebugBundleInfo> tempDic = new Dictionary<string, DebugBundleInfo>(1000);
+				foreach (var providerInfo in pakcageData.ProviderInfos)
+				{
+					foreach (var bundleInfo in providerInfo.DependBundleInfos)
 					{
 						if (string.IsNullOrEmpty(searchKeyWord) == false)
 						{
 							if (bundleInfo.BundleName.Contains(searchKeyWord) == false)
 								continue;
 						}
-					if (result.ContainsKey(bundleInfo.BundleName) == false)
-						result.Add(bundleInfo.BundleName, bundleInfo);
+
+						if (tempDic.ContainsKey(bundleInfo.BundleName) == false)
+						{
+							bundleInfo.PackageName = pakcageData.PackageName;
+							tempDic.Add(bundleInfo.BundleName, bundleInfo);
 						}
 					}
-			return result.Values.ToList();
+				}
+
+				var tempList = tempDic.Values.ToList();
+				tempList.Sort();
+				result.AddRange(tempList);
+			}
+			return result;
 		}
 
 		/// <summary>
@@ -97,11 +123,21 @@ namespace YooAsset.Editor
 
 
 		// 顶部列表相关
-		private VisualElement MakeAssetListViewItem()
+		private VisualElement MakeBundleListViewItem()
 		{
 			VisualElement element = new VisualElement();
 			element.style.flexDirection = FlexDirection.Row;
 
+			{
+				var label = new Label();
+				label.name = "Label0";
+				label.style.unityTextAlign = TextAnchor.MiddleLeft;
+				label.style.marginLeft = 3f;
+				//label.style.flexGrow = 1f;
+				label.style.width = 150;
+				element.Add(label);
+			}
+
 			{
 				var label = new Label();
 				label.name = "Label1";
@@ -134,11 +170,15 @@ namespace YooAsset.Editor
 
 			return element;
 		}
-		private void BindAssetListViewItem(VisualElement element, int index)
+		private void BindBundleListViewItem(VisualElement element, int index)
 		{
 			var sourceData = _bundleListView.itemsSource as List<DebugBundleInfo>;
 			var bundleInfo = sourceData[index];
 
+			// Package Name
+			var label0 = element.Q<Label>("Label0");
+			label0.text = bundleInfo.PackageName;
+
 			// Bundle Name
 			var label1 = element.Q<Label>("Label1");
 			label1.text = bundleInfo.BundleName;
@@ -149,7 +189,7 @@ namespace YooAsset.Editor
 
 			// Status
 			StyleColor textColor;
-			if (bundleInfo.Status == AssetBundleLoaderBase.EStatus.Failed)
+			if (bundleInfo.Status == BundleLoaderBase.EStatus.Failed.ToString())
 				textColor = new StyleColor(Color.yellow);
 			else
 				textColor = label1.style.color;
@@ -162,7 +202,7 @@ namespace YooAsset.Editor
 			foreach (var item in objs)
 			{
 				DebugBundleInfo bundleInfo = item as DebugBundleInfo;
-				FillUsingListView(bundleInfo.BundleName);
+				FillUsingListView(bundleInfo);
 			}
 		}
 
@@ -249,20 +289,26 @@ namespace YooAsset.Editor
 			var label5 = element.Q<Label>("Label5");
 			label5.text = providerInfo.Status.ToString();
 		}
-		private void FillUsingListView(string bundleName)
+		private void FillUsingListView(DebugBundleInfo selectedBundleInfo)
 		{
 			List<DebugProviderInfo> source = new List<DebugProviderInfo>();
-			foreach (var providerInfo in _debugReport.ProviderInfos)
+			foreach (var packageData in _debugReport.PackageDatas)
 			{
-				foreach (var bundleInfo in providerInfo.BundleInfos)
+				if (packageData.PackageName == selectedBundleInfo.PackageName)
 				{
-					if (bundleInfo.BundleName == bundleName)
+					foreach (var providerInfo in packageData.ProviderInfos)
+					{
+						foreach (var bundleInfo in providerInfo.DependBundleInfos)
+						{
+							if (bundleInfo.BundleName == selectedBundleInfo.BundleName)
 							{
 								source.Add(providerInfo);
 								continue;
 							}
 						}
 					}
+				}
+			}
 
 			_usingListView.Clear();
 			_usingListView.ClearSelection();

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

@@ -1,6 +1,7 @@
 <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="Package Name" display-tooltip-when-elided="true" name="TopBar0" style="width: 150px; -unity-text-align: middle-left; flex-grow: 0;" />
             <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="Ref Count" display-tooltip-when-elided="true" name="TopBar3" style="width: 100px; -unity-text-align: middle-left;" />
             <uie:ToolbarButton text="Status" display-tooltip-when-elided="true" name="TopBar4" style="width: 120px; -unity-text-align: middle-left;" />

Assets/YooAsset/Editor/AssetBundleReporter/AssetBundleReporterWindow.cs

@@ -10,9 +10,9 @@ namespace YooAsset.Editor
 	public class AssetBundleReporterWindow : EditorWindow
 	{
 		[MenuItem("YooAsset/AssetBundle Reporter", false, 103)]
-		public static void ShowExample()
+		public static void OpenWindow()
 		{
-			AssetBundleReporterWindow window = GetWindow<AssetBundleReporterWindow>("资源包报告工具", true, EditorDefine.DockedWindowTypes);
+			AssetBundleReporterWindow window = GetWindow<AssetBundleReporterWindow>("资源包报告工具", true, WindowsDefine.DockedWindowTypes);
 			window.minSize = new Vector2(800, 600);
 		}
 
@@ -35,12 +35,18 @@ namespace YooAsset.Editor
 			/// 资源包视图
 			/// </summary>
 			BundleView,
+
+			/// <summary>
+			/// 冗余资源试图
+			/// </summary>
+			Redundancy,
 		}
 
 		private ToolbarMenu _viewModeMenu;
 		private ReporterSummaryViewer _summaryViewer;
 		private ReporterAssetListViewer _assetListViewer;
 		private ReporterBundleListViewer _bundleListViewer;
+		private ReporterRedundancyListViewer _redundancyListViewer;
 
 		private EViewMode _viewMode;
 		private BuildReport _buildReport;
@@ -55,12 +61,10 @@ namespace YooAsset.Editor
 				VisualElement root = this.rootVisualElement;
 
 				// 加载布局文件
-				var visualAsset = YooAssetEditorSettingsData.Setting.AssetBundleReporterUXML;
+				var visualAsset = UxmlLoader.LoadWindowUXML<AssetBundleReporterWindow>();
 				if (visualAsset == null)
-				{
-					Debug.LogError($"Not found {nameof(AssetBundleReporterWindow)}.uxml in settings.");
 					return;
-				}
+				
 				visualAsset.CloneTree(root);
 
 				// 导入按钮
@@ -72,6 +76,7 @@ namespace YooAsset.Editor
 				_viewModeMenu.menu.AppendAction(EViewMode.Summary.ToString(), ViewModeMenuAction0, ViewModeMenuFun0);
 				_viewModeMenu.menu.AppendAction(EViewMode.AssetView.ToString(), ViewModeMenuAction1, ViewModeMenuFun1);
 				_viewModeMenu.menu.AppendAction(EViewMode.BundleView.ToString(), ViewModeMenuAction2, ViewModeMenuFun2);
+				_viewModeMenu.menu.AppendAction(EViewMode.Redundancy.ToString(), ViewModeMenuAction3, ViewModeMenuFun3);
 
 				// 搜索栏
 				var searchField = root.Q<ToolbarSearchField>("SearchField");
@@ -89,6 +94,10 @@ namespace YooAsset.Editor
 				_bundleListViewer = new ReporterBundleListViewer();
 				_bundleListViewer.InitViewer();
 
+				// 加载试图
+				_redundancyListViewer = new ReporterRedundancyListViewer();
+				_redundancyListViewer.InitViewer();
+
 				// 显示视图
 				_viewMode = EViewMode.Summary;
 				_viewModeMenu.text = EViewMode.Summary.ToString();
@@ -111,11 +120,12 @@ namespace YooAsset.Editor
 				return;
 
 			_reportFilePath = selectFilePath;
-			string jsonData = FileUtility.ReadFile(_reportFilePath);
+			string jsonData = FileUtility.ReadAllText(_reportFilePath);
 			_buildReport = BuildReport.Deserialize(jsonData);
+			_summaryViewer.FillViewData(_buildReport);
 			_assetListViewer.FillViewData(_buildReport, _searchKeyWord);
 			_bundleListViewer.FillViewData(_buildReport, _reportFilePath, _searchKeyWord);
-			_summaryViewer.FillViewData(_buildReport);
+			_redundancyListViewer.FillViewData(_buildReport, _searchKeyWord);
 		}
 		private void OnSearchKeyWordChange(ChangeEvent<string> e)
 		{
@@ -136,6 +146,7 @@ namespace YooAsset.Editor
 				_summaryViewer.AttachParent(root);
 				_assetListViewer.DetachParent();
 				_bundleListViewer.DetachParent();
+				_redundancyListViewer.DetachParent();
 			}
 		}
 		private void ViewModeMenuAction1(DropdownMenuAction action)
@@ -148,6 +159,7 @@ namespace YooAsset.Editor
 				_summaryViewer.DetachParent();
 				_assetListViewer.AttachParent(root);
 				_bundleListViewer.DetachParent();
+				_redundancyListViewer.DetachParent();
 			}
 		}
 		private void ViewModeMenuAction2(DropdownMenuAction action)
@@ -160,6 +172,20 @@ namespace YooAsset.Editor
 				_summaryViewer.DetachParent();
 				_assetListViewer.DetachParent();
 				_bundleListViewer.AttachParent(root);
+				_redundancyListViewer.DetachParent();
+			}
+		}
+		private void ViewModeMenuAction3(DropdownMenuAction action)
+		{
+			if (_viewMode != EViewMode.Redundancy)
+			{
+				_viewMode = EViewMode.Redundancy;
+				VisualElement root = this.rootVisualElement;
+				_viewModeMenu.text = EViewMode.Redundancy.ToString();
+				_summaryViewer.DetachParent();
+				_assetListViewer.DetachParent();
+				_bundleListViewer.DetachParent();
+				_redundancyListViewer.AttachParent(root);
 			}
 		}
 		private DropdownMenuAction.Status ViewModeMenuFun0(DropdownMenuAction action)
@@ -183,6 +209,13 @@ namespace YooAsset.Editor
 			else
 				return DropdownMenuAction.Status.Normal;
 		}
+		private DropdownMenuAction.Status ViewModeMenuFun3(DropdownMenuAction action)
+		{
+			if (_viewMode == EViewMode.Redundancy)
+				return DropdownMenuAction.Status.Checked;
+			else
+				return DropdownMenuAction.Status.Normal;
+		}
 	}
 }
 #endif

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

@@ -38,15 +38,10 @@ namespace YooAsset.Editor
 		public void InitViewer()
 		{
 			// 加载布局文件
-			_visualAsset = YooAssetEditorSettingsData.Setting.ReporterAssetListViewerUXML;
+			_visualAsset = UxmlLoader.LoadWindowUXML<ReporterAssetListViewer>();
 			if (_visualAsset == null)
-			{
-				Debug.LogError($"Not found {nameof(ReporterAssetListViewer)}.uxml in settings.");
 				return;
-			}
 
-			try
-			{
 			_root = _visualAsset.CloneTree();
 			_root.style.flexGrow = 1f;
 
@@ -73,11 +68,10 @@ namespace YooAsset.Editor
 			_dependListView = _root.Q<ListView>("BottomListView");
 			_dependListView.makeItem = MakeDependListViewItem;
 			_dependListView.bindItem = BindDependListViewItem;
-			}
-			catch (Exception e)
-			{
-				Debug.LogError(e.ToString());
-			}
+
+#if UNITY_2020_3_OR_NEWER
+			SplitView.Adjuster(_root);
+#endif
 		}
 
 		/// <summary>
@@ -320,11 +314,11 @@ namespace YooAsset.Editor
 
 			// Size
 			var label2 = element.Q<Label>("Label2");
-			label2.text = EditorUtility.FormatBytes(bundleInfo.SizeBytes);
+			label2.text = EditorUtility.FormatBytes(bundleInfo.FileSize);
 
 			// Hash
 			var label3 = element.Q<Label>("Label3");
-			label3.text = bundleInfo.Hash;
+			label3.text = bundleInfo.FileHash;
 		}
 	}
 }

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

@@ -1,10 +1,10 @@
-<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements">
     <ui:VisualElement name="TopGroup" style="flex-grow: 1; border-left-width: 1px; border-right-width: 1px; border-top-width: 1px; border-bottom-width: 1px; border-left-color: rgb(0, 0, 0); border-right-color: rgb(0, 0, 0); border-top-color: rgb(0, 0, 0); border-bottom-color: rgb(0, 0, 0); margin-left: 0; margin-right: 0; margin-top: 2px; margin-bottom: 1px; display: flex;">
         <uie:Toolbar name="TopBar" style="height: 25px; margin-left: 1px; margin-right: 1px;">
             <uie:ToolbarButton text="Asset Path" display-tooltip-when-elided="true" name="TopBar1" style="width: 280px; -unity-text-align: middle-left; flex-grow: 1;" />
             <uie:ToolbarButton text="Main Bundle" display-tooltip-when-elided="true" name="TopBar2" style="width: 145px; -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;" />
+        <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;">