.gitignore

@@ -10,23 +10,8 @@
 /[Ll]ogs/
 /[Mm]emoryCaptures/
 
-
-
-/Bundles/
-/ProjectSettings/
-/App/
-/yoo/ 
-/Assets/StreamingAssets
-/Assets/StreamingAssets.meta
-/Assets/Samples
-/Assets/Samples.meta
-/Packages
-/UserSettings
-
-
-
 # Asset meta data should only be ignored when the corresponding asset is also ignored
-
+!/[Aa]ssets/**/*.meta
 
 # Uncomment this line if you wish to ignore the asset store tools plugin
 # /[Aa]ssets/AssetStoreTools*

Assets/UniTask.YooAsset~/OperationHandleBaseExtensions.cs

@@ -98,12 +98,9 @@ namespace Cysharp.Threading.Tasks
                     case SubAssetsOperationHandle sub_asset_handle:
                         sub_asset_handle.Completed += result.SubContinuation;
                         break;
-                    case RawFileOperationHandle raw_file_handle:
-                        raw_file_handle.Completed += result.RawFileContinuation;
-                        break;
                 }
 #else
-                switch (handle)
+                switch(handle)
                 {
                     case AssetOperationHandle asset_handle:
                         asset_handle.Completed += result.continuationAction;
@@ -114,9 +111,6 @@ namespace Cysharp.Threading.Tasks
                     case SubAssetsOperationHandle sub_asset_handle:
                         sub_asset_handle.Completed += result.continuationAction;
                         break;
-                    case RawFileOperationHandle raw_file_handle:
-                        raw_file_handle.Completed += result.continuationAction;
-                        break;
                 }
 #endif
                 token = result.core.Version;
@@ -141,12 +135,6 @@ namespace Cysharp.Threading.Tasks
                 handle.Completed -= SubContinuation;
                 BaseContinuation();
             }
-
-            private void RawFileContinuation(RawFileOperationHandle handle)
-            {
-                handle.Completed -= RawFileContinuation;
-                BaseContinuation();
-            }
 #endif
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             private void BaseContinuation()
@@ -182,9 +170,6 @@ namespace Cysharp.Threading.Tasks
                     case SubAssetsOperationHandle sub_asset_handle:
                         sub_asset_handle.Completed -= continuationAction;
                         break;
-                    case RawFileOperationHandle raw_file_handle:
-                        raw_file_handle.Completed -= continuationAction;
-                        break;
                 }
 
                 BaseContinuation();

Assets/UniTask.YooAsset~/README.md

@@ -0,0 +1,20 @@
+# UniTask 扩展
+
+[仓库链接](https://github.com/Cysharp/UniTask) 
+- 请去下载对应的源码，并删除此目录最后的波浪线
+- 在项目的 `asmdef` 文件中添加对 `UniTask.YooAsset` 的引用
+- 在 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/UniTask.YooAsset~/UniTask.YooAsset.asmdef

@@ -1,7 +1,9 @@
 {
-    "name": "UniTask.Linq",
+    "name": "UniTask.YooAsset",
+    "rootNamespace": "",
     "references": [
-        "UniTask"
+        "GUID:e34a5702dd353724aa315fb8011f08c3",
+        "GUID:f51ebe6a0ceec4240a699833d6309b23"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Assets/UniTask.YooAsset~/UniTask.YooAsset.asmdef.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ccbd3ee89c7c8614bb89388a769680c1
+guid: cf4f1d4730c114c48ab680458e5a2455
 AssemblyDefinitionImporter:
   externalObjects: {}
   userData: 

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilder.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Reflection;
-using System.Linq;
 using UnityEngine;
 using UnityEditor;
 
@@ -13,100 +11,78 @@ namespace YooAsset.Editor
 		private readonly BuildContext _buildContext = new BuildContext();
 
 		/// <summary>
-		/// 构建资源包
+		/// 开始构建
 		/// </summary>
-		public BuildResult Run(BuildParameters buildParameters, List<IBuildTask> buildPipeline)
+		public bool Run(BuildParameters buildParameters)
 		{
-			// 检测构建参数是否为空
-			if (buildParameters == null)
-				throw new Exception($"{nameof(buildParameters)} is null !");
-
-			// 检测构建参数是否为空
-			if (buildPipeline.Count == 0)
-				throw new Exception($"Build pipeline is empty !");	
-
 			// 清空旧数据
 			_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 !");
+			}
+
 			// 构建参数
 			var buildParametersContext = new BuildParametersContext(buildParameters);
 			_buildContext.SetContextObject(buildParametersContext);
 
-			// 初始化日志
-			BuildLogger.InitLogger(buildParameters.EnableLog);
-
-			// 执行构建流程
-			var buildResult = BuildRunner.Run(buildPipeline, _buildContext);
-			if (buildResult.Success)
-			{
-				buildResult.OutputPackageDirectory = buildParametersContext.GetPackageOutputDirectory();
-				BuildLogger.Log($"{buildParameters.BuildMode} pipeline build succeed !");
-			}
+			// 是否显示LOG
+			if (buildParameters.BuildMode == EBuildMode.SimulateBuild)
+				BuildRunner.EnableLog = false;
 			else
+				BuildRunner.EnableLog = true;
+
+			// 创建构建节点
+			List<IBuildTask> pipeline;
+			if (buildParameters.BuildPipeline == EBuildPipeline.BuiltinBuildPipeline)
 			{
-				BuildLogger.Warning($"{buildParameters.BuildMode} pipeline build failed !");
-				BuildLogger.Error($"Build task failed : {buildResult.FailedTask}");
-				BuildLogger.Error(buildResult.ErrorInfo);
-			}
-
-			return buildResult;
-		}
-
-		/// <summary>
-		/// 构建资源包
-		/// </summary>
-		public BuildResult Run(BuildParameters buildParameters)
-		{
-			var buildPipeline = GetDefaultBuildPipeline(buildParameters.BuildPipeline);
-			return Run(buildParameters, buildPipeline);
-		}
-
-		/// <summary>
-		/// 获取默认的构建流程
-		/// </summary>
-		private List<IBuildTask> GetDefaultBuildPipeline(EBuildPipeline buildPipeline)
-		{
-			// 获取任务节点的属性集合
-			if (buildPipeline == EBuildPipeline.BuiltinBuildPipeline)
-			{
-				List<IBuildTask> pipeline = new List<IBuildTask>
+				pipeline = new List<IBuildTask>
 				{
 					new TaskPrepare(), //前期准备工作
 					new TaskGetBuildMap(), //获取构建列表
 					new TaskBuilding(), //开始执行构建
-					new TaskCopyRawFile(), //拷贝原生文件
 					new TaskVerifyBuildResult(), //验证构建结果
 					new TaskEncryption(), //加密资源文件
-					new TaskUpdateBundleInfo(), //更新资源包信息
-					new TaskCreateManifest(), //创建清单文件
+					new TaskCreatePatchManifest(), //创建清单文件
 					new TaskCreateReport(), //创建报告文件
-					new TaskCreatePackage(), //制作包裹
+					new TaskCreatePatchPackage(), //制作补丁包
 					new TaskCopyBuildinFiles(), //拷贝内置文件
 				};
-				return pipeline;
 			}
-			else if (buildPipeline == EBuildPipeline.ScriptableBuildPipeline)
+			else if (buildParameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
 			{
-				List<IBuildTask> pipeline = new List<IBuildTask>
+				pipeline = new List<IBuildTask>
 				{
 					new TaskPrepare(), //前期准备工作
 					new TaskGetBuildMap(), //获取构建列表
 					new TaskBuilding_SBP(), //开始执行构建
-					new TaskCopyRawFile(), //拷贝原生文件
 					new TaskVerifyBuildResult_SBP(), //验证构建结果
 					new TaskEncryption(), //加密资源文件
-					new TaskUpdateBundleInfo(), //更新补丁信息
-					new TaskCreateManifest(), //创建清单文件
+					new TaskCreatePatchManifest(), //创建清单文件
 					new TaskCreateReport(), //创建报告文件
-					new TaskCreatePackage(), //制作补丁包
+					new TaskCreatePatchPackage(), //制作补丁包
 					new TaskCopyBuildinFiles(), //拷贝内置文件
 				};
-				return pipeline;
 			}
 			else
 			{
 				throw new NotImplementedException();
 			}
+
+			// 执行构建流程
+			bool succeed = BuildRunner.Run(pipeline, _buildContext);
+			if (succeed)
+				Debug.Log($"{buildParameters.BuildMode} pipeline build succeed !");
+			else
+				Debug.LogWarning($"{buildParameters.BuildMode} pipeline build failed !");
+			return succeed;
 		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderHelper.cs

@@ -11,7 +11,7 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 获取默认的输出根路录
 		/// </summary>
-		public static string GetDefaultBuildOutputRoot()
+		public static string GetDefaultOutputRoot()
 		{
 			string projectPath = EditorTools.GetProjectPath();
 			return $"{projectPath}/Bundles";
@@ -20,9 +20,126 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 获取流文件夹路径
 		/// </summary>
-		public static string GetDefaultStreamingAssetsRoot()
+		public static string GetStreamingAssetsFolderPath()
 		{
-			return $"{Application.dataPath}/StreamingAssets/{YooAssetSettingsData.Setting.DefaultYooFolderName}/";
+			return $"{Application.dataPath}/StreamingAssets/YooAssets/";
+		}
+
+		/// <summary>
+		/// 获取构建管线的输出目录
+		/// </summary>
+		public static string MakePipelineOutputDirectory(string outputRoot, BuildTarget buildTarget)
+		{
+			return $"{outputRoot}/{buildTarget}/{YooAssetSettingsData.Setting.UnityManifestFileName}";
+		}
+
+		/// <summary>
+		/// 清空流文件夹
+		/// </summary>
+		public static void ClearStreamingAssetsFolder()
+		{
+			string streamingFolderPath = GetStreamingAssetsFolderPath();
+			EditorTools.ClearFolder(streamingFolderPath);
+		}
+
+		/// <summary>
+		/// 删除流文件夹内无关的文件
+		/// 删除.manifest文件和.meta文件
+		/// </summary>
+		public static void DeleteStreamingAssetsIgnoreFiles()
+		{
+			string streamingFolderPath = GetStreamingAssetsFolderPath();
+			if (Directory.Exists(streamingFolderPath))
+			{
+				string[] files = Directory.GetFiles(streamingFolderPath, "*.manifest", SearchOption.AllDirectories);
+				foreach (var file in files)
+				{
+					FileInfo info = new FileInfo(file);
+					info.Delete();
+				}
+
+				files = Directory.GetFiles(streamingFolderPath, "*.meta", SearchOption.AllDirectories);
+				foreach (var item in files)
+				{
+					FileInfo info = new FileInfo(item);
+					info.Delete();
+				}
+			}
+		}
+
+
+		/// <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,9 +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;
+
 		/// <summary>
 		/// 构建管线
 		/// </summary>
@@ -17,33 +21,23 @@ namespace YooAsset.Editor
 		public EBuildMode BuildMode = EBuildMode.ForceRebuild;
 
 		/// <summary>
-		/// 构建的包裹名称
+		/// 内置资源标签（首包资源标签）
 		/// </summary>
-		public string BuildPackage = string.Empty;
+		public string BuildTags = 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

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

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderTools.cs

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

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

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

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs

@@ -12,28 +12,25 @@ namespace YooAsset.Editor
 	public class AssetBundleBuilderWindow : EditorWindow
 	{
 		[MenuItem("YooAsset/AssetBundle Builder", false, 102)]
-		public static void OpenWindow()
+		public static void ShowExample()
 		{
-			AssetBundleBuilderWindow window = GetWindow<AssetBundleBuilderWindow>("资源包构建工具", true, WindowsDefine.DockedWindowTypes);
+			AssetBundleBuilderWindow window = GetWindow<AssetBundleBuilderWindow>("资源包构建工具", true, EditorDefine.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 _buildVersionField;
-		private PopupField<string> _buildPackageField;
+		private TextField _buildinTagsField;
 		private PopupField<string> _encryptionField;
 		private EnumField _compressionField;
-		private EnumField _outputNameStyleField;
-		private EnumField _copyBuildinFileOptionField;
-		private TextField _copyBuildinFileTagsField;
+		private Toggle _appendExtensionToggle;
 
 		public void CreateGUI()
 		{
@@ -42,7 +39,7 @@ namespace YooAsset.Editor
 				VisualElement root = this.rootVisualElement;
 
 				// 加载布局文件
-				var visualAsset = UxmlLoader.LoadWindowUXML<AssetBundleBuilderWindow>();
+				var visualAsset = EditorHelper.LoadWindowUXML<AssetBundleBuilderWindow>();
 				if (visualAsset == null)
 					return;
 
@@ -55,24 +52,31 @@ namespace YooAsset.Editor
 				// 构建平台
 				_buildTarget = EditorUserBuildSettings.activeBuildTarget;
 
-				// 包裹名称列表
-				_buildPackageNames = GetBuildPackageNames();
-
 				// 加密服务类
 				_encryptionServicesClassTypes = GetEncryptionServicesClassTypes();
-				_encryptionServicesClassNames = _encryptionServicesClassTypes.Select(t => t.Name).ToList();
+				_encryptionServicesClassNames = _encryptionServicesClassTypes.Select(t => t.FullName).ToList();
 
 				// 输出目录
-				string defaultOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
+				string defaultOutputRoot = AssetBundleBuilderHelper.GetDefaultOutputRoot();
+				string pipelineOutputDirectory = AssetBundleBuilderHelper.MakePipelineOutputDirectory(defaultOutputRoot, _buildTarget);
 				_buildOutputField = root.Q<TextField>("BuildOutput");
-				_buildOutputField.SetValueWithoutNotify(defaultOutputRoot);
+				_buildOutputField.SetValueWithoutNotify(pipelineOutputDirectory);
 				_buildOutputField.SetEnabled(false);
 
+				// 构建版本
+				_buildVersionField = root.Q<IntegerField>("BuildVersion");
+				_buildVersionField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.BuildVersion);
+				_buildVersionField.RegisterValueChangedCallback(evt =>
+				{
+					AssetBundleBuilderSettingData.IsDirty = true;
+					AssetBundleBuilderSettingData.Setting.BuildVersion = _buildVersionField.value;
+				});
+
 				// 构建管线
 				_buildPipelineField = root.Q<EnumField>("BuildPipeline");
 				_buildPipelineField.Init(AssetBundleBuilderSettingData.Setting.BuildPipeline);
 				_buildPipelineField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.BuildPipeline);
-				_buildPipelineField.style.width = 350;
+				_buildPipelineField.style.width = 300;
 				_buildPipelineField.RegisterValueChangedCallback(evt =>
 				{
 					AssetBundleBuilderSettingData.IsDirty = true;
@@ -84,7 +88,7 @@ namespace YooAsset.Editor
 				_buildModeField = root.Q<EnumField>("BuildMode");
 				_buildModeField.Init(AssetBundleBuilderSettingData.Setting.BuildMode);
 				_buildModeField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.BuildMode);
-				_buildModeField.style.width = 350;
+				_buildModeField.style.width = 300;
 				_buildModeField.RegisterValueChangedCallback(evt =>
 				{
 					AssetBundleBuilderSettingData.IsDirty = true;
@@ -92,41 +96,23 @@ namespace YooAsset.Editor
 					RefreshWindow();
 				});
 
-				// 构建版本
-				_buildVersionField = root.Q<TextField>("BuildVersion");
-				_buildVersionField.SetValueWithoutNotify(GetBuildPackageVersion());
-
-				// 构建包裹
-				var buildPackageContainer = root.Q("BuildPackageContainer");
-				if (_buildPackageNames.Count > 0)
+				// 内置资源标签
+				_buildinTagsField = root.Q<TextField>("BuildinTags");
+				_buildinTagsField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.BuildTags);
+				_buildinTagsField.RegisterValueChangedCallback(evt =>
 				{
-					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);
-				}
+					AssetBundleBuilderSettingData.IsDirty = true;
+					AssetBundleBuilderSettingData.Setting.BuildTags = _buildinTagsField.value;
+				});
 
 				// 加密方法
 				var encryptionContainer = root.Q("EncryptionContainer");
 				if (_encryptionServicesClassNames.Count > 0)
 				{
-					int defaultIndex = GetDefaultEncryptionIndex(AssetBundleBuilderSettingData.Setting.EncyptionClassName);
+					int defaultIndex = GetEncryptionDefaultIndex(AssetBundleBuilderSettingData.Setting.EncyptionClassName);
 					_encryptionField = new PopupField<string>(_encryptionServicesClassNames, defaultIndex);
 					_encryptionField.label = "Encryption";
-					_encryptionField.style.width = 350;
+					_encryptionField.style.width = 300;
 					_encryptionField.RegisterValueChangedCallback(evt =>
 					{
 						AssetBundleBuilderSettingData.IsDirty = true;
@@ -138,51 +124,28 @@ namespace YooAsset.Editor
 				{
 					_encryptionField = new PopupField<string>();
 					_encryptionField.label = "Encryption";
-					_encryptionField.style.width = 350;
+					_encryptionField.style.width = 300;
 					encryptionContainer.Add(_encryptionField);
 				}
 
-				// 压缩方式选项
+				// 压缩方式
 				_compressionField = root.Q<EnumField>("Compression");
 				_compressionField.Init(AssetBundleBuilderSettingData.Setting.CompressOption);
 				_compressionField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.CompressOption);
-				_compressionField.style.width = 350;
+				_compressionField.style.width = 300;
 				_compressionField.RegisterValueChangedCallback(evt =>
 				{
 					AssetBundleBuilderSettingData.IsDirty = true;
 					AssetBundleBuilderSettingData.Setting.CompressOption = (ECompressOption)_compressionField.value;
 				});
 
-				// 输出文件名称样式
-				_outputNameStyleField = root.Q<EnumField>("OutputNameStyle");
-				_outputNameStyleField.Init(AssetBundleBuilderSettingData.Setting.OutputNameStyle);
-				_outputNameStyleField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.OutputNameStyle);
-				_outputNameStyleField.style.width = 350;
-				_outputNameStyleField.RegisterValueChangedCallback(evt =>
+				// 附加后缀格式
+				_appendExtensionToggle = root.Q<Toggle>("AppendExtension");
+				_appendExtensionToggle.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.AppendExtension);
+				_appendExtensionToggle.RegisterValueChangedCallback(evt =>
 				{
 					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;
+					AssetBundleBuilderSettingData.Setting.AppendExtension = _appendExtensionToggle.value;
 				});
 
 				// 构建按钮
@@ -198,21 +161,21 @@ namespace YooAsset.Editor
 		}
 		public void OnDestroy()
 		{
-			if (AssetBundleBuilderSettingData.IsDirty)
+			if(AssetBundleBuilderSettingData.IsDirty)
 				AssetBundleBuilderSettingData.SaveFile();
 		}
 		public void Update()
 		{
-			if (_saveButton != null)
+			if(_saveButton != null)
 			{
-				if (AssetBundleBuilderSettingData.IsDirty)
+				if(AssetBundleBuilderSettingData.IsDirty)
 				{
 					if (_saveButton.enabledSelf == false)
 						_saveButton.SetEnabled(true);
 				}
 				else
 				{
-					if (_saveButton.enabledSelf)
+					if(_saveButton.enabledSelf)
 						_saveButton.SetEnabled(false);
 				}
 			}
@@ -220,28 +183,12 @@ namespace YooAsset.Editor
 
 		private void RefreshWindow()
 		{
-			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);
-				_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;
+			_buildinTagsField.SetEnabled(enableElement);
+			_encryptionField.SetEnabled(enableElement);
+			_compressionField.SetEnabled(enableElement);
+			_appendExtensionToggle.SetEnabled(enableElement);
 		}
 		private void SaveBtn_clicked()
 		{
@@ -266,21 +213,20 @@ namespace YooAsset.Editor
 		/// </summary>
 		private void ExecuteBuild()
 		{
+			string defaultOutputRoot = AssetBundleBuilderHelper.GetDefaultOutputRoot();
 			BuildParameters buildParameters = new BuildParameters();
-			buildParameters.StreamingAssetsRoot = AssetBundleBuilderHelper.GetDefaultStreamingAssetsRoot();
-			buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
+			buildParameters.OutputRoot = defaultOutputRoot;
 			buildParameters.BuildTarget = _buildTarget;
 			buildParameters.BuildPipeline = AssetBundleBuilderSettingData.Setting.BuildPipeline;
 			buildParameters.BuildMode = AssetBundleBuilderSettingData.Setting.BuildMode;
-			buildParameters.PackageName = AssetBundleBuilderSettingData.Setting.BuildPackage;
-			buildParameters.PackageVersion = _buildVersionField.value;
+			buildParameters.BuildVersion = AssetBundleBuilderSettingData.Setting.BuildVersion;
+			buildParameters.BuildinTags = AssetBundleBuilderSettingData.Setting.BuildTags;
 			buildParameters.VerifyBuildingResult = true;
-			buildParameters.SharedPackRule = new ZeroRedundancySharedPackRule();
+			buildParameters.EnableAddressable = AssetBundleCollectorSettingData.Setting.EnableAddressable;
+			buildParameters.AppendFileExtension = AssetBundleBuilderSettingData.Setting.AppendExtension;
+			buildParameters.CopyBuildinTagFiles = AssetBundleBuilderSettingData.Setting.BuildMode == EBuildMode.ForceRebuild;
 			buildParameters.EncryptionServices = CreateEncryptionServicesInstance();
 			buildParameters.CompressOption = AssetBundleBuilderSettingData.Setting.CompressOption;
-			buildParameters.OutputNameStyle = AssetBundleBuilderSettingData.Setting.OutputNameStyle;
-			buildParameters.CopyBuildinFileOption = AssetBundleBuilderSettingData.Setting.CopyBuildinFileOption;
-			buildParameters.CopyBuildinFileTags = AssetBundleBuilderSettingData.Setting.CopyBuildinFileTags;
 
 			if (AssetBundleBuilderSettingData.Setting.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
 			{
@@ -289,47 +235,15 @@ namespace YooAsset.Editor
 			}
 			
 			var builder = new AssetBundleBuilder();
-			var buildResult = builder.Run(buildParameters);
-			if (buildResult.Success)
+			bool succeed = builder.Run(buildParameters);
+			if (succeed)
 			{
-				EditorUtility.RevealInFinder(buildResult.OutputPackageDirectory);
+				EditorUtility.RevealInFinder($"{buildParameters.OutputRoot}/{buildParameters.BuildTarget}/{buildParameters.BuildVersion}");
 			}
 		}
 
-		// 构建版本相关
-		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 GetDefaultEncryptionIndex(string className)
+		private int GetEncryptionDefaultIndex(string className)
 		{
 			for (int index = 0; index < _encryptionServicesClassNames.Count; index++)
 			{
@@ -338,9 +252,6 @@ 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

@@ -4,15 +4,13 @@
     </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" />
-        <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:Toggle label="Append Extension" name="AppendExtension" style="height: 15px;" />
+        <ui:TextField picking-mode="Ignore" label="Buildin Tags" name="BuildinTags" />
         <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,37 +1,43 @@
 using UnityEditor;
-using UnityEngine;
 
 namespace YooAsset.Editor
 {
 	public static class AssetBundleSimulateBuilder
 	{
+		private static string _manifestFilePath = string.Empty;
+
 		/// <summary>
 		/// 模拟构建
 		/// </summary>
-		public static string SimulateBuild(string packageName)
+		public static void SimulateBuild()
 		{
-			Debug.Log($"Begin to create simulate package : {packageName}");
+			string defaultOutputRoot = AssetBundleBuilderHelper.GetDefaultOutputRoot();
 			BuildParameters buildParameters = new BuildParameters();
-			buildParameters.StreamingAssetsRoot = AssetBundleBuilderHelper.GetDefaultStreamingAssetsRoot();
-			buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
+			buildParameters.OutputRoot = defaultOutputRoot;
 			buildParameters.BuildTarget = EditorUserBuildSettings.activeBuildTarget;
 			buildParameters.BuildMode = EBuildMode.SimulateBuild;
-			buildParameters.PackageName = packageName;
-			buildParameters.PackageVersion = "Simulate";
-			buildParameters.EnableLog = false;
+			buildParameters.BuildVersion = 999;
+			buildParameters.EnableAddressable = AssetBundleCollectorSettingData.Setting.EnableAddressable;
 
 			AssetBundleBuilder builder = new AssetBundleBuilder();
-			var buildResult = builder.Run(buildParameters);
-			if (buildResult.Success)
+			bool buildResult = builder.Run(buildParameters);
+			if (buildResult)
 			{
-				string manifestFileName = YooAssetSettingsData.GetManifestBinaryFileName(buildParameters.PackageName, buildParameters.PackageVersion);
-				string manifestFilePath = $"{buildResult.OutputPackageDirectory}/{manifestFileName}";
-				return manifestFilePath;
+				string pipelineOutputDirectory = AssetBundleBuilderHelper.MakePipelineOutputDirectory(buildParameters.OutputRoot, buildParameters.BuildTarget);
+				_manifestFilePath = $"{pipelineOutputDirectory}_{EBuildMode.SimulateBuild}/{YooAssetSettingsData.GetPatchManifestFileName(buildParameters.BuildVersion)}";
 			}
 			else
 			{
-				return null;
+				_manifestFilePath = null;
 			}
 		}
+		
+		/// <summary>
+		/// 获取构建的补丁清单路径
+		/// </summary>
+		public static string GetPatchManifestPath()
+		{
+			return _manifestFilePath;
+		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildAssetInfo.cs

@@ -7,6 +7,8 @@ namespace YooAsset.Editor
 {
 	public class BuildAssetInfo
 	{
+		private string _mainBundleName;
+		private string _shareBundleName;
 		private bool _isAddAssetTags = false;
 		private readonly HashSet<string> _referenceBundleNames = new HashSet<string>();
 
@@ -15,11 +17,6 @@ namespace YooAsset.Editor
 		/// </summary>
 		public ECollectorType CollectorType { private set; get; }
 
-		/// <summary>
-		/// 资源包完整名称
-		/// </summary>
-		public string BundleName { private set; get; }
-
 		/// <summary>
 		/// 可寻址地址
 		/// </summary>
@@ -30,11 +27,6 @@ namespace YooAsset.Editor
 		/// </summary>
 		public string AssetPath { private set; get; }
 
-		/// <summary>
-		/// 资源GUID
-		/// </summary>
-		public string AssetGUID { private set; get; }
-
 		/// <summary>
 		/// 是否为原生资源
 		/// </summary>
@@ -62,17 +54,16 @@ namespace YooAsset.Editor
 		public List<BuildAssetInfo> AllDependAssetInfos { private set; get; }
 
 
-		public BuildAssetInfo(ECollectorType collectorType, string bundleName, string address, string assetPath, bool isRawAsset)
+		public BuildAssetInfo(ECollectorType collectorType, string mainBundleName, string address, string assetPath, bool isRawAsset)
 		{
+			_mainBundleName = mainBundleName;
 			CollectorType = collectorType;
-			BundleName = bundleName;
 			Address = address;
 			AssetPath = assetPath;
 			IsRawAsset = isRawAsset;
 
-			AssetGUID = UnityEditor.AssetDatabase.AssetPathToGUID(assetPath);
 			System.Type assetType = UnityEditor.AssetDatabase.GetMainAssetTypeAtPath(assetPath);
-			if (assetType == typeof(UnityEngine.Shader) || assetType == typeof(UnityEngine.ShaderVariantCollection))
+			if (assetType == typeof(UnityEngine.Shader))
 				IsShaderAsset = true;
 			else
 				IsShaderAsset = false;
@@ -84,9 +75,8 @@ namespace YooAsset.Editor
 			AssetPath = assetPath;
 			IsRawAsset = false;
 
-			AssetGUID = UnityEditor.AssetDatabase.AssetPathToGUID(assetPath);
 			System.Type assetType = UnityEditor.AssetDatabase.GetMainAssetTypeAtPath(assetPath);
-			if (assetType == typeof(UnityEngine.Shader) || assetType == typeof(UnityEngine.ShaderVariantCollection))
+			if (assetType == typeof(UnityEngine.Shader))
 				IsShaderAsset = true;
 			else
 				IsShaderAsset = false;
@@ -143,12 +133,24 @@ namespace YooAsset.Editor
 		/// </summary>
 		public bool HasBundleName()
 		{
-			if (string.IsNullOrEmpty(BundleName))
+			string bundleName = GetBundleName();
+			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>
@@ -162,52 +164,46 @@ namespace YooAsset.Editor
 		}
 
 		/// <summary>
-		/// 计算共享资源包的完整包名
+		/// 计算主资源或共享资源的完整包名
 		/// </summary>
-		public void CalculateShareBundleName(ISharedPackRule sharedPackRule, bool uniqueBundleName, string packageName, string shadersBundleName)
+		public void CalculateFullBundleName()
 		{
-			if (CollectorType != ECollectorType.None)
-				return;
-
-			if (IsRawAsset)
-				throw new Exception("Should never get here !");
-
-			if (IsShaderAsset)
+			if (CollectorType == ECollectorType.None)
 			{
-				BundleName = shadersBundleName;
+				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;
+					}
+				}
+
+				if (_referenceBundleNames.Count > 1)
+				{
+					IPackRule packRule = PackDirectory.StaticPackRule;
+					var bundleName = packRule.GetBundleName(new PackRuleData(AssetPath));
+					var shareBundleName = $"share_{bundleName}.{YooAssetSettingsData.Setting.AssetBundleFileVariant}";
+					_shareBundleName = EditorTools.GetRegularPath(shareBundleName).ToLower();
+				}
 			}
 			else
 			{
-				if (_referenceBundleNames.Count > 1)
+				if (IsRawAsset)
 				{
-					PackRuleResult packRuleResult = sharedPackRule.GetPackRuleResult(AssetPath);
-					BundleName = packRuleResult.GetShareBundleName(packageName, uniqueBundleName);
+					string mainBundleName = $"{_mainBundleName}.{YooAssetSettingsData.Setting.RawFileVariant}";
+					_mainBundleName = EditorTools.GetRegularPath(mainBundleName).ToLower();
 				}
 				else
 				{
-					// 注意：被引用次数小于1的资源不需要设置资源包名称
-					BundleName = string.Empty;
+					string mainBundleName = $"{_mainBundleName}.{YooAssetSettingsData.Setting.AssetBundleFileVariant}";
+					_mainBundleName = EditorTools.GetRegularPath(mainBundleName).ToLower(); ;
 				}
 			}
 		}
-
-		/// <summary>
-		/// 判断是否为冗余资源
-		/// </summary>
-		public bool IsRedundancyAsset()
-		{
-			if (HasBundleName())
-				return false;
-
-			return _referenceBundleNames.Count > 1;
-		}
-
-		/// <summary>
-		/// 获取关联资源包的数量
-		/// </summary>
-		public int GetReferenceBundleCount()
-		{
-			return _referenceBundleNames.Count;
-		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildBundleInfo.cs

@@ -8,55 +8,6 @@ namespace YooAsset.Editor
 {
 	public class BuildBundleInfo
 	{
-		#region 补丁文件的关键信息
-		/// <summary>
-		/// Unity引擎生成的哈希值（构建内容的哈希值）
-		/// </summary>
-		public string PackageUnityHash { set; get; }
-
-		/// <summary>
-		/// Unity引擎生成的CRC
-		/// </summary>
-		public uint PackageUnityCRC { set; get; }
-
-		/// <summary>
-		/// 文件哈希值
-		/// </summary>
-		public string PackageFileHash { set; get; }
-
-		/// <summary>
-		/// 文件哈希值
-		/// </summary>
-		public string PackageFileCRC { set; get; }
-
-		/// <summary>
-		/// 文件哈希值
-		/// </summary>
-		public long PackageFileSize { set; get; }
-
-		/// <summary>
-		/// 构建输出的文件路径
-		/// </summary>
-		public string BuildOutputFilePath { set; get; }
-
-		/// <summary>
-		/// 补丁包的源文件路径
-		/// </summary>
-		public string PackageSourceFilePath { set; get; }
-
-		/// <summary>
-		/// 补丁包的目标文件路径
-		/// </summary>
-		public string PackageDestFilePath { set; get; }
-
-		/// <summary>
-		/// 加密生成文件的路径
-		/// 注意：如果未加密该路径为空
-		/// </summary>
-		public string EncryptedFilePath { set; get; }
-		#endregion
-
-
 		/// <summary>
 		/// 资源包名称
 		/// </summary>
@@ -64,14 +15,9 @@ namespace YooAsset.Editor
 
 		/// <summary>
 		/// 参与构建的资源列表
-		/// 注意：不包含零依赖资源和冗余资源
+		/// 注意：不包含零依赖资源
 		/// </summary>
-		public readonly List<BuildAssetInfo> AllMainAssets = new List<BuildAssetInfo>();
-
-		/// <summary>
-		/// Bundle文件的加载方法
-		/// </summary>
-		public EBundleLoadMethod LoadMethod { set; get; }
+		public readonly List<BuildAssetInfo> BuildinAssets = new List<BuildAssetInfo>();
 
 		/// <summary>
 		/// 是否为原生文件
@@ -80,29 +26,15 @@ namespace YooAsset.Editor
 		{
 			get
 			{
-				foreach (var assetInfo in AllMainAssets)
+				foreach (var asset in BuildinAssets)
 				{
-					if (assetInfo.IsRawAsset)
+					if (asset.IsRawAsset)
 						return true;
 				}
 				return false;
 			}
 		}
 
-		/// <summary>
-		/// 是否为加密文件
-		/// </summary>
-		public bool IsEncryptedFile
-		{
-			get
-			{
-				if (string.IsNullOrEmpty(EncryptedFilePath))
-					return false;
-				else
-					return true;
-			}
-		}
-
 
 		public BuildBundleInfo(string bundleName)
 		{
@@ -117,7 +49,7 @@ namespace YooAsset.Editor
 			if (IsContainsAsset(assetInfo.AssetPath))
 				throw new System.Exception($"Asset is existed : {assetInfo.AssetPath}");
 
-			AllMainAssets.Add(assetInfo);
+			BuildinAssets.Add(assetInfo);
 		}
 
 		/// <summary>
@@ -125,7 +57,7 @@ namespace YooAsset.Editor
 		/// </summary>
 		public bool IsContainsAsset(string assetPath)
 		{
-			foreach (var assetInfo in AllMainAssets)
+			foreach (var assetInfo in BuildinAssets)
 			{
 				if (assetInfo.AssetPath == assetPath)
 				{
@@ -140,8 +72,8 @@ namespace YooAsset.Editor
 		/// </summary>
 		public string[] GetBundleTags()
 		{
-			List<string> result = new List<string>(AllMainAssets.Count);
-			foreach (var assetInfo in AllMainAssets)
+			List<string> result = new List<string>(BuildinAssets.Count);
+			foreach (var assetInfo in BuildinAssets)
 			{
 				foreach (var assetTag in assetInfo.BundleTags)
 				{
@@ -153,35 +85,27 @@ namespace YooAsset.Editor
 		}
 
 		/// <summary>
-		/// 获取构建的资源路径列表
+		/// 获取文件的扩展名
 		/// </summary>
-		public string[] GetAllMainAssetPaths()
+		public string GetAppendExtension()
 		{
-			return AllMainAssets.Select(t => t.AssetPath).ToArray();
+			return System.IO.Path.GetExtension(BundleName);
 		}
 
 		/// <summary>
-		/// 获取该资源包内的所有资源（包括零依赖资源和冗余资源）
+		/// 获取构建的资源路径列表
 		/// </summary>
-		public List<string> GetAllBuiltinAssetPaths()
+		public string[] GetBuildinAssetPaths()
 		{
-			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;
+			return BuildinAssets.Select(t => t.AssetPath).ToArray();
+		}
+
+		/// <summary>
+		/// 获取所有写入补丁清单的资源
+		/// </summary>
+		public BuildAssetInfo[] GetAllPatchAssetInfos()
+		{
+			return BuildinAssets.Where(t => t.CollectorType == ECollectorType.MainAssetCollector).ToArray();
 		}
 
 		/// <summary>
@@ -193,33 +117,8 @@ namespace YooAsset.Editor
 			AssetBundleBuild build = new AssetBundleBuild();
 			build.assetBundleName = BundleName;
 			build.assetBundleVariant = string.Empty;
-			build.assetNames = GetAllMainAssetPaths();
+			build.assetNames = GetBuildinAssetPaths();
 			return build;
 		}
-
-		/// <summary>
-		/// 获取所有写入补丁清单的资源
-		/// </summary>
-		public BuildAssetInfo[] GetAllManifestAssetInfos()
-		{
-			return AllMainAssets.Where(t => t.CollectorType == ECollectorType.MainAssetCollector).ToArray();
-		}
-
-		/// <summary>
-		/// 创建PackageBundle类
-		/// </summary>
-		internal PackageBundle CreatePackageBundle()
-		{
-			PackageBundle packageBundle = new PackageBundle();
-			packageBundle.BundleName = BundleName;
-			packageBundle.FileHash = PackageFileHash;
-			packageBundle.FileCRC = PackageFileCRC;
-			packageBundle.FileSize = PackageFileSize;
-			packageBundle.UnityCRC = PackageUnityCRC;
-			packageBundle.IsRawFile = IsRawFile;
-			packageBundle.LoadMethod = (byte)LoadMethod;
-			packageBundle.Tags = GetBundleTags();
-			return packageBundle;
-		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildMapContext.cs

@@ -8,13 +8,6 @@ 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>
 		/// 参与构建的资源总数
 		/// 说明：包括主动收集的资源以及其依赖的所有资源
@@ -22,20 +15,9 @@ namespace YooAsset.Editor
 		public int AssetFileCount;
 
 		/// <summary>
-		/// 收集命令
+		/// 资源包列表
 		/// </summary>
-		public CollectCommand Command { set; get; }
-
-		/// <summary>
-		/// 资源包信息列表
-		/// </summary>
-		public Dictionary<string, BuildBundleInfo>.ValueCollection Collection
-		{
-			get
-			{
-				return _bundleInfoDic.Values;
-			}
-		}
+		public readonly List<BuildBundleInfo> BundleInfos = new List<BuildBundleInfo>(1000);
 
 
 		/// <summary>
@@ -43,11 +25,11 @@ namespace YooAsset.Editor
 		/// </summary>
 		public void PackAsset(BuildAssetInfo assetInfo)
 		{
-			string bundleName = assetInfo.BundleName;
+			string bundleName = assetInfo.GetBundleName();
 			if (string.IsNullOrEmpty(bundleName))
 				throw new Exception("Should never get here !");
 
-			if (_bundleInfoDic.TryGetValue(bundleName, out BuildBundleInfo bundleInfo))
+			if (TryGetBundleInfo(bundleName, out BuildBundleInfo bundleInfo))
 			{
 				bundleInfo.PackAsset(assetInfo);
 			}
@@ -55,28 +37,45 @@ namespace YooAsset.Editor
 			{
 				BuildBundleInfo newBundleInfo = new BuildBundleInfo(bundleName);
 				newBundleInfo.PackAsset(assetInfo);
-				_bundleInfoDic.Add(bundleName, newBundleInfo);
+				BundleInfos.Add(newBundleInfo);
 			}
 		}
 
 		/// <summary>
-		/// 是否包含资源包
+		/// 获取所有的打包资源
 		/// </summary>
-		public bool IsContainsBundle(string bundleName)
+		public List<BuildAssetInfo> GetAllAssets()
 		{
-			return _bundleInfoDic.ContainsKey(bundleName);
-		}
-
-		/// <summary>
-		/// 获取资源包信息，如果没找到返回NULL
-		/// </summary>
-		public BuildBundleInfo GetBundleInfo(string bundleName)
-		{
-			if (_bundleInfoDic.TryGetValue(bundleName, out BuildBundleInfo result))
+			List<BuildAssetInfo> result = new List<BuildAssetInfo>(BundleInfos.Count);
+			foreach (var bundleInfo in BundleInfos)
 			{
-				return result;
+				result.AddRange(bundleInfo.BuildinAssets);
 			}
-			throw new Exception($"Not found bundle : {bundleName}");
+			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}");
 		}
 
 		/// <summary>
@@ -84,8 +83,8 @@ namespace YooAsset.Editor
 		/// </summary>
 		public UnityEditor.AssetBundleBuild[] GetPipelineBuilds()
 		{
-			List<UnityEditor.AssetBundleBuild> builds = new List<UnityEditor.AssetBundleBuild>(_bundleInfoDic.Count);
-			foreach (var bundleInfo in _bundleInfoDic.Values)
+			List<UnityEditor.AssetBundleBuild> builds = new List<UnityEditor.AssetBundleBuild>(BundleInfos.Count);
+			foreach (var bundleInfo in BundleInfos)
 			{
 				if (bundleInfo.IsRawFile == false)
 					builds.Add(bundleInfo.CreatePipelineBuild());
@@ -94,15 +93,25 @@ namespace YooAsset.Editor
 		}
 
 		/// <summary>
-		/// 创建着色器信息类
+		/// 是否包含资源包
 		/// </summary>
-		public void CreateShadersBundleInfo(string shadersBundleName)
+		public bool IsContainsBundle(string bundleName)
 		{
-			if (IsContainsBundle(shadersBundleName) == false)
+			return TryGetBundleInfo(bundleName, out BuildBundleInfo bundleInfo);
+		}
+
+		public bool TryGetBundleInfo(string bundleName, out BuildBundleInfo result)
+		{
+			foreach (var bundleInfo in BundleInfos)
 			{
-				var shaderBundleInfo = new BuildBundleInfo(shadersBundleName);
-				_bundleInfoDic.Add(shadersBundleName, shaderBundleInfo);
+				if (bundleInfo.BundleName == bundleName)
+				{
+					result = bundleInfo;
+					return true;
+				}
 			}
+			result = null;
+			return false;
 		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildMapCreater.cs

@@ -0,0 +1,136 @@
+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(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/BuildMapCreater.cs.meta

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

Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs

@@ -18,21 +18,6 @@ namespace YooAsset.Editor
 			/// 生成代码防裁剪配置
 			/// </summary>
 			public bool WriteLinkXML = true;
-
-			/// <summary>
-			/// 缓存服务器地址
-			/// </summary>
-			public string CacheServerHost;
-
-			/// <summary>
-			/// 缓存服务器端口
-			/// </summary>
-			public int CacheServerPort;
-
-			/// <summary>
-			/// 修复图集资源冗余问题
-			/// </summary>
-			public bool FixSpriteAtlasRedundancy = false;
 		}
 
 		/// <summary>
@@ -42,14 +27,9 @@ namespace YooAsset.Editor
 
 
 		/// <summary>
-		/// 内置资源的根目录
+		/// 输出的根目录
 		/// </summary>
-		public string StreamingAssetsRoot;
-
-		/// <summary>
-		/// 构建输出的根目录
-		/// </summary>
-		public string BuildOutputRoot;
+		public string OutputRoot;
 
 		/// <summary>
 		/// 构建的平台
@@ -67,51 +47,43 @@ namespace YooAsset.Editor
 		public EBuildMode BuildMode;
 
 		/// <summary>
-		/// 构建的包裹名称
+		/// 构建的版本（资源版本号）
 		/// </summary>
-		public string PackageName;
+		public int BuildVersion;
 
 		/// <summary>
-		/// 构建的包裹版本
+		/// 内置资源标签集合（首包资源标签）
+		/// 注意：分号为分隔符
 		/// </summary>
-		public string PackageVersion;
+		public string BuildinTags;
 
 
-		/// <summary>
-		/// 是否显示普通日志
-		/// </summary>
-		public bool EnableLog = true;
-		
 		/// <summary>
 		/// 验证构建结果
 		/// </summary>
 		public bool VerifyBuildingResult = false;
 
 		/// <summary>
-		/// 共享资源的打包规则
+		/// 启用可寻址资源定位
 		/// </summary>
-		public ISharedPackRule SharedPackRule = null;
+		public bool EnableAddressable = false;
 
 		/// <summary>
-		/// 资源的加密接口
+		/// 追加文件扩展名
+		/// </summary>
+		public bool AppendFileExtension = false;
+
+		/// <summary>
+		/// 拷贝内置资源文件到StreamingAssets目录（首包资源文件）
+		/// </summary>
+		public bool CopyBuildinTagFiles = false;
+
+
+		/// <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>
@@ -126,5 +98,16 @@ namespace YooAsset.Editor
 		/// 忽略类型树变化
 		/// </summary>
 		public bool IgnoreTypeTreeChanges = true;
+
+
+		/// <summary>
+		/// 获取内置资源标签列表（首包资源标签）
+		/// </summary>
+		public List<string> GetBuildinTags()
+		{
+			return StringUtility.StringToStringList(BuildinTags, ';');
+		}
 	}
+
+
 }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildParametersContext.cs

@@ -7,69 +7,36 @@ namespace YooAsset.Editor
 {
 	public class BuildParametersContext : IContextObject
 	{
-		private string _pipelineOutputDirectory = string.Empty;
-		private string _packageOutputDirectory = string.Empty;
-		private string _packageRootDirectory = string.Empty;
-		private string _streamingAssetsDirectory = string.Empty;
+		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>
-		/// <returns></returns>
-		public string GetPipelineOutputDirectory()
+		public string GetPackageDirectory()
 		{
-			if (string.IsNullOrEmpty(_pipelineOutputDirectory))
-			{
-				_pipelineOutputDirectory = $"{Parameters.BuildOutputRoot}/{Parameters.BuildTarget}/{Parameters.PackageName}/{YooAssetSettings.OutputFolderName}";
-			}
-			return _pipelineOutputDirectory;
-		}
-
-		/// <summary>
-		/// 获取本次构建的补丁输出目录
-		/// </summary>
-		public string GetPackageOutputDirectory()
-		{
-			if (string.IsNullOrEmpty(_packageOutputDirectory))
-			{
-				_packageOutputDirectory = $"{Parameters.BuildOutputRoot}/{Parameters.BuildTarget}/{Parameters.PackageName}/{Parameters.PackageVersion}";
-			}
-			return _packageOutputDirectory;
-		}
-
-		/// <summary>
-		/// 获取本次构建的补丁根目录
-		/// </summary>
-		public string GetPackageRootDirectory()
-		{
-			if (string.IsNullOrEmpty(_packageRootDirectory))
-			{
-				_packageRootDirectory = $"{Parameters.BuildOutputRoot}/{Parameters.BuildTarget}/{Parameters.PackageName}";
-			}
-			return _packageRootDirectory;
-		}
-
-		/// <summary>
-		/// 获取内置资源的目录
-		/// </summary>
-		public string GetStreamingAssetsDirectory()
-		{
-			if (string.IsNullOrEmpty(_streamingAssetsDirectory))
-			{
-				_streamingAssetsDirectory = $"{Parameters.StreamingAssetsRoot}/{Parameters.PackageName}";
-			}
-			return _streamingAssetsDirectory;
+			return $"{Parameters.OutputRoot}/{Parameters.BuildTarget}/{Parameters.BuildVersion}";
 		}
 
 		/// <summary>
@@ -118,9 +85,11 @@ namespace YooAsset.Editor
 			if (Parameters.BuildMode == EBuildMode.SimulateBuild)
 				throw new Exception("Should never get here !");
 
+			if (Parameters.BuildMode == EBuildMode.DryRunBuild)
+				throw new Exception($"SBP not support {nameof(EBuildMode.DryRunBuild)} build mode !");
+
 			var targetGroup = BuildPipeline.GetBuildTargetGroup(Parameters.BuildTarget);
-			var pipelineOutputDirectory = GetPipelineOutputDirectory();
-			var buildParams = new UnityEditor.Build.Pipeline.BundleBuildParameters(Parameters.BuildTarget, targetGroup, pipelineOutputDirectory);
+			var buildParams = new UnityEditor.Build.Pipeline.BundleBuildParameters(Parameters.BuildTarget, targetGroup, PipelineOutputDirectory);
 
 			if (Parameters.CompressOption == ECompressOption.Uncompressed)
 				buildParams.BundleCompression = UnityEngine.BuildCompression.Uncompressed;
@@ -131,15 +100,31 @@ namespace YooAsset.Editor
 			else
 				throw new System.NotImplementedException(Parameters.CompressOption.ToString());
 
+			if (Parameters.BuildMode == EBuildMode.ForceRebuild)
+				buildParams.UseCache = false;
 			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;
 		}
+
+		/// <summary>
+		/// 获取构建的耗时（单位：秒）
+		/// </summary>
+		public float GetBuildingSeconds()
+		{
+			float seconds = _buildWatch.ElapsedMilliseconds / 1000f;
+			return seconds;
+		}
+		public void BeginWatch()
+		{
+			_buildWatch.Start();
+		}
+		public void StopWatch()
+		{
+			_buildWatch.Stop();
+		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildReport.meta

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

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

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

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

@@ -0,0 +1,95 @@
+using System;
+using System.Linq;
+using System.Collections;
+using System.Collections.Generic;
+
+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;
+
+		/// <summary>
+		/// 文件校验码
+		/// </summary>
+		public string CRC;
+
+		/// <summary>
+		/// 文件大小（字节数）
+		/// </summary>
+		public long SizeBytes;
+
+		/// <summary>
+		/// Tags
+		/// </summary>
+		public string[] Tags;
+
+		/// <summary>
+		/// Flags
+		/// </summary>
+		public int Flags;
+
+
+		/// <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;
+		}
+
+		/// <summary>
+		/// 获取资源分类标签的字符串
+		/// </summary>
+		public string GetTagsString()
+		{
+			if (Tags != null)
+				return String.Join(";", Tags);
+			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/ReportSummary.cs

@@ -44,14 +44,14 @@ namespace YooAsset.Editor
 		public EBuildMode BuildMode;
 
 		/// <summary>
-		/// 构建包裹名称
+		/// 构建版本
 		/// </summary>
-		public string BuildPackageName;
+		public int BuildVersion;
 
 		/// <summary>
-		/// 构建包裹版本
+		/// 内置资源标签
 		/// </summary>
-		public string BuildPackageVersion;
+		public string BuildinTags;
 
 		/// <summary>
 		/// 启用可寻址资源定位
@@ -59,24 +59,24 @@ namespace YooAsset.Editor
 		public bool EnableAddressable;
 
 		/// <summary>
-		/// 资源定位地址大小写不敏感
+		/// 追加文件扩展名
 		/// </summary>
-		public bool LocationToLower;
+		public bool AppendFileExtension;
 
 		/// <summary>
-		/// 包含资源GUID数据
+		/// 拷贝内置资源文件
 		/// </summary>
-		public bool IncludeAssetGUID;
+		public bool CopyBuildinTagFiles;
 
 		/// <summary>
-		/// 资源包名唯一化
+		/// 自动收集着色器
 		/// </summary>
-		public bool UniqueBundleName;
+		public bool AutoCollectShaders;
 
 		/// <summary>
-		/// 共享资源的打包规则类名
+		/// 自动收集的着色器资源包名称
 		/// </summary>
-		public string SharedPackRuleClassName;
+		public string ShadersBundleName;
 
 		/// <summary>
 		/// 加密服务类名称
@@ -84,16 +84,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

@@ -1,33 +0,0 @@
-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/BuildResult.cs

@@ -1,29 +0,0 @@
-
-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/BuildRunner.cs

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

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

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

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

@@ -1,68 +0,0 @@
-using System.Collections.Generic;
-using UnityEditor.Build.Content;
-using UnityEngine.U2D;
-using UnityEditor.Build.Pipeline.Injector;
-using UnityEditor.Build.Pipeline.Interfaces;
-using UnityEngine;
-using System.Linq;
-
-namespace UnityEditor.Build.Pipeline.Tasks
-{
-	/// <summary>
-	/// Ref https://zhuanlan.zhihu.com/p/586918159
-	/// </summary>
-	public class RemoveSpriteAtlasRedundancy : IBuildTask
-	{
-		public int Version => 1;
-
-		[InjectContext]
-		IBundleWriteData writeDataParam;
-
-		public ReturnCode Run()
-		{
-#if UNITY_2020_3_OR_NEWER
-			BundleWriteData writeData = (BundleWriteData)writeDataParam;
-
-			// 图集引用的精灵图片集合
-			HashSet<GUID> spriteGuids = new HashSet<GUID>();
-			foreach (var pair in writeData.FileToObjects)
-			{
-				foreach (ObjectIdentifier objectIdentifier in pair.Value)
-				{
-					var assetPath = AssetDatabase.GUIDToAssetPath(objectIdentifier.guid);
-					var assetType = AssetDatabase.GetMainAssetTypeAtPath(assetPath);
-					if (assetType == typeof(SpriteAtlas))
-					{
-						var spritePaths = AssetDatabase.GetDependencies(assetPath, false);
-						foreach (string spritePath in spritePaths)
-						{
-							GUID spriteGuild = AssetDatabase.GUIDFromAssetPath(spritePath);
-							spriteGuids.Add(spriteGuild);
-						}
-					}
-				}
-			}
-
-			// 移除图集引用的精力图片对象
-			foreach (var pair in writeData.FileToObjects)
-			{
-				List<ObjectIdentifier> objectIdentifiers = pair.Value;
-				for (int i = objectIdentifiers.Count - 1; i >= 0; i--)
-				{
-					ObjectIdentifier objectIdentifier = objectIdentifiers[i];
-					if (spriteGuids.Contains(objectIdentifier.guid))
-					{
-						if (objectIdentifier.localIdentifierInFile == 2800000)
-						{
-							// 删除图集散图的冗余纹理
-							objectIdentifiers.RemoveAt(i);
-						}
-					}
-				}
-			}
-#endif
-
-			return ReturnCode.Success;
-		}
-	}
-}

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

@@ -1,54 +0,0 @@
-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(bool fixSpriteAtlasRedundancy, 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());
-			if (fixSpriteAtlasRedundancy)
-				buildTasks.Add(new RemoveSpriteAtlasRedundancy());
-			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/TaskBuilding.cs

@@ -10,7 +10,7 @@ namespace YooAsset.Editor
 	[TaskAttribute("资源构建内容打包")]
 	public class TaskBuilding : IBuildTask
 	{
-		public class BuildResultContext : IContextObject
+		public class UnityManifestContext : IContextObject
 		{
 			public AssetBundleManifest UnityManifest;
 		}
@@ -25,26 +25,40 @@ namespace YooAsset.Editor
 			if (buildMode == EBuildMode.SimulateBuild)
 				return;
 
-			// 开始构建
-			string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
-			BuildAssetBundleOptions buildOptions = buildParametersContext.GetPipelineBuildOptions();
-			AssetBundleManifest buildResults = BuildPipeline.BuildAssetBundles(pipelineOutputDirectory, buildMapContext.GetPipelineBuilds(), buildOptions, buildParametersContext.Parameters.BuildTarget);
-			if (buildResults == null)
-			{
+			BuildAssetBundleOptions opt = buildParametersContext.GetPipelineBuildOptions();
+			AssetBundleManifest unityManifest = BuildPipeline.BuildAssetBundles(buildParametersContext.PipelineOutputDirectory, buildMapContext.GetPipelineBuilds(), opt, buildParametersContext.Parameters.BuildTarget);
+			if (unityManifest == null)
 				throw new Exception("构建过程中发生错误！");
-			}
 
+			BuildRunner.Log("Unity引擎打包成功！");
+			UnityManifestContext unityManifestContext = new UnityManifestContext();
+			unityManifestContext.UnityManifest = unityManifest;
+			context.SetContextObject(unityManifestContext);
+
+			// 拷贝原生文件
 			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
 			{
-				string unityOutputManifestFilePath = $"{pipelineOutputDirectory}/{YooAssetSettings.OutputFolderName}";
-				if (System.IO.File.Exists(unityOutputManifestFilePath) == false)
-					throw new Exception("构建过程中发生严重错误！请查阅上下文日志！");
+				CopyRawBundle(buildMapContext, buildParametersContext);
 			}
+		}
 
-			BuildLogger.Log("Unity引擎打包成功！");
-			BuildResultContext buildResultContext = new BuildResultContext();
-			buildResultContext.UnityManifest = buildResults;
-			context.SetContextObject(buildResultContext);
+		/// <summary>
+		/// 拷贝原生文件
+		/// </summary>
+		private void CopyRawBundle(BuildMapContext buildMapContext, 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);
+					}
+				}
+			}
 		}
 	}
 }

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

@@ -2,17 +2,18 @@
 using System.Linq;
 using System.Collections;
 using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
 
 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 class SBPBuildResultContext : IContextObject
 		{
 			public IBundleBuildResults Results;
 		}
@@ -33,26 +34,49 @@ namespace YooAsset.Editor
 			// 开始构建
 			IBundleBuildResults buildResults;
 			var buildParameters = buildParametersContext.GetSBPBuildParameters();
-			var taskList = SBPBuildTasks.Create(buildParametersContext.Parameters.SBPParameters.FixSpriteAtlasRedundancy, buildMapContext.Command.ShadersBundleName);
+			var taskList = DefaultBuildTasks.Create(DefaultBuildTasks.Preset.AssetBundleBuiltInShaderExtraction);
 			ReturnCode exitCode = ContentPipeline.BuildAssetBundles(buildParameters, buildContent, out buildResults, taskList);
 			if (exitCode < 0)
 			{
 				throw new Exception($"构建过程中发生错误 : {exitCode}");
 			}
 
-			// 创建着色器信息
-			// 说明：解决因为着色器资源包导致验证失败。
-			// 例如：当项目里没有着色器，如果有依赖内置着色器就会验证失败。
-			string shadersBundleName = buildMapContext.Command.ShadersBundleName;
-			if (buildResults.BundleInfos.ContainsKey(shadersBundleName))
-			{
-				buildMapContext.CreateShadersBundleInfo(shadersBundleName);
-			}
-
-			BuildLogger.Log("Unity引擎打包成功！");
-			BuildResultContext buildResultContext = new BuildResultContext();
+			BuildRunner.Log("Unity引擎打包成功！");
+			SBPBuildResultContext buildResultContext = new SBPBuildResultContext();
 			buildResultContext.Results = buildResults;
 			context.SetContextObject(buildResultContext);
+
+			// 添加Unity内置资源包信息
+			if (buildResults.BundleInfos.Keys.Any(t => t == YooAssetSettings.UnityBuiltInShadersBundleName))
+			{
+				BuildBundleInfo builtInBundleInfo = new BuildBundleInfo(YooAssetSettings.UnityBuiltInShadersBundleName);
+				buildMapContext.BundleInfos.Add(builtInBundleInfo);
+			}
+
+			// 拷贝原生文件
+			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
+			{
+				CopyRawBundle(buildMapContext, buildParametersContext);
+			}
+		}
+
+		/// <summary>
+		/// 拷贝原生文件
+		/// </summary>
+		private void CopyRawBundle(BuildMapContext buildMapContext, 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);
+					}
+				}
+			}
 		}
 	}
 }

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

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

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

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

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

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

@@ -1,384 +0,0 @@
-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.Command.EnableAddressable;
-			manifest.LocationToLower = buildMapContext.Command.LocationToLower;
-			manifest.IncludeAssetGUID = buildMapContext.Command.IncludeAssetGUID;
-			manifest.OutputNameStyle = (int)buildParameters.OutputNameStyle;
-			manifest.PackageName = buildParameters.PackageName;
-			manifest.PackageVersion = buildParameters.PackageVersion;
-
-			// 填充资源包集合
-			manifest.BundleList = GetAllPackageBundle(context);
-			CacheBundleIDs(manifest);
-
-			// 填充主资源集合
-			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.Command.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.GetAllManifestAssetInfos();
-				foreach (var assetInfo in assetInfos)
-				{
-					PackageAsset packageAsset = new PackageAsset();
-					packageAsset.Address = buildMapContext.Command.EnableAddressable ? assetInfo.Address : string.Empty;
-					packageAsset.AssetPath = assetInfo.AssetPath;
-					packageAsset.AssetGUID = buildMapContext.Command.IncludeAssetGUID ? assetInfo.AssetGUID : string.Empty;
-					packageAsset.AssetTags = assetInfo.AssetTags.ToArray();
-					packageAsset.BundleID = GetCachedBundleID(assetInfo.BundleName);
-					packageAsset.DependIDs = GetAssetBundleDependIDs(packageAsset.BundleID, assetInfo, manifest);
-					result.Add(packageAsset);
-				}
-			}
-			return result;
-		}
-		private int[] GetAssetBundleDependIDs(int mainBundleID, BuildAssetInfo assetInfo, PackageManifest manifest)
-		{
-			HashSet<int> result = new HashSet<int>();
-			foreach (var dependAssetInfo in assetInfo.AllDependAssetInfos)
-			{
-				if (dependAssetInfo.HasBundleName())
-				{
-					int bundleID = GetCachedBundleID(dependAssetInfo.BundleName);
-					if (mainBundleID != bundleID)
-					{
-						if (result.Contains(bundleID) == false)
-							result.Add(bundleID);
-					}
-				}
-			}
-			return result.ToArray();
-		}
-
-		/// <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)
-				{
-					HashSet<int> newDependIDs = new HashSet<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];
-			HashSet<string> newTags = new HashSet<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 CacheBundleIDs(PackageManifest manifest)
-		{
-			UnityEngine.Debug.Assert(manifest.BundleList.Count != 0, "Manifest bundle list is empty !");
-			for (int index = 0; index < manifest.BundleList.Count; index++)
-			{
-				string bundleName = manifest.BundleList[index].BundleName;
-				_cachedBundleID.Add(bundleName, index);
-			}
-		}
-
-		private void UpdateScriptPipelineReference(PackageManifest manifest, TaskBuilding_SBP.BuildResultContext buildResultContext)
-		{
-			int progressValue;
-			int totalCount = manifest.BundleList.Count;
-
-			// 缓存资源包依赖
-			_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);
-				int pro = ++progressValue;
-				if (pro % 100 == 0)
-				{
-					EditorTools.DisplayProgressBar("缓存资源包依赖列表", pro, totalCount);
-				}
-			}
-			EditorTools.ClearProgressBar();
-
-			// 计算资源包引用列表
-			foreach (var packageBundle in manifest.BundleList)
-			{
-				packageBundle.ReferenceIDs = GetBundleRefrenceIDs(manifest, packageBundle);
-				int pro = ++progressValue;
-				if (pro % 100 == 0)
-				{
-					EditorTools.DisplayProgressBar("计算资源包引用关系", pro, totalCount);
-				}
-			}
-			EditorTools.ClearProgressBar();
-		}
-		private void UpdateBuiltinPipelineReference(PackageManifest manifest, TaskBuilding.BuildResultContext buildResultContext)
-		{
-			int progressValue;
-			int totalCount = manifest.BundleList.Count;
-
-			// 缓存资源包依赖
-			_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);
-				int pro = ++progressValue;
-				if (pro % 100 == 0)
-				{
-					EditorTools.DisplayProgressBar("缓存资源包依赖列表", pro, totalCount);
-				}
-			}
-			EditorTools.ClearProgressBar();
-
-			// 计算资源包引用列表
-			progressValue = 0;
-			foreach (var packageBundle in manifest.BundleList)
-			{
-				packageBundle.ReferenceIDs = GetBundleRefrenceIDs(manifest, packageBundle);
-				int pro = ++progressValue;
-				if (pro % 100 == 0)
-				{
-					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);
-				}
-			}
-
-			HashSet<int> result = new HashSet<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

@@ -1,79 +0,0 @@
-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.PackageSourceFilePath, bundleInfo.PackageDestFilePath, true);
-				EditorTools.DisplayProgressBar("拷贝补丁文件", ++progressValue, fileTotalCount);
-			}
-			EditorTools.ClearProgressBar();
-		}
-	}
-}

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

@@ -0,0 +1,225 @@
+using System;
+using System.Linq;
+using System.Collections;
+using System.Collections.Generic;
+
+using UnityEditor.Build.Pipeline;
+using UnityEditor.Build.Pipeline.Interfaces;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("创建补丁清单文件")]
+	public class TaskCreatePatchManifest : IBuildTask
+	{
+		void IBuildTask.Run(BuildContext context)
+		{
+			CreatePatchManifestFile(context);
+		}
+
+		/// <summary>
+		/// 创建补丁清单文件到输出目录
+		/// </summary>
+		private void CreatePatchManifestFile(BuildContext context)
+		{
+			var buildParameters = context.GetContextObject<BuildParametersContext>();
+			var buildMapContext = context.GetContextObject<BuildMapContext>();
+			var encryptionContext = context.GetContextObject<TaskEncryption.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);
+
+			// 更新Unity内置资源包的引用关系
+			if (buildParameters.Parameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
+			{
+				var buildResultContext = context.GetContextObject<TaskBuilding_SBP.SBPBuildResultContext>();
+				UpdateBuiltInBundleReference(patchManifest, buildResultContext.Results);
+			}
+
+			// 创建补丁清单文件
+			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(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(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}");
+		}
+
+		/// <summary>
+		/// 更新Unity内置资源包的引用关系
+		/// </summary>
+		private void UpdateBuiltInBundleReference(PatchManifest patchManifest, IBundleBuildResults buildResults)
+		{
+			// 获取所有依赖内置资源包的资源包列表
+			List<string> builtInBundleReferenceList = new List<string>();
+			foreach (var valuePair in buildResults.BundleInfos)
+			{
+				if (valuePair.Value.Dependencies.Any(t => t == YooAssetSettings.UnityBuiltInShadersBundleName))
+					builtInBundleReferenceList.Add(valuePair.Key);
+			}
+
+			// 检测依赖交集并更新依赖ID
+			int builtInBundleId = patchManifest.BundleList.Count - 1;
+			foreach (var patchAsset in patchManifest.AssetList)
+			{
+				List<string> dependBundles = GetPatchAssetAllDependBundles(patchManifest, patchAsset);
+				List<string> conflictAssetPathList = dependBundles.Intersect(builtInBundleReferenceList).ToList();
+				if (conflictAssetPathList.Count > 0)
+				{
+					List<int> newDependIDs = new List<int>(patchAsset.DependIDs);
+					newDependIDs.Add(builtInBundleId);
+					patchAsset.DependIDs = newDependIDs.ToArray();
+				}
+			}
+		}
+		private List<string> GetPatchAssetAllDependBundles(PatchManifest patchManifest, PatchAsset patchAsset)
+		{
+			List<string> result = new List<string>();
+			string mainBundle = patchManifest.BundleList[patchAsset.BundleID].BundleName;
+			result.Add(mainBundle);
+			foreach (var dependID in patchAsset.DependIDs)
+			{
+				string dependBundle = patchManifest.BundleList[dependID].BundleName;
+				result.Add(dependBundle);
+			}
+			return result;
+		}
+	}
+}

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

@@ -0,0 +1,105 @@
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("制作补丁包")]
+	public class TaskCreatePatchPackage : IBuildTask
+	{
+		void IBuildTask.Run(BuildContext context)
+		{
+			var buildParameters = context.GetContextObject<BuildParametersContext>();
+			var buildMode = buildParameters.Parameters.BuildMode;
+			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
+			{
+				CopyPatchFiles(buildParameters);
+			}
+		}
+
+		/// <summary>
+		/// 拷贝补丁文件到补丁包目录
+		/// </summary>
+		private void CopyPatchFiles(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);
+			}
+
+			if (buildParameters.Parameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
+			{
+				// 拷贝构建日志
+				{
+					string sourcePath = $"{buildParameters.PipelineOutputDirectory}/buildlogtep.json";
+					string destPath = $"{packageDirectory}/buildlogtep.json";
+					EditorTools.CopyFile(sourcePath, destPath, true);
+				}
+
+				// 拷贝代码防裁剪配置
+				if (buildParameters.Parameters.SBPParameters.WriteLinkXML)
+				{
+					string sourcePath = $"{buildParameters.PipelineOutputDirectory}/link.xml";
+					string destPath = $"{packageDirectory}/link.xml";
+					EditorTools.CopyFile(sourcePath, destPath, true);
+				}
+			}
+			else
+			{
+				// 拷贝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,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using UnityEditor;
 
 namespace YooAsset.Editor
@@ -13,21 +12,23 @@ namespace YooAsset.Editor
 		{
 			var buildParameters = context.GetContextObject<BuildParametersContext>();
 			var buildMapContext = context.GetContextObject<BuildMapContext>();
-			var manifestContext = context.GetContextObject<ManifestContext>();
+			buildParameters.StopWatch();
 
 			var buildMode = buildParameters.Parameters.BuildMode;
 			if (buildMode != EBuildMode.SimulateBuild)
 			{
-				CreateReportFile(buildParameters, buildMapContext, manifestContext);
+				CreateReportFile(buildParameters, buildMapContext);
+			}
+			else
+			{
+				float buildSeconds = buildParameters.GetBuildingSeconds();
+				BuildRunner.Info($"Build time consuming {buildSeconds} seconds.");
 			}
 		}
 
-		private void CreateReportFile(BuildParametersContext buildParametersContext, BuildMapContext buildMapContext, ManifestContext manifestContext)
+		private void CreateReportFile(BuildParametersContext buildParameters, BuildMapContext buildMapContext)
 		{
-			var buildParameters = buildParametersContext.Parameters;
-
-			string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
-			PackageManifest manifest = manifestContext.Manifest;
+			PatchManifest patchManifest = AssetBundleBuilderHelper.LoadPatchManifestFile(buildParameters.PipelineOutputDirectory, buildParameters.Parameters.BuildVersion);
 			BuildReport buildReport = new BuildReport();
 
 			// 概述信息
@@ -39,92 +40,87 @@ namespace YooAsset.Editor
 #endif
 				buildReport.Summary.UnityVersion = UnityEngine.Application.unityVersion;
 				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.Command.EnableAddressable;
-				buildReport.Summary.LocationToLower = buildMapContext.Command.LocationToLower;
-				buildReport.Summary.IncludeAssetGUID = buildMapContext.Command.IncludeAssetGUID;
-				buildReport.Summary.UniqueBundleName = buildMapContext.Command.UniqueBundleName;
-				buildReport.Summary.SharedPackRuleClassName = buildParameters.SharedPackRule == null ?
-					"null" : buildParameters.SharedPackRule.GetType().FullName;
-				buildReport.Summary.EncryptionServicesClassName = buildParameters.EncryptionServices == null ?
-					"null" : buildParameters.EncryptionServices.GetType().FullName;
+				buildReport.Summary.BuildSeconds = (int)buildParameters.GetBuildingSeconds();
+				buildReport.Summary.BuildTarget = buildParameters.Parameters.BuildTarget;
+				buildReport.Summary.BuildPipeline = buildParameters.Parameters.BuildPipeline;
+				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.CopyBuildinTagFiles = buildParameters.Parameters.CopyBuildinTagFiles;
+				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.OutputNameStyle = buildParameters.OutputNameStyle;
-				buildReport.Summary.CompressOption = buildParameters.CompressOption;
-				buildReport.Summary.DisableWriteTypeTree = buildParameters.DisableWriteTypeTree;
-				buildReport.Summary.IgnoreTypeTreeChanges = buildParameters.IgnoreTypeTreeChanges;
+				buildReport.Summary.CompressOption = buildParameters.Parameters.CompressOption;
+				buildReport.Summary.DisableWriteTypeTree = buildParameters.Parameters.DisableWriteTypeTree;
+				buildReport.Summary.IgnoreTypeTreeChanges = buildParameters.Parameters.IgnoreTypeTreeChanges;
 
 				// 构建结果
 				buildReport.Summary.AssetFileTotalCount = buildMapContext.AssetFileCount;
-				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.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.AssetInfos = new List<ReportAssetInfo>(manifest.AssetList.Count);
-			foreach (var packageAsset in manifest.AssetList)
+			buildReport.AssetInfos = new List<ReportAssetInfo>(patchManifest.AssetList.Count);
+			foreach (var patchAsset in patchManifest.AssetList)
 			{
-				var mainBundle = manifest.BundleList[packageAsset.BundleID];
+				var mainBundle = patchManifest.BundleList[patchAsset.BundleID];
 				ReportAssetInfo reportAssetInfo = new ReportAssetInfo();
-				reportAssetInfo.Address = packageAsset.Address;
-				reportAssetInfo.AssetPath = packageAsset.AssetPath;
-				reportAssetInfo.AssetTags = packageAsset.AssetTags;
-				reportAssetInfo.AssetGUID = AssetDatabase.AssetPathToGUID(packageAsset.AssetPath);
+				reportAssetInfo.Address = patchAsset.Address;
+				reportAssetInfo.AssetPath = patchAsset.AssetPath;
+				reportAssetInfo.AssetTags = patchAsset.AssetTags;
+				reportAssetInfo.AssetGUID = AssetDatabase.AssetPathToGUID(patchAsset.AssetPath);
 				reportAssetInfo.MainBundleName = mainBundle.BundleName;
-				reportAssetInfo.MainBundleSize = mainBundle.FileSize;
-				reportAssetInfo.DependBundles = GetDependBundles(manifest, packageAsset);
-				reportAssetInfo.DependAssets = GetDependAssets(buildMapContext, mainBundle.BundleName, packageAsset.AssetPath);
+				reportAssetInfo.MainBundleSize = mainBundle.SizeBytes;
+				reportAssetInfo.DependBundles = GetDependBundles(patchManifest, patchAsset);
+				reportAssetInfo.DependAssets = GetDependAssets(buildMapContext, mainBundle.BundleName, patchAsset.AssetPath);
 				buildReport.AssetInfos.Add(reportAssetInfo);
 			}
 
 			// 资源包列表
-			buildReport.BundleInfos = new List<ReportBundleInfo>(manifest.BundleList.Count);
-			foreach (var packageBundle in manifest.BundleList)
+			buildReport.BundleInfos = new List<ReportBundleInfo>(patchManifest.BundleList.Count);
+			foreach (var patchBundle in patchManifest.BundleList)
 			{
 				ReportBundleInfo reportBundleInfo = new ReportBundleInfo();
-				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);
+				reportBundleInfo.BundleName = patchBundle.BundleName;
+				reportBundleInfo.Hash = patchBundle.Hash;
+				reportBundleInfo.CRC = patchBundle.CRC;
+				reportBundleInfo.SizeBytes = patchBundle.SizeBytes;
+				reportBundleInfo.Tags = patchBundle.Tags;
+				reportBundleInfo.Flags = patchBundle.Flags;
 				buildReport.BundleInfos.Add(reportBundleInfo);
 			}
 
-			// 冗余资源列表
-			buildReport.RedundancyInfos = new List<ReportRedundancyInfo>(buildMapContext.RedundancyInfos);
+			// 删除旧文件
+			string filePath = $"{buildParameters.PipelineOutputDirectory}/{YooAssetSettingsData.GetReportFileName(buildParameters.Parameters.BuildVersion)}";
+			if (File.Exists(filePath))
+				File.Delete(filePath);
 
 			// 序列化文件
-			string fileName = YooAssetSettingsData.GetReportFileName(buildParameters.PackageName, buildParameters.PackageVersion);
-			string filePath = $"{packageOutputDirectory}/{fileName}";
 			BuildReport.Serialize(filePath, buildReport);
-			BuildLogger.Log($"资源构建报告文件创建完成：{filePath}");
+			BuildRunner.Log($"资源构建报告文件创建完成：{filePath}");
 		}
 
 		/// <summary>
 		/// 获取资源对象依赖的所有资源包
 		/// </summary>
-		private List<string> GetDependBundles(PackageManifest manifest, PackageAsset packageAsset)
+		private List<string> GetDependBundles(PatchManifest patchManifest, PatchAsset patchAsset)
 		{
-			List<string> dependBundles = new List<string>(packageAsset.DependIDs.Length);
-			foreach (int index in packageAsset.DependIDs)
+			List<string> dependBundles = new List<string>(patchAsset.DependIDs.Length);
+			foreach (int index in patchAsset.DependIDs)
 			{
-				string dependBundleName = manifest.BundleList[index].BundleName;
+				string dependBundleName = patchManifest.BundleList[index].BundleName;
 				dependBundles.Add(dependBundleName);
 			}
 			return dependBundles;
@@ -136,14 +132,14 @@ namespace YooAsset.Editor
 		private List<string> GetDependAssets(BuildMapContext buildMapContext, string bundleName, string assetPath)
 		{
 			List<string> result = new List<string>();
-			var bundleInfo = buildMapContext.GetBundleInfo(bundleName);
+			if (buildMapContext.TryGetBundleInfo(bundleName, out BuildBundleInfo bundleInfo))
 			{
 				BuildAssetInfo findAssetInfo = null;
-				foreach (var assetInfo in bundleInfo.AllMainAssets)
+				foreach (var buildinAsset in bundleInfo.BuildinAssets)
 				{
-					if (assetInfo.AssetPath == assetPath)
+					if (buildinAsset.AssetPath == assetPath)
 					{
-						findAssetInfo = assetInfo;
+						findAssetInfo = buildinAsset;
 						break;
 					}
 				}
@@ -156,72 +152,83 @@ namespace YooAsset.Editor
 					result.Add(dependAssetInfo.AssetPath);
 				}
 			}
+			else
+			{
+				throw new Exception($"Not found bundle : {bundleName}");
+			}
 			return result;
 		}
 
-		/// <summary>
-		/// 获取该资源包内的所有资源
-		/// </summary>
-		private List<string> GetAllBuiltinAssets(BuildMapContext buildMapContext, string bundleName)
+		private int GetAllBundleCount(PatchManifest patchManifest)
 		{
-			var bundleInfo = buildMapContext.GetBundleInfo(bundleName);
-			return bundleInfo.GetAllBuiltinAssetPaths();
+			return patchManifest.BundleList.Count;
 		}
-
-		private int GetMainAssetCount(PackageManifest manifest)
-		{
-			return manifest.AssetList.Count;
-		}
-		private int GetAllBundleCount(PackageManifest manifest)
-		{
-			return manifest.BundleList.Count;
-		}
-		private long GetAllBundleSize(PackageManifest manifest)
+		private long GetAllBundleSize(PatchManifest patchManifest)
 		{
 			long fileBytes = 0;
-			foreach (var packageBundle in manifest.BundleList)
+			foreach (var patchBundle in patchManifest.BundleList)
 			{
-				fileBytes += packageBundle.FileSize;
+				fileBytes += patchBundle.SizeBytes;
 			}
 			return fileBytes;
 		}
-		private int GetEncryptedBundleCount(PackageManifest manifest)
+		private int GetBuildinBundleCount(PatchManifest patchManifest)
 		{
 			int fileCount = 0;
-			foreach (var packageBundle in manifest.BundleList)
+			foreach (var patchBundle in patchManifest.BundleList)
 			{
-				if (packageBundle.LoadMethod != (byte)EBundleLoadMethod.Normal)
+				if (patchBundle.IsBuildin)
 					fileCount++;
 			}
 			return fileCount;
 		}
-		private long GetEncryptedBundleSize(PackageManifest manifest)
+		private long GetBuildinBundleSize(PatchManifest patchManifest)
 		{
 			long fileBytes = 0;
-			foreach (var packageBundle in manifest.BundleList)
+			foreach (var patchBundle in patchManifest.BundleList)
 			{
-				if (packageBundle.LoadMethod != (byte)EBundleLoadMethod.Normal)
-					fileBytes += packageBundle.FileSize;
+				if (patchBundle.IsBuildin)
+					fileBytes += patchBundle.SizeBytes;
 			}
 			return fileBytes;
 		}
-		private int GetRawBundleCount(PackageManifest manifest)
+		private int GetEncryptedBundleCount(PatchManifest patchManifest)
 		{
 			int fileCount = 0;
-			foreach (var packageBundle in manifest.BundleList)
+			foreach (var patchBundle in patchManifest.BundleList)
 			{
-				if (packageBundle.IsRawFile)
+				if (patchBundle.IsEncrypted)
 					fileCount++;
 			}
 			return fileCount;
 		}
-		private long GetRawBundleSize(PackageManifest manifest)
+		private long GetEncryptedBundleSize(PatchManifest patchManifest)
 		{
 			long fileBytes = 0;
-			foreach (var packageBundle in manifest.BundleList)
+			foreach (var patchBundle in patchManifest.BundleList)
 			{
-				if (packageBundle.IsRawFile)
-					fileBytes += packageBundle.FileSize;
+				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;
 			}
 			return fileBytes;
 		}

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

@@ -9,6 +9,19 @@ 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<BuildParametersContext>();
@@ -17,51 +30,64 @@ namespace YooAsset.Editor
 			var buildMode = buildParameters.Parameters.BuildMode;
 			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
 			{
-				EncryptingBundleFiles(buildParameters, buildMapContext);
+				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);
 			}
 		}
 
 		/// <summary>
 		/// 加密文件
 		/// </summary>
-		private void EncryptingBundleFiles(BuildParametersContext buildParametersContext, BuildMapContext buildMapContext)
+		private List<string> EncryptFiles(BuildParametersContext buildParameters, BuildMapContext buildMapContext)
 		{
-			var encryptionServices = buildParametersContext.Parameters.EncryptionServices;
-			if (encryptionServices == null)
-				return;
+			var encryptionServices = buildParameters.Parameters.EncryptionServices;
 
-			if (encryptionServices.GetType() == typeof(EncryptionNone))
-				return;
+			// 加密资源列表
+			List<string> encryptList = new List<string>();
+
+			// 如果没有设置加密类
+			if (encryptionServices == null)
+				return encryptList;
 
 			int progressValue = 0;
-			string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
-			foreach (var bundleInfo in buildMapContext.Collection)
+			foreach (var bundleInfo in buildMapContext.BundleInfos)
 			{
-				EncryptFileInfo fileInfo = new EncryptFileInfo();
-				fileInfo.BundleName = bundleInfo.BundleName;
-				fileInfo.FilePath = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}";
-
-				var encryptResult = encryptionServices.Encrypt(fileInfo);		
-				if (encryptResult.LoadMethod != EBundleLoadMethod.Normal)
+				if (encryptionServices.Check(bundleInfo.BundleName))
 				{
-					// 注意：原生文件不支持加密
 					if (bundleInfo.IsRawFile)
 					{
-						BuildLogger.Warning($"Encryption not support raw file : {bundleInfo.BundleName}");
+						UnityEngine.Debug.LogWarning($"Encryption not support raw file : {bundleInfo.BundleName}");
 						continue;
 					}
 
-					string filePath = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}.encrypt";
-					FileUtility.WriteAllBytes(filePath, encryptResult.EncryptedData);
-					bundleInfo.EncryptedFilePath = filePath;
-					bundleInfo.LoadMethod = encryptResult.LoadMethod;
-					BuildLogger.Log($"Bundle文件加密完成：{filePath}");
+					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}");
+					}
 				}
 
 				// 进度条
-				EditorTools.DisplayProgressBar("加密资源包", ++progressValue, buildMapContext.Collection.Count);
+				EditorTools.DisplayProgressBar("加密资源包", ++progressValue, buildMapContext.BundleInfos.Count);
 			}
 			EditorTools.ClearProgressBar();
+
+			if(encryptList.Count == 0)
+				UnityEngine.Debug.LogWarning($"没有发现需要加密的文件！");
+			return encryptList;
 		}
 	}
 }

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

@@ -13,206 +13,32 @@ namespace YooAsset.Editor
 		void IBuildTask.Run(BuildContext context)
 		{
 			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-			var buildMapContext = CreateBuildMap(buildParametersContext.Parameters);
+			var buildMapContext = BuildMapCreater.CreateBuildMap(buildParametersContext.Parameters.BuildMode);
 			context.SetContextObject(buildMapContext);
-			BuildLogger.Log("构建内容准备完毕！");
+			BuildRunner.Log("构建内容准备完毕！");
 
 			// 检测构建结果
 			CheckBuildMapContent(buildMapContext);
 		}
 
-		/// <summary>
-		/// 资源构建上下文
-		/// </summary>
-		public BuildMapContext CreateBuildMap(BuildParameters buildParameters)
-		{
-			var buildMode = buildParameters.BuildMode;
-			var packageName = buildParameters.PackageName;
-			var sharedPackRule = buildParameters.SharedPackRule;
-
-			Dictionary<string, BuildAssetInfo> allBuildAssetInfoDic = new Dictionary<string, BuildAssetInfo>(1000);
-
-			// 1. 检测配置合法性
-			AssetBundleCollectorSettingData.Setting.CheckPackageConfigError(packageName);
-
-			// 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.Command = collectResult.Command;
-
-			// 8. 计算共享资源的包名		
-			var command = collectResult.Command;
-			foreach (var buildAssetInfo in allBuildAssetInfoDic.Values)
-			{
-				buildAssetInfo.CalculateShareBundleName(sharedPackRule, command.UniqueBundleName, command.PackageName, command.ShadersBundleName);
-			}
-
-			// 9. 记录冗余资源
-			foreach (var buildAssetInfo in allBuildAssetInfoDic.Values)
-			{
-				if (buildAssetInfo.IsRedundancyAsset())
-				{
-					var redundancyInfo = new ReportRedundancyInfo();
-					redundancyInfo.AssetPath = buildAssetInfo.AssetPath;
-					redundancyInfo.AssetType = AssetDatabase.GetMainAssetTypeAtPath(buildAssetInfo.AssetPath).Name;
-					redundancyInfo.AssetGUID = AssetDatabase.AssetPathToGUID(buildAssetInfo.AssetPath);
-					redundancyInfo.FileSize = FileUtility.GetFileSize(buildAssetInfo.AssetPath);
-					redundancyInfo.Number = buildAssetInfo.GetReferenceBundleCount();
-					context.RedundancyInfos.Add(redundancyInfo);
-				}
-			}
-
-			// 10. 移除不参与构建的资源
-			List<BuildAssetInfo> removeBuildList = new List<BuildAssetInfo>();
-			foreach (var buildAssetInfo in allBuildAssetInfoDic.Values)
-			{
-				if (buildAssetInfo.HasBundleName() == false)
-					removeBuildList.Add(buildAssetInfo);
-			}
-			foreach (var removeValue in removeBuildList)
-			{
-				allBuildAssetInfoDic.Remove(removeValue.AssetPath);
-			}
-
-			// 11. 构建资源列表
-			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 hasAnyDependCollector = false;
-			foreach (var collectAssetInfo in allCollectAssetInfos)
-			{
-				var collectorType = collectAssetInfo.CollectorType;
-				if (collectorType == ECollectorType.DependAssetCollector)
-				{
-					hasAnyDependCollector = true;
-					break;
-				}
-			}
-			if (hasAnyDependCollector == 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.Collection)
+			foreach (var bundleInfo in buildMapContext.BundleInfos)
 			{
 				// 注意：原生文件资源包只能包含一个原生文件
 				bool isRawFile = bundleInfo.IsRawFile;
 				if (isRawFile)
 				{
-					if (bundleInfo.AllMainAssets.Count != 1)
+					if (bundleInfo.BuildinAssets.Count != 1)
 						throw new Exception($"The bundle does not support multiple raw asset : {bundleInfo.BundleName}");
 					continue;
 				}
 
 				// 注意：原生文件不能被其它资源文件依赖
-				foreach (var assetInfo in bundleInfo.AllMainAssets)
+				foreach (var assetInfo in bundleInfo.BuildinAssets)
 				{
 					if (assetInfo.AllDependAssetInfos != null)
 					{

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

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

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

@@ -1,182 +0,0 @@
-using System;
-using System.IO;
-using System.Text;
-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)
-			{
-				bundleInfo.BuildOutputFilePath = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}";
-				if (bundleInfo.IsEncryptedFile)
-					bundleInfo.PackageSourceFilePath = bundleInfo.EncryptedFilePath;
-				else
-					bundleInfo.PackageSourceFilePath = bundleInfo.BuildOutputFilePath;
-			}
-
-			// 3.更新文件其它信息
-			foreach (var bundleInfo in buildMapContext.Collection)
-			{
-				bundleInfo.PackageUnityHash = GetUnityHash(bundleInfo, context);
-				bundleInfo.PackageUnityCRC = GetUnityCRC(bundleInfo, context);
-				bundleInfo.PackageFileHash = GetBundleFileHash(bundleInfo.PackageSourceFilePath, buildParametersContext);
-				bundleInfo.PackageFileCRC = GetBundleFileCRC(bundleInfo.PackageSourceFilePath, buildParametersContext);
-				bundleInfo.PackageFileSize = GetBundleFileSize(bundleInfo.PackageSourceFilePath, buildParametersContext);
-			}
-
-			// 4.更新补丁包输出的文件路径
-			foreach (var bundleInfo in buildMapContext.Collection)
-			{
-				string bundleName = bundleInfo.BundleName;
-				string fileHash = bundleInfo.PackageFileHash;
-				string fileExtension = ManifestTools.GetRemoteBundleFileExtension(bundleName);
-				string fileName = ManifestTools.GetRemoteBundleFileName(outputNameStyle, bundleName, fileExtension, fileHash);
-				bundleInfo.PackageDestFilePath = $"{packageOutputDirectory}/{fileName}";
-			}
-		}
-
-		private string GetUnityHash(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.PackageSourceFilePath;
-				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 hash 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 hash in build result : {bundleInfo.BundleName}");
-			}
-			else
-			{
-				throw new System.NotImplementedException();
-			}
-		}
-		private uint GetUnityCRC(BuildBundleInfo bundleInfo, BuildContext context)
-		{
-			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-			var parameters = buildParametersContext.Parameters;
-			var buildMode = parameters.BuildMode;
-			if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild)
-				return 0;
-
-			if (bundleInfo.IsRawFile)
-				return 0;
-
-			if (parameters.BuildPipeline == EBuildPipeline.BuiltinBuildPipeline)
-			{
-				string filePath = bundleInfo.BuildOutputFilePath;
-				if (BuildPipeline.GetCRCForAssetBundle(filePath, out uint crc))
-					return crc;
-				else
-					throw new Exception($"Not found bundle crc in build result : {bundleInfo.BundleName}");
-			}
-			else if (parameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
-			{
-				var buildResult = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
-				if (buildResult.Results.BundleInfos.TryGetValue(bundleInfo.BundleName, out var value))
-					return value.Crc;
-				else
-					throw new Exception($"Not found bundle crc in build result : {bundleInfo.BundleName}");
-			}
-			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 GetFilePathTempHash(filePath);
-			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);
-		}
-
-		protected string GetFilePathTempHash(string filePath)
-		{
-			byte[] bytes = Encoding.UTF8.GetBytes(filePath);
-			return HashUtility.BytesMD5(bytes);
-
-			// 注意：在文件路径的哈希值冲突的情况下，可以使用下面的方法
-			//return $"{HashUtility.BytesMD5(bytes)}-{Guid.NewGuid():N}";
-		}
-		protected long GetBundleTempSize(BuildBundleInfo bundleInfo)
-		{
-			long tempSize = 0;
-
-			var assetPaths = bundleInfo.GetAllMainAssetPaths();
-			foreach (var assetPath in assetPaths)
-			{
-				long size = FileUtility.GetFileSize(assetPath);
-				tempSize += size;
-			}
-
-			if (tempSize == 0)
-			{
-				string message = $"Bundle temp size is zero, check bundle main asset list : {bundleInfo.BundleName}";
-				throw new Exception(message);
-			}
-			return tempSize;
-		}
-	}
-}

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

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

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

@@ -22,8 +22,8 @@ namespace YooAsset.Editor
 			// 验证构建结果
 			if (buildParametersContext.Parameters.VerifyBuildingResult)
 			{
-				var buildResultContext = context.GetContextObject<TaskBuilding.BuildResultContext>();
-				VerifyingBuildingResult(context, buildResultContext.UnityManifest);
+				var unityManifestContext = context.GetContextObject<TaskBuilding.UnityManifestContext>();
+				VerifyingBuildingResult(context, unityManifestContext.UnityManifest);
 			}
 		}
 
@@ -32,76 +32,80 @@ namespace YooAsset.Editor
 		/// </summary>
 		private void VerifyingBuildingResult(BuildContext context, AssetBundleManifest unityManifest)
 		{
-			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			var buildParameters = context.GetContextObject<BuildParametersContext>();
 			var buildMapContext = context.GetContextObject<BuildMapContext>();
-			string[] unityCreateBundles = unityManifest.GetAllAssetBundles();
+			string[] buildedBundles = unityManifest.GetAllAssetBundles();
 
 			// 1. 过滤掉原生Bundle
-			string[] mapBundles = buildMapContext.Collection.Where(t => t.IsRawFile == false).Select(t => t.BundleName).ToArray();
+			string[] expectBundles = buildMapContext.BundleInfos.Where(t => t.IsRawFile == false).Select(t => t.BundleName).ToArray();
 
 			// 2. 验证Bundle
-			List<string> exceptBundleList1 = unityCreateBundles.Except(mapBundles).ToList();
-			if (exceptBundleList1.Count > 0)
+			List<string> intersectBundleList = buildedBundles.Except(expectBundles).ToList();
+			if (intersectBundleList.Count > 0)
 			{
-				foreach (var exceptBundle in exceptBundleList1)
+				foreach (var intersectBundle in intersectBundleList)
 				{
-					BuildLogger.Warning($"差异资源包: {exceptBundle}");
+					Debug.LogWarning($"差异资源包: {intersectBundle}");
 				}
 				throw new System.Exception("存在差异资源包！请查看警告信息！");
 			}
 
-			// 3. 验证Bundle
-			List<string> exceptBundleList2 = mapBundles.Except(unityCreateBundles).ToList();
-			if (exceptBundleList2.Count > 0)
-			{
-				foreach (var exceptBundle in exceptBundleList2)
-				{
-					BuildLogger.Warning($"差异资源包: {exceptBundle}");
-				}
-				throw new System.Exception("存在差异资源包！请查看警告信息！");
-			}
-
-			// 4. 验证Asset
-			/*
+			// 3. 验证Asset
 			bool isPass = true;
-			var buildMode = buildParametersContext.Parameters.BuildMode;
+			var buildMode = buildParameters.Parameters.BuildMode;
 			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
 			{
 				int progressValue = 0;
-				string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
 				foreach (var buildedBundle in buildedBundles)
 				{
-					string filePath = $"{pipelineOutputDirectory}/{buildedBundle}";
-					string[] buildedAssetPaths = GetAssetBundleAllAssets(filePath);
-					string[] mapAssetPaths = buildMapContext.GetBuildinAssetPaths(buildedBundle);
-					if (mapAssetPaths.Length != buildedAssetPaths.Length)
+					string filePath = $"{buildParameters.PipelineOutputDirectory}/{buildedBundle}";
+					string[] allBuildinAssetPaths = GetAssetBundleAllAssets(filePath);
+					string[] expectBuildinAssetPaths = buildMapContext.GetBuildinAssetPaths(buildedBundle);
+					if (expectBuildinAssetPaths.Length != allBuildinAssetPaths.Length)
 					{
-						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}");
-						}
+						Debug.LogWarning($"构建的Bundle文件内的资源对象数量和预期不匹配 : {buildedBundle}");
 						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("构建结果验证没有通过，请参考警告日志！");
 				}
 			}
-			*/
 
-			BuildLogger.Log("构建结果验证成功！");
+			BuildRunner.Log("构建结果验证成功！");
 		}
 
 		/// <summary>

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

@@ -23,7 +23,7 @@ namespace YooAsset.Editor
 			// 验证构建结果
 			if (buildParametersContext.Parameters.VerifyBuildingResult)
 			{
-				var buildResultContext = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
+				var buildResultContext = context.GetContextObject<TaskBuilding_SBP.SBPBuildResultContext>();
 				VerifyingBuildingResult(context, buildResultContext.Results);
 			}
 		}
@@ -35,34 +35,26 @@ namespace YooAsset.Editor
 		{
 			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();
+			// 1. 移除特定Bundle
+			List<string> buildedBundles = buildResults.BundleInfos.Keys.ToList();
+			buildedBundles.Remove(YooAssetSettings.UnityBuiltInShadersBundleName);
 
-			// 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("存在差异资源包！请查看警告信息！");
-			}
+			// 2. 过滤掉原生Bundle
+			List<string> expectBundles = buildMapContext.BundleInfos.Where(t => t.IsRawFile == false).Select(t => t.BundleName).ToList();
 
 			// 3. 验证Bundle
-			List<string> exceptBundleList2 = expectBundles.Except(unityCreateBundles).ToList();
-			if (exceptBundleList2.Count > 0)
+			List<string> intersectBundleList = buildedBundles.Except(expectBundles).ToList();
+			if (intersectBundleList.Count > 0)
 			{
-				foreach (var exceptBundle in exceptBundleList2)
+				foreach (var intersectBundle in intersectBundleList)
 				{
-					BuildLogger.Warning($"差异资源包: {exceptBundle}");
+					Debug.LogWarning($"差异资源包: {intersectBundle}");
 				}
 				throw new System.Exception("存在差异资源包！请查看警告信息！");
 			}
 
-			BuildLogger.Log("构建结果验证成功！");
+			BuildRunner.Log("构建结果验证成功！");
 		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleBuilder/DefaultEncryption.cs

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

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

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

Assets/YooAsset/Editor/AssetBundleBuilder/ECopyBuildinFileOption.cs

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

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

Assets/YooAsset/Editor/AssetBundleBuilder/EOutputNameStyle.cs

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

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

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

Assets/YooAsset/Editor/AssetBundleBuilder/IEncryptionServices.cs

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

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorConfig.cs

@@ -10,34 +10,22 @@ namespace YooAsset.Editor
 {
 	public class AssetBundleCollectorConfig
 	{
-		public const string ConfigVersion = "2.4";
+		public const string ConfigVersion = "1.0";
 
 		public const string XmlVersion = "Version";
 		public const string XmlCommon = "Common";
 		public const string XmlEnableAddressable = "AutoAddressable";
-		public const string XmlLocationToLower = "LocationToLower";
-		public const string XmlIncludeAssetGUID = "IncludeAssetGUID";
-		public const string XmlUniqueBundleName = "UniqueBundleName";
-		public const string XmlShowPackageView = "ShowPackageView";
-		public const string XmlShowEditorAlias = "ShowEditorAlias";
-
-		public const string XmlPackage = "Package";
-		public const string XmlPackageName = "PackageName";
-		public const string XmlPackageDesc = "PackageDesc";
-
+		public const string XmlAutoCollectShader = "AutoCollectShader";
+		public const string XmlShaderBundleName = "ShaderBundleName";
 		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>
@@ -52,133 +40,91 @@ namespace YooAsset.Editor
 				throw new Exception($"Only support xml : {filePath}");
 
 			// 加载配置文件
-			XmlDocument xmlDoc = new XmlDocument();
-			xmlDoc.Load(filePath);
-			XmlElement root = xmlDoc.DocumentElement;
+			XmlDocument xml = new XmlDocument();
+			xml.Load(filePath);
+			XmlElement root = xml.DocumentElement;
 
 			// 读取配置版本
 			string configVersion = root.GetAttribute(XmlVersion);
-			if (configVersion != ConfigVersion)
+			if(configVersion != 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}");
+				throw new Exception($"The config version is invalid : {configVersion}");
 			}
 
 			// 读取公共配置
 			bool enableAddressable = false;
-			bool locationToLower = false;
-			bool includeAssetGUID = false;
-			bool uniqueBundleName = false;
-			bool showPackageView = false;
-			bool showEditorAlias = false;
+			bool autoCollectShaders = false;
+			string shaderBundleName = string.Empty;
 			var commonNodeList = root.GetElementsByTagName(XmlCommon);
 			if (commonNodeList.Count > 0)
 			{
 				XmlElement commonElement = commonNodeList[0] as XmlElement;
-				if (commonElement.HasAttribute(XmlEnableAddressable))
-					enableAddressable = commonElement.GetAttribute(XmlEnableAddressable) == "True" ? true : false;
-				if (commonElement.HasAttribute(XmlLocationToLower))
-					locationToLower = commonElement.GetAttribute(XmlLocationToLower) == "True" ? true : false;
-				if (commonElement.HasAttribute(XmlIncludeAssetGUID))
-					includeAssetGUID = commonElement.GetAttribute(XmlIncludeAssetGUID) == "True" ? true : false;
-				if (commonElement.HasAttribute(XmlUniqueBundleName))
-					uniqueBundleName = commonElement.GetAttribute(XmlUniqueBundleName) == "True" ? true : false;
-				if (commonElement.HasAttribute(XmlShowPackageView))
-					showPackageView = commonElement.GetAttribute(XmlShowPackageView) == "True" ? true : false;
-				if (commonElement.HasAttribute(XmlShowEditorAlias))
-					showEditorAlias = commonElement.GetAttribute(XmlShowEditorAlias) == "True" ? true : false;
+				if (commonElement.HasAttribute(XmlEnableAddressable) == false)
+					throw new Exception($"Not found attribute {XmlEnableAddressable} in {XmlCommon}");
+				if (commonElement.HasAttribute(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}");
+
+				enableAddressable = commonElement.GetAttribute(XmlEnableAddressable) == "True" ? true : false;
+				autoCollectShaders = commonElement.GetAttribute(XmlAutoCollectShader) == "True" ? true : false;
+				shaderBundleName = commonElement.GetAttribute(XmlShaderBundleName);
 			}
 
-			// 读取包裹配置
-			List<AssetBundleCollectorPackage> packages = new List<AssetBundleCollectorPackage>();
-			var packageNodeList = root.GetElementsByTagName(XmlPackage);
-			foreach (var packageNode in packageNodeList)
+			// 读取分组配置
+			List<AssetBundleCollectorGroup> groupTemper = new List<AssetBundleCollectorGroup>();
+			var groupNodeList = root.GetElementsByTagName(XmlGroup);
+			foreach (var groupNode in groupNodeList)
 			{
-				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}");
+				XmlElement groupElement = groupNode as XmlElement;
+				if (groupElement.HasAttribute(XmlGroupName) == false)
+					throw new Exception($"Not found attribute {XmlGroupName} in {XmlGroup}");
+				if (groupElement.HasAttribute(XmlGroupDesc) == false)
+					throw new Exception($"Not found attribute {XmlGroupDesc} in {XmlGroup}");
+				if (groupElement.HasAttribute(XmlAssetTags) == false)
+					throw new Exception($"Not found attribute {XmlAssetTags} in {XmlGroup}");
 
-				AssetBundleCollectorPackage package = new AssetBundleCollectorPackage();
-				package.PackageName = packageElement.GetAttribute(XmlPackageName);
-				package.PackageDesc = packageElement.GetAttribute(XmlPackageDesc);
-				packages.Add(package);
+				AssetBundleCollectorGroup group = new AssetBundleCollectorGroup();
+				group.GroupName = groupElement.GetAttribute(XmlGroupName);
+				group.GroupDesc = groupElement.GetAttribute(XmlGroupDesc);
+				group.AssetTags = groupElement.GetAttribute(XmlAssetTags);
+				groupTemper.Add(group);
 
-				// 读取分组配置
-				var groupNodeList = packageElement.GetElementsByTagName(XmlGroup);
-				foreach (var groupNode in groupNodeList)
+				// 读取收集器配置
+				var collectorNodeList = groupElement.GetElementsByTagName(XmlCollector);
+				foreach (var collectorNode in collectorNodeList)
 				{
-					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)
-						throw new Exception($"Not found attribute {XmlGroupDesc} in {XmlGroup}");
-					if (groupElement.HasAttribute(XmlAssetTags) == false)
-						throw new Exception($"Not found attribute {XmlAssetTags} in {XmlGroup}");
+					XmlElement collectorElement = collectorNode as XmlElement;
+					if (collectorElement.HasAttribute(XmlCollectPath) == false)
+						throw new Exception($"Not found attribute {XmlCollectPath} in {XmlCollector}");
+					if (collectorElement.HasAttribute(XmlCollectorType) == false)
+						throw new Exception($"Not found attribute {XmlCollectorType} in {XmlCollector}");
+					if (collectorElement.HasAttribute(XmlAddressRule) == false)
+						throw new Exception($"Not found attribute {XmlAddressRule} in {XmlCollector}");
+					if (collectorElement.HasAttribute(XmlPackRule) == false)
+						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(XmlAssetTags) == false)
+						throw new Exception($"Not found attribute {XmlAssetTags} in {XmlCollector}");
 
-					AssetBundleCollectorGroup group = new AssetBundleCollectorGroup();
-					group.ActiveRuleName = groupElement.GetAttribute(XmlGroupActiveRule);
-					group.GroupName = groupElement.GetAttribute(XmlGroupName);
-					group.GroupDesc = groupElement.GetAttribute(XmlGroupDesc);
-					group.AssetTags = groupElement.GetAttribute(XmlAssetTags);
-					package.Groups.Add(group);
-
-					// 读取收集器配置
-					var collectorNodeList = groupElement.GetElementsByTagName(XmlCollector);
-					foreach (var collectorNode in collectorNodeList)
-					{
-						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)
-							throw new Exception($"Not found attribute {XmlAddressRule} in {XmlCollector}");
-						if (collectorElement.HasAttribute(XmlPackRule) == false)
-							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.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.UserData = collectorElement.GetAttribute(XmlUserData);
-						collector.AssetTags = collectorElement.GetAttribute(XmlAssetTags);
-						group.Collectors.Add(collector);
-					}
+					AssetBundleCollector collector = new AssetBundleCollector();
+					collector.CollectPath = collectorElement.GetAttribute(XmlCollectPath);
+					collector.CollectorType = StringUtility.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); ;
+					group.Collectors.Add(collector);
 				}
 			}
 
-			// 检测配置错误
-			foreach (var package in packages)
-			{
-				package.CheckConfigError();
-			}
-
 			// 保存配置数据
 			AssetBundleCollectorSettingData.ClearAll();
 			AssetBundleCollectorSettingData.Setting.EnableAddressable = enableAddressable;
-			AssetBundleCollectorSettingData.Setting.LocationToLower = locationToLower;
-			AssetBundleCollectorSettingData.Setting.IncludeAssetGUID = includeAssetGUID;
-			AssetBundleCollectorSettingData.Setting.UniqueBundleName = uniqueBundleName;
-			AssetBundleCollectorSettingData.Setting.ShowPackageView = showPackageView;
-			AssetBundleCollectorSettingData.Setting.ShowEditorAlias = showEditorAlias;
-			AssetBundleCollectorSettingData.Setting.Packages.AddRange(packages);
+			AssetBundleCollectorSettingData.Setting.AutoCollectShaders = autoCollectShaders;
+			AssetBundleCollectorSettingData.Setting.ShadersBundleName = shaderBundleName;
+			AssetBundleCollectorSettingData.Setting.Groups.AddRange(groupTemper);
 			AssetBundleCollectorSettingData.SaveFile();
 			Debug.Log($"导入配置完毕！");
 		}
@@ -206,45 +152,30 @@ namespace YooAsset.Editor
 			// 设置公共配置
 			var commonElement = xmlDoc.CreateElement(XmlCommon);
 			commonElement.SetAttribute(XmlEnableAddressable, AssetBundleCollectorSettingData.Setting.EnableAddressable.ToString());
-			commonElement.SetAttribute(XmlLocationToLower, AssetBundleCollectorSettingData.Setting.LocationToLower.ToString());
-			commonElement.SetAttribute(XmlIncludeAssetGUID, AssetBundleCollectorSettingData.Setting.IncludeAssetGUID.ToString());
-			commonElement.SetAttribute(XmlUniqueBundleName, AssetBundleCollectorSettingData.Setting.UniqueBundleName.ToString());
-			commonElement.SetAttribute(XmlShowPackageView, AssetBundleCollectorSettingData.Setting.ShowPackageView.ToString());
-			commonElement.SetAttribute(XmlShowEditorAlias, AssetBundleCollectorSettingData.Setting.ShowEditorAlias.ToString());
+			commonElement.SetAttribute(XmlAutoCollectShader, AssetBundleCollectorSettingData.Setting.AutoCollectShaders.ToString());
+			commonElement.SetAttribute(XmlShaderBundleName, AssetBundleCollectorSettingData.Setting.ShadersBundleName);
 			root.AppendChild(commonElement);
 
-			// 设置Package配置
-			foreach (var package in AssetBundleCollectorSettingData.Setting.Packages)
+			// 设置分组配置
+			foreach (var group in AssetBundleCollectorSettingData.Setting.Groups)
 			{
-				var packageElement = xmlDoc.CreateElement(XmlPackage);
-				packageElement.SetAttribute(XmlPackageName, package.PackageName);
-				packageElement.SetAttribute(XmlPackageDesc, package.PackageDesc);
-				root.AppendChild(packageElement);
+				var groupElement = xmlDoc.CreateElement(XmlGroup);
+				groupElement.SetAttribute(XmlGroupName, group.GroupName);
+				groupElement.SetAttribute(XmlGroupDesc, group.GroupDesc);
+				groupElement.SetAttribute(XmlAssetTags, group.AssetTags);
+				root.AppendChild(groupElement);
 
-				// 设置分组配置
-				foreach (var group in package.Groups)
+				// 设置收集器配置
+				foreach (var collector in group.Collectors)
 				{
-					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);
-					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);
-					}
+					var collectorElement = xmlDoc.CreateElement(XmlCollector);
+					collectorElement.SetAttribute(XmlCollectPath, collector.CollectPath);
+					collectorElement.SetAttribute(XmlCollectorType, collector.CollectorType.ToString());
+					collectorElement.SetAttribute(XmlAddressRule, collector.AddressRuleName);
+					collectorElement.SetAttribute(XmlPackRule, collector.PackRuleName);
+					collectorElement.SetAttribute(XmlFilterRule, collector.FilterRuleName);
+					collectorElement.SetAttribute(XmlAssetTags, collector.AssetTags);
+					groupElement.AppendChild(collectorElement);
 				}
 			}
 
@@ -252,137 +183,5 @@ namespace YooAsset.Editor
 			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

@@ -44,35 +44,16 @@ namespace YooAsset.Editor
 			if (AssetBundleCollectorSettingData.HasActiveRuleName(ActiveRuleName) == false)
 				throw new Exception($"Invalid {nameof(IActiveRule)} class type : {ActiveRuleName} in group : {GroupName}");
 
-			// 当分组不是激活状态时，直接不进行检测
-			if (ActiveRuleName == nameof(DisableGroup)) return;
-			
 			foreach (var collector in Collectors)
 			{
 				collector.CheckConfigError();
 			}
 		}
 
-		/// <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(CollectCommand command)
+		public List<CollectAssetInfo> GetAllCollectAssets(EBuildMode buildMode)
 		{
 			Dictionary<string, CollectAssetInfo> result = new Dictionary<string, CollectAssetInfo>(10000);
 
@@ -86,7 +67,7 @@ namespace YooAsset.Editor
 			// 收集打包资源
 			foreach (var collector in Collectors)
 			{
-				var temper = collector.GetAllCollectAssets(command, this);
+				var temper = collector.GetAllCollectAssets(buildMode, this);
 				foreach (var assetInfo in temper)
 				{
 					if (result.ContainsKey(assetInfo.AssetPath) == false)
@@ -97,22 +78,18 @@ namespace YooAsset.Editor
 			}
 
 			// 检测可寻址地址是否重复
-			if (command.EnableAddressable)
+			if (AssetBundleCollectorSettingData.Setting.EnableAddressable)
 			{
-				var addressTemper = new Dictionary<string, string>();
+				HashSet<string> adressTemper = new HashSet<string>();
 				foreach (var collectInfoPair in result)
 				{
 					if (collectInfoPair.Value.CollectorType == ECollectorType.MainAssetCollector)
 					{
 						string address = collectInfoPair.Value.Address;
-						string assetPath = collectInfoPair.Value.AssetPath;
-						if (string.IsNullOrEmpty(address))
-							continue;
-
-						if (addressTemper.TryGetValue(address, out var existed) == false)
-							addressTemper.Add(address, assetPath);
+						if (adressTemper.Contains(address) == false)
+							adressTemper.Add(address);
 						else
-							throw new Exception($"The address is existed : {address} in group : {GroupName} \nAssetPath:\n     {existed}\n     {assetPath}");
+							throw new Exception($"The address is existed : {address} in group : {GroupName}");
 					}
 				}
 			}

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorPackage.cs

@@ -1,129 +0,0 @@
-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 (string.IsNullOrEmpty(address))
-							continue;
-
-						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

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

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSetting.cs

@@ -6,132 +6,79 @@ using UnityEngine;
 
 namespace YooAsset.Editor
 {
-	[CreateAssetMenu(fileName = "AssetBundleCollectorSetting", menuName = "YooAsset/Create AssetBundle Collector Settings")]
 	public class AssetBundleCollectorSetting : ScriptableObject
 	{
 		/// <summary>
-		/// 显示包裹列表视图
-		/// </summary>
-		public bool ShowPackageView = false;
-
-		/// <summary>
-		/// 启用可寻址资源定位
+		/// 是否启用可寻址资源定位
 		/// </summary>
 		public bool EnableAddressable = false;
 
 		/// <summary>
-		/// 资源定位地址大小写不敏感
+		/// 自动收集着色器
 		/// </summary>
-		public bool LocationToLower = false;
+		public bool AutoCollectShaders = true;
 
 		/// <summary>
-		/// 包含资源GUID数据
+		/// 自动收集的着色器资源包名称
 		/// </summary>
-		public bool IncludeAssetGUID = false;
+		public string ShadersBundleName = "myshaders";
 
 		/// <summary>
-		/// 资源包名唯一化
+		/// 分组列表
 		/// </summary>
-		public bool UniqueBundleName = false;
-
-		/// <summary>
-		/// 是否显示编辑器别名
-		/// </summary>
-		public bool ShowEditorAlias = false;
+		public List<AssetBundleCollectorGroup> Groups = new List<AssetBundleCollectorGroup>();
 
 
 		/// <summary>
-		/// 包裹列表
+		/// 检测配置错误
 		/// </summary>
-		public List<AssetBundleCollectorPackage> Packages = new List<AssetBundleCollectorPackage>();
-
-
-		/// <summary>
-		/// 清空所有数据
-		/// </summary>
-		public void ClearAll()
+		public void CheckConfigError()
 		{
-			ShowPackageView = false;
-			EnableAddressable = false;
-			LocationToLower = false;
-			IncludeAssetGUID = false;
-			UniqueBundleName = false;
-			ShowEditorAlias = false;
-			Packages.Clear();
-		}
-
-		/// <summary>
-		/// 检测包裹配置错误
-		/// </summary>
-		public void CheckPackageConfigError(string packageName)
-		{
-			var package = GetPackage(packageName);
-			package.CheckConfigError();
-		}
-
-		/// <summary>
-		/// 检测所有配置错误
-		/// </summary>
-		public void CheckAllPackageConfigError()
-		{
-			foreach (var package in Packages)
+			foreach (var group in Groups)
 			{
-				package.CheckConfigError();
+				group.CheckConfigError();
 			}
 		}
 
 		/// <summary>
-		/// 修复所有配置错误
+		/// 获取打包收集的资源文件
 		/// </summary>
-		public bool FixAllPackageConfigError()
+		public List<CollectAssetInfo> GetAllCollectAssets(EBuildMode buildMode)
 		{
-			bool isFixed = false;
-			foreach (var package in Packages)
+			Dictionary<string, CollectAssetInfo> result = new Dictionary<string, CollectAssetInfo>(10000);
+
+			// 收集打包资源
+			foreach (var group in Groups)
 			{
-				if (package.FixConfigError())
+				var temper = group.GetAllCollectAssets(buildMode);
+				foreach (var assetInfo in temper)
 				{
-					isFixed = true;
+					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.");
 				}
 			}
-			return isFixed;
-		}
 
-		/// <summary>
-		/// 获取所有的资源标签
-		/// </summary>
-		public List<string> GetPackageAllTags(string packageName)
-		{
-			var package = GetPackage(packageName);
-			return package.GetAllTags();
-		}
-
-		/// <summary>
-		/// 获取包裹收集的资源文件
-		/// </summary>
-		public CollectResult GetPackageAssets(EBuildMode buildMode, string packageName)
-		{
-			if (string.IsNullOrEmpty(packageName))
-				throw new Exception("Build package name is null or empty !");
-
-			var package = GetPackage(packageName);
-			CollectCommand command = new CollectCommand(buildMode, packageName,
-			EnableAddressable, LocationToLower, IncludeAssetGUID, UniqueBundleName);
-			CollectResult collectResult = new CollectResult(command);
-			collectResult.SetCollectAssets(package.GetAllCollectAssets(command));
-			return collectResult;
-		}
-
-		/// <summary>
-		/// 获取包裹类
-		/// </summary>
-		public AssetBundleCollectorPackage GetPackage(string packageName)
-		{
-			foreach (var package in Packages)
+			// 检测可寻址地址是否重复
+			if (EnableAddressable)
 			{
-				if (package.PackageName == packageName)
-					return package;
+				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.");
+					}
+				}
 			}
-			throw new Exception($"Not found package : {packageName}");
+
+			// 返回列表
+			return result.Values.ToList();
 		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSettingData.cs

@@ -27,8 +27,110 @@ namespace YooAsset.Editor
 		public static bool IsDirty { private set; get; } = false;
 
 
-		static AssetBundleCollectorSettingData()
+		private static AssetBundleCollectorSetting _setting = null;
+		public static AssetBundleCollectorSetting Setting
 		{
+			get
+			{
+				if (_setting == null)
+					LoadSettingData();
+				return _setting;
+			}
+		}
+
+		public static List<string> GetActiveRuleNames()
+		{
+			if (_setting == null)
+				LoadSettingData();
+
+			List<string> names = new List<string>();
+			foreach (var pair in _cacheActiveRuleTypes)
+			{
+				names.Add(pair.Key);
+			}
+			return names;
+		}
+		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 HasActiveRuleName(string ruleName)
+		{
+			foreach (var pair in _cacheActiveRuleTypes)
+			{
+				if (pair.Key == ruleName)
+					return true;
+			}
+			return false;
+		}
+		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 = EditorHelper.LoadSettingData<AssetBundleCollectorSetting>();
+
 			// IPackRule
 			{
 				// 清空缓存集合
@@ -44,7 +146,6 @@ namespace YooAsset.Editor
 					typeof(PackCollector),
 					typeof(PackGroup),
 					typeof(PackRawFile),
-					typeof(PackShaderVariants)
 				};
 
 				var customTypes = EditorTools.GetAssignableTypes(typeof(IPackRule));
@@ -92,10 +193,8 @@ namespace YooAsset.Editor
 				List<Type> types = new List<Type>(100)
 				{
 					typeof(AddressByFileName),
-					typeof(AddressByFilePath),
-					typeof(AddressByFolderAndFileName),
-					typeof(AddressByGroupAndFileName),
-					typeof(AddressDisable)
+					typeof(AddressByCollectorAndFileName),
+					typeof(AddressByGroupAndFileName)
 				};
 
 				var customTypes = EditorTools.GetAssignableTypes(typeof(IAddressRule));
@@ -132,19 +231,8 @@ namespace YooAsset.Editor
 			}
 		}
 
-		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()
 		{
@@ -157,101 +245,18 @@ namespace YooAsset.Editor
 			}
 		}
 
-		/// <summary>
-		/// 修复配置文件
-		/// </summary>
-		public static void FixFile()
-		{
-			bool isFixed = Setting.FixAllPackageConfigError();
-			if (isFixed)
-			{
-				IsDirty = true;
-			}
-		}
-
 		/// <summary>
 		/// 清空所有数据
 		/// </summary>
 		public static void ClearAll()
 		{
-			Setting.ClearAll();
+			Setting.AutoCollectShaders = false;
+			Setting.ShadersBundleName = string.Empty;
+			Setting.Groups.Clear();
 			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))
@@ -321,78 +326,32 @@ 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 ModifyLocationToLower(bool locationToLower)
-		{
-			Setting.LocationToLower = locationToLower;
-			IsDirty = true;
-		}
-		public static void ModifyIncludeAssetGUID(bool includeAssetGUID)
-		{
-			Setting.IncludeAssetGUID = includeAssetGUID;
-			IsDirty = true;
-		}
-		public static void ModifyUniqueBundleName(bool uniqueBundleName)
-		{
-			Setting.UniqueBundleName = uniqueBundleName;
-			IsDirty = true;
-		}
-		public static void ModifyShowEditorAlias(bool showAlias)
-		{
-			Setting.ShowEditorAlias = showAlias;
-			IsDirty = true;
-		}
 
-		// 资源包裹编辑相关
-		public static AssetBundleCollectorPackage CreatePackage(string packageName)
+		// 着色器编辑相关
+		public static void ModifyShader(bool isCollectAllShaders, string shadersBundleName)
 		{
-			AssetBundleCollectorPackage package = new AssetBundleCollectorPackage();
-			package.PackageName = packageName;
-			Setting.Packages.Add(package);
+			Setting.AutoCollectShaders = isCollectAllShaders;
+			Setting.ShadersBundleName = shadersBundleName;
 			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 AssetBundleCollectorGroup CreateGroup(AssetBundleCollectorPackage package, string groupName)
+		public static void CreateGroup(string groupName)
 		{
 			AssetBundleCollectorGroup group = new AssetBundleCollectorGroup();
 			group.GroupName = groupName;
-			package.Groups.Add(group);
+			Setting.Groups.Add(group);
 			IsDirty = true;
-			return group;
 		}
-		public static void RemoveGroup(AssetBundleCollectorPackage package, AssetBundleCollectorGroup group)
+		public static void RemoveGroup(AssetBundleCollectorGroup group)
 		{
-			if (package.Groups.Remove(group))
+			if (Setting.Groups.Remove(group))
 			{
 				IsDirty = true;
 			}
@@ -401,17 +360,19 @@ namespace YooAsset.Editor
 				Debug.LogWarning($"Failed remove group : {group.GroupName}");
 			}
 		}
-		public static void ModifyGroup(AssetBundleCollectorPackage package, AssetBundleCollectorGroup group)
+		public static void ModifyGroup(AssetBundleCollectorGroup group)
 		{
-			if (package != null && group != null)
+			if (group != null)
 			{
 				IsDirty = true;
 			}
 		}
 
 		// 资源收集器编辑相关
-		public static void CreateCollector(AssetBundleCollectorGroup group, AssetBundleCollector collector)
+		public static void CreateCollector(AssetBundleCollectorGroup group, string collectPath)
 		{
+			AssetBundleCollector collector = new AssetBundleCollector();
+			collector.CollectPath = collectPath;
 			group.Collectors.Add(collector);
 			IsDirty = true;
 		}
@@ -433,14 +394,5 @@ 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,48 +12,29 @@ namespace YooAsset.Editor
 	public class AssetBundleCollectorWindow : EditorWindow
 	{
 		[MenuItem("YooAsset/AssetBundle Collector", false, 101)]
-		public static void OpenWindow()
+		public static void ShowExample()
 		{
-			AssetBundleCollectorWindow window = GetWindow<AssetBundleCollectorWindow>("资源包收集工具", true, WindowsDefine.DockedWindowTypes);
+			AssetBundleCollectorWindow window = GetWindow<AssetBundleCollectorWindow>("资源包收集工具", true, EditorDefine.DockedWindowTypes);
 			window.minSize = new Vector2(800, 600);
 		}
 
 		private Button _saveButton;
 		private List<string> _collectorTypeList;
-		private List<RuleDisplayName> _activeRuleList;
-		private List<RuleDisplayName> _addressRuleList;
-		private List<RuleDisplayName> _packRuleList;
-		private List<RuleDisplayName> _filterRuleList;
-
-		private Button _settingsButton;
-		private VisualElement _helpBoxContainer;
-		private VisualElement _setting1Container;
-		private VisualElement _setting2Container;
-		private Toggle _showPackageToogle;
-		private Toggle _enableAddressableToogle;
-		private Toggle _locationToLowerToogle;
-		private Toggle _includeAssetGUIDToogle;
-		private Toggle _uniqueBundleNameToogle;
-		private Toggle _showEditorAliasToggle;
-
-		private VisualElement _packageContainer;
-		private ListView _packageListView;
-		private TextField _packageNameTxt;
-		private TextField _packageDescTxt;
-
-		private VisualElement _groupContainer;
+		private List<string> _activeRuleList;
+		private List<string> _addressRuleList;
+		private List<string> _packRuleList;
+		private List<string> _filterRuleList;
 		private ListView _groupListView;
+		private ScrollView _collectorScrollView;
+		private PopupField<string> _activeRulePopupField;
+		private Toggle _enableAddressableToogle;
+		private Toggle _autoCollectShaderToogle;
+		private TextField _shaderBundleNameTxt;
 		private TextField _groupNameTxt;
 		private TextField _groupDescTxt;
 		private TextField _groupAssetTagsTxt;
-
-		private VisualElement _collectorContainer;
-		private ScrollView _collectorScrollView;
-		private PopupField<RuleDisplayName> _activeRulePopupField;
-
-		private int _lastModifyPackageIndex = 0;
-		private int _lastModifyGroupIndex = 0;
-		private bool _showSettings = false;
+		private VisualElement _groupContainer;
+		private string _lastModifyGroup = string.Empty;
 
 
 		public void CreateGUI()
@@ -77,61 +58,12 @@ namespace YooAsset.Editor
 				VisualElement root = this.rootVisualElement;
 
 				// 加载布局文件
-				var visualAsset = UxmlLoader.LoadWindowUXML<AssetBundleCollectorWindow>();
+				var visualAsset = EditorHelper.LoadWindowUXML<AssetBundleCollectorWindow>();
 				if (visualAsset == null)
 					return;
 
 				visualAsset.CloneTree(root);
 
-				// 警示栏
-				_helpBoxContainer = root.Q("HelpBoxContainer");
-
-				// 公共设置相关
-				_settingsButton = root.Q<Button>("SettingsButton");
-				_settingsButton.clicked += SettingsBtn_clicked;
-				_setting1Container = root.Q("PublicContainer1");
-				_setting2Container = root.Q("PublicContainer2");
-				_showPackageToogle = root.Q<Toggle>("ShowPackages");
-				_showPackageToogle.RegisterValueChangedCallback(evt =>
-				{
-					AssetBundleCollectorSettingData.ModifyPackageView(evt.newValue);
-					RefreshWindow();
-				});
-				_enableAddressableToogle = root.Q<Toggle>("EnableAddressable");
-				_enableAddressableToogle.RegisterValueChangedCallback(evt =>
-				{
-					AssetBundleCollectorSettingData.ModifyAddressable(evt.newValue);
-					RefreshWindow();
-				});
-				_locationToLowerToogle = root.Q<Toggle>("LocationToLower");
-				_locationToLowerToogle.RegisterValueChangedCallback(evt =>
-				{
-					AssetBundleCollectorSettingData.ModifyLocationToLower(evt.newValue);
-					RefreshWindow();
-				});
-				_includeAssetGUIDToogle = root.Q<Toggle>("IncludeAssetGUID");
-				_includeAssetGUIDToogle.RegisterValueChangedCallback(evt =>
-				{
-					AssetBundleCollectorSettingData.ModifyIncludeAssetGUID(evt.newValue);
-					RefreshWindow();
-				});
-				_uniqueBundleNameToogle = root.Q<Toggle>("UniqueBundleName");
-				_uniqueBundleNameToogle.RegisterValueChangedCallback(evt =>
-				{
-					AssetBundleCollectorSettingData.ModifyUniqueBundleName(evt.newValue);
-					RefreshWindow();
-				});
-				_showEditorAliasToggle = root.Q<Toggle>("ShowEditorAlias");
-				_showEditorAliasToggle.RegisterValueChangedCallback(evt =>
-				{
-					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;
@@ -142,52 +74,23 @@ namespace YooAsset.Editor
 				_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");
+				// 公共设置相关
+				_enableAddressableToogle = root.Q<Toggle>("EnableAddressable");
+				_enableAddressableToogle.RegisterValueChangedCallback(evt =>
 				{
-					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();
-					}
+					AssetBundleCollectorSettingData.ModifyAddressable(evt.newValue);
+					RefreshWindow();
 				});
-
-				// 包裹备注
-				_packageDescTxt = root.Q<TextField>("PackageDesc");
-				_packageDescTxt.RegisterValueChangedCallback(evt =>
+				_autoCollectShaderToogle = root.Q<Toggle>("AutoCollectShader");
+				_autoCollectShaderToogle.RegisterValueChangedCallback(evt =>
 				{
-					var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
-					if (selectPackage != null)
-					{
-						selectPackage.PackageDesc = evt.newValue;
-						AssetBundleCollectorSettingData.ModifyPackage(selectPackage);
-						FillPackageViewData();
-					}
+					AssetBundleCollectorSettingData.ModifyShader(evt.newValue, _shaderBundleNameTxt.value);
+					_shaderBundleNameTxt.SetEnabled(evt.newValue);
+				});
+				_shaderBundleNameTxt = root.Q<TextField>("ShaderBundleName");
+				_shaderBundleNameTxt.RegisterValueChangedCallback(evt =>
+				{
+					AssetBundleCollectorSettingData.ModifyShader(_autoCollectShaderToogle.value, evt.newValue);
 				});
 
 				// 分组列表相关
@@ -216,13 +119,11 @@ namespace YooAsset.Editor
 				_groupNameTxt = root.Q<TextField>("GroupName");
 				_groupNameTxt.RegisterValueChangedCallback(evt =>
 				{
-					var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
 					var selectGroup = _groupListView.selectedItem as AssetBundleCollectorGroup;
-					if (selectPackage != null && selectGroup != null)
+					if (selectGroup != null)
 					{
 						selectGroup.GroupName = evt.newValue;
-						AssetBundleCollectorSettingData.ModifyGroup(selectPackage, selectGroup);
-						FillGroupViewData();
+						AssetBundleCollectorSettingData.ModifyGroup(selectGroup);
 					}
 				});
 
@@ -230,13 +131,11 @@ namespace YooAsset.Editor
 				_groupDescTxt = root.Q<TextField>("GroupDesc");
 				_groupDescTxt.RegisterValueChangedCallback(evt =>
 				{
-					var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
 					var selectGroup = _groupListView.selectedItem as AssetBundleCollectorGroup;
-					if (selectPackage != null && selectGroup != null)
+					if (selectGroup != null)
 					{
 						selectGroup.GroupDesc = evt.newValue;
-						AssetBundleCollectorSettingData.ModifyGroup(selectPackage, selectGroup);
-						FillGroupViewData();
+						AssetBundleCollectorSettingData.ModifyGroup(selectGroup);
 					}
 				});
 
@@ -244,18 +143,14 @@ namespace YooAsset.Editor
 				_groupAssetTagsTxt = root.Q<TextField>("GroupAssetTags");
 				_groupAssetTagsTxt.RegisterValueChangedCallback(evt =>
 				{
-					var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
 					var selectGroup = _groupListView.selectedItem as AssetBundleCollectorGroup;
-					if (selectPackage != null && selectGroup != null)
+					if (selectGroup != null)
 					{
 						selectGroup.AssetTags = evt.newValue;
-						AssetBundleCollectorSettingData.ModifyGroup(selectPackage, selectGroup);
+						AssetBundleCollectorSettingData.ModifyGroup(selectGroup);
 					}
 				});
 
-				// 收集列表容器
-				_collectorContainer = root.Q("CollectorContainer");
-
 				// 收集列表相关
 				_collectorScrollView = root.Q<ScrollView>("CollectorScrollView");
 				_collectorScrollView.style.height = new Length(100, LengthUnit.Percent);
@@ -271,23 +166,20 @@ namespace YooAsset.Editor
 				// 分组激活规则
 				var activeRuleContainer = root.Q("ActiveRuleContainer");
 				{
-					_activeRulePopupField = new PopupField<RuleDisplayName>("Active Rule", _activeRuleList, 0);
+					_activeRulePopupField = new PopupField<string>("Active Rule", _activeRuleList, 0);
 					_activeRulePopupField.name = "ActiveRuleMaskField";
 					_activeRulePopupField.style.unityTextAlign = TextAnchor.MiddleLeft;
-					_activeRulePopupField.formatListItemCallback = FormatListItemCallback;
-					_activeRulePopupField.formatSelectedValueCallback = FormatSelectedValueCallback;
+					activeRuleContainer.Add(_activeRulePopupField);
 					_activeRulePopupField.RegisterValueChangedCallback(evt =>
 					{
-						var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
 						var selectGroup = _groupListView.selectedItem as AssetBundleCollectorGroup;
-						if (selectPackage != null && selectGroup != null)
+						if (selectGroup != null)
 						{
-							selectGroup.ActiveRuleName = evt.newValue.ClassName;
-							AssetBundleCollectorSettingData.ModifyGroup(selectPackage, selectGroup);
+							selectGroup.ActiveRuleName = evt.newValue;
+							AssetBundleCollectorSettingData.ModifyGroup(selectGroup);
 							FillGroupViewData();
 						}
 					});
-					activeRuleContainer.Add(_activeRulePopupField);
 				}
 
 				// 刷新窗体
@@ -325,53 +217,13 @@ namespace YooAsset.Editor
 
 		private void RefreshWindow()
 		{
-			_showPackageToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.ShowPackageView);
 			_enableAddressableToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.EnableAddressable);
-			_locationToLowerToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.LocationToLower);
-			_includeAssetGUIDToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.IncludeAssetGUID);
-			_uniqueBundleNameToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.UniqueBundleName);
-			_showEditorAliasToggle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.ShowEditorAlias);
-
-			// 警示框
-#if UNITY_2020_3_OR_NEWER
-			_helpBoxContainer.Clear();
-			if (_enableAddressableToogle.value && _locationToLowerToogle.value)
-			{
-				var helpBox = new HelpBox("无法同时开启[Enable Addressable]选项和[Location To Lower]选项", HelpBoxMessageType.Error);
-				_helpBoxContainer.Add(helpBox);
-			}
-			if (AssetBundleCollectorSettingData.Setting.Packages.Count > 1 && _uniqueBundleNameToogle.value == false)
-			{
-				var helpBox = new HelpBox("检测到当前配置存在多个Package，建议开启[Unique Bundle Name]选项", HelpBoxMessageType.Warning);
-				_helpBoxContainer.Add(helpBox);
-			}
-			if (_helpBoxContainer.childCount > 0)
-				_helpBoxContainer.style.display = DisplayStyle.Flex;
-			else
-				_helpBoxContainer.style.display = DisplayStyle.None;
-#endif
-
-			// 设置栏
-			if (_showSettings)
-			{
-				_setting1Container.style.display = DisplayStyle.Flex;
-				_setting2Container.style.display = DisplayStyle.Flex;
-			}
-			else
-			{
-				_setting1Container.style.display = DisplayStyle.None;
-				_setting2Container.style.display = DisplayStyle.None;
-			}
-
+			_autoCollectShaderToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.AutoCollectShaders);
+			_shaderBundleNameTxt.SetEnabled(AssetBundleCollectorSettingData.Setting.AutoCollectShaders);
+			_shaderBundleNameTxt.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.ShadersBundleName);
 			_groupContainer.visible = false;
-			_collectorContainer.visible = false;
 
-			FillPackageViewData();
-		}
-		private void FixBtn_clicked()
-		{
-			AssetBundleCollectorSettingData.FixFile();
-			RefreshWindow();
+			FillGroupViewData();
 		}
 		private void ExportBtn_clicked()
 		{
@@ -394,117 +246,23 @@ namespace YooAsset.Editor
 		{
 			AssetBundleCollectorSettingData.SaveFile();
 		}
-		private void SettingsBtn_clicked()
-		{
-			_showSettings = !_showSettings;
-			RefreshWindow();
-		}
-		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 = selectPackage.Groups;
+			_groupListView.itemsSource = AssetBundleCollectorSettingData.Setting.Groups;
 			_groupListView.Rebuild();
 
-			if (_lastModifyGroupIndex >= 0 && _lastModifyGroupIndex < _groupListView.itemsSource.Count)
+			for (int index = 0; index < AssetBundleCollectorSettingData.Setting.Groups.Count; index++)
 			{
-				_groupListView.selectedIndex = _lastModifyGroupIndex;
+				var group = AssetBundleCollectorSettingData.Setting.Groups[index];
+				if (group.GroupName == _lastModifyGroup)
+				{
+					_groupListView.selectedIndex = index;
+					break;
+				}
 			}
 		}
 		private VisualElement MakeGroupListViewItem()
@@ -524,12 +282,9 @@ namespace YooAsset.Editor
 		}
 		private void BindGroupListViewItem(VisualElement element, int index)
 		{
-			var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
-			if (selectPackage == null)
-				return;
-
-			var group = selectPackage.Groups[index];
+			var group = AssetBundleCollectorSettingData.Setting.Groups[index];
 
+			// Group Name
 			var textField1 = element.Q<Label>("Label1");
 			if (string.IsNullOrEmpty(group.GroupDesc))
 				textField1.text = group.GroupName;
@@ -543,44 +298,22 @@ namespace YooAsset.Editor
 		}
 		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()
 		{
-			var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
-			if (selectPackage == null)
-				return;
-
 			Undo.RecordObject(AssetBundleCollectorSettingData.Setting, "YooAsset.AssetBundleCollectorWindow AddGroup");
-			AssetBundleCollectorSettingData.CreateGroup(selectPackage, "Default Group");
+			AssetBundleCollectorSettingData.CreateGroup("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.AssetBundleCollectorWindow RemoveGroup");
-			AssetBundleCollectorSettingData.RemoveGroup(selectPackage, selectGroup);
+			AssetBundleCollectorSettingData.RemoveGroup(selectGroup);
 			FillGroupViewData();
 		}
 
@@ -589,7 +322,17 @@ namespace YooAsset.Editor
 		{
 			var selectGroup = _groupListView.selectedItem as AssetBundleCollectorGroup;
 			if (selectGroup == null)
+			{
+				_groupContainer.visible = false;
 				return;
+			}
+
+			_lastModifyGroup = selectGroup.GroupName;
+			_groupContainer.visible = true;
+			_activeRulePopupField.SetValueWithoutNotify(selectGroup.ActiveRuleName);
+			_groupNameTxt.SetValueWithoutNotify(selectGroup.GroupName);
+			_groupDescTxt.SetValueWithoutNotify(selectGroup.GroupDesc);
+			_groupAssetTagsTxt.SetValueWithoutNotify(selectGroup.AssetTags);
 
 			// 填充数据
 			_collectorScrollView.Clear();
@@ -656,34 +399,25 @@ namespace YooAsset.Editor
 			}
 			if (_enableAddressableToogle.value)
 			{
-				var popupField = new PopupField<RuleDisplayName>(_addressRuleList, 0);
+				var popupField = new PopupField<string>(_addressRuleList, 0);
 				popupField.name = "PopupField1";
 				popupField.style.unityTextAlign = TextAnchor.MiddleLeft;
-				popupField.style.width = 220;
+				popupField.style.width = 200;
 				elementBottom.Add(popupField);
 			}
 			{
-				var popupField = new PopupField<RuleDisplayName>(_packRuleList, 0);
+				var popupField = new PopupField<string>(_packRuleList, 0);
 				popupField.name = "PopupField2";
 				popupField.style.unityTextAlign = TextAnchor.MiddleLeft;
-				popupField.style.width = 220;
-				elementBottom.Add(popupField);
-			}
-			{
-				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 popupField = new PopupField<string>(_filterRuleList, 0);
+				popupField.name = "PopupField3";
+				popupField.style.unityTextAlign = TextAnchor.MiddleLeft;
+				popupField.style.width = 150;
+				elementBottom.Add(popupField);
 			}
 			{
 				var textField = new TextField();
@@ -754,7 +488,6 @@ 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)
@@ -768,7 +501,7 @@ namespace YooAsset.Editor
 			popupField0.index = GetCollectorTypeIndex(collector.CollectorType.ToString());
 			popupField0.RegisterValueChangedCallback(evt =>
 			{
-				collector.CollectorType = EditorTools.NameToEnum<ECollectorType>(evt.newValue);
+				collector.CollectorType = StringUtility.NameToEnum<ECollectorType>(evt.newValue);
 				AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
 				if (foldout.value)
 				{
@@ -777,15 +510,13 @@ namespace YooAsset.Editor
 			});
 
 			// Address Rule
-			var popupField1 = element.Q<PopupField<RuleDisplayName>>("PopupField1");
+			var popupField1 = element.Q<PopupField<string>>("PopupField1");
 			if (popupField1 != null)
 			{
 				popupField1.index = GetAddressRuleIndex(collector.AddressRuleName);
-				popupField1.formatListItemCallback = FormatListItemCallback;
-				popupField1.formatSelectedValueCallback = FormatSelectedValueCallback;
 				popupField1.RegisterValueChangedCallback(evt =>
 				{
-					collector.AddressRuleName = evt.newValue.ClassName;
+					collector.AddressRuleName = evt.newValue;
 					AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
 					if (foldout.value)
 					{
@@ -795,13 +526,11 @@ namespace YooAsset.Editor
 			}
 
 			// Pack Rule
-			var popupField2 = element.Q<PopupField<RuleDisplayName>>("PopupField2");
+			var popupField2 = element.Q<PopupField<string>>("PopupField2");
 			popupField2.index = GetPackRuleIndex(collector.PackRuleName);
-			popupField2.formatListItemCallback = FormatListItemCallback;
-			popupField2.formatSelectedValueCallback = FormatSelectedValueCallback;
 			popupField2.RegisterValueChangedCallback(evt =>
 			{
-				collector.PackRuleName = evt.newValue.ClassName;
+				collector.PackRuleName = evt.newValue;
 				AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
 				if (foldout.value)
 				{
@@ -810,13 +539,11 @@ namespace YooAsset.Editor
 			});
 
 			// Filter Rule
-			var popupField3 = element.Q<PopupField<RuleDisplayName>>("PopupField3");
+			var popupField3 = element.Q<PopupField<string>>("PopupField3");
 			popupField3.index = GetFilterRuleIndex(collector.FilterRuleName);
-			popupField3.formatListItemCallback = FormatListItemCallback;
-			popupField3.formatSelectedValueCallback = FormatSelectedValueCallback;
 			popupField3.RegisterValueChangedCallback(evt =>
 			{
-				collector.FilterRuleName = evt.newValue.ClassName;
+				collector.FilterRuleName = evt.newValue;
 				AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
 				if (foldout.value)
 				{
@@ -824,15 +551,6 @@ 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);
@@ -859,9 +577,7 @@ namespace YooAsset.Editor
 
 				try
 				{
-					CollectCommand command = new CollectCommand(EBuildMode.SimulateBuild, _packageNameTxt.value,
-						_enableAddressableToogle.value, _locationToLowerToogle.value, _includeAssetGUIDToogle.value, _uniqueBundleNameToogle.value);
-					collectAssetInfos = collector.GetAllCollectAssets(command, group);
+					collectAssetInfos = collector.GetAllCollectAssets(EBuildMode.DryRunBuild, group);
 				}
 				catch (System.Exception e)
 				{
@@ -878,7 +594,12 @@ namespace YooAsset.Editor
 
 						string showInfo = collectAssetInfo.AssetPath;
 						if (_enableAddressableToogle.value)
-							showInfo = $"[{collectAssetInfo.Address}] {collectAssetInfo.AssetPath}";
+						{
+							IAddressRule instance = AssetBundleCollectorSettingData.GetAddressRuleInstance(collector.AddressRuleName);
+							AddressRuleData ruleData = new AddressRuleData(collectAssetInfo.AssetPath, collector.CollectPath, group.GroupName);
+							string addressValue = instance.GetAssetAddress(ruleData);
+							showInfo = $"[{addressValue}] {showInfo}";
+						}
 
 						var label = new Label();
 						label.text = showInfo;
@@ -897,8 +618,7 @@ namespace YooAsset.Editor
 				return;
 
 			Undo.RecordObject(AssetBundleCollectorSettingData.Setting, "YooAsset.AssetBundleCollectorWindow AddCollector");
-			AssetBundleCollector collector = new AssetBundleCollector();
-			AssetBundleCollectorSettingData.CreateCollector(selectGroup, collector);
+			AssetBundleCollectorSettingData.CreateCollector(selectGroup, string.Empty);
 			FillCollectorViewData();
 		}
 		private void RemoveCollectorBtn_clicked(AssetBundleCollector selectCollector)
@@ -927,7 +647,7 @@ namespace YooAsset.Editor
 		{
 			for (int i = 0; i < _addressRuleList.Count; i++)
 			{
-				if (_addressRuleList[i].ClassName == ruleName)
+				if (_addressRuleList[i] == ruleName)
 					return i;
 			}
 			return 0;
@@ -936,7 +656,7 @@ namespace YooAsset.Editor
 		{
 			for (int i = 0; i < _packRuleList.Count; i++)
 			{
-				if (_packRuleList[i].ClassName == ruleName)
+				if (_packRuleList[i] == ruleName)
 					return i;
 			}
 			return 0;
@@ -945,20 +665,11 @@ namespace YooAsset.Editor
 		{
 			for (int i = 0; i < _filterRuleList.Count; i++)
 			{
-				if (_filterRuleList[i].ClassName == ruleName)
+				if (_filterRuleList[i] == 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,53 +1,33 @@
-<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="True">
+<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; flex-direction: row-reverse;">
         <ui:Button text="Save" display-tooltip-when-elided="true" name="SaveButton" style="width: 50px; background-color: rgb(56, 147, 58);" />
         <ui:Button text="导出" display-tooltip-when-elided="true" name="ExportButton" style="width: 50px; background-color: rgb(56, 147, 58);" />
         <ui:Button text="导入" display-tooltip-when-elided="true" name="ImportButton" style="width: 50px; background-color: rgb(56, 147, 58);" />
-        <ui:Button text="修复" display-tooltip-when-elided="true" name="FixButton" style="width: 50px; background-color: rgb(56, 147, 58);" />
     </uie:Toolbar>
-    <ui:VisualElement name="PublicContainer" style="background-color: rgb(79, 79, 79); flex-direction: column; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">
-        <ui:VisualElement name="HelpBoxContainer" style="flex-grow: 1;" />
-        <ui:Button text="Settings" display-tooltip-when-elided="true" name="SettingsButton" />
-        <ui:VisualElement name="PublicContainer1" style="flex-direction: row; flex-wrap: nowrap; height: 28px;">
-            <ui:Toggle label="Show Packages" name="ShowPackages" style="width: 196px; -unity-text-align: middle-left;" />
-            <ui:Toggle label="Show Editor Alias" name="ShowEditorAlias" style="width: 196px; -unity-text-align: middle-left;" />
-            <ui:Toggle label="Enable Addressable" name="EnableAddressable" style="width: 196px; -unity-text-align: middle-left;" />
-            <ui:Toggle label="Unique Bundle Name" name="UniqueBundleName" style="width: 196px; -unity-text-align: middle-left;" />
-        </ui:VisualElement>
-        <ui:VisualElement name="PublicContainer2" style="flex-direction: row; flex-wrap: nowrap; height: 28px;">
-            <ui:Toggle label="Location To Lower" name="LocationToLower" style="width: 196px; -unity-text-align: middle-left;" />
-            <ui:Toggle label="Include Asset GUID" name="IncludeAssetGUID" style="width: 196px; -unity-text-align: middle-left;" />
-        </ui:VisualElement>
-    </ui:VisualElement>
     <ui:VisualElement name="ContentContainer" style="flex-grow: 1; flex-direction: row;">
-        <ui:VisualElement name="PackageContainer" style="width: 200px; flex-grow: 0; background-color: rgb(67, 67, 67); border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">
-            <ui:Label text="Packages" display-tooltip-when-elided="true" name="PackageTitle" style="background-color: rgb(89, 89, 89); -unity-text-align: upper-center; -unity-font-style: bold; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px; font-size: 12px;" />
-            <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: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: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="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" />
-            <ui:VisualElement name="CollectorAddContainer" style="height: 20px; flex-direction: row-reverse;">
-                <ui:Button text="[ + ]" display-tooltip-when-elided="true" name="AddBtn" />
+        <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="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" />
+                <ui:VisualElement name="CollectorAddContainer" style="height: 20px; flex-direction: row-reverse;">
+                    <ui:Button text="[ + ]" display-tooltip-when-elided="true" name="AddBtn" />
+                </ui:VisualElement>
+                <ui:ScrollView name="CollectorScrollView" style="flex-grow: 1;" />
             </ui:VisualElement>
-            <ui:ScrollView name="CollectorScrollView" style="flex-grow: 1;" />
         </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 bool IsRawAsset { 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> DependAssets = new List<string>();
 
 
-		public CollectAssetInfo(ECollectorType collectorType, string bundleName, string address, string assetPath, bool isRawAsset, List<string> assetTags)
+		public CollectAssetInfo(ECollectorType collectorType, string bundleName, string address, string assetPath, List<string> assetTags, bool isRawAsset)
 		{
 			CollectorType = collectorType;
 			BundleName = bundleName;
 			Address = address;
 			AssetPath = assetPath;
-			IsRawAsset = isRawAsset;
 			AssetTags = assetTags;
+			IsRawAsset = isRawAsset;
 		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleCollector/CollectCommand.cs

@@ -1,56 +0,0 @@
-
-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 LocationToLower { private set; get; }
-
-		/// <summary>
-		/// 包含资源GUID数据
-		/// </summary>
-		public bool IncludeAssetGUID { 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 locationToLower, bool includeAssetGUID, bool uniqueBundleName)
-		{
-			BuildMode = buildMode;
-			PackageName = packageName;
-			EnableAddressable = enableAddressable;
-			LocationToLower = locationToLower;
-			IncludeAssetGUID = includeAssetGUID;
-			UniqueBundleName = uniqueBundleName;
-
-			// 着色器统一全名称
-			var packRuleResult = DefaultPackRule.CreateShadersPackRuleResult();
-			ShadersBundleName = packRuleResult.GetMainBundleName(packageName, uniqueBundleName);
-		}
-	}
-}

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

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

Assets/YooAsset/Editor/AssetBundleCollector/CollectResult.cs

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

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

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

@@ -1,79 +0,0 @@
-
-namespace YooAsset.Editor
-{
-	public struct PackRuleData
-	{
-		public string AssetPath;
-		public string CollectPath;
-		public string GroupName;
-		public string UserData;
-
-		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('.', '_').Replace(" ", "_").ToLower();
-			if (uniqueBundleName)
-				fullName = $"{packageName}_{bundleName}.{_bundleExtension}";
-			else
-				fullName = $"{bundleName}.{_bundleExtension}";
-			return fullName.ToLower();
-		}
-
-		/// <summary>
-		/// 获取共享资源包全名称
-		/// </summary>
-		public string GetShareBundleName(string packageName, bool uniqueBundleName)
-		{
-			// 注意：冗余的共享资源包名返回空
-			if (string.IsNullOrEmpty(_bundleName) && string.IsNullOrEmpty(_bundleExtension))
-				return string.Empty;
-
-			string fullName;
-			string bundleName = EditorTools.GetRegularPath(_bundleName).Replace('/', '_').Replace('.', '_').Replace(" ", "_").ToLower();
-			if (uniqueBundleName)
-				fullName = $"{packageName}_share_{bundleName}.{_bundleExtension}";
-			else
-				fullName = $"share_{bundleName}.{_bundleExtension}";
-			return fullName.ToLower();
-		}
-	}
-
-	/// <summary>
-	/// 资源打包规则接口
-	/// </summary>
-	public interface IPackRule
-	{
-		/// <summary>
-		/// 获取打包规则结果
-		/// </summary>
-		PackRuleResult GetPackRuleResult(PackRuleData data);
-
-		/// <summary>
-		/// 是否为原生文件打包规则
-		/// </summary>
-		bool IsRawFilePackRule();
-	}
-}

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

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

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

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

Assets/YooAsset/Editor/AssetBundleCollector/DefaultActiveRule.cs

@@ -1,7 +1,9 @@
 
 namespace YooAsset.Editor
 {
-	[DisplayName("启用分组")]
+	/// <summary>
+	/// 启用分组
+	/// </summary>
 	public class EnableGroup : IActiveRule
 	{
 		public bool IsActiveGroup()
@@ -10,7 +12,9 @@ namespace YooAsset.Editor
 		}
 	}
 
-	[DisplayName("禁用分组")]
+	/// <summary>
+	/// 禁用分组
+	/// </summary>
 	public class DisableGroup : IActiveRule
 	{
 		public bool IsActiveGroup()

Assets/YooAsset/Editor/AssetBundleCollector/DefaultAddressRule.cs

@@ -0,0 +1,40 @@
+using System.IO;
+
+namespace YooAsset.Editor
+{
+	/// <summary>
+	/// 以文件名为定位地址
+	/// </summary>
+	public class AddressByFileName : IAddressRule
+	{
+		string IAddressRule.GetAssetAddress(AddressRuleData data)
+		{
+			return Path.GetFileNameWithoutExtension(data.AssetPath);
+		}
+	}
+
+	/// <summary>
+	/// 以组名+文件名为定位地址
+	/// </summary>
+	public class AddressByGroupAndFileName : IAddressRule
+	{
+		string IAddressRule.GetAssetAddress(AddressRuleData data)
+		{
+			string fileName = Path.GetFileNameWithoutExtension(data.AssetPath);
+			return $"{data.GroupName}_{fileName}";
+		}
+	}
+
+	/// <summary>
+	/// 以收集器名+文件名为定位地址
+	/// </summary>
+	public class AddressByCollectorAndFileName : IAddressRule
+	{
+		string IAddressRule.GetAssetAddress(AddressRuleData data)
+		{
+			string fileName = Path.GetFileNameWithoutExtension(data.AssetPath);
+			string collectorName = Path.GetFileNameWithoutExtension(data.CollectPath);
+			return $"{collectorName}_{fileName}";
+		}
+	}
+}

Assets/YooAsset/Editor/AssetBundleCollector/DefaultFilterRule.cs

@@ -1,28 +1,12 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using UnityEngine;
+using UnityEngine;
 using UnityEditor;
+using System.IO;
 
 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("收集所有资源")]
+	/// <summary>
+	/// 收集所有资源
+	/// </summary>
 	public class CollectAll : IFilterRule
 	{
 		public bool IsCollectAsset(FilterRuleData data)
@@ -31,7 +15,9 @@ namespace YooAsset.Editor
 		}
 	}
 
-	[DisplayName("收集场景")]
+	/// <summary>
+	/// 只收集场景
+	/// </summary>
 	public class CollectScene : IFilterRule
 	{
 		public bool IsCollectAsset(FilterRuleData data)
@@ -40,7 +26,9 @@ namespace YooAsset.Editor
 		}
 	}
 	
-	[DisplayName("收集预制体")]
+	/// <summary>
+	/// 只收集预制体
+	/// </summary>
 	public class CollectPrefab : IFilterRule
 	{
 		public bool IsCollectAsset(FilterRuleData data)
@@ -49,13 +37,15 @@ namespace YooAsset.Editor
 		}
 	}
 
-	[DisplayName("收集精灵类型的纹理")]
+	/// <summary>
+	/// 只收集精灵类型的资源
+	/// </summary>
 	public class CollectSprite : IFilterRule
 	{
 		public bool IsCollectAsset(FilterRuleData data)
 		{
 			var mainAssetType = AssetDatabase.GetMainAssetTypeAtPath(data.AssetPath);
-			if (mainAssetType == typeof(Texture2D))
+			if(mainAssetType == typeof(Texture2D))
 			{
 				var texImporter = AssetImporter.GetAtPath(data.AssetPath) as TextureImporter;
 				if (texImporter != null && texImporter.textureType == TextureImporterType.Sprite)
@@ -69,13 +59,4 @@ namespace YooAsset.Editor
 			}
 		}
 	}
-
-	[DisplayName("收集着色器变种集合")]
-	public class CollectShaderVariants : IFilterRule
-	{
-		public bool IsCollectAsset(FilterRuleData data)
-		{
-			return Path.GetExtension(data.AssetPath) == ".shadervariants";
-		}
-	}
 }

Assets/YooAsset/Editor/AssetBundleCollector/DefaultPackRule.cs

@@ -0,0 +1,116 @@
+using System;
+using System.IO;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+	/// <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"
+	/// </summary>
+	public class PackSeparately : IPackRule
+	{
+		string IPackRule.GetBundleName(PackRuleData data)
+		{
+			return StringUtility.RemoveExtension(data.AssetPath);
+		}
+	}
+
+	/// <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"
+	/// </summary>
+	public class PackDirectory : IPackRule
+	{
+		public static PackDirectory StaticPackRule = new PackDirectory();
+
+		string IPackRule.GetBundleName(PackRuleData data)
+		{
+			return Path.GetDirectoryName(data.AssetPath);
+		}
+	}
+
+	/// <summary>
+	/// 以收集器路径下顶级文件夹为资源包名
+	/// 注意：文件夹下所有文件打进一个资源包
+	/// 例如：收集器路径为 "Assets/UIPanel"
+	/// 例如："Assets/UIPanel/Shop/Image/backgroud.png" --> "assets/uipanel/shop.bundle"
+	/// 例如："Assets/UIPanel/Shop/View/main.prefab" --> "assets/uipanel/shop.bundle"
+	/// </summary>
+	public class PackTopDirectory : IPackRule
+	{
+		string IPackRule.GetBundleName(PackRuleData data)
+		{
+			string assetPath = data.AssetPath.Replace(data.CollectPath, string.Empty);
+			assetPath = assetPath.TrimStart('/');
+			string[] splits = assetPath.Split('/');
+			if (splits.Length > 0)
+			{
+				if (Path.HasExtension(splits[0]))
+					throw new Exception($"Not found root directory : {assetPath}");
+				string bundleName = $"{data.CollectPath}/{splits[0]}";
+				return bundleName;
+			}
+			else
+			{
+				throw new Exception($"Not found root directory : {assetPath}");
+			}
+		}
+	}
+
+	/// <summary>
+	/// 以收集器路径作为资源包名
+	/// 注意：收集的所有文件打进一个资源包
+	/// </summary>
+	public class PackCollector : IPackRule
+	{
+		string IPackRule.GetBundleName(PackRuleData data)
+		{
+			return StringUtility.RemoveExtension(data.CollectPath);
+		}
+	}
+
+	/// <summary>
+	/// 以分组名称作为资源包名
+	/// 注意：收集的所有文件打进一个资源包
+	/// </summary>
+	public class PackGroup : IPackRule
+	{
+		string IPackRule.GetBundleName(PackRuleData data)
+		{
+			return data.GroupName;
+		}
+	}
+
+	/// <summary>
+	/// 原生文件打包模式
+	/// 注意：原生文件打包支持：图片，音频，视频，文本
+	/// </summary>
+	public class PackRawFile : IPackRule
+	{
+		string IPackRule.GetBundleName(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[] depends = AssetDatabase.GetDependencies(data.AssetPath, true);
+			if (depends.Length != 1)
+				throw new Exception($"{nameof(PackRawFile)} is not support estension : {extension}");
+
+			return StringUtility.RemoveExtension(data.AssetPath);
+		}
+	}
+}

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

@@ -1,52 +0,0 @@
-using System.IO;
-
-namespace YooAsset.Editor
-{
-	[DisplayName("定位地址: 禁用")]
-	public class AddressDisable : IAddressRule
-	{
-		string IAddressRule.GetAssetAddress(AddressRuleData data)
-		{
-			return string.Empty;
-		}
-	}
-
-	[DisplayName("定位地址: 文件名")]
-	public class AddressByFileName : IAddressRule
-	{
-		string IAddressRule.GetAssetAddress(AddressRuleData data)
-		{
-			return Path.GetFileNameWithoutExtension(data.AssetPath);
-		}
-	}
-
-	[DisplayName("定位地址: 文件路径")]
-	public class AddressByFilePath : IAddressRule
-	{
-		string IAddressRule.GetAssetAddress(AddressRuleData data)
-		{
-			throw new System.Exception("可寻址模式下已经默认支持通过资源路径加载！");
-		}
-	}
-
-	[DisplayName("定位地址: 分组名_文件名")]
-	public class AddressByGroupAndFileName : IAddressRule
-	{
-		string IAddressRule.GetAssetAddress(AddressRuleData data)
-		{
-			string fileName = Path.GetFileNameWithoutExtension(data.AssetPath);
-			return $"{data.GroupName}_{fileName}";
-		}
-	}
-
-	[DisplayName("定位地址: 文件夹名_文件名")]
-	public class AddressByFolderAndFileName : IAddressRule
-	{
-		string IAddressRule.GetAssetAddress(AddressRuleData data)
-		{
-			string fileName = Path.GetFileNameWithoutExtension(data.AssetPath);
-			FileInfo fileInfo = new FileInfo(data.AssetPath);
-			return $"{fileInfo.Directory.Name}_{fileName}";
-		}
-	}
-}

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

@@ -1,196 +0,0 @@
-using System;
-using System.IO;
-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/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
-	{
-		PackRuleResult IPackRule.GetPackRuleResult(PackRuleData data)
-		{
-			string bundleName = PathUtility.RemoveExtension(data.AssetPath);
-			PackRuleResult result = new PackRuleResult(bundleName, DefaultPackRule.AssetBundleFileExtension);
-			return result;
-		}
-
-		bool IPackRule.IsRawFilePackRule()
-		{
-			return false;
-		}
-	}
-
-	/// <summary>
-	/// 以父类文件夹路径作为资源包名
-	/// 注意：文件夹下所有文件打进一个资源包
-	/// 例如："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
-	{
-		PackRuleResult IPackRule.GetPackRuleResult(PackRuleData data)
-		{
-			string bundleName = Path.GetDirectoryName(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.bundle"
-	/// 例如："Assets/UIPanel/Shop/View/main.prefab" --> "assets_uipanel_shop.bundle"
-	/// </summary>
-	[DisplayName("资源包名: 收集器下顶级文件夹路径")]
-	public class PackTopDirectory : IPackRule
-	{
-		PackRuleResult IPackRule.GetPackRuleResult(PackRuleData data)
-		{
-			string assetPath = data.AssetPath.Replace(data.CollectPath, string.Empty);
-			assetPath = assetPath.TrimStart('/');
-			string[] splits = assetPath.Split('/');
-			if (splits.Length > 0)
-			{
-				if (Path.HasExtension(splits[0]))
-					throw new Exception($"Not found root directory : {assetPath}");
-				string bundleName = $"{data.CollectPath}/{splits[0]}";
-				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
-	{
-		PackRuleResult IPackRule.GetPackRuleResult(PackRuleData data)
-		{
-			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;
-		}
-	}
-
-	/// <summary>
-	/// 以分组名称作为资源包名
-	/// 注意：收集的所有文件打进一个资源包
-	/// </summary>
-	[DisplayName("资源包名: 分组名称")]
-	public class PackGroup : IPackRule
-	{
-		PackRuleResult IPackRule.GetPackRuleResult(PackRuleData data)
-		{
-			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
-	{
-		PackRuleResult IPackRule.GetPackRuleResult(PackRuleData data)
-		{
-			string bundleName = data.AssetPath;
-			PackRuleResult result = new PackRuleResult(bundleName, DefaultPackRule.RawFileExtension);
-			return result;
-		}
-
-		bool IPackRule.IsRawFilePackRule()
-		{
-			return true;
-		}
-	}
-
-	/// <summary>
-	/// 打包着色器变种集合
-	/// </summary>
-	[DisplayName("打包着色器变种集合文件")]
-	public class PackShaderVariants : IPackRule
-	{
-		public PackRuleResult GetPackRuleResult(PackRuleData data)
-		{
-			return DefaultPackRule.CreateShadersPackRuleResult();
-		}
-
-		bool IPackRule.IsRawFilePackRule()
-		{
-			return false;
-		}
-	}
-}

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

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

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

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

Assets/YooAsset/Editor/AssetBundleCollector/DisplayNameAttribute.cs

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

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