From 4f0971fcdeb3b17516bf05ca05a0cf132caabc8a Mon Sep 17 00:00:00 2001 From: nachosou Date: Wed, 27 Nov 2024 00:23:14 -0300 Subject: [PATCH] Make sensibility change depending if the player is using mouse or gamepad --- Assets/Scenes/Lvl1.unity | 87 ++++++++++++++++++++ Assets/Scenes/MainMenu.unity | 38 +++++---- Assets/Scenes/SampleScene.unity | 44 +++++----- Assets/Scenes/Tutorial.unity | 127 +++++++++++++++++++++++++++++ Assets/Scripts/InputReader.cs | 13 +-- Assets/Scripts/Player/PlayerCam.cs | 35 +++++--- Assets/Scripts/TutorialHandler.cs | 2 +- 7 files changed, 291 insertions(+), 55 deletions(-) diff --git a/Assets/Scenes/Lvl1.unity b/Assets/Scenes/Lvl1.unity index 14d05fae..050ed26c 100644 --- a/Assets/Scenes/Lvl1.unity +++ b/Assets/Scenes/Lvl1.unity @@ -15200,6 +15200,34 @@ PrefabInstance: propertyPath: m_Name value: EventSystem objectReference: {fileID: 0} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ControlsChangedEvent.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ControlsChangedEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ControlsChangedEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 673801238} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ControlsChangedEvent.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ControlsChangedEvent.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: HandleInputSourceChange + objectReference: {fileID: 0} - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_Target value: @@ -15208,6 +15236,10 @@ PrefabInstance: propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 673801238} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 673801238} - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} propertyPath: m_ActionEvents.Array.data[2].m_PersistentCalls.m_Calls.Array.data[0].m_Target value: @@ -15224,6 +15256,10 @@ PrefabInstance: propertyPath: m_ActionEvents.Array.data[7].m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 673801238} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: HandleMoveInput @@ -15232,6 +15268,10 @@ PrefabInstance: propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: HandleCameraMoveInput objectReference: {fileID: 0} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: HandleInputSourceChange + objectReference: {fileID: 0} - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} propertyPath: m_ActionEvents.Array.data[2].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: HandleGrapplingInput @@ -15248,6 +15288,26 @@ PrefabInstance: propertyPath: m_ActionEvents.Array.data[7].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: HandleUIGamepadNavigation objectReference: {fileID: 0} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ControlsChangedEvent.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: InputReader, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: InputReader, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgument + value: + objectReference: {fileID: 1556027944} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ControlsChangedEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.InputSystem.PlayerInput, Unity.InputSystem + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -15264,6 +15324,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e754ea0d13a356c47af1788d44d9af61, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1556027944 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + m_PrefabInstance: {fileID: 1556027942} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1568897030 GameObject: m_ObjectHideFlags: 0 @@ -18410,6 +18481,14 @@ PrefabInstance: propertyPath: m_Layer value: 7 objectReference: {fileID: 0} + - target: {fileID: 553295087181340520, guid: a0f9c786e09cd4e42ad87b91a3fffd4b, type: 3} + propertyPath: mouseSensX + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 553295087181340520, guid: a0f9c786e09cd4e42ad87b91a3fffd4b, type: 3} + propertyPath: mouseSensY + value: 7 + objectReference: {fileID: 0} - target: {fileID: 553295087181340520, guid: a0f9c786e09cd4e42ad87b91a3fffd4b, type: 3} propertyPath: inputReader value: @@ -18418,6 +18497,14 @@ PrefabInstance: propertyPath: orientation value: objectReference: {fileID: 916150099} + - target: {fileID: 553295087181340520, guid: a0f9c786e09cd4e42ad87b91a3fffd4b, type: 3} + propertyPath: gamepadSensX + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 553295087181340520, guid: a0f9c786e09cd4e42ad87b91a3fffd4b, type: 3} + propertyPath: gamepadSensY + value: 150 + objectReference: {fileID: 0} - target: {fileID: 553295087181340520, guid: a0f9c786e09cd4e42ad87b91a3fffd4b, type: 3} propertyPath: wallRunningScript value: diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index fbf065cf..c0b598d7 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -218,11 +218,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 652070716686612456, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 652070716686612456, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 659031239963549684, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -268,17 +268,21 @@ PrefabInstance: propertyPath: m_Name value: OptionsCanvas objectReference: {fileID: 0} + - target: {fileID: 1317585627519574524, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1921533365511377330, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 1921533365511377330, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1921533365511377330, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2370818481389175330, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_Pivot.x @@ -362,15 +366,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3070592249464744974, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 3070592249464744974, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3070592249464744974, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 3201740919334352526, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_Colors.m_SelectedColor.a @@ -442,23 +446,23 @@ PrefabInstance: objectReference: {fileID: 626973800678644904} - target: {fileID: 4653016998702634255, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 4653016998702634255, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4653016998702634255, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 4904849593354789773, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4904849593354789773, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5091548149368922315, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_Colors.m_SelectedColor.a @@ -498,15 +502,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5387574960012255620, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMax.y - value: 0.81333333 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5963159275655959951, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5963159275655959951, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6839651418226792780, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_TargetGraphic @@ -590,7 +594,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8206059658610235428, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: -17 objectReference: {fileID: 0} - target: {fileID: 8897113341571786865, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_Colors.m_SelectedColor.a diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 67baef38..94117479 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -1469,11 +1469,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 652070716686612456, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 652070716686612456, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1317585627519574524, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_Name @@ -1481,19 +1481,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1317585627519574524, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1921533365511377330, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 1921533365511377330, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1921533365511377330, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2370818481389175330, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_Pivot.x @@ -1577,35 +1577,35 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3070592249464744974, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 3070592249464744974, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3070592249464744974, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 4653016998702634255, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 4653016998702634255, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4653016998702634255, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 4904849593354789773, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4904849593354789773, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4904849593354789773, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchoredPosition.x @@ -1613,27 +1613,31 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5387574960012255620, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5387574960012255620, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 0.81333333 objectReference: {fileID: 0} - target: {fileID: 5963159275655959951, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5963159275655959951, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8206059658610235428, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8206059658610235428, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8206059658610235428, guid: 2e91fb8864ba8aa4fbd09df40afc1fcc, type: 3} + propertyPath: m_SizeDelta.x + value: -17 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] diff --git a/Assets/Scenes/Tutorial.unity b/Assets/Scenes/Tutorial.unity index 9edf87ac..5a64446f 100644 --- a/Assets/Scenes/Tutorial.unity +++ b/Assets/Scenes/Tutorial.unity @@ -5111,6 +5111,14 @@ PrefabInstance: propertyPath: playerTransform value: objectReference: {fileID: 2043342735} + - target: {fileID: 553295087181340520, guid: a0f9c786e09cd4e42ad87b91a3fffd4b, type: 3} + propertyPath: mouseSensX + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 553295087181340520, guid: a0f9c786e09cd4e42ad87b91a3fffd4b, type: 3} + propertyPath: mouseSensY + value: 10 + objectReference: {fileID: 0} - target: {fileID: 553295087181340520, guid: a0f9c786e09cd4e42ad87b91a3fffd4b, type: 3} propertyPath: inputReader value: @@ -5119,6 +5127,14 @@ PrefabInstance: propertyPath: orientation value: objectReference: {fileID: 1648786769} + - target: {fileID: 553295087181340520, guid: a0f9c786e09cd4e42ad87b91a3fffd4b, type: 3} + propertyPath: gamepadSensX + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 553295087181340520, guid: a0f9c786e09cd4e42ad87b91a3fffd4b, type: 3} + propertyPath: gamepadSensY + value: 150 + objectReference: {fileID: 0} - target: {fileID: 553295087181340520, guid: a0f9c786e09cd4e42ad87b91a3fffd4b, type: 3} propertyPath: wallRunningScript value: @@ -7560,6 +7576,10 @@ PrefabInstance: propertyPath: m_DefaultActionMap value: Player objectReference: {fileID: 0} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ControlsChangedEvent.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.size value: 1 @@ -7580,10 +7600,42 @@ PrefabInstance: propertyPath: m_ActionEvents.Array.data[4].m_PersistentCalls.m_Calls.Array.size value: 1 objectReference: {fileID: 0} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ActionEvents.Array.data[5].m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} propertyPath: m_ActionEvents.Array.data[7].m_PersistentCalls.m_Calls.Array.size value: 1 objectReference: {fileID: 0} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ControlsChangedEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ControlsChangedEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1828380641} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ControlsChangedEvent.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ActionEvents.Array.data[5].m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ControlsChangedEvent.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: HandleInputSourceChange + objectReference: {fileID: 0} - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_Target value: @@ -7592,6 +7644,10 @@ PrefabInstance: propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 1828380641} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 1828380641} - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} propertyPath: m_ActionEvents.Array.data[2].m_PersistentCalls.m_Calls.Array.data[0].m_Target value: @@ -7604,6 +7660,10 @@ PrefabInstance: propertyPath: m_ActionEvents.Array.data[4].m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 1828380641} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ActionEvents.Array.data[5].m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1828380641} - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} propertyPath: m_ActionEvents.Array.data[7].m_PersistentCalls.m_Calls.Array.data[0].m_Target value: @@ -7612,10 +7672,18 @@ PrefabInstance: propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 objectReference: {fileID: 0} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 objectReference: {fileID: 0} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} propertyPath: m_ActionEvents.Array.data[2].m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 @@ -7628,6 +7696,10 @@ PrefabInstance: propertyPath: m_ActionEvents.Array.data[4].m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 objectReference: {fileID: 0} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ActionEvents.Array.data[5].m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} propertyPath: m_ActionEvents.Array.data[7].m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 @@ -7640,6 +7712,10 @@ PrefabInstance: propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: HandleCameraMoveInput objectReference: {fileID: 0} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: HandleInputSourceChange + objectReference: {fileID: 0} - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} propertyPath: m_ActionEvents.Array.data[2].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: HandleGrapplingInput @@ -7652,18 +7728,34 @@ PrefabInstance: propertyPath: m_ActionEvents.Array.data[4].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: HandlePauseInput objectReference: {fileID: 0} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ActionEvents.Array.data[5].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: HandleInputSourceChange + objectReference: {fileID: 0} - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} propertyPath: m_ActionEvents.Array.data[7].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: HandleUIGamepadNavigation objectReference: {fileID: 0} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ControlsChangedEvent.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: InputReader, Assembly-CSharp + objectReference: {fileID: 0} - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName value: InputReader, Assembly-CSharp objectReference: {fileID: 0} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: InputReader, Assembly-CSharp + objectReference: {fileID: 0} - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName value: InputReader, Assembly-CSharp objectReference: {fileID: 0} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: InputReader, Assembly-CSharp + objectReference: {fileID: 0} - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} propertyPath: m_ActionEvents.Array.data[2].m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName value: InputReader, Assembly-CSharp @@ -7676,10 +7768,26 @@ PrefabInstance: propertyPath: m_ActionEvents.Array.data[4].m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName value: InputReader, Assembly-CSharp objectReference: {fileID: 0} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ActionEvents.Array.data[5].m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: InputReader, Assembly-CSharp + objectReference: {fileID: 0} - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} propertyPath: m_ActionEvents.Array.data[7].m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName value: InputReader, Assembly-CSharp objectReference: {fileID: 0} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgument + value: + objectReference: {fileID: 1964229413} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ActionEvents.Array.data[5].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument + value: + objectReference: {fileID: 1964229413} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ControlsChangedEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine @@ -7688,6 +7796,10 @@ PrefabInstance: propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.InputSystem.PlayerInput, Unity.InputSystem + objectReference: {fileID: 0} - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} propertyPath: m_ActionEvents.Array.data[2].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine @@ -7700,6 +7812,10 @@ PrefabInstance: propertyPath: m_ActionEvents.Array.data[4].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + propertyPath: m_ActionEvents.Array.data[5].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.InputSystem.PlayerInput, Unity.InputSystem + objectReference: {fileID: 0} - target: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} propertyPath: m_ActionEvents.Array.data[7].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine @@ -7720,6 +7836,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e754ea0d13a356c47af1788d44d9af61, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1964229413 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6003616627403902767, guid: 1a8ed4b495b4b0a49aa9b00be6a03994, type: 3} + m_PrefabInstance: {fileID: 1964229411} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &1979312001 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2827479063076285036, guid: 2b71b9cc9b74c434faa48c2dc74af636, type: 3} diff --git a/Assets/Scripts/InputReader.cs b/Assets/Scripts/InputReader.cs index 577d2be3..8fdb5b47 100644 --- a/Assets/Scripts/InputReader.cs +++ b/Assets/Scripts/InputReader.cs @@ -4,6 +4,9 @@ public class InputReader : MonoBehaviour { + public string gamepad = "Gamepad"; + public string keyboardAndMouse = "Keyboard&Mouse"; + public Action OnJump; public Action OnGrappling; public Action OnMove; @@ -12,7 +15,7 @@ public class InputReader : MonoBehaviour public Action OnExitGame; public Action OnMoveCamera; public Action OnNavigation; - public static bool isUsingController = false; + public Action OnInputSourceChange; public void HandleUIGamepadNavigation(InputAction.CallbackContext context) { @@ -21,13 +24,13 @@ public void HandleUIGamepadNavigation(InputAction.CallbackContext context) public void HandleInputSourceChange(PlayerInput context) { - if (context.devices[0] is Mouse || context.devices[0] is Keyboard) + if (context.currentControlScheme.Equals(keyboardAndMouse)) { - isUsingController = false; + OnInputSourceChange?.Invoke(false); } - else if (context.devices[0] is Gamepad) + else if (context.currentControlScheme.Equals(gamepad)) { - isUsingController = true; + OnInputSourceChange?.Invoke(true); } } diff --git a/Assets/Scripts/Player/PlayerCam.cs b/Assets/Scripts/Player/PlayerCam.cs index bb6a6b22..8ff1135a 100644 --- a/Assets/Scripts/Player/PlayerCam.cs +++ b/Assets/Scripts/Player/PlayerCam.cs @@ -2,24 +2,28 @@ public class PlayerCam : MonoBehaviour { - public float sensX; - public float sensY; + private float sensX; + private float sensY; - public float sensMultiplyer = 10; + public float mouseSensX; + public float mouseSensY; + + public float gamepadSensX; + public float gamepadSensY; public Transform orientation; [SerializeField] WallRunning wallRunningScript; - float xRotation; - float yRotation; + private float xRotation; + private float yRotation; public float tiltAngle; public float tiltSpeed; private float currentTilt; public float rotationClamp = 90; - Vector2 mouse; + private Vector2 mouse; [SerializeField] private InputReader inputReader; @@ -32,16 +36,21 @@ private void Start() { Cursor.lockState = CursorLockMode.Locked; Cursor.visible = false; + + sensX = mouseSensX; + sensY = mouseSensY; } private void OnEnable() { inputReader.OnMoveCamera += AttemptCameraMove; + inputReader.OnInputSourceChange += ChangeSensDependingOnInputSource; } private void OnDisable() { inputReader.OnMoveCamera -= AttemptCameraMove; + inputReader.OnInputSourceChange -= ChangeSensDependingOnInputSource; } private void Update() @@ -55,17 +64,19 @@ private void Update() orientation.rotation = Quaternion.Euler(0, yRotation, WallRunTilt()); } - private void ChangeSensDependingOnInputSource() + private void ChangeSensDependingOnInputSource(bool isController) { - if (InputReader.isUsingController) + Debug.Log(isController); + + if (isController) { - sensX /= sensMultiplyer; - sensY /= sensMultiplyer; + sensX = gamepadSensX; + sensY = gamepadSensY; } else { - sensX *= sensMultiplyer; - sensY *= sensMultiplyer; + sensX = mouseSensX; + sensY = mouseSensY; } } diff --git a/Assets/Scripts/TutorialHandler.cs b/Assets/Scripts/TutorialHandler.cs index 4ce99b9b..b1be78a2 100644 --- a/Assets/Scripts/TutorialHandler.cs +++ b/Assets/Scripts/TutorialHandler.cs @@ -3,7 +3,7 @@ public class TutorialHandler : MonoBehaviour { [SerializeField] private GameObject tutorialCanvas; - private float tutorialCoolDown = 0.2f; + private float tutorialCoolDown = 0.1f; private void Start() {