From 3ae70412faea0ad96423bb5bb4ac999c87105cc1 Mon Sep 17 00:00:00 2001 From: hevinci Date: Mon, 18 Jul 2022 11:24:47 +0800 Subject: [PATCH] Update AssetBundleBuilder --- .../Editor/AssetBundleBuilder/AssetBundleBuilder.cs | 6 +++--- .../Editor/AssetBundleBuilder/AssetBundleBuilderSetting.cs | 2 +- .../Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs | 2 +- .../BuildTasks/TaskCreatePatchManifest.cs | 2 +- .../AssetBundleBuilder/BuildTasks/TaskCreatePatchPackage.cs | 2 +- Assets/YooAsset/Editor/AssetBundleBuilder/EBuildPipeline.cs | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilder.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilder.cs index 4716f65..8fbbda5 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilder.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilder.cs @@ -23,7 +23,7 @@ namespace YooAsset.Editor { throw new Exception($"{nameof(buildParameters)} is null !"); } - if (buildParameters.BuildPipeline == EBuildPipeline.ScriptBuildPipeline) + if (buildParameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline) { if (buildParameters.SBPParameters == null) throw new Exception($"{nameof(BuildParameters.SBPParameters)} is null !"); @@ -41,7 +41,7 @@ namespace YooAsset.Editor // 创建构建节点 List pipeline; - if (buildParameters.BuildPipeline == EBuildPipeline.BuiltInBuildPipeline) + if (buildParameters.BuildPipeline == EBuildPipeline.BuiltinBuildPipeline) { pipeline = new List { @@ -56,7 +56,7 @@ namespace YooAsset.Editor new TaskCopyBuildinFiles(), //拷贝内置文件 }; } - else if (buildParameters.BuildPipeline == EBuildPipeline.ScriptBuildPipeline) + else if (buildParameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline) { pipeline = new List { diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSetting.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSetting.cs index 1a11758..bd63107 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSetting.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSetting.cs @@ -13,7 +13,7 @@ namespace YooAsset.Editor /// /// 构建管线 /// - public EBuildPipeline BuildPipeline = EBuildPipeline.BuiltInBuildPipeline; + public EBuildPipeline BuildPipeline = EBuildPipeline.BuiltinBuildPipeline; /// /// 构建模式 diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs index 64fcc3b..9e613db 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs @@ -192,7 +192,7 @@ namespace YooAsset.Editor buildParameters.EncryptionServices = CreateEncryptionServicesInstance(); buildParameters.CompressOption = AssetBundleBuilderSettingData.Setting.CompressOption; - if (AssetBundleBuilderSettingData.Setting.BuildPipeline == EBuildPipeline.ScriptBuildPipeline) + if (AssetBundleBuilderSettingData.Setting.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline) { buildParameters.SBPParameters = new BuildParameters.SBPBuildParameters(); buildParameters.SBPParameters.WriteLinkXML = true; diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreatePatchManifest.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreatePatchManifest.cs index 1bc02ff..09dd2dc 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreatePatchManifest.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreatePatchManifest.cs @@ -35,7 +35,7 @@ namespace YooAsset.Editor patchManifest.AssetList = GetAllPatchAsset(buildParameters, buildMapContext, patchManifest); // 更新Unity内置资源包的引用关系 - if (buildParameters.Parameters.BuildPipeline == EBuildPipeline.ScriptBuildPipeline) + if (buildParameters.Parameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline) { var buildResultContext = context.GetContextObject(); UpdateBuiltInBundleReference(patchManifest, buildResultContext.Results); diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreatePatchPackage.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreatePatchPackage.cs index 8221232..c29c6ed 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreatePatchPackage.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreatePatchPackage.cs @@ -54,7 +54,7 @@ namespace YooAsset.Editor EditorTools.CopyFile(sourcePath, destPath, true); } - if (buildParameters.Parameters.BuildPipeline == EBuildPipeline.ScriptBuildPipeline) + if (buildParameters.Parameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline) { // 拷贝构建日志 { diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/EBuildPipeline.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/EBuildPipeline.cs index 8beebc2..7ecff2c 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/EBuildPipeline.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/EBuildPipeline.cs @@ -9,11 +9,11 @@ namespace YooAsset.Editor /// /// 传统内置构建管线 /// - BuiltInBuildPipeline, + BuiltinBuildPipeline, /// /// 可编程构建管线 /// - ScriptBuildPipeline, + ScriptableBuildPipeline, } } \ No newline at end of file