diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskBuilding_SBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskBuilding_SBP.cs index 03cbd546..2f084a9c 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskBuilding_SBP.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskBuilding_SBP.cs @@ -32,7 +32,7 @@ namespace YooAsset.Editor // 开始构建 IBundleBuildResults buildResults; var buildParameters = scriptableBuildParameters.GetBundleBuildParameters(); - var taskList = SBPBuildTasks.Create(buildMapContext.Command.ShadersBundleName); + var taskList = SBPBuildTasks.Create(buildMapContext.Command.ShadersBundleName, null); ReturnCode exitCode = ContentPipeline.BuildAssetBundles(buildParameters, buildContent, out buildResults, taskList); if (exitCode < 0) { diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/SBPBuildTasks.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/SBPBuildTasks.cs index 5c72371f..3314daa9 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/SBPBuildTasks.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/SBPBuildTasks.cs @@ -9,7 +9,7 @@ namespace UnityEditor.Build.Pipeline.Tasks { public static class SBPBuildTasks { - public static IList Create(string builtInShaderBundleName) + public static IList Create(string builtInShaderBundleName, string unityMonoScriptsBundleName) { var buildTasks = new List(); @@ -28,13 +28,10 @@ namespace UnityEditor.Build.Pipeline.Tasks #endif buildTasks.Add(new CalculateAssetDependencyData()); buildTasks.Add(new StripUnusedSpriteSources()); - -#if TUANJIE_1_0_OR_NEWER - buildTasks.Add(new CreateBuiltInShadersBundle(builtInShaderBundleName)); -#else - buildTasks.Add(new CreateBuiltInBundle(builtInShaderBundleName)); -#endif - + if (string.IsNullOrEmpty(builtInShaderBundleName) == false) + buildTasks.Add(new CreateBuiltInShadersBundle(builtInShaderBundleName)); + if (string.IsNullOrEmpty(unityMonoScriptsBundleName) == false) + buildTasks.Add(new CreateMonoScriptBundle(unityMonoScriptsBundleName)); buildTasks.Add(new PostDependencyCallback()); // Packing diff --git a/Assets/YooAsset/package.json b/Assets/YooAsset/package.json index 12ad1e44..53a489dc 100644 --- a/Assets/YooAsset/package.json +++ b/Assets/YooAsset/package.json @@ -31,7 +31,7 @@ }, "relatedPackages": {}, "dependencies": { - "com.unity.scriptablebuildpipeline": "2.1.3", + "com.unity.scriptablebuildpipeline": "1.21.25", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.modules.unitywebrequestassetbundle": "1.0.0"