htamas1210/az_tank_remake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New Input System basics added

Browse Source
This commit is contained in:
thewarrior1220
2022-03-04 11:19:58 +01:00
parent b5a7d9e6ab
commit 470a5bed60
11 changed files with 1398 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

588
3D/Assets/InputMaster.inputactions Normal file
View File

@@ -0,0 +1,588 @@
{
"name": "InputMaster",
"maps": [
{
"name": "Player",
"id": "a783c184-a89e-4313-a815-e3563035be8d",
"actions": [
{
"name": "Shoot",
"type": "Button",
"id": "4b107e51-72b2-4ca5-bd46-3fe6f925bc11",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "Movement",
"type": "Value",
"id": "5ade318c-673b-4103-bd70-6978a23f1339",
"expectedControlType": "Vector2",
"processors": "",
"interactions": "",
"initialStateCheck": true
}
],
"bindings": [
{
"name": "",
"id": "15d91e5f-9aa5-4bfe-8b66-3305728aeaee",
"path": "<Keyboard>/q",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "Shoot",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "67318264-3ee9-466e-ac47-fa38a37e72a8",
"path": "<Keyboard>/t",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "Shoot",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "b1f39785-4294-4fe1-9daf-5e699315bdf8",
"path": "<Keyboard>/space",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "Shoot",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "af21d08e-c697-4e7b-88b6-ab285d039655",
"path": "<Keyboard>/numpad7",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "Shoot",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "fd8b1b85-2e49-42b4-9650-36d1b6168914",
"path": "<Gamepad>/rightTrigger",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Shoot",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "ce969bad-123a-4417-bc76-d8075f6c6596",
"path": "<Gamepad>/leftTrigger",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Shoot",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "43b05b5c-d0ac-474d-a48b-8af495fd9c6e",
"path": "<Gamepad>/rightShoulder",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Shoot",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "ff951c55-8df6-40d8-96f2-5f319b4e09b6",
"path": "<Gamepad>/leftShoulder",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Shoot",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "2D Vector",
"id": "83cc5158-fac4-4231-89e5-21ab538cdf79",
"path": "2DVector",
"interactions": "",
"processors": "",
"groups": "",
"action": "Movement",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "up",
"id": "123ce98f-68d3-4920-991b-8bb785b963c5",
"path": "<Keyboard>/e",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "down",
"id": "98e0b041-ad63-4049-b1b7-a8376bcfcab9",
"path": "<Keyboard>/d",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "left",
"id": "bc05db1d-90f5-45f9-a33c-9bd6459c8d56",
"path": "<Keyboard>/s",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "right",
"id": "5a645799-e30a-420a-b9e9-e7cb67b8479b",
"path": "<Keyboard>/f",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "2D Vector",
"id": "8e427b2b-74cf-4c9d-bd72-0108217fa7c0",
"path": "2DVector",
"interactions": "",
"processors": "",
"groups": "",
"action": "Movement",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "up",
"id": "602f7cc5-6d9f-468e-928e-aa6c4335b032",
"path": "<Keyboard>/i",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "down",
"id": "67536a26-9548-415e-beb2-b05b671bfc79",
"path": "<Keyboard>/k",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "left",
"id": "dcc7720f-17f0-4e10-b2c0-2c3f43649b82",
"path": "<Keyboard>/j",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "right",
"id": "77b2eb4e-09f0-43bc-b327-8c22d39e1f6e",
"path": "<Keyboard>/l",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "2D Vector",
"id": "5f8e392f-e102-412e-808c-1c0d0f6d0d1c",
"path": "2DVector",
"interactions": "",
"processors": "",
"groups": "",
"action": "Movement",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "up",
"id": "a4f414d5-0b4e-4646-ae13-f101b322787c",
"path": "<Keyboard>/upArrow",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "down",
"id": "1c38d675-68ca-4a69-9e83-7d476b11ecb8",
"path": "<Keyboard>/downArrow",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "left",
"id": "de1783b5-c4c3-4df1-b1f6-f31a92289b7f",
"path": "<Keyboard>/leftArrow",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "right",
"id": "802cc7db-4145-4f4b-8f12-5b4d04c4cd34",
"path": "<Keyboard>/rightArrow",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "2D Vector",
"id": "929bb35d-4c13-4269-a96b-19575a7e0875",
"path": "2DVector",
"interactions": "",
"processors": "",
"groups": "",
"action": "Movement",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "up",
"id": "27438f1d-427b-43bb-828c-59a0651ba4ed",
"path": "<Keyboard>/numpad5",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "down",
"id": "273771cf-7209-4c4e-91bd-7bcdd59b8058",
"path": "<Keyboard>/numpad2",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "left",
"id": "4488adf1-f2eb-4315-9a28-d6f1e082c00d",
"path": "<Keyboard>/numpad1",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "right",
"id": "601eed6e-0487-4b76-ac44-937e59ec1baa",
"path": "<Keyboard>/numpad3",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "2D Vector",
"id": "83205de0-d84a-4e93-8bb6-dac3695d3e96",
"path": "2DVector",
"interactions": "",
"processors": "",
"groups": "",
"action": "Movement",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "up",
"id": "fb09f037-9b5e-4e15-9636-f442e9582b71",
"path": "<Gamepad>/leftStick/up",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "down",
"id": "e9570dae-9d6d-41e5-916f-c517f3d92cf2",
"path": "<Gamepad>/leftStick/down",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "left",
"id": "1a21c3b1-25ac-408a-8353-25b58c02a0cd",
"path": "<Gamepad>/leftStick/left",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "right",
"id": "692a063e-e9f1-4618-9b4f-3dfa3320f452",
"path": "<Gamepad>/leftStick/right",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "2D Vector",
"id": "1083e319-9bf1-4078-91c8-1d23314b494f",
"path": "2DVector",
"interactions": "",
"processors": "",
"groups": "",
"action": "Movement",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "up",
"id": "8fd1db79-a735-40ba-9840-0e4cbab3c95d",
"path": "<Gamepad>/rightStick/up",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "down",
"id": "1c055962-72a4-4bb2-b64a-27bb2819dc21",
"path": "<Gamepad>/leftStick/down",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "left",
"id": "6019368c-51d1-44d1-b1fc-e0927fbf3527",
"path": "<Gamepad>/leftStick/left",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "right",
"id": "d343037d-b26c-4cef-8054-abc121596fda",
"path": "<Gamepad>/leftStick/right",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "2D Vector",
"id": "879a1669-eb82-48f8-8733-9a80dee5b735",
"path": "2DVector",
"interactions": "",
"processors": "",
"groups": "",
"action": "Movement",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "up",
"id": "dfcdd6bf-7f24-47eb-978b-18792e3fd1d4",
"path": "<Gamepad>/dpad/up",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "down",
"id": "db9e43ff-febf-450b-96ac-9307671005ef",
"path": "<Gamepad>/dpad/down",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "left",
"id": "54af0f26-5e48-46fd-9a7e-895851dd925a",
"path": "<Gamepad>/dpad/left",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "right",
"id": "4d436bbf-8ead-42ba-af37-d28eefb7b0d3",
"path": "<Gamepad>/dpad/right",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "2D Vector",
"id": "a4adeb95-c64e-42ad-b220-b9c7c793f1e3",
"path": "2DVector",
"interactions": "",
"processors": "",
"groups": "",
"action": "Movement",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "up",
"id": "c8306adc-8c58-4687-bdfb-5e4e4792679a",
"path": "<Gamepad>/buttonNorth",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "down",
"id": "22898ff8-c2df-499e-bb65-03b4ab7d5ac7",
"path": "<Gamepad>/buttonSouth",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "left",
"id": "4c780a32-9f41-4ad9-95eb-42d41b627ff4",
"path": "<Gamepad>/buttonWest",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "right",
"id": "da86ca75-7900-41a3-b367-68e70b787448",
"path": "<Gamepad>/buttonEast",
"interactions": "",
"processors": "",
"groups": "Gamepad",
"action": "Movement",
"isComposite": false,
"isPartOfComposite": true
}
]
}
],
"controlSchemes": [
{
"name": "Keyboard",
"bindingGroup": "Keyboard",
"devices": [
{
"devicePath": "<Keyboard>",
"isOptional": false,
"isOR": false
}
]
},
{
"name": "Gamepad",
"bindingGroup": "Gamepad",
"devices": [
{
"devicePath": "<DualShockGamepad>",
"isOptional": false,
"isOR": false
},
{
"devicePath": "<XInputController>",
"isOptional": false,
"isOR": false
}
]
}
]
}

14
3D/Assets/InputMaster.inputactions.meta Normal file
View File

@@ -0,0 +1,14 @@
fileFormatVersion: 2
guid: 47108b9c84510c7408ce55ddb46a6dab
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 8404be70184654265930450def6a9037, type: 3}
generateWrapperCode: 1
wrapperCodePath: Assets/Scripts/InputMaster.cs
wrapperClassName:
wrapperCodeNamespace:

182
3D/Assets/Scenes/Main.unity
View File

@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0} m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.5748171, a: 1} m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@@ -297,151 +297,8 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 3 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &915004373
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 915004379}
- component: {fileID: 915004378}
- component: {fileID: 915004377}
- component: {fileID: 915004376}
- component: {fileID: 915004380}
- component: {fileID: 915004375}
- component: {fileID: 915004374}
m_Layer: 0
m_Name: Player
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!54 &915004374
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 915004373}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!114 &915004375
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 915004373}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ac60c4a928e1042438bc00bd2f70af0a, type: 3}
m_Name:
m_EditorClassIdentifier:
playerMovement: {fileID: 915004380}
--- !u!65 &915004376
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 915004373}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 0.98748153}
m_Center: {x: 0, y: 0, z: -0.0062598228}
--- !u!23 &915004377
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 915004373}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: bb56fbc361545fd489ea4345f35d51ad, 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: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &915004378
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 915004373}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &915004379
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 915004373}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 172.4, y: 11.32, z: -81.33838}
m_LocalScale: {x: 10, y: 10, z: 10}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &915004380
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 915004373}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3d1003961d12b50469d57cf00114c3f4, type: 3}
m_Name:
m_EditorClassIdentifier:
movespeed: 15
rb: {fileID: 915004374}
movement: {x: 0, y: 0, z: 0}
rotation: {x: 0, y: 0, z: 0}
--- !u!65 &1209288078 --- !u!65 &1209288078
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -692,7 +549,6 @@ GameObject:
- component: {fileID: 5334037119917370449} - component: {fileID: 5334037119917370449}
- component: {fileID: 4539702727796617358} - component: {fileID: 4539702727796617358}
- component: {fileID: 1209288078} - component: {fileID: 1209288078}
- component: {fileID: 832149484756735015}
- component: {fileID: 832149484756735014} - component: {fileID: 832149484756735014}
m_Layer: 0 m_Layer: 0
m_Name: Tank m_Name: Tank
@@ -701,25 +557,7 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!143 &832149484756735014 --- !u!114 &832149484756735014
CharacterController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 832149484756735013}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Height: 2
m_Radius: 2
m_SlopeLimit: 45
m_StepOffset: 0.3
m_SkinWidth: 0.08
m_MinMoveDistance: 0.001
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &832149484756735015
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@@ -728,15 +566,9 @@ MonoBehaviour:
m_GameObject: {fileID: 832149484756735013} m_GameObject: {fileID: 832149484756735013}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a2650ec0c90cfb74da510d0f0961bab4, type: 3} m_Script: {fileID: 11500000, guid: 48961f21fe75d884ea97a37715c08891, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
controller: {fileID: 832149484756735014}
speed: 30
turnSmoothness: 0.1
targetAngle: 0
angle: 0
direction: {x: 0, y: 0, z: 0}
--- !u!1 &836326522288652984 --- !u!1 &836326522288652984
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1357,11 +1189,11 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 832149484756735013} m_GameObject: {fileID: 832149484756735013}
m_LocalRotation: {x: -0, y: 0.7071068, z: 0.7071068, w: 0} m_LocalRotation: {x: -0, y: 0.7071068, z: 0.7071068, w: 0}
m_LocalPosition: {x: 71.8, y: 15.75, z: -9.7} m_LocalPosition: {x: 71.8, y: 17.69, z: -9.7}
m_LocalScale: {x: 10, y: 10, z: 10} m_LocalScale: {x: 10, y: 10, z: 10}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 2 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: -90, y: 180, z: 0} m_LocalEulerAnglesHint: {x: -90, y: 180, z: 0}
--- !u!33 &3789499977111455469 --- !u!33 &3789499977111455469
MeshFilter: MeshFilter:
@@ -2194,7 +2026,7 @@ Transform:
- {fileID: 3155070224141227685} - {fileID: 3155070224141227685}
- {fileID: 1149994309874116970} - {fileID: 1149994309874116970}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 1 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &6978687947768988245 --- !u!33 &6978687947768988245
MeshFilter: MeshFilter:

734
3D/Assets/Scripts/InputMaster.cs Normal file
View File

@@ -0,0 +1,734 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
// version 1.3.0
// from Assets/InputMaster.inputactions
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine.InputSystem;
using UnityEngine.InputSystem.Utilities;
public partial class @InputMaster : IInputActionCollection2, IDisposable
{
public InputActionAsset asset { get; }
public @InputMaster()
{
asset = InputActionAsset.FromJson(@"{
""name"": ""InputMaster"",
""maps"": [
{
""name"": ""Player"",
""id"": ""a783c184-a89e-4313-a815-e3563035be8d"",
""actions"": [
{
""name"": ""Shoot"",
""type"": ""Button"",
""id"": ""4b107e51-72b2-4ca5-bd46-3fe6f925bc11"",
""expectedControlType"": ""Button"",
""processors"": """",
""interactions"": """",
""initialStateCheck"": false
},
{
""name"": ""Movement"",
""type"": ""Value"",
""id"": ""5ade318c-673b-4103-bd70-6978a23f1339"",
""expectedControlType"": ""Vector2"",
""processors"": """",
""interactions"": """",
""initialStateCheck"": true
}
],
""bindings"": [
{
""name"": """",
""id"": ""15d91e5f-9aa5-4bfe-8b66-3305728aeaee"",
""path"": ""<Keyboard>/q"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard"",
""action"": ""Shoot"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""67318264-3ee9-466e-ac47-fa38a37e72a8"",
""path"": ""<Keyboard>/t"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard"",
""action"": ""Shoot"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""b1f39785-4294-4fe1-9daf-5e699315bdf8"",
""path"": ""<Keyboard>/space"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard"",
""action"": ""Shoot"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""af21d08e-c697-4e7b-88b6-ab285d039655"",
""path"": ""<Keyboard>/numpad7"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard"",
""action"": ""Shoot"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""fd8b1b85-2e49-42b4-9650-36d1b6168914"",
""path"": ""<Gamepad>/rightTrigger"",
""interactions"": """",
""processors"": """",
""groups"": ""Gamepad"",
""action"": ""Shoot"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""ce969bad-123a-4417-bc76-d8075f6c6596"",
""path"": ""<Gamepad>/leftTrigger"",
""interactions"": """",
""processors"": """",
""groups"": ""Gamepad"",
""action"": ""Shoot"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""43b05b5c-d0ac-474d-a48b-8af495fd9c6e"",
""path"": ""<Gamepad>/rightShoulder"",
""interactions"": """",
""processors"": """",
""groups"": ""Gamepad"",
""action"": ""Shoot"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""ff951c55-8df6-40d8-96f2-5f319b4e09b6"",
""path"": ""<Gamepad>/leftShoulder"",
""interactions"": """",
""processors"": """",
""groups"": ""Gamepad"",
""action"": ""Shoot"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": ""2D Vector"",
""id"": ""83cc5158-fac4-4231-89e5-21ab538cdf79"",
""path"": ""2DVector"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Movement"",
""isComposite"": true,
""isPartOfComposite"": false
},
{
""name"": ""up"",
""id"": ""123ce98f-68d3-4920-991b-8bb785b963c5"",
""path"": ""<Keyboard>/e"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""down"",
""id"": ""98e0b041-ad63-4049-b1b7-a8376bcfcab9"",
""path"": ""<Keyboard>/d"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""left"",
""id"": ""bc05db1d-90f5-45f9-a33c-9bd6459c8d56"",
""path"": ""<Keyboard>/s"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""right"",
""id"": ""5a645799-e30a-420a-b9e9-e7cb67b8479b"",
""path"": ""<Keyboard>/f"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""2D Vector"",
""id"": ""8e427b2b-74cf-4c9d-bd72-0108217fa7c0"",
""path"": ""2DVector"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Movement"",
""isComposite"": true,
""isPartOfComposite"": false
},
{
""name"": ""up"",
""id"": ""602f7cc5-6d9f-468e-928e-aa6c4335b032"",
""path"": ""<Keyboard>/i"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""down"",
""id"": ""67536a26-9548-415e-beb2-b05b671bfc79"",
""path"": ""<Keyboard>/k"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""left"",
""id"": ""dcc7720f-17f0-4e10-b2c0-2c3f43649b82"",
""path"": ""<Keyboard>/j"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""right"",
""id"": ""77b2eb4e-09f0-43bc-b327-8c22d39e1f6e"",
""path"": ""<Keyboard>/l"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""2D Vector"",
""id"": ""5f8e392f-e102-412e-808c-1c0d0f6d0d1c"",
""path"": ""2DVector"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Movement"",
""isComposite"": true,
""isPartOfComposite"": false
},
{
""name"": ""up"",
""id"": ""a4f414d5-0b4e-4646-ae13-f101b322787c"",
""path"": ""<Keyboard>/upArrow"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""down"",
""id"": ""1c38d675-68ca-4a69-9e83-7d476b11ecb8"",
""path"": ""<Keyboard>/downArrow"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""left"",
""id"": ""de1783b5-c4c3-4df1-b1f6-f31a92289b7f"",
""path"": ""<Keyboard>/leftArrow"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""right"",
""id"": ""802cc7db-4145-4f4b-8f12-5b4d04c4cd34"",
""path"": ""<Keyboard>/rightArrow"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""2D Vector"",
""id"": ""929bb35d-4c13-4269-a96b-19575a7e0875"",
""path"": ""2DVector"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Movement"",
""isComposite"": true,
""isPartOfComposite"": false
},
{
""name"": ""up"",
""id"": ""27438f1d-427b-43bb-828c-59a0651ba4ed"",
""path"": ""<Keyboard>/numpad5"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""down"",
""id"": ""273771cf-7209-4c4e-91bd-7bcdd59b8058"",
""path"": ""<Keyboard>/numpad2"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""left"",
""id"": ""4488adf1-f2eb-4315-9a28-d6f1e082c00d"",
""path"": ""<Keyboard>/numpad1"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""right"",
""id"": ""601eed6e-0487-4b76-ac44-937e59ec1baa"",
""path"": ""<Keyboard>/numpad3"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""2D Vector"",
""id"": ""83205de0-d84a-4e93-8bb6-dac3695d3e96"",
""path"": ""2DVector"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Movement"",
""isComposite"": true,
""isPartOfComposite"": false
},
{
""name"": ""up"",
""id"": ""fb09f037-9b5e-4e15-9636-f442e9582b71"",
""path"": ""<Gamepad>/leftStick/up"",
""interactions"": """",
""processors"": """",
""groups"": ""Gamepad"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""down"",
""id"": ""e9570dae-9d6d-41e5-916f-c517f3d92cf2"",
""path"": ""<Gamepad>/leftStick/down"",
""interactions"": """",
""processors"": """",
""groups"": ""Gamepad"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""left"",
""id"": ""1a21c3b1-25ac-408a-8353-25b58c02a0cd"",
""path"": ""<Gamepad>/leftStick/left"",
""interactions"": """",
""processors"": """",
""groups"": ""Gamepad"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""right"",
""id"": ""692a063e-e9f1-4618-9b4f-3dfa3320f452"",
""path"": ""<Gamepad>/leftStick/right"",
""interactions"": """",
""processors"": """",
""groups"": ""Gamepad"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""2D Vector"",
""id"": ""1083e319-9bf1-4078-91c8-1d23314b494f"",
""path"": ""2DVector"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Movement"",
""isComposite"": true,
""isPartOfComposite"": false
},
{
""name"": ""up"",
""id"": ""8fd1db79-a735-40ba-9840-0e4cbab3c95d"",
""path"": ""<Gamepad>/rightStick/up"",
""interactions"": """",
""processors"": """",
""groups"": ""Gamepad"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""down"",
""id"": ""1c055962-72a4-4bb2-b64a-27bb2819dc21"",
""path"": ""<Gamepad>/leftStick/down"",
""interactions"": """",
""processors"": """",
""groups"": ""Gamepad"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""left"",
""id"": ""6019368c-51d1-44d1-b1fc-e0927fbf3527"",
""path"": ""<Gamepad>/leftStick/left"",
""interactions"": """",
""processors"": """",
""groups"": ""Gamepad"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""right"",
""id"": ""d343037d-b26c-4cef-8054-abc121596fda"",
""path"": ""<Gamepad>/leftStick/right"",
""interactions"": """",
""processors"": """",
""groups"": ""Gamepad"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""2D Vector"",
""id"": ""879a1669-eb82-48f8-8733-9a80dee5b735"",
""path"": ""2DVector"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Movement"",
""isComposite"": true,
""isPartOfComposite"": false
},
{
""name"": ""up"",
""id"": ""dfcdd6bf-7f24-47eb-978b-18792e3fd1d4"",
""path"": ""<Gamepad>/dpad/up"",
""interactions"": """",
""processors"": """",
""groups"": ""Gamepad"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""down"",
""id"": ""db9e43ff-febf-450b-96ac-9307671005ef"",
""path"": ""<Gamepad>/dpad/down"",
""interactions"": """",
""processors"": """",
""groups"": ""Gamepad"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""left"",
""id"": ""54af0f26-5e48-46fd-9a7e-895851dd925a"",
""path"": ""<Gamepad>/dpad/left"",
""interactions"": """",
""processors"": """",
""groups"": ""Gamepad"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""right"",
""id"": ""4d436bbf-8ead-42ba-af37-d28eefb7b0d3"",
""path"": ""<Gamepad>/dpad/right"",
""interactions"": """",
""processors"": """",
""groups"": ""Gamepad"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""2D Vector"",
""id"": ""a4adeb95-c64e-42ad-b220-b9c7c793f1e3"",
""path"": ""2DVector"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Movement"",
""isComposite"": true,
""isPartOfComposite"": false
},
{
""name"": ""up"",
""id"": ""c8306adc-8c58-4687-bdfb-5e4e4792679a"",
""path"": ""<Gamepad>/buttonNorth"",
""interactions"": """",
""processors"": """",
""groups"": ""Gamepad"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""down"",
""id"": ""22898ff8-c2df-499e-bb65-03b4ab7d5ac7"",
""path"": ""<Gamepad>/buttonSouth"",
""interactions"": """",
""processors"": """",
""groups"": ""Gamepad"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""left"",
""id"": ""4c780a32-9f41-4ad9-95eb-42d41b627ff4"",
""path"": ""<Gamepad>/buttonWest"",
""interactions"": """",
""processors"": """",
""groups"": ""Gamepad"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""right"",
""id"": ""da86ca75-7900-41a3-b367-68e70b787448"",
""path"": ""<Gamepad>/buttonEast"",
""interactions"": """",
""processors"": """",
""groups"": ""Gamepad"",
""action"": ""Movement"",
""isComposite"": false,
""isPartOfComposite"": true
}
]
}
],
""controlSchemes"": [
{
""name"": ""Keyboard"",
""bindingGroup"": ""Keyboard"",
""devices"": [
{
""devicePath"": ""<Keyboard>"",
""isOptional"": false,
""isOR"": false
}
]
},
{
""name"": ""Gamepad"",
""bindingGroup"": ""Gamepad"",
""devices"": [
{
""devicePath"": ""<DualShockGamepad>"",
""isOptional"": false,
""isOR"": false
},
{
""devicePath"": ""<XInputController>"",
""isOptional"": false,
""isOR"": false
}
]
}
]
}");
// Player
m_Player = asset.FindActionMap("Player", throwIfNotFound: true);
m_Player_Shoot = m_Player.FindAction("Shoot", throwIfNotFound: true);
m_Player_Movement = m_Player.FindAction("Movement", throwIfNotFound: true);
}
public void Dispose()
{
UnityEngine.Object.Destroy(asset);
}
public InputBinding? bindingMask
{
get => asset.bindingMask;
set => asset.bindingMask = value;
}
public ReadOnlyArray<InputDevice>? devices
{
get => asset.devices;
set => asset.devices = value;
}
public ReadOnlyArray<InputControlScheme> controlSchemes => asset.controlSchemes;
public bool Contains(InputAction action)
{
return asset.Contains(action);
}
public IEnumerator<InputAction> GetEnumerator()
{
return asset.GetEnumerator();
}
IEnumerator IEnumerable.GetEnumerator()
{
return GetEnumerator();
}
public void Enable()
{
asset.Enable();
}
public void Disable()
{
asset.Disable();
}
public IEnumerable<InputBinding> bindings => asset.bindings;
public InputAction FindAction(string actionNameOrId, bool throwIfNotFound = false)
{
return asset.FindAction(actionNameOrId, throwIfNotFound);
}
public int FindBinding(InputBinding bindingMask, out InputAction action)
{
return asset.FindBinding(bindingMask, out action);
}
// Player
private readonly InputActionMap m_Player;
private IPlayerActions m_PlayerActionsCallbackInterface;
private readonly InputAction m_Player_Shoot;
private readonly InputAction m_Player_Movement;
public struct PlayerActions
{
private @InputMaster m_Wrapper;
public PlayerActions(@InputMaster wrapper) { m_Wrapper = wrapper; }
public InputAction @Shoot => m_Wrapper.m_Player_Shoot;
public InputAction @Movement => m_Wrapper.m_Player_Movement;
public InputActionMap Get() { return m_Wrapper.m_Player; }
public void Enable() { Get().Enable(); }
public void Disable() { Get().Disable(); }
public bool enabled => Get().enabled;
public static implicit operator InputActionMap(PlayerActions set) { return set.Get(); }
public void SetCallbacks(IPlayerActions instance)
{
if (m_Wrapper.m_PlayerActionsCallbackInterface != null)
{
@Shoot.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnShoot;
@Shoot.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnShoot;
@Shoot.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnShoot;
@Movement.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnMovement;
@Movement.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnMovement;
@Movement.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnMovement;
}
m_Wrapper.m_PlayerActionsCallbackInterface = instance;
if (instance != null)
{
@Shoot.started += instance.OnShoot;
@Shoot.performed += instance.OnShoot;
@Shoot.canceled += instance.OnShoot;
@Movement.started += instance.OnMovement;
@Movement.performed += instance.OnMovement;
@Movement.canceled += instance.OnMovement;
}
}
}
public PlayerActions @Player => new PlayerActions(this);
private int m_KeyboardSchemeIndex = -1;
public InputControlScheme KeyboardScheme
{
get
{
if (m_KeyboardSchemeIndex == -1) m_KeyboardSchemeIndex = asset.FindControlSchemeIndex("Keyboard");
return asset.controlSchemes[m_KeyboardSchemeIndex];
}
}
private int m_GamepadSchemeIndex = -1;
public InputControlScheme GamepadScheme
{
get
{
if (m_GamepadSchemeIndex == -1) m_GamepadSchemeIndex = asset.FindControlSchemeIndex("Gamepad");
return asset.controlSchemes[m_GamepadSchemeIndex];
}
}
public interface IPlayerActions
{
void OnShoot(InputAction.CallbackContext context);
void OnMovement(InputAction.CallbackContext context);
}
}

2
3D/Assets/Scripts/PlayerCollision.cs.meta → 3D/Assets/Scripts/InputMaster.cs.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: ac60c4a928e1042438bc00bd2f70af0a guid: b39adc11ec2ae2543bf63097c5a04c78
MonoImporter: MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2

32
3D/Assets/Scripts/NewInputSystem.cs Normal file
View File

@@ -0,0 +1,32 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.InputSystem;
public class NewInputSystem : MonoBehaviour
{
InputMaster controls;
void Awake() {
controls = new InputMaster();
controls.Player.Shoot.performed += _ => Shoot();
controls.Player.Movement.performed += context => Move(context.ReadValue<Vector2>());
}
void Shoot() {
Debug.Log("Shoot");
}
void Move(Vector2 direction) {
Debug.Log("Move" + direction);
}
private void OnEnable() {
controls.Enable();
}
private void OnDisable() {
controls.Disable();
}
}

11
3D/Assets/Scripts/NewInputSystem.cs.meta Normal file
View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 48961f21fe75d884ea97a37715c08891
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

15
3D/Assets/Scripts/PlayerCollision.cs
View File

@@ -1,15 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class PlayerCollision : MonoBehaviour
{
public PlayerMovement3d playerMovement;
private void OnCollisionEnter(Collision collision) {
if(collision.collider.name == "Wall") {
Debug.Log("Wall hit");
}
}
}

1
3D/Packages/manifest.json
View File

@@ -4,6 +4,7 @@
"com.unity.ide.rider": "2.0.7", "com.unity.ide.rider": "2.0.7",
"com.unity.ide.visualstudio": "2.0.14", "com.unity.ide.visualstudio": "2.0.14",
"com.unity.ide.vscode": "1.2.5", "com.unity.ide.vscode": "1.2.5",
"com.unity.inputsystem": "1.3.0",
"com.unity.probuilder": "4.5.2", "com.unity.probuilder": "4.5.2",
"com.unity.test-framework": "1.1.31", "com.unity.test-framework": "1.1.31",
"com.unity.textmeshpro": "3.0.6", "com.unity.textmeshpro": "3.0.6",

9
3D/Packages/packages-lock.json
View File

@@ -41,6 +41,15 @@
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.inputsystem": {
"version": "1.3.0",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.modules.uielements": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.probuilder": { "com.unity.probuilder": {
"version": "4.5.2", "version": "4.5.2",
"depth": 0, "depth": 0,

2
3D/ProjectSettings/ProjectSettings.asset
View File

@@ -679,7 +679,7 @@ PlayerSettings:
m_VersionCode: 1 m_VersionCode: 1
m_VersionName: m_VersionName:
apiCompatibilityLevel: 6 apiCompatibilityLevel: 6
activeInputHandler: 0 activeInputHandler: 1
cloudProjectId: cloudProjectId:
framebufferDepthMemorylessMode: 0 framebufferDepthMemorylessMode: 0
qualitySettingsNames: [] qualitySettingsNames: []