diff --git a/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/FirstPersonController1.cs b/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/FirstPersonController1.cs index 65e769026a100e61376afc8b77dec6c06247cd7f..1cd851ee230d957c62532ecf308cae5cf364720b 100644 --- a/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/FirstPersonController1.cs +++ b/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/FirstPersonController1.cs @@ -118,6 +118,7 @@ private void OnDisable() input_ControlMapping.Actnmp_HC.Move_Right.Disable(); input_ControlMapping.Actnmp_HC.Move_Forward.Disable(); input_ControlMapping.Actnmp_HC.Move_Backwards.Disable(); + m_MouseLook.disable(); } diff --git a/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/MouseLook1.cs b/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/MouseLook1.cs index 46dfda3db6893e5516a938788af1edc59899d805..f9af9c766cfb0cee17a95b7181f1b87d32ad6a4c 100644 --- a/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/MouseLook1.cs +++ b/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/MouseLook1.cs @@ -56,6 +56,12 @@ private void OnDisable() } + public void disable() + { + input_ControlMapping.Actionmap1.LookCamera.Disable(); + input_ControlMapping.Actnmp_HC.LookCamera.Disable(); + } + diff --git a/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/RigidbodyFirstPersonController1.cs b/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/RigidbodyFirstPersonController1.cs index ad77e0bcaec19d3e16d9f2ed1de258c8a487184c..5aecebdc526da7e68b08494be0a32bacfc611a03 100644 --- a/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/RigidbodyFirstPersonController1.cs +++ b/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/RigidbodyFirstPersonController1.cs @@ -126,6 +126,11 @@ private void Start() mouseLook.Init(transform, cam.transform); } + private void OnDisable() + { + mouseLook.disable(); + } + private void Update() { diff --git a/Assets/Scripts/UI/Characters/ThirdPersonCharacter/Scripts/ThirdPersonMovementScript.cs b/Assets/Scripts/UI/Characters/ThirdPersonCharacter/Scripts/ThirdPersonMovementScript.cs index 0e2f9daa4e9c56f7a27657d4835bf4d8fa5c5db1..be28e278996ce6b35d2716629b424cf9bf6f598e 100644 --- a/Assets/Scripts/UI/Characters/ThirdPersonCharacter/Scripts/ThirdPersonMovementScript.cs +++ b/Assets/Scripts/UI/Characters/ThirdPersonCharacter/Scripts/ThirdPersonMovementScript.cs @@ -52,6 +52,16 @@ private void Start() m_CharacterController = controller; } + private void OnEnable() + { + input_ControlMapping.Actionmap1.Movement.Enable(); + } + + private void OnDisable() + { + input_ControlMapping.Actionmap1.Movement.Disable(); + } + // Update is called once per frame void Update2() { diff --git a/Assets/Scripts/UI/PlayerControls/TestInput.cs b/Assets/Scripts/UI/PlayerControls/TestInput.cs index 1046cb0057164edbe67d4fcf76712d7adeeb7bd9..43a02646b99d75996f19917b365723ebda6841a5 100644 --- a/Assets/Scripts/UI/PlayerControls/TestInput.cs +++ b/Assets/Scripts/UI/PlayerControls/TestInput.cs @@ -25,7 +25,7 @@ private void Awake() } private void OnEnable() { - input_ControlMapping = new ControlMapping(); + //input_ControlMapping = new ControlMapping(); input_ControlMapping.Actionmap1.Movement.Enable();