From 9094b17a3daa6c0b29c5560fdd4067356ff8c4a5 Mon Sep 17 00:00:00 2001 From: GanX <2423855310@qq.com> Date: Sun, 26 Oct 2025 09:56:23 +0800 Subject: [PATCH] =?UTF-8?q?fix():=20=E4=BF=AE=E5=A4=8D=E9=87=8D=E5=90=AF?= =?UTF-8?q?=E5=90=8E=E5=88=87=E6=8D=A2=E6=A8=A1=E5=BC=8F=E5=90=8E=E7=9B=B8?= =?UTF-8?q?=E6=9C=BA=E4=B8=A2=E5=A4=B1BUG=EF=BC=8C=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=87=8D=E5=90=AF=E5=90=8EUI=E7=BB=91=E5=AE=9A=E5=A4=B1?= =?UTF-8?q?=E6=95=88=E7=9A=84BUG=EF=BC=8C=E5=B0=86GameManager=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E5=88=B0Gameplay?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/Level1.unity | 351 +----------------- Assets/Script/Core/ScenesManager.cs | 12 +- .../Script/Gameplay/Global/GameFlowManager.cs | 9 +- .../{Core => Gameplay/Global}/GameManager.cs | 12 +- .../Global}/GameManager.cs.meta | 0 .../Player/PlayerWatchModeController.cs | 28 +- Assets/Script/Gameplay/UI/StartGameButton.cs | 10 +- 7 files changed, 55 insertions(+), 367 deletions(-) rename Assets/Script/{Core => Gameplay/Global}/GameManager.cs (60%) rename Assets/Script/{Core => Gameplay/Global}/GameManager.cs.meta (100%) diff --git a/Assets/Scenes/Level1.unity b/Assets/Scenes/Level1.unity index 50664b7..1284484 100644 --- a/Assets/Scenes/Level1.unity +++ b/Assets/Scenes/Level1.unity @@ -554,74 +554,6 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 852526192} m_SourcePrefab: {fileID: 100100000, guid: 8f4de64a5cce27745b5566ff3ef971c8, type: 3} ---- !u!1001 &31717449 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1586746027131230676, guid: 2a2113dbf189fbd44bca90f4df91f338, - type: 3} - propertyPath: m_LocalPosition.x - value: 0.51336026 - objectReference: {fileID: 0} - - target: {fileID: 1586746027131230676, guid: 2a2113dbf189fbd44bca90f4df91f338, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.37061486 - objectReference: {fileID: 0} - - target: {fileID: 1586746027131230676, guid: 2a2113dbf189fbd44bca90f4df91f338, - type: 3} - propertyPath: m_LocalPosition.z - value: 1.5721664 - objectReference: {fileID: 0} - - target: {fileID: 1586746027131230676, guid: 2a2113dbf189fbd44bca90f4df91f338, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1586746027131230676, guid: 2a2113dbf189fbd44bca90f4df91f338, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1586746027131230676, guid: 2a2113dbf189fbd44bca90f4df91f338, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1586746027131230676, guid: 2a2113dbf189fbd44bca90f4df91f338, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1586746027131230676, guid: 2a2113dbf189fbd44bca90f4df91f338, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1586746027131230676, guid: 2a2113dbf189fbd44bca90f4df91f338, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1586746027131230676, guid: 2a2113dbf189fbd44bca90f4df91f338, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5223255733355640781, guid: 2a2113dbf189fbd44bca90f4df91f338, - type: 3} - propertyPath: m_Name - value: InputManager - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2a2113dbf189fbd44bca90f4df91f338, type: 3} --- !u!1001 &43889001 PrefabInstance: m_ObjectHideFlags: 0 @@ -6644,74 +6576,6 @@ Transform: m_Children: [] m_Father: {fileID: 2009785149} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &769057572 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3918776012077598679, guid: 9e2e93bf07726014bac5a458c32e697f, - type: 3} - propertyPath: m_Name - value: GameCountDownManager - objectReference: {fileID: 0} - - target: {fileID: 4952453861214115371, guid: 9e2e93bf07726014bac5a458c32e697f, - type: 3} - propertyPath: m_LocalPosition.x - value: 829.4015 - objectReference: {fileID: 0} - - target: {fileID: 4952453861214115371, guid: 9e2e93bf07726014bac5a458c32e697f, - type: 3} - propertyPath: m_LocalPosition.y - value: 383.09033 - objectReference: {fileID: 0} - - target: {fileID: 4952453861214115371, guid: 9e2e93bf07726014bac5a458c32e697f, - type: 3} - propertyPath: m_LocalPosition.z - value: 3.2512481 - objectReference: {fileID: 0} - - target: {fileID: 4952453861214115371, guid: 9e2e93bf07726014bac5a458c32e697f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4952453861214115371, guid: 9e2e93bf07726014bac5a458c32e697f, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4952453861214115371, guid: 9e2e93bf07726014bac5a458c32e697f, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4952453861214115371, guid: 9e2e93bf07726014bac5a458c32e697f, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4952453861214115371, guid: 9e2e93bf07726014bac5a458c32e697f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4952453861214115371, guid: 9e2e93bf07726014bac5a458c32e697f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4952453861214115371, guid: 9e2e93bf07726014bac5a458c32e697f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 9e2e93bf07726014bac5a458c32e697f, type: 3} --- !u!1001 &770547568 PrefabInstance: m_ObjectHideFlags: 0 @@ -11328,74 +11192,6 @@ Transform: m_Children: [] m_Father: {fileID: 705072614} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1279118200 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2130934091406547798, guid: f480e7d630901ad48a69a5df6d2132f2, - type: 3} - propertyPath: m_Name - value: GameFlowManager - objectReference: {fileID: 0} - - target: {fileID: 8520498794796434433, guid: f480e7d630901ad48a69a5df6d2132f2, - type: 3} - propertyPath: m_LocalPosition.x - value: 829.4015 - objectReference: {fileID: 0} - - target: {fileID: 8520498794796434433, guid: f480e7d630901ad48a69a5df6d2132f2, - type: 3} - propertyPath: m_LocalPosition.y - value: 383.09033 - objectReference: {fileID: 0} - - target: {fileID: 8520498794796434433, guid: f480e7d630901ad48a69a5df6d2132f2, - type: 3} - propertyPath: m_LocalPosition.z - value: 3.2512481 - objectReference: {fileID: 0} - - target: {fileID: 8520498794796434433, guid: f480e7d630901ad48a69a5df6d2132f2, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8520498794796434433, guid: f480e7d630901ad48a69a5df6d2132f2, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8520498794796434433, guid: f480e7d630901ad48a69a5df6d2132f2, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8520498794796434433, guid: f480e7d630901ad48a69a5df6d2132f2, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8520498794796434433, guid: f480e7d630901ad48a69a5df6d2132f2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8520498794796434433, guid: f480e7d630901ad48a69a5df6d2132f2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8520498794796434433, guid: f480e7d630901ad48a69a5df6d2132f2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f480e7d630901ad48a69a5df6d2132f2, type: 3} --- !u!1 &1280149366 GameObject: m_ObjectHideFlags: 0 @@ -12246,17 +12042,17 @@ PrefabInstance: - target: {fileID: 7437893023972897012, guid: 667aedb0d3f8c9d469819c9ff2b4472b, type: 3} propertyPath: m_LocalPosition.x - value: -6.311 + value: -6.9859 objectReference: {fileID: 0} - target: {fileID: 7437893023972897012, guid: 667aedb0d3f8c9d469819c9ff2b4472b, type: 3} propertyPath: m_LocalPosition.y - value: 3.575 + value: 2.101 objectReference: {fileID: 0} - target: {fileID: 7437893023972897012, guid: 667aedb0d3f8c9d469819c9ff2b4472b, type: 3} propertyPath: m_LocalPosition.z - value: -3.106 + value: -0.5246 objectReference: {fileID: 0} - target: {fileID: 7437893023972897012, guid: 667aedb0d3f8c9d469819c9ff2b4472b, type: 3} @@ -13312,74 +13108,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8f4de64a5cce27745b5566ff3ef971c8, type: 3} ---- !u!1001 &1532480746 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 5532734616494925005, guid: 781c629235eee4f4eb34f1e763aa7f67, - type: 3} - propertyPath: m_Name - value: TimePauseManager - objectReference: {fileID: 0} - - target: {fileID: 6144181697203329678, guid: 781c629235eee4f4eb34f1e763aa7f67, - type: 3} - propertyPath: m_LocalPosition.x - value: 0.29564962 - objectReference: {fileID: 0} - - target: {fileID: 6144181697203329678, guid: 781c629235eee4f4eb34f1e763aa7f67, - type: 3} - propertyPath: m_LocalPosition.y - value: 4.269477 - objectReference: {fileID: 0} - - target: {fileID: 6144181697203329678, guid: 781c629235eee4f4eb34f1e763aa7f67, - type: 3} - propertyPath: m_LocalPosition.z - value: -1.7842796 - objectReference: {fileID: 0} - - target: {fileID: 6144181697203329678, guid: 781c629235eee4f4eb34f1e763aa7f67, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6144181697203329678, guid: 781c629235eee4f4eb34f1e763aa7f67, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6144181697203329678, guid: 781c629235eee4f4eb34f1e763aa7f67, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6144181697203329678, guid: 781c629235eee4f4eb34f1e763aa7f67, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6144181697203329678, guid: 781c629235eee4f4eb34f1e763aa7f67, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6144181697203329678, guid: 781c629235eee4f4eb34f1e763aa7f67, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6144181697203329678, guid: 781c629235eee4f4eb34f1e763aa7f67, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 781c629235eee4f4eb34f1e763aa7f67, type: 3} --- !u!114 &1543743027 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4936355834716623489, guid: be07db3098b709a40a6965f50f8c9640, @@ -19167,74 +18895,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2126243156} m_PrefabAsset: {fileID: 0} ---- !u!1001 &2706680471642920534 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1741528481904243288, guid: 580e72e098ea0074795102df8d1f812e, - type: 3} - propertyPath: m_LocalPosition.x - value: 1341.3049 - objectReference: {fileID: 0} - - target: {fileID: 1741528481904243288, guid: 580e72e098ea0074795102df8d1f812e, - type: 3} - propertyPath: m_LocalPosition.y - value: 771.7224 - objectReference: {fileID: 0} - - target: {fileID: 1741528481904243288, guid: 580e72e098ea0074795102df8d1f812e, - type: 3} - propertyPath: m_LocalPosition.z - value: 0.19054106 - objectReference: {fileID: 0} - - target: {fileID: 1741528481904243288, guid: 580e72e098ea0074795102df8d1f812e, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1741528481904243288, guid: 580e72e098ea0074795102df8d1f812e, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1741528481904243288, guid: 580e72e098ea0074795102df8d1f812e, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1741528481904243288, guid: 580e72e098ea0074795102df8d1f812e, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1741528481904243288, guid: 580e72e098ea0074795102df8d1f812e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1741528481904243288, guid: 580e72e098ea0074795102df8d1f812e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1741528481904243288, guid: 580e72e098ea0074795102df8d1f812e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5733440185495106210, guid: 580e72e098ea0074795102df8d1f812e, - type: 3} - propertyPath: m_Name - value: EditableManager - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 580e72e098ea0074795102df8d1f812e, type: 3} --- !u!1001 &7233731901126413131 PrefabInstance: m_ObjectHideFlags: 0 @@ -19562,12 +19222,7 @@ PrefabInstance: SceneRoots: m_ObjectHideFlags: 0 m_Roots: - - {fileID: 31717449} - - {fileID: 1532480746} - - {fileID: 1279118200} - - {fileID: 769057572} - {fileID: 7233731901126413131} - - {fileID: 2706680471642920534} - {fileID: 2021089518} - {fileID: 539242447} - {fileID: 522947464} diff --git a/Assets/Script/Core/ScenesManager.cs b/Assets/Script/Core/ScenesManager.cs index fbc233e..92c77f6 100644 --- a/Assets/Script/Core/ScenesManager.cs +++ b/Assets/Script/Core/ScenesManager.cs @@ -41,11 +41,17 @@ namespace Core public void LoadGameplay(string sceneName) { StartCoroutine(SwitchGameplay(sceneName)); - if (!isLoadGameplayUI) + ReLoadUIScene(); + } + + public void ReLoadUIScene() + { + if (isLoadGameplayUI) { - StartCoroutine(LoadSceneAdditive("UIScene")); - isLoadGameplayUI = true; + StartCoroutine(UnloadScene("UIScene")); } + StartCoroutine(LoadSceneAdditive("UIScene")); + isLoadGameplayUI = true; } private IEnumerator SwitchGameplay(string newScene) diff --git a/Assets/Script/Gameplay/Global/GameFlowManager.cs b/Assets/Script/Gameplay/Global/GameFlowManager.cs index b335857..5320bdd 100644 --- a/Assets/Script/Gameplay/Global/GameFlowManager.cs +++ b/Assets/Script/Gameplay/Global/GameFlowManager.cs @@ -23,7 +23,7 @@ namespace Script.Gameplay.Global private void Start() { _gameCountdownManager = GameCountdownManager.Instance; - _gameCountdownManager.StartLevelTimer(); + GameManager.Instance.OnGameStart += OnGameStart; _gameCountdownManager.OnFinish.AddListener(() => { if (IsOpenRestartGameOnCountdownFinish) @@ -32,11 +32,16 @@ namespace Script.Gameplay.Global ); } + public void OnGameStart() + { + _gameCountdownManager.StartLevelTimer(); + } + public IEnumerator OnCountDown() { StartCoroutine(ScreenGlitchManager.Instance.TriggerGlitchEffect()); yield return new WaitForSeconds(1.0f); - GameManager.Instance.ReStartGameplay(); + GameManager.Instance.StartGameplay(); } } } \ No newline at end of file diff --git a/Assets/Script/Core/GameManager.cs b/Assets/Script/Gameplay/Global/GameManager.cs similarity index 60% rename from Assets/Script/Core/GameManager.cs rename to Assets/Script/Gameplay/Global/GameManager.cs index bb68220..4853d76 100644 --- a/Assets/Script/Core/GameManager.cs +++ b/Assets/Script/Gameplay/Global/GameManager.cs @@ -1,7 +1,7 @@ using System; - -namespace Core +using Core; +namespace Script.Gameplay.Global { public class GameManager : MonoSingleton { @@ -11,10 +11,16 @@ namespace Core ScenesManager.Instance.LoadMainMenu(); } - public void ReStartGameplay() + public void StartGameplay() { ScenesManager.Instance.LoadGameplay("Level1"); OnGameStart?.Invoke(); } + + public void StartTest() + { + ScenesManager.Instance.LoadGameplay("Test"); + OnGameStart?.Invoke(); + } } } \ No newline at end of file diff --git a/Assets/Script/Core/GameManager.cs.meta b/Assets/Script/Gameplay/Global/GameManager.cs.meta similarity index 100% rename from Assets/Script/Core/GameManager.cs.meta rename to Assets/Script/Gameplay/Global/GameManager.cs.meta diff --git a/Assets/Script/Gameplay/Player/PlayerWatchModeController.cs b/Assets/Script/Gameplay/Player/PlayerWatchModeController.cs index 6d57fdf..e408bef 100644 --- a/Assets/Script/Gameplay/Player/PlayerWatchModeController.cs +++ b/Assets/Script/Gameplay/Player/PlayerWatchModeController.cs @@ -3,6 +3,7 @@ using Script.Gameplay.Input; using UnityEngine; using Core; using Script.Gameplay.Global; +using UnityEngine.InputSystem; namespace Script.Gameplay.Player { @@ -34,7 +35,7 @@ namespace Script.Gameplay.Player // 触发退出事件 OnExitWatchMode?.Invoke(previousMode); OnEnterWatchMode?.Invoke(currentMode); - + SwitchWatchMode(currentMode); } } @@ -47,17 +48,19 @@ namespace Script.Gameplay.Player playerConnectController = GetComponent(); var input = inputManager.Input; - input.Player.SwitchWatchMode.performed += ctx => - { - var modeTemp = (WatchMode)(((int)CurrentWatchMode + 1) % Enum.GetNames(typeof(WatchMode)).Length); - CurrentWatchMode = modeTemp; - }; - ; + input.Player.SwitchWatchMode.performed += RegisterInput + ; ControllerLocator.Instance.Register(this); OnEnterWatchMode?.Invoke(currentMode); } + private void RegisterInput(InputAction.CallbackContext ctx) + { + var modeTemp = (WatchMode)(((int)CurrentWatchMode + 1) % Enum.GetNames(typeof(WatchMode)).Length); + CurrentWatchMode = modeTemp; + } + // 实现按Tap键实现在WatchMode 3个模式切换，并通过SwitchWatchMode设置正确的相机模式 private void SwitchWatchMode(WatchMode watchMode) { @@ -78,6 +81,7 @@ namespace Script.Gameplay.Player { playerConnectController.IsEnablePlayerConnecting = false; } + break; case WatchMode.Outside: SetSeeLines(true); @@ -89,7 +93,7 @@ namespace Script.Gameplay.Player { playerInteractorController.SetPlayerInteractionEnabled(true); } - + if (playerConnectController != null) { playerConnectController.IsEnablePlayerConnecting = true; @@ -113,5 +117,13 @@ namespace Script.Gameplay.Player cam.cullingMask = mask; } + + private void OnDestroy() + { + ControllerLocator.Instance.Unregister(this); + + var input = inputManager.Input; + input.Player.SwitchWatchMode.performed -= RegisterInput; + } } } \ No newline at end of file diff --git a/Assets/Script/Gameplay/UI/StartGameButton.cs b/Assets/Script/Gameplay/UI/StartGameButton.cs index a90377f..852d10c 100644 --- a/Assets/Script/Gameplay/UI/StartGameButton.cs +++ b/Assets/Script/Gameplay/UI/StartGameButton.cs @@ -1,16 +1,20 @@ using UnityEngine; using Core; using Script.Gameplay.Input; - +using Script.Gameplay.Global; namespace UI { public class StartGameButton : UIBase { public string levelName = "Level1"; + public void StartGame() { - ScenesManager.Instance.LoadGameplay(levelName); - InputManager.Instance.SetCursorState(false,CursorLockMode.Locked); + if (levelName == "Level1") + GameManager.Instance.StartGameplay(); + else if (levelName == "Test") + GameManager.Instance.StartTest(); + InputManager.Instance.SetCursorState(false, CursorLockMode.Locked); } } } \ No newline at end of file