From 4623583ffdad7d0de564e1ce572dd2679484f3b1 Mon Sep 17 00:00:00 2001 From: RochesterX Date: Fri, 17 Jan 2025 09:40:48 -0500 Subject: [PATCH] Reimplement player joining --- .../Input System/Global Actions.inputactions | 622 ++++++++++++++++++ ....meta => Global Actions.inputactions.meta} | 0 ...tactions => Player 2 Actions.inputactions} | 156 +---- .../Player 2 Actions.inputactions.meta | 14 + Assets/Scenes/Platformer.unity | 4 +- Assets/Scripts/PlayerManager.cs | 26 + Assets/Scripts/PlayerMovement.cs | 4 +- 7 files changed, 681 insertions(+), 145 deletions(-) create mode 100644 Assets/Input System/Global Actions.inputactions rename Assets/Input System/{InputSystem_Actions.inputactions.meta => Global Actions.inputactions.meta} (100%) rename Assets/Input System/{InputSystem_Actions.inputactions => Player 2 Actions.inputactions} (82%) create mode 100644 Assets/Input System/Player 2 Actions.inputactions.meta diff --git a/Assets/Input System/Global Actions.inputactions b/Assets/Input System/Global Actions.inputactions new file mode 100644 index 0000000..e0c4e09 --- /dev/null +++ b/Assets/Input System/Global Actions.inputactions @@ -0,0 +1,622 @@ +{ + "name": "Global Actions", + "maps": [ + { + "name": "Player", + "id": "df70fa95-8a34-4494-b137-73ab6b9c7d37", + "actions": [ + { + "name": "Join Player", + "type": "Button", + "id": "ef1cc6a9-3786-49b2-a1e8-a0b7e80d307c", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + } + ], + "bindings": [ + { + "name": "", + "id": "126309a2-1150-49a1-8554-2ab7ac5e5bb7", + "path": "/enter", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Join Player", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "9e1b26cf-c0f1-48cb-bcb0-30b8da1cdaf2", + "path": "/start", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Join Player", + "isComposite": false, + "isPartOfComposite": false + } + ] + }, + { + "name": "UI", + "id": "272f6d14-89ba-496f-b7ff-215263d3219f", + "actions": [ + { + "name": "Navigate", + "type": "PassThrough", + "id": "c95b2375-e6d9-4b88-9c4c-c5e76515df4b", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Submit", + "type": "Button", + "id": "7607c7b6-cd76-4816-beef-bd0341cfe950", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Cancel", + "type": "Button", + "id": "15cef263-9014-4fd5-94d9-4e4a6234a6ef", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Point", + "type": "PassThrough", + "id": "32b35790-4ed0-4e9a-aa41-69ac6d629449", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Click", + "type": "PassThrough", + "id": "3c7022bf-7922-4f7c-a998-c437916075ad", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "RightClick", + "type": "PassThrough", + "id": "44b200b1-1557-4083-816c-b22cbdf77ddf", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "MiddleClick", + "type": "PassThrough", + "id": "dad70c86-b58c-4b17-88ad-f5e53adf419e", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "ScrollWheel", + "type": "PassThrough", + "id": "0489e84a-4833-4c40-bfae-cea84b696689", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "TrackedDevicePosition", + "type": "PassThrough", + "id": "24908448-c609-4bc3-a128-ea258674378a", + "expectedControlType": "Vector3", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "TrackedDeviceOrientation", + "type": "PassThrough", + "id": "9caa3d8a-6b2f-4e8e-8bad-6ede561bd9be", + "expectedControlType": "Quaternion", + "processors": "", + "interactions": "", + "initialStateCheck": false + } + ], + "bindings": [ + { + "name": "Gamepad", + "id": "809f371f-c5e2-4e7a-83a1-d867598f40dd", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Navigate", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "14a5d6e8-4aaf-4119-a9ef-34b8c2c548bf", + "path": "/leftStick/up", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "up", + "id": "9144cbe6-05e1-4687-a6d7-24f99d23dd81", + "path": "/rightStick/up", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "2db08d65-c5fb-421b-983f-c71163608d67", + "path": "/leftStick/down", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "58748904-2ea9-4a80-8579-b500e6a76df8", + "path": "/rightStick/down", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "8ba04515-75aa-45de-966d-393d9bbd1c14", + "path": "/leftStick/left", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "712e721c-bdfb-4b23-a86c-a0d9fcfea921", + "path": "/rightStick/left", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "fcd248ae-a788-4676-a12e-f4d81205600b", + "path": "/leftStick/right", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "1f04d9bc-c50b-41a1-bfcc-afb75475ec20", + "path": "/rightStick/right", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "", + "id": "fb8277d4-c5cd-4663-9dc7-ee3f0b506d90", + "path": "/dpad", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "Joystick", + "id": "e25d9774-381c-4a61-b47c-7b6b299ad9f9", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Navigate", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "3db53b26-6601-41be-9887-63ac74e79d19", + "path": "/stick/up", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "0cb3e13e-3d90-4178-8ae6-d9c5501d653f", + "path": "/stick/down", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "0392d399-f6dd-4c82-8062-c1e9c0d34835", + "path": "/stick/left", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "942a66d9-d42f-43d6-8d70-ecb4ba5363bc", + "path": "/stick/right", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "Keyboard", + "id": "ff527021-f211-4c02-933e-5976594c46ed", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Navigate", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "563fbfdd-0f09-408d-aa75-8642c4f08ef0", + "path": "/w", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "up", + "id": "eb480147-c587-4a33-85ed-eb0ab9942c43", + "path": "/upArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "2bf42165-60bc-42ca-8072-8c13ab40239b", + "path": "/s", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "85d264ad-e0a0-4565-b7ff-1a37edde51ac", + "path": "/downArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "74214943-c580-44e4-98eb-ad7eebe17902", + "path": "/a", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "cea9b045-a000-445b-95b8-0c171af70a3b", + "path": "/leftArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "8607c725-d935-4808-84b1-8354e29bab63", + "path": "/d", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "4cda81dc-9edd-4e03-9d7c-a71a14345d0b", + "path": "/rightArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "", + "id": "9e92bb26-7e3b-4ec4-b06b-3c8f8e498ddc", + "path": "*/{Submit}", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse;Gamepad;Touch;Joystick;XR", + "action": "Submit", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "82627dcc-3b13-4ba9-841d-e4b746d6553e", + "path": "*/{Cancel}", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse;Gamepad;Touch;Joystick;XR", + "action": "Cancel", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "c52c8e0b-8179-41d3-b8a1-d149033bbe86", + "path": "/position", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "e1394cbc-336e-44ce-9ea8-6007ed6193f7", + "path": "/position", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "5693e57a-238a-46ed-b5ae-e64e6e574302", + "path": "/touch*/position", + "interactions": "", + "processors": "", + "groups": "Touch", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "4faf7dc9-b979-4210-aa8c-e808e1ef89f5", + "path": "/leftButton", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "8d66d5ba-88d7-48e6-b1cd-198bbfef7ace", + "path": "/tip", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "47c2a644-3ebc-4dae-a106-589b7ca75b59", + "path": "/touch*/press", + "interactions": "", + "processors": "", + "groups": "Touch", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "bb9e6b34-44bf-4381-ac63-5aa15d19f677", + "path": "/trigger", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "38c99815-14ea-4617-8627-164d27641299", + "path": "/scroll", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "ScrollWheel", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "4c191405-5738-4d4b-a523-c6a301dbf754", + "path": "/rightButton", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "RightClick", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "24066f69-da47-44f3-a07e-0015fb02eb2e", + "path": "/middleButton", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "MiddleClick", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "7236c0d9-6ca3-47cf-a6ee-a97f5b59ea77", + "path": "/devicePosition", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "TrackedDevicePosition", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "23e01e3a-f935-4948-8d8b-9bcac77714fb", + "path": "/deviceRotation", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "TrackedDeviceOrientation", + "isComposite": false, + "isPartOfComposite": false + } + ] + } + ], + "controlSchemes": [ + { + "name": "Keyboard&Mouse", + "bindingGroup": "Keyboard&Mouse", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + }, + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "Gamepad", + "bindingGroup": "Gamepad", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "Touch", + "bindingGroup": "Touch", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "Joystick", + "bindingGroup": "Joystick", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + }, + { + "name": "XR", + "bindingGroup": "XR", + "devices": [ + { + "devicePath": "", + "isOptional": false, + "isOR": false + } + ] + } + ] +} \ No newline at end of file diff --git a/Assets/Input System/InputSystem_Actions.inputactions.meta b/Assets/Input System/Global Actions.inputactions.meta similarity index 100% rename from Assets/Input System/InputSystem_Actions.inputactions.meta rename to Assets/Input System/Global Actions.inputactions.meta diff --git a/Assets/Input System/InputSystem_Actions.inputactions b/Assets/Input System/Player 2 Actions.inputactions similarity index 82% rename from Assets/Input System/InputSystem_Actions.inputactions rename to Assets/Input System/Player 2 Actions.inputactions index 1a41878..5e71a39 100644 --- a/Assets/Input System/InputSystem_Actions.inputactions +++ b/Assets/Input System/Player 2 Actions.inputactions @@ -1,12 +1,12 @@ { - "name": "InputSystem_Actions", + "name": "Player 2 Actions", "maps": [ { "name": "Player", "id": "df70fa95-8a34-4494-b137-73ab6b9c7d37", "actions": [ { - "name": "Player 1 Move", + "name": "Move", "type": "Value", "id": "351f2ccd-1f9f-44bf-9bec-d62ac5c5f408", "expectedControlType": "Vector2", @@ -15,207 +15,79 @@ "initialStateCheck": true }, { - "name": "Player 2 Move", - "type": "Value", - "id": "c76e95e7-c558-47cc-a7bd-93f9ad6eba7f", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Player 1 Action", + "name": "Action", "type": "Button", "id": "6c333d17-3450-4446-b7e0-a49595f68ba7", "expectedControlType": "", "processors": "", "interactions": "", "initialStateCheck": false - }, - { - "name": "Player 2 Action", - "type": "Button", - "id": "76071948-d107-4fd7-9e4a-196dda4c8871", - "expectedControlType": "", - "processors": "", - "interactions": "", - "initialStateCheck": false } ], "bindings": [ { - "name": "", - "id": "978bfe49-cc26-4a3d-ab7b-7d7a29327403", - "path": "/leftStick", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Player 1 Move", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "WASD", + "name": "D-Pad", "id": "00ca640b-d935-4593-8157-c05846ea39b3", "path": "Dpad", "interactions": "", "processors": "", "groups": "", - "action": "Player 1 Move", + "action": "Move", "isComposite": true, "isPartOfComposite": false }, { "name": "up", "id": "e2062cb9-1b15-46a2-838c-2f8d72a0bdd9", - "path": "/w", + "path": "/upArrow", "interactions": "", "processors": "", "groups": ";Keyboard&Mouse", - "action": "Player 1 Move", + "action": "Move", "isComposite": false, "isPartOfComposite": true }, { "name": "down", "id": "320bffee-a40b-4347-ac70-c210eb8bc73a", - "path": "/s", + "path": "/downArrow", "interactions": "", "processors": "", "groups": ";Keyboard&Mouse", - "action": "Player 1 Move", + "action": "Move", "isComposite": false, "isPartOfComposite": true }, { "name": "left", "id": "d2581a9b-1d11-4566-b27d-b92aff5fabbc", - "path": "/a", + "path": "/leftArrow", "interactions": "", "processors": "", "groups": ";Keyboard&Mouse", - "action": "Player 1 Move", + "action": "Move", "isComposite": false, "isPartOfComposite": true }, { "name": "right", "id": "fcfe95b8-67b9-4526-84b5-5d0bc98d6400", - "path": "/d", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Player 1 Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "", - "id": "1635d3fe-58b6-4ba9-a4e2-f4b964f6b5c8", - "path": "/{Primary2DAxis}", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Player 1 Move", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "b8b0405a-1eaa-4be8-8a20-7358c20c2ec3", - "path": "/rightStick", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Player 2 Move", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "Arrow Keys", - "id": "e957ec01-13b2-4284-a59c-3b7a2d0a5923", - "path": "Dpad", - "interactions": "", - "processors": "", - "groups": "", - "action": "Player 2 Move", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "up", - "id": "4af1d2bb-197b-49e3-a944-245927131501", - "path": "/upArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Player 2 Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "169ba39e-4240-47ee-9c27-e11f3d7173db", - "path": "/downArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Player 2 Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "be9ced23-2090-47a6-b377-e2f75339e846", - "path": "/leftArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Player 2 Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "24e88854-20ad-469a-a3df-85306fff2b19", "path": "/rightArrow", "interactions": "", "processors": "", "groups": ";Keyboard&Mouse", - "action": "Player 2 Move", + "action": "Move", "isComposite": false, "isPartOfComposite": true }, - { - "name": "", - "id": "fb5572f1-5733-47da-bd9d-bd8e0073784c", - "path": "/{Primary2DAxis}", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Player 2 Move", - "isComposite": false, - "isPartOfComposite": false - }, { "name": "", "id": "6f8632d2-312f-4559-8fdd-d17a3c226436", - "path": "/e", - "interactions": "", - "processors": "", - "groups": "", - "action": "Player 1 Action", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "55c1ccb7-7241-49e2-8cda-4758f50156f1", "path": "/space", "interactions": "", "processors": "", - "groups": "", - "action": "Player 2 Action", + "groups": ";Keyboard&Mouse", + "action": "Action", "isComposite": false, "isPartOfComposite": false } diff --git a/Assets/Input System/Player 2 Actions.inputactions.meta b/Assets/Input System/Player 2 Actions.inputactions.meta new file mode 100644 index 0000000..0790ceb --- /dev/null +++ b/Assets/Input System/Player 2 Actions.inputactions.meta @@ -0,0 +1,14 @@ +fileFormatVersion: 2 +guid: 66bf446e230994f6cb8817e4943f9adf +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 8404be70184654265930450def6a9037, type: 3} + generateWrapperCode: 0 + wrapperCodePath: + wrapperClassName: + wrapperCodeNamespace: diff --git a/Assets/Scenes/Platformer.unity b/Assets/Scenes/Platformer.unity index 4a0524a..4346c94 100644 --- a/Assets/Scenes/Platformer.unity +++ b/Assets/Scenes/Platformer.unity @@ -196,6 +196,8 @@ MonoBehaviour: m_EditorClassIdentifier: players: [] spawnPosition: {x: -2, y: 15} + playerActions: {fileID: -944628639613478452, guid: 6cbaae0ad99590d468c8b501c0452c36, type: 3} + player2Actions: {fileID: -944628639613478452, guid: 66bf446e230994f6cb8817e4943f9adf, type: 3} --- !u!114 &804358386 MonoBehaviour: m_ObjectHideFlags: 0 @@ -211,7 +213,7 @@ MonoBehaviour: m_NotificationBehavior: 0 m_MaxPlayerCount: -1 m_AllowJoining: 1 - m_JoinBehavior: 0 + m_JoinBehavior: 2 m_PlayerJoinedEvent: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Scripts/PlayerManager.cs b/Assets/Scripts/PlayerManager.cs index 07175ae..cc2cd5a 100644 --- a/Assets/Scripts/PlayerManager.cs +++ b/Assets/Scripts/PlayerManager.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using NUnit.Framework.Constraints; using UnityEngine; using UnityEngine.InputSystem; @@ -8,6 +9,11 @@ public class PlayerManager : MonoBehaviour public List players; [SerializeField] private Vector2 spawnPosition; + [SerializeField] private InputActionAsset playerActions; + + + [Header("Debug")] + [SerializeField] private InputActionAsset player2Actions; private PlayerCameraMovement playerCamera; @@ -24,6 +30,19 @@ public class PlayerManager : MonoBehaviour playerCamera = FindFirstObjectByType(); } + private void Update() + { + if (InputSystem.actions.FindAction("Join Player").WasPressedThisFrame()) + { + JoinPlayer(playerActions); + } + + if (Keyboard.current.periodKey.wasPressedThisFrame) + { + JoinPlayer(player2Actions); + } + } + private void OnPlayerJoined(PlayerInput playerInput) { playerInput.transform.position = spawnPosition; @@ -49,4 +68,11 @@ public class PlayerManager : MonoBehaviour print("A PlayerManager already exists."); } } + + private void JoinPlayer(InputActionAsset actions) + { + PlayerInput player = GetComponent().JoinPlayer(-1, -1, null, Keyboard.current); + print(player == null); + player.actions = actions; + } } diff --git a/Assets/Scripts/PlayerMovement.cs b/Assets/Scripts/PlayerMovement.cs index 4332d84..9210873 100644 --- a/Assets/Scripts/PlayerMovement.cs +++ b/Assets/Scripts/PlayerMovement.cs @@ -86,9 +86,9 @@ public class PlayerMovement : MonoBehaviour animationPlayer.SetState(AnimationPlayer.AnimationState.Idle); } - if (body.linearVelocityX < 0) + if (body.linearVelocityX < -0.1f) animationPlayer.backwards = true; - else if (body.linearVelocityX > 0) + else if (body.linearVelocityX > 0.1f) animationPlayer.backwards = false; }