From a84f9811473318cf593baafe154a444bbbe4c727 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E5=86=A0=E5=B3=B0?= Date: Fri, 3 Jan 2025 19:15:51 +0800 Subject: [PATCH] update test scene --- ...mulateBuilder.cs => TestPackageBuilder.cs} | 14 +++++------ ...der.cs.meta => TestPackageBuilder.cs.meta} | 0 .../Runtime/BuildinFileSystemTester.cs | 24 +++++++++---------- .../Runtime/EditorFileSystemTester.cs | 16 ++++++------- .../Test Sample/TestRes/Scene/scene_c.unity | 9 ------- 5 files changed, 27 insertions(+), 36 deletions(-) rename Assets/YooAsset/Samples~/Test Sample/Editor/{TestSimulateBuilder.cs => TestPackageBuilder.cs} (94%) rename Assets/YooAsset/Samples~/Test Sample/Editor/{TestSimulateBuilder.cs.meta => TestPackageBuilder.cs.meta} (100%) diff --git a/Assets/YooAsset/Samples~/Test Sample/Editor/TestSimulateBuilder.cs b/Assets/YooAsset/Samples~/Test Sample/Editor/TestPackageBuilder.cs similarity index 94% rename from Assets/YooAsset/Samples~/Test Sample/Editor/TestSimulateBuilder.cs rename to Assets/YooAsset/Samples~/Test Sample/Editor/TestPackageBuilder.cs index 0789a27b..853e747b 100644 --- a/Assets/YooAsset/Samples~/Test Sample/Editor/TestSimulateBuilder.cs +++ b/Assets/YooAsset/Samples~/Test Sample/Editor/TestPackageBuilder.cs @@ -3,12 +3,12 @@ using UnityEngine; using YooAsset; using YooAsset.Editor; -public static class TestSimulateBuilder +public static class TestPackageBuilder { /// - /// 模拟构建 + /// 构建资源包 /// - public static EditorSimulateBuildResult SimulateBuild(EditorSimulateBuildParam buildParam) + public static PackageInvokeBuildResult BuildPackage(PackageInvokeBuildParam buildParam) { string packageName = buildParam.PackageName; string buildPipelineName = buildParam.BuildPipelineName; @@ -31,7 +31,7 @@ public static class TestSimulateBuilder BuildResult buildResult = pipeline.Run(buildParameters, false); if (buildResult.Success) { - var reulst = new EditorSimulateBuildResult(); + var reulst = new PackageInvokeBuildResult(); reulst.PackageRootDirectory = buildResult.OutputPackageDirectory; return reulst; } @@ -64,7 +64,7 @@ public static class TestSimulateBuilder BuildResult buildResult = pipeline.Run(buildParameters, false); if (buildResult.Success) { - var reulst = new EditorSimulateBuildResult(); + var reulst = new PackageInvokeBuildResult(); reulst.PackageRootDirectory = buildResult.OutputPackageDirectory; return reulst; } @@ -97,7 +97,7 @@ public static class TestSimulateBuilder BuildResult buildResult = pipeline.Run(buildParameters, false); if (buildResult.Success) { - var reulst = new EditorSimulateBuildResult(); + var reulst = new PackageInvokeBuildResult(); reulst.PackageRootDirectory = buildResult.OutputPackageDirectory; return reulst; } @@ -128,7 +128,7 @@ public static class TestSimulateBuilder BuildResult buildResult = pipeline.Run(buildParameters, false); if (buildResult.Success) { - var reulst = new EditorSimulateBuildResult(); + var reulst = new PackageInvokeBuildResult(); reulst.PackageRootDirectory = buildResult.OutputPackageDirectory; return reulst; } diff --git a/Assets/YooAsset/Samples~/Test Sample/Editor/TestSimulateBuilder.cs.meta b/Assets/YooAsset/Samples~/Test Sample/Editor/TestPackageBuilder.cs.meta similarity index 100% rename from Assets/YooAsset/Samples~/Test Sample/Editor/TestSimulateBuilder.cs.meta rename to Assets/YooAsset/Samples~/Test Sample/Editor/TestPackageBuilder.cs.meta diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/BuildinFileSystemTester.cs b/Assets/YooAsset/Samples~/Test Sample/Runtime/BuildinFileSystemTester.cs index 19dcebf4..d5cef736 100644 --- a/Assets/YooAsset/Samples~/Test Sample/Runtime/BuildinFileSystemTester.cs +++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/BuildinFileSystemTester.cs @@ -19,23 +19,23 @@ public class BuildinFileSystemTester : IPrebuildSetup, IPostBuildCleanup #if UNITY_EDITOR // 构建TestPackage { - var simulateParams = new EditorSimulateBuildParam(AssetBundleCollectorDefine.TestPackageName); - simulateParams.BuildPipelineName = "ScriptableBuildPipeline"; - simulateParams.InvokeAssmeblyName = "YooAsset.Test.Editor"; - simulateParams.InvokeClassFullName = "TestSimulateBuilder"; - simulateParams.InvokeMethodName = "SimulateBuild"; - var simulateResult = EditorSimulateModeHelper.SimulateBuild(simulateParams); + var buildParams = new PackageInvokeBuildParam(AssetBundleCollectorDefine.TestPackageName); + buildParams.BuildPipelineName = "ScriptableBuildPipeline"; + buildParams.InvokeAssmeblyName = "YooAsset.Test.Editor"; + buildParams.InvokeClassFullName = "TestPackageBuilder"; + buildParams.InvokeMethodName = "BuildPackage"; + var simulateResult = PakcageInvokeBuilder.InvokeBuilder(buildParams); UnityEditor.EditorPrefs.SetString(BFS_TEST_PACKAGE_ROOT_KEY, simulateResult.PackageRootDirectory); } // 构建RawPackage { - var simulateParams = new EditorSimulateBuildParam(AssetBundleCollectorDefine.RawPackageName); - simulateParams.BuildPipelineName = "RawFileBuildPipeline"; - simulateParams.InvokeAssmeblyName = "YooAsset.Test.Editor"; - simulateParams.InvokeClassFullName = "TestSimulateBuilder"; - simulateParams.InvokeMethodName = "SimulateBuild"; - var simulateResult = EditorSimulateModeHelper.SimulateBuild(simulateParams); + var buildParams = new PackageInvokeBuildParam(AssetBundleCollectorDefine.RawPackageName); + buildParams.BuildPipelineName = "RawFileBuildPipeline"; + buildParams.InvokeAssmeblyName = "YooAsset.Test.Editor"; + buildParams.InvokeClassFullName = "TestPackageBuilder"; + buildParams.InvokeMethodName = "BuildPackage"; + var simulateResult = PakcageInvokeBuilder.InvokeBuilder(buildParams); UnityEditor.EditorPrefs.SetString(BFS_RAW_PACKAGE_ROOT_KEY, simulateResult.PackageRootDirectory); } #endif diff --git a/Assets/YooAsset/Samples~/Test Sample/Runtime/EditorFileSystemTester.cs b/Assets/YooAsset/Samples~/Test Sample/Runtime/EditorFileSystemTester.cs index 2fd30155..5341fa5e 100644 --- a/Assets/YooAsset/Samples~/Test Sample/Runtime/EditorFileSystemTester.cs +++ b/Assets/YooAsset/Samples~/Test Sample/Runtime/EditorFileSystemTester.cs @@ -19,23 +19,23 @@ public class EditorFileSystemTester : IPrebuildSetup, IPostBuildCleanup #if UNITY_EDITOR // 构建TestPackage { - var simulateParams = new EditorSimulateBuildParam(AssetBundleCollectorDefine.TestPackageName); + var simulateParams = new PackageInvokeBuildParam(AssetBundleCollectorDefine.TestPackageName); simulateParams.BuildPipelineName = "EditorSimulateBuildPipeline"; simulateParams.InvokeAssmeblyName = "YooAsset.Test.Editor"; - simulateParams.InvokeClassFullName = "TestSimulateBuilder"; - simulateParams.InvokeMethodName = "SimulateBuild"; - var simulateResult = EditorSimulateModeHelper.SimulateBuild(simulateParams); + simulateParams.InvokeClassFullName = "TestPackageBuilder"; + simulateParams.InvokeMethodName = "BuildPackage"; + var simulateResult = PakcageInvokeBuilder.InvokeBuilder(simulateParams); UnityEditor.EditorPrefs.SetString(EFS_TEST_PACKAGE_ROOT_KEY, simulateResult.PackageRootDirectory); } // 构建RawPackage { - var simulateParams = new EditorSimulateBuildParam(AssetBundleCollectorDefine.RawPackageName); + var simulateParams = new PackageInvokeBuildParam(AssetBundleCollectorDefine.RawPackageName); simulateParams.BuildPipelineName = "EditorSimulateBuildPipeline"; simulateParams.InvokeAssmeblyName = "YooAsset.Test.Editor"; - simulateParams.InvokeClassFullName = "TestSimulateBuilder"; - simulateParams.InvokeMethodName = "SimulateBuild"; - var simulateResult = EditorSimulateModeHelper.SimulateBuild(simulateParams); + simulateParams.InvokeClassFullName = "TestPackageBuilder"; + simulateParams.InvokeMethodName = "BuildPackage"; + var simulateResult = PakcageInvokeBuilder.InvokeBuilder(simulateParams); UnityEditor.EditorPrefs.SetString(EFS_RAW_PACKAGE_ROOT_KEY, simulateResult.PackageRootDirectory); } #endif diff --git a/Assets/YooAsset/Samples~/Test Sample/TestRes/Scene/scene_c.unity b/Assets/YooAsset/Samples~/Test Sample/TestRes/Scene/scene_c.unity index 8203e320..8a424cc0 100644 --- a/Assets/YooAsset/Samples~/Test Sample/TestRes/Scene/scene_c.unity +++ b/Assets/YooAsset/Samples~/Test Sample/TestRes/Scene/scene_c.unity @@ -333,7 +333,6 @@ GameObject: m_Component: - component: {fileID: 2032300069} - component: {fileID: 2032300068} - - component: {fileID: 2032300067} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -341,14 +340,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!81 &2032300067 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2032300066} - m_Enabled: 1 --- !u!20 &2032300068 Camera: m_ObjectHideFlags: 0