From 70b871b1e90127542e27e5cb5c5d6b0a90599506 Mon Sep 17 00:00:00 2001 From: Paolo Abela Date: Tue, 28 May 2024 14:34:56 +0100 Subject: [PATCH 01/19] chore: updated Dedicated Game Server Sample to Unity 6, and Multiplayer Play Mode and dedicated server packages to 1.1.0 --- .../Assets/InputSystem_Actions.inputactions | 1057 +++++++++++++++++ .../InputSystem_Actions.inputactions.meta | 14 + .../GameMenuViewPanelSettings.asset | 3 + .../MatchView/MatchViewPanelSettings.asset | 3 + ...niversalRenderPipelineGlobalSettings.asset | 42 +- .../Packages/manifest.json | 20 +- .../Packages/packages-lock.json | 108 +- .../ProjectSettings/EditorBuildSettings.asset | 3 +- .../ProjectSettings/InputManager.asset | 1053 ---------------- .../ProjectSettings/MultiplayerManager.asset | 3 +- .../ProjectSettings/ProjectVersion.txt | 4 +- .../VirtualProjectsConfig.json | 4 + 12 files changed, 1190 insertions(+), 1124 deletions(-) create mode 100644 Experimental/DedicatedGameServer/Assets/InputSystem_Actions.inputactions create mode 100644 Experimental/DedicatedGameServer/Assets/InputSystem_Actions.inputactions.meta create mode 100644 Experimental/DedicatedGameServer/ProjectSettings/VirtualProjectsConfig.json diff --git a/Experimental/DedicatedGameServer/Assets/InputSystem_Actions.inputactions b/Experimental/DedicatedGameServer/Assets/InputSystem_Actions.inputactions new file mode 100644 index 000000000..278aa57b8 --- /dev/null +++ b/Experimental/DedicatedGameServer/Assets/InputSystem_Actions.inputactions @@ -0,0 +1,1057 @@ +{ + "name": "InputSystem_Actions", + "maps": [ + { + "name": "Player", + "id": "df70fa95-8a34-4494-b137-73ab6b9c7d37", + "actions": [ + { + "name": "Move", + "type": "Value", + "id": "351f2ccd-1f9f-44bf-9bec-d62ac5c5f408", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Look", + "type": "Value", + "id": "6b444451-8a00-4d00-a97e-f47457f736a8", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Attack", + "type": "Button", + "id": "6c2ab1b8-8984-453a-af3d-a3c78ae1679a", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Interact", + "type": "Button", + "id": "852140f2-7766-474d-8707-702459ba45f3", + "expectedControlType": "Button", + "processors": "", + "interactions": "Hold", + "initialStateCheck": false + }, + { + "name": "Crouch", + "type": "Button", + "id": "27c5f898-bc57-4ee1-8800-db469aca5fe3", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Jump", + "type": "Button", + "id": "f1ba0d36-48eb-4cd5-b651-1c94a6531f70", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Previous", + "type": "Value", + "id": "2776c80d-3c14-4091-8c56-d04ced07a2b0", + "expectedControlType": "Axis", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Next", + "type": "Value", + "id": "b7230bb6-fc9b-4f52-8b25-f5e19cb2c2ba", + "expectedControlType": "Axis", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Sprint", + "type": "Button", + "id": "641cd816-40e6-41b4-8c3d-04687c349290", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + } + ], + "bindings": [ + { + "name": "", + "id": "978bfe49-cc26-4a3d-ab7b-7d7a29327403", + "path": "/leftStick", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Move", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "WASD", + "id": "00ca640b-d935-4593-8157-c05846ea39b3", + "path": "Dpad", + "interactions": "", + "processors": "", + "groups": "", + "action": "Move", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "e2062cb9-1b15-46a2-838c-2f8d72a0bdd9", + "path": "/w", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "up", + "id": "8180e8bd-4097-4f4e-ab88-4523101a6ce9", + "path": "/upArrow", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "320bffee-a40b-4347-ac70-c210eb8bc73a", + "path": "/s", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "1c5327b5-f71c-4f60-99c7-4e737386f1d1", + "path": "/downArrow", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "d2581a9b-1d11-4566-b27d-b92aff5fabbc", + "path": "/a", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "2e46982e-44cc-431b-9f0b-c11910bf467a", + "path": "/leftArrow", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "fcfe95b8-67b9-4526-84b5-5d0bc98d6400", + "path": "/d", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "77bff152-3580-4b21-b6de-dcd0c7e41164", + "path": "/rightArrow", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "", + "id": "1635d3fe-58b6-4ba9-a4e2-f4b964f6b5c8", + "path": "/{Primary2DAxis}", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "Move", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "3ea4d645-4504-4529-b061-ab81934c3752", + "path": "/stick", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Move", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "c1f7a91b-d0fd-4a62-997e-7fb9b69bf235", + "path": "/rightStick", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Look", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "8c8e490b-c610-4785-884f-f04217b23ca4", + "path": "/delta", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse;Touch", + "action": "Look", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "3e5f5442-8668-4b27-a940-df99bad7e831", + "path": "/{Hatswitch}", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Look", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "143bb1cd-cc10-4eca-a2f0-a3664166fe91", + "path": "/buttonWest", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Attack", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "05f6913d-c316-48b2-a6bb-e225f14c7960", + "path": "/leftButton", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Attack", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "886e731e-7071-4ae4-95c0-e61739dad6fd", + "path": "/primaryTouch/tap", + "interactions": "", + "processors": "", + "groups": ";Touch", + "action": "Attack", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "ee3d0cd2-254e-47a7-a8cb-bc94d9658c54", + "path": "/trigger", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Attack", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "8255d333-5683-4943-a58a-ccb207ff1dce", + "path": "/{PrimaryAction}", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "Attack", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "b3c1c7f0-bd20-4ee7-a0f1-899b24bca6d7", + "path": "/enter", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Attack", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "cbac6039-9c09-46a1-b5f2-4e5124ccb5ed", + "path": "/2", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Next", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "e15ca19d-e649-4852-97d5-7fe8ccc44e94", + "path": "/dpad/right", + "interactions": "", + "processors": "", + "groups": "Gamepad", + "action": "Next", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "f2e9ba44-c423-42a7-ad56-f20975884794", + "path": "/leftShift", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Sprint", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "8cbb2f4b-a784-49cc-8d5e-c010b8c7f4e6", + "path": "/leftStickPress", + "interactions": "", + "processors": "", + "groups": "Gamepad", + "action": "Sprint", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "d8bf24bf-3f2f-4160-a97c-38ec1eb520ba", + "path": "/trigger", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "Sprint", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "eb40bb66-4559-4dfa-9a2f-820438abb426", + "path": "/space", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Jump", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "daba33a1-ad0c-4742-a909-43ad1cdfbeb6", + "path": "/buttonSouth", + "interactions": "", + "processors": "", + "groups": "Gamepad", + "action": "Jump", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "603f3daf-40bd-4854-8724-93e8017f59e3", + "path": "/secondaryButton", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "Jump", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "1534dc16-a6aa-499d-9c3a-22b47347b52a", + "path": "/1", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Previous", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "25060bbd-a3a6-476e-8fba-45ae484aad05", + "path": "/dpad/left", + "interactions": "", + "processors": "", + "groups": "Gamepad", + "action": "Previous", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "1c04ea5f-b012-41d1-a6f7-02e963b52893", + "path": "/e", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Interact", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "b3f66d0b-7751-423f-908b-a11c5bd95930", + "path": "/buttonNorth", + "interactions": "", + "processors": "", + "groups": "Gamepad", + "action": "Interact", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "4f4649ac-64a8-4a73-af11-b3faef356a4d", + "path": "/buttonEast", + "interactions": "", + "processors": "", + "groups": "Gamepad", + "action": "Crouch", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "36e52cba-0905-478e-a818-f4bfcb9f3b9a", + "path": "/c", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Crouch", + "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/Experimental/DedicatedGameServer/Assets/InputSystem_Actions.inputactions.meta b/Experimental/DedicatedGameServer/Assets/InputSystem_Actions.inputactions.meta new file mode 100644 index 000000000..aed6ed130 --- /dev/null +++ b/Experimental/DedicatedGameServer/Assets/InputSystem_Actions.inputactions.meta @@ -0,0 +1,14 @@ +fileFormatVersion: 2 +guid: 11f69b19b763bf74caf33219a6ca8029 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 8404be70184654265930450def6a9037, type: 3} + generateWrapperCode: 0 + wrapperCodePath: + wrapperClassName: + wrapperCodeNamespace: diff --git a/Experimental/DedicatedGameServer/Assets/UI Toolkit/GameMenuView/GameMenuViewPanelSettings.asset b/Experimental/DedicatedGameServer/Assets/UI Toolkit/GameMenuView/GameMenuViewPanelSettings.asset index e0b915ed0..da457e771 100644 --- a/Experimental/DedicatedGameServer/Assets/UI Toolkit/GameMenuView/GameMenuViewPanelSettings.asset +++ b/Experimental/DedicatedGameServer/Assets/UI Toolkit/GameMenuView/GameMenuViewPanelSettings.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: GameMenuViewPanelSettings m_EditorClassIdentifier: themeUss: {fileID: -4733365628477956816, guid: 2798018c7901adf47b47c3e251c0d36b, type: 3} + m_DisableNoThemeWarning: 0 m_TargetTexture: {fileID: 0} m_RenderMode: 0 m_WorldSpaceLayer: 0 @@ -40,4 +41,6 @@ MonoBehaviour: m_AtlasBlitShader: {fileID: 9101, guid: 0000000000000000f000000000000000, type: 0} m_RuntimeShader: {fileID: 9100, guid: 0000000000000000f000000000000000, type: 0} m_RuntimeWorldShader: {fileID: 9102, guid: 0000000000000000f000000000000000, type: 0} + m_ICUDataAsset: {fileID: 0} + forceGammaRendering: 0 textSettings: {fileID: 0} diff --git a/Experimental/DedicatedGameServer/Assets/UI Toolkit/MatchView/MatchViewPanelSettings.asset b/Experimental/DedicatedGameServer/Assets/UI Toolkit/MatchView/MatchViewPanelSettings.asset index efc135472..2156bcfa0 100644 --- a/Experimental/DedicatedGameServer/Assets/UI Toolkit/MatchView/MatchViewPanelSettings.asset +++ b/Experimental/DedicatedGameServer/Assets/UI Toolkit/MatchView/MatchViewPanelSettings.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: MatchViewPanelSettings m_EditorClassIdentifier: themeUss: {fileID: -4733365628477956816, guid: 2798018c7901adf47b47c3e251c0d36b, type: 3} + m_DisableNoThemeWarning: 0 m_TargetTexture: {fileID: 0} m_RenderMode: 0 m_WorldSpaceLayer: 0 @@ -40,4 +41,6 @@ MonoBehaviour: m_AtlasBlitShader: {fileID: 9101, guid: 0000000000000000f000000000000000, type: 0} m_RuntimeShader: {fileID: 9100, guid: 0000000000000000f000000000000000, type: 0} m_RuntimeWorldShader: {fileID: 9102, guid: 0000000000000000f000000000000000, type: 0} + m_ICUDataAsset: {fileID: 0} + forceGammaRendering: 0 textSettings: {fileID: 0} diff --git a/Experimental/DedicatedGameServer/Assets/UniversalRenderPipelineGlobalSettings.asset b/Experimental/DedicatedGameServer/Assets/UniversalRenderPipelineGlobalSettings.asset index b11e65026..fb37c50e5 100644 --- a/Experimental/DedicatedGameServer/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/Experimental/DedicatedGameServer/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -49,9 +49,13 @@ MonoBehaviour: - rid: 889817428941602829 - rid: 889817428941602830 - rid: 889817428941602831 + - rid: 7796461650670780416 + - rid: 7796461650670780417 + - rid: 7796461650670780418 + - rid: 7796461650670780419 m_RuntimeSettings: m_List: [] - m_AssetVersion: 6 + m_AssetVersion: 8 m_ObsoleteDefaultVolumeProfile: {fileID: 0} m_RenderingLayerNames: - Default @@ -78,8 +82,9 @@ MonoBehaviour: type: {class: UniversalRenderPipelineRuntimeShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 - m_CoreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} + m_FallbackErrorShader: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} m_BlitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3} + m_CoreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} m_CoreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3} m_SamplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} - rid: 889817428941602817 @@ -100,6 +105,7 @@ MonoBehaviour: m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3} m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} + m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} - rid: 889817428941602819 type: {class: URPDefaultVolumeProfileSettings, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: @@ -137,7 +143,7 @@ MonoBehaviour: type: {class: RenderGraphSettings, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 - m_UseRenderGraph: 0 + m_EnableRenderCompatibilityMode: 0 - rid: 889817428941602824 type: {class: UniversalRendererResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: @@ -203,3 +209,33 @@ MonoBehaviour: data: m_Version: 1 m_ProbeVolumeDisableStreamingAssets: 0 + - rid: 7796461650670780416 + type: {class: RenderGraphUtilsResources, ns: UnityEngine.Rendering.RenderGraphModule.Util, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 0 + m_CoreCopyPS: {fileID: 4800000, guid: 12dc59547ea167a4ab435097dd0f9add, type: 3} + - rid: 7796461650670780417 + type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 1 + dilationShader: {fileID: 7200000, guid: 6bb382f7de370af41b775f54182e491d, type: 3} + subdivideSceneCS: {fileID: 7200000, guid: bb86f1f0af829fd45b2ebddda1245c22, type: 3} + voxelizeSceneShader: {fileID: 4800000, guid: c8b6a681c7b4e2e4785ffab093907f9e, type: 3} + traceVirtualOffsetCS: {fileID: 7200000, guid: 805f10d263aac4b4098c0279cd37a4f3, type: 3} + traceVirtualOffsetRT: {fileID: 4807578003741378534, guid: b60511f4aa1443f4d8c0b18f4fec92f4, type: 3} + skyOcclusionCS: {fileID: 7200000, guid: 798f52ec82fa04048a12826bbbbcf7b4, type: 3} + skyOcclusionRT: {fileID: 4807578003741378534, guid: dfaf42b38dd001f49a72d8102b709f29, type: 3} + renderingLayerCS: {fileID: 7200000, guid: a63c9cf933e3d8f41ae680a372784ebf, type: 3} + renderingLayerRT: {fileID: 4807578003741378534, guid: c2be09c936362eb49a58f08aeb30627a, type: 3} + - rid: 7796461650670780418 + type: {class: RenderGraphGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_version: 0 + m_EnableCompilationCaching: 1 + m_EnableValidityChecks: 1 + - rid: 7796461650670780419 + type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3} + m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3} + m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3} diff --git a/Experimental/DedicatedGameServer/Packages/manifest.json b/Experimental/DedicatedGameServer/Packages/manifest.json index 85dd47c26..c7ee754f0 100644 --- a/Experimental/DedicatedGameServer/Packages/manifest.json +++ b/Experimental/DedicatedGameServer/Packages/manifest.json @@ -1,23 +1,23 @@ { "dependencies": { "com.unity.ai.navigation": "2.0.0", - "com.unity.cinemachine": "2.9.7", - "com.unity.dedicated-server": "1.0.0", - "com.unity.ide.rider": "3.0.26", + "com.unity.cinemachine": "2.10.0", + "com.unity.dedicated-server": "1.1.0", + "com.unity.ide.rider": "3.0.28", "com.unity.ide.visualstudio": "2.0.22", - "com.unity.inputsystem": "1.8.0-pre.2", + "com.unity.inputsystem": "1.8.2", "com.unity.learn.iet-framework": "3.1.3", "com.unity.learn.iet-framework.authoring": "1.2.2", - "com.unity.multiplayer.playmode": "1.0.0", + "com.unity.multiplayer.playmode": "1.1.0", "com.unity.multiplayer.samples.coop": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.3.0", "com.unity.multiplayer.tools": "2.1.0", - "com.unity.netcode.gameobjects": "1.8.0", - "com.unity.render-pipelines.universal": "17.0.1", + "com.unity.netcode.gameobjects": "1.9.1", + "com.unity.render-pipelines.universal": "17.0.3", "com.unity.services.matchmaker": "1.1.2", - "com.unity.services.multiplay": "1.0.5", - "com.unity.test-framework": "1.4.0", + "com.unity.services.multiplay": "1.1.0", + "com.unity.test-framework": "1.4.4", "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.6", - "com.unity.transport": "2.0.2", + "com.unity.transport": "2.1.0", "com.unity.modules.animation": "1.0.0" } } diff --git a/Experimental/DedicatedGameServer/Packages/packages-lock.json b/Experimental/DedicatedGameServer/Packages/packages-lock.json index 7a67e81f5..2d64a785d 100644 --- a/Experimental/DedicatedGameServer/Packages/packages-lock.json +++ b/Experimental/DedicatedGameServer/Packages/packages-lock.json @@ -10,16 +10,17 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.10", - "depth": 1, + "version": "1.8.14", + "depth": 2, "source": "registry", "dependencies": { - "com.unity.mathematics": "1.2.1" + "com.unity.mathematics": "1.2.1", + "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.cinemachine": { - "version": "2.9.7", + "version": "2.10.0", "depth": 0, "source": "registry", "dependencies": { @@ -28,18 +29,19 @@ "url": "https://packages.unity.com" }, "com.unity.collections": { - "version": "2.2.0", + "version": "2.4.1", "depth": 2, "source": "registry", "dependencies": { - "com.unity.burst": "1.8.4", - "com.unity.modules.unityanalytics": "1.0.0", - "com.unity.nuget.mono-cecil": "1.11.4" + "com.unity.burst": "1.8.13", + "com.unity.nuget.mono-cecil": "1.11.4", + "com.unity.test-framework": "1.4.3", + "com.unity.test-framework.performance": "3.0.3" }, "url": "https://packages.unity.com" }, "com.unity.dedicated-server": { - "version": "1.0.0", + "version": "1.1.0", "depth": 0, "source": "registry", "dependencies": {}, @@ -60,7 +62,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.26", + "version": "3.0.28", "depth": 0, "source": "registry", "dependencies": { @@ -78,7 +80,7 @@ "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.8.0-pre.2", + "version": "1.8.2", "depth": 0, "source": "registry", "dependencies": { @@ -106,14 +108,14 @@ "url": "https://packages.unity.com" }, "com.unity.mathematics": { - "version": "1.2.6", - "depth": 1, + "version": "1.3.2", + "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.multiplayer.playmode": { - "version": "1.0.0", + "version": "1.1.0", "depth": 0, "source": "registry", "dependencies": { @@ -149,7 +151,7 @@ "url": "https://packages.unity.com" }, "com.unity.netcode.gameobjects": { - "version": "1.8.0", + "version": "1.9.1", "depth": 0, "source": "registry", "dependencies": { @@ -180,13 +182,14 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "17.0.1", + "version": "17.0.3", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.collections": "2.2.0", - "com.unity.mathematics": "1.2.6", + "com.unity.burst": "1.8.14", + "com.unity.mathematics": "1.3.2", "com.unity.ugui": "2.0.0", + "com.unity.collections": "2.4.1", "com.unity.modules.physics": "1.0.0", "com.unity.modules.terrain": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", @@ -194,33 +197,31 @@ } }, "com.unity.render-pipelines.universal": { - "version": "17.0.1", + "version": "17.0.3", "depth": 0, "source": "builtin", "dependencies": { - "com.unity.mathematics": "1.2.1", - "com.unity.burst": "1.8.9", - "com.unity.render-pipelines.core": "17.0.1", - "com.unity.shadergraph": "17.0.1", - "com.unity.render-pipelines.universal-config": "17.0.1" + "com.unity.render-pipelines.core": "17.0.3", + "com.unity.shadergraph": "17.0.3", + "com.unity.render-pipelines.universal-config": "17.0.3" } }, "com.unity.render-pipelines.universal-config": { - "version": "17.0.1", + "version": "17.0.3", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "17.0.1" + "com.unity.render-pipelines.core": "17.0.3" } }, "com.unity.rendering.light-transport": { - "version": "1.0.0", + "version": "1.0.1", "depth": 2, "source": "builtin", "dependencies": { "com.unity.collections": "2.2.0", "com.unity.mathematics": "1.2.4", - "com.unity.render-pipelines.core": "17.0.0" + "com.unity.modules.terrain": "1.0.0" } }, "com.unity.searcher": { @@ -231,19 +232,19 @@ "url": "https://packages.unity.com" }, "com.unity.services.authentication": { - "version": "3.2.0", + "version": "3.3.1", "depth": 1, "source": "registry", "dependencies": { "com.unity.nuget.newtonsoft-json": "3.2.1", - "com.unity.services.core": "1.12.1", + "com.unity.services.core": "1.12.5", "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.ugui": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.services.core": { - "version": "1.12.1", + "version": "1.12.5", "depth": 1, "source": "registry", "dependencies": { @@ -270,11 +271,11 @@ "url": "https://packages.unity.com" }, "com.unity.services.multiplay": { - "version": "1.0.5", + "version": "1.1.0", "depth": 0, "source": "registry", "dependencies": { - "com.unity.services.core": "1.8.2", + "com.unity.services.core": "1.12.0", "com.unity.services.wire": "1.1.4", "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.modules.unitywebrequestassetbundle": "1.0.0", @@ -286,11 +287,11 @@ "url": "https://packages.unity.com" }, "com.unity.services.qos": { - "version": "1.2.1", + "version": "1.3.0", "depth": 2, "source": "registry", "dependencies": { - "com.unity.services.core": "1.4.0", + "com.unity.services.core": "1.12.4", "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.nuget.newtonsoft-json": "3.0.2", "com.unity.services.authentication": "2.0.0", @@ -317,11 +318,11 @@ "url": "https://packages.unity.com" }, "com.unity.services.wire": { - "version": "1.2.2", + "version": "1.2.3", "depth": 1, "source": "registry", "dependencies": { - "com.unity.services.core": "1.11.0", + "com.unity.services.core": "1.12.4", "com.unity.nuget.newtonsoft-json": "3.2.1", "com.unity.services.authentication": "2.7.2" }, @@ -335,11 +336,11 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "17.0.1", + "version": "17.0.3", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "17.0.1", + "com.unity.render-pipelines.core": "17.0.3", "com.unity.searcher": "4.9.2" } }, @@ -360,7 +361,7 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.4.0", + "version": "1.4.4", "depth": 0, "source": "registry", "dependencies": { @@ -370,6 +371,16 @@ }, "url": "https://packages.unity.com" }, + "com.unity.test-framework.performance": { + "version": "3.0.3", + "depth": 2, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.31", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.toolchain.win-x86_64-linux-x86_64": { "version": "2.0.6", "depth": 0, @@ -381,13 +392,13 @@ "url": "https://packages.unity.com" }, "com.unity.transport": { - "version": "2.0.2", + "version": "2.1.0", "depth": 0, "source": "registry", "dependencies": { - "com.unity.collections": "2.1.4", - "com.unity.burst": "1.8.4", - "com.unity.mathematics": "1.2.6" + "com.unity.collections": "2.2.1", + "com.unity.burst": "1.8.8", + "com.unity.mathematics": "1.3.1" }, "url": "https://packages.unity.com" }, @@ -483,15 +494,6 @@ "com.unity.modules.hierarchycore": "1.0.0" } }, - "com.unity.modules.unityanalytics": { - "version": "1.0.0", - "depth": 2, - "source": "builtin", - "dependencies": { - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0" - } - }, "com.unity.modules.unitywebrequest": { "version": "1.0.0", "depth": 1, diff --git a/Experimental/DedicatedGameServer/ProjectSettings/EditorBuildSettings.asset b/Experimental/DedicatedGameServer/ProjectSettings/EditorBuildSettings.asset index 7735d6a48..b0693382c 100644 --- a/Experimental/DedicatedGameServer/ProjectSettings/EditorBuildSettings.asset +++ b/Experimental/DedicatedGameServer/ProjectSettings/EditorBuildSettings.asset @@ -14,5 +14,6 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/GameScene01.unity guid: 59b8ab2dc12914f49abb89d9bf130ec3 - m_configObjects: {} + m_configObjects: + com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 11f69b19b763bf74caf33219a6ca8029, type: 3} m_UseUCBPForAssetBundles: 0 diff --git a/Experimental/DedicatedGameServer/ProjectSettings/InputManager.asset b/Experimental/DedicatedGameServer/ProjectSettings/InputManager.asset index 5009cfb24..6a65192d0 100644 --- a/Experimental/DedicatedGameServer/ProjectSettings/InputManager.asset +++ b/Experimental/DedicatedGameServer/ProjectSettings/InputManager.asset @@ -1,946 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-7746503004765643349 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} - m_Name: UI/TrackedDeviceOrientation - m_EditorClassIdentifier: - m_Asset: {fileID: -4022728701091717789} - m_ActionId: 9caa3d8a-6b2f-4e8e-8bad-6ede561bd9be ---- !u!114 &-7602584703684664449 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} - m_Name: UI/Click - m_EditorClassIdentifier: - m_Asset: {fileID: -4022728701091717789} - m_ActionId: 3c7022bf-7922-4f7c-a998-c437916075ad ---- !u!114 &-6901587892598150634 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} - m_Name: UI/Cancel - m_EditorClassIdentifier: - m_Asset: {fileID: -4022728701091717789} - m_ActionId: 15cef263-9014-4fd5-94d9-4e4a6234a6ef ---- !u!114 &-6265603135491588258 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} - m_Name: UI/Point - m_EditorClassIdentifier: - m_Asset: {fileID: -4022728701091717789} - m_ActionId: 32b35790-4ed0-4e9a-aa41-69ac6d629449 ---- !u!114 &-6129568776898891069 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} - m_Name: Player/Interact - m_EditorClassIdentifier: - m_Asset: {fileID: -4022728701091717789} - m_ActionId: 852140f2-7766-474d-8707-702459ba45f3 ---- !u!114 &-5310656711654992985 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} - m_Name: InputManager - m_EditorClassIdentifier: - m_Asset: {fileID: -4022728701091717789} - m_ActionId: 6c2ab1b8-8984-453a-af3d-a3c78ae1679a ---- !u!114 &-4022728701091717789 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 39fa3d8997a24136984ca6e2c99902bc, type: 3} - m_Name: ProjectWideInputActions - m_EditorClassIdentifier: - m_ActionMaps: - - m_Name: Player - m_Id: df70fa95-8a34-4494-b137-73ab6b9c7d37 - m_Asset: {fileID: -4022728701091717789} - m_Actions: - - m_Name: Move - m_Type: 0 - m_ExpectedControlType: Vector2 - m_Id: 351f2ccd-1f9f-44bf-9bec-d62ac5c5f408 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 1 - - m_Name: Look - m_Type: 0 - m_ExpectedControlType: Vector2 - m_Id: 6b444451-8a00-4d00-a97e-f47457f736a8 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 1 - - m_Name: Attack - m_Type: 1 - m_ExpectedControlType: Button - m_Id: 6c2ab1b8-8984-453a-af3d-a3c78ae1679a - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - - m_Name: Interact - m_Type: 1 - m_ExpectedControlType: Button - m_Id: 852140f2-7766-474d-8707-702459ba45f3 - m_Processors: - m_Interactions: Hold - m_SingletonActionBindings: [] - m_Flags: 0 - - m_Name: Crouch - m_Type: 1 - m_ExpectedControlType: Button - m_Id: 27c5f898-bc57-4ee1-8800-db469aca5fe3 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - - m_Name: Jump - m_Type: 1 - m_ExpectedControlType: Button - m_Id: f1ba0d36-48eb-4cd5-b651-1c94a6531f70 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - - m_Name: Previous - m_Type: 0 - m_ExpectedControlType: Axis - m_Id: 2776c80d-3c14-4091-8c56-d04ced07a2b0 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 1 - - m_Name: Next - m_Type: 0 - m_ExpectedControlType: Axis - m_Id: b7230bb6-fc9b-4f52-8b25-f5e19cb2c2ba - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 1 - - m_Name: Sprint - m_Type: 1 - m_ExpectedControlType: Button - m_Id: 641cd816-40e6-41b4-8c3d-04687c349290 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Bindings: - - m_Name: - m_Id: 978bfe49-cc26-4a3d-ab7b-7d7a29327403 - m_Path: /leftStick - m_Interactions: - m_Processors: - m_Groups: ;Gamepad - m_Action: Move - m_Flags: 0 - - m_Name: WASD - m_Id: 00ca640b-d935-4593-8157-c05846ea39b3 - m_Path: Dpad - m_Interactions: - m_Processors: - m_Groups: - m_Action: Move - m_Flags: 4 - - m_Name: up - m_Id: e2062cb9-1b15-46a2-838c-2f8d72a0bdd9 - m_Path: /w - m_Interactions: - m_Processors: - m_Groups: ;Keyboard&Mouse - m_Action: Move - m_Flags: 8 - - m_Name: up - m_Id: 8180e8bd-4097-4f4e-ab88-4523101a6ce9 - m_Path: /upArrow - m_Interactions: - m_Processors: - m_Groups: ;Keyboard&Mouse - m_Action: Move - m_Flags: 8 - - m_Name: down - m_Id: 320bffee-a40b-4347-ac70-c210eb8bc73a - m_Path: /s - m_Interactions: - m_Processors: - m_Groups: ;Keyboard&Mouse - m_Action: Move - m_Flags: 8 - - m_Name: down - m_Id: 1c5327b5-f71c-4f60-99c7-4e737386f1d1 - m_Path: /downArrow - m_Interactions: - m_Processors: - m_Groups: ;Keyboard&Mouse - m_Action: Move - m_Flags: 8 - - m_Name: left - m_Id: d2581a9b-1d11-4566-b27d-b92aff5fabbc - m_Path: /a - m_Interactions: - m_Processors: - m_Groups: ;Keyboard&Mouse - m_Action: Move - m_Flags: 8 - - m_Name: left - m_Id: 2e46982e-44cc-431b-9f0b-c11910bf467a - m_Path: /leftArrow - m_Interactions: - m_Processors: - m_Groups: ;Keyboard&Mouse - m_Action: Move - m_Flags: 8 - - m_Name: right - m_Id: fcfe95b8-67b9-4526-84b5-5d0bc98d6400 - m_Path: /d - m_Interactions: - m_Processors: - m_Groups: ;Keyboard&Mouse - m_Action: Move - m_Flags: 8 - - m_Name: right - m_Id: 77bff152-3580-4b21-b6de-dcd0c7e41164 - m_Path: /rightArrow - m_Interactions: - m_Processors: - m_Groups: ;Keyboard&Mouse - m_Action: Move - m_Flags: 8 - - m_Name: - m_Id: 1635d3fe-58b6-4ba9-a4e2-f4b964f6b5c8 - m_Path: /{Primary2DAxis} - m_Interactions: - m_Processors: - m_Groups: XR - m_Action: Move - m_Flags: 0 - - m_Name: - m_Id: 3ea4d645-4504-4529-b061-ab81934c3752 - m_Path: /stick - m_Interactions: - m_Processors: - m_Groups: Joystick - m_Action: Move - m_Flags: 0 - - m_Name: - m_Id: c1f7a91b-d0fd-4a62-997e-7fb9b69bf235 - m_Path: /rightStick - m_Interactions: - m_Processors: - m_Groups: ;Gamepad - m_Action: Look - m_Flags: 0 - - m_Name: - m_Id: 8c8e490b-c610-4785-884f-f04217b23ca4 - m_Path: /delta - m_Interactions: - m_Processors: - m_Groups: ;Keyboard&Mouse;Touch - m_Action: Look - m_Flags: 0 - - m_Name: - m_Id: 3e5f5442-8668-4b27-a940-df99bad7e831 - m_Path: /{Hatswitch} - m_Interactions: - m_Processors: - m_Groups: Joystick - m_Action: Look - m_Flags: 0 - - m_Name: - m_Id: 143bb1cd-cc10-4eca-a2f0-a3664166fe91 - m_Path: /buttonWest - m_Interactions: - m_Processors: - m_Groups: ;Gamepad - m_Action: Attack - m_Flags: 0 - - m_Name: - m_Id: 05f6913d-c316-48b2-a6bb-e225f14c7960 - m_Path: /leftButton - m_Interactions: - m_Processors: - m_Groups: ;Keyboard&Mouse - m_Action: Attack - m_Flags: 0 - - m_Name: - m_Id: 886e731e-7071-4ae4-95c0-e61739dad6fd - m_Path: /primaryTouch/tap - m_Interactions: - m_Processors: - m_Groups: ;Touch - m_Action: Attack - m_Flags: 0 - - m_Name: - m_Id: ee3d0cd2-254e-47a7-a8cb-bc94d9658c54 - m_Path: /trigger - m_Interactions: - m_Processors: - m_Groups: Joystick - m_Action: Attack - m_Flags: 0 - - m_Name: - m_Id: 8255d333-5683-4943-a58a-ccb207ff1dce - m_Path: /{PrimaryAction} - m_Interactions: - m_Processors: - m_Groups: XR - m_Action: Attack - m_Flags: 0 - - m_Name: - m_Id: b3c1c7f0-bd20-4ee7-a0f1-899b24bca6d7 - m_Path: /enter - m_Interactions: - m_Processors: - m_Groups: Keyboard&Mouse - m_Action: Attack - m_Flags: 0 - - m_Name: - m_Id: cbac6039-9c09-46a1-b5f2-4e5124ccb5ed - m_Path: /2 - m_Interactions: - m_Processors: - m_Groups: Keyboard&Mouse - m_Action: Next - m_Flags: 0 - - m_Name: - m_Id: e15ca19d-e649-4852-97d5-7fe8ccc44e94 - m_Path: /dpad/right - m_Interactions: - m_Processors: - m_Groups: Gamepad - m_Action: Next - m_Flags: 0 - - m_Name: - m_Id: f2e9ba44-c423-42a7-ad56-f20975884794 - m_Path: /leftShift - m_Interactions: - m_Processors: - m_Groups: Keyboard&Mouse - m_Action: Sprint - m_Flags: 0 - - m_Name: - m_Id: 8cbb2f4b-a784-49cc-8d5e-c010b8c7f4e6 - m_Path: /leftStickPress - m_Interactions: - m_Processors: - m_Groups: Gamepad - m_Action: Sprint - m_Flags: 0 - - m_Name: - m_Id: d8bf24bf-3f2f-4160-a97c-38ec1eb520ba - m_Path: /trigger - m_Interactions: - m_Processors: - m_Groups: XR - m_Action: Sprint - m_Flags: 0 - - m_Name: - m_Id: eb40bb66-4559-4dfa-9a2f-820438abb426 - m_Path: /space - m_Interactions: - m_Processors: - m_Groups: Keyboard&Mouse - m_Action: Jump - m_Flags: 0 - - m_Name: - m_Id: daba33a1-ad0c-4742-a909-43ad1cdfbeb6 - m_Path: /buttonSouth - m_Interactions: - m_Processors: - m_Groups: Gamepad - m_Action: Jump - m_Flags: 0 - - m_Name: - m_Id: 603f3daf-40bd-4854-8724-93e8017f59e3 - m_Path: /secondaryButton - m_Interactions: - m_Processors: - m_Groups: XR - m_Action: Jump - m_Flags: 0 - - m_Name: - m_Id: 1534dc16-a6aa-499d-9c3a-22b47347b52a - m_Path: /1 - m_Interactions: - m_Processors: - m_Groups: Keyboard&Mouse - m_Action: Previous - m_Flags: 0 - - m_Name: - m_Id: 25060bbd-a3a6-476e-8fba-45ae484aad05 - m_Path: /dpad/left - m_Interactions: - m_Processors: - m_Groups: Gamepad - m_Action: Previous - m_Flags: 0 - - m_Name: - m_Id: 1c04ea5f-b012-41d1-a6f7-02e963b52893 - m_Path: /e - m_Interactions: - m_Processors: - m_Groups: Keyboard&Mouse - m_Action: Interact - m_Flags: 0 - - m_Name: - m_Id: b3f66d0b-7751-423f-908b-a11c5bd95930 - m_Path: /buttonNorth - m_Interactions: - m_Processors: - m_Groups: Gamepad - m_Action: Interact - m_Flags: 0 - - m_Name: - m_Id: 4f4649ac-64a8-4a73-af11-b3faef356a4d - m_Path: /buttonEast - m_Interactions: - m_Processors: - m_Groups: Gamepad - m_Action: Crouch - m_Flags: 0 - - m_Name: - m_Id: 36e52cba-0905-478e-a818-f4bfcb9f3b9a - m_Path: /c - m_Interactions: - m_Processors: - m_Groups: Keyboard&Mouse - m_Action: Crouch - m_Flags: 0 - - m_Name: UI - m_Id: 272f6d14-89ba-496f-b7ff-215263d3219f - m_Asset: {fileID: -4022728701091717789} - m_Actions: - - m_Name: Navigate - m_Type: 2 - m_ExpectedControlType: Vector2 - m_Id: c95b2375-e6d9-4b88-9c4c-c5e76515df4b - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - - m_Name: Submit - m_Type: 1 - m_ExpectedControlType: Button - m_Id: 7607c7b6-cd76-4816-beef-bd0341cfe950 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - - m_Name: Cancel - m_Type: 1 - m_ExpectedControlType: Button - m_Id: 15cef263-9014-4fd5-94d9-4e4a6234a6ef - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - - m_Name: Point - m_Type: 2 - m_ExpectedControlType: Vector2 - m_Id: 32b35790-4ed0-4e9a-aa41-69ac6d629449 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 1 - - m_Name: Click - m_Type: 2 - m_ExpectedControlType: Button - m_Id: 3c7022bf-7922-4f7c-a998-c437916075ad - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 1 - - m_Name: RightClick - m_Type: 2 - m_ExpectedControlType: Button - m_Id: 44b200b1-1557-4083-816c-b22cbdf77ddf - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - - m_Name: MiddleClick - m_Type: 2 - m_ExpectedControlType: Button - m_Id: dad70c86-b58c-4b17-88ad-f5e53adf419e - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - - m_Name: ScrollWheel - m_Type: 2 - m_ExpectedControlType: Vector2 - m_Id: 0489e84a-4833-4c40-bfae-cea84b696689 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - - m_Name: TrackedDevicePosition - m_Type: 2 - m_ExpectedControlType: Vector3 - m_Id: 24908448-c609-4bc3-a128-ea258674378a - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - - m_Name: TrackedDeviceOrientation - m_Type: 2 - m_ExpectedControlType: Quaternion - m_Id: 9caa3d8a-6b2f-4e8e-8bad-6ede561bd9be - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Bindings: - - m_Name: Gamepad - m_Id: 809f371f-c5e2-4e7a-83a1-d867598f40dd - m_Path: 2DVector - m_Interactions: - m_Processors: - m_Groups: - m_Action: Navigate - m_Flags: 4 - - m_Name: up - m_Id: 14a5d6e8-4aaf-4119-a9ef-34b8c2c548bf - m_Path: /leftStick/up - m_Interactions: - m_Processors: - m_Groups: ;Gamepad - m_Action: Navigate - m_Flags: 8 - - m_Name: up - m_Id: 9144cbe6-05e1-4687-a6d7-24f99d23dd81 - m_Path: /rightStick/up - m_Interactions: - m_Processors: - m_Groups: ;Gamepad - m_Action: Navigate - m_Flags: 8 - - m_Name: down - m_Id: 2db08d65-c5fb-421b-983f-c71163608d67 - m_Path: /leftStick/down - m_Interactions: - m_Processors: - m_Groups: ;Gamepad - m_Action: Navigate - m_Flags: 8 - - m_Name: down - m_Id: 58748904-2ea9-4a80-8579-b500e6a76df8 - m_Path: /rightStick/down - m_Interactions: - m_Processors: - m_Groups: ;Gamepad - m_Action: Navigate - m_Flags: 8 - - m_Name: left - m_Id: 8ba04515-75aa-45de-966d-393d9bbd1c14 - m_Path: /leftStick/left - m_Interactions: - m_Processors: - m_Groups: ;Gamepad - m_Action: Navigate - m_Flags: 8 - - m_Name: left - m_Id: 712e721c-bdfb-4b23-a86c-a0d9fcfea921 - m_Path: /rightStick/left - m_Interactions: - m_Processors: - m_Groups: ;Gamepad - m_Action: Navigate - m_Flags: 8 - - m_Name: right - m_Id: fcd248ae-a788-4676-a12e-f4d81205600b - m_Path: /leftStick/right - m_Interactions: - m_Processors: - m_Groups: ;Gamepad - m_Action: Navigate - m_Flags: 8 - - m_Name: right - m_Id: 1f04d9bc-c50b-41a1-bfcc-afb75475ec20 - m_Path: /rightStick/right - m_Interactions: - m_Processors: - m_Groups: ;Gamepad - m_Action: Navigate - m_Flags: 8 - - m_Name: - m_Id: fb8277d4-c5cd-4663-9dc7-ee3f0b506d90 - m_Path: /dpad - m_Interactions: - m_Processors: - m_Groups: ;Gamepad - m_Action: Navigate - m_Flags: 0 - - m_Name: Joystick - m_Id: e25d9774-381c-4a61-b47c-7b6b299ad9f9 - m_Path: 2DVector - m_Interactions: - m_Processors: - m_Groups: - m_Action: Navigate - m_Flags: 4 - - m_Name: up - m_Id: 3db53b26-6601-41be-9887-63ac74e79d19 - m_Path: /stick/up - m_Interactions: - m_Processors: - m_Groups: Joystick - m_Action: Navigate - m_Flags: 8 - - m_Name: down - m_Id: 0cb3e13e-3d90-4178-8ae6-d9c5501d653f - m_Path: /stick/down - m_Interactions: - m_Processors: - m_Groups: Joystick - m_Action: Navigate - m_Flags: 8 - - m_Name: left - m_Id: 0392d399-f6dd-4c82-8062-c1e9c0d34835 - m_Path: /stick/left - m_Interactions: - m_Processors: - m_Groups: Joystick - m_Action: Navigate - m_Flags: 8 - - m_Name: right - m_Id: 942a66d9-d42f-43d6-8d70-ecb4ba5363bc - m_Path: /stick/right - m_Interactions: - m_Processors: - m_Groups: Joystick - m_Action: Navigate - m_Flags: 8 - - m_Name: Keyboard - m_Id: ff527021-f211-4c02-933e-5976594c46ed - m_Path: 2DVector - m_Interactions: - m_Processors: - m_Groups: - m_Action: Navigate - m_Flags: 4 - - m_Name: up - m_Id: 563fbfdd-0f09-408d-aa75-8642c4f08ef0 - m_Path: /w - m_Interactions: - m_Processors: - m_Groups: Keyboard&Mouse - m_Action: Navigate - m_Flags: 8 - - m_Name: up - m_Id: eb480147-c587-4a33-85ed-eb0ab9942c43 - m_Path: /upArrow - m_Interactions: - m_Processors: - m_Groups: Keyboard&Mouse - m_Action: Navigate - m_Flags: 8 - - m_Name: down - m_Id: 2bf42165-60bc-42ca-8072-8c13ab40239b - m_Path: /s - m_Interactions: - m_Processors: - m_Groups: Keyboard&Mouse - m_Action: Navigate - m_Flags: 8 - - m_Name: down - m_Id: 85d264ad-e0a0-4565-b7ff-1a37edde51ac - m_Path: /downArrow - m_Interactions: - m_Processors: - m_Groups: Keyboard&Mouse - m_Action: Navigate - m_Flags: 8 - - m_Name: left - m_Id: 74214943-c580-44e4-98eb-ad7eebe17902 - m_Path: /a - m_Interactions: - m_Processors: - m_Groups: Keyboard&Mouse - m_Action: Navigate - m_Flags: 8 - - m_Name: left - m_Id: cea9b045-a000-445b-95b8-0c171af70a3b - m_Path: /leftArrow - m_Interactions: - m_Processors: - m_Groups: Keyboard&Mouse - m_Action: Navigate - m_Flags: 8 - - m_Name: right - m_Id: 8607c725-d935-4808-84b1-8354e29bab63 - m_Path: /d - m_Interactions: - m_Processors: - m_Groups: Keyboard&Mouse - m_Action: Navigate - m_Flags: 8 - - m_Name: right - m_Id: 4cda81dc-9edd-4e03-9d7c-a71a14345d0b - m_Path: /rightArrow - m_Interactions: - m_Processors: - m_Groups: Keyboard&Mouse - m_Action: Navigate - m_Flags: 8 - - m_Name: - m_Id: 9e92bb26-7e3b-4ec4-b06b-3c8f8e498ddc - m_Path: '*/{Submit}' - m_Interactions: - m_Processors: - m_Groups: Keyboard&Mouse;Gamepad;Touch;Joystick;XR - m_Action: Submit - m_Flags: 0 - - m_Name: - m_Id: 82627dcc-3b13-4ba9-841d-e4b746d6553e - m_Path: '*/{Cancel}' - m_Interactions: - m_Processors: - m_Groups: Keyboard&Mouse;Gamepad;Touch;Joystick;XR - m_Action: Cancel - m_Flags: 0 - - m_Name: - m_Id: c52c8e0b-8179-41d3-b8a1-d149033bbe86 - m_Path: /position - m_Interactions: - m_Processors: - m_Groups: Keyboard&Mouse - m_Action: Point - m_Flags: 0 - - m_Name: - m_Id: e1394cbc-336e-44ce-9ea8-6007ed6193f7 - m_Path: /position - m_Interactions: - m_Processors: - m_Groups: Keyboard&Mouse - m_Action: Point - m_Flags: 0 - - m_Name: - m_Id: 5693e57a-238a-46ed-b5ae-e64e6e574302 - m_Path: /touch*/position - m_Interactions: - m_Processors: - m_Groups: Touch - m_Action: Point - m_Flags: 0 - - m_Name: - m_Id: 4faf7dc9-b979-4210-aa8c-e808e1ef89f5 - m_Path: /leftButton - m_Interactions: - m_Processors: - m_Groups: ;Keyboard&Mouse - m_Action: Click - m_Flags: 0 - - m_Name: - m_Id: 8d66d5ba-88d7-48e6-b1cd-198bbfef7ace - m_Path: /tip - m_Interactions: - m_Processors: - m_Groups: ;Keyboard&Mouse - m_Action: Click - m_Flags: 0 - - m_Name: - m_Id: 47c2a644-3ebc-4dae-a106-589b7ca75b59 - m_Path: /touch*/press - m_Interactions: - m_Processors: - m_Groups: Touch - m_Action: Click - m_Flags: 0 - - m_Name: - m_Id: bb9e6b34-44bf-4381-ac63-5aa15d19f677 - m_Path: /trigger - m_Interactions: - m_Processors: - m_Groups: XR - m_Action: Click - m_Flags: 0 - - m_Name: - m_Id: 38c99815-14ea-4617-8627-164d27641299 - m_Path: /scroll - m_Interactions: - m_Processors: - m_Groups: ;Keyboard&Mouse - m_Action: ScrollWheel - m_Flags: 0 - - m_Name: - m_Id: 4c191405-5738-4d4b-a523-c6a301dbf754 - m_Path: /rightButton - m_Interactions: - m_Processors: - m_Groups: Keyboard&Mouse - m_Action: RightClick - m_Flags: 0 - - m_Name: - m_Id: 24066f69-da47-44f3-a07e-0015fb02eb2e - m_Path: /middleButton - m_Interactions: - m_Processors: - m_Groups: Keyboard&Mouse - m_Action: MiddleClick - m_Flags: 0 - - m_Name: - m_Id: 7236c0d9-6ca3-47cf-a6ee-a97f5b59ea77 - m_Path: /devicePosition - m_Interactions: - m_Processors: - m_Groups: XR - m_Action: TrackedDevicePosition - m_Flags: 0 - - m_Name: - m_Id: 23e01e3a-f935-4948-8d8b-9bcac77714fb - m_Path: /deviceRotation - m_Interactions: - m_Processors: - m_Groups: XR - m_Action: TrackedDeviceOrientation - m_Flags: 0 - m_ControlSchemes: - - m_Name: Keyboard&Mouse - m_BindingGroup: Keyboard&Mouse - m_DeviceRequirements: - - m_ControlPath: - m_Flags: 0 - - m_ControlPath: - m_Flags: 0 - - m_Name: Gamepad - m_BindingGroup: Gamepad - m_DeviceRequirements: - - m_ControlPath: - m_Flags: 0 - - m_Name: Touch - m_BindingGroup: Touch - m_DeviceRequirements: - - m_ControlPath: - m_Flags: 0 - - m_Name: Joystick - m_BindingGroup: Joystick - m_DeviceRequirements: - - m_ControlPath: - m_Flags: 0 - - m_Name: XR - m_BindingGroup: XR - m_DeviceRequirements: - - m_ControlPath: - m_Flags: 0 ---- !u!114 &-3965379426457554002 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} - m_Name: UI/Submit - m_EditorClassIdentifier: - m_Asset: {fileID: -4022728701091717789} - m_ActionId: 7607c7b6-cd76-4816-beef-bd0341cfe950 ---- !u!114 &-3127691080085075464 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} - m_Name: UI/Navigate - m_EditorClassIdentifier: - m_Asset: {fileID: -4022728701091717789} - m_ActionId: c95b2375-e6d9-4b88-9c4c-c5e76515df4b ---- !u!114 &-2010927484808927786 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} - m_Name: UI/TrackedDevicePosition - m_EditorClassIdentifier: - m_Asset: {fileID: -4022728701091717789} - m_ActionId: 24908448-c609-4bc3-a128-ea258674378a ---- !u!114 &-904625355109497667 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} - m_Name: Player/Jump - m_EditorClassIdentifier: - m_Asset: {fileID: -4022728701091717789} - m_ActionId: f1ba0d36-48eb-4cd5-b651-1c94a6531f70 ---- !u!114 &-686852967719455193 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} - m_Name: Player/Look - m_EditorClassIdentifier: - m_Asset: {fileID: -4022728701091717789} - m_ActionId: 6b444451-8a00-4d00-a97e-f47457f736a8 --- !u!13 &1 InputManager: m_ObjectHideFlags: 0 @@ -1427,115 +486,3 @@ InputManager: axis: 5 joyNum: 0 m_UsePhysicalKeys: 1 ---- !u!114 &728015373813780041 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} - m_Name: UI/RightClick - m_EditorClassIdentifier: - m_Asset: {fileID: -4022728701091717789} - m_ActionId: 44b200b1-1557-4083-816c-b22cbdf77ddf ---- !u!114 &1291346785401375180 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} - m_Name: UI/ScrollWheel - m_EditorClassIdentifier: - m_Asset: {fileID: -4022728701091717789} - m_ActionId: 0489e84a-4833-4c40-bfae-cea84b696689 ---- !u!114 &1918450080377512709 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} - m_Name: Player/Previous - m_EditorClassIdentifier: - m_Asset: {fileID: -4022728701091717789} - m_ActionId: 2776c80d-3c14-4091-8c56-d04ced07a2b0 ---- !u!114 &2481665413342675700 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} - m_Name: Player/Crouch - m_EditorClassIdentifier: - m_Asset: {fileID: -4022728701091717789} - m_ActionId: 27c5f898-bc57-4ee1-8800-db469aca5fe3 ---- !u!114 &2796878842316341624 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} - m_Name: UI/MiddleClick - m_EditorClassIdentifier: - m_Asset: {fileID: -4022728701091717789} - m_ActionId: dad70c86-b58c-4b17-88ad-f5e53adf419e ---- !u!114 &3223566915479619813 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} - m_Name: Player/Sprint - m_EditorClassIdentifier: - m_Asset: {fileID: -4022728701091717789} - m_ActionId: 641cd816-40e6-41b4-8c3d-04687c349290 ---- !u!114 &4780473726255618035 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} - m_Name: Player/Next - m_EditorClassIdentifier: - m_Asset: {fileID: -4022728701091717789} - m_ActionId: b7230bb6-fc9b-4f52-8b25-f5e19cb2c2ba ---- !u!114 &8890781979033400217 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} - m_Name: Player/Move - m_EditorClassIdentifier: - m_Asset: {fileID: -4022728701091717789} - m_ActionId: 351f2ccd-1f9f-44bf-9bec-d62ac5c5f408 diff --git a/Experimental/DedicatedGameServer/ProjectSettings/MultiplayerManager.asset b/Experimental/DedicatedGameServer/ProjectSettings/MultiplayerManager.asset index 25be2dd90..e389741e9 100644 --- a/Experimental/DedicatedGameServer/ProjectSettings/MultiplayerManager.asset +++ b/Experimental/DedicatedGameServer/ProjectSettings/MultiplayerManager.asset @@ -3,7 +3,6 @@ --- !u!655991488 &1 MultiplayerManager: m_ObjectHideFlags: 0 - m_ActiveMultiplayerRoles: 1 m_EnableMultiplayerRoles: 1 m_StrippingTypes: 1: [] @@ -59,8 +58,8 @@ MultiplayerManager: - UnityEngine.AudioModule:UnityEngine:AudioBehaviour - UnityEngine.UI:UnityEngine.UI:Scrollbar - UnityEngine.UI:UnityEngine.UI:Text - - UnityEngine.UI:UnityEngine.UI:VerticalLayoutGroup - UnityEngine.UI:UnityEngine.UI:GridLayoutGroup + - UnityEngine.UI:UnityEngine.UI:VerticalLayoutGroup - UnityEngine.UI:UnityEngine.UI:Mask - UnityEngine.AudioModule:UnityEngine:AudioListener - UnityEngine.CoreModule:UnityEngine:BillboardRenderer diff --git a/Experimental/DedicatedGameServer/ProjectSettings/ProjectVersion.txt b/Experimental/DedicatedGameServer/ProjectSettings/ProjectVersion.txt index 97bd5d0c8..be6307c45 100644 --- a/Experimental/DedicatedGameServer/ProjectSettings/ProjectVersion.txt +++ b/Experimental/DedicatedGameServer/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2023.3.0a17 -m_EditorVersionWithRevision: 2023.3.0a17 (771c7abb2095) +m_EditorVersion: 6000.0.3f1 +m_EditorVersionWithRevision: 6000.0.3f1 (019aa96b6ed9) diff --git a/Experimental/DedicatedGameServer/ProjectSettings/VirtualProjectsConfig.json b/Experimental/DedicatedGameServer/ProjectSettings/VirtualProjectsConfig.json new file mode 100644 index 000000000..2dc1fd044 --- /dev/null +++ b/Experimental/DedicatedGameServer/ProjectSettings/VirtualProjectsConfig.json @@ -0,0 +1,4 @@ +{ + "PlayerTags": [], + "version": "1.1.0" +} \ No newline at end of file From 7a647b54fd453d40837346aed2bb172ea1eaaf05 Mon Sep 17 00:00:00 2001 From: Paolo Abela Date: Tue, 28 May 2024 15:52:08 +0100 Subject: [PATCH 02/19] chore: update Unity version in the CI for Dedicated Game Server --- .yamato/project.metafile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/project.metafile b/.yamato/project.metafile index 0186a4c89..6201d4074 100644 --- a/.yamato/project.metafile +++ b/.yamato/project.metafile @@ -47,7 +47,7 @@ projects: - name: dedicatedgameserver path: Experimental/DedicatedGameServer test_editors: - - 2023.3.0a17 + - 6000.0.3 run_editor_tests: !!bool false run_playmode_tests: !!bool true test_filter: Unity.DedicatedGameServerSample.Tests From d60cedf82cd5ca2ae28fd0abf08f4ddf69b5499f Mon Sep 17 00:00:00 2001 From: Paolo Abela Date: Tue, 28 May 2024 17:14:22 +0100 Subject: [PATCH 03/19] chore: attempted to change editor version to see if DGS sample can build --- .yamato/project.metafile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/project.metafile b/.yamato/project.metafile index 6201d4074..a87a009b8 100644 --- a/.yamato/project.metafile +++ b/.yamato/project.metafile @@ -47,7 +47,7 @@ projects: - name: dedicatedgameserver path: Experimental/DedicatedGameServer test_editors: - - 6000.0.3 + - 6000.0.3f1 run_editor_tests: !!bool false run_playmode_tests: !!bool true test_filter: Unity.DedicatedGameServerSample.Tests From d7907376b6fe42576c7044098c792685df067665 Mon Sep 17 00:00:00 2001 From: Paolo Abela Date: Wed, 29 May 2024 10:52:47 +0100 Subject: [PATCH 04/19] feat: updated logic in BuildProcessor so it doesn't use deprecated (and now unneeded) APIs --- .yamato/project.metafile | 2 +- .../DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.yamato/project.metafile b/.yamato/project.metafile index a87a009b8..6201d4074 100644 --- a/.yamato/project.metafile +++ b/.yamato/project.metafile @@ -47,7 +47,7 @@ projects: - name: dedicatedgameserver path: Experimental/DedicatedGameServer test_editors: - - 6000.0.3f1 + - 6000.0.3 run_editor_tests: !!bool false run_playmode_tests: !!bool true test_filter: Unity.DedicatedGameServerSample.Tests diff --git a/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs b/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs index 1080935b1..4058aea8f 100644 --- a/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs +++ b/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs @@ -132,7 +132,6 @@ internal static void BuildServer(BuildTarget target, string locationPathName, bo { Debug.Log($"Building {target} server"); EditorUserBuildSettings.SwitchActiveBuildTarget(NamedBuildTarget.Server, BuildTarget.StandaloneLinux64); - EditorMultiplayerRolesManager.SetMultiplayerRoleForBuildTarget(NamedBuildTarget.Server, MultiplayerRoleFlags.Server); var report = BuildPipeline.BuildPlayer(new BuildPlayerOptions { scenes = GetScenePaths(), @@ -151,7 +150,6 @@ internal static void BuildClient(BuildTarget target, string locationPathName, bo Debug.Log($"Building {target} client"); EditorUserBuildSettings.SwitchActiveBuildTarget(NamedBuildTarget.Standalone, target); - EditorMultiplayerRolesManager.SetMultiplayerRoleForBuildTarget(NamedBuildTarget.Standalone, MultiplayerRoleFlags.Client); var report = BuildPipeline.BuildPlayer(new BuildPlayerOptions { scenes = GetScenePaths(), From 7cc3b5689f212de0df47dc3cb1b691f369017894 Mon Sep 17 00:00:00 2001 From: Paolo Abela Date: Mon, 3 Jun 2024 08:08:29 +0100 Subject: [PATCH 05/19] chore: temporarily disabled running tests of other samples (will be re-enabled after DGS troubleshooting) --- .yamato/project.metafile | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/.yamato/project.metafile b/.yamato/project.metafile index 6201d4074..7b181e025 100644 --- a/.yamato/project.metafile +++ b/.yamato/project.metafile @@ -16,44 +16,10 @@ test_platforms: # The test-editors field is for editors where tests will happen. The first entry of this array is also used # for validation. Therefore, **do not** put an older V1-lifecycle ver. like 2020.x or 2019.x on top of 'test_editors' projects: - - name: 2dspaceshooter - path: Basic/2DSpaceShooter - test_editors: - - 2022.3 - run_editor_tests: !!bool false - run_playmode_tests: !!bool false - test_filter: - - name: invaders - path: Basic/Invaders - test_editors: - - 2022.3 - run_editor_tests: !!bool false - run_playmode_tests: !!bool false - test_filter: - - name: clientdriven - path: Basic/ClientDriven - test_editors: - - 2022.3 - run_editor_tests: !!bool false - run_playmode_tests: !!bool false - test_filter: - - name: dynamicaddressablesnetworkprefabs - path: Basic/DynamicAddressablesNetworkPrefabs - test_editors: - - 2022.3 - run_editor_tests: !!bool false - run_playmode_tests: !!bool false - test_filter: - name: dedicatedgameserver path: Experimental/DedicatedGameServer test_editors: - 6000.0.3 run_editor_tests: !!bool false run_playmode_tests: !!bool true - test_filter: Unity.DedicatedGameServerSample.Tests - - name: multiplayerusecases - path: Experimental/MultiplayerUseCases - test_editors: - - 2022.3 - run_editor_tests: !!bool true - run_playmode_tests: !!bool false \ No newline at end of file + test_filter: Unity.DedicatedGameServerSample.Tests \ No newline at end of file From ac3cf42cb8a3f62b672534578e6eb671ea7ed897 Mon Sep 17 00:00:00 2001 From: Paolo Abela Date: Mon, 3 Jun 2024 08:08:52 +0100 Subject: [PATCH 06/19] chore: disabled core part of BuildEverything automation to see if Yamato still fails --- .../DedicatedGameServer/Assets/Scripts/Editor/BuildHelpers.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildHelpers.cs b/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildHelpers.cs index 0b5b19a56..ccd5bdd87 100644 --- a/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildHelpers.cs +++ b/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildHelpers.cs @@ -197,7 +197,7 @@ public static void BuildEverything() ToggleAllClients(); ToggleAllServers(); s_ExitApplicationOnFailure = true; - BuildEnabledServersAndClients(); + //BuildEnabledServersAndClients(); s_ExitApplicationOnFailure = false; } From e0d983acb95668c9ca18b3ce4622fab0715d3391 Mon Sep 17 00:00:00 2001 From: Paolo Abela Date: Mon, 3 Jun 2024 08:25:48 +0100 Subject: [PATCH 07/19] chore: bisecting CI failure --- .../Assets/Scripts/Editor/BuildHelpers.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildHelpers.cs b/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildHelpers.cs index ccd5bdd87..ca4ed45c7 100644 --- a/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildHelpers.cs +++ b/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildHelpers.cs @@ -131,7 +131,7 @@ static void BuildAllEnabledServers() var buildPathRoot = Path.Combine("Builds", "Server"); - DeleteOutputFolder("Server/"); + //DeleteOutputFolder("Server/"); if (buildMacOS) { @@ -166,7 +166,7 @@ static void BuildAllEnabledClients() var buildPathRoot = Path.Combine("Builds", "Client"); - DeleteOutputFolder("Client/"); + //DeleteOutputFolder("Client/"); if (buildMacOS) { @@ -197,7 +197,7 @@ public static void BuildEverything() ToggleAllClients(); ToggleAllServers(); s_ExitApplicationOnFailure = true; - //BuildEnabledServersAndClients(); + BuildEnabledServersAndClients(); s_ExitApplicationOnFailure = false; } From 7d0c72e8655db6e62e53f1e72bd6e6d2cb1242ea Mon Sep 17 00:00:00 2001 From: Paolo Abela Date: Mon, 3 Jun 2024 08:56:42 +0100 Subject: [PATCH 08/19] chore: bisecting CI failure --- .../Assets/Scripts/Editor/BuildHelpers.cs | 4 ++-- .../Assets/Scripts/Editor/BuildProcessor.cs | 22 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildHelpers.cs b/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildHelpers.cs index ca4ed45c7..0b5b19a56 100644 --- a/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildHelpers.cs +++ b/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildHelpers.cs @@ -131,7 +131,7 @@ static void BuildAllEnabledServers() var buildPathRoot = Path.Combine("Builds", "Server"); - //DeleteOutputFolder("Server/"); + DeleteOutputFolder("Server/"); if (buildMacOS) { @@ -166,7 +166,7 @@ static void BuildAllEnabledClients() var buildPathRoot = Path.Combine("Builds", "Client"); - //DeleteOutputFolder("Client/"); + DeleteOutputFolder("Client/"); if (buildMacOS) { diff --git a/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs b/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs index 4058aea8f..6e2dd7211 100644 --- a/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs +++ b/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs @@ -150,17 +150,17 @@ internal static void BuildClient(BuildTarget target, string locationPathName, bo Debug.Log($"Building {target} client"); EditorUserBuildSettings.SwitchActiveBuildTarget(NamedBuildTarget.Standalone, target); - var report = BuildPipeline.BuildPlayer(new BuildPlayerOptions - { - scenes = GetScenePaths(), - locationPathName = locationPathName, - target = target, - subtarget = (int) StandaloneBuildSubtarget.Player, - }); - if (exitApplicationOnFailure && report.summary.result != BuildResult.Succeeded) - { - EditorApplication.Exit(1); - } + //var report = BuildPipeline.BuildPlayer(new BuildPlayerOptions + //{ + // scenes = GetScenePaths(), + // locationPathName = locationPathName, + // target = target, + // subtarget = (int) StandaloneBuildSubtarget.Player, + //}); + //if (exitApplicationOnFailure && report.summary.result != BuildResult.Succeeded) + //{ + // EditorApplication.Exit(1); + //} } static string[] GetScenePaths() From 43437554ff7840612d4645e11bf7ad7840e77f89 Mon Sep 17 00:00:00 2001 From: Paolo Abela Date: Mon, 3 Jun 2024 08:57:03 +0100 Subject: [PATCH 09/19] chore: bisecting CI failure --- .../Assets/Scripts/Editor/BuildProcessor.cs | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs b/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs index 6e2dd7211..1a5f88da9 100644 --- a/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs +++ b/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs @@ -132,17 +132,17 @@ internal static void BuildServer(BuildTarget target, string locationPathName, bo { Debug.Log($"Building {target} server"); EditorUserBuildSettings.SwitchActiveBuildTarget(NamedBuildTarget.Server, BuildTarget.StandaloneLinux64); - var report = BuildPipeline.BuildPlayer(new BuildPlayerOptions - { - scenes = GetScenePaths(), - locationPathName = locationPathName, - target = target, - subtarget = (int) StandaloneBuildSubtarget.Server, - }); - if (exitApplicationOnFailure && report.summary.result != BuildResult.Succeeded) - { - EditorApplication.Exit(1); - } + //var report = BuildPipeline.BuildPlayer(new BuildPlayerOptions + //{ + // scenes = GetScenePaths(), + // locationPathName = locationPathName, + // target = target, + // subtarget = (int) StandaloneBuildSubtarget.Server, + //}); + //if (exitApplicationOnFailure && report.summary.result != BuildResult.Succeeded) + //{ + // EditorApplication.Exit(1); + //} } internal static void BuildClient(BuildTarget target, string locationPathName, bool exitApplicationOnFailure = false) From 72f91399c87b8670a6e332708941b23281636aea Mon Sep 17 00:00:00 2001 From: Paolo Abela Date: Mon, 3 Jun 2024 09:24:43 +0100 Subject: [PATCH 10/19] chore: attempted to change build path to see if CI fails --- .../Assets/Scripts/Editor/BuildHelpers.cs | 38 +++++++------- .../Assets/Scripts/Editor/BuildProcessor.cs | 49 +++++++++---------- 2 files changed, 43 insertions(+), 44 deletions(-) diff --git a/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildHelpers.cs b/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildHelpers.cs index 0b5b19a56..f1dcc9e8a 100644 --- a/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildHelpers.cs +++ b/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildHelpers.cs @@ -15,24 +15,24 @@ public static class BuildHelpers const string k_BuildClientAndServer = k_MenuRoot + "Build Client(s) and Server(s)"; const string k_ToggleAllName = k_MenuRoot + "Toggle All clients and servers"; - + const string k_ClientToggleName = k_MenuRoot + "Toggle All clients"; const string k_ClientMacOSToggleName = k_MenuRoot + "Toggle MacOS client"; const string k_ClientWindowsToggleName = k_MenuRoot + "Toggle Windows client"; const string k_ClientLinuxToggleName = k_MenuRoot + "Toggle Linux client"; - + const string k_ServerToggleName = k_MenuRoot + "Toggle All servers"; const string k_ServerMacOSToggleName = k_MenuRoot + "Toggle MacOS server"; const string k_ServerWindowsToggleName = k_MenuRoot + "Toggle Windows server"; const string k_ServerLinuxToggleName = k_MenuRoot + "Toggle Linux server"; - + const int k_MenuGroupingBuild = 0; // to add separator in menus const int k_MenuGroupingToggles = 11; const int k_MenuGroupingClientPlatforms = 22; const int k_MenuGroupingServerPlatforms = 33; static bool s_ExitApplicationOnFailure = false; - + [MenuItem(k_ToggleAllName, false, k_MenuGroupingToggles)] static void ToggleAllClientsAndServers() { @@ -46,7 +46,7 @@ static void ToggleAllClientsAndServers() ToggleMenu(k_ServerWindowsToggleName, newValue); ToggleMenu(k_ServerLinuxToggleName, newValue); } - + [MenuItem(k_ClientToggleName, false, k_MenuGroupingToggles)] static void ToggleAllClients() { @@ -55,25 +55,25 @@ static void ToggleAllClients() ToggleMenu(k_ClientWindowsToggleName, newValue); ToggleMenu(k_ClientLinuxToggleName, newValue); } - + [MenuItem(k_ClientMacOSToggleName, false, k_MenuGroupingClientPlatforms)] static void ToggleClientMacOS() { ToggleMenu(k_ClientMacOSToggleName); } - + [MenuItem(k_ClientWindowsToggleName, false, k_MenuGroupingClientPlatforms)] static void ToggleClientWindows() { ToggleMenu(k_ClientWindowsToggleName); } - + [MenuItem(k_ClientLinuxToggleName, false, k_MenuGroupingClientPlatforms)] static void ToggleClientLinux() { ToggleMenu(k_ClientLinuxToggleName); } - + [MenuItem(k_ServerToggleName, false, k_MenuGroupingToggles)] static void ToggleAllServers() { @@ -82,25 +82,25 @@ static void ToggleAllServers() ToggleMenu(k_ServerWindowsToggleName, newValue); ToggleMenu(k_ServerLinuxToggleName, newValue); } - + [MenuItem(k_ServerMacOSToggleName, false, k_MenuGroupingServerPlatforms)] static void ToggleServerMacOS() { ToggleMenu(k_ServerMacOSToggleName); } - + [MenuItem(k_ServerWindowsToggleName, false, k_MenuGroupingServerPlatforms)] static void ToggleServerWindows() { ToggleMenu(k_ServerWindowsToggleName); } - + [MenuItem(k_ServerLinuxToggleName, false, k_MenuGroupingServerPlatforms)] static void ToggleServerLinux() { ToggleMenu(k_ServerLinuxToggleName); } - + [MenuItem(k_BuildClientAndServer, true)] static bool CanBuildServerAndClient() { @@ -113,7 +113,7 @@ static void BuildEnabledServersAndClients() BuildAllEnabledServers(); BuildAllEnabledClients(); } - + [MenuItem(k_BuildServer, true)] static bool CanBuildServer() { @@ -129,7 +129,7 @@ static void BuildAllEnabledServers() bool buildWindows = Menu.GetChecked(k_ServerWindowsToggleName); bool buildLinux = Menu.GetChecked(k_ServerLinuxToggleName); - var buildPathRoot = Path.Combine("Builds", "Server"); + var buildPathRoot = Path.Combine(Application.dataPath, "..", "Builds", "Server"); DeleteOutputFolder("Server/"); @@ -148,7 +148,7 @@ static void BuildAllEnabledServers() BuildProcessor.BuildServer(BuildTarget.StandaloneLinux64, Path.Combine(buildPathRoot, "Linux64", "Game.x86_64"), s_ExitApplicationOnFailure); } } - + [MenuItem(k_BuildClient, true)] static bool CanBuildClient() { @@ -164,7 +164,7 @@ static void BuildAllEnabledClients() bool buildWindows = Menu.GetChecked(k_ClientWindowsToggleName); bool buildLinux = Menu.GetChecked(k_ClientLinuxToggleName); - var buildPathRoot = Path.Combine("Builds", "Client"); + var buildPathRoot = Path.Combine(Application.dataPath, "..", "Builds", "Client"); DeleteOutputFolder("Client/"); @@ -183,7 +183,7 @@ static void BuildAllEnabledClients() BuildProcessor.BuildClient(BuildTarget.StandaloneLinux64, Path.Combine(buildPathRoot, "Linux64", "Game.x86_64"), s_ExitApplicationOnFailure); } } - + /// /// Toggles everything on and builds a client and a server for each platform. This is used in the continuous integration flow. /// @@ -192,7 +192,7 @@ public static void BuildEverything() // setting menus unchecked so toggling afterwards will check everything ToggleMenu(k_ClientToggleName, false); ToggleMenu(k_ServerToggleName, false); - + // toggling on every platform ToggleAllClients(); ToggleAllServers(); diff --git a/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs b/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs index 1a5f88da9..acbaca6e1 100644 --- a/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs +++ b/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs @@ -130,37 +130,36 @@ MetagameApplication FindMetagameAppInProject() internal static void BuildServer(BuildTarget target, string locationPathName, bool exitApplicationOnFailure = false) { - Debug.Log($"Building {target} server"); + Debug.Log($"Building {target} server in: {locationPathName}"); EditorUserBuildSettings.SwitchActiveBuildTarget(NamedBuildTarget.Server, BuildTarget.StandaloneLinux64); - //var report = BuildPipeline.BuildPlayer(new BuildPlayerOptions - //{ - // scenes = GetScenePaths(), - // locationPathName = locationPathName, - // target = target, - // subtarget = (int) StandaloneBuildSubtarget.Server, - //}); - //if (exitApplicationOnFailure && report.summary.result != BuildResult.Succeeded) - //{ - // EditorApplication.Exit(1); - //} + var report = BuildPipeline.BuildPlayer(new BuildPlayerOptions + { + scenes = GetScenePaths(), + locationPathName = locationPathName, + target = target, + subtarget = (int)StandaloneBuildSubtarget.Server, + }); + if (exitApplicationOnFailure && report.summary.result != BuildResult.Succeeded) + { + EditorApplication.Exit(1); + } } internal static void BuildClient(BuildTarget target, string locationPathName, bool exitApplicationOnFailure = false) { - Debug.Log($"Building {target} client"); - + Debug.Log($"Building {target} client in: {locationPathName}"); EditorUserBuildSettings.SwitchActiveBuildTarget(NamedBuildTarget.Standalone, target); - //var report = BuildPipeline.BuildPlayer(new BuildPlayerOptions - //{ - // scenes = GetScenePaths(), - // locationPathName = locationPathName, - // target = target, - // subtarget = (int) StandaloneBuildSubtarget.Player, - //}); - //if (exitApplicationOnFailure && report.summary.result != BuildResult.Succeeded) - //{ - // EditorApplication.Exit(1); - //} + var report = BuildPipeline.BuildPlayer(new BuildPlayerOptions + { + scenes = GetScenePaths(), + locationPathName = locationPathName, + target = target, + subtarget = (int)StandaloneBuildSubtarget.Player, + }); + if (exitApplicationOnFailure && report.summary.result != BuildResult.Succeeded) + { + EditorApplication.Exit(1); + } } static string[] GetScenePaths() From 14510bea1e4514eb267740310a45bc29f4481033 Mon Sep 17 00:00:00 2001 From: Paolo Abela Date: Mon, 3 Jun 2024 09:58:54 +0100 Subject: [PATCH 11/19] Revert "chore: attempted to change build path to see if CI fails" This reverts commit 72f91399c87b8670a6e332708941b23281636aea. --- .../Assets/Scripts/Editor/BuildHelpers.cs | 38 +++++++------- .../Assets/Scripts/Editor/BuildProcessor.cs | 49 ++++++++++--------- 2 files changed, 44 insertions(+), 43 deletions(-) diff --git a/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildHelpers.cs b/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildHelpers.cs index f1dcc9e8a..0b5b19a56 100644 --- a/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildHelpers.cs +++ b/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildHelpers.cs @@ -15,24 +15,24 @@ public static class BuildHelpers const string k_BuildClientAndServer = k_MenuRoot + "Build Client(s) and Server(s)"; const string k_ToggleAllName = k_MenuRoot + "Toggle All clients and servers"; - + const string k_ClientToggleName = k_MenuRoot + "Toggle All clients"; const string k_ClientMacOSToggleName = k_MenuRoot + "Toggle MacOS client"; const string k_ClientWindowsToggleName = k_MenuRoot + "Toggle Windows client"; const string k_ClientLinuxToggleName = k_MenuRoot + "Toggle Linux client"; - + const string k_ServerToggleName = k_MenuRoot + "Toggle All servers"; const string k_ServerMacOSToggleName = k_MenuRoot + "Toggle MacOS server"; const string k_ServerWindowsToggleName = k_MenuRoot + "Toggle Windows server"; const string k_ServerLinuxToggleName = k_MenuRoot + "Toggle Linux server"; - + const int k_MenuGroupingBuild = 0; // to add separator in menus const int k_MenuGroupingToggles = 11; const int k_MenuGroupingClientPlatforms = 22; const int k_MenuGroupingServerPlatforms = 33; static bool s_ExitApplicationOnFailure = false; - + [MenuItem(k_ToggleAllName, false, k_MenuGroupingToggles)] static void ToggleAllClientsAndServers() { @@ -46,7 +46,7 @@ static void ToggleAllClientsAndServers() ToggleMenu(k_ServerWindowsToggleName, newValue); ToggleMenu(k_ServerLinuxToggleName, newValue); } - + [MenuItem(k_ClientToggleName, false, k_MenuGroupingToggles)] static void ToggleAllClients() { @@ -55,25 +55,25 @@ static void ToggleAllClients() ToggleMenu(k_ClientWindowsToggleName, newValue); ToggleMenu(k_ClientLinuxToggleName, newValue); } - + [MenuItem(k_ClientMacOSToggleName, false, k_MenuGroupingClientPlatforms)] static void ToggleClientMacOS() { ToggleMenu(k_ClientMacOSToggleName); } - + [MenuItem(k_ClientWindowsToggleName, false, k_MenuGroupingClientPlatforms)] static void ToggleClientWindows() { ToggleMenu(k_ClientWindowsToggleName); } - + [MenuItem(k_ClientLinuxToggleName, false, k_MenuGroupingClientPlatforms)] static void ToggleClientLinux() { ToggleMenu(k_ClientLinuxToggleName); } - + [MenuItem(k_ServerToggleName, false, k_MenuGroupingToggles)] static void ToggleAllServers() { @@ -82,25 +82,25 @@ static void ToggleAllServers() ToggleMenu(k_ServerWindowsToggleName, newValue); ToggleMenu(k_ServerLinuxToggleName, newValue); } - + [MenuItem(k_ServerMacOSToggleName, false, k_MenuGroupingServerPlatforms)] static void ToggleServerMacOS() { ToggleMenu(k_ServerMacOSToggleName); } - + [MenuItem(k_ServerWindowsToggleName, false, k_MenuGroupingServerPlatforms)] static void ToggleServerWindows() { ToggleMenu(k_ServerWindowsToggleName); } - + [MenuItem(k_ServerLinuxToggleName, false, k_MenuGroupingServerPlatforms)] static void ToggleServerLinux() { ToggleMenu(k_ServerLinuxToggleName); } - + [MenuItem(k_BuildClientAndServer, true)] static bool CanBuildServerAndClient() { @@ -113,7 +113,7 @@ static void BuildEnabledServersAndClients() BuildAllEnabledServers(); BuildAllEnabledClients(); } - + [MenuItem(k_BuildServer, true)] static bool CanBuildServer() { @@ -129,7 +129,7 @@ static void BuildAllEnabledServers() bool buildWindows = Menu.GetChecked(k_ServerWindowsToggleName); bool buildLinux = Menu.GetChecked(k_ServerLinuxToggleName); - var buildPathRoot = Path.Combine(Application.dataPath, "..", "Builds", "Server"); + var buildPathRoot = Path.Combine("Builds", "Server"); DeleteOutputFolder("Server/"); @@ -148,7 +148,7 @@ static void BuildAllEnabledServers() BuildProcessor.BuildServer(BuildTarget.StandaloneLinux64, Path.Combine(buildPathRoot, "Linux64", "Game.x86_64"), s_ExitApplicationOnFailure); } } - + [MenuItem(k_BuildClient, true)] static bool CanBuildClient() { @@ -164,7 +164,7 @@ static void BuildAllEnabledClients() bool buildWindows = Menu.GetChecked(k_ClientWindowsToggleName); bool buildLinux = Menu.GetChecked(k_ClientLinuxToggleName); - var buildPathRoot = Path.Combine(Application.dataPath, "..", "Builds", "Client"); + var buildPathRoot = Path.Combine("Builds", "Client"); DeleteOutputFolder("Client/"); @@ -183,7 +183,7 @@ static void BuildAllEnabledClients() BuildProcessor.BuildClient(BuildTarget.StandaloneLinux64, Path.Combine(buildPathRoot, "Linux64", "Game.x86_64"), s_ExitApplicationOnFailure); } } - + /// /// Toggles everything on and builds a client and a server for each platform. This is used in the continuous integration flow. /// @@ -192,7 +192,7 @@ public static void BuildEverything() // setting menus unchecked so toggling afterwards will check everything ToggleMenu(k_ClientToggleName, false); ToggleMenu(k_ServerToggleName, false); - + // toggling on every platform ToggleAllClients(); ToggleAllServers(); diff --git a/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs b/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs index acbaca6e1..1a5f88da9 100644 --- a/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs +++ b/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs @@ -130,36 +130,37 @@ MetagameApplication FindMetagameAppInProject() internal static void BuildServer(BuildTarget target, string locationPathName, bool exitApplicationOnFailure = false) { - Debug.Log($"Building {target} server in: {locationPathName}"); + Debug.Log($"Building {target} server"); EditorUserBuildSettings.SwitchActiveBuildTarget(NamedBuildTarget.Server, BuildTarget.StandaloneLinux64); - var report = BuildPipeline.BuildPlayer(new BuildPlayerOptions - { - scenes = GetScenePaths(), - locationPathName = locationPathName, - target = target, - subtarget = (int)StandaloneBuildSubtarget.Server, - }); - if (exitApplicationOnFailure && report.summary.result != BuildResult.Succeeded) - { - EditorApplication.Exit(1); - } + //var report = BuildPipeline.BuildPlayer(new BuildPlayerOptions + //{ + // scenes = GetScenePaths(), + // locationPathName = locationPathName, + // target = target, + // subtarget = (int) StandaloneBuildSubtarget.Server, + //}); + //if (exitApplicationOnFailure && report.summary.result != BuildResult.Succeeded) + //{ + // EditorApplication.Exit(1); + //} } internal static void BuildClient(BuildTarget target, string locationPathName, bool exitApplicationOnFailure = false) { - Debug.Log($"Building {target} client in: {locationPathName}"); + Debug.Log($"Building {target} client"); + EditorUserBuildSettings.SwitchActiveBuildTarget(NamedBuildTarget.Standalone, target); - var report = BuildPipeline.BuildPlayer(new BuildPlayerOptions - { - scenes = GetScenePaths(), - locationPathName = locationPathName, - target = target, - subtarget = (int)StandaloneBuildSubtarget.Player, - }); - if (exitApplicationOnFailure && report.summary.result != BuildResult.Succeeded) - { - EditorApplication.Exit(1); - } + //var report = BuildPipeline.BuildPlayer(new BuildPlayerOptions + //{ + // scenes = GetScenePaths(), + // locationPathName = locationPathName, + // target = target, + // subtarget = (int) StandaloneBuildSubtarget.Player, + //}); + //if (exitApplicationOnFailure && report.summary.result != BuildResult.Succeeded) + //{ + // EditorApplication.Exit(1); + //} } static string[] GetScenePaths() From c906cd0aaddb4ce33b4109db2575f925a063c66a Mon Sep 17 00:00:00 2001 From: Paolo Abela Date: Mon, 3 Jun 2024 09:59:18 +0100 Subject: [PATCH 12/19] chore: disabled burst compilation --- .../BurstAotSettings_StandaloneWindows.json | 18 ++++++++++++++++++ .../CommonBurstAotSettings.json | 6 ++++++ 2 files changed, 24 insertions(+) create mode 100644 Experimental/DedicatedGameServer/ProjectSettings/BurstAotSettings_StandaloneWindows.json create mode 100644 Experimental/DedicatedGameServer/ProjectSettings/CommonBurstAotSettings.json diff --git a/Experimental/DedicatedGameServer/ProjectSettings/BurstAotSettings_StandaloneWindows.json b/Experimental/DedicatedGameServer/ProjectSettings/BurstAotSettings_StandaloneWindows.json new file mode 100644 index 000000000..7f891636b --- /dev/null +++ b/Experimental/DedicatedGameServer/ProjectSettings/BurstAotSettings_StandaloneWindows.json @@ -0,0 +1,18 @@ +{ + "MonoBehaviour": { + "Version": 4, + "EnableBurstCompilation": false, + "EnableOptimisations": true, + "EnableSafetyChecks": false, + "EnableDebugInAllBuilds": false, + "DebugDataKind": 1, + "EnableArmv9SecurityFeatures": false, + "CpuMinTargetX32": 0, + "CpuMaxTargetX32": 0, + "CpuMinTargetX64": 0, + "CpuMaxTargetX64": 0, + "CpuTargetsX32": 6, + "CpuTargetsX64": 72, + "OptimizeFor": 0 + } +} diff --git a/Experimental/DedicatedGameServer/ProjectSettings/CommonBurstAotSettings.json b/Experimental/DedicatedGameServer/ProjectSettings/CommonBurstAotSettings.json new file mode 100644 index 000000000..0293dafc8 --- /dev/null +++ b/Experimental/DedicatedGameServer/ProjectSettings/CommonBurstAotSettings.json @@ -0,0 +1,6 @@ +{ + "MonoBehaviour": { + "Version": 4, + "DisabledWarnings": "" + } +} From 33a84b2eda25468a8e74c1168a11ee4cf0cd1f80 Mon Sep 17 00:00:00 2001 From: Paolo Abela Date: Mon, 3 Jun 2024 10:19:47 +0100 Subject: [PATCH 13/19] chore: re-enabled build code --- .../Assets/Scripts/Editor/BuildProcessor.cs | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs b/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs index 1a5f88da9..96a45bb7e 100644 --- a/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs +++ b/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs @@ -132,17 +132,17 @@ internal static void BuildServer(BuildTarget target, string locationPathName, bo { Debug.Log($"Building {target} server"); EditorUserBuildSettings.SwitchActiveBuildTarget(NamedBuildTarget.Server, BuildTarget.StandaloneLinux64); - //var report = BuildPipeline.BuildPlayer(new BuildPlayerOptions - //{ - // scenes = GetScenePaths(), - // locationPathName = locationPathName, - // target = target, - // subtarget = (int) StandaloneBuildSubtarget.Server, - //}); - //if (exitApplicationOnFailure && report.summary.result != BuildResult.Succeeded) - //{ - // EditorApplication.Exit(1); - //} + var report = BuildPipeline.BuildPlayer(new BuildPlayerOptions + { + scenes = GetScenePaths(), + locationPathName = locationPathName, + target = target, + subtarget = (int)StandaloneBuildSubtarget.Server, + }); + if (exitApplicationOnFailure && report.summary.result != BuildResult.Succeeded) + { + EditorApplication.Exit(1); + } } internal static void BuildClient(BuildTarget target, string locationPathName, bool exitApplicationOnFailure = false) @@ -150,17 +150,17 @@ internal static void BuildClient(BuildTarget target, string locationPathName, bo Debug.Log($"Building {target} client"); EditorUserBuildSettings.SwitchActiveBuildTarget(NamedBuildTarget.Standalone, target); - //var report = BuildPipeline.BuildPlayer(new BuildPlayerOptions - //{ - // scenes = GetScenePaths(), - // locationPathName = locationPathName, - // target = target, - // subtarget = (int) StandaloneBuildSubtarget.Player, - //}); - //if (exitApplicationOnFailure && report.summary.result != BuildResult.Succeeded) - //{ - // EditorApplication.Exit(1); - //} + var report = BuildPipeline.BuildPlayer(new BuildPlayerOptions + { + scenes = GetScenePaths(), + locationPathName = locationPathName, + target = target, + subtarget = (int)StandaloneBuildSubtarget.Player, + }); + if (exitApplicationOnFailure && report.summary.result != BuildResult.Succeeded) + { + EditorApplication.Exit(1); + } } static string[] GetScenePaths() From fc2aa5624aea1c8780ab9e7b04bb99da036f285e Mon Sep 17 00:00:00 2001 From: Paolo Abela Date: Mon, 3 Jun 2024 10:50:57 +0100 Subject: [PATCH 14/19] chore: disabled burst compiler programmatically before and after builds --- .../Assets/Scripts/Editor/BuildProcessor.cs | 12 +++++++++++- .../com.unity.sample.dedicated-server.editor.asmdef | 3 ++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs b/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs index 96a45bb7e..c0f8a3193 100644 --- a/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs +++ b/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs @@ -36,7 +36,7 @@ public class BuildProcessor : IPreprocessBuildWithReport, IPostprocessBuildWithR /// The generated build report. public void OnPreprocessBuild(BuildReport report) { - AssetDatabase.SaveAssets(); + DisableBurstCompiler(); ApplyChangesToMetagameApplication(); string definesString = PlayerSettings.GetScriptingDefineSymbols(NamedBuildTarget.FromBuildTargetGroup(EditorUserBuildSettings.selectedBuildTargetGroup)); @@ -55,12 +55,22 @@ public void OnPreprocessBuild(BuildReport report) PlayerSettings.SetScriptingDefineSymbols(NamedBuildTarget.FromBuildTargetGroup(EditorUserBuildSettings.selectedBuildTargetGroup), string.Join(";", allDefines.ToArray())); } + void DisableBurstCompiler() + { + //unfortunately we can't use burst compilation due to a + //bug in its latest version, so we need to disable it. + //It annoyingly re-enables every time you switch platform... + Burst.BurstCompiler.Options.EnableBurstCompilation = false; + AssetDatabase.SaveAssets(); + } + /// /// Called at the end of the build process /// /// The generated build report. public void OnPostprocessBuild(BuildReport report) { + DisableBurstCompiler(); RevertChangesToMetagameApplication(); string definesString = PlayerSettings.GetScriptingDefineSymbols(NamedBuildTarget.FromBuildTargetGroup(EditorUserBuildSettings.selectedBuildTargetGroup)); List allDefines = definesString.Split(';').ToList(); diff --git a/Experimental/DedicatedGameServer/Assets/Scripts/Editor/com.unity.sample.dedicated-server.editor.asmdef b/Experimental/DedicatedGameServer/Assets/Scripts/Editor/com.unity.sample.dedicated-server.editor.asmdef index cd189a922..4fffb2b4d 100644 --- a/Experimental/DedicatedGameServer/Assets/Scripts/Editor/com.unity.sample.dedicated-server.editor.asmdef +++ b/Experimental/DedicatedGameServer/Assets/Scripts/Editor/com.unity.sample.dedicated-server.editor.asmdef @@ -8,7 +8,8 @@ "Unity.Networking.Transport", "Unity.EditorCoroutines.Editor", "Unity.DedicatedServer.MultiplayerRoles", - "Unity.DedicatedServer.MultiplayerRoles.Editor" + "Unity.DedicatedServer.MultiplayerRoles.Editor", + "Unity.Burst" ], "includePlatforms": [ "Editor" From 7cd253d9ab77ee92eb2730bd92e8cc799a7819e5 Mon Sep 17 00:00:00 2001 From: Paolo Abela Date: Mon, 3 Jun 2024 11:30:39 +0100 Subject: [PATCH 15/19] chore: disabled building clients --- .../Assets/Scripts/Editor/BuildProcessor.cs | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs b/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs index c0f8a3193..08b05579a 100644 --- a/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs +++ b/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs @@ -140,7 +140,7 @@ MetagameApplication FindMetagameAppInProject() internal static void BuildServer(BuildTarget target, string locationPathName, bool exitApplicationOnFailure = false) { - Debug.Log($"Building {target} server"); + Debug.Log($"Building {target} server in {locationPathName}"); EditorUserBuildSettings.SwitchActiveBuildTarget(NamedBuildTarget.Server, BuildTarget.StandaloneLinux64); var report = BuildPipeline.BuildPlayer(new BuildPlayerOptions { @@ -157,20 +157,20 @@ internal static void BuildServer(BuildTarget target, string locationPathName, bo internal static void BuildClient(BuildTarget target, string locationPathName, bool exitApplicationOnFailure = false) { - Debug.Log($"Building {target} client"); + Debug.Log($"Building {target} client in {locationPathName}"); EditorUserBuildSettings.SwitchActiveBuildTarget(NamedBuildTarget.Standalone, target); - var report = BuildPipeline.BuildPlayer(new BuildPlayerOptions - { - scenes = GetScenePaths(), - locationPathName = locationPathName, - target = target, - subtarget = (int)StandaloneBuildSubtarget.Player, - }); - if (exitApplicationOnFailure && report.summary.result != BuildResult.Succeeded) - { - EditorApplication.Exit(1); - } + //var report = BuildPipeline.BuildPlayer(new BuildPlayerOptions + //{ + // scenes = GetScenePaths(), + // locationPathName = locationPathName, + // target = target, + // subtarget = (int)StandaloneBuildSubtarget.Player, + //}); + //if (exitApplicationOnFailure && report.summary.result != BuildResult.Succeeded) + //{ + // EditorApplication.Exit(1); + //} } static string[] GetScenePaths() From 3375ff8ea44a27879a765f091374936876833348 Mon Sep 17 00:00:00 2001 From: Paolo Abela Date: Mon, 3 Jun 2024 12:14:19 +0100 Subject: [PATCH 16/19] chore: updated burst to latest version --- Experimental/DedicatedGameServer/Packages/manifest.json | 1 + Experimental/DedicatedGameServer/Packages/packages-lock.json | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Experimental/DedicatedGameServer/Packages/manifest.json b/Experimental/DedicatedGameServer/Packages/manifest.json index c7ee754f0..d6c67548b 100644 --- a/Experimental/DedicatedGameServer/Packages/manifest.json +++ b/Experimental/DedicatedGameServer/Packages/manifest.json @@ -1,6 +1,7 @@ { "dependencies": { "com.unity.ai.navigation": "2.0.0", + "com.unity.burst": "1.8.15", "com.unity.cinemachine": "2.10.0", "com.unity.dedicated-server": "1.1.0", "com.unity.ide.rider": "3.0.28", diff --git a/Experimental/DedicatedGameServer/Packages/packages-lock.json b/Experimental/DedicatedGameServer/Packages/packages-lock.json index 2d64a785d..30e359954 100644 --- a/Experimental/DedicatedGameServer/Packages/packages-lock.json +++ b/Experimental/DedicatedGameServer/Packages/packages-lock.json @@ -10,8 +10,8 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.14", - "depth": 2, + "version": "1.8.15", + "depth": 0, "source": "registry", "dependencies": { "com.unity.mathematics": "1.2.1", From c6314adb37d8eb599635f01513ea76a68dd298e2 Mon Sep 17 00:00:00 2001 From: Paolo Abela Date: Mon, 3 Jun 2024 13:42:25 +0100 Subject: [PATCH 17/19] chore: re-enabled client builds --- .../Assets/Scripts/Editor/BuildProcessor.cs | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs b/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs index 08b05579a..73a105b14 100644 --- a/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs +++ b/Experimental/DedicatedGameServer/Assets/Scripts/Editor/BuildProcessor.cs @@ -160,17 +160,17 @@ internal static void BuildClient(BuildTarget target, string locationPathName, bo Debug.Log($"Building {target} client in {locationPathName}"); EditorUserBuildSettings.SwitchActiveBuildTarget(NamedBuildTarget.Standalone, target); - //var report = BuildPipeline.BuildPlayer(new BuildPlayerOptions - //{ - // scenes = GetScenePaths(), - // locationPathName = locationPathName, - // target = target, - // subtarget = (int)StandaloneBuildSubtarget.Player, - //}); - //if (exitApplicationOnFailure && report.summary.result != BuildResult.Succeeded) - //{ - // EditorApplication.Exit(1); - //} + var report = BuildPipeline.BuildPlayer(new BuildPlayerOptions + { + scenes = GetScenePaths(), + locationPathName = locationPathName, + target = target, + subtarget = (int)StandaloneBuildSubtarget.Player, + }); + if (exitApplicationOnFailure && report.summary.result != BuildResult.Succeeded) + { + EditorApplication.Exit(1); + } } static string[] GetScenePaths() From e0a1f6ecc3bcf10945699483f2fa8c4560b5d05f Mon Sep 17 00:00:00 2001 From: Paolo Abela Date: Mon, 3 Jun 2024 15:16:03 +0100 Subject: [PATCH 18/19] chore: restored tests of other samples --- .yamato/project.metafile | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/.yamato/project.metafile b/.yamato/project.metafile index 7b181e025..6201d4074 100644 --- a/.yamato/project.metafile +++ b/.yamato/project.metafile @@ -16,10 +16,44 @@ test_platforms: # The test-editors field is for editors where tests will happen. The first entry of this array is also used # for validation. Therefore, **do not** put an older V1-lifecycle ver. like 2020.x or 2019.x on top of 'test_editors' projects: + - name: 2dspaceshooter + path: Basic/2DSpaceShooter + test_editors: + - 2022.3 + run_editor_tests: !!bool false + run_playmode_tests: !!bool false + test_filter: + - name: invaders + path: Basic/Invaders + test_editors: + - 2022.3 + run_editor_tests: !!bool false + run_playmode_tests: !!bool false + test_filter: + - name: clientdriven + path: Basic/ClientDriven + test_editors: + - 2022.3 + run_editor_tests: !!bool false + run_playmode_tests: !!bool false + test_filter: + - name: dynamicaddressablesnetworkprefabs + path: Basic/DynamicAddressablesNetworkPrefabs + test_editors: + - 2022.3 + run_editor_tests: !!bool false + run_playmode_tests: !!bool false + test_filter: - name: dedicatedgameserver path: Experimental/DedicatedGameServer test_editors: - 6000.0.3 run_editor_tests: !!bool false run_playmode_tests: !!bool true - test_filter: Unity.DedicatedGameServerSample.Tests \ No newline at end of file + test_filter: Unity.DedicatedGameServerSample.Tests + - name: multiplayerusecases + path: Experimental/MultiplayerUseCases + test_editors: + - 2022.3 + run_editor_tests: !!bool true + run_playmode_tests: !!bool false \ No newline at end of file From f8d36461d6f983d77b5a0c8a644ea0ea0498125d Mon Sep 17 00:00:00 2001 From: Paolo Abela Date: Tue, 4 Jun 2024 09:40:12 +0100 Subject: [PATCH 19/19] feat: added UIToolkit support ot input system configuration chore: removed unneeded input asset, set project-wide input actions file --- .../DedicatedGameServerSample.inputactions | 516 ++++++++ .../Assets/InputSystem_Actions.inputactions | 1057 ----------------- .../InputSystem_Actions.inputactions.meta | 14 - .../ProjectSettings/EditorBuildSettings.asset | 3 +- 4 files changed, 518 insertions(+), 1072 deletions(-) delete mode 100644 Experimental/DedicatedGameServer/Assets/InputSystem_Actions.inputactions delete mode 100644 Experimental/DedicatedGameServer/Assets/InputSystem_Actions.inputactions.meta diff --git a/Experimental/DedicatedGameServer/Assets/InputSystem/DedicatedGameServerSample.inputactions b/Experimental/DedicatedGameServer/Assets/InputSystem/DedicatedGameServerSample.inputactions index 1ecf4741a..c609bc864 100644 --- a/Experimental/DedicatedGameServer/Assets/InputSystem/DedicatedGameServerSample.inputactions +++ b/Experimental/DedicatedGameServer/Assets/InputSystem/DedicatedGameServerSample.inputactions @@ -293,6 +293,522 @@ "isPartOfComposite": false } ] + }, + { + "name": "UI", + "id": "3e0727ac-43aa-40b7-b05e-a9fe6b75b169", + "actions": [ + { + "name": "Navigate", + "type": "PassThrough", + "id": "06024823-05b4-4f22-a11a-97e5c025ccc4", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Submit", + "type": "Button", + "id": "7596186a-007e-44ca-a09c-09c537c65549", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Cancel", + "type": "Button", + "id": "f1dfe8e0-dc7f-4a4e-9d24-a48e1b9836da", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Point", + "type": "PassThrough", + "id": "1ffaeba5-84e0-41ce-bbad-bce91fcda4cb", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Click", + "type": "PassThrough", + "id": "2626b843-1410-429f-9759-091055a7eb50", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "RightClick", + "type": "PassThrough", + "id": "116f2fdf-c2e1-4f32-b578-b0b332318063", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "MiddleClick", + "type": "PassThrough", + "id": "9754a754-e619-45b0-9252-27296fc5d9ba", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "ScrollWheel", + "type": "PassThrough", + "id": "074cbf9b-cf17-41d3-9b83-5939258c6760", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "TrackedDevicePosition", + "type": "PassThrough", + "id": "406ce8c8-f27d-4f03-afcf-4d89da462619", + "expectedControlType": "Vector3", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "TrackedDeviceOrientation", + "type": "PassThrough", + "id": "64415b91-eb7f-412b-b5fc-cecef4d597d1", + "expectedControlType": "Quaternion", + "processors": "", + "interactions": "", + "initialStateCheck": false + } + ], + "bindings": [ + { + "name": "Gamepad", + "id": "a5b1bfa1-919d-4ee1-b350-be0a6b65eab3", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Navigate", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "044c4be5-dc3e-4d02-ad72-ed81cc71d15b", + "path": "/leftStick/up", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "up", + "id": "3a845639-1331-4721-83f8-3eb7dac4ab62", + "path": "/rightStick/up", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "3f83c07d-b86d-483b-af51-1574db92a0c2", + "path": "/leftStick/down", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "01cf97b5-7682-4867-90b6-9d72e5c1ba0a", + "path": "/rightStick/down", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "57c8e1eb-830e-4280-bfd7-6f6f1bd2fb8e", + "path": "/leftStick/left", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "528b3438-c327-42ed-891d-7f4290ad9142", + "path": "/rightStick/left", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "43c1e342-bbb1-4feb-b47e-b4bac2bd1907", + "path": "/leftStick/right", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "ec971f08-e220-4b0a-8bd7-438dfcc5b843", + "path": "/rightStick/right", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "", + "id": "53005cb4-7bbf-4eab-950e-38b82dd2c980", + "path": "/dpad", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "Joystick", + "id": "968c1bf9-afa5-4e1e-aa20-4cce9675a1b3", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Navigate", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "80a10871-ecc1-4f6b-9c4e-fad8d1b8e9b8", + "path": "/stick/up", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "145f88ff-d05c-4d69-bd20-10c701acb2d0", + "path": "/stick/down", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "fb0425f5-a693-491f-9594-8781527162e1", + "path": "/stick/left", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "82e5b11e-7dad-45b0-b477-a1883d0570b9", + "path": "/stick/right", + "interactions": "", + "processors": "", + "groups": "Joystick", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "Keyboard", + "id": "5dc3d7fd-6780-40cc-bcdd-49f10ca150dd", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Navigate", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "e10fa424-f5e8-4007-8d3d-a7731f62047e", + "path": "/w", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "up", + "id": "6528a3b4-221c-497d-8219-62f5e4361928", + "path": "/upArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "bb5ae73c-8866-40a5-8b98-b3ff9b9b5497", + "path": "/s", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "a1cfc9bf-a546-4d58-ae93-e221614451aa", + "path": "/downArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "75d3d6eb-7867-4998-a79a-1b9b75860114", + "path": "/a", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "b8e0803d-c066-4654-a784-c46e91440cb0", + "path": "/leftArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "75f7ef08-44e5-447d-a8c5-95bc6e6efa89", + "path": "/d", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "d7094d06-d09a-4dfd-a7a3-f1274216b62a", + "path": "/rightArrow", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Navigate", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "", + "id": "9930affe-ae03-4515-8626-179a31639bf8", + "path": "*/{Submit}", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse;Gamepad;Touch;Joystick;XR", + "action": "Submit", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "2b22d8c8-f86e-4956-b2ad-d3184f78affe", + "path": "*/{Cancel}", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse;Gamepad;Touch;Joystick;XR", + "action": "Cancel", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "4259148e-54ea-4225-835d-0fac215eb839", + "path": "/position", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "b4ee11bd-982b-43d5-b977-24254b0bddcb", + "path": "/position", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "66f66a77-e947-4832-89ba-fad8173c7e66", + "path": "/touch*/position", + "interactions": "", + "processors": "", + "groups": "Touch", + "action": "Point", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "c09b3fb5-45c0-4f68-aa71-8984c58b9119", + "path": "/leftButton", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "7343b47a-eaea-4f6b-8fa2-c8d5cd6d48d0", + "path": "/tip", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "ccb29cc1-ef1c-4906-9100-03fb8951eef3", + "path": "/touch*/press", + "interactions": "", + "processors": "", + "groups": "Touch", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "6b6996c7-b4f8-42e2-a58f-fab88035c2de", + "path": "/trigger", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "Click", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "5287c6fb-16c6-44cb-a482-61c06a4927c8", + "path": "/scroll", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "ScrollWheel", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "6bd762fe-6024-4505-8c92-245725d0cd0c", + "path": "/rightButton", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "RightClick", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "83d4eaee-e3df-458a-9216-0eb0e21cd6f4", + "path": "/middleButton", + "interactions": "", + "processors": "", + "groups": "Keyboard&Mouse", + "action": "MiddleClick", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "a37a3078-3e04-4893-92c3-cd474ef234b2", + "path": "/devicePosition", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "TrackedDevicePosition", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "659f0797-48f4-4ca9-a6d3-b5f90b2db1b2", + "path": "/deviceRotation", + "interactions": "", + "processors": "", + "groups": "XR", + "action": "TrackedDeviceOrientation", + "isComposite": false, + "isPartOfComposite": false + } + ] } ], "controlSchemes": [ diff --git a/Experimental/DedicatedGameServer/Assets/InputSystem_Actions.inputactions b/Experimental/DedicatedGameServer/Assets/InputSystem_Actions.inputactions deleted file mode 100644 index 278aa57b8..000000000 --- a/Experimental/DedicatedGameServer/Assets/InputSystem_Actions.inputactions +++ /dev/null @@ -1,1057 +0,0 @@ -{ - "name": "InputSystem_Actions", - "maps": [ - { - "name": "Player", - "id": "df70fa95-8a34-4494-b137-73ab6b9c7d37", - "actions": [ - { - "name": "Move", - "type": "Value", - "id": "351f2ccd-1f9f-44bf-9bec-d62ac5c5f408", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Look", - "type": "Value", - "id": "6b444451-8a00-4d00-a97e-f47457f736a8", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Attack", - "type": "Button", - "id": "6c2ab1b8-8984-453a-af3d-a3c78ae1679a", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Interact", - "type": "Button", - "id": "852140f2-7766-474d-8707-702459ba45f3", - "expectedControlType": "Button", - "processors": "", - "interactions": "Hold", - "initialStateCheck": false - }, - { - "name": "Crouch", - "type": "Button", - "id": "27c5f898-bc57-4ee1-8800-db469aca5fe3", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Jump", - "type": "Button", - "id": "f1ba0d36-48eb-4cd5-b651-1c94a6531f70", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Previous", - "type": "Value", - "id": "2776c80d-3c14-4091-8c56-d04ced07a2b0", - "expectedControlType": "Axis", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Next", - "type": "Value", - "id": "b7230bb6-fc9b-4f52-8b25-f5e19cb2c2ba", - "expectedControlType": "Axis", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Sprint", - "type": "Button", - "id": "641cd816-40e6-41b4-8c3d-04687c349290", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - } - ], - "bindings": [ - { - "name": "", - "id": "978bfe49-cc26-4a3d-ab7b-7d7a29327403", - "path": "/leftStick", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Move", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "WASD", - "id": "00ca640b-d935-4593-8157-c05846ea39b3", - "path": "Dpad", - "interactions": "", - "processors": "", - "groups": "", - "action": "Move", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "up", - "id": "e2062cb9-1b15-46a2-838c-2f8d72a0bdd9", - "path": "/w", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "up", - "id": "8180e8bd-4097-4f4e-ab88-4523101a6ce9", - "path": "/upArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "320bffee-a40b-4347-ac70-c210eb8bc73a", - "path": "/s", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "1c5327b5-f71c-4f60-99c7-4e737386f1d1", - "path": "/downArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "d2581a9b-1d11-4566-b27d-b92aff5fabbc", - "path": "/a", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "2e46982e-44cc-431b-9f0b-c11910bf467a", - "path": "/leftArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "fcfe95b8-67b9-4526-84b5-5d0bc98d6400", - "path": "/d", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "77bff152-3580-4b21-b6de-dcd0c7e41164", - "path": "/rightArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "", - "id": "1635d3fe-58b6-4ba9-a4e2-f4b964f6b5c8", - "path": "/{Primary2DAxis}", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Move", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "3ea4d645-4504-4529-b061-ab81934c3752", - "path": "/stick", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Move", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "c1f7a91b-d0fd-4a62-997e-7fb9b69bf235", - "path": "/rightStick", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Look", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "8c8e490b-c610-4785-884f-f04217b23ca4", - "path": "/delta", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse;Touch", - "action": "Look", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "3e5f5442-8668-4b27-a940-df99bad7e831", - "path": "/{Hatswitch}", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Look", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "143bb1cd-cc10-4eca-a2f0-a3664166fe91", - "path": "/buttonWest", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "05f6913d-c316-48b2-a6bb-e225f14c7960", - "path": "/leftButton", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "886e731e-7071-4ae4-95c0-e61739dad6fd", - "path": "/primaryTouch/tap", - "interactions": "", - "processors": "", - "groups": ";Touch", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "ee3d0cd2-254e-47a7-a8cb-bc94d9658c54", - "path": "/trigger", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "8255d333-5683-4943-a58a-ccb207ff1dce", - "path": "/{PrimaryAction}", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "b3c1c7f0-bd20-4ee7-a0f1-899b24bca6d7", - "path": "/enter", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "cbac6039-9c09-46a1-b5f2-4e5124ccb5ed", - "path": "/2", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Next", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "e15ca19d-e649-4852-97d5-7fe8ccc44e94", - "path": "/dpad/right", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Next", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "f2e9ba44-c423-42a7-ad56-f20975884794", - "path": "/leftShift", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Sprint", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "8cbb2f4b-a784-49cc-8d5e-c010b8c7f4e6", - "path": "/leftStickPress", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Sprint", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "d8bf24bf-3f2f-4160-a97c-38ec1eb520ba", - "path": "/trigger", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Sprint", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "eb40bb66-4559-4dfa-9a2f-820438abb426", - "path": "/space", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Jump", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "daba33a1-ad0c-4742-a909-43ad1cdfbeb6", - "path": "/buttonSouth", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Jump", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "603f3daf-40bd-4854-8724-93e8017f59e3", - "path": "/secondaryButton", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Jump", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "1534dc16-a6aa-499d-9c3a-22b47347b52a", - "path": "/1", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Previous", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "25060bbd-a3a6-476e-8fba-45ae484aad05", - "path": "/dpad/left", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Previous", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "1c04ea5f-b012-41d1-a6f7-02e963b52893", - "path": "/e", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Interact", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "b3f66d0b-7751-423f-908b-a11c5bd95930", - "path": "/buttonNorth", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Interact", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "4f4649ac-64a8-4a73-af11-b3faef356a4d", - "path": "/buttonEast", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Crouch", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "36e52cba-0905-478e-a818-f4bfcb9f3b9a", - "path": "/c", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Crouch", - "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/Experimental/DedicatedGameServer/Assets/InputSystem_Actions.inputactions.meta b/Experimental/DedicatedGameServer/Assets/InputSystem_Actions.inputactions.meta deleted file mode 100644 index aed6ed130..000000000 --- a/Experimental/DedicatedGameServer/Assets/InputSystem_Actions.inputactions.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -guid: 11f69b19b763bf74caf33219a6ca8029 -ScriptedImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 2 - userData: - assetBundleName: - assetBundleVariant: - script: {fileID: 11500000, guid: 8404be70184654265930450def6a9037, type: 3} - generateWrapperCode: 0 - wrapperCodePath: - wrapperClassName: - wrapperCodeNamespace: diff --git a/Experimental/DedicatedGameServer/ProjectSettings/EditorBuildSettings.asset b/Experimental/DedicatedGameServer/ProjectSettings/EditorBuildSettings.asset index b0693382c..b058f81cb 100644 --- a/Experimental/DedicatedGameServer/ProjectSettings/EditorBuildSettings.asset +++ b/Experimental/DedicatedGameServer/ProjectSettings/EditorBuildSettings.asset @@ -15,5 +15,6 @@ EditorBuildSettings: path: Assets/Scenes/GameScene01.unity guid: 59b8ab2dc12914f49abb89d9bf130ec3 m_configObjects: - com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 11f69b19b763bf74caf33219a6ca8029, type: 3} + com.unity.input.settings: {fileID: 11400000, guid: 9e7be553448fa2546aea5752021cbcf7, type: 2} + com.unity.input.settings.actions: {fileID: -944628639613478452, guid: c991eb0e4659b8f4a92be9446bf3ee5d, type: 3} m_UseUCBPForAssetBundles: 0