From e499103b4e7e08295e926c49745650bfd09832b4 Mon Sep 17 00:00:00 2001 From: yzx Date: Mon, 24 Jun 2024 14:36:37 +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 --- .../Assets/Framework/GameLauncher.cs | 16 ---- .../Assets/Scripts/MessageManager.cs | 12 +-- .../ProcessMode/AnimationProcessManager.cs | 10 +-- .../Scripts/ProcessMode/IncorrectClick.cs | 19 ----- .../ProcessMode/IncorrectClick.cs.meta | 3 - .../Scripts/ProcessMode/ProcessUIManager.cs | 85 ------------------- .../ProcessMode/ProcessUIManager.cs.meta | 3 - .../ProcessMode/SceneProcessLauncher.cs | 14 --- .../ProcessMode/SceneProcessLauncher.cs.meta | 11 --- 9 files changed, 10 insertions(+), 163 deletions(-) delete mode 100644 SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/IncorrectClick.cs delete mode 100644 SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/IncorrectClick.cs.meta delete mode 100644 SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/ProcessUIManager.cs delete mode 100644 SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/ProcessUIManager.cs.meta delete mode 100644 SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/SceneProcessLauncher.cs delete mode 100644 SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/SceneProcessLauncher.cs.meta diff --git a/SXElectricityInformationAcquisition/Assets/Framework/GameLauncher.cs b/SXElectricityInformationAcquisition/Assets/Framework/GameLauncher.cs index 447c4393..e2a97730 100644 --- a/SXElectricityInformationAcquisition/Assets/Framework/GameLauncher.cs +++ b/SXElectricityInformationAcquisition/Assets/Framework/GameLauncher.cs @@ -16,19 +16,9 @@ using UnityEngine.SceneManagement; public class GameLauncher : MonoBehaviour { - [Tooltip("在编辑器下模拟运行")] - public bool SimulationOnEditor = true; - public string sceneName; void Awake() { -#if !UNITY_EDITOR - SimulationOnEditor = false; -#endif - // 初始化控制台 - //if (Application.isEditor || Debug.isDebugBuild) - // DeveloperConsole.Initialize(); - // 初始化框架 MotionEngine.Initialize(this, HandleMotionFrameworkLog); } @@ -44,12 +34,6 @@ public class GameLauncher : MonoBehaviour // 更新框架 MotionEngine.Update(); } - void OnGUI() - { - // 绘制控制台 - //if (Application.isEditor || Debug.isDebugBuild) - // DeveloperConsole.Draw(); - } private async void CreateGameModules() { diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/MessageManager.cs b/SXElectricityInformationAcquisition/Assets/Scripts/MessageManager.cs index 32c96980..ac471928 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/MessageManager.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/MessageManager.cs @@ -10,20 +10,20 @@ using UnityEngine; public class MessageManager : MonoBehaviour { public TMP_Text text; - async void Start() - { + async void Start() + { await Task.Delay(TimeSpan.FromSeconds(1)); - if ( MotionEngine.GetModule().GetProcessMode() == ProcessMode.Teaching || MotionEngine.GetModule().GetProcessMode() == ProcessMode.Assessment) + if (MotionEngine.GetModule().GetProcessMode() == ProcessMode.Teaching || MotionEngine.GetModule().GetProcessMode() == ProcessMode.Assessment) { this.gameObject.SetActive(false); } - + MotionEngine.GetModule().OnSendMessagePrompt += SendMessagePrompt; } - + private void SendMessagePrompt(string message) { text.text = message; } -} +} \ No newline at end of file diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs index 5f7240f4..1d5e46e1 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs @@ -38,6 +38,9 @@ namespace DefaultNamespace.ProcessMode public event CompleteEventHandler OnCompleteEvent; public event UIEventHandler OnUIEvent; + /// + /// 鍙充笂瑙掓秷鎭氱煡 + /// public event SendMessagePrompt OnSendMessagePrompt; @@ -53,12 +56,6 @@ namespace DefaultNamespace.ProcessMode Enum.TryParse(type, true, out currentMode); } - public void ClearProcess() - { - processes.Clear(); - } - - public void AddStepToProcess(string type, AnimationStep step) { if (processes.ContainsKey(type)) @@ -556,6 +553,7 @@ namespace DefaultNamespace.ProcessMode actions.Add(new ActionWithDescription(targetObjects, action, actionData.Description, actionData.IsSequential, stepData.StepDescription)); } + //閫氳繃鎺ュ彛鑾峰彇鍒嗘暟鏁版嵁 // AnimationStep step = new AnimationStep(stepData.StepDescription, _sceneStepData.taskList[0].stepList[index].defaultScore, actions); AnimationStep step = new AnimationStep(stepData.StepDescription,stepData.Score , actions); index++; diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/IncorrectClick.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/IncorrectClick.cs deleted file mode 100644 index 009f4b89..00000000 --- a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/IncorrectClick.cs +++ /dev/null @@ -1,19 +0,0 @@ -using UnityEngine; - -namespace DefaultNamespace.ProcessMode -{ - public class IncorrectClick - { - public GameObject ClickedObject { get; set; } - public int StepIndex { get; set; } - public int ActionIndex { get; set; } // 鏂板锛氬姩浣滅储寮 - - public IncorrectClick(GameObject clickedObject, int stepIndex, int actionIndex) - { - ClickedObject = clickedObject; - StepIndex = stepIndex; - ActionIndex = actionIndex; - } - } - -} \ No newline at end of file diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/IncorrectClick.cs.meta b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/IncorrectClick.cs.meta deleted file mode 100644 index 80d9aae4..00000000 --- a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/IncorrectClick.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: e49a83ec6ff240d38d3b702d006793b2 -timeCreated: 1718155453 \ No newline at end of file diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/ProcessUIManager.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/ProcessUIManager.cs deleted file mode 100644 index 478cbea5..00000000 --- a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/ProcessUIManager.cs +++ /dev/null @@ -1,85 +0,0 @@ -// using UnityEngine; -// using UnityEngine.UI; -// -// namespace DefaultNamespace.ProcessMode -// { -// public class ProcessUIManager : MonoBehaviour -// { -// public Text trainingTextBox; // 鍩硅妯″紡鐨勬枃鏈 -// public Text practiceTextBox; // 缁冧範妯″紡鐨勬枃鏈 -// public GameObject highlightObject; // 楂樹寒瀵硅薄锛岀敤浜庢暀瀛︽ā寮 -// -// public AnimationProcessManager processManager; // 娴佺▼绠$悊鍣ㄥ疄渚 -// -// private void Start() -// { -// processManager = new AnimationProcessManager(); // 浼犻扷IManager瀹炰緥 -// } -// -// private void Update() -// { -// if (Input.GetMouseButtonDown(0)) -// { -// GameObject clickedObject = DetectClickedObject(); -// if (clickedObject != null) -// { -// processManager.HandleClick(clickedObject); -// } -// } -// } -// -// /// -// /// 妫娴嬬偣鍑荤殑瀵硅薄 -// /// -// /// 鐐瑰嚮鐨勫璞 -// private GameObject DetectClickedObject() -// { -// Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); -// RaycastHit hit; -// if (Physics.Raycast(ray, out hit)) -// { -// return hit.collider.gameObject; -// } -// -// return null; -// } -// -// /// -// /// 鏄剧ず鍩硅姝ラ淇℃伅 -// /// -// /// 褰撳墠姝ラ -// public void ShowTrainingStep(AnimationStep step) -// { -// if (trainingTextBox != null) -// { -// trainingTextBox.text = step.Description; -// } -// } -// -// /// -// /// 鏄剧ず缁冧範姝ラ淇℃伅 -// /// -// /// 褰撳墠姝ラ -// public void ShowPracticeStep(AnimationStep step) -// { -// if (practiceTextBox != null) -// { -// practiceTextBox.text = step.Description; -// } -// } -// -// /// -// /// 楂樹寒鏄剧ず涓嬩竴涓渶瑕佺偣鍑荤殑鍦版柟锛堟暀瀛︽ā寮忥級 -// /// -// /// 褰撳墠姝ラ -// public void HighlightNextStep(AnimationStep step) -// { -// if (highlightObject != null) -// { -// highlightObject.SetActive(true); -// // 鍋囪浣犳湁涓涓柟娉曟潵瀹氫綅楂樹寒瀵硅薄 -// // highlightObject.transform.position = ...; -// } -// } -// } -// } \ No newline at end of file diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/ProcessUIManager.cs.meta b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/ProcessUIManager.cs.meta deleted file mode 100644 index 46263e3f..00000000 --- a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/ProcessUIManager.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 7ebad6a729d44621873e93e1cd6f2b60 -timeCreated: 1717742043 \ No newline at end of file diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/SceneProcessLauncher.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/SceneProcessLauncher.cs deleted file mode 100644 index b11fe2ab..00000000 --- a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/SceneProcessLauncher.cs +++ /dev/null @@ -1,14 +0,0 @@ - -using UnityEngine; - -namespace DefaultNamespace.ProcessMode -{ - [ScriptDescription("鍦烘櫙鐨勬祦绋嬪惎鍔ㄥ櫒")] - public class SceneProcessLauncher : MonoBehaviour - { - private void Start() - { - - } - } -} \ No newline at end of file diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/SceneProcessLauncher.cs.meta b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/SceneProcessLauncher.cs.meta deleted file mode 100644 index 3c13d076..00000000 --- a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/SceneProcessLauncher.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 51f73ee94f284a86b677a6bc74544094 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: