diff --git a/Assets/InputSystem_Actions.inputactions b/Assets/InputSystem_Actions.inputactions index 8fe2672..44347c5 100644 --- a/Assets/InputSystem_Actions.inputactions +++ b/Assets/InputSystem_Actions.inputactions @@ -4,93 +4,30 @@ "maps": [ { "name": "Player", - "id": "df70fa95-8a34-4494-b137-73ab6b9c7d37", + "id": "bd035e3c-59d7-41ef-aa06-6108ba4dd4b1", "actions": [ + { + "name": "Click", + "type": "Button", + "id": "9d38540b-b286-4c5c-8dfb-a43018aed178", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, { "name": "Move", "type": "Value", - "id": "351f2ccd-1f9f-44bf-9bec-d62ac5c5f408", + "id": "f63f8f72-975a-4121-a6dc-7a1cbe2ad94a", "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": "Button", - "id": "2776c80d-3c14-4091-8c56-d04ced07a2b0", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Next", - "type": "Button", - "id": "b7230bb6-fc9b-4f52-8b25-f5e19cb2c2ba", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Sprint", - "type": "Button", - "id": "641cd816-40e6-41b4-8c3d-04687c349290", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, { "name": "Mouse", "type": "Value", - "id": "24341b02-824d-4fad-9ca4-b13eb0e8d4e7", + "id": "ef1ceee0-76ec-42ca-94a4-5ceb8fbdfb67", "expectedControlType": "Vector2", "processors": "", "interactions": "", @@ -100,19 +37,19 @@ "bindings": [ { "name": "", - "id": "978bfe49-cc26-4a3d-ab7b-7d7a29327403", - "path": "/leftStick", + "id": "f2b76d5e-a751-4187-b6ca-60ed2a86f5c9", + "path": "/leftButton", "interactions": "", "processors": "", - "groups": ";Gamepad", - "action": "Move", + "groups": ";Keyboard&Mouse", + "action": "Click", "isComposite": false, "isPartOfComposite": false }, { - "name": "WASD", - "id": "00ca640b-d935-4593-8157-c05846ea39b3", - "path": "Dpad", + "name": "2D Vector", + "id": "4ef87f54-a868-4a6b-be65-020d768b1533", + "path": "2DVector", "interactions": "", "processors": "", "groups": "", @@ -122,7 +59,7 @@ }, { "name": "up", - "id": "e2062cb9-1b15-46a2-838c-2f8d72a0bdd9", + "id": "e7ee6792-e69c-4032-8f4a-a06f59ee6a7d", "path": "/w", "interactions": "", "processors": "", @@ -131,20 +68,9 @@ "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", + "id": "38b0cbec-1da6-44be-b335-c4b5bf0ac1ed", "path": "/s", "interactions": "", "processors": "", @@ -153,20 +79,9 @@ "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", + "id": "16ed2229-8db8-46ab-9572-068de5b43b78", "path": "/a", "interactions": "", "processors": "", @@ -175,20 +90,9 @@ "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", + "id": "ebf38664-3b77-49b2-b4a6-3dc983803428", "path": "/d", "interactions": "", "processors": "", @@ -197,295 +101,9 @@ "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": "", - "id": "37f6f208-f780-4e98-829e-c0037bea0fe7", + "id": "401ca091-2bf4-46ae-991b-27c2736f58c4", "path": "/position", "interactions": "", "processors": "", @@ -495,522 +113,6 @@ "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": [ diff --git a/Assets/Licenses.meta b/Assets/Licenses.meta new file mode 100644 index 0000000..bd03d90 --- /dev/null +++ b/Assets/Licenses.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0f033138cc2be4352aed6ae9e1c6dff6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Licenses/License free.txt b/Assets/Licenses/License free.txt new file mode 100644 index 0000000..0267b39 --- /dev/null +++ b/Assets/Licenses/License free.txt @@ -0,0 +1,45 @@ +IMPORTANT NOTICE: This license only applies if you downloaded this vector as +an unsubscribed user. If you are a premium user (ie, you pay a subscription) +you are bound to the license terms described in the accompanying file +"License premium.txt". + +--------------------- + +You must attribute the image to its author: + +In order to use a vector or a part of it, you must attribute it to Layerace / Freepik, +so we will be able to continue creating new graphic resources every day. + + +How to attribute it? + +For websites: + +Please, copy this code on your website to accredit the author: +Designed by Layerace / Freepik + +For printing: + +Paste this text on the final work so the authorship is known. +- For example, in the acknowledgements chapter of a book: +"Designed by Layerace / Freepik" + + +You are free to use this image: + +- For both personal and commercial projects and to modify it. +- In a website or presentation template or application or as part of your design. + +You are not allowed to: + +- Sub-license, resell or rent it. +- Include it in any online or offline archive or database. + +The full terms of the license are described in section 7 of the Freepik +terms of use, available online in the following link: + + http://www.freepik.com/terms_of_use + +The terms described in the above link have precedence over the terms described +in the present document. In case of disagreement, the Freepik Terms of Use +will prevail. diff --git a/Assets/Licenses/License free.txt.meta b/Assets/Licenses/License free.txt.meta new file mode 100644 index 0000000..0a5fb4d --- /dev/null +++ b/Assets/Licenses/License free.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a84bb550bbd0b405cbd70181ef933d96 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Bullet.prefab b/Assets/Prefabs/Bullet.prefab index ab11413..b42b467 100644 --- a/Assets/Prefabs/Bullet.prefab +++ b/Assets/Prefabs/Bullet.prefab @@ -105,7 +105,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 80aae26211daf7b4d9f8f603e7c6987f, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::BulletMovement - moveSpeed: 10 + moveSpeed: 3 + lifeTime: 2 --- !u!61 &1818131859172166424 BoxCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/MainScene.unity similarity index 72% rename from Assets/Scenes/SampleScene.unity rename to Assets/Scenes/MainScene.unity index f04a7e7..80c845f 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -222,6 +222,7 @@ GameObject: - component: {fileID: 519420031} - component: {fileID: 519420029} - component: {fileID: 519420030} + - component: {fileID: 519420033} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -347,6 +348,38 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &519420033 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineBrain + ShowDebugText: 0 + ShowCameraFrustum: 1 + IgnoreTimeScale: 0 + WorldUpOverride: {fileID: 0} + ChannelMask: -1 + UpdateMethod: 2 + BlendUpdateMethod: 1 + LensModeOverride: + Enabled: 0 + DefaultMode: 2 + DefaultBlend: + Style: 1 + Time: 2 + CustomCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + CustomBlends: {fileID: 0} --- !u!1 &619394800 GameObject: m_ObjectHideFlags: 0 @@ -431,6 +464,192 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &779260763 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 779260765} + - component: {fileID: 779260764} + - component: {fileID: 779260766} + m_Layer: 0 + m_Name: CinemachineCamera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &779260764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 779260763} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f9dfa5b682dcd46bda6128250e975f58, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineCamera + Priority: + Enabled: 1 + m_Value: 0 + OutputChannel: 1 + StandbyUpdate: 2 + m_StreamingVersion: 20241001 + m_LegacyPriority: 0 + Target: + TrackingTarget: {fileID: 1146100370} + LookAtTarget: {fileID: 0} + CustomLookAtTarget: 0 + Lens: + FieldOfView: 34 + OrthographicSize: 5 + NearClipPlane: 0.3 + FarClipPlane: 1000 + Dutch: 0 + ModeOverride: 0 + PhysicalProperties: + GateFit: 2 + SensorSize: {x: 21.946, y: 16.002} + LensShift: {x: 0, y: 0} + FocusDistance: 10 + Iso: 200 + ShutterSpeed: 0.005 + Aperture: 16 + BladeCount: 5 + Curvature: {x: 2, y: 11} + BarrelClipping: 0.25 + Anamorphism: 0 + BlendHint: 0 +--- !u!4 &779260765 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 779260763} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &779260766 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 779260763} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b617507da6d07e749b7efdb34e1173e1, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineFollow + TrackerSettings: + BindingMode: 4 + PositionDamping: {x: 0, y: 0, z: 0} + AngularDampingMode: 0 + RotationDamping: {x: 1, y: 1, z: 1} + QuaternionDamping: 1 + FollowOffset: {x: 0, y: 0, z: -10} +--- !u!1 &903255911 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 903255912} + - component: {fileID: 903255913} + m_Layer: 0 + m_Name: BackGround + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &903255912 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 903255911} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 20, y: 10, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &903255913 +SpriteRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 903255911} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: cd74d1883649c474eb4fc1d7f2017b95, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_Sprite: {fileID: 21300000, guid: 8edaa247ddb25401b864cc16ce8f3b03, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 2 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_SpriteSortPoint: 0 --- !u!1 &1146100368 GameObject: m_ObjectHideFlags: 0 @@ -537,7 +756,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::Player bulletPrefab: {fileID: 3217186003837015034, guid: 204cdd5e6f663694d8d6e719543b2018, type: 3} - bulletCount: 30 + bulletCount: 21 + backGround: {fileID: 903255911} + moveSpeed: 2 + fireRate: 0.1 --- !u!1 &1777497058 GameObject: m_ObjectHideFlags: 0 @@ -590,3 +812,5 @@ SceneRoots: - {fileID: 619394802} - {fileID: 1146100370} - {fileID: 1777497060} + - {fileID: 779260765} + - {fileID: 903255912} diff --git a/Assets/Scenes/SampleScene.unity.meta b/Assets/Scenes/MainScene.unity.meta similarity index 100% rename from Assets/Scenes/SampleScene.unity.meta rename to Assets/Scenes/MainScene.unity.meta diff --git a/Assets/Scripts/InputSystem.cs b/Assets/Scripts/InputSystem.cs index c3eba8e..d7a7244 100644 --- a/Assets/Scripts/InputSystem.cs +++ b/Assets/Scripts/InputSystem.cs @@ -90,93 +90,30 @@ public partial class @InputSystem: IInputActionCollection2, IDisposable ""maps"": [ { ""name"": ""Player"", - ""id"": ""df70fa95-8a34-4494-b137-73ab6b9c7d37"", + ""id"": ""bd035e3c-59d7-41ef-aa06-6108ba4dd4b1"", ""actions"": [ + { + ""name"": ""Click"", + ""type"": ""Button"", + ""id"": ""9d38540b-b286-4c5c-8dfb-a43018aed178"", + ""expectedControlType"": """", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": false + }, { ""name"": ""Move"", ""type"": ""Value"", - ""id"": ""351f2ccd-1f9f-44bf-9bec-d62ac5c5f408"", + ""id"": ""f63f8f72-975a-4121-a6dc-7a1cbe2ad94a"", ""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"": ""Button"", - ""id"": ""2776c80d-3c14-4091-8c56-d04ced07a2b0"", - ""expectedControlType"": ""Button"", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": false - }, - { - ""name"": ""Next"", - ""type"": ""Button"", - ""id"": ""b7230bb6-fc9b-4f52-8b25-f5e19cb2c2ba"", - ""expectedControlType"": ""Button"", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": false - }, - { - ""name"": ""Sprint"", - ""type"": ""Button"", - ""id"": ""641cd816-40e6-41b4-8c3d-04687c349290"", - ""expectedControlType"": ""Button"", - ""processors"": """", - ""interactions"": """", - ""initialStateCheck"": false - }, { ""name"": ""Mouse"", ""type"": ""Value"", - ""id"": ""24341b02-824d-4fad-9ca4-b13eb0e8d4e7"", + ""id"": ""ef1ceee0-76ec-42ca-94a4-5ceb8fbdfb67"", ""expectedControlType"": ""Vector2"", ""processors"": """", ""interactions"": """", @@ -186,19 +123,19 @@ public partial class @InputSystem: IInputActionCollection2, IDisposable ""bindings"": [ { ""name"": """", - ""id"": ""978bfe49-cc26-4a3d-ab7b-7d7a29327403"", - ""path"": ""/leftStick"", + ""id"": ""f2b76d5e-a751-4187-b6ca-60ed2a86f5c9"", + ""path"": ""/leftButton"", ""interactions"": """", ""processors"": """", - ""groups"": "";Gamepad"", - ""action"": ""Move"", + ""groups"": "";Keyboard&Mouse"", + ""action"": ""Click"", ""isComposite"": false, ""isPartOfComposite"": false }, { - ""name"": ""WASD"", - ""id"": ""00ca640b-d935-4593-8157-c05846ea39b3"", - ""path"": ""Dpad"", + ""name"": ""2D Vector"", + ""id"": ""4ef87f54-a868-4a6b-be65-020d768b1533"", + ""path"": ""2DVector"", ""interactions"": """", ""processors"": """", ""groups"": """", @@ -208,7 +145,7 @@ public partial class @InputSystem: IInputActionCollection2, IDisposable }, { ""name"": ""up"", - ""id"": ""e2062cb9-1b15-46a2-838c-2f8d72a0bdd9"", + ""id"": ""e7ee6792-e69c-4032-8f4a-a06f59ee6a7d"", ""path"": ""/w"", ""interactions"": """", ""processors"": """", @@ -217,20 +154,9 @@ public partial class @InputSystem: IInputActionCollection2, IDisposable ""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"", + ""id"": ""38b0cbec-1da6-44be-b335-c4b5bf0ac1ed"", ""path"": ""/s"", ""interactions"": """", ""processors"": """", @@ -239,20 +165,9 @@ public partial class @InputSystem: IInputActionCollection2, IDisposable ""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"", + ""id"": ""16ed2229-8db8-46ab-9572-068de5b43b78"", ""path"": ""/a"", ""interactions"": """", ""processors"": """", @@ -261,20 +176,9 @@ public partial class @InputSystem: IInputActionCollection2, IDisposable ""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"", + ""id"": ""ebf38664-3b77-49b2-b4a6-3dc983803428"", ""path"": ""/d"", ""interactions"": """", ""processors"": """", @@ -283,295 +187,9 @@ public partial class @InputSystem: IInputActionCollection2, IDisposable ""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"": """", - ""id"": ""37f6f208-f780-4e98-829e-c0037bea0fe7"", + ""id"": ""401ca091-2bf4-46ae-991b-27c2736f58c4"", ""path"": ""/position"", ""interactions"": """", ""processors"": """", @@ -581,522 +199,6 @@ public partial class @InputSystem: IInputActionCollection2, IDisposable ""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"": [ @@ -1164,34 +266,14 @@ public partial class @InputSystem: IInputActionCollection2, IDisposable }"); // Player m_Player = asset.FindActionMap("Player", throwIfNotFound: true); + m_Player_Click = m_Player.FindAction("Click", throwIfNotFound: true); m_Player_Move = m_Player.FindAction("Move", throwIfNotFound: true); - m_Player_Look = m_Player.FindAction("Look", throwIfNotFound: true); - m_Player_Attack = m_Player.FindAction("Attack", throwIfNotFound: true); - m_Player_Interact = m_Player.FindAction("Interact", throwIfNotFound: true); - m_Player_Crouch = m_Player.FindAction("Crouch", throwIfNotFound: true); - m_Player_Jump = m_Player.FindAction("Jump", throwIfNotFound: true); - m_Player_Previous = m_Player.FindAction("Previous", throwIfNotFound: true); - m_Player_Next = m_Player.FindAction("Next", throwIfNotFound: true); - m_Player_Sprint = m_Player.FindAction("Sprint", throwIfNotFound: true); m_Player_Mouse = m_Player.FindAction("Mouse", throwIfNotFound: true); - // UI - m_UI = asset.FindActionMap("UI", throwIfNotFound: true); - m_UI_Navigate = m_UI.FindAction("Navigate", throwIfNotFound: true); - m_UI_Submit = m_UI.FindAction("Submit", throwIfNotFound: true); - m_UI_Cancel = m_UI.FindAction("Cancel", throwIfNotFound: true); - m_UI_Point = m_UI.FindAction("Point", throwIfNotFound: true); - m_UI_Click = m_UI.FindAction("Click", throwIfNotFound: true); - m_UI_RightClick = m_UI.FindAction("RightClick", throwIfNotFound: true); - m_UI_MiddleClick = m_UI.FindAction("MiddleClick", throwIfNotFound: true); - m_UI_ScrollWheel = m_UI.FindAction("ScrollWheel", throwIfNotFound: true); - m_UI_TrackedDevicePosition = m_UI.FindAction("TrackedDevicePosition", throwIfNotFound: true); - m_UI_TrackedDeviceOrientation = m_UI.FindAction("TrackedDeviceOrientation", throwIfNotFound: true); } ~@InputSystem() { UnityEngine.Debug.Assert(!m_Player.enabled, "This will cause a leak and performance issues, InputSystem.Player.Disable() has not been called."); - UnityEngine.Debug.Assert(!m_UI.enabled, "This will cause a leak and performance issues, InputSystem.UI.Disable() has not been called."); } /// @@ -1267,15 +349,8 @@ public partial class @InputSystem: IInputActionCollection2, IDisposable // Player private readonly InputActionMap m_Player; private List m_PlayerActionsCallbackInterfaces = new List(); + private readonly InputAction m_Player_Click; private readonly InputAction m_Player_Move; - private readonly InputAction m_Player_Look; - private readonly InputAction m_Player_Attack; - private readonly InputAction m_Player_Interact; - private readonly InputAction m_Player_Crouch; - private readonly InputAction m_Player_Jump; - private readonly InputAction m_Player_Previous; - private readonly InputAction m_Player_Next; - private readonly InputAction m_Player_Sprint; private readonly InputAction m_Player_Mouse; /// /// Provides access to input actions defined in input action map "Player". @@ -1289,42 +364,14 @@ public partial class @InputSystem: IInputActionCollection2, IDisposable /// public PlayerActions(@InputSystem wrapper) { m_Wrapper = wrapper; } /// + /// Provides access to the underlying input action "Player/Click". + /// + public InputAction @Click => m_Wrapper.m_Player_Click; + /// /// Provides access to the underlying input action "Player/Move". /// public InputAction @Move => m_Wrapper.m_Player_Move; /// - /// Provides access to the underlying input action "Player/Look". - /// - public InputAction @Look => m_Wrapper.m_Player_Look; - /// - /// Provides access to the underlying input action "Player/Attack". - /// - public InputAction @Attack => m_Wrapper.m_Player_Attack; - /// - /// Provides access to the underlying input action "Player/Interact". - /// - public InputAction @Interact => m_Wrapper.m_Player_Interact; - /// - /// Provides access to the underlying input action "Player/Crouch". - /// - public InputAction @Crouch => m_Wrapper.m_Player_Crouch; - /// - /// Provides access to the underlying input action "Player/Jump". - /// - public InputAction @Jump => m_Wrapper.m_Player_Jump; - /// - /// Provides access to the underlying input action "Player/Previous". - /// - public InputAction @Previous => m_Wrapper.m_Player_Previous; - /// - /// Provides access to the underlying input action "Player/Next". - /// - public InputAction @Next => m_Wrapper.m_Player_Next; - /// - /// Provides access to the underlying input action "Player/Sprint". - /// - public InputAction @Sprint => m_Wrapper.m_Player_Sprint; - /// /// Provides access to the underlying input action "Player/Mouse". /// public InputAction @Mouse => m_Wrapper.m_Player_Mouse; @@ -1354,33 +401,12 @@ public partial class @InputSystem: IInputActionCollection2, IDisposable { if (instance == null || m_Wrapper.m_PlayerActionsCallbackInterfaces.Contains(instance)) return; m_Wrapper.m_PlayerActionsCallbackInterfaces.Add(instance); + @Click.started += instance.OnClick; + @Click.performed += instance.OnClick; + @Click.canceled += instance.OnClick; @Move.started += instance.OnMove; @Move.performed += instance.OnMove; @Move.canceled += instance.OnMove; - @Look.started += instance.OnLook; - @Look.performed += instance.OnLook; - @Look.canceled += instance.OnLook; - @Attack.started += instance.OnAttack; - @Attack.performed += instance.OnAttack; - @Attack.canceled += instance.OnAttack; - @Interact.started += instance.OnInteract; - @Interact.performed += instance.OnInteract; - @Interact.canceled += instance.OnInteract; - @Crouch.started += instance.OnCrouch; - @Crouch.performed += instance.OnCrouch; - @Crouch.canceled += instance.OnCrouch; - @Jump.started += instance.OnJump; - @Jump.performed += instance.OnJump; - @Jump.canceled += instance.OnJump; - @Previous.started += instance.OnPrevious; - @Previous.performed += instance.OnPrevious; - @Previous.canceled += instance.OnPrevious; - @Next.started += instance.OnNext; - @Next.performed += instance.OnNext; - @Next.canceled += instance.OnNext; - @Sprint.started += instance.OnSprint; - @Sprint.performed += instance.OnSprint; - @Sprint.canceled += instance.OnSprint; @Mouse.started += instance.OnMouse; @Mouse.performed += instance.OnMouse; @Mouse.canceled += instance.OnMouse; @@ -1395,33 +421,12 @@ public partial class @InputSystem: IInputActionCollection2, IDisposable /// private void UnregisterCallbacks(IPlayerActions instance) { + @Click.started -= instance.OnClick; + @Click.performed -= instance.OnClick; + @Click.canceled -= instance.OnClick; @Move.started -= instance.OnMove; @Move.performed -= instance.OnMove; @Move.canceled -= instance.OnMove; - @Look.started -= instance.OnLook; - @Look.performed -= instance.OnLook; - @Look.canceled -= instance.OnLook; - @Attack.started -= instance.OnAttack; - @Attack.performed -= instance.OnAttack; - @Attack.canceled -= instance.OnAttack; - @Interact.started -= instance.OnInteract; - @Interact.performed -= instance.OnInteract; - @Interact.canceled -= instance.OnInteract; - @Crouch.started -= instance.OnCrouch; - @Crouch.performed -= instance.OnCrouch; - @Crouch.canceled -= instance.OnCrouch; - @Jump.started -= instance.OnJump; - @Jump.performed -= instance.OnJump; - @Jump.canceled -= instance.OnJump; - @Previous.started -= instance.OnPrevious; - @Previous.performed -= instance.OnPrevious; - @Previous.canceled -= instance.OnPrevious; - @Next.started -= instance.OnNext; - @Next.performed -= instance.OnNext; - @Next.canceled -= instance.OnNext; - @Sprint.started -= instance.OnSprint; - @Sprint.performed -= instance.OnSprint; - @Sprint.canceled -= instance.OnSprint; @Mouse.started -= instance.OnMouse; @Mouse.performed -= instance.OnMouse; @Mouse.canceled -= instance.OnMouse; @@ -1458,201 +463,6 @@ public partial class @InputSystem: IInputActionCollection2, IDisposable /// Provides a new instance referencing this action map. /// public PlayerActions @Player => new PlayerActions(this); - - // UI - private readonly InputActionMap m_UI; - private List m_UIActionsCallbackInterfaces = new List(); - private readonly InputAction m_UI_Navigate; - private readonly InputAction m_UI_Submit; - private readonly InputAction m_UI_Cancel; - private readonly InputAction m_UI_Point; - private readonly InputAction m_UI_Click; - private readonly InputAction m_UI_RightClick; - private readonly InputAction m_UI_MiddleClick; - private readonly InputAction m_UI_ScrollWheel; - private readonly InputAction m_UI_TrackedDevicePosition; - private readonly InputAction m_UI_TrackedDeviceOrientation; - /// - /// Provides access to input actions defined in input action map "UI". - /// - public struct UIActions - { - private @InputSystem m_Wrapper; - - /// - /// Construct a new instance of the input action map wrapper class. - /// - public UIActions(@InputSystem wrapper) { m_Wrapper = wrapper; } - /// - /// Provides access to the underlying input action "UI/Navigate". - /// - public InputAction @Navigate => m_Wrapper.m_UI_Navigate; - /// - /// Provides access to the underlying input action "UI/Submit". - /// - public InputAction @Submit => m_Wrapper.m_UI_Submit; - /// - /// Provides access to the underlying input action "UI/Cancel". - /// - public InputAction @Cancel => m_Wrapper.m_UI_Cancel; - /// - /// Provides access to the underlying input action "UI/Point". - /// - public InputAction @Point => m_Wrapper.m_UI_Point; - /// - /// Provides access to the underlying input action "UI/Click". - /// - public InputAction @Click => m_Wrapper.m_UI_Click; - /// - /// Provides access to the underlying input action "UI/RightClick". - /// - public InputAction @RightClick => m_Wrapper.m_UI_RightClick; - /// - /// Provides access to the underlying input action "UI/MiddleClick". - /// - public InputAction @MiddleClick => m_Wrapper.m_UI_MiddleClick; - /// - /// Provides access to the underlying input action "UI/ScrollWheel". - /// - public InputAction @ScrollWheel => m_Wrapper.m_UI_ScrollWheel; - /// - /// Provides access to the underlying input action "UI/TrackedDevicePosition". - /// - public InputAction @TrackedDevicePosition => m_Wrapper.m_UI_TrackedDevicePosition; - /// - /// Provides access to the underlying input action "UI/TrackedDeviceOrientation". - /// - public InputAction @TrackedDeviceOrientation => m_Wrapper.m_UI_TrackedDeviceOrientation; - /// - /// Provides access to the underlying input action map instance. - /// - public InputActionMap Get() { return m_Wrapper.m_UI; } - /// - public void Enable() { Get().Enable(); } - /// - public void Disable() { Get().Disable(); } - /// - public bool enabled => Get().enabled; - /// - /// Implicitly converts an to an instance. - /// - public static implicit operator InputActionMap(UIActions set) { return set.Get(); } - /// - /// Adds , and callbacks provided via on all input actions contained in this map. - /// - /// Callback instance. - /// - /// If is null or have already been added this method does nothing. - /// - /// - public void AddCallbacks(IUIActions instance) - { - if (instance == null || m_Wrapper.m_UIActionsCallbackInterfaces.Contains(instance)) return; - m_Wrapper.m_UIActionsCallbackInterfaces.Add(instance); - @Navigate.started += instance.OnNavigate; - @Navigate.performed += instance.OnNavigate; - @Navigate.canceled += instance.OnNavigate; - @Submit.started += instance.OnSubmit; - @Submit.performed += instance.OnSubmit; - @Submit.canceled += instance.OnSubmit; - @Cancel.started += instance.OnCancel; - @Cancel.performed += instance.OnCancel; - @Cancel.canceled += instance.OnCancel; - @Point.started += instance.OnPoint; - @Point.performed += instance.OnPoint; - @Point.canceled += instance.OnPoint; - @Click.started += instance.OnClick; - @Click.performed += instance.OnClick; - @Click.canceled += instance.OnClick; - @RightClick.started += instance.OnRightClick; - @RightClick.performed += instance.OnRightClick; - @RightClick.canceled += instance.OnRightClick; - @MiddleClick.started += instance.OnMiddleClick; - @MiddleClick.performed += instance.OnMiddleClick; - @MiddleClick.canceled += instance.OnMiddleClick; - @ScrollWheel.started += instance.OnScrollWheel; - @ScrollWheel.performed += instance.OnScrollWheel; - @ScrollWheel.canceled += instance.OnScrollWheel; - @TrackedDevicePosition.started += instance.OnTrackedDevicePosition; - @TrackedDevicePosition.performed += instance.OnTrackedDevicePosition; - @TrackedDevicePosition.canceled += instance.OnTrackedDevicePosition; - @TrackedDeviceOrientation.started += instance.OnTrackedDeviceOrientation; - @TrackedDeviceOrientation.performed += instance.OnTrackedDeviceOrientation; - @TrackedDeviceOrientation.canceled += instance.OnTrackedDeviceOrientation; - } - - /// - /// Removes , and callbacks provided via on all input actions contained in this map. - /// - /// - /// Calling this method when have not previously been registered has no side-effects. - /// - /// - private void UnregisterCallbacks(IUIActions instance) - { - @Navigate.started -= instance.OnNavigate; - @Navigate.performed -= instance.OnNavigate; - @Navigate.canceled -= instance.OnNavigate; - @Submit.started -= instance.OnSubmit; - @Submit.performed -= instance.OnSubmit; - @Submit.canceled -= instance.OnSubmit; - @Cancel.started -= instance.OnCancel; - @Cancel.performed -= instance.OnCancel; - @Cancel.canceled -= instance.OnCancel; - @Point.started -= instance.OnPoint; - @Point.performed -= instance.OnPoint; - @Point.canceled -= instance.OnPoint; - @Click.started -= instance.OnClick; - @Click.performed -= instance.OnClick; - @Click.canceled -= instance.OnClick; - @RightClick.started -= instance.OnRightClick; - @RightClick.performed -= instance.OnRightClick; - @RightClick.canceled -= instance.OnRightClick; - @MiddleClick.started -= instance.OnMiddleClick; - @MiddleClick.performed -= instance.OnMiddleClick; - @MiddleClick.canceled -= instance.OnMiddleClick; - @ScrollWheel.started -= instance.OnScrollWheel; - @ScrollWheel.performed -= instance.OnScrollWheel; - @ScrollWheel.canceled -= instance.OnScrollWheel; - @TrackedDevicePosition.started -= instance.OnTrackedDevicePosition; - @TrackedDevicePosition.performed -= instance.OnTrackedDevicePosition; - @TrackedDevicePosition.canceled -= instance.OnTrackedDevicePosition; - @TrackedDeviceOrientation.started -= instance.OnTrackedDeviceOrientation; - @TrackedDeviceOrientation.performed -= instance.OnTrackedDeviceOrientation; - @TrackedDeviceOrientation.canceled -= instance.OnTrackedDeviceOrientation; - } - - /// - /// Unregisters and unregisters all input action callbacks via . - /// - /// - public void RemoveCallbacks(IUIActions instance) - { - if (m_Wrapper.m_UIActionsCallbackInterfaces.Remove(instance)) - UnregisterCallbacks(instance); - } - - /// - /// Replaces all existing callback instances and previously registered input action callbacks associated with them with callbacks provided via . - /// - /// - /// If is null, calling this method will only unregister all existing callbacks but not register any new callbacks. - /// - /// - /// - /// - public void SetCallbacks(IUIActions instance) - { - foreach (var item in m_Wrapper.m_UIActionsCallbackInterfaces) - UnregisterCallbacks(item); - m_Wrapper.m_UIActionsCallbackInterfaces.Clear(); - AddCallbacks(instance); - } - } - /// - /// Provides a new instance referencing this action map. - /// - public UIActions @UI => new UIActions(this); private int m_KeyboardMouseSchemeIndex = -1; /// /// Provides access to the input control scheme. @@ -1725,6 +535,13 @@ public partial class @InputSystem: IInputActionCollection2, IDisposable /// public interface IPlayerActions { + /// + /// Method invoked when associated input action "Click" is either , or . + /// + /// + /// + /// + void OnClick(InputAction.CallbackContext context); /// /// Method invoked when associated input action "Move" is either , or . /// @@ -1733,62 +550,6 @@ public partial class @InputSystem: IInputActionCollection2, IDisposable /// void OnMove(InputAction.CallbackContext context); /// - /// Method invoked when associated input action "Look" is either , or . - /// - /// - /// - /// - void OnLook(InputAction.CallbackContext context); - /// - /// Method invoked when associated input action "Attack" is either , or . - /// - /// - /// - /// - void OnAttack(InputAction.CallbackContext context); - /// - /// Method invoked when associated input action "Interact" is either , or . - /// - /// - /// - /// - void OnInteract(InputAction.CallbackContext context); - /// - /// Method invoked when associated input action "Crouch" is either , or . - /// - /// - /// - /// - void OnCrouch(InputAction.CallbackContext context); - /// - /// Method invoked when associated input action "Jump" is either , or . - /// - /// - /// - /// - void OnJump(InputAction.CallbackContext context); - /// - /// Method invoked when associated input action "Previous" is either , or . - /// - /// - /// - /// - void OnPrevious(InputAction.CallbackContext context); - /// - /// Method invoked when associated input action "Next" is either , or . - /// - /// - /// - /// - void OnNext(InputAction.CallbackContext context); - /// - /// Method invoked when associated input action "Sprint" is either , or . - /// - /// - /// - /// - void OnSprint(InputAction.CallbackContext context); - /// /// Method invoked when associated input action "Mouse" is either , or . /// /// @@ -1796,82 +557,4 @@ public partial class @InputSystem: IInputActionCollection2, IDisposable /// void OnMouse(InputAction.CallbackContext context); } - /// - /// Interface to implement callback methods for all input action callbacks associated with input actions defined by "UI" which allows adding and removing callbacks. - /// - /// - /// - public interface IUIActions - { - /// - /// Method invoked when associated input action "Navigate" is either , or . - /// - /// - /// - /// - void OnNavigate(InputAction.CallbackContext context); - /// - /// Method invoked when associated input action "Submit" is either , or . - /// - /// - /// - /// - void OnSubmit(InputAction.CallbackContext context); - /// - /// Method invoked when associated input action "Cancel" is either , or . - /// - /// - /// - /// - void OnCancel(InputAction.CallbackContext context); - /// - /// Method invoked when associated input action "Point" is either , or . - /// - /// - /// - /// - void OnPoint(InputAction.CallbackContext context); - /// - /// Method invoked when associated input action "Click" is either , or . - /// - /// - /// - /// - void OnClick(InputAction.CallbackContext context); - /// - /// Method invoked when associated input action "RightClick" is either , or . - /// - /// - /// - /// - void OnRightClick(InputAction.CallbackContext context); - /// - /// Method invoked when associated input action "MiddleClick" is either , or . - /// - /// - /// - /// - void OnMiddleClick(InputAction.CallbackContext context); - /// - /// Method invoked when associated input action "ScrollWheel" is either , or . - /// - /// - /// - /// - void OnScrollWheel(InputAction.CallbackContext context); - /// - /// Method invoked when associated input action "TrackedDevicePosition" is either , or . - /// - /// - /// - /// - void OnTrackedDevicePosition(InputAction.CallbackContext context); - /// - /// Method invoked when associated input action "TrackedDeviceOrientation" is either , or . - /// - /// - /// - /// - void OnTrackedDeviceOrientation(InputAction.CallbackContext context); - } } diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index c4b7fee..ed31d10 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using UnityEngine; using UnityEngine.InputSystem; @@ -8,7 +9,9 @@ public class Player : MonoBehaviour private Queue _bulletPool = new Queue(); public GameObject bulletPrefab; - public int bulletCount = 30; + public int bulletCount = 21; + public GameObject backGround; + public int moveSpeed = 20; [Header("연사 설정")] public float fireRate = 0.1f; // 총알 발사 간격 (0.1초마다 1발) @@ -23,8 +26,8 @@ public class Player : MonoBehaviour _fireTimer = fireRate; // 기존의 performed 대신 클릭 시작(started)과 종료(canceled) 이벤트를 연결합니다. - InputManager.InputSystem.UI.Click.started += OnShootStarted; - InputManager.InputSystem.UI.Click.canceled += OnShootCanceled; + InputManager.InputSystem.Player.Click.started += OnShootStarted; + InputManager.InputSystem.Player.Click.canceled += OnShootCanceled; for (int i = 0; i < bulletCount; i++) { @@ -34,6 +37,14 @@ public class Player : MonoBehaviour } } + private void FixedUpdate() + { + var readValue = InputManager.InputSystem.Player.Move.ReadValue(); + var moveDir = new Vector3(readValue.x, readValue.y, 0); + transform.position += moveDir * (Time.fixedDeltaTime * moveSpeed); + backGround.transform.position = transform.position; + } + // 마우스를 클릭하기 시작했을 때 private void OnShootStarted(InputAction.CallbackContext obj) { @@ -79,7 +90,7 @@ public class Player : MonoBehaviour Vector2 direction = screenToWorldPoint - transform.position; var rad2Deg = Mathf.Atan2(direction.y, direction.x) * Mathf.Rad2Deg; - transform.rotation = Quaternion.Euler(0, 0, rad2Deg - 90); + transform.rotation = Quaternion.Euler(0, 0, rad2Deg + 90); // 2. 연사 처리 로직 _fireTimer += Time.deltaTime; // 타이머는 매 프레임 증가 @@ -96,8 +107,8 @@ public class Player : MonoBehaviour { if (InputManager.InputSystem != null) { - InputManager.InputSystem.UI.Click.started -= OnShootStarted; - InputManager.InputSystem.UI.Click.canceled -= OnShootCanceled; + InputManager.InputSystem.Player.Click.started -= OnShootStarted; + InputManager.InputSystem.Player.Click.canceled -= OnShootCanceled; } } } \ No newline at end of file diff --git a/Assets/Textures.meta b/Assets/Textures.meta new file mode 100644 index 0000000..e775f44 --- /dev/null +++ b/Assets/Textures.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0bd006a432d78491990505e7c8de66cd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/Grass.shadergraph b/Assets/Textures/Grass.shadergraph new file mode 100644 index 0000000..442e89d --- /dev/null +++ b/Assets/Textures/Grass.shadergraph @@ -0,0 +1,1251 @@ +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.GraphData", + "m_ObjectId": "7e705d6529df477e982888ead24abaaf", + "m_Properties": [ + { + "m_Id": "c10a48d5719546d99807c78499fe5f5f" + }, + { + "m_Id": "a1d8e8ff3d7e4dd986ee4991f33a32bb" + } + ], + "m_Keywords": [], + "m_Dropdowns": [], + "m_CategoryData": [ + { + "m_Id": "ae7ea40735a34ae2bb13c668cfe3f863" + } + ], + "m_Nodes": [ + { + "m_Id": "4bdb7a775b854a14bbeeff580cec12e7" + }, + { + "m_Id": "5ec516b019e046e69d2ad44c5cbc1e34" + }, + { + "m_Id": "5d561e0063814215a8044dd68b6894b7" + }, + { + "m_Id": "5eaf69da7d764087b9d50d8634ab4f9c" + }, + { + "m_Id": "67b900c279904358aa05de9a71049669" + }, + { + "m_Id": "b7e77ed3f5e5404ca06a3af1a2d9280e" + }, + { + "m_Id": "f5d89fa67b7c47c6b11fc5cc44a403a5" + }, + { + "m_Id": "ac7c0ae75154409f9bf7d5f44b226d4e" + }, + { + "m_Id": "58e6e47f44464ce2994e36594088c966" + }, + { + "m_Id": "1d0b697f0edd435f90c78afcba3c6666" + } + ], + "m_GroupDatas": [], + "m_StickyNoteDatas": [], + "m_Edges": [ + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "1d0b697f0edd435f90c78afcba3c6666" + }, + "m_SlotId": 5 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "ac7c0ae75154409f9bf7d5f44b226d4e" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "58e6e47f44464ce2994e36594088c966" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "1d0b697f0edd435f90c78afcba3c6666" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "58e6e47f44464ce2994e36594088c966" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "1d0b697f0edd435f90c78afcba3c6666" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "58e6e47f44464ce2994e36594088c966" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "1d0b697f0edd435f90c78afcba3c6666" + }, + "m_SlotId": 2 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "67b900c279904358aa05de9a71049669" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "5eaf69da7d764087b9d50d8634ab4f9c" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "ac7c0ae75154409f9bf7d5f44b226d4e" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "67b900c279904358aa05de9a71049669" + }, + "m_SlotId": 2 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "b7e77ed3f5e5404ca06a3af1a2d9280e" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "67b900c279904358aa05de9a71049669" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "f5d89fa67b7c47c6b11fc5cc44a403a5" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "ac7c0ae75154409f9bf7d5f44b226d4e" + }, + "m_SlotId": 0 + } + } + ], + "m_VertexContext": { + "m_Position": { + "x": 0.0, + "y": 0.0 + }, + "m_Blocks": [ + { + "m_Id": "4bdb7a775b854a14bbeeff580cec12e7" + }, + { + "m_Id": "5ec516b019e046e69d2ad44c5cbc1e34" + }, + { + "m_Id": "5d561e0063814215a8044dd68b6894b7" + } + ] + }, + "m_FragmentContext": { + "m_Position": { + "x": 0.0, + "y": 200.0 + }, + "m_Blocks": [ + { + "m_Id": "5eaf69da7d764087b9d50d8634ab4f9c" + } + ] + }, + "m_PreviewData": { + "serializedMesh": { + "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "preventRotation": false + }, + "m_Path": "Shader Graphs", + "m_GraphPrecision": 1, + "m_PreviewMode": 2, + "m_OutputNode": { + "m_Id": "" + }, + "m_SubDatas": [], + "m_ActiveTargets": [ + { + "m_Id": "26e4c8b925304f17ad69d6ed3a1581d4" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "0dc7945d94164e199ea73fb6c18e6a16", + "m_Id": 0, + "m_DisplayName": "RGBA", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "RGBA", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", + "m_ObjectId": "194ec64b043145719e5b1a73f3e7dc36", + "m_Id": 0, + "m_DisplayName": "Position", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Position", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CombineNode", + "m_ObjectId": "1d0b697f0edd435f90c78afcba3c6666", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Combine", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -973.5000610351563, + "y": -82.50000762939453, + "width": 208.0, + "height": 350.0 + } + }, + "m_Slots": [ + { + "m_Id": "34a9119bf410423094b63f405cec511c" + }, + { + "m_Id": "de9ca866860b42ed8ea9582d1575eb85" + }, + { + "m_Id": "ed32ce3ae71f4f52b16ce28961184088" + }, + { + "m_Id": "7ae3f168f5e643548e4d783e2bd7185c" + }, + { + "m_Id": "8e17d4a724d84523bced245f915b03f1" + }, + { + "m_Id": "57ab7e6696084b9ca12a7f3511763d0c" + }, + { + "m_Id": "5d17357e013842e0820dc36886fb3301" + } + ], + "synonyms": [ + "append" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "1dbbdbc589c24e44b8d4d0b39d122355", + "m_Id": 0, + "m_DisplayName": "Normal", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Normal", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", + "m_ObjectId": "26e4c8b925304f17ad69d6ed3a1581d4", + "m_Datas": [], + "m_ActiveSubTarget": { + "m_Id": "d9434d6ba8a340388ba495adc55342ee" + }, + "m_AllowMaterialOverride": false, + "m_SurfaceType": 0, + "m_ZTestMode": 4, + "m_ZWriteControl": 0, + "m_AlphaMode": 0, + "m_RenderFace": 2, + "m_AlphaClip": false, + "m_CastShadows": true, + "m_ReceiveShadows": true, + "m_DisableTint": false, + "m_Sort3DAs2DCompatible": false, + "m_AdditionalMotionVectorMode": 0, + "m_AlembicMotionVectors": false, + "m_SupportsLODCrossFade": false, + "m_CustomEditorGUI": "", + "m_SupportVFX": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "34a9119bf410423094b63f405cec511c", + "m_Id": 0, + "m_DisplayName": "R", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "R", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "3c5aae5321d44caebee579d48598509b", + "m_Id": 0, + "m_DisplayName": "Base Color", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "BaseColor", + "m_StageCapability": 2, + "m_Value": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_DefaultValue": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_Labels": [], + "m_ColorMode": 0, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "45edf818cf6f415395644f194472c11d", + "m_Id": 1, + "m_DisplayName": "Texture", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Texture", + "m_StageCapability": 3, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "", + "m_Guid": "" + }, + "m_DefaultType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "4bdb7a775b854a14bbeeff580cec12e7", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Position", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "194ec64b043145719e5b1a73f3e7dc36" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Position" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "57ab7e6696084b9ca12a7f3511763d0c", + "m_Id": 5, + "m_DisplayName": "RGB", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "RGB", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "58e6e47f44464ce2994e36594088c966", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1122.0001220703125, + "y": 108.50000762939453, + "width": 104.00006103515625, + "height": 34.000022888183597 + } + }, + "m_Slots": [ + { + "m_Id": "e94847bf7afd4b07a12788f2a00d0c15" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "a1d8e8ff3d7e4dd986ee4991f33a32bb" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", + "m_ObjectId": "5d17357e013842e0820dc36886fb3301", + "m_Id": 6, + "m_DisplayName": "RG", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "RG", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "5d561e0063814215a8044dd68b6894b7", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Tangent", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "bc3667856d3d49e09cd73e5635890ea5" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Tangent" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "5eaf69da7d764087b9d50d8634ab4f9c", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.BaseColor", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "3c5aae5321d44caebee579d48598509b" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.BaseColor" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "5ec516b019e046e69d2ad44c5cbc1e34", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Normal", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "1dbbdbc589c24e44b8d4d0b39d122355" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Normal" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode", + "m_ObjectId": "67b900c279904358aa05de9a71049669", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Sample Texture 2D", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -434.5, + "y": 92.5, + "width": 208.0, + "height": 432.0 + } + }, + "m_Slots": [ + { + "m_Id": "0dc7945d94164e199ea73fb6c18e6a16" + }, + { + "m_Id": "86dc31737c864ae29e6748ce3b89495f" + }, + { + "m_Id": "8636e95347f445f199417bc0a2f01cc7" + }, + { + "m_Id": "e8e3339a02834d2bb875166b4894d107" + }, + { + "m_Id": "b1bfa1c80d4b43c489f4609fd503428e" + }, + { + "m_Id": "45edf818cf6f415395644f194472c11d" + }, + { + "m_Id": "c50bc0f5433f4e278e8d9bea5c77d8b5" + }, + { + "m_Id": "90e444b953734f258c2e6d7b21866f45" + } + ], + "synonyms": [ + "tex2d" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_TextureType": 0, + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true, + "m_MipSamplingMode": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "7ae3f168f5e643548e4d783e2bd7185c", + "m_Id": 3, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "8636e95347f445f199417bc0a2f01cc7", + "m_Id": 5, + "m_DisplayName": "G", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "86dc31737c864ae29e6748ce3b89495f", + "m_Id": 4, + "m_DisplayName": "R", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "R", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "8e17d4a724d84523bced245f915b03f1", + "m_Id": 4, + "m_DisplayName": "RGBA", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "RGBA", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", + "m_ObjectId": "90e444b953734f258c2e6d7b21866f45", + "m_Id": 3, + "m_DisplayName": "Sampler", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Sampler", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "9a673007c64548189deeec9251216b05", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_LiteralMode": false +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "a1d8e8ff3d7e4dd986ee4991f33a32bb", + "m_Guid": { + "m_GuidSerialized": "d0aab3ac-7502-4982-b1e7-bf0ecca7736e" + }, + "promotedFromAssetID": "", + "promotedFromCategoryName": "", + "promotedOrdering": -1, + "m_Name": "Value", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Value", + "m_DefaultReferenceName": "_Value", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_PerRendererData": false, + "m_customAttributes": [], + "m_Value": 0.0, + "m_FloatType": 0, + "m_LiteralFloatMode": false, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + }, + "m_SliderType": 0, + "m_SliderPower": 3.0, + "m_EnumType": 0, + "m_CSharpEnumString": "", + "m_EnumNames": [ + "Default" + ], + "m_EnumValues": [ + 0 + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DivideNode", + "m_ObjectId": "ac7c0ae75154409f9bf7d5f44b226d4e", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Divide", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -702.0000610351563, + "y": 200.00001525878907, + "width": 208.0, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "ee89c0dd20dd44feaacbb362373d04f9" + }, + { + "m_Id": "e748e1b524c240c092e3d56ef2740ef0" + }, + { + "m_Id": "9a673007c64548189deeec9251216b05" + } + ], + "synonyms": [ + "division", + "divided by" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "ae7ea40735a34ae2bb13c668cfe3f863", + "m_Name": "", + "m_ChildObjectList": [ + { + "m_Id": "c10a48d5719546d99807c78499fe5f5f" + }, + { + "m_Id": "a1d8e8ff3d7e4dd986ee4991f33a32bb" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "b1bfa1c80d4b43c489f4609fd503428e", + "m_Id": 7, + "m_DisplayName": "A", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "b7e77ed3f5e5404ca06a3af1a2d9280e", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -665.9999389648438, + "y": 58.500003814697269, + "width": 137.49993896484376, + "height": 33.99996566772461 + } + }, + "m_Slots": [ + { + "m_Id": "eec13b38e8ac4356ae6ba3c748b6182a" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "c10a48d5719546d99807c78499fe5f5f" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", + "m_ObjectId": "bc3667856d3d49e09cd73e5635890ea5", + "m_Id": 0, + "m_DisplayName": "Tangent", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Tangent", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", + "m_ObjectId": "c10a48d5719546d99807c78499fe5f5f", + "m_Guid": { + "m_GuidSerialized": "55602495-66e4-4793-8c00-254e68ac286d" + }, + "promotedFromAssetID": "", + "promotedFromCategoryName": "", + "promotedOrdering": -1, + "m_Name": "Texture2D", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Texture2D", + "m_DefaultReferenceName": "_Texture2D", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_PerRendererData": false, + "m_customAttributes": [], + "m_Value": { + "m_SerializedTexture": "", + "m_Guid": "" + }, + "isMainTexture": false, + "useTilingAndOffset": false, + "useTexelSize": true, + "isHDR": false, + "m_Modifiable": true, + "m_DefaultType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", + "m_ObjectId": "c50bc0f5433f4e278e8d9bea5c77d8b5", + "m_Id": 2, + "m_DisplayName": "UV", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "UV", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [], + "m_Channel": 0 +} + +{ + "m_SGVersion": 2, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalUnlitSubTarget", + "m_ObjectId": "d9434d6ba8a340388ba495adc55342ee", + "m_KeepLightingVariants": false, + "m_DefaultDecalBlending": true, + "m_DefaultSSAO": true +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "de9ca866860b42ed8ea9582d1575eb85", + "m_Id": 1, + "m_DisplayName": "G", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "e748e1b524c240c092e3d56ef2740ef0", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "x": 2.0, + "y": 2.0, + "z": 2.0, + "w": 2.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "e8e3339a02834d2bb875166b4894d107", + "m_Id": 6, + "m_DisplayName": "B", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "e94847bf7afd4b07a12788f2a00d0c15", + "m_Id": 0, + "m_DisplayName": "Value", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "ed32ce3ae71f4f52b16ce28961184088", + "m_Id": 2, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "ee89c0dd20dd44feaacbb362373d04f9", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_LiteralMode": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "eec13b38e8ac4356ae6ba3c748b6182a", + "m_Id": 0, + "m_DisplayName": "Texture2D", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "f2cfcd7c6c084b1bb165d79fd5e633eb", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.PositionNode", + "m_ObjectId": "f5d89fa67b7c47c6b11fc5cc44a403a5", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Position", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -984.0001220703125, + "y": 348.5000305175781, + "width": 208.0, + "height": 313.5000305175781 + } + }, + "m_Slots": [ + { + "m_Id": "f2cfcd7c6c084b1bb165d79fd5e633eb" + } + ], + "synonyms": [ + "location" + ], + "m_Precision": 1, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 2, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Space": 2, + "m_PositionSource": 0 +} + diff --git a/Assets/Textures/Grass.shadergraph.meta b/Assets/Textures/Grass.shadergraph.meta new file mode 100644 index 0000000..6c0e96d --- /dev/null +++ b/Assets/Textures/Grass.shadergraph.meta @@ -0,0 +1,18 @@ +fileFormatVersion: 2 +guid: 57c08dd52c6d24faa80b415b4d5bf8e0 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3} + useAsTemplate: 0 + exposeTemplateAsShader: 0 + template: + name: + category: + description: + icon: {instanceID: 0} + thumbnail: {instanceID: 0} diff --git a/Assets/Textures/GrassMat.mat b/Assets/Textures/GrassMat.mat new file mode 100644 index 0000000..c7b64c8 --- /dev/null +++ b/Assets/Textures/GrassMat.mat @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GrassMat + m_Shader: {fileID: -6465566751694194690, guid: 57c08dd52c6d24faa80b415b4d5bf8e0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _Texture2D: + m_Texture: {fileID: 2800000, guid: 8edaa247ddb25401b864cc16ce8f3b03, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _QueueControl: 0 + - _QueueOffset: 0 + - _Value: 10 + m_Colors: [] + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &7914526487705265515 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 diff --git a/Assets/Textures/GrassMat.mat.meta b/Assets/Textures/GrassMat.mat.meta new file mode 100644 index 0000000..3edcf40 --- /dev/null +++ b/Assets/Textures/GrassMat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cd74d1883649c474eb4fc1d7f2017b95 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/O9FG5G0.jpg b/Assets/Textures/O9FG5G0.jpg new file mode 100644 index 0000000..3d73959 Binary files /dev/null and b/Assets/Textures/O9FG5G0.jpg differ diff --git a/Assets/Textures/O9FG5G0.jpg.meta b/Assets/Textures/O9FG5G0.jpg.meta new file mode 100644 index 0000000..2d78be9 --- /dev/null +++ b/Assets/Textures/O9FG5G0.jpg.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 8edaa247ddb25401b864cc16ce8f3b03 +TextureImporter: + internalIDToNameTable: + - first: + 213: 6831805570687245269 + second: O9FG5G0_0 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 5200 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: O9FG5G0_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1300 + height: 1300 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 5db195758f27fce50800000000000000 + internalID: 6831805570687245269 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + O9FG5G0_0: 6831805570687245269 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index 1860602..c03edf6 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -8,7 +8,8 @@ "com.unity.2d.tilemap": "1.0.0", "com.unity.2d.tilemap.extras": "7.0.1", "com.unity.2d.tooling": "2.0.1", - "com.unity.collab-proxy": "2.11.4", + "com.unity.cinemachine": "3.1.6", + "com.unity.collab-proxy": "2.12.4", "com.unity.ide.rider": "3.0.40", "com.unity.ide.visualstudio": "2.0.27", "com.unity.inputsystem": "1.19.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 82bf5be..1d94251 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -109,8 +109,18 @@ }, "url": "https://packages.unity.com" }, + "com.unity.cinemachine": { + "version": "3.1.6", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.splines": "2.0.0", + "com.unity.modules.imgui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.collab-proxy": { - "version": "2.11.4", + "version": "2.12.4", "depth": 0, "source": "registry", "dependencies": {}, @@ -221,6 +231,13 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.settings-manager": { + "version": "2.1.1", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.shadergraph": { "version": "17.4.0", "depth": 1, @@ -230,6 +247,17 @@ "com.unity.searcher": "4.9.3" } }, + "com.unity.splines": { + "version": "2.8.4", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.mathematics": "1.2.1", + "com.unity.modules.imgui": "1.0.0", + "com.unity.settings-manager": "1.0.3" + }, + "url": "https://packages.unity.com" + }, "com.unity.test-framework": { "version": "1.6.0", "depth": 0, @@ -241,7 +269,7 @@ } }, "com.unity.test-framework.performance": { - "version": "3.2.0", + "version": "3.3.0", "depth": 2, "source": "registry", "dependencies": { diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 835c33f..9935806 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -6,7 +6,7 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/Scenes/SampleScene.unity + path: Assets/Scenes/MainScene.unity guid: 8c9cfa26abfee488c85f1582747f6a02 m_configObjects: com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3} diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index eb91bb0..fb0b95b 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ m_EditorVersion: 6000.4.1f1 -m_EditorVersionWithRevision: 6000.4.1f1 (8535861f39e1) +m_EditorVersionWithRevision: 6000.4.1f1 (336a400b9ea2)