From eff296926c1fc4a74ca9564790f3123d83fe5b97 Mon Sep 17 00:00:00 2001 From: Playmaker1210 Date: Wed, 14 Jun 2023 16:27:21 +0200 Subject: [PATCH] new input system working --- Assets/Input/InputMaster.cs | 81 ++ Assets/Input/InputMaster.inputactions | 28 + Assets/Scenes/Test.unity | 1047 ++++++++++++------------- Assets/Scripts/Quit.cs | 10 - Assets/Scripts/Quit.cs.meta | 11 - Assets/Scripts/WheelController.cs | 30 +- ProjectSettings/ProjectSettings.asset | 2 +- 7 files changed, 652 insertions(+), 557 deletions(-) delete mode 100644 Assets/Scripts/Quit.cs delete mode 100644 Assets/Scripts/Quit.cs.meta diff --git a/Assets/Input/InputMaster.cs b/Assets/Input/InputMaster.cs index 497fcae..6e88765 100644 --- a/Assets/Input/InputMaster.cs +++ b/Assets/Input/InputMaster.cs @@ -211,6 +211,34 @@ public partial class @InputMaster: IInputActionCollection2, IDisposable ""isPartOfComposite"": false } ] + }, + { + ""name"": ""Quit"", + ""id"": ""438f3b6d-0c7f-4b9a-8ad9-e9f579d301c1"", + ""actions"": [ + { + ""name"": ""Quit"", + ""type"": ""Button"", + ""id"": ""70626aec-c0b2-4b69-8178-0cf47115bc24"", + ""expectedControlType"": ""Button"", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": false + } + ], + ""bindings"": [ + { + ""name"": """", + ""id"": ""a9d6f446-7259-4075-aa28-d6c782ee269a"", + ""path"": ""/escape"", + ""interactions"": """", + ""processors"": """", + ""groups"": """", + ""action"": ""Quit"", + ""isComposite"": false, + ""isPartOfComposite"": false + } + ] } ], ""controlSchemes"": [ @@ -248,6 +276,9 @@ public partial class @InputMaster: IInputActionCollection2, IDisposable m_Car_Movement = m_Car.FindAction("Movement", throwIfNotFound: true); m_Car_Turn = m_Car.FindAction("Turn", throwIfNotFound: true); m_Car_Brake = m_Car.FindAction("Brake", throwIfNotFound: true); + // Quit + m_Quit = asset.FindActionMap("Quit", throwIfNotFound: true); + m_Quit_Quit = m_Quit.FindAction("Quit", throwIfNotFound: true); } public void Dispose() @@ -367,6 +398,52 @@ public partial class @InputMaster: IInputActionCollection2, IDisposable } } public CarActions @Car => new CarActions(this); + + // Quit + private readonly InputActionMap m_Quit; + private List m_QuitActionsCallbackInterfaces = new List(); + private readonly InputAction m_Quit_Quit; + public struct QuitActions + { + private @InputMaster m_Wrapper; + public QuitActions(@InputMaster wrapper) { m_Wrapper = wrapper; } + public InputAction @Quit => m_Wrapper.m_Quit_Quit; + public InputActionMap Get() { return m_Wrapper.m_Quit; } + public void Enable() { Get().Enable(); } + public void Disable() { Get().Disable(); } + public bool enabled => Get().enabled; + public static implicit operator InputActionMap(QuitActions set) { return set.Get(); } + public void AddCallbacks(IQuitActions instance) + { + if (instance == null || m_Wrapper.m_QuitActionsCallbackInterfaces.Contains(instance)) return; + m_Wrapper.m_QuitActionsCallbackInterfaces.Add(instance); + @Quit.started += instance.OnQuit; + @Quit.performed += instance.OnQuit; + @Quit.canceled += instance.OnQuit; + } + + private void UnregisterCallbacks(IQuitActions instance) + { + @Quit.started -= instance.OnQuit; + @Quit.performed -= instance.OnQuit; + @Quit.canceled -= instance.OnQuit; + } + + public void RemoveCallbacks(IQuitActions instance) + { + if (m_Wrapper.m_QuitActionsCallbackInterfaces.Remove(instance)) + UnregisterCallbacks(instance); + } + + public void SetCallbacks(IQuitActions instance) + { + foreach (var item in m_Wrapper.m_QuitActionsCallbackInterfaces) + UnregisterCallbacks(item); + m_Wrapper.m_QuitActionsCallbackInterfaces.Clear(); + AddCallbacks(instance); + } + } + public QuitActions @Quit => new QuitActions(this); private int m_GamepadSchemeIndex = -1; public InputControlScheme GamepadScheme { @@ -391,4 +468,8 @@ public partial class @InputMaster: IInputActionCollection2, IDisposable void OnTurn(InputAction.CallbackContext context); void OnBrake(InputAction.CallbackContext context); } + public interface IQuitActions + { + void OnQuit(InputAction.CallbackContext context); + } } diff --git a/Assets/Input/InputMaster.inputactions b/Assets/Input/InputMaster.inputactions index f962b28..084228b 100644 --- a/Assets/Input/InputMaster.inputactions +++ b/Assets/Input/InputMaster.inputactions @@ -189,6 +189,34 @@ "isPartOfComposite": false } ] + }, + { + "name": "Quit", + "id": "438f3b6d-0c7f-4b9a-8ad9-e9f579d301c1", + "actions": [ + { + "name": "Quit", + "type": "Button", + "id": "70626aec-c0b2-4b69-8178-0cf47115bc24", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + } + ], + "bindings": [ + { + "name": "", + "id": "a9d6f446-7259-4075-aa28-d6c782ee269a", + "path": "/escape", + "interactions": "", + "processors": "", + "groups": "", + "action": "Quit", + "isComposite": false, + "isPartOfComposite": false + } + ] } ], "controlSchemes": [ diff --git a/Assets/Scenes/Test.unity b/Assets/Scenes/Test.unity index c4d4d3a..4e5db0f 100644 --- a/Assets/Scenes/Test.unity +++ b/Assets/Scenes/Test.unity @@ -123,6 +123,85 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &75429420 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 75429422} + - component: {fileID: 75429421} + m_Layer: 0 + m_Name: MiddleRig + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &75429421 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 75429420} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + - Header + - Extensions + - m_Priority + - m_Transitions + - m_Follow + - m_StandbyUpdate + - m_Lens + m_LockStageInInspector: 00000000 + m_StreamingVersion: 20170927 + m_Priority: 10 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 0} + m_Follow: {fileID: 0} + m_Lens: + FieldOfView: 60 + OrthographicSize: 10 + NearClipPlane: 0.1 + FarClipPlane: 5000 + Dutch: 0 + ModeOverride: 0 + LensShift: {x: 0, y: 0} + GateFit: 2 + FocusDistance: 10 + m_SensorSize: {x: 1, y: 1} + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 + m_ComponentOwner: {fileID: 908681781} +--- !u!4 &75429422 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 75429420} + m_LocalRotation: {x: 0.16071762, y: 0.000000008491354, z: -0.0000000013826846, w: 0.98700047} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 908681781} + m_Father: {fileID: 2002302909} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &169305935 GameObject: m_ObjectHideFlags: 0 @@ -444,7 +523,6 @@ GameObject: - component: {fileID: 330585544} - component: {fileID: 330585547} - component: {fileID: 330585548} - - component: {fileID: 330585549} - component: {fileID: 330585550} m_Layer: 0 m_Name: Main Camera @@ -519,8 +597,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 330585543} - m_LocalRotation: {x: 0.18910752, y: 0, z: 0, w: 0.9819564} - m_LocalPosition: {x: -1.3821344, y: 9.9834175, z: -20.275475} + m_LocalRotation: {x: 0.16071767, y: 0.000000042456765, z: -0.0000000069134227, w: 0.98700047} + m_LocalPosition: {x: 2.6789722, y: 8.023036, z: -20.5378} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -605,18 +683,6 @@ MonoBehaviour: m_CameraActivatedEvent: m_PersistentCalls: m_Calls: [] ---- !u!114 &330585549 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 330585543} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bcd90519abd2eaa47ab4e721bdbe12c8, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &330585550 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1021,289 +1087,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 641528072} m_CullTransparentMesh: 1 ---- !u!1 &693516888 -GameObject: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 693516889} - - component: {fileID: 693516892} - - component: {fileID: 693516891} - - component: {fileID: 693516890} - m_Layer: 0 - m_Name: cm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &693516889 -Transform: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 693516888} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1063055266} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &693516890 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 693516888} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0 - m_VerticalDamping: 0 - m_ScreenX: 0.5 - m_ScreenY: 0.5 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 ---- !u!114 &693516891 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 693516888} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_BindingMode: 4 - m_FollowOffset: {x: 0, y: 5.8, z: -14.5} - m_XDamping: 1 - m_YDamping: 1 - m_ZDamping: 1 - m_AngularDampingMode: 0 - m_PitchDamping: 0 - m_YawDamping: 0 - m_RollDamping: 0 - m_AngularDamping: 0 - m_Heading: - m_Definition: 2 - m_VelocityFilterStrength: 4 - m_Bias: 0 - m_RecenterToTargetHeading: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_XAxis: - Value: 0 - m_SpeedMode: 0 - m_MaxSpeed: 300 - m_AccelTime: 0.1 - m_DecelTime: 0.1 - m_InputAxisName: - m_InputAxisValue: 0 - m_InvertInput: 1 - m_MinValue: -180 - m_MaxValue: 180 - m_Wrap: 1 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_LegacyRadius: 3.4028235e+38 - m_LegacyHeightOffset: 3.4028235e+38 - m_LegacyHeadingBias: 3.4028235e+38 - m_HeadingIsSlave: 1 ---- !u!114 &693516892 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 693516888} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &716651844 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 716651846} - - component: {fileID: 716651845} - - component: {fileID: 716651847} - m_Layer: 0 - m_Name: CarFollow - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &716651845 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 716651844} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 319d2fe34a804e245819465c9505ea59, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - m_LockStageInInspector: - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_CommonLens: 1 - m_Lens: - FieldOfView: 60 - OrthographicSize: 10 - NearClipPlane: 0.1 - FarClipPlane: 5000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - FocusDistance: 10 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_YAxis: - Value: 0.5 - m_SpeedMode: 0 - m_MaxSpeed: 2 - m_AccelTime: 0.2 - m_DecelTime: 0.1 - m_InputAxisName: Mouse Y - m_InputAxisValue: 0 - m_InvertInput: 0 - m_MinValue: 0 - m_MaxValue: 1 - m_Wrap: 0 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_YAxisRecentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_XAxis: - Value: 0 - m_SpeedMode: 0 - m_MaxSpeed: 300 - m_AccelTime: 0.1 - m_DecelTime: 0.1 - m_InputAxisName: Mouse X - m_InputAxisValue: 0 - m_InvertInput: 0 - m_MinValue: -180 - m_MaxValue: 180 - m_Wrap: 1 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_Heading: - m_Definition: 2 - m_VelocityFilterStrength: 4 - m_Bias: 0 - m_RecenterToTargetHeading: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_BindingMode: 4 - m_SplineCurvature: 0.2 - m_Orbits: - - m_Height: 4.18 - m_Radius: 8.82 - - m_Height: 5.8 - m_Radius: 14.5 - - m_Height: 0.4 - m_Radius: 2.21 - m_LegacyHeadingBias: 3.4028235e+38 - m_Rigs: - - {fileID: 1063055265} - - {fileID: 1280128311} - - {fileID: 1475882127} ---- !u!4 &716651846 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 716651844} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.3821344, y: 8.47, z: -14.203237} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1063055266} - - {fileID: 1280128312} - - {fileID: 1475882128} - m_Father: {fileID: 0} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &716651847 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 716651844} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 44d70cc20219cd84593f67d248eafe36, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Offset: {x: 0, y: -0.85, z: -6.2} - m_ApplyAfter: 1 - m_PreserveComposition: 0 --- !u!1 &744704368 GameObject: m_ObjectHideFlags: 0 @@ -1391,7 +1174,7 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &905580687 +--- !u!1 &908681780 GameObject: m_ObjectHideFlags: 3 m_CorrespondingSourceObject: {fileID: 0} @@ -1399,10 +1182,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 905580688} - - component: {fileID: 905580691} - - component: {fileID: 905580690} - - component: {fileID: 905580689} + - component: {fileID: 908681781} + - component: {fileID: 908681784} + - component: {fileID: 908681783} + - component: {fileID: 908681782} m_Layer: 0 m_Name: cm m_TagString: Untagged @@ -1410,28 +1193,28 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &905580688 +--- !u!4 &908681781 Transform: m_ObjectHideFlags: 3 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 905580687} + m_GameObject: {fileID: 908681780} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1475882128} - m_RootOrder: 0 + m_Father: {fileID: 75429422} + m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &905580689 +--- !u!114 &908681782 MonoBehaviour: m_ObjectHideFlags: 3 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 905580687} + m_GameObject: {fileID: 908681780} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} @@ -1444,7 +1227,7 @@ MonoBehaviour: m_HorizontalDamping: 0 m_VerticalDamping: 0 m_ScreenX: 0.5 - m_ScreenY: 0.6 + m_ScreenY: 0.55 m_DeadZoneWidth: 0 m_DeadZoneHeight: 0 m_SoftZoneWidth: 0.8 @@ -1452,13 +1235,13 @@ MonoBehaviour: m_BiasX: 0 m_BiasY: 0 m_CenterOnActivate: 1 ---- !u!114 &905580690 +--- !u!114 &908681783 MonoBehaviour: m_ObjectHideFlags: 3 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 905580687} + m_GameObject: {fileID: 908681780} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} @@ -1506,13 +1289,13 @@ MonoBehaviour: m_LegacyHeightOffset: 3.4028235e+38 m_LegacyHeadingBias: 3.4028235e+38 m_HeadingIsSlave: 1 ---- !u!114 &905580691 +--- !u!114 &908681784 MonoBehaviour: m_ObjectHideFlags: 3 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 905580687} + m_GameObject: {fileID: 908681780} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} @@ -1591,85 +1374,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8a97cc7d459762945ab8e9f6ae4bac33, type: 3} ---- !u!1 &1063055264 -GameObject: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1063055266} - - component: {fileID: 1063055265} - m_Layer: 0 - m_Name: TopRig - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1063055265 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1063055264} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - - Header - - Extensions - - m_Priority - - m_Transitions - - m_Follow - - m_StandbyUpdate - - m_Lens - m_LockStageInInspector: 00000000 - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_Lens: - FieldOfView: 60 - OrthographicSize: 10 - NearClipPlane: 0.1 - FarClipPlane: 5000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - FocusDistance: 10 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 693516889} ---- !u!4 &1063055266 -Transform: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1063055264} - m_LocalRotation: {x: 0.18910752, y: -1e-45, z: -0, w: 0.9819564} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 693516889} - m_Father: {fileID: 716651846} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1105409192 GameObject: m_ObjectHideFlags: 0 @@ -1708,6 +1412,85 @@ RectTransform: m_AnchoredPosition: {x: -366.1421, y: 347.95847} m_SizeDelta: {x: 244.1437, y: 73.9168} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1237188360 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1237188362} + - component: {fileID: 1237188361} + m_Layer: 0 + m_Name: BottomRig + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1237188361 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1237188360} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + - Header + - Extensions + - m_Priority + - m_Transitions + - m_Follow + - m_StandbyUpdate + - m_Lens + m_LockStageInInspector: 00000000 + m_StreamingVersion: 20170927 + m_Priority: 10 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 0} + m_Follow: {fileID: 0} + m_Lens: + FieldOfView: 60 + OrthographicSize: 10 + NearClipPlane: 0.1 + FarClipPlane: 5000 + Dutch: 0 + ModeOverride: 0 + LensShift: {x: 0, y: 0} + GateFit: 2 + FocusDistance: 10 + m_SensorSize: {x: 1, y: 1} + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 + m_ComponentOwner: {fileID: 1547012892} +--- !u!4 &1237188362 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1237188360} + m_LocalRotation: {x: 0.13238297, y: -0.000000019068002, z: 0.0000000025466933, w: 0.99119866} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1547012892} + m_Father: {fileID: 2002302909} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1249082955 GameObject: m_ObjectHideFlags: 0 @@ -1843,7 +1626,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1249082955} m_CullTransparentMesh: 1 ---- !u!1 &1280128310 +--- !u!1 &1375743168 GameObject: m_ObjectHideFlags: 3 m_CorrespondingSourceObject: {fileID: 0} @@ -1851,22 +1634,22 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1280128312} - - component: {fileID: 1280128311} + - component: {fileID: 1375743170} + - component: {fileID: 1375743169} m_Layer: 0 - m_Name: MiddleRig + m_Name: TopRig m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1280128311 +--- !u!114 &1375743169 MonoBehaviour: m_ObjectHideFlags: 3 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1280128310} + m_GameObject: {fileID: 1375743168} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} @@ -1905,22 +1688,22 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 1594060432} ---- !u!4 &1280128312 + m_ComponentOwner: {fileID: 1961085164} +--- !u!4 &1375743170 Transform: m_ObjectHideFlags: 3 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1280128310} - m_LocalRotation: {x: 0.18910752, y: 1e-45, z: -0, w: 0.9819564} + m_GameObject: {fileID: 1375743168} + m_LocalRotation: {x: 0.18910752, y: -0, z: -0, w: 0.9819564} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1594060432} - m_Father: {fileID: 716651846} - m_RootOrder: 1 + - {fileID: 1961085164} + m_Father: {fileID: 2002302909} + m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1432360283 GameObject: @@ -2057,85 +1840,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1432360283} m_CullTransparentMesh: 1 ---- !u!1 &1475882126 -GameObject: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1475882128} - - component: {fileID: 1475882127} - m_Layer: 0 - m_Name: BottomRig - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1475882127 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1475882126} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - - Header - - Extensions - - m_Priority - - m_Transitions - - m_Follow - - m_StandbyUpdate - - m_Lens - m_LockStageInInspector: 00000000 - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_Lens: - FieldOfView: 60 - OrthographicSize: 10 - NearClipPlane: 0.1 - FarClipPlane: 5000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - FocusDistance: 10 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 905580688} ---- !u!4 &1475882128 -Transform: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1475882126} - m_LocalRotation: {x: 0.13238297, y: 0.000000019068002, z: -0.0000000025466933, w: 0.99119866} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 905580688} - m_Father: {fileID: 716651846} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1509071307 GameObject: m_ObjectHideFlags: 0 @@ -2241,7 +1945,7 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1594060431 +--- !u!1 &1547012891 GameObject: m_ObjectHideFlags: 3 m_CorrespondingSourceObject: {fileID: 0} @@ -2249,10 +1953,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1594060432} - - component: {fileID: 1594060435} - - component: {fileID: 1594060434} - - component: {fileID: 1594060436} + - component: {fileID: 1547012892} + - component: {fileID: 1547012895} + - component: {fileID: 1547012894} + - component: {fileID: 1547012893} m_Layer: 0 m_Name: cm m_TagString: Untagged @@ -2260,28 +1964,55 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1594060432 +--- !u!4 &1547012892 Transform: m_ObjectHideFlags: 3 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1594060431} + m_GameObject: {fileID: 1547012891} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1280128312} - m_RootOrder: 0 + m_Father: {fileID: 1237188362} + m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1594060434 +--- !u!114 &1547012893 MonoBehaviour: m_ObjectHideFlags: 3 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1594060431} + m_GameObject: {fileID: 1547012891} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackedObjectOffset: {x: 0, y: 0, z: 0} + m_LookaheadTime: 0 + m_LookaheadSmoothing: 0 + m_LookaheadIgnoreY: 0 + m_HorizontalDamping: 0 + m_VerticalDamping: 0 + m_ScreenX: 0.5 + m_ScreenY: 0.6 + m_DeadZoneWidth: 0 + m_DeadZoneHeight: 0 + m_SoftZoneWidth: 0.8 + m_SoftZoneHeight: 0.8 + m_BiasX: 0 + m_BiasY: 0 + m_CenterOnActivate: 1 +--- !u!114 &1547012894 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1547012891} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} @@ -2329,45 +2060,18 @@ MonoBehaviour: m_LegacyHeightOffset: 3.4028235e+38 m_LegacyHeadingBias: 3.4028235e+38 m_HeadingIsSlave: 1 ---- !u!114 &1594060435 +--- !u!114 &1547012895 MonoBehaviour: m_ObjectHideFlags: 3 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1594060431} + m_GameObject: {fileID: 1547012891} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1594060436 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1594060431} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0.5 - m_VerticalDamping: 0.5 - m_ScreenX: 0.5 - m_ScreenY: 0.5 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 --- !u!1 &1735399694 GameObject: m_ObjectHideFlags: 0 @@ -2434,8 +2138,14 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &1759726179 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6295450445658667873, guid: 8a97cc7d459762945ab8e9f6ae4bac33, + type: 3} + m_PrefabInstance: {fileID: 1017951274} + m_PrefabAsset: {fileID: 0} --- !u!1 &1838563707 GameObject: m_ObjectHideFlags: 0 @@ -2571,6 +2281,133 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1838563707} m_CullTransparentMesh: 1 +--- !u!1 &1961085163 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1961085164} + - component: {fileID: 1961085167} + - component: {fileID: 1961085166} + - component: {fileID: 1961085165} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1961085164 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1961085163} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1375743170} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1961085165 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1961085163} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackedObjectOffset: {x: 0, y: 0, z: 0} + m_LookaheadTime: 0 + m_LookaheadSmoothing: 0 + m_LookaheadIgnoreY: 0 + m_HorizontalDamping: 0 + m_VerticalDamping: 0 + m_ScreenX: 0.5 + m_ScreenY: 0.5 + m_DeadZoneWidth: 0 + m_DeadZoneHeight: 0 + m_SoftZoneWidth: 0.8 + m_SoftZoneHeight: 0.8 + m_BiasX: 0 + m_BiasY: 0 + m_CenterOnActivate: 1 +--- !u!114 &1961085166 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1961085163} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_BindingMode: 4 + m_FollowOffset: {x: 0, y: 5.8, z: -14.5} + m_XDamping: 1 + m_YDamping: 1 + m_ZDamping: 1 + m_AngularDampingMode: 0 + m_PitchDamping: 0 + m_YawDamping: 0 + m_RollDamping: 0 + m_AngularDamping: 0 + m_Heading: + m_Definition: 2 + m_VelocityFilterStrength: 4 + m_Bias: 0 + m_RecenterToTargetHeading: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_XAxis: + Value: 0 + m_SpeedMode: 0 + m_MaxSpeed: 300 + m_AccelTime: 0.1 + m_DecelTime: 0.1 + m_InputAxisName: + m_InputAxisValue: 0 + m_InvertInput: 1 + m_MinValue: -180 + m_MaxValue: 180 + m_Wrap: 1 + m_Recentering: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_LegacyRadius: 3.4028235e+38 + m_LegacyHeightOffset: 3.4028235e+38 + m_LegacyHeadingBias: 3.4028235e+38 + m_HeadingIsSlave: 1 +--- !u!114 &1961085167 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1961085163} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1962769952 GameObject: m_ObjectHideFlags: 0 @@ -2706,6 +2543,162 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1962769952} m_CullTransparentMesh: 1 +--- !u!1 &2002302906 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2002302909} + - component: {fileID: 2002302908} + - component: {fileID: 2002302907} + m_Layer: 0 + m_Name: CarFollow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2002302907 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2002302906} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 44d70cc20219cd84593f67d248eafe36, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Offset: {x: 0, y: -0.85, z: -5} + m_ApplyAfter: 1 + m_PreserveComposition: 0 +--- !u!114 &2002302908 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2002302906} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 319d2fe34a804e245819465c9505ea59, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + m_LockStageInInspector: + m_StreamingVersion: 20170927 + m_Priority: 10 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 1759726179} + m_Follow: {fileID: 1759726179} + m_CommonLens: 1 + m_Lens: + FieldOfView: 60 + OrthographicSize: 10 + NearClipPlane: 0.1 + FarClipPlane: 5000 + Dutch: 0 + ModeOverride: 0 + LensShift: {x: 0, y: 0} + GateFit: 2 + FocusDistance: 10 + m_SensorSize: {x: 1, y: 1} + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 + m_YAxis: + Value: 0.5 + m_SpeedMode: 0 + m_MaxSpeed: 2 + m_AccelTime: 0.2 + m_DecelTime: 0.1 + m_InputAxisName: Mouse Y + m_InputAxisValue: 0 + m_InvertInput: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_Wrap: 0 + m_Recentering: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_YAxisRecentering: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_XAxis: + Value: 0 + m_SpeedMode: 0 + m_MaxSpeed: 300 + m_AccelTime: 0.1 + m_DecelTime: 0.1 + m_InputAxisName: Mouse X + m_InputAxisValue: 0 + m_InvertInput: 0 + m_MinValue: -180 + m_MaxValue: 180 + m_Wrap: 1 + m_Recentering: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_Heading: + m_Definition: 2 + m_VelocityFilterStrength: 4 + m_Bias: 0 + m_RecenterToTargetHeading: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_BindingMode: 4 + m_SplineCurvature: 0.2 + m_Orbits: + - m_Height: 4.18 + m_Radius: 8.82 + - m_Height: 5.8 + m_Radius: 14.5 + - m_Height: 0.4 + m_Radius: 2.21 + m_LegacyHeadingBias: 3.4028235e+38 + m_Rigs: + - {fileID: 1375743169} + - {fileID: 75429421} + - {fileID: 1237188361} +--- !u!4 &2002302909 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2002302906} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.6789722, y: 7.2428412, z: -15.526432} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1375743170} + - {fileID: 75429422} + - {fileID: 1237188362} + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2051369973 GameObject: m_ObjectHideFlags: 0 @@ -2805,7 +2798,7 @@ RectTransform: - {fileID: 744704369} - {fileID: 1105409193} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} diff --git a/Assets/Scripts/Quit.cs b/Assets/Scripts/Quit.cs deleted file mode 100644 index a0a9e20..0000000 --- a/Assets/Scripts/Quit.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Quit : MonoBehaviour -{ - private void Update() { - if(Input.GetKeyDown(KeyCode.Escape)) Application.Quit(); - } -} diff --git a/Assets/Scripts/Quit.cs.meta b/Assets/Scripts/Quit.cs.meta deleted file mode 100644 index 9be2608..0000000 --- a/Assets/Scripts/Quit.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: bcd90519abd2eaa47ab4e721bdbe12c8 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/WheelController.cs b/Assets/Scripts/WheelController.cs index b11c92f..27fbbd3 100644 --- a/Assets/Scripts/WheelController.cs +++ b/Assets/Scripts/WheelController.cs @@ -31,6 +31,23 @@ public class WheelController : MonoBehaviour controls = new InputMaster(); } + private void OnEnable() { + movement = controls.Car.Movement; + movement.Enable(); + + turn = controls.Car.Turn; + turn.Enable(); + + brake = controls.Car.Brake; + brake.Enable(); + } + + private void OnDisable() { + movement.Disable(); + turn.Disable(); + brake.Disable(); + } + private void Update() { debugInfo.setRpmLabels(frontLeftWheel.GetWheelRPM(), frontRightWheel.GetWheelRPM(), rearLeftWheel.GetWheelRPM(), rearRightWheel.GetWheelRPM()); } @@ -39,15 +56,12 @@ public class WheelController : MonoBehaviour //TODO: Update input info to new input system //forward reverse input - //currentAcceleration = acceleration * Input.GetAxis("Vertical"); + //Debug.Log("movement value: " + movement.ReadValue()); + currentAcceleration = acceleration * movement.ReadValue(); - //breaking input - /*if(Input.GetKey(KeyCode.Space)){ - currentBrakeForce = breakingForce; - }else{ - currentBrakeForce = 0f; - }*/ + //Debug.Log("brake: " + brake.ReadValue()); + currentBrakeForce = breakingForce * brake.ReadValue(); //apply acceleration to front wheels| (this determines which wheel drive is the car (fwd, awd, rwd)) rearRightWheel.ApplyAcceleration(currentAcceleration); @@ -60,7 +74,7 @@ public class WheelController : MonoBehaviour rearRightWheel.ApplyBrakeForce(currentBrakeForce); //steering - //currentTurnAngle = maxTurnAngle * Input.GetAxis("Horizontal"); //getting steering input + currentTurnAngle = maxTurnAngle * turn.ReadValue(); //getting steering input frontLeftWheel.ApplySteerAngle(currentTurnAngle); frontRightWheel.ApplySteerAngle(currentTurnAngle); diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 48d908d..38555b2 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -916,7 +916,7 @@ PlayerSettings: hmiLogStartupTiming: 0 hmiCpuConfiguration: apiCompatibilityLevel: 6 - activeInputHandler: 1 + activeInputHandler: 2 windowsGamepadBackendHint: 0 cloudProjectId: framebufferDepthMemorylessMode: 0