From bc36aaba4da104d517a2c0287c5706c45611644d Mon Sep 17 00:00:00 2001 From: Playmaker1210 Date: Sun, 6 Mar 2022 22:56:32 +0100 Subject: [PATCH] update --- 3D/Assets/InputMaster.inputactions | 588 ---------- 3D/Assets/InputMaster.inputactions.meta | 14 - 3D/Assets/Scenes/Main.unity | 1017 +++++++++++++---- 3D/Assets/Scripts/ExitGame.cs | 13 + ...ewInputSystem.cs.meta => ExitGame.cs.meta} | 2 +- 3D/Assets/Scripts/InputMaster.cs | 734 ------------ 3D/Assets/Scripts/InputMaster.cs.meta | 11 - 3D/Assets/Scripts/NewInputSystem.cs | 32 - 3D/Assets/Scripts/PlayerMovement3d.cs | 29 - 3D/Assets/Scripts/PlayerMovement3d.cs.meta | 11 - 3D/Assets/Scripts/TankMovement.cs | 84 ++ ...tMovement.cs.meta => TankMovement.cs.meta} | 2 +- 3D/Assets/Scripts/TestMovement.cs | 32 - 3D/Packages/manifest.json | 3 +- 3D/Packages/packages-lock.json | 44 +- 3D/ProjectSettings/GraphicsSettings.asset | 6 +- 3D/ProjectSettings/InputManager.asset | 252 +--- .../com.unity.probuilder/Settings.json | 2 +- 3D/ProjectSettings/ProjectSettings.asset | 11 +- 3D/ProjectSettings/TagManager.asset | 2 +- 20 files changed, 953 insertions(+), 1936 deletions(-) delete mode 100644 3D/Assets/InputMaster.inputactions delete mode 100644 3D/Assets/InputMaster.inputactions.meta create mode 100644 3D/Assets/Scripts/ExitGame.cs rename 3D/Assets/Scripts/{NewInputSystem.cs.meta => ExitGame.cs.meta} (83%) delete mode 100644 3D/Assets/Scripts/InputMaster.cs delete mode 100644 3D/Assets/Scripts/InputMaster.cs.meta delete mode 100644 3D/Assets/Scripts/NewInputSystem.cs delete mode 100644 3D/Assets/Scripts/PlayerMovement3d.cs delete mode 100644 3D/Assets/Scripts/PlayerMovement3d.cs.meta create mode 100644 3D/Assets/Scripts/TankMovement.cs rename 3D/Assets/Scripts/{TestMovement.cs.meta => TankMovement.cs.meta} (83%) delete mode 100644 3D/Assets/Scripts/TestMovement.cs diff --git a/3D/Assets/InputMaster.inputactions b/3D/Assets/InputMaster.inputactions deleted file mode 100644 index f452805..0000000 --- a/3D/Assets/InputMaster.inputactions +++ /dev/null @@ -1,588 +0,0 @@ -{ - "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": "/q", - "interactions": "", - "processors": "", - "groups": "Keyboard", - "action": "Shoot", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "67318264-3ee9-466e-ac47-fa38a37e72a8", - "path": "/t", - "interactions": "", - "processors": "", - "groups": "Keyboard", - "action": "Shoot", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "b1f39785-4294-4fe1-9daf-5e699315bdf8", - "path": "/space", - "interactions": "", - "processors": "", - "groups": "Keyboard", - "action": "Shoot", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "af21d08e-c697-4e7b-88b6-ab285d039655", - "path": "/numpad7", - "interactions": "", - "processors": "", - "groups": "Keyboard", - "action": "Shoot", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "fd8b1b85-2e49-42b4-9650-36d1b6168914", - "path": "/rightTrigger", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Shoot", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "ce969bad-123a-4417-bc76-d8075f6c6596", - "path": "/leftTrigger", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Shoot", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "43b05b5c-d0ac-474d-a48b-8af495fd9c6e", - "path": "/rightShoulder", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Shoot", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "ff951c55-8df6-40d8-96f2-5f319b4e09b6", - "path": "/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": "/e", - "interactions": "", - "processors": "", - "groups": "Keyboard", - "action": "Movement", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "98e0b041-ad63-4049-b1b7-a8376bcfcab9", - "path": "/d", - "interactions": "", - "processors": "", - "groups": "Keyboard", - "action": "Movement", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "bc05db1d-90f5-45f9-a33c-9bd6459c8d56", - "path": "/s", - "interactions": "", - "processors": "", - "groups": "Keyboard", - "action": "Movement", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "5a645799-e30a-420a-b9e9-e7cb67b8479b", - "path": "/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": "/i", - "interactions": "", - "processors": "", - "groups": "Keyboard", - "action": "Movement", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "67536a26-9548-415e-beb2-b05b671bfc79", - "path": "/k", - "interactions": "", - "processors": "", - "groups": "Keyboard", - "action": "Movement", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "dcc7720f-17f0-4e10-b2c0-2c3f43649b82", - "path": "/j", - "interactions": "", - "processors": "", - "groups": "Keyboard", - "action": "Movement", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "77b2eb4e-09f0-43bc-b327-8c22d39e1f6e", - "path": "/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": "/upArrow", - "interactions": "", - "processors": "", - "groups": "Keyboard", - "action": "Movement", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "1c38d675-68ca-4a69-9e83-7d476b11ecb8", - "path": "/downArrow", - "interactions": "", - "processors": "", - "groups": "Keyboard", - "action": "Movement", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "de1783b5-c4c3-4df1-b1f6-f31a92289b7f", - "path": "/leftArrow", - "interactions": "", - "processors": "", - "groups": "Keyboard", - "action": "Movement", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "802cc7db-4145-4f4b-8f12-5b4d04c4cd34", - "path": "/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": "/numpad5", - "interactions": "", - "processors": "", - "groups": "Keyboard", - "action": "Movement", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "273771cf-7209-4c4e-91bd-7bcdd59b8058", - "path": "/numpad2", - "interactions": "", - "processors": "", - "groups": "Keyboard", - "action": "Movement", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "4488adf1-f2eb-4315-9a28-d6f1e082c00d", - "path": "/numpad1", - "interactions": "", - "processors": "", - "groups": "Keyboard", - "action": "Movement", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "601eed6e-0487-4b76-ac44-937e59ec1baa", - "path": "/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": "/leftStick/up", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Movement", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "e9570dae-9d6d-41e5-916f-c517f3d92cf2", - "path": "/leftStick/down", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Movement", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "1a21c3b1-25ac-408a-8353-25b58c02a0cd", - "path": "/leftStick/left", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Movement", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "692a063e-e9f1-4618-9b4f-3dfa3320f452", - "path": "/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": "/rightStick/up", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Movement", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "1c055962-72a4-4bb2-b64a-27bb2819dc21", - "path": "/leftStick/down", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Movement", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "6019368c-51d1-44d1-b1fc-e0927fbf3527", - "path": "/leftStick/left", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Movement", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "d343037d-b26c-4cef-8054-abc121596fda", - "path": "/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": "/dpad/up", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Movement", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "db9e43ff-febf-450b-96ac-9307671005ef", - "path": "/dpad/down", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Movement", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "54af0f26-5e48-46fd-9a7e-895851dd925a", - "path": "/dpad/left", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Movement", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "4d436bbf-8ead-42ba-af37-d28eefb7b0d3", - "path": "/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": "/buttonNorth", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Movement", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "22898ff8-c2df-499e-bb65-03b4ab7d5ac7", - "path": "/buttonSouth", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Movement", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "4c780a32-9f41-4ad9-95eb-42d41b627ff4", - "path": "/buttonWest", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Movement", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "da86ca75-7900-41a3-b367-68e70b787448", - "path": "/buttonEast", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Movement", - "isComposite": false, - "isPartOfComposite": true - } - ] - } - ], - "controlSchemes": [ - { - "name": "Keyboard", - "bindingGroup": "Keyboard", - "devices": [ - { - "devicePath": "", - "isOptional": false, - "isOR": false - } - ] - }, - { - "name": "Gamepad", - "bindingGroup": "Gamepad", - "devices": [ - { - "devicePath": "", - "isOptional": false, - "isOR": false - }, - { - "devicePath": "", - "isOptional": false, - "isOR": false - } - ] - } - ] -} \ No newline at end of file diff --git a/3D/Assets/InputMaster.inputactions.meta b/3D/Assets/InputMaster.inputactions.meta deleted file mode 100644 index 87f3822..0000000 --- a/3D/Assets/InputMaster.inputactions.meta +++ /dev/null @@ -1,14 +0,0 @@ -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: diff --git a/3D/Assets/Scenes/Main.unity b/3D/Assets/Scenes/Main.unity index c1e16fa..76063c9 100644 --- a/3D/Assets/Scenes/Main.unity +++ b/3D/Assets/Scenes/Main.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1} + m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.5748171, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -134,6 +134,7 @@ GameObject: - component: {fileID: 403144235} - component: {fileID: 403144234} - component: {fileID: 403144233} + - component: {fileID: 403144236} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -200,12 +201,24 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 403144232} m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 1254, z: 0} + m_LocalPosition: {x: 0, y: 1177.4, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!114 &403144236 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 403144232} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e75cbf2f3a211cc4dac41ccd629dc4e3, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &598081035 GameObject: m_ObjectHideFlags: 0 @@ -299,19 +312,264 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!65 &1209288078 +--- !u!1 &711422030 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 711422036} + - component: {fileID: 711422035} + - component: {fileID: 711422034} + - component: {fileID: 711422033} + - component: {fileID: 711422032} + - component: {fileID: 711422031} + m_Layer: 6 + m_Name: Player2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &711422031 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 711422030} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 10c35f7d02f278949ba7bd10d159b7b1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_PlayerNumber: 2 + m_Speed: 30 + m_TurnSpeed: 180 + m_PitchRange: 0.2 +--- !u!54 &711422032 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 711422030} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 84 + m_CollisionDetection: 3 +--- !u!65 &711422033 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 832149484756735013} + m_GameObject: {fileID: 711422030} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 3.6340976, y: 4.530515, z: 3.2187436} - m_Center: {x: 0, y: 0.07058166, z: 0.45564726} + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &711422034 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 711422030} + 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 &711422035 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 711422030} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &711422036 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 711422030} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -43.7, y: 16.2, z: -8.24259} + m_LocalScale: {x: 15, y: 15, z: 15} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1549583588 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1549583594} + - component: {fileID: 1549583593} + - component: {fileID: 1549583592} + - component: {fileID: 1549583591} + - component: {fileID: 1549583590} + - component: {fileID: 1549583589} + m_Layer: 6 + m_Name: Player1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1549583589 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1549583588} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 10c35f7d02f278949ba7bd10d159b7b1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_PlayerNumber: 1 + m_Speed: 30 + m_TurnSpeed: 180 + m_PitchRange: 0.2 +--- !u!54 &1549583590 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1549583588} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 84 + m_CollisionDetection: 3 +--- !u!65 &1549583591 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1549583588} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1549583592 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1549583588} + 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: 10303, guid: 0000000000000000f000000000000000, type: 0} + 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 &1549583593 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1549583588} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1549583594 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1549583588} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -3.4, y: 15.5, z: -8.24259} + m_LocalScale: {x: 15, y: 15, z: 15} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &74861012453899779 MeshRenderer: m_ObjectHideFlags: 0 @@ -428,6 +686,7 @@ GameObject: - component: {fileID: 6567165045376820177} - component: {fileID: 74861012453899779} - component: {fileID: 649776946038645705} + - component: {fileID: 649776946038645706} m_Layer: 0 m_Name: Wall.007 m_TagString: Untagged @@ -435,8 +694,8 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 4294967295 m_IsActive: 1 ---- !u!64 &649776946038645705 -MeshCollider: +--- !u!65 &649776946038645705 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -445,10 +704,25 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -1960669225518942497, guid: 910da85b9980587469a455dc1cbca10e, type: 3} + serializedVersion: 2 + m_Size: {x: 2, y: 1.9999995, z: 1.9999998} + m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &649776946038645706 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 649776946038645704} + serializedVersion: 2 + m_Mass: 2 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 84 + m_CollisionDetection: 3 --- !u!23 &737159830657688691 MeshRenderer: m_ObjectHideFlags: 0 @@ -502,6 +776,7 @@ GameObject: - component: {fileID: 6418068960892729093} - component: {fileID: 1452851685641802084} - component: {fileID: 820955451840536437} + - component: {fileID: 820955451840536438} m_Layer: 0 m_Name: Wall.004 m_TagString: Untagged @@ -509,8 +784,8 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 4294967295 m_IsActive: 1 ---- !u!64 &820955451840536437 -MeshCollider: +--- !u!65 &820955451840536437 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -519,10 +794,25 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -2427450495734281886, guid: 910da85b9980587469a455dc1cbca10e, type: 3} + serializedVersion: 2 + m_Size: {x: 2, y: 1.9999998, z: 1.9999998} + m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &820955451840536438 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 820955451840536436} + serializedVersion: 2 + m_Mass: 2 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 84 + m_CollisionDetection: 3 --- !u!4 &827097196422436415 Transform: m_ObjectHideFlags: 0 @@ -537,38 +827,6 @@ Transform: m_Father: {fileID: 6848066206515850231} m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &832149484756735013 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3745622627825310415} - - component: {fileID: 5334037119917370449} - - component: {fileID: 4539702727796617358} - - component: {fileID: 1209288078} - - component: {fileID: 832149484756735014} - m_Layer: 0 - m_Name: Tank - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &832149484756735014 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 832149484756735013} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 48961f21fe75d884ea97a37715c08891, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &836326522288652984 GameObject: m_ObjectHideFlags: 0 @@ -581,6 +839,7 @@ GameObject: - component: {fileID: 1736460833074988183} - component: {fileID: 8344259915793292901} - component: {fileID: 836326522288652985} + - component: {fileID: 836326522288652986} m_Layer: 0 m_Name: Wall.003 m_TagString: Untagged @@ -588,8 +847,8 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 4294967295 m_IsActive: 1 ---- !u!64 &836326522288652985 -MeshCollider: +--- !u!65 &836326522288652985 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -598,10 +857,25 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 6503316152310639137, guid: 910da85b9980587469a455dc1cbca10e, type: 3} + serializedVersion: 2 + m_Size: {x: 2.000001, y: 2.0000002, z: 2.0000002} + m_Center: {x: -0.0000009536743, y: 0, z: 0} +--- !u!54 &836326522288652986 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 836326522288652984} + serializedVersion: 2 + m_Mass: 2 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 84 + m_CollisionDetection: 3 --- !u!4 &931637653895416113 Transform: m_ObjectHideFlags: 0 @@ -628,6 +902,7 @@ GameObject: - component: {fileID: 3789499977111455469} - component: {fileID: 2773929149271941619} - component: {fileID: 972465771029297437} + - component: {fileID: 972465771029297438} m_Layer: 0 m_Name: Wall.011 m_TagString: Untagged @@ -635,8 +910,8 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 4294967295 m_IsActive: 1 ---- !u!64 &972465771029297437 -MeshCollider: +--- !u!65 &972465771029297437 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -645,10 +920,25 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -3482599626735259911, guid: 910da85b9980587469a455dc1cbca10e, type: 3} + serializedVersion: 2 + m_Size: {x: 2, y: 1.9999998, z: 1.9999998} + m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &972465771029297438 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 972465771029297436} + serializedVersion: 2 + m_Mass: 2 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 84 + m_CollisionDetection: 3 --- !u!1 &1148393572436198276 GameObject: m_ObjectHideFlags: 0 @@ -661,6 +951,7 @@ GameObject: - component: {fileID: 6978687947768988245} - component: {fileID: 6253474319365204820} - component: {fileID: 1148393572436198277} + - component: {fileID: 1148393572436198278} m_Layer: 0 m_Name: Wall.014 m_TagString: Untagged @@ -668,8 +959,8 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 4294967295 m_IsActive: 1 ---- !u!64 &1148393572436198277 -MeshCollider: +--- !u!65 &1148393572436198277 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -678,10 +969,25 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -6258084497164794892, guid: 910da85b9980587469a455dc1cbca10e, type: 3} + serializedVersion: 2 + m_Size: {x: 2, y: 1.9999996, z: 1.9999998} + m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &1148393572436198278 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148393572436198276} + serializedVersion: 2 + m_Mass: 2 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 84 + m_CollisionDetection: 3 --- !u!4 &1149994309874116970 Transform: m_ObjectHideFlags: 0 @@ -708,6 +1014,7 @@ GameObject: - component: {fileID: 4042371301972672091} - component: {fileID: 4700449833575504905} - component: {fileID: 1335408609601014784} + - component: {fileID: 1335408609601014785} m_Layer: 0 m_Name: Wall.001 m_TagString: Untagged @@ -715,8 +1022,8 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 4294967295 m_IsActive: 1 ---- !u!64 &1335408609601014784 -MeshCollider: +--- !u!65 &1335408609601014784 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -725,10 +1032,25 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 6206450301262281439, guid: 910da85b9980587469a455dc1cbca10e, type: 3} + serializedVersion: 2 + m_Size: {x: 2, y: 1.9999995, z: 1.9999998} + m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &1335408609601014785 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1335408609601014783} + serializedVersion: 2 + m_Mass: 2 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 84 + m_CollisionDetection: 3 --- !u!23 &1452851685641802084 MeshRenderer: m_ObjectHideFlags: 0 @@ -782,6 +1104,7 @@ GameObject: - component: {fileID: 9094464489853835365} - component: {fileID: 7843192436177896378} - component: {fileID: 1669855319042171288} + - component: {fileID: 1669855319042171289} m_Layer: 0 m_Name: Wall.012 m_TagString: Untagged @@ -789,8 +1112,8 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 4294967295 m_IsActive: 1 ---- !u!64 &1669855319042171288 -MeshCollider: +--- !u!65 &1669855319042171288 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -799,10 +1122,25 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -753113481590415055, guid: 910da85b9980587469a455dc1cbca10e, type: 3} + serializedVersion: 2 + m_Size: {x: 2.0000017, y: 2, z: 2.0000005} + m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &1669855319042171289 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1669855319042171287} + serializedVersion: 2 + m_Mass: 2 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 84 + m_CollisionDetection: 3 --- !u!4 &1710978644625261148 Transform: m_ObjectHideFlags: 0 @@ -1181,20 +1519,6 @@ Transform: m_Father: {fileID: 6848066206515850231} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &3745622627825310415 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 832149484756735013} - m_LocalRotation: {x: -0, y: 0.7071068, z: 0.7071068, w: 0} - m_LocalPosition: {x: 71.8, y: 17.69, z: -9.7} - m_LocalScale: {x: 10, y: 10, z: 10} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: -90, y: 180, z: 0} --- !u!33 &3789499977111455469 MeshFilter: m_ObjectHideFlags: 0 @@ -1314,6 +1638,7 @@ GameObject: - component: {fileID: 2119494166666074040} - component: {fileID: 3492171072606615783} - component: {fileID: 4497761288514631270} + - component: {fileID: 4497761288514631271} m_Layer: 0 m_Name: Wall m_TagString: Untagged @@ -1321,8 +1646,8 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 4294967295 m_IsActive: 1 ---- !u!64 &4497761288514631270 -MeshCollider: +--- !u!65 &4497761288514631270 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1331,10 +1656,25 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 8733429697405204941, guid: 910da85b9980587469a455dc1cbca10e, type: 3} + serializedVersion: 2 + m_Size: {x: 2, y: 1.9999995, z: 1.9999998} + m_Center: {x: 0, y: 0.000000007450581, z: 0} +--- !u!54 &4497761288514631271 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4497761288514631269} + serializedVersion: 2 + m_Mass: 2 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 84 + m_CollisionDetection: 3 --- !u!23 &4529611148120154782 MeshRenderer: m_ObjectHideFlags: 0 @@ -1376,55 +1716,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!23 &4539702727796617358 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 832149484756735013} - 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} - - {fileID: 2100000, guid: 746c12765a1d8934085e26b41fc3d350, type: 2} - - {fileID: 2100000, guid: bb56fbc361545fd489ea4345f35d51ad, type: 2} - - {fileID: 2100000, guid: 61342213f6e6d324687a7eb2fbceba8f, type: 2} - - {fileID: 2100000, guid: e641c94a7783484449e9d37540551346, type: 2} - - {fileID: 2100000, guid: 746c12765a1d8934085e26b41fc3d350, type: 2} - - {fileID: 2100000, guid: e641c94a7783484449e9d37540551346, type: 2} - - {fileID: 2100000, guid: bb56fbc361545fd489ea4345f35d51ad, type: 2} - - {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!23 &4656341524539966822 MeshRenderer: m_ObjectHideFlags: 0 @@ -1527,6 +1818,7 @@ GameObject: - component: {fileID: 6430747790343552473} - component: {fileID: 2777982924113010345} - component: {fileID: 4928781760934707544} + - component: {fileID: 4928781760934707545} m_Layer: 0 m_Name: MainWall4 m_TagString: Untagged @@ -1534,8 +1826,8 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 4294967295 m_IsActive: 1 ---- !u!64 &4928781760934707544 -MeshCollider: +--- !u!65 &4928781760934707544 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1544,10 +1836,25 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -5739118449312966352, guid: 910da85b9980587469a455dc1cbca10e, type: 3} + serializedVersion: 2 + m_Size: {x: 2.0000033, y: 2.0000002, z: 2.0000007} + m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &4928781760934707545 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4928781760934707543} + serializedVersion: 2 + m_Mass: 2 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 84 + m_CollisionDetection: 3 --- !u!33 &5120323238512477898 MeshFilter: m_ObjectHideFlags: 0 @@ -1578,14 +1885,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5821426592586426464} m_Mesh: {fileID: 6783441914887117901, guid: 910da85b9980587469a455dc1cbca10e, type: 3} ---- !u!33 &5334037119917370449 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 832149484756735013} - m_Mesh: {fileID: -5495902117074765545, guid: ce7f7ad1dde841c4fbffa9b7a3bf17dc, type: 3} --- !u!23 &5400324553077906727 MeshRenderer: m_ObjectHideFlags: 0 @@ -1639,6 +1938,7 @@ GameObject: - component: {fileID: 2251566101230565672} - component: {fileID: 4656341524539966822} - component: {fileID: 5640250880920258744} + - component: {fileID: 5640250880920258745} m_Layer: 0 m_Name: Wall.015 m_TagString: Untagged @@ -1646,8 +1946,8 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 4294967295 m_IsActive: 1 ---- !u!64 &5640250880920258744 -MeshCollider: +--- !u!65 &5640250880920258744 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1656,10 +1956,25 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -247244562708069194, guid: 910da85b9980587469a455dc1cbca10e, type: 3} + serializedVersion: 2 + m_Size: {x: 2.000002, y: 2, z: 2.0000005} + m_Center: {x: 0, y: 0.00000011920929, z: 0} +--- !u!54 &5640250880920258745 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5640250880920258743} + serializedVersion: 2 + m_Mass: 2 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 84 + m_CollisionDetection: 3 --- !u!23 &5641885326368902053 MeshRenderer: m_ObjectHideFlags: 0 @@ -1713,6 +2028,7 @@ GameObject: - component: {fileID: 5215038669983769339} - component: {fileID: 8415151531708678173} - component: {fileID: 5821426592586426465} + - component: {fileID: 5821426592586426466} m_Layer: 0 m_Name: Wall2 m_TagString: Untagged @@ -1720,8 +2036,8 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 4294967295 m_IsActive: 1 ---- !u!64 &5821426592586426465 -MeshCollider: +--- !u!65 &5821426592586426465 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1730,10 +2046,25 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 6783441914887117901, guid: 910da85b9980587469a455dc1cbca10e, type: 3} + serializedVersion: 2 + m_Size: {x: 2.000001, y: 2.0000002, z: 2.0000002} + m_Center: {x: 0, y: -0.00000047683716, z: 0} +--- !u!54 &5821426592586426466 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5821426592586426464} + serializedVersion: 2 + m_Mass: 2 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 84 + m_CollisionDetection: 3 --- !u!4 &5969611543482542170 Transform: m_ObjectHideFlags: 0 @@ -1776,6 +2107,7 @@ GameObject: - component: {fileID: 2425682645476050235} - component: {fileID: 9127345518820215002} - component: {fileID: 6172235275449449130} + - component: {fileID: 6172235275449449131} m_Layer: 0 m_Name: Wall.009 m_TagString: Untagged @@ -1783,8 +2115,8 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 4294967295 m_IsActive: 1 ---- !u!64 &6172235275449449130 -MeshCollider: +--- !u!65 &6172235275449449130 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1793,10 +2125,25 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4762489875059447549, guid: 910da85b9980587469a455dc1cbca10e, type: 3} + serializedVersion: 2 + m_Size: {x: 2.0000012, y: 2, z: 2.0000002} + m_Center: {x: 0, y: -0.0000000037252903, z: 0} +--- !u!54 &6172235275449449131 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6172235275449449129} + serializedVersion: 2 + m_Mass: 2 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 84 + m_CollisionDetection: 3 --- !u!33 &6208944394421098674 MeshFilter: m_ObjectHideFlags: 0 @@ -1858,6 +2205,7 @@ GameObject: - component: {fileID: 7635578952263928679} - component: {fileID: 2366926407171870713} - component: {fileID: 6321484692471841303} + - component: {fileID: 6321484692471841304} m_Layer: 0 m_Name: MainWall2 m_TagString: Untagged @@ -1865,8 +2213,8 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 4294967295 m_IsActive: 1 ---- !u!64 &6321484692471841303 -MeshCollider: +--- !u!65 &6321484692471841303 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1875,10 +2223,25 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 6894271628449686462, guid: 910da85b9980587469a455dc1cbca10e, type: 3} + serializedVersion: 2 + m_Size: {x: 2, y: 1.9999995, z: 1.9999998} + m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &6321484692471841304 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6321484692471841302} + serializedVersion: 2 + m_Mass: 2 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 84 + m_CollisionDetection: 3 --- !u!4 &6356538488010265033 Transform: m_ObjectHideFlags: 0 @@ -1921,6 +2284,7 @@ GameObject: - component: {fileID: 3898756214372304537} - component: {fileID: 7112288296323204503} - component: {fileID: 6474112201766687349} + - component: {fileID: 6474112201766687350} m_Layer: 0 m_Name: Wall.002 m_TagString: Untagged @@ -1928,8 +2292,8 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 4294967295 m_IsActive: 1 ---- !u!64 &6474112201766687349 -MeshCollider: +--- !u!65 &6474112201766687349 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1938,10 +2302,25 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 2643821412708588246, guid: 910da85b9980587469a455dc1cbca10e, type: 3} + serializedVersion: 2 + m_Size: {x: 2.0000012, y: 2, z: 2.0000002} + m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &6474112201766687350 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6474112201766687348} + serializedVersion: 2 + m_Mass: 2 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 84 + m_CollisionDetection: 3 --- !u!33 &6542461718318204676 MeshFilter: m_ObjectHideFlags: 0 @@ -1970,6 +2349,7 @@ GameObject: - component: {fileID: 2900633274711177787} - component: {fileID: 5641885326368902053} - component: {fileID: 6572188262022874481} + - component: {fileID: 6572188262022874482} m_Layer: 0 m_Name: Wall.016 m_TagString: Untagged @@ -1977,8 +2357,8 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 4294967295 m_IsActive: 1 ---- !u!64 &6572188262022874481 -MeshCollider: +--- !u!65 &6572188262022874481 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1987,10 +2367,25 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -3428755963297276160, guid: 910da85b9980587469a455dc1cbca10e, type: 3} + serializedVersion: 2 + m_Size: {x: 2, y: 1.9999995, z: 1.9999998} + m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &6572188262022874482 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6572188262022874480} + serializedVersion: 2 + m_Mass: 2 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 84 + m_CollisionDetection: 3 --- !u!4 &6848066206515850231 Transform: m_ObjectHideFlags: 0 @@ -2103,6 +2498,7 @@ GameObject: - component: {fileID: 4912053127338460789} - component: {fileID: 5400324553077906727} - component: {fileID: 7318127575737247141} + - component: {fileID: 7318127575737247142} m_Layer: 0 m_Name: Wall.010 m_TagString: Untagged @@ -2110,8 +2506,8 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 4294967295 m_IsActive: 1 ---- !u!64 &7318127575737247141 -MeshCollider: +--- !u!65 &7318127575737247141 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -2120,10 +2516,25 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 7466140592968860590, guid: 910da85b9980587469a455dc1cbca10e, type: 3} + serializedVersion: 2 + m_Size: {x: 2.0000017, y: 2, z: 2.0000005} + m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &7318127575737247142 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7318127575737247140} + serializedVersion: 2 + m_Mass: 2 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 84 + m_CollisionDetection: 3 --- !u!4 &7536273069664095703 Transform: m_ObjectHideFlags: 0 @@ -2172,6 +2583,7 @@ GameObject: - component: {fileID: 6208944394421098674} - component: {fileID: 3576434658113210006} - component: {fileID: 7816826067024513678} + - component: {fileID: 7816826067024513679} m_Layer: 0 m_Name: Wall.008 m_TagString: Untagged @@ -2179,8 +2591,8 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 4294967295 m_IsActive: 1 ---- !u!64 &7816826067024513678 -MeshCollider: +--- !u!65 &7816826067024513678 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -2189,10 +2601,25 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 6681037884777033280, guid: 910da85b9980587469a455dc1cbca10e, type: 3} + serializedVersion: 2 + m_Size: {x: 2.0000012, y: 2, z: 2.0000002} + m_Center: {x: 0, y: -0.00000011920929, z: 0} +--- !u!54 &7816826067024513679 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7816826067024513677} + serializedVersion: 2 + m_Mass: 2 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 84 + m_CollisionDetection: 3 --- !u!23 &7843192436177896378 MeshRenderer: m_ObjectHideFlags: 0 @@ -2268,6 +2695,7 @@ GameObject: - component: {fileID: 5120323238512477898} - component: {fileID: 737159830657688691} - component: {fileID: 8202752920852598808} + - component: {fileID: 8202752920852598809} m_Layer: 0 m_Name: MainWall3 m_TagString: Untagged @@ -2275,8 +2703,8 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 4294967295 m_IsActive: 1 ---- !u!64 &8202752920852598808 -MeshCollider: +--- !u!65 &8202752920852598808 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -2285,10 +2713,25 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 1064733200286486929, guid: 910da85b9980587469a455dc1cbca10e, type: 3} + serializedVersion: 2 + m_Size: {x: 2.0000033, y: 2.0000002, z: 2.0000007} + m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &8202752920852598809 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8202752920852598807} + serializedVersion: 2 + m_Mass: 2 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 84 + m_CollisionDetection: 3 --- !u!23 &8344259915793292901 MeshRenderer: m_ObjectHideFlags: 0 @@ -2383,6 +2826,7 @@ GameObject: - component: {fileID: 8681508763074788974} - component: {fileID: 562640465693251529} - component: {fileID: 8464535609377026258} + - component: {fileID: 8464535609377026259} m_Layer: 0 m_Name: MainWall1 m_TagString: Untagged @@ -2390,8 +2834,8 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 4294967295 m_IsActive: 1 ---- !u!64 &8464535609377026258 -MeshCollider: +--- !u!65 &8464535609377026258 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -2400,10 +2844,25 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -4127911419310272426, guid: 910da85b9980587469a455dc1cbca10e, type: 3} + serializedVersion: 2 + m_Size: {x: 2, y: 1.9999995, z: 1.9999998} + m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &8464535609377026259 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8464535609377026257} + serializedVersion: 2 + m_Mass: 2 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 84 + m_CollisionDetection: 3 --- !u!4 &8549379663446121844 Transform: m_ObjectHideFlags: 0 @@ -2452,6 +2911,7 @@ GameObject: - component: {fileID: 6542461718318204676} - component: {fileID: 8858507216858716695} - component: {fileID: 8815379788078579734} + - component: {fileID: 8815379788078579735} m_Layer: 0 m_Name: Wall.013 m_TagString: Untagged @@ -2459,8 +2919,8 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 4294967295 m_IsActive: 1 ---- !u!64 &8815379788078579734 -MeshCollider: +--- !u!65 &8815379788078579734 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -2469,10 +2929,25 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 7305168873492875877, guid: 910da85b9980587469a455dc1cbca10e, type: 3} + serializedVersion: 2 + m_Size: {x: 2.0000014, y: 1.9999999, z: 2.0000005} + m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &8815379788078579735 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8815379788078579733} + serializedVersion: 2 + m_Mass: 2 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 84 + m_CollisionDetection: 3 --- !u!23 &8858507216858716695 MeshRenderer: m_ObjectHideFlags: 0 @@ -2540,6 +3015,7 @@ GameObject: - component: {fileID: 3016721543437484225} - component: {fileID: 3095465718314267384} - component: {fileID: 8927998876244521152} + - component: {fileID: 8927998876244521153} m_Layer: 0 m_Name: Floor m_TagString: Untagged @@ -2547,8 +3023,8 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 4294967295 m_IsActive: 1 ---- !u!64 &8927998876244521152 -MeshCollider: +--- !u!65 &8927998876244521152 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -2557,10 +3033,25 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -629719859055844128, guid: 910da85b9980587469a455dc1cbca10e, type: 3} + serializedVersion: 2 + m_Size: {x: 2, y: 1.9999995, z: 1.9999998} + m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &8927998876244521153 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8927998876244521151} + serializedVersion: 2 + m_Mass: 2 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 84 + m_CollisionDetection: 3 --- !u!1 &8976491023356292989 GameObject: m_ObjectHideFlags: 0 @@ -2573,6 +3064,7 @@ GameObject: - component: {fileID: 7997132234647221491} - component: {fileID: 4529611148120154782} - component: {fileID: 8976491023356292990} + - component: {fileID: 8976491023356292991} m_Layer: 0 m_Name: Wall.005 m_TagString: Untagged @@ -2580,8 +3072,8 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 4294967295 m_IsActive: 1 ---- !u!64 &8976491023356292990 -MeshCollider: +--- !u!65 &8976491023356292990 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -2590,10 +3082,25 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 66159664719695952, guid: 910da85b9980587469a455dc1cbca10e, type: 3} + serializedVersion: 2 + m_Size: {x: 2.000001, y: 2, z: 2.0000002} + m_Center: {x: 0, y: 0.00000023841858, z: 0} +--- !u!54 &8976491023356292991 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8976491023356292989} + serializedVersion: 2 + m_Mass: 2 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 84 + m_CollisionDetection: 3 --- !u!33 &9094464489853835365 MeshFilter: m_ObjectHideFlags: 0 @@ -2614,6 +3121,7 @@ GameObject: - component: {fileID: 642645044412023035} - component: {fileID: 4424124250180961931} - component: {fileID: 9115203963343780253} + - component: {fileID: 9115203963343780254} m_Layer: 0 m_Name: Wall.006 m_TagString: Untagged @@ -2621,8 +3129,8 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 4294967295 m_IsActive: 1 ---- !u!64 &9115203963343780253 -MeshCollider: +--- !u!65 &9115203963343780253 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -2631,10 +3139,25 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -6766430848978330548, guid: 910da85b9980587469a455dc1cbca10e, type: 3} + serializedVersion: 2 + m_Size: {x: 2, y: 1.9999996, z: 1.9999998} + m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &9115203963343780254 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9115203963343780252} + serializedVersion: 2 + m_Mass: 2 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 84 + m_CollisionDetection: 3 --- !u!23 &9127345518820215002 MeshRenderer: m_ObjectHideFlags: 0 diff --git a/3D/Assets/Scripts/ExitGame.cs b/3D/Assets/Scripts/ExitGame.cs new file mode 100644 index 0000000..c71ddac --- /dev/null +++ b/3D/Assets/Scripts/ExitGame.cs @@ -0,0 +1,13 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ExitGame : MonoBehaviour +{ + private void Update() { + if (Input.GetKey("escape")) { + Debug.Log("Application is quitting!!"); + Application.Quit(); + } + } +} diff --git a/3D/Assets/Scripts/NewInputSystem.cs.meta b/3D/Assets/Scripts/ExitGame.cs.meta similarity index 83% rename from 3D/Assets/Scripts/NewInputSystem.cs.meta rename to 3D/Assets/Scripts/ExitGame.cs.meta index 8f16486..3a281c4 100644 --- a/3D/Assets/Scripts/NewInputSystem.cs.meta +++ b/3D/Assets/Scripts/ExitGame.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 48961f21fe75d884ea97a37715c08891 +guid: e75cbf2f3a211cc4dac41ccd629dc4e3 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/3D/Assets/Scripts/InputMaster.cs b/3D/Assets/Scripts/InputMaster.cs deleted file mode 100644 index 6bf3534..0000000 --- a/3D/Assets/Scripts/InputMaster.cs +++ /dev/null @@ -1,734 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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. -// -//------------------------------------------------------------------------------ - -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"": ""/q"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard"", - ""action"": ""Shoot"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""67318264-3ee9-466e-ac47-fa38a37e72a8"", - ""path"": ""/t"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard"", - ""action"": ""Shoot"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""b1f39785-4294-4fe1-9daf-5e699315bdf8"", - ""path"": ""/space"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard"", - ""action"": ""Shoot"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""af21d08e-c697-4e7b-88b6-ab285d039655"", - ""path"": ""/numpad7"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard"", - ""action"": ""Shoot"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""fd8b1b85-2e49-42b4-9650-36d1b6168914"", - ""path"": ""/rightTrigger"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Gamepad"", - ""action"": ""Shoot"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""ce969bad-123a-4417-bc76-d8075f6c6596"", - ""path"": ""/leftTrigger"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Gamepad"", - ""action"": ""Shoot"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""43b05b5c-d0ac-474d-a48b-8af495fd9c6e"", - ""path"": ""/rightShoulder"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Gamepad"", - ""action"": ""Shoot"", - ""isComposite"": false, - ""isPartOfComposite"": false - }, - { - ""name"": """", - ""id"": ""ff951c55-8df6-40d8-96f2-5f319b4e09b6"", - ""path"": ""/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"": ""/e"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard"", - ""action"": ""Movement"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""down"", - ""id"": ""98e0b041-ad63-4049-b1b7-a8376bcfcab9"", - ""path"": ""/d"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard"", - ""action"": ""Movement"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""left"", - ""id"": ""bc05db1d-90f5-45f9-a33c-9bd6459c8d56"", - ""path"": ""/s"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard"", - ""action"": ""Movement"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""right"", - ""id"": ""5a645799-e30a-420a-b9e9-e7cb67b8479b"", - ""path"": ""/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"": ""/i"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard"", - ""action"": ""Movement"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""down"", - ""id"": ""67536a26-9548-415e-beb2-b05b671bfc79"", - ""path"": ""/k"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard"", - ""action"": ""Movement"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""left"", - ""id"": ""dcc7720f-17f0-4e10-b2c0-2c3f43649b82"", - ""path"": ""/j"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard"", - ""action"": ""Movement"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""right"", - ""id"": ""77b2eb4e-09f0-43bc-b327-8c22d39e1f6e"", - ""path"": ""/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"": ""/upArrow"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard"", - ""action"": ""Movement"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""down"", - ""id"": ""1c38d675-68ca-4a69-9e83-7d476b11ecb8"", - ""path"": ""/downArrow"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard"", - ""action"": ""Movement"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""left"", - ""id"": ""de1783b5-c4c3-4df1-b1f6-f31a92289b7f"", - ""path"": ""/leftArrow"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard"", - ""action"": ""Movement"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""right"", - ""id"": ""802cc7db-4145-4f4b-8f12-5b4d04c4cd34"", - ""path"": ""/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"": ""/numpad5"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard"", - ""action"": ""Movement"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""down"", - ""id"": ""273771cf-7209-4c4e-91bd-7bcdd59b8058"", - ""path"": ""/numpad2"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard"", - ""action"": ""Movement"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""left"", - ""id"": ""4488adf1-f2eb-4315-9a28-d6f1e082c00d"", - ""path"": ""/numpad1"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Keyboard"", - ""action"": ""Movement"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""right"", - ""id"": ""601eed6e-0487-4b76-ac44-937e59ec1baa"", - ""path"": ""/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"": ""/leftStick/up"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Gamepad"", - ""action"": ""Movement"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""down"", - ""id"": ""e9570dae-9d6d-41e5-916f-c517f3d92cf2"", - ""path"": ""/leftStick/down"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Gamepad"", - ""action"": ""Movement"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""left"", - ""id"": ""1a21c3b1-25ac-408a-8353-25b58c02a0cd"", - ""path"": ""/leftStick/left"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Gamepad"", - ""action"": ""Movement"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""right"", - ""id"": ""692a063e-e9f1-4618-9b4f-3dfa3320f452"", - ""path"": ""/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"": ""/rightStick/up"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Gamepad"", - ""action"": ""Movement"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""down"", - ""id"": ""1c055962-72a4-4bb2-b64a-27bb2819dc21"", - ""path"": ""/leftStick/down"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Gamepad"", - ""action"": ""Movement"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""left"", - ""id"": ""6019368c-51d1-44d1-b1fc-e0927fbf3527"", - ""path"": ""/leftStick/left"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Gamepad"", - ""action"": ""Movement"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""right"", - ""id"": ""d343037d-b26c-4cef-8054-abc121596fda"", - ""path"": ""/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"": ""/dpad/up"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Gamepad"", - ""action"": ""Movement"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""down"", - ""id"": ""db9e43ff-febf-450b-96ac-9307671005ef"", - ""path"": ""/dpad/down"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Gamepad"", - ""action"": ""Movement"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""left"", - ""id"": ""54af0f26-5e48-46fd-9a7e-895851dd925a"", - ""path"": ""/dpad/left"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Gamepad"", - ""action"": ""Movement"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""right"", - ""id"": ""4d436bbf-8ead-42ba-af37-d28eefb7b0d3"", - ""path"": ""/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"": ""/buttonNorth"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Gamepad"", - ""action"": ""Movement"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""down"", - ""id"": ""22898ff8-c2df-499e-bb65-03b4ab7d5ac7"", - ""path"": ""/buttonSouth"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Gamepad"", - ""action"": ""Movement"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""left"", - ""id"": ""4c780a32-9f41-4ad9-95eb-42d41b627ff4"", - ""path"": ""/buttonWest"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Gamepad"", - ""action"": ""Movement"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""right"", - ""id"": ""da86ca75-7900-41a3-b367-68e70b787448"", - ""path"": ""/buttonEast"", - ""interactions"": """", - ""processors"": """", - ""groups"": ""Gamepad"", - ""action"": ""Movement"", - ""isComposite"": false, - ""isPartOfComposite"": true - } - ] - } - ], - ""controlSchemes"": [ - { - ""name"": ""Keyboard"", - ""bindingGroup"": ""Keyboard"", - ""devices"": [ - { - ""devicePath"": """", - ""isOptional"": false, - ""isOR"": false - } - ] - }, - { - ""name"": ""Gamepad"", - ""bindingGroup"": ""Gamepad"", - ""devices"": [ - { - ""devicePath"": """", - ""isOptional"": false, - ""isOR"": false - }, - { - ""devicePath"": """", - ""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? devices - { - get => asset.devices; - set => asset.devices = value; - } - - public ReadOnlyArray controlSchemes => asset.controlSchemes; - - public bool Contains(InputAction action) - { - return asset.Contains(action); - } - - public IEnumerator GetEnumerator() - { - return asset.GetEnumerator(); - } - - IEnumerator IEnumerable.GetEnumerator() - { - return GetEnumerator(); - } - - public void Enable() - { - asset.Enable(); - } - - public void Disable() - { - asset.Disable(); - } - public IEnumerable 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); - } -} diff --git a/3D/Assets/Scripts/InputMaster.cs.meta b/3D/Assets/Scripts/InputMaster.cs.meta deleted file mode 100644 index 5b7c66c..0000000 --- a/3D/Assets/Scripts/InputMaster.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b39adc11ec2ae2543bf63097c5a04c78 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/3D/Assets/Scripts/NewInputSystem.cs b/3D/Assets/Scripts/NewInputSystem.cs deleted file mode 100644 index f884f61..0000000 --- a/3D/Assets/Scripts/NewInputSystem.cs +++ /dev/null @@ -1,32 +0,0 @@ -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()); - } - - void Shoot() { - Debug.Log("Shoot"); - } - - void Move(Vector2 direction) { - Debug.Log("Move" + direction); - } - - private void OnEnable() { - controls.Enable(); - } - - private void OnDisable() { - controls.Disable(); - } - -} diff --git a/3D/Assets/Scripts/PlayerMovement3d.cs b/3D/Assets/Scripts/PlayerMovement3d.cs deleted file mode 100644 index 4b7092f..0000000 --- a/3D/Assets/Scripts/PlayerMovement3d.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class PlayerMovement3d : MonoBehaviour -{ - public float movespeed = 15f; - - public Rigidbody rb; - public Vector3 movement; - public Vector3 rotation; - private float x, y; - - void Update() { - //Input - x = Input.GetAxisRaw("Horizontal"); - y = Input.GetAxisRaw("Vertical"); - - movement = new Vector3(0f, 0f, y); - rotation = new Vector3(0f, x, 0f); - } - - void FixedUpdate() { - //Movement - rb.MovePosition(rb.position + movement * movespeed * Time.deltaTime); - //rb.AddForce(rb.position + movement * movespeed * Time.deltaTime); - rb.MoveRotation(rb.rotation * Quaternion.Euler(0f, rotation.y, 0f)); - } -} diff --git a/3D/Assets/Scripts/PlayerMovement3d.cs.meta b/3D/Assets/Scripts/PlayerMovement3d.cs.meta deleted file mode 100644 index 2bd5a3b..0000000 --- a/3D/Assets/Scripts/PlayerMovement3d.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3d1003961d12b50469d57cf00114c3f4 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/3D/Assets/Scripts/TankMovement.cs b/3D/Assets/Scripts/TankMovement.cs new file mode 100644 index 0000000..4b938e0 --- /dev/null +++ b/3D/Assets/Scripts/TankMovement.cs @@ -0,0 +1,84 @@ +using UnityEngine; +using UnityEngine.Audio; + +public class TankMovement : MonoBehaviour +{ + public int m_PlayerNumber = 1; + public float m_Speed = 30f; + public float m_TurnSpeed = 180f; + public float m_PitchRange = 0.2f; + /*public AudioSource m_MovementAudio; + public AudioClip m_EngineIdle; + public AudioClip m_EngineDrive;*/ + + private string m_MovementAxisName; + private string m_TurnAxisName; + private float m_MovementInputValue; + private float m_TurnInputValue; + private float m_OriginalPitch; + private Rigidbody m_Rigidbody; + + private void Awake() { + m_Rigidbody = GetComponent(); + } + + private void OnEnable() { + m_Rigidbody.isKinematic = false; //at start of new game + m_MovementInputValue = 0f; + m_TurnInputValue = 0f; + } + + private void OnDisable() { + m_Rigidbody.isKinematic = true; //when player dies, disables the player object + } + + private void Start() { + m_MovementAxisName = "Vertical" + m_PlayerNumber; //different virtual axis for different players + m_TurnAxisName = "Horizontal" + m_PlayerNumber; + //m_OriginalPitch = m_MovementAudio.pitch; + } + + private void Update() { + //Getting input + m_MovementInputValue = Input.GetAxisRaw(m_MovementAxisName); + m_TurnInputValue = Input.GetAxisRaw(m_TurnAxisName); + + } + + /*private void EngineAudio() { + //for audio playing + if(Mathf.Abs(m_MovementInputValue) < 0.1f && Mathf.Abs(m_TurnInputValue) < 0.1f) { //if tank is not moving + if(m_MovementAudio.clip == m_EngineDrive) { + m_MovementAudio.clip = m_EngineIdle; + m_MovementAudio.pitch = Random.Range(m_OriginalPitch - m_PitchRange, m_OriginalPitch + m_PitchRange); + m_MovementAudio.Play(); + } + } else { + if (m_MovementAudio.clip == m_EngineIdle) { + m_MovementAudio.clip = m_EngineDrive; + m_MovementAudio.pitch = Random.Range(m_OriginalPitch - m_PitchRange, m_OriginalPitch + m_PitchRange); + m_MovementAudio.Play(); + } + } + }*/ + + private void FixedUpdate() { + //Moving the tank + Move(); + Turn(); + } + + private void Move() { + //forward and backwards movement + Vector3 movement = transform.forward * m_MovementInputValue * m_Speed * Time.deltaTime; + m_Rigidbody.MovePosition(m_Rigidbody.position + movement); + } + + private void Turn() { + //left or right rotation + float turn = m_TurnInputValue * m_TurnSpeed * Time.deltaTime; + Quaternion turnRotation = Quaternion.Euler(0f, turn, 0f); + + m_Rigidbody.MoveRotation(m_Rigidbody.rotation * turnRotation); + } +} diff --git a/3D/Assets/Scripts/TestMovement.cs.meta b/3D/Assets/Scripts/TankMovement.cs.meta similarity index 83% rename from 3D/Assets/Scripts/TestMovement.cs.meta rename to 3D/Assets/Scripts/TankMovement.cs.meta index 8ec5246..8b3cfb8 100644 --- a/3D/Assets/Scripts/TestMovement.cs.meta +++ b/3D/Assets/Scripts/TankMovement.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a2650ec0c90cfb74da510d0f0961bab4 +guid: 10c35f7d02f278949ba7bd10d159b7b1 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/3D/Assets/Scripts/TestMovement.cs b/3D/Assets/Scripts/TestMovement.cs deleted file mode 100644 index 5f66372..0000000 --- a/3D/Assets/Scripts/TestMovement.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class TestMovement : MonoBehaviour -{ - public CharacterController controller; - //public Transform gameobject; - - public float speed = 15f; - public float turnSmoothness = 0.1f; - public float targetAngle, angle; - float turnSmoothVelocity; - float x, y; - public Vector3 direction; - - void Update() - { - x = Input.GetAxisRaw("Horizontal"); - y = Input.GetAxisRaw("Vertical"); - direction = new Vector3(x, 0f, y).normalized; - - if (direction.magnitude >= 0.1f) { - targetAngle = Mathf.Atan2(direction.x, direction.z) * Mathf.Rad2Deg; //+ gameobject.eulerAngles.y - angle = Mathf.SmoothDampAngle(transform.eulerAngles.y, targetAngle, ref turnSmoothVelocity, turnSmoothness); - transform.rotation = Quaternion.Euler(-90f, angle, 0f); - - //Vector3 moveDir = Quaternion.Euler(0f, targetAngle, 0f) * Vector3.forward; - controller.Move(direction * speed * Time.deltaTime); - } - } -} diff --git a/3D/Packages/manifest.json b/3D/Packages/manifest.json index 096ddb2..d7aa3fb 100644 --- a/3D/Packages/manifest.json +++ b/3D/Packages/manifest.json @@ -1,14 +1,13 @@ { "dependencies": { "com.unity.collab-proxy": "1.15.13", - "com.unity.ide.rider": "2.0.7", "com.unity.ide.visualstudio": "2.0.14", "com.unity.ide.vscode": "1.2.5", - "com.unity.inputsystem": "1.3.0", "com.unity.probuilder": "4.5.2", "com.unity.test-framework": "1.1.31", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.4.8", + "com.unity.toolchain.win-x86_64-linux-x86_64": "1.0.0", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/3D/Packages/packages-lock.json b/3D/Packages/packages-lock.json index 30ab6f3..85869f3 100644 --- a/3D/Packages/packages-lock.json +++ b/3D/Packages/packages-lock.json @@ -16,15 +16,6 @@ "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.ide.rider": { - "version": "2.0.7", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.test-framework": "1.1.1" - }, - "url": "https://packages.unity.com" - }, "com.unity.ide.visualstudio": { "version": "2.0.14", "depth": 0, @@ -41,15 +32,6 @@ "dependencies": {}, "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": { "version": "4.5.2", "depth": 0, @@ -75,6 +57,22 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.sysroot": { + "version": "1.0.0", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.sysroot.linux-x86_64": { + "version": "1.0.0", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.test-framework": { "version": "1.1.31", "depth": 0, @@ -107,6 +105,16 @@ }, "url": "https://packages.unity.com" }, + "com.unity.toolchain.win-x86_64-linux-x86_64": { + "version": "1.0.0", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "1.0.0", + "com.unity.sysroot.linux-x86_64": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.ugui": { "version": "1.0.0", "depth": 0, diff --git a/3D/ProjectSettings/GraphicsSettings.asset b/3D/ProjectSettings/GraphicsSettings.asset index 43369e3..88dfcc8 100644 --- a/3D/ProjectSettings/GraphicsSettings.asset +++ b/3D/ProjectSettings/GraphicsSettings.asset @@ -28,6 +28,7 @@ GraphicsSettings: m_LensFlare: m_Mode: 1 m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0} + m_VideoShadersIncludeMode: 2 m_AlwaysIncludedShaders: - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0} @@ -36,8 +37,7 @@ GraphicsSettings: - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] - m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, - type: 0} + m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_CustomRenderPipeline: {fileID: 0} m_TransparencySortMode: 0 m_TransparencySortAxis: {x: 0, y: 0, z: 1} @@ -59,5 +59,5 @@ GraphicsSettings: m_AlbedoSwatchInfos: [] m_LightsUseLinearIntensity: 0 m_LightsUseColorTemperature: 0 + m_DefaultRenderingLayerMask: 1 m_LogWhenShaderIsCompiled: 0 - m_AllowEnlightenSupportForUpgradedProject: 0 diff --git a/3D/ProjectSettings/InputManager.asset b/3D/ProjectSettings/InputManager.asset index 17c8f53..12c05b4 100644 --- a/3D/ProjectSettings/InputManager.asset +++ b/3D/ProjectSettings/InputManager.asset @@ -6,13 +6,13 @@ InputManager: serializedVersion: 2 m_Axes: - serializedVersion: 3 - m_Name: Horizontal + m_Name: Horizontal1 descriptiveName: descriptiveNegativeName: - negativeButton: left - positiveButton: right - altNegativeButton: a - altPositiveButton: d + negativeButton: s + positiveButton: f + altNegativeButton: + altPositiveButton: gravity: 3 dead: 0.001 sensitivity: 3 @@ -20,15 +20,15 @@ InputManager: invert: 0 type: 0 axis: 0 - joyNum: 0 + joyNum: 1 - serializedVersion: 3 - m_Name: Vertical + m_Name: Horizontal2 descriptiveName: descriptiveNegativeName: - negativeButton: down - positiveButton: up - altNegativeButton: s - altPositiveButton: w + negativeButton: j + positiveButton: l + altNegativeButton: + altPositiveButton: gravity: 3 dead: 0.001 sensitivity: 3 @@ -36,61 +36,45 @@ InputManager: invert: 0 type: 0 axis: 0 - joyNum: 0 + joyNum: 2 + - serializedVersion: 3 + m_Name: Vertical1 + descriptiveName: + descriptiveNegativeName: + negativeButton: d + positiveButton: e + altNegativeButton: + altPositiveButton: + gravity: 3 + dead: 0.001 + sensitivity: 3 + snap: 1 + invert: 0 + type: 0 + axis: 0 + joyNum: 1 + - serializedVersion: 3 + m_Name: Vertical2 + descriptiveName: + descriptiveNegativeName: + negativeButton: k + positiveButton: i + altNegativeButton: + altPositiveButton: + gravity: 3 + dead: 0.001 + sensitivity: 3 + snap: 1 + invert: 0 + type: 0 + axis: 0 + joyNum: 2 - serializedVersion: 3 m_Name: Fire1 descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: left ctrl - altNegativeButton: - altPositiveButton: mouse 0 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire2 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: left alt - altNegativeButton: - altPositiveButton: mouse 1 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire3 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: left shift - altNegativeButton: - altPositiveButton: mouse 2 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Jump - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: space + positiveButton: q altNegativeButton: altPositiveButton: gravity: 1000 @@ -100,7 +84,7 @@ InputManager: invert: 0 type: 0 axis: 0 - joyNum: 0 + joyNum: 1 - serializedVersion: 3 m_Name: Mouse X descriptiveName: @@ -149,147 +133,3 @@ InputManager: type: 1 axis: 2 joyNum: 0 - - serializedVersion: 3 - m_Name: Horizontal - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0.19 - sensitivity: 1 - snap: 0 - invert: 0 - type: 2 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Vertical - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0.19 - sensitivity: 1 - snap: 0 - invert: 1 - type: 2 - axis: 1 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire1 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 0 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire2 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 1 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire3 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 2 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Jump - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 3 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Submit - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: return - altNegativeButton: - altPositiveButton: joystick button 0 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Submit - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: enter - altNegativeButton: - altPositiveButton: space - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Cancel - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: escape - altNegativeButton: - altPositiveButton: joystick button 1 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 diff --git a/3D/ProjectSettings/Packages/com.unity.probuilder/Settings.json b/3D/ProjectSettings/Packages/com.unity.probuilder/Settings.json index 745b079..af96b10 100644 --- a/3D/ProjectSettings/Packages/com.unity.probuilder/Settings.json +++ b/3D/ProjectSettings/Packages/com.unity.probuilder/Settings.json @@ -61,7 +61,7 @@ { "type": "UnityEngine.ProBuilder.SelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "editor.selectMode", - "value": "{\"m_Value\":0}" + "value": "{\"m_Value\":1}" } ] } diff --git a/3D/ProjectSettings/ProjectSettings.asset b/3D/ProjectSettings/ProjectSettings.asset index 4e61349..0d1ecb3 100644 --- a/3D/ProjectSettings/ProjectSettings.asset +++ b/3D/ProjectSettings/ProjectSettings.asset @@ -152,7 +152,8 @@ PlayerSettings: resolutionScalingMode: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 - applicationIdentifier: {} + applicationIdentifier: + Standalone: com.DefaultCompany.aztank3d buildNumber: Standalone: 0 iPhone: 0 @@ -611,8 +612,8 @@ PlayerSettings: apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 m_MobileRenderingPath: 1 - metroPackageName: Template_3D - metroPackageVersion: + metroPackageName: Template3D + metroPackageVersion: 1.0.0.0 metroCertificatePath: metroCertificatePassword: metroCertificateSubject: @@ -620,7 +621,7 @@ PlayerSettings: metroCertificateNotAfter: 0000000000000000 metroApplicationDescription: Template_3D wsaImages: {} - metroTileShortName: + metroTileShortName: az tank 3d metroTileShowName: 0 metroMediumTileShowName: 0 metroLargeTileShowName: 0 @@ -679,7 +680,7 @@ PlayerSettings: m_VersionCode: 1 m_VersionName: apiCompatibilityLevel: 6 - activeInputHandler: 1 + activeInputHandler: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] diff --git a/3D/ProjectSettings/TagManager.asset b/3D/ProjectSettings/TagManager.asset index 1c92a78..4f87441 100644 --- a/3D/ProjectSettings/TagManager.asset +++ b/3D/ProjectSettings/TagManager.asset @@ -11,7 +11,7 @@ TagManager: - - Water - UI - - + - Players - - -