From a72329ab4f2791f12e0173b0adef510d03dc8374 Mon Sep 17 00:00:00 2001 From: yzx Date: Thu, 13 Jun 2024 17:15:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scripts/ProcessMode/AnimationProcessManager.cs | 6 ++++++ .../Scripts/ProcessMode/SceneProcessLauncher.cs | 12 ++++++++++-- .../ToolsPack/ToolsPackGameObjectComponent.cs | 2 +- .../Scripts/ToolsPack/ToolsSceneProcessLauncher.cs | 11 +++++++++-- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs index e17593fa..f1ffd608 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs @@ -34,6 +34,12 @@ namespace DefaultNamespace.ProcessMode } } + public void ClearProcess() + { + processes.Clear(); + } + + public void AddStepToProcess(string type, AnimationStep step) { if (processes.ContainsKey(type)) diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/SceneProcessLauncher.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/SceneProcessLauncher.cs index bccb5083..fc328ca9 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/SceneProcessLauncher.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/SceneProcessLauncher.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Threading.Tasks; using DefaultNamespace.Dto; using DG.Tweening; using MotionFramework; @@ -15,11 +16,18 @@ namespace DefaultNamespace.ProcessMode private AnimationProcessManager processManager; - private IEnumerator Start() + private async void Start() { - yield return new WaitForSeconds(1); + await Task.Delay(TimeSpan.FromSeconds(1)); + + + + processManager = MotionEngine.GetModule(); + + processManager.ClearProcess(); + processManager.AddProcess("Training"); string json = System.IO.File.ReadAllText(Application.streamingAssetsPath + "/DataConfig/SceneStepData.json"); diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackGameObjectComponent.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackGameObjectComponent.cs index 776f4662..7eb97d00 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackGameObjectComponent.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackGameObjectComponent.cs @@ -26,7 +26,7 @@ namespace ToolsPack private void Start() { - _toolsPackScene = MotionEngine.GetModule().GetToolsPackScene(); + // _toolsPackScene = MotionEngine.GetModule().GetToolsPackScene(); } private void OnEnable() diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsSceneProcessLauncher.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsSceneProcessLauncher.cs index 63b7af90..9f258bdc 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsSceneProcessLauncher.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsSceneProcessLauncher.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Threading.Tasks; using DefaultNamespace.Dto; using DefaultNamespace.ProcessMode; using MotionFramework; @@ -17,11 +18,17 @@ namespace ToolsPack private AnimationProcessManager processManager; - private IEnumerator Start() + private async void Start() { - yield return new WaitForSeconds(1); + await Task.Delay(TimeSpan.FromSeconds(1)); + + processManager = MotionEngine.GetModule(); + + processManager.ClearProcess(); + + processManager.AddProcess("Training"); string json = System.IO.File.ReadAllText(Application.streamingAssetsPath + "/DataConfig/ToolsSceneStepData.json");