TE6 打飞机Demo

TE6 打飞机Demo

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateCatalog.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+    public class TaskCreateCatalog
+    {
+        /// <summary>
+        /// 生成内置资源记录文件
+        /// </summary>
+        internal void CreateCatalogFile(BuildParametersContext buildParametersContext)
+        {
+            string buildinRootDirectory = buildParametersContext.GetBuildinRootDirectory();
+            string buildPackageName = buildParametersContext.Parameters.PackageName;
+            DefaultBuildinFileSystemBuild.CreateBuildinCatalogFile(buildPackageName, buildinRootDirectory);
+
+            // 刷新目录
+            AssetDatabase.Refresh();
+        }
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateCatalog.cs.meta

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

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateManifest.cs

@@ -12,40 +12,51 @@ namespace YooAsset.Editor
 
     public abstract class TaskCreateManifest
     {
-        private readonly Dictionary<string, int> _cachedBundleID = new Dictionary<string, int>(10000);
+        private readonly Dictionary<string, int> _cachedBundleIndexIDs = new Dictionary<string, int>(10000);
         private readonly Dictionary<int, HashSet<string>> _cacheBundleTags = new Dictionary<int, HashSet<string>>(10000);
 
         /// <summary>
         /// 创建补丁清单文件到输出目录
         /// </summary>
-        protected void CreateManifestFile(BuildContext context)
+        protected void CreateManifestFile(bool processBundleDepends, bool processBundleTags, BuildContext context)
         {
             var buildMapContext = context.GetContextObject<BuildMapContext>();
             var buildParametersContext = context.GetContextObject<BuildParametersContext>();
             var buildParameters = buildParametersContext.Parameters;
             string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
 
+            // 检测资源包哈希冲突
+            CheckBundleHashConflict(buildMapContext);
+
             // 创建新补丁清单
             PackageManifest manifest = new PackageManifest();
-            manifest.FileVersion = YooAssetSettings.ManifestFileVersion;
+            manifest.FileVersion = ManifestDefine.FileVersion;
             manifest.EnableAddressable = buildMapContext.Command.EnableAddressable;
             manifest.LocationToLower = buildMapContext.Command.LocationToLower;
             manifest.IncludeAssetGUID = buildMapContext.Command.IncludeAssetGUID;
             manifest.OutputNameStyle = (int)buildParameters.FileNameStyle;
+            manifest.BuildBundleType = buildParameters.BuildBundleType;
             manifest.BuildPipeline = buildParameters.BuildPipeline;
             manifest.PackageName = buildParameters.PackageName;
             manifest.PackageVersion = buildParameters.PackageVersion;
-            manifest.BundleList = GetAllPackageBundle(buildMapContext);
-            manifest.AssetList = GetAllPackageAsset(buildMapContext);
+            manifest.PackageNote = buildParameters.PackageNote;
+            manifest.AssetList = CreatePackageAssetList(buildMapContext);
+            manifest.BundleList = CreatePackageBundleList(buildMapContext);
 
-            if (buildParameters.BuildMode != EBuildMode.SimulateBuild)
-            {
-                // 处理资源包的依赖列表
+            // 1. 处理资源清单的资源对象
+            ProcessPacakgeAsset(manifest);
+
+            // 2. 处理资源包的依赖列表
+            if (processBundleDepends)
                 ProcessBundleDepends(context, manifest);
 
-                // 处理资源包的标签集合
+            // 3. 处理资源包的标签集合
+            if (processBundleTags)
                 ProcessBundleTags(manifest);
-            }
+
+            // 4. 处理内置资源包
+            if (processBundleDepends)
+                ProcessBuiltinBundleDependency(context, manifest);
 
             // 创建补丁清单文本文件
             {
@@ -57,17 +68,13 @@ namespace YooAsset.Editor
 
             // 创建补丁清单二进制文件
             string packageHash;
+            string packagePath;
             {
                 string fileName = YooAssetSettingsData.GetManifestBinaryFileName(buildParameters.PackageName, buildParameters.PackageVersion);
-                string filePath = $"{packageOutputDirectory}/{fileName}";
-                ManifestTools.SerializeToBinary(filePath, manifest);
-                packageHash = HashUtility.FileMD5(filePath);
-                BuildLogger.Log($"Create package manifest file: {filePath}");
-
-                ManifestContext manifestContext = new ManifestContext();
-                byte[] bytesData = FileUtility.ReadAllBytes(filePath);
-                manifestContext.Manifest = ManifestTools.DeserializeFromBinary(bytesData);
-                context.SetContextObject(manifestContext);
+                packagePath = $"{packageOutputDirectory}/{fileName}";
+                ManifestTools.SerializeToBinary(packagePath, manifest);
+                packageHash = HashUtility.FileCRC32(packagePath);
+                BuildLogger.Log($"Create package manifest file: {packagePath}");
             }
 
             // 创建补丁清单哈希文件
@@ -85,6 +92,36 @@ namespace YooAsset.Editor
                 FileUtility.WriteAllText(filePath, buildParameters.PackageVersion);
                 BuildLogger.Log($"Create package manifest version file: {filePath}");
             }
+
+            // 填充上下文
+            {
+                ManifestContext manifestContext = new ManifestContext();
+                byte[] bytesData = FileUtility.ReadAllBytes(packagePath);
+                manifestContext.Manifest = ManifestTools.DeserializeFromBinary(bytesData);
+                context.SetContextObject(manifestContext);
+            }
+        }
+
+        /// <summary>
+        /// 检测资源包哈希冲突
+        /// </summary>
+        private void CheckBundleHashConflict(BuildMapContext buildMapContext)
+        {
+            // 说明：在特殊情况下，例如某些文件加密算法会导致加密后的文件哈希值冲突！
+            // 说明：二进制完全相同的原生文件也会冲突！
+            HashSet<string> guids = new HashSet<string>();
+            foreach (var bundleInfo in buildMapContext.Collection)
+            {
+                if (guids.Contains(bundleInfo.PackageFileHash))
+                {
+                    string message = BuildLogger.GetErrorMessage(ErrorCode.BundleHashConflict, $"Bundle hash conflict : {bundleInfo.BundleName}");
+                    throw new Exception(message);
+                }
+                else
+                {
+                    guids.Add(bundleInfo.PackageFileHash);
+                }
+            }
         }
 
         /// <summary>
@@ -93,9 +130,9 @@ namespace YooAsset.Editor
         protected abstract string[] GetBundleDepends(BuildContext context, string bundleName);
 
         /// <summary>
-        /// 获取主资源对象列表
+        /// 创建资源对象列表
         /// </summary>
-        private List<PackageAsset> GetAllPackageAsset(BuildMapContext buildMapContext)
+        private List<PackageAsset> CreatePackageAssetList(BuildMapContext buildMapContext)
         {
             List<PackageAsset> result = new List<PackageAsset>(1000);
             foreach (var bundleInfo in buildMapContext.Collection)
@@ -108,17 +145,20 @@ namespace YooAsset.Editor
                     packageAsset.AssetPath = assetInfo.AssetInfo.AssetPath;
                     packageAsset.AssetGUID = buildMapContext.Command.IncludeAssetGUID ? assetInfo.AssetInfo.AssetGUID : string.Empty;
                     packageAsset.AssetTags = assetInfo.AssetTags.ToArray();
-                    packageAsset.BundleID = GetCachedBundleID(assetInfo.BundleName);
+                    packageAsset.TempDataInEditor = assetInfo;
                     result.Add(packageAsset);
                 }
             }
+
+            // 按照AssetPath排序
+            result.Sort((a, b) => a.AssetPath.CompareTo(b.AssetPath));
             return result;
         }
 
         /// <summary>
-        /// 获取资源包列表
+        /// 创建资源包列表
         /// </summary>
-        private List<PackageBundle> GetAllPackageBundle(BuildMapContext buildMapContext)
+        private List<PackageBundle> CreatePackageBundleList(BuildMapContext buildMapContext)
         {
             List<PackageBundle> result = new List<PackageBundle>(1000);
             foreach (var bundleInfo in buildMapContext.Collection)
@@ -127,14 +167,37 @@ namespace YooAsset.Editor
                 result.Add(packageBundle);
             }
 
-            // 注意：缓存资源包索引
-            for (int index = 0; index < result.Count; index++)
+            // 按照BundleName排序
+            result.Sort((a, b) => a.BundleName.CompareTo(b.BundleName));
+            return result;
+        }
+
+        /// <summary>
+        /// 处理资源清单的资源对象列表
+        /// </summary>
+        private void ProcessPacakgeAsset(PackageManifest manifest)
+        {
+            // 注意：优先缓存资源包索引
+            for (int index = 0; index < manifest.BundleList.Count; index++)
             {
-                string bundleName = result[index].BundleName;
-                _cachedBundleID.Add(bundleName, index);
+                string bundleName = manifest.BundleList[index].BundleName;
+                _cachedBundleIndexIDs.Add(bundleName, index);
             }
 
-            return result;
+            // 记录资源对象所属的资源包ID
+            foreach (var packageAsset in manifest.AssetList)
+            {
+                var assetInfo = packageAsset.TempDataInEditor as BuildAssetInfo;
+                packageAsset.BundleID = GetCachedBundleIndexID(assetInfo.BundleName);
+            }
+
+            // 记录资源对象依赖的资源包ID集合
+            // 注意：依赖关系非引擎构建结果里查询！
+            foreach (var packageAsset in manifest.AssetList)
+            {
+                var mainAssetInfo = packageAsset.TempDataInEditor as BuildAssetInfo;
+                packageAsset.DependBundleIDs = GetAssetDependBundleIDs(mainAssetInfo);
+            }
         }
 
         /// <summary>
@@ -145,16 +208,19 @@ namespace YooAsset.Editor
             // 查询引擎生成的资源包依赖关系，然后记录到清单
             foreach (var packageBundle in manifest.BundleList)
             {
-                int mainBundleID = GetCachedBundleID(packageBundle.BundleName);
-                var depends = GetBundleDepends(context, packageBundle.BundleName);
-                List<int> dependIDs = new List<int>(depends.Length);
-                foreach (var dependBundleName in depends)
+                int mainBundleID = GetCachedBundleIndexID(packageBundle.BundleName);
+                string[] dependNames = GetBundleDepends(context, packageBundle.BundleName);
+                List<int> dependIDs = new List<int>(dependNames.Length);
+                foreach (var dependName in dependNames)
                 {
-                    int bundleID = GetCachedBundleID(dependBundleName);
-                    if (bundleID != mainBundleID)
-                        dependIDs.Add(bundleID);
+                    int dependBundleID = GetCachedBundleIndexID(dependName);
+                    if (dependBundleID != mainBundleID)
+                        dependIDs.Add(dependBundleID);
                 }
-                packageBundle.DependIDs = dependIDs.ToArray();
+
+                // 排序并填充数据
+                dependIDs.Sort();
+                packageBundle.DependBundleIDs = dependIDs.ToArray();
             }
         }
 
@@ -163,26 +229,33 @@ namespace YooAsset.Editor
         /// </summary>
         private void ProcessBundleTags(PackageManifest manifest)
         {
+            foreach (var packageBundle in manifest.BundleList)
+            {
+                packageBundle.Tags = Array.Empty<string>();
+            }
+
             // 将主资源的标签信息传染给其依赖的资源包集合
             foreach (var packageAsset in manifest.AssetList)
             {
                 var assetTags = packageAsset.AssetTags;
                 int bundleID = packageAsset.BundleID;
                 CacheBundleTags(bundleID, assetTags);
-
-                var packageBundle = manifest.BundleList[bundleID];
-                foreach (var dependBundleID in packageBundle.DependIDs)
+                if (packageAsset.DependBundleIDs != null)
                 {
-                    CacheBundleTags(dependBundleID, assetTags);
+                    foreach (var dependBundleID in packageAsset.DependBundleIDs)
+                    {
+                        CacheBundleTags(dependBundleID, assetTags);
+                    }
                 }
             }
 
+            // 将缓存的资源标签赋值给资源包
             for (int index = 0; index < manifest.BundleList.Count; index++)
             {
                 var packageBundle = manifest.BundleList[index];
-                if (_cacheBundleTags.ContainsKey(index))
+                if (_cacheBundleTags.TryGetValue(index, out var value))
                 {
-                    packageBundle.Tags = _cacheBundleTags[index].ToArray();
+                    packageBundle.Tags = value.ToArray();
                 }
                 else
                 {
@@ -205,15 +278,104 @@ namespace YooAsset.Editor
         }
 
         /// <summary>
-        /// 获取资源包的索引ID
+        /// 获取缓存的资源包的索引ID
         /// </summary>
-        private int GetCachedBundleID(string bundleName)
+        private int GetCachedBundleIndexID(string bundleName)
         {
-            if (_cachedBundleID.TryGetValue(bundleName, out int value) == false)
+            if (_cachedBundleIndexIDs.TryGetValue(bundleName, out int value) == false)
             {
-                throw new Exception($"Should never get here ! Not found bundle ID : {bundleName}");
+                throw new Exception($"Should never get here ! Not found bundle index ID : {bundleName}");
             }
             return value;
         }
+
+        /// <summary>
+        /// 是否包含该资源包的索引ID
+        /// </summary>
+        private bool ContainsCachedBundleIndexID(string bundleName)
+        {
+            return _cachedBundleIndexIDs.ContainsKey(bundleName);
+        }
+
+        #region YOOASSET_LEGACY_DEPENDENCY
+        private void ProcessBuiltinBundleDependency(BuildContext context, PackageManifest manifest)
+        {
+            // 注意：如果是可编程构建管线，需要补充内置资源包
+            // 注意：该步骤依赖前面的操作！
+            var buildResultContext = context.TryGetContextObject<TaskBuilding_SBP.BuildResultContext>();
+            if (buildResultContext != null)
+            {
+                // 注意：初始化资源清单建立引用关系
+                ManifestTools.InitManifest(manifest);
+                ProcessBuiltinBundleReference(context, manifest, buildResultContext.BuiltinShadersBundleName);
+                ProcessBuiltinBundleReference(context, manifest, buildResultContext.MonoScriptsBundleName);
+            }
+        }
+        private void ProcessBuiltinBundleReference(BuildContext context, PackageManifest manifest, string builtinBundleName)
+        {
+            if (string.IsNullOrEmpty(builtinBundleName))
+                return;
+
+            // 查询内置资源包是否存在
+            if (ContainsCachedBundleIndexID(builtinBundleName) == false)
+                return;
+
+            // 获取内置资源包
+            int builtinBundleID = GetCachedBundleIndexID(builtinBundleName);
+            var builtinPackageBundle = manifest.BundleList[builtinBundleID];
+
+            // 更新依赖资源包ID集合
+            HashSet<int> cacheBundleIDs = new HashSet<int>(builtinPackageBundle.ReferenceBundleIDs);
+            HashSet<string> tempTags = new HashSet<string>();
+            foreach (var packageAsset in manifest.AssetList)
+            {
+                if (cacheBundleIDs.Contains(packageAsset.BundleID))
+                {
+                    if (packageAsset.DependBundleIDs.Contains(builtinBundleID) == false)
+                    {
+                        var tempBundleIDs = new List<int>(packageAsset.DependBundleIDs);
+                        tempBundleIDs.Add(builtinBundleID);
+                        packageAsset.DependBundleIDs = tempBundleIDs.ToArray();
+                    }
+
+                    foreach (var tag in packageAsset.AssetTags)
+                    {
+                        if (tempTags.Contains(tag) == false)
+                            tempTags.Add(tag);
+                    }
+                }
+            }
+
+            // 更新内置资源包的标签集合
+            foreach (var tag in builtinPackageBundle.Tags)
+            {
+                if (tempTags.Contains(tag) == false)
+                    tempTags.Add(tag);
+            }
+            builtinPackageBundle.Tags = tempTags.ToArray();
+        }
+        private int[] GetAssetDependBundleIDs(BuildAssetInfo mainAssetInfo)
+        {
+            HashSet<int> result = new HashSet<int>();
+            int mainBundleID = GetCachedBundleIndexID(mainAssetInfo.BundleName);
+            foreach (var dependAssetInfo in mainAssetInfo.AllDependAssetInfos)
+            {
+                if (dependAssetInfo.HasBundleName())
+                {
+                    int bundleID = GetCachedBundleIndexID(dependAssetInfo.BundleName);
+                    if (mainBundleID != bundleID)
+                    {
+                        if (result.Contains(bundleID) == false)
+                            result.Add(bundleID);
+                    }
+                }
+            }
+
+            // 排序并返回数据
+            List<int> listResult = new List<int>(result);
+            listResult.Sort();
+            return listResult.ToArray();
+        }
+        #endregion
     }
 }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateReport.cs

@@ -18,53 +18,50 @@ namespace YooAsset.Editor
 
             // 概述信息
             {
-#if UNITY_2019_4_OR_NEWER
-                UnityEditor.PackageManager.PackageInfo packageInfo = UnityEditor.PackageManager.PackageInfo.FindForAssembly(typeof(BuildReport).Assembly);
-                if (packageInfo != null)
-                    buildReport.Summary.YooVersion = packageInfo.version;
-#endif
+                buildReport.Summary.YooVersion = EditorTools.GetPackageManagerYooVersion();
                 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.BuildBundleType = buildParameters.BuildBundleType;
                 buildReport.Summary.BuildPackageName = buildParameters.PackageName;
                 buildReport.Summary.BuildPackageVersion = buildParameters.PackageVersion;
+                buildReport.Summary.BuildPackageNote = buildParameters.PackageNote;
 
                 // 收集器配置
                 buildReport.Summary.UniqueBundleName = buildMapContext.Command.UniqueBundleName;
                 buildReport.Summary.EnableAddressable = buildMapContext.Command.EnableAddressable;
                 buildReport.Summary.LocationToLower = buildMapContext.Command.LocationToLower;
                 buildReport.Summary.IncludeAssetGUID = buildMapContext.Command.IncludeAssetGUID;
-                buildReport.Summary.IgnoreDefaultType = buildMapContext.Command.IgnoreDefaultType;
                 buildReport.Summary.AutoCollectShaders = buildMapContext.Command.AutoCollectShaders;
+                buildReport.Summary.IgnoreRuleName = buildMapContext.Command.IgnoreRule.GetType().FullName;
 
                 // 构建参数
+                buildReport.Summary.ClearBuildCacheFiles = buildParameters.ClearBuildCacheFiles;
+                buildReport.Summary.UseAssetDependencyDB = buildParameters.UseAssetDependencyDB;
                 buildReport.Summary.EnableSharePackRule = buildParameters.EnableSharePackRule;
+                buildReport.Summary.SingleReferencedPackAlone = buildParameters.SingleReferencedPackAlone;
+                buildReport.Summary.FileNameStyle = buildParameters.FileNameStyle;
                 buildReport.Summary.EncryptionClassName = buildParameters.EncryptionServices == null ? "null" : buildParameters.EncryptionServices.GetType().FullName;
-                if (buildParameters.BuildPipeline == nameof(BuiltinBuildPipeline))
+                if (buildParameters is BuiltinBuildParameters)
                 {
                     var builtinBuildParameters = buildParameters as BuiltinBuildParameters;
-                    buildReport.Summary.FileNameStyle = buildParameters.FileNameStyle;
                     buildReport.Summary.CompressOption = builtinBuildParameters.CompressOption;
                     buildReport.Summary.DisableWriteTypeTree = builtinBuildParameters.DisableWriteTypeTree;
                     buildReport.Summary.IgnoreTypeTreeChanges = builtinBuildParameters.IgnoreTypeTreeChanges;
                 }
-                else if (buildParameters.BuildPipeline == nameof(ScriptableBuildPipeline))
+                else if (buildParameters is ScriptableBuildParameters)
                 {
                     var scriptableBuildParameters = buildParameters as ScriptableBuildParameters;
-                    buildReport.Summary.FileNameStyle = buildParameters.FileNameStyle;
                     buildReport.Summary.CompressOption = scriptableBuildParameters.CompressOption;
                     buildReport.Summary.DisableWriteTypeTree = scriptableBuildParameters.DisableWriteTypeTree;
                     buildReport.Summary.IgnoreTypeTreeChanges = scriptableBuildParameters.IgnoreTypeTreeChanges;
-                }
-                else
-                {
-                    buildReport.Summary.FileNameStyle = buildParameters.FileNameStyle;
-                    buildReport.Summary.CompressOption = ECompressOption.Uncompressed;
-                    buildReport.Summary.DisableWriteTypeTree = false;
-                    buildReport.Summary.IgnoreTypeTreeChanges = false;
+                    buildReport.Summary.WriteLinkXML = scriptableBuildParameters.WriteLinkXML;
+                    buildReport.Summary.CacheServerHost = scriptableBuildParameters.CacheServerHost;
+                    buildReport.Summary.CacheServerPort = scriptableBuildParameters.CacheServerPort;
+                    buildReport.Summary.BuiltinShadersBundleName = scriptableBuildParameters.BuiltinShadersBundleName;
+                    buildReport.Summary.MonoScriptsBundleName = scriptableBuildParameters.MonoScriptsBundleName;
                 }
 
                 // 构建结果
@@ -88,7 +85,8 @@ namespace YooAsset.Editor
                 reportAssetInfo.AssetGUID = AssetDatabase.AssetPathToGUID(packageAsset.AssetPath);
                 reportAssetInfo.MainBundleName = mainBundle.BundleName;
                 reportAssetInfo.MainBundleSize = mainBundle.FileSize;
-                reportAssetInfo.DependAssets = GetDependAssets(buildMapContext, mainBundle.BundleName, packageAsset.AssetPath);
+                reportAssetInfo.DependAssets = GetAssetDependAssets(buildMapContext, mainBundle.BundleName, packageAsset.AssetPath);
+                reportAssetInfo.DependBundles = GetAssetDependBundles(manifest, packageAsset);
                 buildReport.AssetInfos.Add(reportAssetInfo);
             }
 
@@ -104,8 +102,9 @@ namespace YooAsset.Editor
                 reportBundleInfo.FileSize = packageBundle.FileSize;
                 reportBundleInfo.Encrypted = packageBundle.Encrypted;
                 reportBundleInfo.Tags = packageBundle.Tags;
-                reportBundleInfo.DependBundles = GetDependBundles(manifest, packageBundle);
-                reportBundleInfo.AllBuiltinAssets = GetAllBuiltinAssets(buildMapContext, packageBundle.BundleName);
+                reportBundleInfo.DependBundles = GetBundleDependBundles(manifest, packageBundle);
+                reportBundleInfo.ReferenceBundles = GetBundleReferenceBundles(manifest, packageBundle);
+                reportBundleInfo.BundleContents = GetBundleContents(buildMapContext, packageBundle.BundleName);
                 buildReport.BundleInfos.Add(reportBundleInfo);
             }
 
@@ -113,62 +112,82 @@ namespace YooAsset.Editor
             buildReport.IndependAssets = new List<ReportIndependAsset>(buildMapContext.IndependAssets);
 
             // 序列化文件
-            string fileName = YooAssetSettingsData.GetReportFileName(buildParameters.PackageName, buildParameters.PackageVersion);
+            string fileName = YooAssetSettingsData.GetBuildReportFileName(buildParameters.PackageName, buildParameters.PackageVersion);
             string filePath = $"{packageOutputDirectory}/{fileName}";
             BuildReport.Serialize(filePath, buildReport);
             BuildLogger.Log($"Create build report file: {filePath}");
         }
 
-        /// <summary>
-        /// 获取资源对象依赖的所有资源包
-        /// </summary>
-        private List<string> GetDependBundles(PackageManifest manifest, PackageBundle packageBundle)
-        {
-            List<string> dependBundles = new List<string>(packageBundle.DependIDs.Length);
-            foreach (int index in packageBundle.DependIDs)
-            {
-                string dependBundleName = manifest.BundleList[index].BundleName;
-                dependBundles.Add(dependBundleName);
-            }
-            return dependBundles;
-        }
-
         /// <summary>
         /// 获取资源对象依赖的其它所有资源
         /// </summary>
-        private List<string> GetDependAssets(BuildMapContext buildMapContext, string bundleName, string assetPath)
+        private List<AssetInfo> GetAssetDependAssets(BuildMapContext buildMapContext, string bundleName, string assetPath)
         {
-            List<string> result = new List<string>();
+            List<AssetInfo> result = new List<AssetInfo>();
             var bundleInfo = buildMapContext.GetBundleInfo(bundleName);
+            var assetInfo = bundleInfo.GetPackAssetInfo(assetPath);
+            foreach (var dependAssetInfo in assetInfo.AllDependAssetInfos)
             {
-                BuildAssetInfo findAssetInfo = null;
-                foreach (var buildAsset in bundleInfo.MainAssets)
-                {
-                    if (buildAsset.AssetInfo.AssetPath == assetPath)
-                    {
-                        findAssetInfo = buildAsset;
-                        break;
-                    }
-                }
-                if (findAssetInfo == null)
-                {
-                    throw new Exception($"Should never get here ! Not found asset {assetPath} in bunlde {bundleName}");
-                }
-                foreach (var dependAssetInfo in findAssetInfo.AllDependAssetInfos)
-                {
-                    result.Add(dependAssetInfo.AssetInfo.AssetPath);
-                }
+                result.Add(dependAssetInfo.AssetInfo);
             }
+            result.Sort();
             return result;
         }
 
         /// <summary>
-        /// 获取该资源包内的所有资源
+        /// 获取资源对象依赖的资源包集合
         /// </summary>
-        private List<string> GetAllBuiltinAssets(BuildMapContext buildMapContext, string bundleName)
+        private List<string> GetAssetDependBundles(PackageManifest manifest, PackageAsset packageAsset)
+        {
+            List<string> dependBundles = new List<string>(packageAsset.DependBundleIDs.Length);
+            foreach (int index in packageAsset.DependBundleIDs)
+            {
+                string dependBundleName = manifest.BundleList[index].BundleName;
+                dependBundles.Add(dependBundleName);
+            }
+            dependBundles.Sort();
+            return dependBundles;
+        }
+
+        /// <summary>
+        /// 获取资源包依赖的资源包集合
+        /// </summary>
+        private List<string> GetBundleDependBundles(PackageManifest manifest, PackageBundle packageBundle)
+        {
+            List<string> dependBundles = new List<string>(packageBundle.DependBundleIDs.Length);
+            foreach (int index in packageBundle.DependBundleIDs)
+            {
+                string dependBundleName = manifest.BundleList[index].BundleName;
+                dependBundles.Add(dependBundleName);
+            }
+            dependBundles.Sort();
+            return dependBundles;
+        }
+
+        /// <summary>
+        /// 获取引用该资源包的资源包集合
+        /// </summary>
+        private List<string> GetBundleReferenceBundles(PackageManifest manifest, PackageBundle packageBundle)
+        {
+            List<string> referenceBundles = new List<string>(packageBundle.ReferenceBundleIDs.Count);
+            foreach (int index in packageBundle.ReferenceBundleIDs)
+            {
+                string dependBundleName = manifest.BundleList[index].BundleName;
+                referenceBundles.Add(dependBundleName);
+            }
+            referenceBundles.Sort();
+            return referenceBundles;
+        }
+
+        /// <summary>
+        /// 获取资源包内部所有资产
+        /// </summary>
+        private List<AssetInfo> GetBundleContents(BuildMapContext buildMapContext, string bundleName)
         {
             var bundleInfo = buildMapContext.GetBundleInfo(bundleName);
-            return bundleInfo.GetAllBuiltinAssetPaths();
+            List<AssetInfo> result = bundleInfo.GetBundleContents();
+            result.Sort();
+            return result;
         }
 
         private int GetMainAssetCount(PackageManifest manifest)

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskEncryption.cs

@@ -26,7 +26,7 @@ namespace YooAsset.Editor
             {
                 EncryptFileInfo fileInfo = new EncryptFileInfo();
                 fileInfo.BundleName = bundleInfo.BundleName;
-                fileInfo.FilePath = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}";
+                fileInfo.FileLoadPath = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}";
                 var encryptResult = encryptionServices.Encrypt(fileInfo);
                 if (encryptResult.Encrypted)
                 {

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskGetBuildMap.cs

@@ -12,16 +12,16 @@ namespace YooAsset.Editor
         /// <summary>
         /// 生成资源构建上下文
         /// </summary>
-        public BuildMapContext CreateBuildMap(BuildParameters buildParameters)
+        public BuildMapContext CreateBuildMap(bool simulateBuild, BuildParameters buildParameters)
         {
             BuildMapContext context = new BuildMapContext();
-            var buildMode = buildParameters.BuildMode;
             var packageName = buildParameters.PackageName;
 
             Dictionary<string, BuildAssetInfo> allBuildAssetInfos = new Dictionary<string, BuildAssetInfo>(1000);
 
             // 1. 获取所有收集器收集的资源
-            var collectResult = AssetBundleCollectorSettingData.Setting.GetPackageAssets(buildMode, packageName);
+            bool useAssetDependencyDB = buildParameters.UseAssetDependencyDB;
+            var collectResult = AssetBundleCollectorSettingData.Setting.BeginCollect(packageName, simulateBuild, useAssetDependencyDB);
             List<CollectAssetInfo> allCollectAssets = collectResult.CollectAssets;
 
             // 2. 剔除未被引用的依赖项资源
@@ -56,9 +56,9 @@ namespace YooAsset.Editor
                 string bundleName = collectAssetInfo.BundleName;
                 foreach (var dependAsset in collectAssetInfo.DependAssets)
                 {
-                    if (allBuildAssetInfos.ContainsKey(dependAsset.AssetPath))
+                    if (allBuildAssetInfos.TryGetValue(dependAsset.AssetPath, out var value))
                     {
-                        allBuildAssetInfos[dependAsset.AssetPath].AddReferenceBundleName(bundleName);
+                        value.AddReferenceBundleName(bundleName);
                     }
                     else
                     {
@@ -109,15 +109,10 @@ namespace YooAsset.Editor
                 {
                     if (buildAssetInfo.HasBundleName() == false)
                     {
-                        PackRuleResult packRuleResult = GetShareBundleName(buildAssetInfo);
-                        if (packRuleResult.IsValid())
-                        {
-                            string shareBundleName = packRuleResult.GetShareBundleName(collectResult.Command.PackageName, collectResult.Command.UniqueBundleName);
-                            buildAssetInfo.SetBundleName(shareBundleName);
-                        }
+                        ProcessingPackShareBundle(buildParameters, collectResult.Command, buildAssetInfo);
                     }
                 }
-                PostProcessPackShareBundle();
+                PostProcessPackShareBundle(buildParameters, collectResult.Command, allBuildAssetInfos);
             }
 
             // 8. 记录关键信息
@@ -209,21 +204,38 @@ namespace YooAsset.Editor
         }
 
         /// <summary>
-        /// 共享资源打包后置处理
+        /// 共享资源打包机制
         /// </summary>
-        protected virtual void PostProcessPackShareBundle()
+        protected virtual void ProcessingPackShareBundle(BuildParameters buildParameters, CollectCommand command, BuildAssetInfo buildAssetInfo)
         {
-        }
+            PackRuleResult packRuleResult = GetShareBundleName(buildAssetInfo);
+            if (packRuleResult.IsValid() == false)
+                return;
 
-        /// <summary>
-        /// 获取共享资源包名称
-        /// </summary>
-        protected virtual PackRuleResult GetShareBundleName(BuildAssetInfo buildAssetInfo)
+            // 处理单个引用的共享资源
+            if (buildAssetInfo.GetReferenceBundleCount() <= 1)
+            {
+                if (buildParameters.SingleReferencedPackAlone == false)
+                    return;
+            }
+
+            // 设置共享资源包名
+            string shareBundleName = packRuleResult.GetShareBundleName(command.PackageName, command.UniqueBundleName);
+            buildAssetInfo.SetBundleName(shareBundleName);
+        }
+        private PackRuleResult GetShareBundleName(BuildAssetInfo buildAssetInfo)
         {
             string bundleName = Path.GetDirectoryName(buildAssetInfo.AssetInfo.AssetPath);
             PackRuleResult result = new PackRuleResult(bundleName, DefaultPackRule.AssetBundleFileExtension);
             return result;
         }
+
+        /// <summary>
+        /// 共享资源打包后置处理
+        /// </summary>
+        protected virtual void PostProcessPackShareBundle(BuildParameters buildParameters, CollectCommand command, Dictionary<string, BuildAssetInfo> allBuildAssetInfos)
+        {
+        }
         #endregion
     }
 }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskUpdateBundleInfo.cs

@@ -65,32 +65,5 @@ namespace YooAsset.Editor
         protected abstract string GetBundleFileHash(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext);
         protected abstract string GetBundleFileCRC(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext);
         protected abstract long GetBundleFileSize(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext);
-
-        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 = BuildLogger.GetErrorMessage(ErrorCode.BundleTempSizeIsZero, $"Bundle temp size is zero, check bundle main asset list : {bundleInfo.BundleName}");
-                throw new Exception(message);
-            }
-            return tempSize;
-        }
     }
 }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskBuilding_BBP.cs

@@ -20,11 +20,6 @@ namespace YooAsset.Editor
             var buildMapContext = context.GetContextObject<BuildMapContext>();
             var builtinBuildParameters = buildParametersContext.Parameters as BuiltinBuildParameters;
 
-            // 模拟构建模式下跳过引擎构建
-            var buildMode = buildParametersContext.Parameters.BuildMode;
-            if (buildMode == EBuildMode.SimulateBuild)
-                return;
-
             // 开始构建
             string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
             BuildAssetBundleOptions buildOptions = builtinBuildParameters.GetBundleBuildOptions();
@@ -35,14 +30,12 @@ namespace YooAsset.Editor
                 throw new Exception(message);
             }
 
-            if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
+            // 检测输出目录
+            string unityOutputManifestFilePath = $"{pipelineOutputDirectory}/{YooAssetSettings.OutputFolderName}";
+            if (System.IO.File.Exists(unityOutputManifestFilePath) == false)
             {
-                string unityOutputManifestFilePath = $"{pipelineOutputDirectory}/{YooAssetSettings.OutputFolderName}";
-                if (System.IO.File.Exists(unityOutputManifestFilePath) == false)
-                {
-                    string message = BuildLogger.GetErrorMessage(ErrorCode.UnityEngineBuildFatal, $"Not found output {nameof(AssetBundleManifest)} file : {unityOutputManifestFilePath}");
-                    throw new Exception(message);
-                }
+                string message = BuildLogger.GetErrorMessage(ErrorCode.UnityEngineBuildFatal, $"Not found output {nameof(AssetBundleManifest)} file : {unityOutputManifestFilePath}");
+                throw new Exception(message);
             }
 
             BuildLogger.Log("UnityEngine build success !");

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCopyBuildinFiles_BBP.cs

@@ -12,14 +12,9 @@ namespace YooAsset.Editor
         {
             var buildParametersContext = context.GetContextObject<BuildParametersContext>();
             var manifestContext = context.GetContextObject<ManifestContext>();
-            var buildMode = buildParametersContext.Parameters.BuildMode;
-
-            if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
+            if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
             {
-                if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
-                {
-                    CopyBuildinFilesToStreaming(buildParametersContext, manifestContext.Manifest);
-                }
+                CopyBuildinFilesToStreaming(buildParametersContext, manifestContext.Manifest);
             }
         }
     }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreateCatalog_BBP.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace YooAsset.Editor
+{
+    public class TaskCreateCatalog_BBP : TaskCreateCatalog, IBuildTask
+    {
+        void IBuildTask.Run(BuildContext context)
+        {
+            var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+            if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
+            {
+                CreateCatalogFile(buildParametersContext);
+            }
+        }
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreateCatalog_BBP.cs.meta

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

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreateManifest_BBP.cs

@@ -11,7 +11,7 @@ namespace YooAsset.Editor
 
         void IBuildTask.Run(BuildContext context)
         {
-            CreateManifestFile(context);
+            CreateManifestFile(true, true, context);
         }
 
         protected override string[] GetBundleDepends(BuildContext context, string bundleName)

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreatePackage_BBP.cs

@@ -9,17 +9,13 @@ namespace YooAsset.Editor
         {
             var buildParameters = context.GetContextObject<BuildParametersContext>();
             var buildMapContext = context.GetContextObject<BuildMapContext>();
-            var buildMode = buildParameters.Parameters.BuildMode;
-            if (buildMode != EBuildMode.SimulateBuild && buildMode != EBuildMode.DryRunBuild)
-            {
-                CreatePackageCatalog(buildParameters, buildMapContext);
-            }
+            CreatePackagePatch(buildParameters, buildMapContext);
         }
 
         /// <summary>
         /// 拷贝补丁文件到补丁包目录
         /// </summary>
-        private void CreatePackageCatalog(BuildParametersContext buildParametersContext, BuildMapContext buildMapContext)
+        private void CreatePackagePatch(BuildParametersContext buildParametersContext, BuildMapContext buildMapContext)
         {
             string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
             string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreateReport_BBP.cs

@@ -13,12 +13,7 @@ namespace YooAsset.Editor
             var buildParameters = context.GetContextObject<BuildParametersContext>();
             var buildMapContext = context.GetContextObject<BuildMapContext>();
             var manifestContext = context.GetContextObject<ManifestContext>();
-
-            var buildMode = buildParameters.Parameters.BuildMode;
-            if (buildMode != EBuildMode.SimulateBuild)
-            {
-                CreateReportFile(buildParameters, buildMapContext, manifestContext);
-            }
+            CreateReportFile(buildParameters, buildMapContext, manifestContext);
         }
     }
 }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskEncryption_BBP.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections;
-using System.Collections.Generic;
-
+
 namespace YooAsset.Editor
 {
     public class TaskEncryption_BBP : TaskEncryption, IBuildTask
@@ -12,12 +7,7 @@ namespace YooAsset.Editor
         {
             var buildParameters = context.GetContextObject<BuildParametersContext>();
             var buildMapContext = context.GetContextObject<BuildMapContext>();
-
-            var buildMode = buildParameters.Parameters.BuildMode;
-            if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
-            {
-                EncryptingBundleFiles(buildParameters, buildMapContext);
-            }
+            EncryptingBundleFiles(buildParameters, buildMapContext);
         }
     }
 }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskGetBuildMap_BBP.cs

@@ -12,7 +12,7 @@ namespace YooAsset.Editor
         void IBuildTask.Run(BuildContext context)
         {
             var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-            var buildMapContext = CreateBuildMap(buildParametersContext.Parameters);
+            var buildMapContext = CreateBuildMap(false, buildParametersContext.Parameters);
             context.SetContextObject(buildMapContext);
         }
     }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskPrepare_BBP.cs

@@ -17,13 +17,42 @@ namespace YooAsset.Editor
             // 检测基础构建参数
             buildParametersContext.CheckBuildParameters();
 
+            // 检测是否有未保存场景
+            if (EditorTools.HasDirtyScenes())
+            {
+                string message = BuildLogger.GetErrorMessage(ErrorCode.FoundUnsavedScene, "Found unsaved scene !");
+                throw new Exception(message);
+            }
+
+            // 删除包裹目录
+            if (buildParameters.ClearBuildCacheFiles)
+            {
+                string packageRootDirectory = buildParameters.GetPackageRootDirectory();
+                if (EditorTools.DeleteDirectory(packageRootDirectory))
+                {
+                    BuildLogger.Log($"Delete package root directory: {packageRootDirectory}");
+                }
+            }
+
+            // 检测包裹输出目录是否存在
+            string packageOutputDirectory = buildParameters.GetPackageOutputDirectory();
+            if (Directory.Exists(packageOutputDirectory))
+            {
+                string message = BuildLogger.GetErrorMessage(ErrorCode.PackageOutputDirectoryExists, $"Package outout directory exists: {packageOutputDirectory}");
+                throw new Exception(message);
+            }
+
+            // 如果输出目录不存在
+            string pipelineOutputDirectory = buildParameters.GetPipelineOutputDirectory();
+            if (EditorTools.CreateDirectory(pipelineOutputDirectory))
+            {
+                BuildLogger.Log($"Create pipeline output directory: {pipelineOutputDirectory}");
+            }
+
             // 检测Unity版本
 #if UNITY_2021_3_OR_NEWER
-            if (buildParameters.BuildMode != EBuildMode.SimulateBuild)
-            {
-                string warning = BuildLogger.GetErrorMessage(ErrorCode.RecommendScriptBuildPipeline, $"Starting with UnityEngine2021, recommend use script build pipeline (SBP) !");
-                BuildLogger.Warning(warning);
-            }
+            string warning = BuildLogger.GetErrorMessage(ErrorCode.RecommendScriptBuildPipeline, $"Starting with UnityEngine2021, recommend use script build pipeline (SBP) !");
+            BuildLogger.Warning(warning);
 #endif
         }
     }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskUpdateBundleInfo_BBP.cs

@@ -15,77 +15,45 @@ namespace YooAsset.Editor
 
         protected override 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)
+            var buildResult = context.GetContextObject<TaskBuilding_BBP.BuildResultContext>();
+            var hash = buildResult.UnityManifest.GetAssetBundleHash(bundleInfo.BundleName);
+            if (hash.isValid)
             {
-                return "00000000000000000000000000000000"; //32位
+                return hash.ToString();
             }
             else
             {
-                var buildResult = context.GetContextObject<TaskBuilding_BBP.BuildResultContext>();
-                var hash = buildResult.UnityManifest.GetAssetBundleHash(bundleInfo.BundleName);
-                if (hash.isValid)
-                {
-                    return hash.ToString();
-                }
-                else
-                {
-                    string message = BuildLogger.GetErrorMessage(ErrorCode.NotFoundUnityBundleHash, $"Not found unity bundle hash : {bundleInfo.BundleName}");
-                    throw new Exception(message);
-                }
+                string message = BuildLogger.GetErrorMessage(ErrorCode.NotFoundUnityBundleHash, $"Not found unity bundle hash : {bundleInfo.BundleName}");
+                throw new Exception(message);
             }
         }
         protected override 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)
+            string filePath = bundleInfo.BuildOutputFilePath;
+            if (BuildPipeline.GetCRCForAssetBundle(filePath, out uint crc))
             {
-                return 0;
+                return crc;
             }
             else
             {
-                string filePath = bundleInfo.BuildOutputFilePath;
-                if (BuildPipeline.GetCRCForAssetBundle(filePath, out uint crc))
-                {
-                    return crc;
-                }
-                else
-                {
-                    string message = BuildLogger.GetErrorMessage(ErrorCode.NotFoundUnityBundleCRC, $"Not found unity bundle crc : {bundleInfo.BundleName}");
-                    throw new Exception(message);
-                }
+                string message = BuildLogger.GetErrorMessage(ErrorCode.NotFoundUnityBundleCRC, $"Not found unity bundle crc : {bundleInfo.BundleName}");
+                throw new Exception(message);
             }
         }
         protected override string GetBundleFileHash(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
         {
             string filePath = bundleInfo.PackageSourceFilePath;
-            var buildMode = buildParametersContext.Parameters.BuildMode;
-            if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild)
-                return GetFilePathTempHash(filePath);
-            else
-                return HashUtility.FileMD5(filePath);
+            return HashUtility.FileMD5(filePath);
         }
         protected override string GetBundleFileCRC(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
         {
             string filePath = bundleInfo.PackageSourceFilePath;
-            var buildMode = buildParametersContext.Parameters.BuildMode;
-            if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild)
-                return "00000000"; //8位
-            else
-                return HashUtility.FileCRC32(filePath);
+            return HashUtility.FileCRC32(filePath);
         }
         protected override long GetBundleFileSize(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
         {
             string filePath = bundleInfo.PackageSourceFilePath;
-            var buildMode = buildParametersContext.Parameters.BuildMode;
-            if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild)
-                return GetBundleTempSize(bundleInfo);
-            else
-                return FileUtility.GetFileSize(filePath);
+            return FileUtility.GetFileSize(filePath);
         }
     }
 }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskVerifyBuildResult_BBP.cs

@@ -15,10 +15,6 @@ namespace YooAsset.Editor
             var buildParametersContext = context.GetContextObject<BuildParametersContext>();
             var buildParameters = buildParametersContext.Parameters as BuiltinBuildParameters;
 
-            // 模拟构建模式下跳过验证
-            if (buildParameters.BuildMode == EBuildMode.SimulateBuild)
-                return;
-
             // 验证构建结果
             if (buildParameters.VerifyBuildingResult)
             {
@@ -32,15 +28,14 @@ namespace YooAsset.Editor
         /// </summary>
         private void VerifyingBuildingResult(BuildContext context, AssetBundleManifest unityManifest)
         {
-            var buildParametersContext = context.GetContextObject<BuildParametersContext>();
             var buildMapContext = context.GetContextObject<BuildMapContext>();
-            string[] unityCreateBundles = unityManifest.GetAllAssetBundles();
+            string[] unityBuildContent = unityManifest.GetAllAssetBundles();
 
-            // 1. 过滤掉原生Bundle
-            string[] mapBundles = buildMapContext.Collection.Select(t => t.BundleName).ToArray();
+            // 1. 计划内容
+            string[] planningContent = buildMapContext.Collection.Select(t => t.BundleName).ToArray();
 
-            // 2. 验证Bundle
-            List<string> exceptBundleList1 = unityCreateBundles.Except(mapBundles).ToList();
+            // 2. 验证差异
+            List<string> exceptBundleList1 = unityBuildContent.Except(planningContent).ToList();
             if (exceptBundleList1.Count > 0)
             {
                 foreach (var exceptBundle in exceptBundleList1)
@@ -53,8 +48,8 @@ namespace YooAsset.Editor
                 throw new Exception(exception);
             }
 
-            // 3. 验证Bundle
-            List<string> exceptBundleList2 = mapBundles.Except(unityCreateBundles).ToList();
+            // 3. 验证差异
+            List<string> exceptBundleList2 = planningContent.Except(unityBuildContent).ToList();
             if (exceptBundleList2.Count > 0)
             {
                 foreach (var exceptBundle in exceptBundleList2)

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuiltinBuildParameters.cs

@@ -34,18 +34,12 @@ namespace YooAsset.Editor
             BuildAssetBundleOptions opt = BuildAssetBundleOptions.None;
             opt |= BuildAssetBundleOptions.StrictMode; //Do not allow the build to succeed if any errors are reporting during it.
 
-            if (BuildMode == EBuildMode.DryRunBuild)
-            {
-                opt |= BuildAssetBundleOptions.DryRunBuild;
-                return opt;
-            }
-
             if (CompressOption == ECompressOption.Uncompressed)
                 opt |= BuildAssetBundleOptions.UncompressedAssetBundle;
             else if (CompressOption == ECompressOption.LZ4)
                 opt |= BuildAssetBundleOptions.ChunkBasedCompression;
 
-            if (BuildMode == EBuildMode.ForceRebuild)
+            if (ClearBuildCacheFiles)
                 opt |= BuildAssetBundleOptions.ForceRebuildAssetBundle; //Force rebuild the asset bundles
             if (DisableWriteTypeTree)
                 opt |= BuildAssetBundleOptions.DisableWriteTypeTree; //Do not include type information within the asset bundle (don't write type tree).

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuiltinBuildPipeline.cs

@@ -8,8 +8,15 @@ namespace YooAsset.Editor
     {
         public BuildResult Run(BuildParameters buildParameters, bool enableLog)
         {
-            AssetBundleBuilder builder = new AssetBundleBuilder();
-            return builder.Run(buildParameters, GetDefaultBuildPipeline(), enableLog);
+            if (buildParameters is BuiltinBuildParameters)
+            {              
+                AssetBundleBuilder builder = new AssetBundleBuilder();
+                return builder.Run(buildParameters, GetDefaultBuildPipeline(), enableLog);
+            }
+            else
+            {
+                throw new Exception($"Invalid build parameter type : {buildParameters.GetType().Name}");
+            }
         }
 
         /// <summary>
@@ -29,6 +36,7 @@ namespace YooAsset.Editor
                     new TaskCreateReport_BBP(),
                     new TaskCreatePackage_BBP(),
                     new TaskCopyBuildinFiles_BBP(),
+                    new TaskCreateCatalog_BBP()
                 };
             return pipeline;
         }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline.meta

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

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/BuildTasks.meta

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

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/BuildTasks/TaskCreateManifest_ESBP.cs

@@ -0,0 +1,18 @@
+
+using System;
+
+namespace YooAsset.Editor
+{
+    public class TaskCreateManifest_ESBP : TaskCreateManifest, IBuildTask
+    {
+        void IBuildTask.Run(BuildContext context)
+        {
+            CreateManifestFile(false, false, context);
+        }
+
+        protected override string[] GetBundleDepends(BuildContext context, string bundleName)
+        {
+            return Array.Empty<string>();
+        }
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/BuildTasks/TaskCreateManifest_ESBP.cs.meta

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

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/BuildTasks/TaskGetBuildMap_ESBP.cs

@@ -0,0 +1,15 @@
+
+using System;
+
+namespace YooAsset.Editor
+{
+    public class TaskGetBuildMap_ESBP : TaskGetBuildMap, IBuildTask
+    {
+        void IBuildTask.Run(BuildContext context)
+        {
+            var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+            var buildMapContext = CreateBuildMap(true, buildParametersContext.Parameters);
+            context.SetContextObject(buildMapContext);
+        }
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/BuildTasks/TaskGetBuildMap_ESBP.cs.meta

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

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/BuildTasks/TaskPrepare_ESBP.cs

@@ -0,0 +1,17 @@
+
+using System;
+
+namespace YooAsset.Editor
+{
+    public class TaskPrepare_ESBP : IBuildTask
+    {
+        void IBuildTask.Run(BuildContext context)
+        {
+            var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+            var buildParameters = buildParametersContext.Parameters;
+
+            // 检测基础构建参数
+            buildParametersContext.CheckBuildParameters();
+        }
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/BuildTasks/TaskPrepare_ESBP.cs.meta

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

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/BuildTasks/TaskUpdateBundleInfo_ESBP.cs

@@ -0,0 +1,63 @@
+
+using System.Text;
+using System;
+
+namespace YooAsset.Editor
+{
+    public class TaskUpdateBundleInfo_ESBP : TaskUpdateBundleInfo, IBuildTask
+    {
+        void IBuildTask.Run(BuildContext context)
+        {
+            UpdateBundleInfo(context);
+        }
+
+        protected override string GetUnityHash(BuildBundleInfo bundleInfo, BuildContext context)
+        {
+            return "00000000000000000000000000000000"; //32位
+        }
+        protected override uint GetUnityCRC(BuildBundleInfo bundleInfo, BuildContext context)
+        {
+            return 0;
+        }
+        protected override string GetBundleFileHash(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
+        {
+            string filePath = bundleInfo.PackageSourceFilePath;
+            return GetFilePathTempHash(filePath);
+        }
+        protected override string GetBundleFileCRC(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
+        {
+            return "00000000"; //8位
+        }
+        protected override long GetBundleFileSize(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
+        {
+            return GetBundleTempSize(bundleInfo);
+        }
+
+        private string GetFilePathTempHash(string filePath)
+        {
+            byte[] bytes = Encoding.UTF8.GetBytes(filePath);
+            return HashUtility.BytesMD5(bytes);
+
+            // 注意：在文件路径的哈希值冲突的情况下，可以使用下面的方法
+            //return $"{HashUtility.BytesMD5(bytes)}-{Guid.NewGuid():N}";
+        }
+        private long GetBundleTempSize(BuildBundleInfo bundleInfo)
+        {
+            long tempSize = 0;
+
+            var assetPaths = bundleInfo.GetAllPackAssetPaths();
+            foreach (var assetPath in assetPaths)
+            {
+                long size = FileUtility.GetFileSize(assetPath);
+                tempSize += size;
+            }
+
+            if (tempSize == 0)
+            {
+                string message = BuildLogger.GetErrorMessage(ErrorCode.BundleTempSizeIsZero, $"Bundle temp size is zero, check bundle main asset list : {bundleInfo.BundleName}");
+                throw new Exception(message);
+            }
+            return tempSize;
+        }
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/BuildTasks/TaskUpdateBundleInfo_ESBP.cs.meta

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

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/EditorSimulateBuildParameters.cs

@@ -0,0 +1,7 @@
+
+namespace YooAsset.Editor
+{
+    public class EditorSimulateBuildParameters : BuildParameters
+    {
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/EditorSimulateBuildParameters.cs.meta

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

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/EditorSimulateBuildPipeline.cs

@@ -0,0 +1,37 @@
+
+using System.Collections.Generic;
+using System;
+
+namespace YooAsset.Editor
+{
+    public class EditorSimulateBuildPipeline : IBuildPipeline
+    {
+        public BuildResult Run(BuildParameters buildParameters, bool enableLog)
+        {
+            if (buildParameters is EditorSimulateBuildParameters)
+            {
+                AssetBundleBuilder builder = new AssetBundleBuilder();
+                return builder.Run(buildParameters, GetDefaultBuildPipeline(), enableLog);
+            }
+            else
+            {
+                throw new Exception($"Invalid build parameter type : {buildParameters.GetType().Name}");
+            }
+        }
+        
+        /// <summary>
+        /// 获取默认的构建流程
+        /// </summary>
+        private List<IBuildTask> GetDefaultBuildPipeline()
+        {
+            List<IBuildTask> pipeline = new List<IBuildTask>
+                {
+                    new TaskPrepare_ESBP(),
+                    new TaskGetBuildMap_ESBP(),
+                    new TaskUpdateBundleInfo_ESBP(),
+                    new TaskCreateManifest_ESBP()
+                };
+            return pipeline;
+        }
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/EditorSimulateBuildPipeline.cs.meta

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

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskBuilding_RFBP.cs

@@ -10,14 +10,8 @@ namespace YooAsset.Editor
         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);
-            }
+            CopyRawBundle(buildMapContext, buildParametersContext);
         }
 
         /// <summary>
@@ -29,7 +23,7 @@ namespace YooAsset.Editor
             foreach (var bundleInfo in buildMapContext.Collection)
             {
                 string dest = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}";
-                foreach (var buildAsset in bundleInfo.MainAssets)
+                foreach (var buildAsset in bundleInfo.AllPackAssets)
                 {
                     EditorTools.CopyFile(buildAsset.AssetInfo.AssetPath, dest, true);
                 }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCopyBuildinFiles_RFBP.cs

@@ -13,13 +13,9 @@ namespace YooAsset.Editor
             var buildParametersContext = context.GetContextObject<BuildParametersContext>();
             var buildParameters = buildParametersContext.Parameters;
             var manifestContext = context.GetContextObject<ManifestContext>();
-
-            if (buildParameters.BuildMode != EBuildMode.SimulateBuild)
+            if (buildParameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
             {
-                if (buildParameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
-                {
-                    CopyBuildinFilesToStreaming(buildParametersContext, manifestContext.Manifest);
-                }
+                CopyBuildinFilesToStreaming(buildParametersContext, manifestContext.Manifest);
             }
         }
     }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreateCatalog_RFBP.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace YooAsset.Editor
+{
+    public class TaskCreateCatalog_RFBP : TaskCreateCatalog, IBuildTask
+    {
+        void IBuildTask.Run(BuildContext context)
+        {
+            var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+            if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
+            {
+                CreateCatalogFile(buildParametersContext);
+            }
+        }
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreateCatalog_RFBP.cs.meta

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

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreateManifest_RFBP.cs

@@ -9,12 +9,12 @@ namespace YooAsset.Editor
     {
         void IBuildTask.Run(BuildContext context)
         {
-            CreateManifestFile(context);
+            CreateManifestFile(false, true, context);
         }
 
         protected override string[] GetBundleDepends(BuildContext context, string bundleName)
         {
-            return new string[] { };
+            return Array.Empty<string>();
         }
     }
 }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreatePackage_RFBP.cs

@@ -9,17 +9,13 @@ namespace YooAsset.Editor
         {
             var buildParameters = context.GetContextObject<BuildParametersContext>();
             var buildMapContext = context.GetContextObject<BuildMapContext>();
-            var buildMode = buildParameters.Parameters.BuildMode;
-            if (buildMode != EBuildMode.SimulateBuild)
-            {
-                CreatePackageCatalog(buildParameters, buildMapContext);
-            }
+            CreatePackagePatch(buildParameters, buildMapContext);
         }
 
         /// <summary>
         /// 拷贝补丁文件到补丁包目录
         /// </summary>
-        private void CreatePackageCatalog(BuildParametersContext buildParametersContext, BuildMapContext buildMapContext)
+        private void CreatePackagePatch(BuildParametersContext buildParametersContext, BuildMapContext buildMapContext)
         {
             string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
             BuildLogger.Log($"Start making patch package: {packageOutputDirectory}");

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreateReport_RFBP.cs

@@ -13,12 +13,7 @@ namespace YooAsset.Editor
             var buildParameters = context.GetContextObject<BuildParametersContext>();
             var buildMapContext = context.GetContextObject<BuildMapContext>();
             var manifestContext = context.GetContextObject<ManifestContext>();
-
-            var buildMode = buildParameters.Parameters.BuildMode;
-            if (buildMode != EBuildMode.SimulateBuild)
-            {
-                CreateReportFile(buildParameters, buildMapContext, manifestContext);
-            }
+            CreateReportFile(buildParameters, buildMapContext, manifestContext);
         }
     }
 }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskEncryption_RFBP.cs

@@ -0,0 +1,13 @@
+
+namespace YooAsset.Editor
+{
+    public class TaskEncryption_RFBP : TaskEncryption, IBuildTask
+    {
+        void IBuildTask.Run(BuildContext context)
+        {
+            var buildParameters = context.GetContextObject<BuildParametersContext>();
+            var buildMapContext = context.GetContextObject<BuildMapContext>();
+            EncryptingBundleFiles(buildParameters, buildMapContext);
+        }
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskEncryption_RFBP.cs.meta

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

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskGetBuildMap_RFBP.cs

@@ -12,7 +12,7 @@ namespace YooAsset.Editor
         void IBuildTask.Run(BuildContext context)
         {
             var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-            var buildMapContext = CreateBuildMap(buildParametersContext.Parameters);
+            var buildMapContext = CreateBuildMap(true, buildParametersContext.Parameters);
             context.SetContextObject(buildMapContext);
 
             // 检测构建结果
@@ -27,7 +27,7 @@ namespace YooAsset.Editor
             // 注意：原生文件资源包只能包含一个原生文件
             foreach (var bundleInfo in buildMapContext.Collection)
             {
-                if (bundleInfo.MainAssets.Count != 1)
+                if (bundleInfo.AllPackAssets.Count != 1)
                 {
                     string message = BuildLogger.GetErrorMessage(ErrorCode.NotSupportMultipleRawAsset, $"The bundle does not support multiple raw asset : {bundleInfo.BundleName}");
                     throw new Exception(message);

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskPrepare_RFBP.cs

@@ -16,23 +16,29 @@ namespace YooAsset.Editor
             // 检测基础构建参数
             buildParametersContext.CheckBuildParameters();
 
-            // 检测不被支持的参数
-            if (buildParameters.EnableSharePackRule)
+            // 删除包裹目录
+            if (buildParameters.ClearBuildCacheFiles)
             {
-                string message = BuildLogger.GetErrorMessage(ErrorCode.BuildPipelineNotSupportSharePackRule, $"{nameof(EBuildPipeline.RawFileBuildPipeline)} not support share pack rule !");
+                string packageRootDirectory = buildParameters.GetPackageRootDirectory();
+                if (EditorTools.DeleteDirectory(packageRootDirectory))
+                {
+                    BuildLogger.Log($"Delete package root directory: {packageRootDirectory}");
+                }
+            }
+
+            // 检测包裹输出目录是否存在
+            string packageOutputDirectory = buildParameters.GetPackageOutputDirectory();
+            if (Directory.Exists(packageOutputDirectory))
+            {
+                string message = BuildLogger.GetErrorMessage(ErrorCode.PackageOutputDirectoryExists, $"Package outout directory exists: {packageOutputDirectory}");
                 throw new Exception(message);
             }
 
-            // 检测不被支持的构建模式
-            if (buildParameters.BuildMode == EBuildMode.DryRunBuild)
+            // 如果输出目录不存在
+            string pipelineOutputDirectory = buildParameters.GetPipelineOutputDirectory();
+            if (EditorTools.CreateDirectory(pipelineOutputDirectory))
             {
-                string message = BuildLogger.GetErrorMessage(ErrorCode.BuildPipelineNotSupportBuildMode, $"{nameof(EBuildPipeline.RawFileBuildPipeline)} not support {nameof(EBuildMode.DryRunBuild)} build mode !");
-                throw new Exception(message);
-            }
-            if (buildParameters.BuildMode == EBuildMode.IncrementalBuild)
-            {
-                string message = BuildLogger.GetErrorMessage(ErrorCode.BuildPipelineNotSupportBuildMode, $"{nameof(EBuildPipeline.RawFileBuildPipeline)} not support {nameof(EBuildMode.IncrementalBuild)} build mode !");
-                throw new Exception(message);
+                BuildLogger.Log($"Create pipeline output directory: {pipelineOutputDirectory}");
             }
         }
     }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskUpdateBundleInfo_RFBP.cs

@@ -15,18 +15,8 @@ namespace YooAsset.Editor
 
         protected override string GetUnityHash(BuildBundleInfo bundleInfo, BuildContext context)
         {
-            var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-            var parameters = buildParametersContext.Parameters;
-            var buildMode = parameters.BuildMode;
-            if (buildMode == EBuildMode.SimulateBuild)
-            {
-                return "00000000000000000000000000000000"; //32位
-            }
-            else
-            {
-                string filePath = bundleInfo.PackageSourceFilePath;
-                return HashUtility.FileMD5(filePath);
-            }
+            string filePath = bundleInfo.PackageSourceFilePath;
+            return HashUtility.FileMD5(filePath);
         }
         protected override uint GetUnityCRC(BuildBundleInfo bundleInfo, BuildContext context)
         {
@@ -35,29 +25,17 @@ namespace YooAsset.Editor
         protected override string GetBundleFileHash(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
         {
             string filePath = bundleInfo.PackageSourceFilePath;
-            var buildMode = buildParametersContext.Parameters.BuildMode;
-            if (buildMode == EBuildMode.SimulateBuild)
-                return GetFilePathTempHash(filePath);
-            else
-                return HashUtility.FileMD5(filePath);
+            return HashUtility.FileMD5(filePath);
         }
         protected override string GetBundleFileCRC(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
         {
             string filePath = bundleInfo.PackageSourceFilePath;
-            var buildMode = buildParametersContext.Parameters.BuildMode;
-            if (buildMode == EBuildMode.SimulateBuild)
-                return "00000000"; //8位
-            else
-                return HashUtility.FileCRC32(filePath);
+            return HashUtility.FileCRC32(filePath);
         }
         protected override long GetBundleFileSize(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
         {
             string filePath = bundleInfo.PackageSourceFilePath;
-            var buildMode = buildParametersContext.Parameters.BuildMode;
-            if (buildMode == EBuildMode.SimulateBuild)
-                return GetBundleTempSize(bundleInfo);
-            else
-                return FileUtility.GetFileSize(filePath);
+            return FileUtility.GetFileSize(filePath);
         }
     }
 }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/RawFileBuildPipeline.cs

@@ -11,8 +11,15 @@ namespace YooAsset.Editor
     {
         public BuildResult Run(BuildParameters buildParameters, bool enableLog)
         {
-            AssetBundleBuilder builder = new AssetBundleBuilder();
-            return builder.Run(buildParameters, GetDefaultBuildPipeline(), enableLog);
+            if (buildParameters is RawFileBuildParameters)
+            {
+                AssetBundleBuilder builder = new AssetBundleBuilder();
+                return builder.Run(buildParameters, GetDefaultBuildPipeline(), enableLog);
+            }
+            else
+            {
+                throw new Exception($"Invalid build parameter type : {buildParameters.GetType().Name}");
+            }
         }
 
         /// <summary>
@@ -25,11 +32,13 @@ namespace YooAsset.Editor
                     new TaskPrepare_RFBP(),
                     new TaskGetBuildMap_RFBP(),
                     new TaskBuilding_RFBP(),
+                    new TaskEncryption_RFBP(),
                     new TaskUpdateBundleInfo_RFBP(),
                     new TaskCreateManifest_RFBP(),
                     new TaskCreateReport_RFBP(),
                     new TaskCreatePackage_RFBP(),
                     new TaskCopyBuildinFiles_RFBP(),
+                    new TaskCreateCatalog_RFBP()
                 };
             return pipeline;
         }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskBuilding_SBP.cs

@@ -13,6 +13,8 @@ namespace YooAsset.Editor
         public class BuildResultContext : IContextObject
         {
             public IBundleBuildResults Results;
+            public string BuiltinShadersBundleName;
+            public string MonoScriptsBundleName;
         }
 
         void IBuildTask.Run(BuildContext context)
@@ -21,18 +23,15 @@ namespace YooAsset.Editor
             var buildMapContext = context.GetContextObject<BuildMapContext>();
             var scriptableBuildParameters = buildParametersContext.Parameters as ScriptableBuildParameters;
 
-            // 模拟构建模式下跳过引擎构建
-            var buildMode = buildParametersContext.Parameters.BuildMode;
-            if (buildMode == EBuildMode.SimulateBuild)
-                return;
-
             // 构建内容
             var buildContent = new BundleBuildContent(buildMapContext.GetPipelineBuilds());
 
             // 开始构建
             IBundleBuildResults buildResults;
             var buildParameters = scriptableBuildParameters.GetBundleBuildParameters();
-            var taskList = SBPBuildTasks.Create(buildMapContext.Command.ShadersBundleName);
+            string builtinShadersBundleName = scriptableBuildParameters.BuiltinShadersBundleName;
+            string monoScriptsBundleName = scriptableBuildParameters.MonoScriptsBundleName;
+            var taskList = SBPBuildTasks.Create(builtinShadersBundleName, monoScriptsBundleName);
             ReturnCode exitCode = ContentPipeline.BuildAssetBundles(buildParameters, buildContent, out buildResults, taskList);
             if (exitCode < 0)
             {
@@ -40,18 +39,24 @@ namespace YooAsset.Editor
                 throw new Exception(message);
             }
 
-            // 创建着色器信息
-            // 说明：解决因为着色器资源包导致验证失败。
+            // 说明：解决因为特殊资源包导致验证失败。
             // 例如：当项目里没有着色器，如果有依赖内置着色器就会验证失败。
-            string shadersBundleName = buildMapContext.Command.ShadersBundleName;
-            if (buildResults.BundleInfos.ContainsKey(shadersBundleName))
+            if (string.IsNullOrEmpty(builtinShadersBundleName) == false)
             {
-                buildMapContext.CreateShadersBundleInfo(shadersBundleName);
+                if (buildResults.BundleInfos.ContainsKey(builtinShadersBundleName))
+                    buildMapContext.CreateEmptyBundleInfo(builtinShadersBundleName);
+            }
+            if (string.IsNullOrEmpty(monoScriptsBundleName) == false)
+            {
+                if (buildResults.BundleInfos.ContainsKey(monoScriptsBundleName))
+                    buildMapContext.CreateEmptyBundleInfo(monoScriptsBundleName);
             }
 
             BuildLogger.Log("UnityEngine build success!");
             BuildResultContext buildResultContext = new BuildResultContext();
             buildResultContext.Results = buildResults;
+            buildResultContext.BuiltinShadersBundleName = builtinShadersBundleName;
+            buildResultContext.MonoScriptsBundleName = monoScriptsBundleName;
             context.SetContextObject(buildResultContext);
         }
     }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCopyBuildinFiles_SBP.cs

@@ -12,14 +12,9 @@ namespace YooAsset.Editor
         {
             var buildParametersContext = context.GetContextObject<BuildParametersContext>();
             var manifestContext = context.GetContextObject<ManifestContext>();
-            var buildMode = buildParametersContext.Parameters.BuildMode;
-
-            if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
+            if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
             {
-                if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
-                {
-                    CopyBuildinFilesToStreaming(buildParametersContext, manifestContext.Manifest);
-                }
+                CopyBuildinFilesToStreaming(buildParametersContext, manifestContext.Manifest);
             }
         }
     }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreateCatalog_SBP.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace YooAsset.Editor
+{
+    public class TaskCreateCatalog_SBP : TaskCreateCatalog, IBuildTask
+    {
+        void IBuildTask.Run(BuildContext context)
+        {
+            var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+            if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
+            {
+                CreateCatalogFile(buildParametersContext);
+            }
+        }
+    }
+}

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreateCatalog_SBP.cs.meta

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

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreateManifest_SBP.cs

@@ -13,7 +13,7 @@ namespace YooAsset.Editor
 
         void IBuildTask.Run(BuildContext context)
         {
-            CreateManifestFile(context);
+            CreateManifestFile(true, true, context);
         }
 
         protected override string[] GetBundleDepends(BuildContext context, string bundleName)

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreatePackage_SBP.cs

@@ -9,17 +9,13 @@ namespace YooAsset.Editor
         {
             var buildParameters = context.GetContextObject<BuildParametersContext>();
             var buildMapContext = context.GetContextObject<BuildMapContext>();
-            var buildMode = buildParameters.Parameters.BuildMode;
-            if (buildMode != EBuildMode.SimulateBuild)
-            {
-                CreatePackageCatalog(buildParameters, buildMapContext);
-            }
+            CreatePackagePatch(buildParameters, buildMapContext);
         }
 
         /// <summary>
         /// 拷贝补丁文件到补丁包目录
         /// </summary>
-        private void CreatePackageCatalog(BuildParametersContext buildParametersContext, BuildMapContext buildMapContext)
+        private void CreatePackagePatch(BuildParametersContext buildParametersContext, BuildMapContext buildMapContext)
         {
             var scriptableBuildParameters = buildParametersContext.Parameters as ScriptableBuildParameters;
             string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreateReport_SBP.cs

@@ -13,12 +13,7 @@ namespace YooAsset.Editor
             var buildParameters = context.GetContextObject<BuildParametersContext>();
             var buildMapContext = context.GetContextObject<BuildMapContext>();
             var manifestContext = context.GetContextObject<ManifestContext>();
-
-            var buildMode = buildParameters.Parameters.BuildMode;
-            if (buildMode != EBuildMode.SimulateBuild)
-            {
-                CreateReportFile(buildParameters, buildMapContext, manifestContext);
-            }
+            CreateReportFile(buildParameters, buildMapContext, manifestContext);
         }
     }
 }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskEncryption_SBP.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections;
-using System.Collections.Generic;
-
+
 namespace YooAsset.Editor
 {
     public class TaskEncryption_SBP : TaskEncryption, IBuildTask
@@ -12,12 +7,7 @@ namespace YooAsset.Editor
         {
             var buildParameters = context.GetContextObject<BuildParametersContext>();
             var buildMapContext = context.GetContextObject<BuildMapContext>();
-
-            var buildMode = buildParameters.Parameters.BuildMode;
-            if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
-            {
-                EncryptingBundleFiles(buildParameters, buildMapContext);
-            }
+            EncryptingBundleFiles(buildParameters, buildMapContext);
         }
     }
 }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskGetBuildMap_SBP.cs

@@ -12,7 +12,7 @@ namespace YooAsset.Editor
         void IBuildTask.Run(BuildContext context)
         {
             var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-            var buildMapContext = CreateBuildMap(buildParametersContext.Parameters);
+            var buildMapContext = CreateBuildMap(false, buildParametersContext.Parameters);
             context.SetContextObject(buildMapContext);
         }
     }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskPrepare_SBP.cs

@@ -16,17 +16,40 @@ namespace YooAsset.Editor
             // 检测基础构建参数
             buildParametersContext.CheckBuildParameters();
 
-            // 检测不被支持的构建模式
-            if (buildParameters.BuildMode == EBuildMode.DryRunBuild)
+            // 检测是否有未保存场景
+            if (EditorTools.HasDirtyScenes())
             {
-                string message = BuildLogger.GetErrorMessage(ErrorCode.BuildPipelineNotSupportBuildMode, $"{nameof(EBuildPipeline.ScriptableBuildPipeline)} not support {nameof(EBuildMode.DryRunBuild)} build mode !");
+                string message = BuildLogger.GetErrorMessage(ErrorCode.FoundUnsavedScene, "Found unsaved scene !");
                 throw new Exception(message);
             }
-            if (buildParameters.BuildMode == EBuildMode.ForceRebuild)
+
+            // 删除包裹目录
+            if (buildParameters.ClearBuildCacheFiles)
             {
-                string message = BuildLogger.GetErrorMessage(ErrorCode.BuildPipelineNotSupportBuildMode, $"{nameof(EBuildPipeline.ScriptableBuildPipeline)} not support {nameof(EBuildMode.ForceRebuild)} build mode !");
+                // Deletes the build cache directory.
+                UnityEditor.Build.Pipeline.Utilities.BuildCache.PurgeCache(false);
+
+                string packageRootDirectory = buildParameters.GetPackageRootDirectory();
+                if (EditorTools.DeleteDirectory(packageRootDirectory))
+                {
+                    BuildLogger.Log($"Delete package root directory: {packageRootDirectory}");
+                }
+            }
+
+            // 检测包裹输出目录是否存在
+            string packageOutputDirectory = buildParameters.GetPackageOutputDirectory();
+            if (Directory.Exists(packageOutputDirectory))
+            {
+                string message = BuildLogger.GetErrorMessage(ErrorCode.PackageOutputDirectoryExists, $"Package outout directory exists: {packageOutputDirectory}");
                 throw new Exception(message);
             }
+
+            // 如果输出目录不存在
+            string pipelineOutputDirectory = buildParameters.GetPipelineOutputDirectory();
+            if (EditorTools.CreateDirectory(pipelineOutputDirectory))
+            {
+                BuildLogger.Log($"Create pipeline output directory: {pipelineOutputDirectory}");
+            }
         }
     }
 }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskUpdateBundleInfo_SBP.cs

@@ -15,77 +15,45 @@ namespace YooAsset.Editor
 
         protected override string GetUnityHash(BuildBundleInfo bundleInfo, BuildContext context)
         {
-            var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-            var parameters = buildParametersContext.Parameters;
-            var buildMode = parameters.BuildMode;
-            if (buildMode == EBuildMode.SimulateBuild)
+            // 注意：当资源包的依赖列表发生变化的时候，ContentHash也会发生变化！
+            var buildResult = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
+            if (buildResult.Results.BundleInfos.TryGetValue(bundleInfo.BundleName, out var value))
             {
-                return "00000000000000000000000000000000"; //32位
+                return value.Hash.ToString();
             }
             else
             {
-                // 注意：当资源包的依赖列表发生变化的时候，ContentHash也会发生变化！
-                var buildResult = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
-                if (buildResult.Results.BundleInfos.TryGetValue(bundleInfo.BundleName, out var value))
-                {
-                    return value.Hash.ToString();
-                }
-                else
-                {
-                    string message = BuildLogger.GetErrorMessage(ErrorCode.NotFoundUnityBundleHash, $"Not found unity bundle hash : {bundleInfo.BundleName}");
-                    throw new Exception(message);
-                }
+                string message = BuildLogger.GetErrorMessage(ErrorCode.NotFoundUnityBundleHash, $"Not found unity bundle hash : {bundleInfo.BundleName}");
+                throw new Exception(message);
             }
         }
         protected override uint GetUnityCRC(BuildBundleInfo bundleInfo, BuildContext context)
         {
-            var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-            var parameters = buildParametersContext.Parameters;
-            var buildMode = parameters.BuildMode;
-            if (buildMode == EBuildMode.SimulateBuild)
+            var buildResult = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
+            if (buildResult.Results.BundleInfos.TryGetValue(bundleInfo.BundleName, out var value))
             {
-                return 0;
+                return value.Crc;
             }
             else
             {
-                var buildResult = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
-                if (buildResult.Results.BundleInfos.TryGetValue(bundleInfo.BundleName, out var value))
-                {
-                    return value.Crc;
-                }
-                else
-                {
-                    string message = BuildLogger.GetErrorMessage(ErrorCode.NotFoundUnityBundleCRC, $"Not found unity bundle crc : {bundleInfo.BundleName}");
-                    throw new Exception(message);
-                }
+                string message = BuildLogger.GetErrorMessage(ErrorCode.NotFoundUnityBundleCRC, $"Not found unity bundle crc : {bundleInfo.BundleName}");
+                throw new Exception(message);
             }
         }
         protected override string GetBundleFileHash(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
         {
             string filePath = bundleInfo.PackageSourceFilePath;
-            var buildMode = buildParametersContext.Parameters.BuildMode;
-            if (buildMode == EBuildMode.SimulateBuild)
-                return GetFilePathTempHash(filePath);
-            else
-                return HashUtility.FileMD5(filePath);
+            return HashUtility.FileMD5(filePath);
         }
         protected override string GetBundleFileCRC(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
         {
             string filePath = bundleInfo.PackageSourceFilePath;
-            var buildMode = buildParametersContext.Parameters.BuildMode;
-            if (buildMode == EBuildMode.SimulateBuild)
-                return "00000000"; //8位
-            else
-                return HashUtility.FileCRC32(filePath);
+            return HashUtility.FileCRC32(filePath);
         }
         protected override long GetBundleFileSize(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
         {
             string filePath = bundleInfo.PackageSourceFilePath;
-            var buildMode = buildParametersContext.Parameters.BuildMode;
-            if (buildMode == EBuildMode.SimulateBuild)
-                return GetBundleTempSize(bundleInfo);
-            else
-                return FileUtility.GetFileSize(filePath);
+            return FileUtility.GetFileSize(filePath);
         }
     }
 }

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskVerifyBuildResult_SBP.cs

@@ -16,10 +16,6 @@ namespace YooAsset.Editor
             var buildParametersContext = context.GetContextObject<BuildParametersContext>();
             var buildParameters = buildParametersContext.Parameters as ScriptableBuildParameters;
 
-            // 模拟构建模式下跳过验证
-            if (buildParameters.BuildMode == EBuildMode.SimulateBuild)
-                return;
-
             // 验证构建结果
             if (buildParameters.VerifyBuildingResult)
             {
@@ -33,15 +29,14 @@ namespace YooAsset.Editor
         /// </summary>
         private void VerifyingBuildingResult(BuildContext context, IBundleBuildResults buildResults)
         {
-            var buildParameters = context.GetContextObject<BuildParametersContext>();
             var buildMapContext = context.GetContextObject<BuildMapContext>();
-            List<string> unityCreateBundles = buildResults.BundleInfos.Keys.ToList();
+            List<string> unityBuildContent = buildResults.BundleInfos.Keys.ToList();
 
-            // 1. 过滤掉原生Bundle
-            List<string> expectBundles = buildMapContext.Collection.Select(t => t.BundleName).ToList();
+            // 1. 计划内容
+            List<string> planningContent = buildMapContext.Collection.Select(t => t.BundleName).ToList();
 
-            // 2. 验证Bundle
-            List<string> exceptBundleList1 = unityCreateBundles.Except(expectBundles).ToList();
+            // 2. 验证差异
+            List<string> exceptBundleList1 = unityBuildContent.Except(planningContent).ToList();
             if (exceptBundleList1.Count > 0)
             {
                 foreach (var exceptBundle in exceptBundleList1)
@@ -54,8 +49,8 @@ namespace YooAsset.Editor
                 throw new Exception(exception);
             }
 
-            // 3. 验证Bundle
-            List<string> exceptBundleList2 = expectBundles.Except(unityCreateBundles).ToList();
+            // 3. 验证差异
+            List<string> exceptBundleList2 = planningContent.Except(unityBuildContent).ToList();
             if (exceptBundleList2.Count > 0)
             {
                 foreach (var exceptBundle in exceptBundleList2)

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/SBPBuildTasks.cs

@@ -9,7 +9,7 @@ namespace UnityEditor.Build.Pipeline.Tasks
 {
     public static class SBPBuildTasks
     {
-        public static IList<IBuildTask> Create(string builtInShaderBundleName)
+        public static IList<IBuildTask> Create(string builtInShaderBundleName, string monoScriptsBundleName)
         {
             var buildTasks = new List<IBuildTask>();
 
@@ -28,7 +28,10 @@ namespace UnityEditor.Build.Pipeline.Tasks
 #endif
             buildTasks.Add(new CalculateAssetDependencyData());
             buildTasks.Add(new StripUnusedSpriteSources());
-            buildTasks.Add(new CreateBuiltInShadersBundle(builtInShaderBundleName));
+            if (string.IsNullOrEmpty(builtInShaderBundleName) == false)
+                buildTasks.Add(new CreateBuiltInShadersBundle(builtInShaderBundleName));
+            if (string.IsNullOrEmpty(monoScriptsBundleName) == false)
+                buildTasks.Add(new CreateMonoScriptBundle(monoScriptsBundleName));
             buildTasks.Add(new PostDependencyCallback());
 
             // Packing

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/ScriptableBuildParameters.cs

@@ -41,6 +41,17 @@ namespace YooAsset.Editor
         public int CacheServerPort;
 
 
+        /// <summary>
+        /// 内置着色器资源包名称
+        /// </summary>
+        public string BuiltinShadersBundleName;
+
+        /// <summary>
+        /// Mono脚本资源包名称
+        /// </summary>
+        public string MonoScriptsBundleName;
+
+
         /// <summary>
         /// 获取可编程构建管线的构建参数
         /// </summary>

UnityProject/Packages/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/ScriptableBuildPipeline.cs

@@ -8,8 +8,15 @@ namespace YooAsset.Editor
     {
         public BuildResult Run(BuildParameters buildParameters, bool enableLog)
         {
-            AssetBundleBuilder builder = new AssetBundleBuilder();
-            return builder.Run(buildParameters, GetDefaultBuildPipeline(), enableLog);
+            if (buildParameters is ScriptableBuildParameters)
+            {
+                AssetBundleBuilder builder = new AssetBundleBuilder();
+                return builder.Run(buildParameters, GetDefaultBuildPipeline(), enableLog);
+            }
+            else
+            {
+                throw new Exception($"Invalid build parameter type : {buildParameters.GetType().Name}");
+            }
         }
 
         /// <summary>
@@ -29,6 +36,7 @@ namespace YooAsset.Editor
                     new TaskCreateReport_SBP(),
                     new TaskCreatePackage_SBP(),
                     new TaskCopyBuildinFiles_SBP(),
+                    new TaskCreateCatalog_SBP()
                 };
             return pipeline;
         }