Merge 008a3e1893 into f0ed677d86

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderHelper.cs

@@ -22,7 +22,7 @@ namespace YooAsset.Editor
         /// </summary>
         public static string GetStreamingAssetsRoot()
         {
-            return YooAssetSettingsData.GetYooEditorBuildinRoot();
+            return $"{Application.dataPath}/StreamingAssets/{YooAssetSettingsData.Setting.DefaultYooFolderName}/";
         }
     }
 }

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSetting.cs

@@ -18,6 +18,18 @@ namespace YooAsset.Editor
             EditorPrefs.SetInt(key, (int)buildPipeline);
         }
 
+        // EBuildMode
+        public static EBuildMode GetPackageBuildMode(string packageName, EBuildPipeline buildPipeline)
+        {
+            string key = $"{Application.productName}_{packageName}_{buildPipeline}_{nameof(EBuildMode)}";
+            return (EBuildMode)EditorPrefs.GetInt(key, (int)EBuildMode.ForceRebuild);
+        }
+        public static void SetPackageBuildMode(string packageName, EBuildPipeline buildPipeline, EBuildMode buildMode)
+        {
+            string key = $"{Application.productName}_{packageName}_{buildPipeline}_{nameof(EBuildMode)}";
+            EditorPrefs.SetInt(key, (int)buildMode);
+        }
+
         // ECompressOption
         public static ECompressOption GetPackageCompressOption(string packageName, EBuildPipeline buildPipeline)
         {
@@ -77,17 +89,5 @@ namespace YooAsset.Editor
             string key = $"{Application.productName}_{packageName}_{buildPipeline}_EncyptionClassName";
             EditorPrefs.SetString(key, encyptionClassName);
         }
-
-        // ClearBuildCache
-        public static bool GetPackageClearBuildCache(string packageName, EBuildPipeline buildPipeline)
-        {
-            string key = $"{Application.productName}_{packageName}_{buildPipeline}_ClearBuildCache";
-            return EditorPrefs.GetInt(key, 0) > 0;
-        }
-        public static void SetPackageClearBuildCache(string packageName, EBuildPipeline buildPipeline, bool clearBuildCache)
-        {
-            string key = $"{Application.productName}_{packageName}_{buildPipeline}_ClearBuildCache";
-            EditorPrefs.SetInt(key, clearBuildCache ? 1 : 0);
-        }
     }
 }

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs

@@ -69,7 +69,6 @@ namespace YooAsset.Editor
                 {
                     _pipelineMenu = new ToolbarMenu();
                     _pipelineMenu.style.width = 200;
-                    _pipelineMenu.menu.AppendAction(EBuildPipeline.EditorSimulateBuildPipeline.ToString(), PipelineMenuAction, PipelineMenuFun, EBuildPipeline.EditorSimulateBuildPipeline);
                     _pipelineMenu.menu.AppendAction(EBuildPipeline.BuiltinBuildPipeline.ToString(), PipelineMenuAction, PipelineMenuFun, EBuildPipeline.BuiltinBuildPipeline);
                     _pipelineMenu.menu.AppendAction(EBuildPipeline.ScriptableBuildPipeline.ToString(), PipelineMenuAction, PipelineMenuFun, EBuildPipeline.ScriptableBuildPipeline);
                     _pipelineMenu.menu.AppendAction(EBuildPipeline.RawFileBuildPipeline.ToString(), PipelineMenuAction, PipelineMenuFun, EBuildPipeline.RawFileBuildPipeline);
@@ -94,11 +93,7 @@ namespace YooAsset.Editor
             _pipelineMenu.text = _buildPipeline.ToString();
 
             var buildTarget = EditorUserBuildSettings.activeBuildTarget;
-            if (_buildPipeline == EBuildPipeline.EditorSimulateBuildPipeline)
-            {
-                var viewer = new EditorSimulateBuildPipelineViewer(_buildPackage, buildTarget, _container);
-            }
-            else if (_buildPipeline == EBuildPipeline.BuiltinBuildPipeline)
+            if (_buildPipeline == EBuildPipeline.BuiltinBuildPipeline)
             {
                 var viewer = new BuiltinBuildPipelineViewer(_buildPackage, buildTarget, _container);
             }

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleSimulateBuilder.cs

@@ -8,25 +8,71 @@ namespace YooAsset.Editor
         /// <summary>
         /// 模拟构建
         /// </summary>
-        public static EditorSimulateBuildResult SimulateBuild(EditorSimulateBuildParam buildParam)
+        public static SimulateBuildResult SimulateBuild(string buildPipelineName, string packageName)
         {
-            string packageName = buildParam.PackageName;
-            var buildParameters = new EditorSimulateBuildParameters();
+            string packageVersion = "Simulate";
+            BuildResult buildResult;
+
+            if (buildPipelineName == EBuildPipeline.BuiltinBuildPipeline.ToString())
+            {
+                BuiltinBuildParameters buildParameters = new BuiltinBuildParameters();
                 buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
                 buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
-            buildParameters.BuildPipeline = EBuildPipeline.EditorSimulateBuildPipeline.ToString();
+                buildParameters.BuildPipeline = buildPipelineName;
                 buildParameters.BuildTarget = EditorUserBuildSettings.activeBuildTarget;
+                buildParameters.BuildMode = EBuildMode.SimulateBuild;
                 buildParameters.PackageName = packageName;
-            buildParameters.PackageVersion = "Simulate";
+                buildParameters.PackageVersion = packageVersion;
                 buildParameters.FileNameStyle = EFileNameStyle.HashName;
                 buildParameters.BuildinFileCopyOption = EBuildinFileCopyOption.None;
                 buildParameters.BuildinFileCopyParams = string.Empty;
 
-            var pipeline = new EditorSimulateBuildPipeline();
-            BuildResult buildResult = pipeline.Run(buildParameters, false);
+                BuiltinBuildPipeline pipeline = new BuiltinBuildPipeline();
+                buildResult = pipeline.Run(buildParameters, false);
+            }
+            else if (buildPipelineName == EBuildPipeline.ScriptableBuildPipeline.ToString())
+            {
+                ScriptableBuildParameters buildParameters = new ScriptableBuildParameters();
+                buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
+                buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
+                buildParameters.BuildPipeline = buildPipelineName;
+                buildParameters.BuildTarget = EditorUserBuildSettings.activeBuildTarget;
+                buildParameters.BuildMode = EBuildMode.SimulateBuild;
+                buildParameters.PackageName = packageName;
+                buildParameters.PackageVersion = packageVersion;
+                buildParameters.FileNameStyle = EFileNameStyle.HashName;
+                buildParameters.BuildinFileCopyOption = EBuildinFileCopyOption.None;
+                buildParameters.BuildinFileCopyParams = string.Empty;
+
+                ScriptableBuildPipeline pipeline = new ScriptableBuildPipeline();
+                buildResult = pipeline.Run(buildParameters, true);
+            }
+            else if (buildPipelineName == EBuildPipeline.RawFileBuildPipeline.ToString())
+            {
+                RawFileBuildParameters buildParameters = new RawFileBuildParameters();
+                buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
+                buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
+                buildParameters.BuildPipeline = buildPipelineName;
+                buildParameters.BuildTarget = EditorUserBuildSettings.activeBuildTarget;
+                buildParameters.BuildMode = EBuildMode.SimulateBuild;
+                buildParameters.PackageName = packageName;
+                buildParameters.PackageVersion = packageVersion;
+                buildParameters.FileNameStyle = EFileNameStyle.HashName;
+                buildParameters.BuildinFileCopyOption = EBuildinFileCopyOption.None;
+                buildParameters.BuildinFileCopyParams = string.Empty;
+
+                RawFileBuildPipeline pipeline = new RawFileBuildPipeline();
+                buildResult = pipeline.Run(buildParameters, true);
+            }
+            else
+            {
+                throw new System.NotImplementedException(buildPipelineName);
+            }
+
+            // 返回结果
             if (buildResult.Success)
             {
-                var reulst = new EditorSimulateBuildResult();
+                SimulateBuildResult reulst = new SimulateBuildResult();
                 reulst.PackageRootDirectory = buildResult.OutputPackageDirectory;
                 return reulst;
             }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs

@@ -31,6 +31,11 @@ namespace YooAsset.Editor
         /// </summary>
         public BuildTarget BuildTarget;
 
+        /// <summary>
+        /// 构建模式
+        /// </summary>
+        public EBuildMode BuildMode;
+
         /// <summary>
         /// 构建的包裹名称
         /// </summary>
@@ -47,12 +52,7 @@ namespace YooAsset.Editor
         public string PackageNote;
 
         /// <summary>
-        /// 清空构建缓存文件
-        /// </summary>
-        public bool ClearBuildCacheFiles = false;
-        
-        /// <summary>
-        /// 启用共享资源打包
+        /// 是否启用共享资源打包
         /// </summary>
         public bool EnableSharePackRule = false;
 
@@ -99,6 +99,16 @@ namespace YooAsset.Editor
                 throw new Exception(message);
             }
 
+            // 检测是否有未保存场景
+            if (BuildMode != EBuildMode.SimulateBuild)
+            {
+                if (EditorTools.HasDirtyScenes())
+                {
+                    string message = BuildLogger.GetErrorMessage(ErrorCode.FoundUnsavedScene, "Found unsaved scene !");
+                    throw new Exception(message);
+                }
+            }
+
             // 检测构建参数合法性
             if (BuildTarget == BuildTarget.NoTarget)
             {
@@ -126,6 +136,34 @@ namespace YooAsset.Editor
                 throw new Exception(message);
             }
 
+            // 强制构建删除包裹目录
+            if (BuildMode == EBuildMode.ForceRebuild)
+            {
+                string packageRootDirectory = GetPackageRootDirectory();
+                if (EditorTools.DeleteDirectory(packageRootDirectory))
+                {
+                    BuildLogger.Log($"Delete package root directory: {packageRootDirectory}");
+                }
+            }
+
+            // 检测包裹输出目录是否存在
+            if (BuildMode != EBuildMode.SimulateBuild)
+            {
+                string packageOutputDirectory = GetPackageOutputDirectory();
+                if (Directory.Exists(packageOutputDirectory))
+                {
+                    string message = BuildLogger.GetErrorMessage(ErrorCode.PackageOutputDirectoryExists, $"Package outout directory exists: {packageOutputDirectory}");
+                    throw new Exception(message);
+                }
+            }
+
+            // 如果输出目录不存在
+            string pipelineOutputDirectory = GetPipelineOutputDirectory();
+            if (EditorTools.CreateDirectory(pipelineOutputDirectory))
+            {
+                BuildLogger.Log($"Create pipeline output directory: {pipelineOutputDirectory}");
+            }
+
             // 设置默认备注信息
             if (string.IsNullOrEmpty(PackageNote))
             {

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateManifest.cs

@@ -18,7 +18,7 @@ namespace YooAsset.Editor
         /// <summary>
         /// 创建补丁清单文件到输出目录
         /// </summary>
-        protected void CreateManifestFile(bool processBundleDepends, bool processBundleTags, BuildContext context)
+        protected void CreateManifestFile(BuildContext context)
         {
             var buildMapContext = context.GetContextObject<BuildMapContext>();
             var buildParametersContext = context.GetContextObject<BuildParametersContext>();
@@ -42,13 +42,14 @@ namespace YooAsset.Editor
             manifest.BundleList = GetAllPackageBundle(buildMapContext);
             manifest.AssetList = GetAllPackageAsset(buildMapContext);
 
+            if (buildParameters.BuildMode != EBuildMode.SimulateBuild)
+            {
                 // 处理资源包的依赖列表
-            if (processBundleDepends)
                 ProcessBundleDepends(context, manifest);
 
                 // 处理资源包的标签集合
-            if (processBundleTags)
                 ProcessBundleTags(manifest);
+            }
 
             // 创建补丁清单文本文件
             {
@@ -196,14 +197,11 @@ namespace YooAsset.Editor
                 CacheBundleTags(bundleID, assetTags);
 
                 var packageBundle = manifest.BundleList[bundleID];
-                if (packageBundle.DependIDs != null)
-                {
                 foreach (var dependBundleID in packageBundle.DependIDs)
                 {
                     CacheBundleTags(dependBundleID, assetTags);
                 }
             }
-            }
 
             for (int index = 0; index < manifest.BundleList.Count; index++)
             {

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateReport.cs

@@ -28,6 +28,7 @@ namespace YooAsset.Editor
                 buildReport.Summary.BuildSeconds = BuildRunner.TotalSeconds;
                 buildReport.Summary.BuildTarget = buildParameters.BuildTarget;
                 buildReport.Summary.BuildPipeline = buildParameters.BuildPipeline;
+                buildReport.Summary.BuildMode = buildParameters.BuildMode;
                 buildReport.Summary.BuildPackageName = buildParameters.PackageName;
                 buildReport.Summary.BuildPackageVersion = buildParameters.PackageVersion;
                 buildReport.Summary.BuildPackageNote = buildParameters.PackageNote;
@@ -41,7 +42,6 @@ namespace YooAsset.Editor
                 buildReport.Summary.AutoCollectShaders = buildMapContext.Command.AutoCollectShaders;
 
                 // 构建参数
-                buildReport.Summary.ClearBuildCacheFiles = buildParameters.ClearBuildCacheFiles;
                 buildReport.Summary.EnableSharePackRule = buildParameters.EnableSharePackRule;
                 buildReport.Summary.EncryptionClassName = buildParameters.EncryptionServices == null ? "null" : buildParameters.EncryptionServices.GetType().FullName;
                 if (buildParameters.BuildPipeline == nameof(BuiltinBuildPipeline))

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskGetBuildMap.cs

@@ -12,15 +12,16 @@ namespace YooAsset.Editor
         /// <summary>
         /// 生成资源构建上下文
         /// </summary>
-        public BuildMapContext CreateBuildMap(bool simulateBuild, BuildParameters buildParameters)
+        public BuildMapContext CreateBuildMap(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(simulateBuild, packageName);
+            var collectResult = AssetBundleCollectorSettingData.Setting.GetPackageAssets(buildMode, packageName);
             List<CollectAssetInfo> allCollectAssets = collectResult.CollectAssets;
 
             // 2. 剔除未被引用的依赖项资源

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskUpdateBundleInfo.cs

@@ -65,5 +65,32 @@ 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;
+        }
     }
 }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskBuilding_BBP.cs

@@ -20,6 +20,11 @@ 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();

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCopyBuildinFiles_BBP.cs

@@ -12,6 +12,10 @@ 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)
                 {
                     CopyBuildinFilesToStreaming(buildParametersContext, manifestContext.Manifest);
@@ -19,3 +23,4 @@ namespace YooAsset.Editor
             }
         }
     }
+}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreateManifest_BBP.cs

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

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreatePackage_BBP.cs

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

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreateReport_BBP.cs

@@ -13,7 +13,12 @@ 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);
             }
         }
     }
+}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskEncryption_BBP.cs

@@ -7,7 +7,12 @@ 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);
             }
         }
     }
+}

Assets/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(false, buildParametersContext.Parameters);
+            var buildMapContext = CreateBuildMap(buildParametersContext.Parameters);
             context.SetContextObject(buildMapContext);
         }
     }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskPrepare_BBP.cs

@@ -17,42 +17,13 @@ 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);
+            }
 #endif
         }
     }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskUpdateBundleInfo_BBP.cs

@@ -14,6 +14,15 @@ 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
             {
                 var buildResult = context.GetContextObject<TaskBuilding_BBP.BuildResultContext>();
                 var hash = buildResult.UnityManifest.GetAssetBundleHash(bundleInfo.BundleName);
@@ -27,7 +36,17 @@ namespace YooAsset.Editor
                     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)
+            {
+                return 0;
+            }
+            else
             {
                 string filePath = bundleInfo.BuildOutputFilePath;
                 if (BuildPipeline.GetCRCForAssetBundle(filePath, out uint crc))
@@ -40,19 +59,32 @@ namespace YooAsset.Editor
                     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);
         }
         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);
         }
         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);
         }
     }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskVerifyBuildResult_BBP.cs

@@ -15,6 +15,10 @@ namespace YooAsset.Editor
             var buildParametersContext = context.GetContextObject<BuildParametersContext>();
             var buildParameters = buildParametersContext.Parameters as BuiltinBuildParameters;
 
+            // 模拟构建模式下跳过验证
+            if (buildParameters.BuildMode == EBuildMode.SimulateBuild)
+                return;
+
             // 验证构建结果
             if (buildParameters.VerifyBuildingResult)
             {

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuiltinBuildParameters.cs

@@ -39,7 +39,7 @@ namespace YooAsset.Editor
             else if (CompressOption == ECompressOption.LZ4)
                 opt |= BuildAssetBundleOptions.ChunkBasedCompression;
 
-            if (ClearBuildCacheFiles)
+            if (BuildMode == EBuildMode.ForceRebuild)
                 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).

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline.meta

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

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/BuildTasks.meta

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

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/BuildTasks/TaskCreateManifest_ESBP.cs

@@ -1,18 +0,0 @@
-
-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>();
-        }
-    }
-}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/BuildTasks/TaskCreateManifest_ESBP.cs.meta

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

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/BuildTasks/TaskGetBuildMap_ESBP.cs

@@ -1,15 +0,0 @@
-
-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);
-        }
-    }
-}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/BuildTasks/TaskGetBuildMap_ESBP.cs.meta

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

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/BuildTasks/TaskPrepare_ESBP.cs

@@ -1,17 +0,0 @@
-
-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();
-        }
-    }
-}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/BuildTasks/TaskUpdateBundleInfo_ESBP.cs

@@ -1,63 +0,0 @@
-
-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.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;
-        }
-    }
-}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/EditorSimulateBuildParameters.cs

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

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/EditorSimulateBuildParameters.cs.meta

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

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/EditorSimulateBuildPipeline.cs

@@ -1,37 +0,0 @@
-
-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;
-        }
-    }
-}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/EditorSimulateBuildPipeline.cs.meta

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

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskBuilding_RFBP.cs

@@ -10,9 +10,15 @@ 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);
             }
+        }
 
         /// <summary>
         /// 拷贝原生文件

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCopyBuildinFiles_RFBP.cs

@@ -13,6 +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)
                 {
                     CopyBuildinFilesToStreaming(buildParametersContext, manifestContext.Manifest);
@@ -20,3 +23,4 @@ namespace YooAsset.Editor
             }
         }
     }
+}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreateManifest_RFBP.cs

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

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreatePackage_RFBP.cs

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

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreateReport_RFBP.cs

@@ -13,7 +13,12 @@ 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);
             }
         }
     }
+}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskEncryption_RFBP.cs

@@ -7,7 +7,12 @@ 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);
             }
         }
     }
+}

Assets/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(true, buildParametersContext.Parameters);
+            var buildMapContext = CreateBuildMap(buildParametersContext.Parameters);
             context.SetContextObject(buildMapContext);
 
             // 检测构建结果

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskPrepare_RFBP.cs

@@ -16,29 +16,18 @@ namespace YooAsset.Editor
             // 检测基础构建参数
             buildParametersContext.CheckBuildParameters();
 
-            // 删除包裹目录
-            if (buildParameters.ClearBuildCacheFiles)
+            // 检测不被支持的参数
+            if (buildParameters.EnableSharePackRule)
             {
-                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}");
+                string message = BuildLogger.GetErrorMessage(ErrorCode.BuildPipelineNotSupportSharePackRule, $"{nameof(EBuildPipeline.RawFileBuildPipeline)} not support share pack rule !");
                 throw new Exception(message);
             }
 
-            // 如果输出目录不存在
-            string pipelineOutputDirectory = buildParameters.GetPipelineOutputDirectory();
-            if (EditorTools.CreateDirectory(pipelineOutputDirectory))
+            // 检测不被支持的构建模式
+            if (buildParameters.BuildMode == EBuildMode.IncrementalBuild)
             {
-                BuildLogger.Log($"Create pipeline output directory: {pipelineOutputDirectory}");
+                string message = BuildLogger.GetErrorMessage(ErrorCode.BuildPipelineNotSupportBuildMode, $"{nameof(EBuildPipeline.RawFileBuildPipeline)} not support {nameof(EBuildMode.IncrementalBuild)} build mode !");
+                throw new Exception(message);
             }
         }
     }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskUpdateBundleInfo_RFBP.cs

@@ -14,10 +14,20 @@ 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);
             }
+        }
         protected override uint GetUnityCRC(BuildBundleInfo bundleInfo, BuildContext context)
         {
             return 0;
@@ -25,16 +35,28 @@ 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);
         }
         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);
         }
         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);
         }
     }

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

@@ -21,6 +21,11 @@ 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());
 

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCopyBuildinFiles_SBP.cs

@@ -12,6 +12,10 @@ 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)
                 {
                     CopyBuildinFilesToStreaming(buildParametersContext, manifestContext.Manifest);
@@ -19,3 +23,4 @@ namespace YooAsset.Editor
             }
         }
     }
+}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreateManifest_SBP.cs

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

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreatePackage_SBP.cs

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

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreateReport_SBP.cs

@@ -13,7 +13,12 @@ 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);
             }
         }
     }
+}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskEncryption_SBP.cs

@@ -7,7 +7,12 @@ 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);
             }
         }
     }
+}

Assets/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(false, buildParametersContext.Parameters);
+            var buildMapContext = CreateBuildMap(buildParametersContext.Parameters);
             context.SetContextObject(buildMapContext);
         }
     }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskPrepare_SBP.cs

@@ -16,40 +16,12 @@ namespace YooAsset.Editor
             // 检测基础构建参数
             buildParametersContext.CheckBuildParameters();
 
-            // 检测是否有未保存场景
-            if (EditorTools.HasDirtyScenes())
+            // 检测不被支持的构建模式
+            if (buildParameters.BuildMode == EBuildMode.ForceRebuild)
             {
-                string message = BuildLogger.GetErrorMessage(ErrorCode.FoundUnsavedScene, "Found unsaved scene !");
+                string message = BuildLogger.GetErrorMessage(ErrorCode.BuildPipelineNotSupportBuildMode, $"{nameof(EBuildPipeline.ScriptableBuildPipeline)} not support {nameof(EBuildMode.ForceRebuild)} build mode !");
                 throw new Exception(message);
             }
-
-            // 删除包裹目录
-            if (buildParameters.ClearBuildCacheFiles)
-            {
-                // 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}");
-            }
         }
     }
 }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskUpdateBundleInfo_SBP.cs

@@ -14,6 +14,15 @@ 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
             {
                 // 注意：当资源包的依赖列表发生变化的时候，ContentHash也会发生变化！
                 var buildResult = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
@@ -27,7 +36,17 @@ namespace YooAsset.Editor
                     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)
+            {
+                return 0;
+            }
+            else
             {
                 var buildResult = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
                 if (buildResult.Results.BundleInfos.TryGetValue(bundleInfo.BundleName, out var value))
@@ -40,19 +59,32 @@ namespace YooAsset.Editor
                     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);
         }
         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);
         }
         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);
         }
     }

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

@@ -16,6 +16,10 @@ namespace YooAsset.Editor
             var buildParametersContext = context.GetContextObject<BuildParametersContext>();
             var buildParameters = buildParametersContext.Parameters as ScriptableBuildParameters;
 
+            // 模拟构建模式下跳过验证
+            if (buildParameters.BuildMode == EBuildMode.SimulateBuild)
+                return;
+
             // 验证构建结果
             if (buildParameters.VerifyBuildingResult)
             {

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

@@ -13,6 +13,8 @@ namespace YooAsset.Editor
         BuildinFileRootIsNullOrEmpty = 114,
         PackageOutputDirectoryExists = 115,
         RecommendScriptBuildPipeline = 130,
+        BuildPipelineNotSupportBuildMode = 140,
+        BuildPipelineNotSupportSharePackRule = 141,
 
         // TaskGetBuildMap
         RemoveInvalidTags = 200,

Assets/YooAsset/Editor/AssetBundleBuilder/EBuildMode.cs

@@ -0,0 +1,24 @@
+
+namespace YooAsset.Editor
+{
+    /// <summary>
+    /// 资源包流水线的构建模式
+    /// </summary>
+    public enum EBuildMode
+    {
+        /// <summary>
+        /// 强制重建模式
+        /// </summary>
+        ForceRebuild,
+
+        /// <summary>
+        /// 增量构建模式
+        /// </summary>
+        IncrementalBuild,
+
+        /// <summary>
+        /// 模拟构建模式
+        /// </summary>
+        SimulateBuild,
+    }
+}

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: abbe56a7120e34349b10f20956ed51a7
+guid: 0b6f2523a865e454d8fa3f48a2852d5a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/YooAsset/Editor/AssetBundleBuilder/EBuildPipeline.cs

@@ -6,11 +6,6 @@ namespace YooAsset.Editor
     /// </summary>
     public enum EBuildPipeline
     {
-        /// <summary>
-        /// 编辑器下的模拟构建管线（ESBP）
-        /// </summary>
-        EditorSimulateBuildPipeline,
-
         /// <summary>
         /// 传统内置构建管线 (BBP)
         /// </summary>

Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuildPipelineViewerBase.cs

@@ -27,7 +27,6 @@ namespace YooAsset.Editor
         private EnumField _outputNameStyleField;
         private EnumField _copyBuildinFileOptionField;
         private TextField _copyBuildinFileTagsField;
-        private Toggle _clearBuildCacheToggle;
 
         public BuildPipelineViewerBase(string packageName, EBuildPipeline buildPipeline, BuildTarget buildTarget, VisualElement parent)
         {
@@ -60,6 +59,24 @@ namespace YooAsset.Editor
             _buildVersionField.style.width = StyleWidth;
             _buildVersionField.SetValueWithoutNotify(GetDefaultPackageVersion());
 
+            // 构建模式
+            {
+                var buildModeContainer = Root.Q("BuildModeContainer");
+                var buildMode = AssetBundleBuilderSetting.GetPackageBuildMode(PackageName, BuildPipeline);
+                var buildModeList = GetSupportBuildModes();
+                int defaultIndex = buildModeList.FindIndex(x => x.Equals(buildMode));
+                if (defaultIndex < 0)
+                    defaultIndex = (int)(EBuildMode)buildModeList[0];
+                _buildModeField = new PopupField<Enum>(buildModeList, defaultIndex);
+                _buildModeField.label = "Build Mode";
+                _buildModeField.style.width = StyleWidth;
+                _buildModeField.RegisterValueChangedCallback(evt =>
+                {
+                    AssetBundleBuilderSetting.SetPackageBuildMode(PackageName, BuildPipeline, (EBuildMode)_buildModeField.value);
+                });
+                buildModeContainer.Add(_buildModeField);
+            }
+
             // 加密方法
             {
                 var encryptionContainer = Root.Q("EncryptionContainer");
@@ -131,15 +148,6 @@ namespace YooAsset.Editor
                 AssetBundleBuilderSetting.SetPackageBuildinFileCopyParams(PackageName, BuildPipeline, _copyBuildinFileTagsField.value);
             });
 
-            // 清理构建缓存
-            bool clearBuildCache = AssetBundleBuilderSetting.GetPackageClearBuildCache(PackageName, BuildPipeline);
-            _clearBuildCacheToggle = Root.Q<Toggle>("ClearBuildCache");
-            _clearBuildCacheToggle.SetValueWithoutNotify(clearBuildCache);
-            _clearBuildCacheToggle.RegisterValueChangedCallback(evt =>
-            {
-                AssetBundleBuilderSetting.SetPackageClearBuildCache(PackageName, BuildPipeline, _clearBuildCacheToggle.value);
-            });
-
             // 构建按钮
             var buildButton = Root.Q<Button>("Build");
             buildButton.clicked += BuildButton_clicked;
@@ -152,7 +160,8 @@ namespace YooAsset.Editor
         }
         private void BuildButton_clicked()
         {
-            if (EditorUtility.DisplayDialog("提示", $"开始构建资源包[{PackageName}]！", "Yes", "No"))
+            var buildMode = AssetBundleBuilderSetting.GetPackageBuildMode(PackageName, BuildPipeline);
+            if (EditorUtility.DisplayDialog("提示", $"通过构建模式【{buildMode}】来构建！", "Yes", "No"))
             {
                 EditorTools.ClearUnityConsole();
                 EditorApplication.delayCall += ExecuteBuild;
@@ -168,6 +177,11 @@ namespace YooAsset.Editor
         /// </summary>
         protected abstract void ExecuteBuild();
 
+        /// <summary>
+        /// 获取构建管线支持的构建模式集合
+        /// </summary>
+        protected abstract List<Enum> GetSupportBuildModes();
+
         /// <summary>
         /// 获取构建版本
         /// </summary>

Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuildPipelineViewerBase.uxml

@@ -2,7 +2,7 @@
     <ui:VisualElement name="BuildContainer">
         <ui:TextField picking-mode="Ignore" label="Build Output" name="BuildOutput" />
         <ui:TextField picking-mode="Ignore" label="Build Version" name="BuildVersion" />
-        <ui:Toggle label="Clear Build Cache" name="ClearBuildCache" />
+        <ui:VisualElement name="BuildModeContainer" style="height: 24px;" />
         <ui:VisualElement name="EncryptionContainer" style="height: 24px;" />
         <uie:EnumField label="Compression" value="Center" name="Compression" />
         <uie:EnumField label="File Name Style" value="Center" name="FileNameStyle" />

Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuiltinBuildPipelineViewer.cs

@@ -22,17 +22,18 @@ namespace YooAsset.Editor
         /// </summary>
         protected override void ExecuteBuild()
         {
+            var buildMode = AssetBundleBuilderSetting.GetPackageBuildMode(PackageName, BuildPipeline);
             var fileNameStyle = AssetBundleBuilderSetting.GetPackageFileNameStyle(PackageName, BuildPipeline);
             var buildinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, BuildPipeline);
             var buildinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuildinFileCopyParams(PackageName, BuildPipeline);
             var compressOption = AssetBundleBuilderSetting.GetPackageCompressOption(PackageName, BuildPipeline);
-            var clearBuildCache = AssetBundleBuilderSetting.GetPackageClearBuildCache(PackageName, BuildPipeline);
 
             BuiltinBuildParameters buildParameters = new BuiltinBuildParameters();
             buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
             buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
             buildParameters.BuildPipeline = BuildPipeline.ToString();
             buildParameters.BuildTarget = BuildTarget;
+            buildParameters.BuildMode = buildMode;
             buildParameters.PackageName = PackageName;
             buildParameters.PackageVersion = GetPackageVersion();
             buildParameters.EnableSharePackRule = true;
@@ -40,15 +41,23 @@ namespace YooAsset.Editor
             buildParameters.FileNameStyle = fileNameStyle;
             buildParameters.BuildinFileCopyOption = buildinFileCopyOption;
             buildParameters.BuildinFileCopyParams = buildinFileCopyParams;
-            buildParameters.CompressOption = compressOption;
-            buildParameters.ClearBuildCacheFiles = clearBuildCache;
             buildParameters.EncryptionServices = CreateEncryptionInstance();
+            buildParameters.CompressOption = compressOption;
 
             BuiltinBuildPipeline pipeline = new BuiltinBuildPipeline();
             var buildResult = pipeline.Run(buildParameters, true);
             if (buildResult.Success)
                 EditorUtility.RevealInFinder(buildResult.OutputPackageDirectory);
         }
+
+        protected override List<Enum> GetSupportBuildModes()
+        {
+            List<Enum> buildModeList = new List<Enum>();
+            buildModeList.Add(EBuildMode.ForceRebuild);
+            buildModeList.Add(EBuildMode.IncrementalBuild);
+            buildModeList.Add(EBuildMode.SimulateBuild);
+            return buildModeList;
+        }
     }
 }
 #endif

Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/EditorSimulateBuildpipelineViewer.cs

@@ -1,66 +0,0 @@
-#if UNITY_2019_4_OR_NEWER
-using System;
-using System.IO;
-using System.Linq;
-using System.Collections.Generic;
-using UnityEditor;
-using UnityEngine;
-using UnityEditor.UIElements;
-using UnityEngine.UIElements;
-
-namespace YooAsset.Editor
-{
-    internal class EditorSimulateBuildPipelineViewer : BuildPipelineViewerBase
-    {
-        public EditorSimulateBuildPipelineViewer(string packageName, BuildTarget buildTarget, VisualElement parent)
-            : base(packageName, EBuildPipeline.RawFileBuildPipeline, buildTarget, parent)
-        {
-            var compressionField = Root.Q<EnumField>("Compression");
-            UIElementsTools.SetElementVisible(compressionField, false);
-
-            var encryptionContainer = Root.Q<VisualElement>("EncryptionContainer");
-            UIElementsTools.SetElementVisible(encryptionContainer, false);
-
-            var fileNameStyleField = Root.Q<EnumField>("FileNameStyle");
-            UIElementsTools.SetElementVisible(fileNameStyleField, false);
-
-            var copyBuildinFileOptionField = Root.Q<EnumField>("CopyBuildinFileOption");
-            UIElementsTools.SetElementVisible(copyBuildinFileOptionField, false);
-
-            var copyBuildinFileParamField = Root.Q<TextField>("CopyBuildinFileParam");
-            UIElementsTools.SetElementVisible(copyBuildinFileParamField, false);
-
-            var clearBuildCacheToggle = Root.Q<Toggle>("ClearBuildCache");
-            UIElementsTools.SetElementVisible(clearBuildCacheToggle, false);
-        }
-
-        /// <summary>
-        /// 执行构建
-        /// </summary>
-        protected override void ExecuteBuild()
-        {
-            var fileNameStyle = AssetBundleBuilderSetting.GetPackageFileNameStyle(PackageName, BuildPipeline);
-            var buildinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, BuildPipeline);
-            var buildinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuildinFileCopyParams(PackageName, BuildPipeline);
-
-            EditorSimulateBuildParameters buildParameters = new EditorSimulateBuildParameters();
-            buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
-            buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
-            buildParameters.BuildPipeline = BuildPipeline.ToString();
-            buildParameters.BuildTarget = BuildTarget;
-            buildParameters.PackageName = PackageName;
-            buildParameters.PackageVersion = GetPackageVersion();
-            buildParameters.VerifyBuildingResult = true;
-            buildParameters.FileNameStyle = fileNameStyle;
-            buildParameters.BuildinFileCopyOption = buildinFileCopyOption;
-            buildParameters.BuildinFileCopyParams = buildinFileCopyParams;
-            buildParameters.EncryptionServices = CreateEncryptionInstance();
-
-            EditorSimulateBuildPipeline pipeline = new EditorSimulateBuildPipeline();
-            var buildResult = pipeline.Run(buildParameters, true);
-            if (buildResult.Success)
-                EditorUtility.RevealInFinder(buildResult.OutputPackageDirectory);
-        }
-    }
-}
-#endif

Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/EditorSimulateBuildpipelineViewer.cs.meta

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

Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/RawfileBuildpipelineViewer.cs

@@ -24,23 +24,23 @@ namespace YooAsset.Editor
         /// </summary>
         protected override void ExecuteBuild()
         {
+            var buildMode = AssetBundleBuilderSetting.GetPackageBuildMode(PackageName, BuildPipeline);
             var fileNameStyle = AssetBundleBuilderSetting.GetPackageFileNameStyle(PackageName, BuildPipeline);
             var buildinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, BuildPipeline);
             var buildinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuildinFileCopyParams(PackageName, BuildPipeline);
-            var clearBuildCache = AssetBundleBuilderSetting.GetPackageClearBuildCache(PackageName, BuildPipeline);
 
             RawFileBuildParameters buildParameters = new RawFileBuildParameters();
             buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
             buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
             buildParameters.BuildPipeline = BuildPipeline.ToString();
             buildParameters.BuildTarget = BuildTarget;
+            buildParameters.BuildMode = buildMode;
             buildParameters.PackageName = PackageName;
             buildParameters.PackageVersion = GetPackageVersion();
             buildParameters.VerifyBuildingResult = true;
             buildParameters.FileNameStyle = fileNameStyle;
             buildParameters.BuildinFileCopyOption = buildinFileCopyOption;
             buildParameters.BuildinFileCopyParams = buildinFileCopyParams;
-            buildParameters.ClearBuildCacheFiles = clearBuildCache;
             buildParameters.EncryptionServices = CreateEncryptionInstance();
 
             RawFileBuildPipeline pipeline = new RawFileBuildPipeline();
@@ -48,6 +48,14 @@ namespace YooAsset.Editor
             if (buildResult.Success)
                 EditorUtility.RevealInFinder(buildResult.OutputPackageDirectory);
         }
+
+        protected override List<Enum> GetSupportBuildModes()
+        {
+            List<Enum> buildModeList = new List<Enum>();
+            buildModeList.Add(EBuildMode.ForceRebuild);
+            buildModeList.Add(EBuildMode.SimulateBuild);
+            return buildModeList;
+        }
     }
 }
 #endif

Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/ScriptableBuildPipelineViewer.cs

@@ -22,17 +22,18 @@ namespace YooAsset.Editor
         /// </summary>
         protected override void ExecuteBuild()
         {
+            var buildMode = AssetBundleBuilderSetting.GetPackageBuildMode(PackageName, BuildPipeline);
             var fileNameStyle = AssetBundleBuilderSetting.GetPackageFileNameStyle(PackageName, BuildPipeline);
             var buildinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, BuildPipeline);
             var buildinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuildinFileCopyParams(PackageName, BuildPipeline);
             var compressOption = AssetBundleBuilderSetting.GetPackageCompressOption(PackageName, BuildPipeline);
-            var clearBuildCache = AssetBundleBuilderSetting.GetPackageClearBuildCache(PackageName, BuildPipeline);
 
             ScriptableBuildParameters buildParameters = new ScriptableBuildParameters();
             buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
             buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
             buildParameters.BuildPipeline = BuildPipeline.ToString();
             buildParameters.BuildTarget = BuildTarget;
+            buildParameters.BuildMode = buildMode;
             buildParameters.PackageName = PackageName;
             buildParameters.PackageVersion = GetPackageVersion();
             buildParameters.EnableSharePackRule = true;
@@ -40,15 +41,22 @@ namespace YooAsset.Editor
             buildParameters.FileNameStyle = fileNameStyle;
             buildParameters.BuildinFileCopyOption = buildinFileCopyOption;
             buildParameters.BuildinFileCopyParams = buildinFileCopyParams;
-            buildParameters.CompressOption = compressOption;
-            buildParameters.ClearBuildCacheFiles = clearBuildCache;
             buildParameters.EncryptionServices = CreateEncryptionInstance();
+            buildParameters.CompressOption = compressOption;
 
             ScriptableBuildPipeline pipeline = new ScriptableBuildPipeline();
             var buildResult = pipeline.Run(buildParameters, true);
             if (buildResult.Success)
                 EditorUtility.RevealInFinder(buildResult.OutputPackageDirectory);
         }
+
+        protected override List<Enum> GetSupportBuildModes()
+        {
+            List<Enum> buildModeList = new List<Enum>();
+            buildModeList.Add(EBuildMode.IncrementalBuild);
+            buildModeList.Add(EBuildMode.SimulateBuild);
+            return buildModeList;
+        }
     }
 }
 #endif

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollector.cs

@@ -140,7 +140,7 @@ namespace YooAsset.Editor
         public List<CollectAssetInfo> GetAllCollectAssets(CollectCommand command, AssetBundleCollectorGroup group)
         {
             // 注意：模拟构建模式下只收集主资源
-            if (command.SimulateBuild)
+            if (command.BuildMode == EBuildMode.SimulateBuild)
             {
                 if (CollectorType != ECollectorType.MainAssetCollector)
                     return new List<CollectAssetInfo>();
@@ -220,7 +220,7 @@ namespace YooAsset.Editor
             CollectAssetInfo collectAssetInfo = new CollectAssetInfo(CollectorType, bundleName, address, assetInfo, assetTags);
 
             // 注意：模拟构建模式下不需要收集依赖资源
-            if (command.SimulateBuild)
+            if (command.BuildMode == EBuildMode.SimulateBuild)
                 collectAssetInfo.DependAssets = new List<AssetInfo>();
             else
                 collectAssetInfo.DependAssets = GetAllDependencies(command, assetInfo.AssetPath);

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorGroup.cs

@@ -46,7 +46,7 @@ namespace YooAsset.Editor
 
             // 检测分组是否激活
             IActiveRule activeRule = AssetBundleCollectorSettingData.GetActiveRuleInstance(ActiveRuleName);
-            if (activeRule.IsActiveGroup(new GroupData(GroupName)) == false)
+            if (activeRule.IsActiveGroup() == false)
                 return;
 
             foreach (var collector in Collectors)
@@ -80,7 +80,7 @@ namespace YooAsset.Editor
 
             // 检测分组是否激活
             IActiveRule activeRule = AssetBundleCollectorSettingData.GetActiveRuleInstance(ActiveRuleName);
-            if (activeRule.IsActiveGroup(new GroupData(GroupName)) == false)
+            if (activeRule.IsActiveGroup() == false)
             {
                 return new List<CollectAssetInfo>();
             }

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSetting.cs

@@ -89,7 +89,7 @@ namespace YooAsset.Editor
         /// <summary>
         /// 获取包裹收集的资源文件
         /// </summary>
-        public CollectResult GetPackageAssets(bool simulateBuild, string packageName)
+        public CollectResult GetPackageAssets(EBuildMode buildMode, string packageName)
         {
             if (string.IsNullOrEmpty(packageName))
                 throw new Exception("Build package name is null or empty !");
@@ -100,7 +100,7 @@ namespace YooAsset.Editor
 
             // 创建资源收集命令
             IIgnoreRule ignoreRule = AssetBundleCollectorSettingData.GetIgnoreRuleInstance(package.IgnoreRuleName);
-            CollectCommand command = new CollectCommand(simulateBuild, packageName,
+            CollectCommand command = new CollectCommand(buildMode, packageName,
                  package.EnableAddressable,
                  package.LocationToLower,
                  package.IncludeAssetGUID,

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs

@@ -657,7 +657,7 @@ namespace YooAsset.Editor
 
             // 激活状态
             IActiveRule activeRule = AssetBundleCollectorSettingData.GetActiveRuleInstance(group.ActiveRuleName);
-            bool isActive = activeRule.IsActiveGroup(new GroupData(group.GroupName));
+            bool isActive = activeRule.IsActiveGroup();
             textField1.SetEnabled(isActive);
         }
         private void GroupListView_onSelectionChange(IEnumerable<object> objs)
@@ -991,7 +991,7 @@ namespace YooAsset.Editor
                 try
                 {
                     IIgnoreRule ignoreRule = AssetBundleCollectorSettingData.GetIgnoreRuleInstance(_ignoreRulePopupField.value.ClassName);
-                    CollectCommand command = new CollectCommand(true,
+                    CollectCommand command = new CollectCommand(EBuildMode.SimulateBuild,
                         _packageNameTxt.value,
                         _enableAddressableToogle.value,
                         _locationToLowerToogle.value,

Assets/YooAsset/Editor/AssetBundleCollector/CollectCommand.cs

@@ -4,9 +4,9 @@ namespace YooAsset.Editor
     public class CollectCommand
     {
         /// <summary>
-        /// 模拟构建模式
+        /// 构建模式
         /// </summary>
-        public bool SimulateBuild { private set; get; }
+        public EBuildMode BuildMode { private set; get; }
 
         /// <summary>
         /// 包裹名称
@@ -49,11 +49,11 @@ namespace YooAsset.Editor
         public IIgnoreRule IgnoreRule { private set; get; }
 
 
-        public CollectCommand(bool simulateBuild, string packageName,
+        public CollectCommand(EBuildMode buildMode, string packageName,
             bool enableAddressable, bool locationToLower, bool includeAssetGUID, 
             bool autoCollectShaders, bool uniqueBundleName, IIgnoreRule ignoreRule)
         {
-            SimulateBuild = simulateBuild;
+            BuildMode = buildMode;
             PackageName = packageName;
             EnableAddressable = enableAddressable;
             LocationToLower = locationToLower;

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

@@ -1,16 +1,6 @@
 
 namespace YooAsset.Editor
 {
-    public struct GroupData
-    {
-        public string GroupName;
-
-        public GroupData(string groupName)
-        {
-            GroupName = groupName;
-        }
-    }
-
     /// <summary>
     /// 资源分组激活规则接口
     /// </summary>
@@ -19,6 +9,6 @@ namespace YooAsset.Editor
         /// <summary>
         /// 是否激活分组
         /// </summary>
-        bool IsActiveGroup(GroupData data);
+        bool IsActiveGroup();
     }
 }

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

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

Assets/YooAsset/Editor/AssetBundleReporter/ReportSummary.cs

@@ -33,6 +33,11 @@ namespace YooAsset.Editor
         /// </summary>
         public BuildTarget BuildTarget;
 
+        /// <summary>
+        /// 构建模式
+        /// </summary>
+        public EBuildMode BuildMode;
+
         /// <summary>
         /// 构建管线
         /// </summary>
@@ -62,7 +67,6 @@ namespace YooAsset.Editor
         public string IgnoreRuleName;
 
         // 构建参数
-        public bool ClearBuildCacheFiles;
         public bool EnableSharePackRule;
         public string EncryptionClassName;
         public EFileNameStyle FileNameStyle;

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

@@ -62,6 +62,7 @@ namespace YooAsset.Editor
             _items.Add(new ItemWrapper("Build Seconds", ConvertTime(buildReport.Summary.BuildSeconds)));
             _items.Add(new ItemWrapper("Build Target", $"{buildReport.Summary.BuildTarget}"));
             _items.Add(new ItemWrapper("Build Pipeline", $"{buildReport.Summary.BuildPipeline}"));
+            _items.Add(new ItemWrapper("Build Mode", $"{buildReport.Summary.BuildMode}"));
             _items.Add(new ItemWrapper("Package Name", buildReport.Summary.BuildPackageName));
             _items.Add(new ItemWrapper("Package Version", buildReport.Summary.BuildPackageVersion));
             _items.Add(new ItemWrapper("Package Note", buildReport.Summary.BuildPackageNote));
@@ -77,7 +78,6 @@ namespace YooAsset.Editor
 
             _items.Add(new ItemWrapper(string.Empty, string.Empty));
             _items.Add(new ItemWrapper("Build Params", string.Empty));
-            _items.Add(new ItemWrapper("Clear Build Cache Files", $"{buildReport.Summary.ClearBuildCacheFiles}"));
             _items.Add(new ItemWrapper("Enable Share Pack Rule", $"{buildReport.Summary.EnableSharePackRule}"));
             _items.Add(new ItemWrapper("Encryption Class Name", buildReport.Summary.EncryptionClassName));
             _items.Add(new ItemWrapper("FileNameStyle", $"{buildReport.Summary.FileNameStyle}"));

Assets/YooAsset/Runtime/FileSystem/CacheSystem/CacheHelper.cs

@@ -0,0 +1,25 @@
+using System;
+using System.IO;
+
+namespace YooAsset
+{
+    internal class CacheHelper
+    {
+        /// <summary>
+        /// 获取默认的缓存根目录
+        /// </summary>
+        public static string GetDefaultCacheRoot()
+        {
+#if UNITY_EDITOR
+            // 注意：为了方便调试查看，编辑器下把存储目录放到项目里。
+            string projectPath = Path.GetDirectoryName(UnityEngine.Application.dataPath);
+            projectPath = PathUtility.RegularPath(projectPath);
+            return PathUtility.Combine(projectPath, YooAssetSettingsData.Setting.DefaultYooFolderName);
+#elif UNITY_STANDALONE
+            return PathUtility.Combine(UnityEngine.Application.dataPath, YooAssetSettingsData.Setting.DefaultYooFolderName);
+#else
+            return PathUtility.Combine(UnityEngine.Application.persistentDataPath, YooAssetSettingsData.Setting.DefaultYooFolderName);	
+#endif
+        }
+    }
+}

Assets/YooAsset/Runtime/FileSystem/CacheSystem/CacheHelper.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 990b41f647b80a34ab666a3b0c1ba3f6
+guid: cbc12d398555ced46b201626eec6825e
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuildinFileSystem.cs

@@ -181,7 +181,7 @@ namespace YooAsset
             PackageName = packageName;
 
             if (string.IsNullOrEmpty(rootDirectory))
-                rootDirectory = GetDefaultBuildinRoot();
+                rootDirectory = GetDefaultRoot();
 
             _packageRoot = PathUtility.Combine(rootDirectory, packageName);
 
@@ -292,9 +292,9 @@ namespace YooAsset
         }
 
         #region 内部方法
-        protected string GetDefaultBuildinRoot()
+        protected string GetDefaultRoot()
         {
-            return YooAssetSettingsData.GetYooMobileBuildinRoot();
+            return PathUtility.Combine(Application.streamingAssetsPath, YooAssetSettingsData.Setting.DefaultYooFolderName);
         }
         public string GetBuildinFileLoadPath(PackageBundle bundle)
         {
@@ -305,25 +305,30 @@ namespace YooAsset
             }
             return filePath;
         }
+        public string GetBuildinCatalogFileLoadPath()
+        {
+            string fileName = Path.GetFileNameWithoutExtension(DefaultBuildinFileSystemDefine.BuildinCatalogFileName);
+            return PathUtility.Combine(YooAssetSettingsData.Setting.DefaultYooFolderName, PackageName, fileName);
+        }
         public string GetBuildinPackageVersionFilePath()
         {
             string fileName = YooAssetSettingsData.GetPackageVersionFileName(PackageName);
-            return PathUtility.Combine(_packageRoot, fileName);
+            return PathUtility.Combine(FileRoot, fileName);
         }
         public string GetBuildinPackageHashFilePath(string packageVersion)
         {
             string fileName = YooAssetSettingsData.GetPackageHashFileName(PackageName, packageVersion);
-            return PathUtility.Combine(_packageRoot, fileName);
+            return PathUtility.Combine(FileRoot, fileName);
         }
         public string GetBuildinPackageManifestFilePath(string packageVersion)
         {
             string fileName = YooAssetSettingsData.GetManifestBinaryFileName(PackageName, packageVersion);
-            return PathUtility.Combine(_packageRoot, fileName);
+            return PathUtility.Combine(FileRoot, fileName);
         }
-        public string GetCatalogFileLoadPath()
+        public string GetStreamingAssetsPackageRoot()
         {
-            string fileName = Path.GetFileNameWithoutExtension(DefaultBuildinFileSystemDefine.BuildinCatalogFileName);
-            return YooAssetSettingsData.GetYooResourcesLoadPath(PackageName, fileName);
+            string rootPath = PathUtility.Combine(Application.dataPath, "StreamingAssets", YooAssetSettingsData.Setting.DefaultYooFolderName);
+            return PathUtility.Combine(rootPath, PackageName);
         }
 
         /// <summary>

Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuildinFileSystemBuild.cs

@@ -17,12 +17,12 @@ namespace YooAsset
         {
             YooLogger.Log("Begin to create catalog file !");
 
-            string savePath = YooAssetSettingsData.GetYooResourcesFullPath();
+            string savePath = $"Assets/Resources/{YooAssetSettingsData.Setting.DefaultYooFolderName}";
             DirectoryInfo saveDirectory = new DirectoryInfo(savePath);
             if (saveDirectory.Exists)
                 saveDirectory.Delete(true);
 
-            string rootPath = YooAssetSettingsData.GetYooEditorBuildinRoot();
+            string rootPath = $"{Application.dataPath}/StreamingAssets/{YooAssetSettingsData.Setting.DefaultYooFolderName}";
             DirectoryInfo rootDirectory = new DirectoryInfo(rootPath);
             if (rootDirectory.Exists == false)
             {
@@ -105,8 +105,7 @@ namespace YooAsset
                 }
             }
 
-            string fullPath = YooAssetSettingsData.GetYooResourcesFullPath();
-            string saveFilePath = $"{fullPath}/{packageName}/{DefaultBuildinFileSystemDefine.BuildinCatalogFileName}";
+            string saveFilePath = $"Assets/Resources/{YooAssetSettingsData.Setting.DefaultYooFolderName}/{packageName}/{DefaultBuildinFileSystemDefine.BuildinCatalogFileName}";
             FileUtility.CreateFileDirectory(saveFilePath);
 
             UnityEditor.AssetDatabase.CreateAsset(buildinFileCatalog, saveFilePath);

Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSInitializeOperation.cs

@@ -65,8 +65,7 @@ namespace YooAsset
 #if UNITY_EDITOR
                     // 兼容性初始化
                     // 说明：内置文件系统在编辑器下运行时需要动态生成
-                    string buildinRoot = YooAssetSettingsData.GetYooEditorBuildinRoot();
-                    string packageRoot = PathUtility.Combine(buildinRoot, _fileSystem.PackageName);
+                    string packageRoot = _fileSystem.GetStreamingAssetsPackageRoot();
                     DefaultBuildinFileSystemBuild.CreateBuildinCatalogFile(_fileSystem.PackageName, packageRoot);
 #endif
 

Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/LoadBuildinCatalogFileOperation.cs

@@ -30,7 +30,7 @@ namespace YooAsset
 
             if (_steps == ESteps.LoadCatalog)
             {
-                string catalogFilePath = _fileSystem.GetCatalogFileLoadPath();
+                string catalogFilePath = _fileSystem.GetBuildinCatalogFileLoadPath();
                 var catalog = Resources.Load<DefaultBuildinFileCatalog>(catalogFilePath);
                 if (catalog == null)
                 {

Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/DefaultCacheFileSystem.cs

@@ -255,7 +255,7 @@ namespace YooAsset
             PackageName = packageName;
 
             if (string.IsNullOrEmpty(rootDirectory))
-                rootDirectory = GetDefaultCacheRoot();
+                rootDirectory = CacheHelper.GetDefaultCacheRoot();
 
             _packageRoot = PathUtility.Combine(rootDirectory, packageName);
             _cacheFileRoot = PathUtility.Combine(_packageRoot, DefaultCacheFileSystemDefine.SaveFilesFolderName);
@@ -520,16 +520,6 @@ namespace YooAsset
         #endregion
 
         #region 内部方法
-        public string GetDefaultCacheRoot()
-        {
-#if UNITY_EDITOR
-            return YooAssetSettingsData.GetYooEditorCacheRoot();
-#elif UNITY_STANDALONE
-            return YooAssetSettingsData.GetYooStandaloneCacheRoot();
-#else
-            return YooAssetSettingsData.GetYooMobileCacheRoot();
-#endif
-        }
         public string GetCacheFileLoadPath(PackageBundle bundle)
         {
             return GetDataFilePath(bundle);

Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/DefaultWebServerFileSystem.cs

@@ -163,7 +163,8 @@ namespace YooAsset
         #region 内部方法
         protected string GetDefaultWebRoot()
         {
-            return YooAssetSettingsData.GetYooWebBuildinRoot();
+            string path = PathUtility.Combine(UnityEngine.Application.streamingAssetsPath, YooAssetSettingsData.Setting.DefaultYooFolderName);
+            return path;
         }
         public string GetWebFileLoadPath(PackageBundle bundle)
         {
@@ -174,6 +175,11 @@ namespace YooAsset
             }
             return filePath;
         }
+        public string GetCatalogFileLoadPath()
+        {
+            string fileName = Path.GetFileNameWithoutExtension(DefaultBuildinFileSystemDefine.BuildinCatalogFileName);
+            return PathUtility.Combine(YooAssetSettingsData.Setting.DefaultYooFolderName, PackageName, fileName);
+        }
         public string GetWebPackageVersionFilePath()
         {
             string fileName = YooAssetSettingsData.GetPackageVersionFileName(PackageName);
@@ -189,10 +195,10 @@ namespace YooAsset
             string fileName = YooAssetSettingsData.GetManifestBinaryFileName(PackageName, packageVersion);
             return PathUtility.Combine(FileRoot, fileName);
         }
-        public string GetCatalogFileLoadPath()
+        public string GetStreamingAssetsPackageRoot()
         {
-            string fileName = Path.GetFileNameWithoutExtension(DefaultBuildinFileSystemDefine.BuildinCatalogFileName);
-            return YooAssetSettingsData.GetYooResourcesLoadPath(PackageName, fileName);
+            string rootPath = PathUtility.Combine(Application.dataPath, "StreamingAssets", YooAssetSettingsData.Setting.DefaultYooFolderName);
+            return PathUtility.Combine(rootPath, PackageName);
         }
 
         /// <summary>

Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/DWSFSInitializeOperation.cs

@@ -35,8 +35,7 @@ namespace YooAsset
 #if UNITY_EDITOR
                     // 兼容性初始化
                     // 说明：内置文件系统在编辑器下运行时需要动态生成
-                    string buildinRoot = YooAssetSettingsData.GetYooEditorBuildinRoot();
-                    string packageRoot = PathUtility.Combine(buildinRoot, _fileSystem.PackageName);
+                    string packageRoot = _fileSystem.GetStreamingAssetsPackageRoot();
                     DefaultBuildinFileSystemBuild.CreateBuildinCatalogFile(_fileSystem.PackageName, packageRoot);
 #endif
 

Assets/YooAsset/Runtime/InitializeParameters.cs

@@ -3,6 +3,27 @@ using System.Collections.Generic;
 
 namespace YooAsset
 {
+    /// <summary>
+    /// 默认的构建管线
+    /// </summary>
+    public enum EDefaultBuildPipeline
+    {
+        /// <summary>
+        /// 内置构建管线
+        /// </summary>
+        BuiltinBuildPipeline,
+
+        /// <summary>
+        /// 可编程构建管线
+        /// </summary>
+        ScriptableBuildPipeline,
+
+        /// <summary>
+        /// 原生文件构建管线
+        /// </summary>
+        RawFileBuildPipeline,
+    }
+
     /// <summary>
     /// 运行模式
     /// </summary>
@@ -68,7 +89,7 @@ namespace YooAsset
         /// 创建默认的编辑器文件系统参数
         /// <param name="simulateBuildResult">模拟构建结果</param>
         /// </summary>
-        public static FileSystemParameters CreateDefaultEditorFileSystemParameters(EditorSimulateBuildResult simulateBuildResult)
+        public static FileSystemParameters CreateDefaultEditorFileSystemParameters(SimulateBuildResult simulateBuildResult)
         {
             string fileSystemClass = typeof(DefaultEditorFileSystem).FullName;
             var fileSystemParams = new FileSystemParameters(fileSystemClass, simulateBuildResult.PackageRootDirectory);

Assets/YooAsset/Runtime/ResourceManager/Operation/UnloadUnusedAssetsOperation.cs

@@ -58,7 +58,6 @@ namespace YooAsset
                 }
 
                 // 注意：调用底层接口释放所有资源
-                if (removeList.Count > 0)
                 Resources.UnloadUnusedAssets();
 
                 _steps = ESteps.Done;

Assets/YooAsset/Runtime/ResourcePackage/PlayMode/EditorSimulateBuildParam.cs

@@ -1,8 +0,0 @@
-
-namespace YooAsset
-{
-    public class EditorSimulateBuildParam
-    {
-        public string PackageName;
-    }
-}

Assets/YooAsset/Runtime/ResourcePackage/PlayMode/EditorSimulateBuildParam.cs.meta

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

Assets/YooAsset/Runtime/ResourcePackage/PlayMode/EditorSimulateBuildResult.cs

@@ -1,7 +1,7 @@
 
 namespace YooAsset
 {
-    public class EditorSimulateBuildResult
+    public class SimulateBuildResult
     {
         public string PackageRootDirectory;
     }

Assets/YooAsset/Runtime/ResourcePackage/PlayMode/EditorSimulateModeHelper.cs

@@ -10,12 +10,20 @@ namespace YooAsset
         /// <summary>
         /// 编辑器下模拟构建清单
         /// </summary>
-        public static EditorSimulateBuildResult SimulateBuild(EditorSimulateBuildParam buildParam)
+        public static SimulateBuildResult SimulateBuild(string buildPipelineName, string packageName)
         {
             if (_classType == null)
                 _classType = Assembly.Load("YooAsset.Editor").GetType("YooAsset.Editor.AssetBundleSimulateBuilder");
 
-            return (EditorSimulateBuildResult)InvokePublicStaticMethod(_classType, "SimulateBuild", buildParam);
+            return (SimulateBuildResult)InvokePublicStaticMethod(_classType, "SimulateBuild", buildPipelineName, packageName);
+        }
+
+        /// <summary>
+        /// 编辑器下模拟构建清单
+        /// </summary>
+        public static SimulateBuildResult SimulateBuild(EDefaultBuildPipeline buildPipeline, string packageName)
+        {
+            return SimulateBuild(buildPipeline.ToString(), packageName);
         }
 
         private static object InvokePublicStaticMethod(System.Type type, string method, params object[] parameters)
@@ -35,7 +43,12 @@ namespace YooAsset
 { 
     public static class EditorSimulateModeHelper
     {
-        public static EditorSimulateBuildResult SimulateBuild(EditorSimulateBuildParam buildParam) 
+        public static SimulateBuildResult SimulateBuild(string buildPipelineName, string packageName) 
+        {
+            throw new System.Exception("Only support in unity editor !");
+        }
+
+        public static SimulateBuildResult SimulateBuild(EDefaultBuildPipeline buildPipeline, string packageName)
         {
             throw new System.Exception("Only support in unity editor !");
         }

Assets/YooAsset/Runtime/Settings/YooAssetSettingsData.cs

@@ -1,5 +1,4 @@
-using System.IO;
-using UnityEngine;
+using UnityEngine;
 
 namespace YooAsset
 {
@@ -72,115 +71,5 @@ namespace YooAsset
         {
             return $"{Setting.ManifestFileName}_{packageName}.version";
         }
-
-        #region 路径相关
-        /// <summary>
-        /// 获取YOO的Resources目录的加载路径
-        /// </summary>
-        public static string GetYooResourcesLoadPath(string packageName, string fileName)
-        {
-            if (string.IsNullOrEmpty(Setting.DefaultYooFolderName))
-                return PathUtility.Combine(packageName, fileName);
-            else
-                return PathUtility.Combine(Setting.DefaultYooFolderName, packageName, fileName);
-        }
-
-        /// <summary>
-        /// 获取YOO的Resources目录的全路径
-        /// </summary>
-        public static string GetYooResourcesFullPath()
-        {
-            if (string.IsNullOrEmpty(Setting.DefaultYooFolderName))
-                return $"Assets/Resources";
-            else
-                return $"Assets/Resources/{Setting.DefaultYooFolderName}";
-        }
-
-        /// <summary>
-        /// 获取YOO的编辑器下内置文件根目录
-        /// </summary>
-        public static string GetYooEditorBuildinRoot()
-        {
-            if (string.IsNullOrEmpty(Setting.DefaultYooFolderName))
-                return PathUtility.Combine(Application.dataPath, "StreamingAssets");
-            else
-                return PathUtility.Combine(Application.dataPath, "StreamingAssets", Setting.DefaultYooFolderName);
-        }
-
-        /// <summary>
-        /// 获取YOO的PC端内置文件根目录
-        /// </summary>
-        public static string GetYooStandaloneBuildinRoot()
-        {
-            if (string.IsNullOrEmpty(Setting.DefaultYooFolderName))
-                return Application.streamingAssetsPath;
-            else
-                return PathUtility.Combine(Application.streamingAssetsPath, Setting.DefaultYooFolderName);
-        }
-
-        /// <summary>
-        /// 获取YOO的移动端内置文件根目录
-        /// </summary>
-        public static string GetYooMobileBuildinRoot()
-        {
-            if (string.IsNullOrEmpty(Setting.DefaultYooFolderName))
-                return Application.streamingAssetsPath;
-            else
-                return PathUtility.Combine(Application.streamingAssetsPath, Setting.DefaultYooFolderName);
-        }
-
-        /// <summary>
-        /// 获取YOO的Web端内置文件根目录
-        /// </summary>
-        public static string GetYooWebBuildinRoot()
-        {
-            if (string.IsNullOrEmpty(Setting.DefaultYooFolderName))
-                return Application.streamingAssetsPath;
-            else
-                return PathUtility.Combine(Application.streamingAssetsPath, Setting.DefaultYooFolderName);
-        }
-
-        /// <summary>
-        /// 获取YOO的编辑器下缓存文件根目录
-        /// </summary>
-        public static string GetYooEditorCacheRoot()
-        {
-            if (string.IsNullOrEmpty(Setting.DefaultYooFolderName))
-            {
-                string projectPath = Path.GetDirectoryName(Application.dataPath);
-                projectPath = PathUtility.RegularPath(projectPath);
-                return projectPath;
-            }
-            else
-            {
-                // 注意：为了方便调试查看，编辑器下把存储目录放到项目根目录下。
-                string projectPath = Path.GetDirectoryName(Application.dataPath);
-                projectPath = PathUtility.RegularPath(projectPath);
-                return PathUtility.Combine(projectPath, Setting.DefaultYooFolderName);
-            }
-        }
-
-        /// <summary>
-        /// 获取YOO的PC端缓存文件根目录
-        /// </summary>
-        public static string GetYooStandaloneCacheRoot()
-        {
-            if (string.IsNullOrEmpty(Setting.DefaultYooFolderName))
-                return Application.dataPath;
-            else
-                return PathUtility.Combine(Application.dataPath, Setting.DefaultYooFolderName);
-        }
-
-        /// <summary>
-        /// 获取YOO的移动端缓存文件根目录
-        /// </summary>
-        public static string GetYooMobileCacheRoot()
-        {
-            if (string.IsNullOrEmpty(Setting.DefaultYooFolderName))
-                return Application.persistentDataPath;
-            else
-                return PathUtility.Combine(Application.persistentDataPath, Setting.DefaultYooFolderName);
-        }
-        #endregion
     }
 }

Assets/YooAsset/Samples~/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollector.cs

@@ -143,7 +143,7 @@ public static class ShaderVariantCollector
         List<string> allAssets = new List<string>(1000);
 
         // 获取所有打包的资源
-        CollectResult collectResult = AssetBundleCollectorSettingData.Setting.GetPackageAssets(true, _packageName);
+        CollectResult collectResult = AssetBundleCollectorSettingData.Setting.GetPackageAssets(EBuildMode.DryRunBuild, _packageName);
         foreach (var assetInfo in collectResult.CollectAssets)
         {
             string[] depends = AssetDatabase.GetDependencies(assetInfo.AssetInfo.AssetPath, true);

Assets/YooAsset/Samples~/Extension Sample/Runtime/CopyBuildinManifestOperation.cs

@@ -125,7 +125,7 @@ public class CopyBuildinManifestOperation : GameAsyncOperation
 
     private string GetBuildinYooRoot()
     {
-        return YooAssetSettingsData.GetYooMobileBuildinRoot();
+        return PathUtility.Combine(Application.streamingAssetsPath, YooAssetSettingsData.Setting.DefaultYooFolderName);
     }
     private string GetBuildinHashFilePath()
     {
@@ -142,7 +142,7 @@ public class CopyBuildinManifestOperation : GameAsyncOperation
 
     private string GetCacheYooRoot()
     {
-        return YooAssetSettingsData.GetYooMobileCacheRoot();
+        return PathUtility.Combine(UnityEngine.Application.persistentDataPath, YooAssetSettingsData.Setting.DefaultYooFolderName);
     }
     private string GetCacheHashFilePath()
     {

Assets/YooAsset/Samples~/Extension Sample/Runtime/LoadGameObjectOperation.cs

@@ -1,102 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using YooAsset;
-
-public static class YooAssetsExtension
-{
-    public static LoadGameObjectOperation LoadGameObjectAsync(this ResourcePackage resourcePackage, string location, Vector3 position, Quaternion rotation, Transform parent, bool destroyGoOnRelease = false)
-    {
-        var operation = new LoadGameObjectOperation(location, position, rotation, parent, destroyGoOnRelease);
-        YooAssets.StartOperation(operation);
-        return operation;
-    }
-}
-
-public class LoadGameObjectOperation : GameAsyncOperation
-{
-    private enum ESteps
-    {
-        None,
-        LoadAsset,
-        Done,
-    }
-
-    private readonly string _location;
-    private readonly Vector3 _positon;
-    private readonly Quaternion _rotation;
-    private readonly Transform _parent;
-    private readonly bool _destroyGoOnRelease;
-    private AssetHandle _handle;
-    private ESteps _steps = ESteps.None;
-
-    /// <summary>
-    /// 加载的游戏对象
-    /// </summary>
-    public GameObject Go { private set; get; }
-
-
-    public LoadGameObjectOperation(string location, Vector3 position, Quaternion rotation, Transform parent, bool destroyGoOnRelease = false)
-    {
-        _location = location;
-        _positon = position;
-        _rotation = rotation;
-        _parent = parent;
-        _destroyGoOnRelease = destroyGoOnRelease;
-    }
-    protected override void OnStart()
-    {
-        _steps = ESteps.LoadAsset;
-    }
-    protected override void OnUpdate()
-    {
-        if (_steps == ESteps.None || _steps == ESteps.Done)
-            return;
-
-        if (_steps == ESteps.LoadAsset)
-        {
-            if (_handle == null)
-            {
-                _handle = YooAssets.LoadAssetAsync<GameObject>(_location);
-            }
-
-            Progress = _handle.Progress;
-            if (_handle.IsDone == false)
-                return;
-
-            if (_handle.Status != EOperationStatus.Succeed)
-            {
-                Error = _handle.LastError;
-                Status = EOperationStatus.Failed;
-                _steps = ESteps.Done;
-            }
-            else
-            {
-                Go = _handle.InstantiateSync(_positon, _rotation, _parent);
-                Status = EOperationStatus.Succeed;
-                _steps = ESteps.Done;
-            }
-        }
-    }
-    protected override void OnAbort()
-    {
-    }
-
-    /// <summary>
-    /// 释放资源句柄
-    /// </summary>
-    public void ReleaseHandle()
-    {
-        if (_handle != null)
-        {
-            _handle.Release();
-
-            if (_destroyGoOnRelease)
-            {
-                if (Go != null)
-                    GameObject.Destroy(Go);
-            }
-        }
-    }
-}

Assets/YooAsset/Samples~/Extension Sample/Runtime/LoadGameObjectOperation.cs.meta

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

Assets/YooAsset/Samples~/Space Shooter/GameScript/Runtime/PatchLogic/FsmNode/FsmInitializePackage.cs

@@ -33,6 +33,7 @@ internal class FsmInitializePackage : IStateNode
     {
         var playMode = (EPlayMode)_machine.GetBlackboardValue("PlayMode");
         var packageName = (string)_machine.GetBlackboardValue("PackageName");
+        var buildPipeline = (string)_machine.GetBlackboardValue("BuildPipeline");
         var rawFileSystem = (bool)_machine.GetBlackboardValue("RawFileSystem");
 
         // 创建资源包裹类
@@ -44,9 +45,7 @@ internal class FsmInitializePackage : IStateNode
         InitializationOperation initializationOperation = null;
         if (playMode == EPlayMode.EditorSimulateMode)
         {
-            var simulateBuildParam = new EditorSimulateBuildParam();
-            simulateBuildParam.PackageName = packageName;
-            var simulateBuildResult = EditorSimulateModeHelper.SimulateBuild(simulateBuildParam);
+            var simulateBuildResult = EditorSimulateModeHelper.SimulateBuild(buildPipeline, packageName);
             var createParameters = new EditorSimulateModeParameters();
             createParameters.EditorFileSystemParameters = FileSystemParameters.CreateDefaultEditorFileSystemParameters(simulateBuildResult);
             initializationOperation = package.InitializeAsync(createParameters);

Assets/YooAsset/Samples~/Space Shooter/GameScript/Runtime/PatchLogic/PatchOperation.cs

@@ -19,7 +19,7 @@ public class PatchOperation : GameAsyncOperation
     private readonly StateMachine _machine;
     private ESteps _steps = ESteps.None;
 
-    public PatchOperation(string packageName, bool rawFileSystem, EPlayMode playMode)
+    public PatchOperation(string packageName, string buildPipeline, bool rawFileSystem, EPlayMode playMode)
     {
         // 注册监听事件
         _eventGroup.AddListener<UserEventDefine.UserTryInitialize>(OnHandleEventMessage);
@@ -41,6 +41,7 @@ public class PatchOperation : GameAsyncOperation
 
         _machine.SetBlackboardValue("PackageName", packageName);
         _machine.SetBlackboardValue("PlayMode", playMode);
+        _machine.SetBlackboardValue("BuildPipeline", buildPipeline);
         _machine.SetBlackboardValue("RawFileSystem", rawFileSystem);
     }
     protected override void OnStart()