From a33891791bf4ad6ca11db9c9fa828ca97744cf7d Mon Sep 17 00:00:00 2001 From: RedStealthDev Date: Fri, 9 Dec 2022 12:21:57 +0100 Subject: [PATCH] Started working on inputs and movement --- Assets/Inputs.cs | 346 ++++++++++++ Assets/Inputs.cs.meta | 11 + Assets/Inputs.inputactions | 178 ++++++ Assets/Inputs.inputactions.meta | 14 + Assets/Scenes/Main_Game.unity | 612 +++++++++++++++++++++ Assets/Scenes/Main_Game.unity.meta | 7 + Assets/Scripts.meta | 8 + Assets/Scripts/PlayerMovement.cs | 47 ++ Assets/Scripts/PlayerMovement.cs.meta | 11 + Packages/manifest.json | 1 + Packages/packages-lock.json | 9 + ProjectSettings/ProjectSettings.asset | 2 +- ProjectSettings/SceneTemplateSettings.json | 167 ++++++ UserSettings/EditorUserSettings.asset | 3 + UserSettings/Layouts/default-2021.dwlt | 134 ++--- 15 files changed, 1482 insertions(+), 68 deletions(-) create mode 100644 Assets/Inputs.cs create mode 100644 Assets/Inputs.cs.meta create mode 100644 Assets/Inputs.inputactions create mode 100644 Assets/Inputs.inputactions.meta create mode 100644 Assets/Scenes/Main_Game.unity create mode 100644 Assets/Scenes/Main_Game.unity.meta create mode 100644 Assets/Scripts.meta create mode 100644 Assets/Scripts/PlayerMovement.cs create mode 100644 Assets/Scripts/PlayerMovement.cs.meta create mode 100644 ProjectSettings/SceneTemplateSettings.json diff --git a/Assets/Inputs.cs b/Assets/Inputs.cs new file mode 100644 index 0000000..7eba66e --- /dev/null +++ b/Assets/Inputs.cs @@ -0,0 +1,346 @@ +//------------------------------------------------------------------------------ +// +// This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator +// version 1.4.4 +// from Assets/Inputs.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 @Inputs : IInputActionCollection2, IDisposable +{ + public InputActionAsset asset { get; } + public @Inputs() + { + asset = InputActionAsset.FromJson(@"{ + ""name"": ""Inputs"", + ""maps"": [ + { + ""name"": ""Movement"", + ""id"": ""d8d47c0a-b662-400d-a385-35807c70320f"", + ""actions"": [ + { + ""name"": ""wasd"", + ""type"": ""Value"", + ""id"": ""0b6cb4ea-7ff8-4923-b6ab-33d667c9ca70"", + ""expectedControlType"": ""Vector2"", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": true + }, + { + ""name"": ""Jump"", + ""type"": ""Button"", + ""id"": ""e80a18a4-dc07-4781-a2fb-d1339a1395e2"", + ""expectedControlType"": ""Button"", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": false + }, + { + ""name"": ""Dash"", + ""type"": ""Button"", + ""id"": ""69029b38-e024-4fc6-a3d3-0ec0fe6bde48"", + ""expectedControlType"": ""Button"", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": false + }, + { + ""name"": ""Next weapon"", + ""type"": ""Button"", + ""id"": ""0f70482d-054d-45ca-be81-c54e2deb922d"", + ""expectedControlType"": ""Button"", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": false + }, + { + ""name"": ""Last weapon"", + ""type"": ""Button"", + ""id"": ""838ac902-8907-4180-87a9-f03f438c9069"", + ""expectedControlType"": ""Button"", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": false + }, + { + ""name"": ""attack"", + ""type"": ""Button"", + ""id"": ""d99967b7-1e06-448b-b920-422947e9c03e"", + ""expectedControlType"": ""Button"", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": false + } + ], + ""bindings"": [ + { + ""name"": ""2D Vector"", + ""id"": ""6c5c6ba8-c84f-4d14-ba76-681085988d36"", + ""path"": ""2DVector"", + ""interactions"": """", + ""processors"": """", + ""groups"": """", + ""action"": ""wasd"", + ""isComposite"": true, + ""isPartOfComposite"": false + }, + { + ""name"": ""up"", + ""id"": ""a7ce409d-b8a9-40a8-82fb-36838e8027b3"", + ""path"": ""/w"", + ""interactions"": """", + ""processors"": """", + ""groups"": """", + ""action"": ""wasd"", + ""isComposite"": false, + ""isPartOfComposite"": true + }, + { + ""name"": ""down"", + ""id"": ""d99c0c7a-1ef2-4abb-adc8-bf105d8d71e9"", + ""path"": ""/s"", + ""interactions"": """", + ""processors"": """", + ""groups"": """", + ""action"": ""wasd"", + ""isComposite"": false, + ""isPartOfComposite"": true + }, + { + ""name"": ""left"", + ""id"": ""01b1a9c6-3b80-4b40-a597-e8bc579b9393"", + ""path"": ""/a"", + ""interactions"": """", + ""processors"": """", + ""groups"": """", + ""action"": ""wasd"", + ""isComposite"": false, + ""isPartOfComposite"": true + }, + { + ""name"": ""right"", + ""id"": ""29c247ff-d21c-4ca8-bf9a-0906d54cc62d"", + ""path"": ""/d"", + ""interactions"": """", + ""processors"": """", + ""groups"": """", + ""action"": ""wasd"", + ""isComposite"": false, + ""isPartOfComposite"": true + }, + { + ""name"": """", + ""id"": ""264c79a3-0145-44a7-8e56-9c9664661d8d"", + ""path"": ""/space"", + ""interactions"": """", + ""processors"": """", + ""groups"": """", + ""action"": ""Jump"", + ""isComposite"": false, + ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""7aaca10d-6d18-4407-a143-93fd3f941a82"", + ""path"": ""/shift"", + ""interactions"": """", + ""processors"": """", + ""groups"": """", + ""action"": ""Dash"", + ""isComposite"": false, + ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""559884ac-6f23-4120-affe-c514ba57b47b"", + ""path"": """", + ""interactions"": """", + ""processors"": """", + ""groups"": """", + ""action"": ""Next weapon"", + ""isComposite"": false, + ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""72bd1b1e-d6fe-416f-9e88-0c34f36eda52"", + ""path"": """", + ""interactions"": """", + ""processors"": """", + ""groups"": """", + ""action"": ""Last weapon"", + ""isComposite"": false, + ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""73cb1d56-f8d9-41bb-9639-8d72e45caac2"", + ""path"": """", + ""interactions"": """", + ""processors"": """", + ""groups"": """", + ""action"": ""attack"", + ""isComposite"": false, + ""isPartOfComposite"": false + } + ] + } + ], + ""controlSchemes"": [] +}"); + // Movement + m_Movement = asset.FindActionMap("Movement", throwIfNotFound: true); + m_Movement_wasd = m_Movement.FindAction("wasd", throwIfNotFound: true); + m_Movement_Jump = m_Movement.FindAction("Jump", throwIfNotFound: true); + m_Movement_Dash = m_Movement.FindAction("Dash", throwIfNotFound: true); + m_Movement_Nextweapon = m_Movement.FindAction("Next weapon", throwIfNotFound: true); + m_Movement_Lastweapon = m_Movement.FindAction("Last weapon", throwIfNotFound: true); + m_Movement_attack = m_Movement.FindAction("attack", 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); + } + + // Movement + private readonly InputActionMap m_Movement; + private IMovementActions m_MovementActionsCallbackInterface; + private readonly InputAction m_Movement_wasd; + private readonly InputAction m_Movement_Jump; + private readonly InputAction m_Movement_Dash; + private readonly InputAction m_Movement_Nextweapon; + private readonly InputAction m_Movement_Lastweapon; + private readonly InputAction m_Movement_attack; + public struct MovementActions + { + private @Inputs m_Wrapper; + public MovementActions(@Inputs wrapper) { m_Wrapper = wrapper; } + public InputAction @wasd => m_Wrapper.m_Movement_wasd; + public InputAction @Jump => m_Wrapper.m_Movement_Jump; + public InputAction @Dash => m_Wrapper.m_Movement_Dash; + public InputAction @Nextweapon => m_Wrapper.m_Movement_Nextweapon; + public InputAction @Lastweapon => m_Wrapper.m_Movement_Lastweapon; + public InputAction @attack => m_Wrapper.m_Movement_attack; + public InputActionMap Get() { return m_Wrapper.m_Movement; } + public void Enable() { Get().Enable(); } + public void Disable() { Get().Disable(); } + public bool enabled => Get().enabled; + public static implicit operator InputActionMap(MovementActions set) { return set.Get(); } + public void SetCallbacks(IMovementActions instance) + { + if (m_Wrapper.m_MovementActionsCallbackInterface != null) + { + @wasd.started -= m_Wrapper.m_MovementActionsCallbackInterface.OnWasd; + @wasd.performed -= m_Wrapper.m_MovementActionsCallbackInterface.OnWasd; + @wasd.canceled -= m_Wrapper.m_MovementActionsCallbackInterface.OnWasd; + @Jump.started -= m_Wrapper.m_MovementActionsCallbackInterface.OnJump; + @Jump.performed -= m_Wrapper.m_MovementActionsCallbackInterface.OnJump; + @Jump.canceled -= m_Wrapper.m_MovementActionsCallbackInterface.OnJump; + @Dash.started -= m_Wrapper.m_MovementActionsCallbackInterface.OnDash; + @Dash.performed -= m_Wrapper.m_MovementActionsCallbackInterface.OnDash; + @Dash.canceled -= m_Wrapper.m_MovementActionsCallbackInterface.OnDash; + @Nextweapon.started -= m_Wrapper.m_MovementActionsCallbackInterface.OnNextweapon; + @Nextweapon.performed -= m_Wrapper.m_MovementActionsCallbackInterface.OnNextweapon; + @Nextweapon.canceled -= m_Wrapper.m_MovementActionsCallbackInterface.OnNextweapon; + @Lastweapon.started -= m_Wrapper.m_MovementActionsCallbackInterface.OnLastweapon; + @Lastweapon.performed -= m_Wrapper.m_MovementActionsCallbackInterface.OnLastweapon; + @Lastweapon.canceled -= m_Wrapper.m_MovementActionsCallbackInterface.OnLastweapon; + @attack.started -= m_Wrapper.m_MovementActionsCallbackInterface.OnAttack; + @attack.performed -= m_Wrapper.m_MovementActionsCallbackInterface.OnAttack; + @attack.canceled -= m_Wrapper.m_MovementActionsCallbackInterface.OnAttack; + } + m_Wrapper.m_MovementActionsCallbackInterface = instance; + if (instance != null) + { + @wasd.started += instance.OnWasd; + @wasd.performed += instance.OnWasd; + @wasd.canceled += instance.OnWasd; + @Jump.started += instance.OnJump; + @Jump.performed += instance.OnJump; + @Jump.canceled += instance.OnJump; + @Dash.started += instance.OnDash; + @Dash.performed += instance.OnDash; + @Dash.canceled += instance.OnDash; + @Nextweapon.started += instance.OnNextweapon; + @Nextweapon.performed += instance.OnNextweapon; + @Nextweapon.canceled += instance.OnNextweapon; + @Lastweapon.started += instance.OnLastweapon; + @Lastweapon.performed += instance.OnLastweapon; + @Lastweapon.canceled += instance.OnLastweapon; + @attack.started += instance.OnAttack; + @attack.performed += instance.OnAttack; + @attack.canceled += instance.OnAttack; + } + } + } + public MovementActions @Movement => new MovementActions(this); + public interface IMovementActions + { + void OnWasd(InputAction.CallbackContext context); + void OnJump(InputAction.CallbackContext context); + void OnDash(InputAction.CallbackContext context); + void OnNextweapon(InputAction.CallbackContext context); + void OnLastweapon(InputAction.CallbackContext context); + void OnAttack(InputAction.CallbackContext context); + } +} diff --git a/Assets/Inputs.cs.meta b/Assets/Inputs.cs.meta new file mode 100644 index 0000000..bba2176 --- /dev/null +++ b/Assets/Inputs.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 717974ec11e99da41a4e61ae7df3e097 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inputs.inputactions b/Assets/Inputs.inputactions new file mode 100644 index 0000000..923c2c1 --- /dev/null +++ b/Assets/Inputs.inputactions @@ -0,0 +1,178 @@ +{ + "name": "Inputs", + "maps": [ + { + "name": "Movement", + "id": "d8d47c0a-b662-400d-a385-35807c70320f", + "actions": [ + { + "name": "wasd", + "type": "Value", + "id": "0b6cb4ea-7ff8-4923-b6ab-33d667c9ca70", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Jump", + "type": "Button", + "id": "e80a18a4-dc07-4781-a2fb-d1339a1395e2", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Dash", + "type": "Button", + "id": "69029b38-e024-4fc6-a3d3-0ec0fe6bde48", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Next weapon", + "type": "Button", + "id": "0f70482d-054d-45ca-be81-c54e2deb922d", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "Last weapon", + "type": "Button", + "id": "838ac902-8907-4180-87a9-f03f438c9069", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "attack", + "type": "Button", + "id": "d99967b7-1e06-448b-b920-422947e9c03e", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + } + ], + "bindings": [ + { + "name": "2D Vector", + "id": "6c5c6ba8-c84f-4d14-ba76-681085988d36", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "wasd", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "a7ce409d-b8a9-40a8-82fb-36838e8027b3", + "path": "/w", + "interactions": "", + "processors": "", + "groups": "", + "action": "wasd", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "d99c0c7a-1ef2-4abb-adc8-bf105d8d71e9", + "path": "/s", + "interactions": "", + "processors": "", + "groups": "", + "action": "wasd", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "01b1a9c6-3b80-4b40-a597-e8bc579b9393", + "path": "/a", + "interactions": "", + "processors": "", + "groups": "", + "action": "wasd", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "29c247ff-d21c-4ca8-bf9a-0906d54cc62d", + "path": "/d", + "interactions": "", + "processors": "", + "groups": "", + "action": "wasd", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "", + "id": "264c79a3-0145-44a7-8e56-9c9664661d8d", + "path": "/space", + "interactions": "", + "processors": "", + "groups": "", + "action": "Jump", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "7aaca10d-6d18-4407-a143-93fd3f941a82", + "path": "/shift", + "interactions": "", + "processors": "", + "groups": "", + "action": "Dash", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "559884ac-6f23-4120-affe-c514ba57b47b", + "path": "", + "interactions": "", + "processors": "", + "groups": "", + "action": "Next weapon", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "72bd1b1e-d6fe-416f-9e88-0c34f36eda52", + "path": "", + "interactions": "", + "processors": "", + "groups": "", + "action": "Last weapon", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "73cb1d56-f8d9-41bb-9639-8d72e45caac2", + "path": "", + "interactions": "", + "processors": "", + "groups": "", + "action": "attack", + "isComposite": false, + "isPartOfComposite": false + } + ] + } + ], + "controlSchemes": [] +} \ No newline at end of file diff --git a/Assets/Inputs.inputactions.meta b/Assets/Inputs.inputactions.meta new file mode 100644 index 0000000..7c746c3 --- /dev/null +++ b/Assets/Inputs.inputactions.meta @@ -0,0 +1,14 @@ +fileFormatVersion: 2 +guid: e16d7adc5614df14d93942c95438e60d +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 8404be70184654265930450def6a9037, type: 3} + generateWrapperCode: 1 + wrapperCodePath: + wrapperClassName: + wrapperCodeNamespace: diff --git a/Assets/Scenes/Main_Game.unity b/Assets/Scenes/Main_Game.unity new file mode 100644 index 0000000..8693e9e --- /dev/null +++ b/Assets/Scenes/Main_Game.unity @@ -0,0 +1,612 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &96465037 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 96465040} + - component: {fileID: 96465039} + - component: {fileID: 96465038} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &96465038 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 96465037} + m_Enabled: 1 +--- !u!20 &96465039 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 96465037} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &96465040 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 96465037} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1426947899} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &225923646 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 225923647} + m_Layer: 0 + m_Name: Test Map + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &225923647 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 225923646} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -4.75, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1734573319} + - {fileID: 1748358147} + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1426947895 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1426947899} + - component: {fileID: 1426947898} + - component: {fileID: 1426947897} + - component: {fileID: 1426947896} + - component: {fileID: 1426947900} + m_Layer: 0 + m_Name: Player + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!50 &1426947896 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1426947895} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!61 &1426947897 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1426947895} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!212 &1426947898 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1426947895} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1426947899 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1426947895} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 96465040} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1426947900 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1426947895} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a238c84151853e1438fb4bf8922712a7, type: 3} + m_Name: + m_EditorClassIdentifier: + Speed: 5 +--- !u!1 &1734573316 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1734573319} + - component: {fileID: 1734573318} + - component: {fileID: 1734573320} + m_Layer: 0 + m_Name: test map + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1734573318 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1734573316} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1734573319 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1734573316} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.6911, y: 0, z: 0} + m_LocalScale: {x: 25.394897, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 225923647} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &1734573320 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1734573316} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!1 &1748358146 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1748358147} + - component: {fileID: 1748358148} + - component: {fileID: 1748358149} + m_Layer: 0 + m_Name: Square + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1748358147 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1748358146} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -13.889382, y: 5.0344, z: 0} + m_LocalScale: {x: 1.0949068, y: 9.4287, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 225923647} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1748358148 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1748358146} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!61 &1748358149 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1748358146} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 diff --git a/Assets/Scenes/Main_Game.unity.meta b/Assets/Scenes/Main_Game.unity.meta new file mode 100644 index 0000000..815b520 --- /dev/null +++ b/Assets/Scenes/Main_Game.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a8f76e9b00caa0c4d8dd7816278353d3 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts.meta b/Assets/Scripts.meta new file mode 100644 index 0000000..e4df673 --- /dev/null +++ b/Assets/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f14edb7a99b81dc459a2f6fba386dd6f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PlayerMovement.cs b/Assets/Scripts/PlayerMovement.cs new file mode 100644 index 0000000..cdd0629 --- /dev/null +++ b/Assets/Scripts/PlayerMovement.cs @@ -0,0 +1,47 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.InputSystem; + +public class PlayerMovement : MonoBehaviour +{ + private Rigidbody2D rb; + private Inputs Input; + private InputAction Walk; + private InputAction Jump; + private InputAction Dash; + private Vector2 Force; + public float Speed; + private void Awake() + { + Input = new Inputs(); + rb = this.gameObject.GetComponent(); + } + private void OnEnable() + { + Walk = Input.Movement.wasd; + Jump = Input.Movement.Jump; + Dash = Input.Movement.Dash; + Walk.Enable(); + Jump.Enable(); + Dash.Enable(); + } + private void OnDisable() + { + Walk.Disable(); + Jump.Disable(); + Dash.Disable(); + } + // Start is called before the first frame update + private void Start() + { + + } + + // Update is called once per frame + private void Update() + { + Force = Walk.ReadValue(); + rb.AddForce(new Vector2(Force.x * Speed * Time.deltaTime, 0), ForceMode2D.Impulse); + } +} diff --git a/Assets/Scripts/PlayerMovement.cs.meta b/Assets/Scripts/PlayerMovement.cs.meta new file mode 100644 index 0000000..718ddcd --- /dev/null +++ b/Assets/Scripts/PlayerMovement.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a238c84151853e1438fb4bf8922712a7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index 27f794f..fab9483 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -5,6 +5,7 @@ "com.unity.ide.rider": "3.0.16", "com.unity.ide.visualstudio": "2.0.16", "com.unity.ide.vscode": "1.2.5", + "com.unity.inputsystem": "1.4.4", "com.unity.test-framework": "1.1.31", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.6.4", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 3fcacac..deeae11 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -149,6 +149,15 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.inputsystem": { + "version": "1.4.4", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.uielements": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.mathematics": { "version": "1.2.6", "depth": 2, diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 83957ad..50c31a5 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -662,7 +662,7 @@ PlayerSettings: m_VersionCode: 1 m_VersionName: apiCompatibilityLevel: 6 - activeInputHandler: 0 + activeInputHandler: 2 windowsGamepadBackendHint: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 diff --git a/ProjectSettings/SceneTemplateSettings.json b/ProjectSettings/SceneTemplateSettings.json new file mode 100644 index 0000000..6f3e60f --- /dev/null +++ b/ProjectSettings/SceneTemplateSettings.json @@ -0,0 +1,167 @@ +{ + "templatePinStates": [], + "dependencyTypeInfos": [ + { + "userAdded": false, + "type": "UnityEngine.AnimationClip", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.Animations.AnimatorController", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.AnimatorOverrideController", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.Audio.AudioMixerController", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.ComputeShader", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Cubemap", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.GameObject", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.LightingDataAsset", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": false + }, + { + "userAdded": false, + "type": "UnityEngine.LightingSettings", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Material", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.MonoScript", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicMaterial", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicsMaterial2D", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessResources", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.VolumeProfile", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.SceneAsset", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": false + }, + { + "userAdded": false, + "type": "UnityEngine.Shader", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.ShaderVariantCollection", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Texture", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Texture2D", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Timeline.TimelineAsset", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + } + ], + "defaultDependencyTypeInfo": { + "userAdded": false, + "type": "", + "ignore": false, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + "newSceneOverride": 0 +} \ No newline at end of file diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index d1857b5..6984768 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -8,6 +8,9 @@ EditorUserSettings: RecentlyUsedSceneGuid-0: value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661 flags: 0 + RecentlyUsedSceneGuid-1: + value: 02095251535050595d5e0f2311735c44124f1c2e7b7077667f7e4560b7b3306b + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index cf8a978..905a057 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 997 m_ShowMode: 4 - m_Title: Hierarchy + m_Title: Inspector m_RootView: {fileID: 6} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -45,10 +45,10 @@ MonoBehaviour: y: 30 width: 1920 height: 947 - m_MinSize: {x: 503, y: 321} - m_MaxSize: {x: 16192, y: 12117} + m_MinSize: {x: 300, y: 200} + m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 48 + controlID: 99 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -64,12 +64,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1466 + x: 1465 y: 0 - width: 454 + width: 455 height: 947 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -111,23 +111,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 y: 561 - width: 1466 + width: 1465 height: 386 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 17} + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 12} m_Panes: - {fileID: 12} - {fileID: 17} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -218,12 +218,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1466 + width: 1465 height: 947 - m_MinSize: {x: 403, y: 321} - m_MaxSize: {x: 8096, y: 12117} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 49 + controlID: 55 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -243,12 +243,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1466 + width: 1465 height: 561 - m_MinSize: {x: 403, y: 221} - m_MaxSize: {x: 8003, y: 4021} + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 50 + controlID: 56 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -259,14 +259,14 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 363 y: 0 - width: 1103 + width: 1102 height: 561 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} @@ -296,10 +296,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 240 - y: 506 - width: 965 - height: 229 + x: 0 + y: 634 + width: 1464 + height: 365 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -325,14 +325,14 @@ MonoBehaviour: m_LastFolders: - Assets m_LastFoldersGridSize: -1 - m_LastProjectPath: C:\Users\alexander.ahlanders\Documents\GitHub\RatAttack2D + m_LastProjectPath: E:\Repos\RatAttack2D m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 2a650000 - m_LastClickedID: 25898 - m_ExpandedIDs: 00000000805f0000 + m_SelectedIDs: 82620000 + m_LastClickedID: 25218 + m_ExpandedIDs: 000000008262000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -360,7 +360,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000805f0000 + m_ExpandedIDs: 0000000082620000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -387,7 +387,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -404,7 +404,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 5} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -436,9 +436,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1466 + x: 1465 y: 73 - width: 453 + width: 454 height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -451,7 +451,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastVerticalScrollValue: 441 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: @@ -488,9 +488,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 2afbffff + m_SelectedIDs: 36620000 + m_LastClickedID: 25142 + m_ExpandedIDs: 28fbffff3262000036620000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -506,7 +506,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 4} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -536,7 +536,7 @@ MonoBehaviour: serializedVersion: 2 x: 363 y: 73 - width: 1101 + width: 1100 height: 540 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -794,9 +794,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 0, y: 0, z: 0} + m_Target: {x: -2.084323, y: -0.059439972, z: -0.035523273} speed: 2 - m_Value: {x: 0, y: 0, z: 0} + m_Value: {x: -2.084323, y: -0.059439972, z: -0.035523273} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -847,9 +847,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 10 + m_Target: 8.358135 speed: 2 - m_Value: 10 + m_Value: 8.358135 m_Ortho: m_Target: 1 speed: 2 @@ -894,10 +894,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 507 - y: 94 - width: 1532 - height: 790 + x: 363 + y: 73 + width: 1100 + height: 540 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -908,10 +908,10 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1532, y: 769} + m_TargetSize: {x: 1100, y: 519} m_TextureFilterMode: 0 m_TextureHideFlags: 61 - m_RenderIMGUI: 0 + m_RenderIMGUI: 1 m_EnterPlayModeBehavior: 0 m_UseMipMap: 0 m_VSyncEnabled: 0 @@ -923,10 +923,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -766 - m_HBaseRangeMax: 766 - m_VBaseRangeMin: -384.5 - m_VBaseRangeMax: 384.5 + m_HBaseRangeMin: -550 + m_HBaseRangeMax: 550 + m_VBaseRangeMin: -259.5 + m_VBaseRangeMax: 259.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -935,7 +935,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -944,23 +944,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1532 - height: 769 + width: 1100 + height: 519 m_Scale: {x: 1, y: 1} - m_Translation: {x: 766, y: 384.5} + m_Translation: {x: 550, y: 259.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -766 - y: -384.5 - width: 1532 - height: 769 + x: -550 + y: -259.5 + width: 1100 + height: 519 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1532, y: 790} + m_LastWindowPixelSize: {x: 1100, y: 540} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000