From f0ed677d86ad52eb301037c36186bad42a732c7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E5=86=A0=E5=B3=B0?= Date: Fri, 13 Dec 2024 14:32:17 +0800 Subject: [PATCH] refactor : remove DryRunBuild build mode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 移除演练构建模式 --- .../BuildTasks/TaskBuilding_BBP.cs | 12 +++++------- .../BuildTasks/TaskCreatePackage_BBP.cs | 2 +- .../BuildTasks/TaskUpdateBundleInfo_BBP.cs | 10 +++++----- .../BuiltinBuildPipeline/BuiltinBuildParameters.cs | 6 ------ .../BuildTasks/TaskPrepare_RFBP.cs | 5 ----- .../BuildTasks/TaskPrepare_SBP.cs | 5 ----- .../YooAsset/Editor/AssetBundleBuilder/EBuildMode.cs | 5 ----- .../VisualViewers/BuiltinBuildPipelineViewer.cs | 1 - 8 files changed, 11 insertions(+), 35 deletions(-) diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskBuilding_BBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskBuilding_BBP.cs index f15882a8..f722b055 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskBuilding_BBP.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskBuilding_BBP.cs @@ -35,14 +35,12 @@ namespace YooAsset.Editor throw new Exception(message); } - if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild) + // 检测输出目录 + string unityOutputManifestFilePath = $"{pipelineOutputDirectory}/{YooAssetSettings.OutputFolderName}"; + if (System.IO.File.Exists(unityOutputManifestFilePath) == false) { - string unityOutputManifestFilePath = $"{pipelineOutputDirectory}/{YooAssetSettings.OutputFolderName}"; - if (System.IO.File.Exists(unityOutputManifestFilePath) == false) - { - string message = BuildLogger.GetErrorMessage(ErrorCode.UnityEngineBuildFatal, $"Not found output {nameof(AssetBundleManifest)} file : {unityOutputManifestFilePath}"); - throw new Exception(message); - } + string message = BuildLogger.GetErrorMessage(ErrorCode.UnityEngineBuildFatal, $"Not found output {nameof(AssetBundleManifest)} file : {unityOutputManifestFilePath}"); + throw new Exception(message); } BuildLogger.Log("UnityEngine build success !"); diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreatePackage_BBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreatePackage_BBP.cs index 530b1b7f..eeaa6eb4 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreatePackage_BBP.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreatePackage_BBP.cs @@ -10,7 +10,7 @@ namespace YooAsset.Editor var buildParameters = context.GetContextObject(); var buildMapContext = context.GetContextObject(); var buildMode = buildParameters.Parameters.BuildMode; - if (buildMode != EBuildMode.SimulateBuild && buildMode != EBuildMode.DryRunBuild) + if (buildMode != EBuildMode.SimulateBuild) { CreatePackageCatalog(buildParameters, buildMapContext); } diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskUpdateBundleInfo_BBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskUpdateBundleInfo_BBP.cs index 5aaccfb2..343b641a 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskUpdateBundleInfo_BBP.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskUpdateBundleInfo_BBP.cs @@ -18,7 +18,7 @@ namespace YooAsset.Editor var buildParametersContext = context.GetContextObject(); var parameters = buildParametersContext.Parameters; var buildMode = parameters.BuildMode; - if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild) + if (buildMode == EBuildMode.SimulateBuild) { return "00000000000000000000000000000000"; //32位 } @@ -42,7 +42,7 @@ namespace YooAsset.Editor var buildParametersContext = context.GetContextObject(); var parameters = buildParametersContext.Parameters; var buildMode = parameters.BuildMode; - if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild) + if (buildMode == EBuildMode.SimulateBuild) { return 0; } @@ -64,7 +64,7 @@ namespace YooAsset.Editor { string filePath = bundleInfo.PackageSourceFilePath; var buildMode = buildParametersContext.Parameters.BuildMode; - if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild) + if (buildMode == EBuildMode.SimulateBuild) return GetFilePathTempHash(filePath); else return HashUtility.FileMD5(filePath); @@ -73,7 +73,7 @@ namespace YooAsset.Editor { string filePath = bundleInfo.PackageSourceFilePath; var buildMode = buildParametersContext.Parameters.BuildMode; - if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild) + if ( buildMode == EBuildMode.SimulateBuild) return "00000000"; //8位 else return HashUtility.FileCRC32(filePath); @@ -82,7 +82,7 @@ namespace YooAsset.Editor { string filePath = bundleInfo.PackageSourceFilePath; var buildMode = buildParametersContext.Parameters.BuildMode; - if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild) + if (buildMode == EBuildMode.SimulateBuild) return GetBundleTempSize(bundleInfo); else return FileUtility.GetFileSize(filePath); diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuiltinBuildParameters.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuiltinBuildParameters.cs index da4c5380..84fbb406 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuiltinBuildParameters.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuiltinBuildParameters.cs @@ -34,12 +34,6 @@ namespace YooAsset.Editor BuildAssetBundleOptions opt = BuildAssetBundleOptions.None; opt |= BuildAssetBundleOptions.StrictMode; //Do not allow the build to succeed if any errors are reporting during it. - if (BuildMode == EBuildMode.DryRunBuild) - { - opt |= BuildAssetBundleOptions.DryRunBuild; - return opt; - } - if (CompressOption == ECompressOption.Uncompressed) opt |= BuildAssetBundleOptions.UncompressedAssetBundle; else if (CompressOption == ECompressOption.LZ4) diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskPrepare_RFBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskPrepare_RFBP.cs index 6c836a59..1ac31e86 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskPrepare_RFBP.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskPrepare_RFBP.cs @@ -24,11 +24,6 @@ namespace YooAsset.Editor } // 检测不被支持的构建模式 - if (buildParameters.BuildMode == EBuildMode.DryRunBuild) - { - string message = BuildLogger.GetErrorMessage(ErrorCode.BuildPipelineNotSupportBuildMode, $"{nameof(EBuildPipeline.RawFileBuildPipeline)} not support {nameof(EBuildMode.DryRunBuild)} build mode !"); - throw new Exception(message); - } if (buildParameters.BuildMode == EBuildMode.IncrementalBuild) { string message = BuildLogger.GetErrorMessage(ErrorCode.BuildPipelineNotSupportBuildMode, $"{nameof(EBuildPipeline.RawFileBuildPipeline)} not support {nameof(EBuildMode.IncrementalBuild)} build mode !"); diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskPrepare_SBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskPrepare_SBP.cs index 0fbf3217..8d4ff541 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskPrepare_SBP.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskPrepare_SBP.cs @@ -17,11 +17,6 @@ namespace YooAsset.Editor buildParametersContext.CheckBuildParameters(); // 检测不被支持的构建模式 - if (buildParameters.BuildMode == EBuildMode.DryRunBuild) - { - string message = BuildLogger.GetErrorMessage(ErrorCode.BuildPipelineNotSupportBuildMode, $"{nameof(EBuildPipeline.ScriptableBuildPipeline)} not support {nameof(EBuildMode.DryRunBuild)} build mode !"); - throw new Exception(message); - } if (buildParameters.BuildMode == EBuildMode.ForceRebuild) { string message = BuildLogger.GetErrorMessage(ErrorCode.BuildPipelineNotSupportBuildMode, $"{nameof(EBuildPipeline.ScriptableBuildPipeline)} not support {nameof(EBuildMode.ForceRebuild)} build mode !"); diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/EBuildMode.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/EBuildMode.cs index e9393275..c483f4b2 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/EBuildMode.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/EBuildMode.cs @@ -16,11 +16,6 @@ namespace YooAsset.Editor /// IncrementalBuild, - /// - /// 演练构建模式 - /// - DryRunBuild, - /// /// 模拟构建模式 /// diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuiltinBuildPipelineViewer.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuiltinBuildPipelineViewer.cs index 55fc367b..937df593 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuiltinBuildPipelineViewer.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuiltinBuildPipelineViewer.cs @@ -55,7 +55,6 @@ namespace YooAsset.Editor List buildModeList = new List(); buildModeList.Add(EBuildMode.ForceRebuild); buildModeList.Add(EBuildMode.IncrementalBuild); - buildModeList.Add(EBuildMode.DryRunBuild); buildModeList.Add(EBuildMode.SimulateBuild); return buildModeList; }