diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleSimulateBuilder.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleSimulateBuilder.cs index d3e1962c..2a0c2014 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleSimulateBuilder.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleSimulateBuilder.cs @@ -8,8 +8,9 @@ namespace YooAsset.Editor /// /// 模拟构建 /// - public static SimulateBuildResult SimulateBuild(string buildPipelineName, string packageName) + public static EditorSimulateBuildResult SimulateBuild(EditorSimulateBuildParam buildParam) { + string packageName = buildParam.PackageName; var buildParameters = new EditorSimulateBuildParameters(); buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot(); buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot(); @@ -25,7 +26,7 @@ namespace YooAsset.Editor BuildResult buildResult = pipeline.Run(buildParameters, false); if (buildResult.Success) { - SimulateBuildResult reulst = new SimulateBuildResult(); + var reulst = new EditorSimulateBuildResult(); reulst.PackageRootDirectory = buildResult.OutputPackageDirectory; return reulst; } diff --git a/Assets/YooAsset/Runtime/InitializeParameters.cs b/Assets/YooAsset/Runtime/InitializeParameters.cs index f013415f..00b690e5 100644 --- a/Assets/YooAsset/Runtime/InitializeParameters.cs +++ b/Assets/YooAsset/Runtime/InitializeParameters.cs @@ -3,27 +3,6 @@ using System.Collections.Generic; namespace YooAsset { - /// - /// 默认的构建管线 - /// - public enum EDefaultBuildPipeline - { - /// - /// 内置构建管线 - /// - BuiltinBuildPipeline, - - /// - /// 可编程构建管线 - /// - ScriptableBuildPipeline, - - /// - /// 原生文件构建管线 - /// - RawFileBuildPipeline, - } - /// /// 运行模式 /// @@ -89,7 +68,7 @@ namespace YooAsset /// 创建默认的编辑器文件系统参数 /// 模拟构建结果 /// - public static FileSystemParameters CreateDefaultEditorFileSystemParameters(SimulateBuildResult simulateBuildResult) + public static FileSystemParameters CreateDefaultEditorFileSystemParameters(EditorSimulateBuildResult simulateBuildResult) { string fileSystemClass = typeof(DefaultEditorFileSystem).FullName; var fileSystemParams = new FileSystemParameters(fileSystemClass, simulateBuildResult.PackageRootDirectory); diff --git a/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/EditorSimulateBuildParam.cs b/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/EditorSimulateBuildParam.cs new file mode 100644 index 00000000..2a94b901 --- /dev/null +++ b/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/EditorSimulateBuildParam.cs @@ -0,0 +1,8 @@ + +namespace YooAsset +{ + public class EditorSimulateBuildParam + { + public string PackageName; + } +} \ No newline at end of file diff --git a/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/EditorSimulateBuildParam.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/EditorSimulateBuildParam.cs.meta new file mode 100644 index 00000000..42be870d --- /dev/null +++ b/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/EditorSimulateBuildParam.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 720a3c8ecde4cd443bedd238c03713c0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/EditorSimulateBuildResult.cs b/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/EditorSimulateBuildResult.cs index 044ba7fa..fa2f0594 100644 --- a/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/EditorSimulateBuildResult.cs +++ b/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/EditorSimulateBuildResult.cs @@ -1,7 +1,7 @@  namespace YooAsset { - public class SimulateBuildResult + public class EditorSimulateBuildResult { public string PackageRootDirectory; } diff --git a/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/EditorSimulateModeHelper.cs b/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/EditorSimulateModeHelper.cs index 955f7246..160ba028 100644 --- a/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/EditorSimulateModeHelper.cs +++ b/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/EditorSimulateModeHelper.cs @@ -10,20 +10,12 @@ namespace YooAsset /// /// 编辑器下模拟构建清单 /// - public static SimulateBuildResult SimulateBuild(string buildPipelineName, string packageName) + public static EditorSimulateBuildResult SimulateBuild(EditorSimulateBuildParam buildParam) { if (_classType == null) _classType = Assembly.Load("YooAsset.Editor").GetType("YooAsset.Editor.AssetBundleSimulateBuilder"); - return (SimulateBuildResult)InvokePublicStaticMethod(_classType, "SimulateBuild", buildPipelineName, packageName); - } - - /// - /// 编辑器下模拟构建清单 - /// - public static SimulateBuildResult SimulateBuild(EDefaultBuildPipeline buildPipeline, string packageName) - { - return SimulateBuild(buildPipeline.ToString(), packageName); + return (EditorSimulateBuildResult)InvokePublicStaticMethod(_classType, "SimulateBuild", buildParam); } private static object InvokePublicStaticMethod(System.Type type, string method, params object[] parameters) @@ -43,12 +35,7 @@ namespace YooAsset { public static class EditorSimulateModeHelper { - 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) + public static EditorSimulateBuildResult SimulateBuild(EditorSimulateBuildParam buildParam) { throw new System.Exception("Only support in unity editor !"); }