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

update

Browse Source
This commit is contained in:
Playmaker1210
2022-03-06 22:56:32 +01:00
parent 470a5bed60
commit bc36aaba4d
20 changed files with 953 additions and 1936 deletions
Download Patch File Download Diff File Expand all files Collapse all files

588
3D/Assets/InputMaster.inputactions
View File

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

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

@@ -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:

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

File diff suppressed because it is too large Load Diff

13
3D/Assets/Scripts/ExitGame.cs Normal file
View File

@@ -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();
}
}
}

2
3D/Assets/Scripts/NewInputSystem.cs.meta → 3D/Assets/Scripts/ExitGame.cs.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 48961f21fe75d884ea97a37715c08891 guid: e75cbf2f3a211cc4dac41ccd629dc4e3
MonoImporter: MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2

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

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

11
3D/Assets/Scripts/InputMaster.cs.meta
View File

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

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

@@ -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<Vector2>());
}
void Shoot() {
Debug.Log("Shoot");
}
void Move(Vector2 direction) {
Debug.Log("Move" + direction);
}
private void OnEnable() {
controls.Enable();
}
private void OnDisable() {
controls.Disable();
}
}

29
3D/Assets/Scripts/PlayerMovement3d.cs
View File

@@ -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));
}
}

11
3D/Assets/Scripts/PlayerMovement3d.cs.meta
View File

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

84
3D/Assets/Scripts/TankMovement.cs Normal file
View File

@@ -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<Rigidbody>();
}
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);
}
}

2
3D/Assets/Scripts/TestMovement.cs.meta → 3D/Assets/Scripts/TankMovement.cs.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: a2650ec0c90cfb74da510d0f0961bab4 guid: 10c35f7d02f278949ba7bd10d159b7b1
MonoImporter: MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2

32
3D/Assets/Scripts/TestMovement.cs
View File

@@ -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);
}
}
}

3
3D/Packages/manifest.json
View File

@@ -1,14 +1,13 @@
{ {
"dependencies": { "dependencies": {
"com.unity.collab-proxy": "1.15.13", "com.unity.collab-proxy": "1.15.13",
"com.unity.ide.rider": "2.0.7",
"com.unity.ide.visualstudio": "2.0.14", "com.unity.ide.visualstudio": "2.0.14",
"com.unity.ide.vscode": "1.2.5", "com.unity.ide.vscode": "1.2.5",
"com.unity.inputsystem": "1.3.0",
"com.unity.probuilder": "4.5.2", "com.unity.probuilder": "4.5.2",
"com.unity.test-framework": "1.1.31", "com.unity.test-framework": "1.1.31",
"com.unity.textmeshpro": "3.0.6", "com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.4.8", "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.ugui": "1.0.0",
"com.unity.modules.ai": "1.0.0", "com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0", "com.unity.modules.androidjni": "1.0.0",

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

@@ -16,15 +16,6 @@
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.com" "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": { "com.unity.ide.visualstudio": {
"version": "2.0.14", "version": "2.0.14",
"depth": 0, "depth": 0,
@@ -41,15 +32,6 @@
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.inputsystem": {
"version": "1.3.0",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.modules.uielements": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.probuilder": { "com.unity.probuilder": {
"version": "4.5.2", "version": "4.5.2",
"depth": 0, "depth": 0,
@@ -75,6 +57,22 @@
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.com" "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": { "com.unity.test-framework": {
"version": "1.1.31", "version": "1.1.31",
"depth": 0, "depth": 0,
@@ -107,6 +105,16 @@
}, },
"url": "https://packages.unity.com" "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": { "com.unity.ugui": {
"version": "1.0.0", "version": "1.0.0",
"depth": 0, "depth": 0,

6
3D/ProjectSettings/GraphicsSettings.asset
View File

@@ -28,6 +28,7 @@ GraphicsSettings:
m_LensFlare: m_LensFlare:
m_Mode: 1 m_Mode: 1
m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0} m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0}
m_VideoShadersIncludeMode: 2
m_AlwaysIncludedShaders: m_AlwaysIncludedShaders:
- {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0}
@@ -36,8 +37,7 @@ GraphicsSettings:
- {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: [] m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
type: 0}
m_CustomRenderPipeline: {fileID: 0} m_CustomRenderPipeline: {fileID: 0}
m_TransparencySortMode: 0 m_TransparencySortMode: 0
m_TransparencySortAxis: {x: 0, y: 0, z: 1} m_TransparencySortAxis: {x: 0, y: 0, z: 1}
@@ -59,5 +59,5 @@ GraphicsSettings:
m_AlbedoSwatchInfos: [] m_AlbedoSwatchInfos: []
m_LightsUseLinearIntensity: 0 m_LightsUseLinearIntensity: 0
m_LightsUseColorTemperature: 0 m_LightsUseColorTemperature: 0
m_DefaultRenderingLayerMask: 1
m_LogWhenShaderIsCompiled: 0 m_LogWhenShaderIsCompiled: 0
m_AllowEnlightenSupportForUpgradedProject: 0

252
3D/ProjectSettings/InputManager.asset
View File

@@ -6,13 +6,13 @@ InputManager:
serializedVersion: 2 serializedVersion: 2
m_Axes: m_Axes:
- serializedVersion: 3 - serializedVersion: 3
m_Name: Horizontal m_Name: Horizontal1
descriptiveName: descriptiveName:
descriptiveNegativeName: descriptiveNegativeName:
negativeButton: left negativeButton: s
positiveButton: right positiveButton: f
altNegativeButton: a altNegativeButton:
altPositiveButton: d altPositiveButton:
gravity: 3 gravity: 3
dead: 0.001 dead: 0.001
sensitivity: 3 sensitivity: 3
@@ -20,15 +20,15 @@ InputManager:
invert: 0 invert: 0
type: 0 type: 0
axis: 0 axis: 0
joyNum: 0 joyNum: 1
- serializedVersion: 3 - serializedVersion: 3
m_Name: Vertical m_Name: Horizontal2
descriptiveName: descriptiveName:
descriptiveNegativeName: descriptiveNegativeName:
negativeButton: down negativeButton: j
positiveButton: up positiveButton: l
altNegativeButton: s altNegativeButton:
altPositiveButton: w altPositiveButton:
gravity: 3 gravity: 3
dead: 0.001 dead: 0.001
sensitivity: 3 sensitivity: 3
@@ -36,61 +36,45 @@ InputManager:
invert: 0 invert: 0
type: 0 type: 0
axis: 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 - serializedVersion: 3
m_Name: Fire1 m_Name: Fire1
descriptiveName: descriptiveName:
descriptiveNegativeName: descriptiveNegativeName:
negativeButton: negativeButton:
positiveButton: left ctrl positiveButton: q
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
altNegativeButton: altNegativeButton:
altPositiveButton: altPositiveButton:
gravity: 1000 gravity: 1000
@@ -100,7 +84,7 @@ InputManager:
invert: 0 invert: 0
type: 0 type: 0
axis: 0 axis: 0
joyNum: 0 joyNum: 1
- serializedVersion: 3 - serializedVersion: 3
m_Name: Mouse X m_Name: Mouse X
descriptiveName: descriptiveName:
@@ -149,147 +133,3 @@ InputManager:
type: 1 type: 1
axis: 2 axis: 2
joyNum: 0 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

2
3D/ProjectSettings/Packages/com.unity.probuilder/Settings.json
View File

@@ -61,7 +61,7 @@
{ {
"type": "UnityEngine.ProBuilder.SelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "type": "UnityEngine.ProBuilder.SelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "editor.selectMode", "key": "editor.selectMode",
"value": "{\"m_Value\":0}" "value": "{\"m_Value\":1}"
} }
] ]
} }

11
3D/ProjectSettings/ProjectSettings.asset
View File

@@ -152,7 +152,8 @@ PlayerSettings:
resolutionScalingMode: 0 resolutionScalingMode: 0
androidSupportedAspectRatio: 1 androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1 androidMaxAspectRatio: 2.1
applicationIdentifier: {} applicationIdentifier:
Standalone: com.DefaultCompany.aztank3d
buildNumber: buildNumber:
Standalone: 0 Standalone: 0
iPhone: 0 iPhone: 0
@@ -611,8 +612,8 @@ PlayerSettings:
apiCompatibilityLevelPerPlatform: {} apiCompatibilityLevelPerPlatform: {}
m_RenderingPath: 1 m_RenderingPath: 1
m_MobileRenderingPath: 1 m_MobileRenderingPath: 1
metroPackageName: Template_3D metroPackageName: Template3D
metroPackageVersion: metroPackageVersion: 1.0.0.0
metroCertificatePath: metroCertificatePath:
metroCertificatePassword: metroCertificatePassword:
metroCertificateSubject: metroCertificateSubject:
@@ -620,7 +621,7 @@ PlayerSettings:
metroCertificateNotAfter: 0000000000000000 metroCertificateNotAfter: 0000000000000000
metroApplicationDescription: Template_3D metroApplicationDescription: Template_3D
wsaImages: {} wsaImages: {}
metroTileShortName: metroTileShortName: az tank 3d
metroTileShowName: 0 metroTileShowName: 0
metroMediumTileShowName: 0 metroMediumTileShowName: 0
metroLargeTileShowName: 0 metroLargeTileShowName: 0
@@ -679,7 +680,7 @@ PlayerSettings:
m_VersionCode: 1 m_VersionCode: 1
m_VersionName: m_VersionName:
apiCompatibilityLevel: 6 apiCompatibilityLevel: 6
activeInputHandler: 1 activeInputHandler: 0
cloudProjectId: cloudProjectId:
framebufferDepthMemorylessMode: 0 framebufferDepthMemorylessMode: 0
qualitySettingsNames: [] qualitySettingsNames: []

2
3D/ProjectSettings/TagManager.asset
View File

@@ -11,7 +11,7 @@ TagManager:
- -
- Water - Water
- UI - UI
- - Players
- -
- -
- -