diff --git a/Assets/Inputs.cs b/Assets/Inputs.cs index 7eba66e..2a78336 100644 --- a/Assets/Inputs.cs +++ b/Assets/Inputs.cs @@ -80,6 +80,15 @@ public partial class @Inputs : IInputActionCollection2, IDisposable ""processors"": """", ""interactions"": """", ""initialStateCheck"": false + }, + { + ""name"": ""Escape"", + ""type"": ""Button"", + ""id"": ""9bbda6c2-543d-457c-8361-e76b4d64877f"", + ""expectedControlType"": ""Button"", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": false } ], ""bindings"": [ @@ -192,6 +201,17 @@ public partial class @Inputs : IInputActionCollection2, IDisposable ""action"": ""attack"", ""isComposite"": false, ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""5753ac26-8ca2-4cda-8164-176dcf1fb9c5"", + ""path"": ""/escape"", + ""interactions"": """", + ""processors"": """", + ""groups"": """", + ""action"": ""Escape"", + ""isComposite"": false, + ""isPartOfComposite"": false } ] } @@ -206,6 +226,7 @@ public partial class @Inputs : IInputActionCollection2, IDisposable 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); + m_Movement_Escape = m_Movement.FindAction("Escape", throwIfNotFound: true); } public void Dispose() @@ -271,6 +292,7 @@ public partial class @Inputs : IInputActionCollection2, IDisposable private readonly InputAction m_Movement_Nextweapon; private readonly InputAction m_Movement_Lastweapon; private readonly InputAction m_Movement_attack; + private readonly InputAction m_Movement_Escape; public struct MovementActions { private @Inputs m_Wrapper; @@ -281,6 +303,7 @@ public partial class @Inputs : IInputActionCollection2, IDisposable 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 InputAction @Escape => m_Wrapper.m_Movement_Escape; public InputActionMap Get() { return m_Wrapper.m_Movement; } public void Enable() { Get().Enable(); } public void Disable() { Get().Disable(); } @@ -308,6 +331,9 @@ public partial class @Inputs : IInputActionCollection2, IDisposable @attack.started -= m_Wrapper.m_MovementActionsCallbackInterface.OnAttack; @attack.performed -= m_Wrapper.m_MovementActionsCallbackInterface.OnAttack; @attack.canceled -= m_Wrapper.m_MovementActionsCallbackInterface.OnAttack; + @Escape.started -= m_Wrapper.m_MovementActionsCallbackInterface.OnEscape; + @Escape.performed -= m_Wrapper.m_MovementActionsCallbackInterface.OnEscape; + @Escape.canceled -= m_Wrapper.m_MovementActionsCallbackInterface.OnEscape; } m_Wrapper.m_MovementActionsCallbackInterface = instance; if (instance != null) @@ -330,6 +356,9 @@ public partial class @Inputs : IInputActionCollection2, IDisposable @attack.started += instance.OnAttack; @attack.performed += instance.OnAttack; @attack.canceled += instance.OnAttack; + @Escape.started += instance.OnEscape; + @Escape.performed += instance.OnEscape; + @Escape.canceled += instance.OnEscape; } } } @@ -342,5 +371,6 @@ public partial class @Inputs : IInputActionCollection2, IDisposable void OnNextweapon(InputAction.CallbackContext context); void OnLastweapon(InputAction.CallbackContext context); void OnAttack(InputAction.CallbackContext context); + void OnEscape(InputAction.CallbackContext context); } } diff --git a/Assets/Inputs.inputactions b/Assets/Inputs.inputactions index 923c2c1..ba9cb48 100644 --- a/Assets/Inputs.inputactions +++ b/Assets/Inputs.inputactions @@ -58,6 +58,15 @@ "processors": "", "interactions": "", "initialStateCheck": false + }, + { + "name": "Escape", + "type": "Button", + "id": "9bbda6c2-543d-457c-8361-e76b4d64877f", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false } ], "bindings": [ @@ -170,6 +179,17 @@ "action": "attack", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "5753ac26-8ca2-4cda-8164-176dcf1fb9c5", + "path": "/escape", + "interactions": "", + "processors": "", + "groups": "", + "action": "Escape", + "isComposite": false, + "isPartOfComposite": false } ] } diff --git a/Assets/PauseMenu.cs b/Assets/PauseMenu.cs new file mode 100644 index 0000000..10ec106 --- /dev/null +++ b/Assets/PauseMenu.cs @@ -0,0 +1,28 @@ +using UnityEngine; +using System.Collections; +using UnityEngine.InputSystem; + +public class PauseMenu : MonoBehaviour +{ + + public GameObject pauseMenu; + private bool paused = false; + + void Update() + { + if (Input.GetKeyDown(KeyCode.Escape)) + { + paused = !paused; + } + if (paused) + { + pauseMenu.SetActive(true); + Time.timeScale = 0; + } + else + { + pauseMenu.SetActive(false); + Time.timeScale = 1; + } + } +} \ No newline at end of file diff --git a/Assets/PauseMenu.cs.meta b/Assets/PauseMenu.cs.meta new file mode 100644 index 0000000..42a9a42 --- /dev/null +++ b/Assets/PauseMenu.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 03d7102471452394680cdff3e871ca58 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main_Game.unity b/Assets/Scenes/Main_Game.unity index 9cb5ea1..60bd4ab 100644 --- a/Assets/Scenes/Main_Game.unity +++ b/Assets/Scenes/Main_Game.unity @@ -123,6 +123,107 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &44985090 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 44985094} + - component: {fileID: 44985093} + - component: {fileID: 44985092} + - component: {fileID: 44985091} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &44985091 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 44985090} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &44985092 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 44985090} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &44985093 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 44985090} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 25 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &44985094 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 44985090} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 345050014} + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &96465037 GameObject: m_ObjectHideFlags: 0 @@ -267,6 +368,272 @@ Rigidbody2D: m_SleepingMode: 0 m_CollisionDetection: 1 m_Constraints: 4 +--- !u!1 &133096002 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 133096003} + - component: {fileID: 133096006} + - component: {fileID: 133096005} + - component: {fileID: 133096004} + m_Layer: 5 + m_Name: Settings + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &133096003 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 133096002} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.5374, y: 1.65, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1587602168} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 16, y: -60.615097} + m_SizeDelta: {x: 217.6481, y: 40.1834} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &133096004 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 133096002} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 2 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: -806958928, guid: 7d9ad5e849e934c4c9fe1f18d9284644, type: 3} + m_PressedSprite: {fileID: 126313575, guid: 7d9ad5e849e934c4c9fe1f18d9284644, type: 3} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 133096005} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: + m_MethodName: + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &133096005 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 133096002} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 581330340, guid: 7d9ad5e849e934c4c9fe1f18d9284644, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 1 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &133096006 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 133096002} + m_CullTransparentMesh: 1 +--- !u!1 &146650944 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 146650945} + - component: {fileID: 146650948} + - component: {fileID: 146650947} + - component: {fileID: 146650946} + m_Layer: 5 + m_Name: Go to Home + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &146650945 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 146650944} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.5374, y: 1.65, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1587602168} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 16, y: 38} + m_SizeDelta: {x: 217.6481, y: 40.1834} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &146650946 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 146650944} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 2 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 622712040, guid: 7d9ad5e849e934c4c9fe1f18d9284644, type: 3} + m_PressedSprite: {fileID: -1117267334, guid: 7d9ad5e849e934c4c9fe1f18d9284644, type: 3} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 146650947} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: + m_MethodName: + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &146650947 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 146650944} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 124789168, guid: 7d9ad5e849e934c4c9fe1f18d9284644, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 1 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &146650948 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 146650944} + m_CullTransparentMesh: 1 --- !u!1 &225923646 GameObject: m_ObjectHideFlags: 0 @@ -300,6 +667,111 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &345050013 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 345050014} + m_Layer: 5 + m_Name: PauseMenu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &345050014 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 345050013} + 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: 1587602168} + m_Father: {fileID: 44985094} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &799499354 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 799499357} + - component: {fileID: 799499356} + - component: {fileID: 799499355} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &799499355 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 799499354} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &799499356 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 799499354} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &799499357 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 799499354} + 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: [] + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &874085733 GameObject: m_ObjectHideFlags: 0 @@ -5171,6 +5643,7 @@ GameObject: - component: {fileID: 1426947896} - component: {fileID: 1426947900} - component: {fileID: 1426947901} + - component: {fileID: 1426947902} m_Layer: 0 m_Name: Player m_TagString: Untagged @@ -5335,6 +5808,19 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &1426947902 +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: 03d7102471452394680cdff3e871ca58, type: 3} + m_Name: + m_EditorClassIdentifier: + pauseMenu: {fileID: 345050013} --- !u!1 &1504207989 GameObject: m_ObjectHideFlags: 0 @@ -5366,6 +5852,139 @@ Transform: m_Father: {fileID: 1426947899} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1508797154 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1508797155} + - component: {fileID: 1508797158} + - component: {fileID: 1508797157} + - component: {fileID: 1508797156} + m_Layer: 5 + m_Name: Resume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1508797155 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1508797154} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.5374, y: 1.65, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1587602168} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 16, y: 133.93536} + m_SizeDelta: {x: 217.6481, y: 40.1834} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1508797156 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1508797154} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 2 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 622712040, guid: 7d9ad5e849e934c4c9fe1f18d9284644, type: 3} + m_PressedSprite: {fileID: -1117267334, guid: 7d9ad5e849e934c4c9fe1f18d9284644, type: 3} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1508797157} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: + m_MethodName: + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1508797157 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1508797154} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 124789168, guid: 7d9ad5e849e934c4c9fe1f18d9284644, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 1 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1508797158 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1508797154} + m_CullTransparentMesh: 1 --- !u!1 &1576707493 GameObject: m_ObjectHideFlags: 0 @@ -5585,6 +6204,86 @@ TilemapCollider2D: m_Offset: {x: 0, y: 0} m_MaximumTileChangeCount: 1000 m_ExtrusionFactor: 0.00001 +--- !u!1 &1587602167 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1587602168} + - component: {fileID: 1587602170} + - component: {fileID: 1587602169} + m_Layer: 5 + m_Name: MenuBackground + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1587602168 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1587602167} + 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: 1508797155} + - {fileID: 146650945} + - {fileID: 133096003} + - {fileID: 1812337262} + m_Father: {fileID: 345050014} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 718, y: 360.4} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1587602169 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1587602167} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.392} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1587602170 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1587602167} + m_CullTransparentMesh: 1 --- !u!1 &1734573316 GameObject: m_ObjectHideFlags: 0 @@ -5838,3 +6537,150 @@ Transform: m_Father: {fileID: 1426947899} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1812337261 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1812337262} + - component: {fileID: 1812337265} + - component: {fileID: 1812337264} + - component: {fileID: 1812337263} + - component: {fileID: 1812337266} + m_Layer: 5 + m_Name: Quit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1812337262 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1812337261} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.5374, y: 1.65, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1587602168} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 16, y: -155.47856} + m_SizeDelta: {x: 217.6481, y: 40.1834} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1812337263 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1812337261} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 2 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 9354910, guid: 7d9ad5e849e934c4c9fe1f18d9284644, type: 3} + m_PressedSprite: {fileID: 235863675, guid: 7d9ad5e849e934c4c9fe1f18d9284644, type: 3} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1812337264} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1812337266} + m_TargetAssemblyTypeName: SceneChangeButton, Assembly-CSharp + m_MethodName: ChangeScene + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 +--- !u!114 &1812337264 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1812337261} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -1947440698, guid: 7d9ad5e849e934c4c9fe1f18d9284644, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 1 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1812337265 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1812337261} + m_CullTransparentMesh: 1 +--- !u!114 &1812337266 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1812337261} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8466911bd3e82f14fbbfa9cc306e5a2a, type: 3} + m_Name: + m_EditorClassIdentifier: + sceneName: Main_Menu diff --git a/Assets/Scenes/Main_Menu.unity b/Assets/Scenes/Main_Menu.unity index 27e2e45..0a9f189 100644 --- a/Assets/Scenes/Main_Menu.unity +++ b/Assets/Scenes/Main_Menu.unity @@ -155,8 +155,8 @@ RectTransform: - {fileID: 1989443925} - {fileID: 1778332101} - {fileID: 1779447993} - - {fileID: 782561803} - {fileID: 1891554129} + - {fileID: 782561803} m_Father: {fileID: 221552283} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -200,7 +200,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -2, y: 68.6} + m_AnchoredPosition: {x: -271.7, y: -120.1} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &153310841 @@ -225,8 +225,8 @@ MonoBehaviour: m_Calls: [] m_text: Julia Hallberg m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 259e3a7af3a4ac34f8e71f347a6dd604, type: 2} - m_sharedMaterial: {fileID: 2331139175972049953, guid: 259e3a7af3a4ac34f8e71f347a6dd604, type: 2} + m_fontAsset: {fileID: 11400000, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -250,8 +250,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -335,7 +335,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -8.4, y: -14} + m_AnchoredPosition: {x: -272, y: -37} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &176004362 @@ -360,8 +360,8 @@ MonoBehaviour: m_Calls: [] m_text: Liam Ahlstromp m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 259e3a7af3a4ac34f8e71f347a6dd604, type: 2} - m_sharedMaterial: {fileID: 2331139175972049953, guid: 259e3a7af3a4ac34f8e71f347a6dd604, type: 2} + m_fontAsset: {fileID: 11400000, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -385,8 +385,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -421,7 +421,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: -2.6173668, w: 22.499502} + m_margin: {x: 0, y: 0, z: -13.298122, w: 22.499502} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -486,7 +486,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 4 m_ScaleFactor: 1 m_ReferenceResolution: {x: 800, y: 600} @@ -694,7 +694,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -18, y: 138} + m_AnchoredPosition: {x: 29, y: 182} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &655253194 @@ -719,15 +719,15 @@ MonoBehaviour: m_Calls: [] m_text: Credits m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 4b85bc8c581b4704f9ecf80449a3b742, type: 2} - m_sharedMaterial: {fileID: -7860752935613747955, guid: 4b85bc8c581b4704f9ecf80449a3b742, type: 2} + m_fontAsset: {fileID: 11400000, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190335 - m_fontColor: {r: 1, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -780,7 +780,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: -26.005112, w: 0} + m_margin: {x: 0, y: 0, z: 63.208126, w: -0.072813004} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -829,7 +829,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -21, y: -92} + m_AnchoredPosition: {x: -272, y: 53} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &687257769 @@ -854,8 +854,8 @@ MonoBehaviour: m_Calls: [] m_text: Adam Gustafsson m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 259e3a7af3a4ac34f8e71f347a6dd604, type: 2} - m_sharedMaterial: {fileID: 2331139175972049953, guid: 259e3a7af3a4ac34f8e71f347a6dd604, type: 2} + m_fontAsset: {fileID: 11400000, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -879,8 +879,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -915,7 +915,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: -34.670277, w: 22.499502} + m_margin: {x: 0, y: 0, z: -49.894596, w: 8.770493} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -960,11 +960,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 142571404} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -50, y: 107} + m_AnchoredPosition: {x: -30, y: 122} m_SizeDelta: {x: 200, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &782561804 @@ -1014,8 +1014,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 50 - m_fontSizeBase: 50 + m_fontSize: 40 + m_fontSizeBase: 40 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1050,7 +1050,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: -132.66338, w: 0} + m_margin: {x: 0, y: 0, z: -71.402466, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -1098,9 +1098,9 @@ RectTransform: m_Father: {fileID: 635089185} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -221, y: -81} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -215, y: -133} m_SizeDelta: {x: 128, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1159991285 @@ -1236,7 +1236,7 @@ RectTransform: m_GameObject: {fileID: 1171210106} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 7.6123996, y: 3.6699998, z: 1} + m_LocalScale: {x: 9.991275, y: 5.1379995, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 604500610} @@ -1244,7 +1244,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 2, y: -0.085065} + m_AnchoredPosition: {x: 2, y: -0.085063} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1171210108 @@ -1320,7 +1320,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -8, y: 29} + m_AnchoredPosition: {x: -272, y: -81} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1212968598 @@ -1345,8 +1345,8 @@ MonoBehaviour: m_Calls: [] m_text: 'Gustav Mikkola ' m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 259e3a7af3a4ac34f8e71f347a6dd604, type: 2} - m_sharedMaterial: {fileID: 2331139175972049953, guid: 259e3a7af3a4ac34f8e71f347a6dd604, type: 2} + m_fontAsset: {fileID: 11400000, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1370,8 +1370,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1406,7 +1406,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 1.4826698, w: 22.499502} + m_margin: {x: 0, y: 0, z: -17.74268, w: 22.499502} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -1448,7 +1448,7 @@ RectTransform: m_GameObject: {fileID: 1557610813} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2, y: 2, z: 1} + m_LocalScale: {x: 3.6437502, y: 2, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 604500610} @@ -1456,7 +1456,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -282.756, y: -79} + m_AnchoredPosition: {x: -318, y: -136} m_SizeDelta: {x: 61.926, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1557610815 @@ -1705,7 +1705,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -15, y: -52} + m_AnchoredPosition: {x: -272, y: 7} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1633491346 @@ -1730,8 +1730,8 @@ MonoBehaviour: m_Calls: [] m_text: Alex Andersson m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 259e3a7af3a4ac34f8e71f347a6dd604, type: 2} - m_sharedMaterial: {fileID: 2331139175972049953, guid: 259e3a7af3a4ac34f8e71f347a6dd604, type: 2} + m_fontAsset: {fileID: 11400000, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1755,8 +1755,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1791,7 +1791,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: -6.7264714, w: 22.499502} + m_margin: {x: 0, y: 0, z: -19.969063, w: 22.499502} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -1841,7 +1841,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -47, y: -62.999985} + m_AnchoredPosition: {x: -47, y: -32} m_SizeDelta: {x: 128, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1778332102 @@ -1987,7 +1987,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -47.00003, y: -137} + m_AnchoredPosition: {x: -47.00003, y: -112} m_SizeDelta: {x: 128, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1779447994 @@ -2131,7 +2131,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -48, y: -134} + m_AnchoredPosition: {x: -272, y: 85} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1848731731 @@ -2156,8 +2156,8 @@ MonoBehaviour: m_Calls: [] m_text: Alexander Simonsson m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 259e3a7af3a4ac34f8e71f347a6dd604, type: 2} - m_sharedMaterial: {fileID: 2331139175972049953, guid: 259e3a7af3a4ac34f8e71f347a6dd604, type: 2} + m_fontAsset: {fileID: 11400000, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -2181,8 +2181,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2217,7 +2217,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: -82.47338, w: 22.499502} + m_margin: {x: 0, y: -17.516825, z: -97.83765, w: 31.773134} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -2243,7 +2243,7 @@ GameObject: - component: {fileID: 1891554131} - component: {fileID: 1891554130} m_Layer: 5 - m_Name: Text (TMP) (1) + m_Name: '2D ' m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2262,11 +2262,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 142571404} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -15.082} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 260, y: 130} + m_AnchoredPosition: {x: 219, y: 124} m_SizeDelta: {x: 200, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1891554130 @@ -2316,8 +2316,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2352,7 +2352,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 139.02467, w: -2.2413712} + m_margin: {x: 0, y: 0, z: 141.602, w: 12.226212} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -2402,7 +2402,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -47, y: 13.000008} + m_AnchoredPosition: {x: -47, y: 45} m_SizeDelta: {x: 128, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1989443926 @@ -2625,7 +2625,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -47, y: 88} + m_AnchoredPosition: {x: -47, y: 124} m_SizeDelta: {x: 128, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2098359455 diff --git a/Assets/Scripts/SceneChangeButton.cs b/Assets/Scripts/SceneChangeButton.cs new file mode 100644 index 0000000..ad67e99 --- /dev/null +++ b/Assets/Scripts/SceneChangeButton.cs @@ -0,0 +1,12 @@ +using UnityEngine; +using UnityEngine.SceneManagement; + +public class SceneChangeButton : MonoBehaviour +{ + public string sceneName; + + public void ChangeScene() + { + SceneManager.LoadScene(sceneName); + } +} diff --git a/Assets/Scripts/SceneChangeButton.cs.meta b/Assets/Scripts/SceneChangeButton.cs.meta new file mode 100644 index 0000000..d101f0d --- /dev/null +++ b/Assets/Scripts/SceneChangeButton.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8466911bd3e82f14fbbfa9cc306e5a2a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TextMesh Pro/Fonts/pixelmix SDF.asset b/Assets/TextMesh Pro/Fonts/pixelmix SDF.asset index 85270cf..518392a 100644 --- a/Assets/TextMesh Pro/Fonts/pixelmix SDF.asset +++ b/Assets/TextMesh Pro/Fonts/pixelmix SDF.asset @@ -1016,7 +1016,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: pixelmix Atlas Material m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} - m_ValidKeywords: [] + m_ValidKeywords: + - UNDERLAY_ON m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset index e907cc7..d2796f7 100644 --- a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset +++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset @@ -2,14 +2,15 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2180264 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: LiberationSans SDF Material m_Shader: {fileID: 4800000, guid: fe393ace9b354375a9cb14cdbbc28be4, type: 3} - m_ShaderKeywords: + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -67,6 +68,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _Ambient: 0.5 - _Bevel: 0.5 @@ -107,9 +109,9 @@ Material: - _Parallax: 0.02 - _PerspectiveFilter: 0.875 - _Reflectivity: 10 - - _ScaleRatioA: 0.90909094 + - _ScaleRatioA: 0.9 - _ScaleRatioB: 0.73125 - - _ScaleRatioC: 0.7386364 + - _ScaleRatioC: 0.73125 - _ScaleX: 1 - _ScaleY: 1 - _ShaderFlags: 0 @@ -148,6 +150,7 @@ Material: - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1} - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5} + m_BuildTextureStacks: [] --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -165,11 +168,11 @@ MonoBehaviour: materialHashCode: 462855346 m_Version: 1.1.0 m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75 - m_SourceFontFile_EditorRef: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, - type: 3} + m_SourceFontFile_EditorRef: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3} m_SourceFontFile: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3} m_AtlasPopulationMode: 1 m_FaceInfo: + m_FaceIndex: 0 m_FamilyName: Liberation Sans m_StyleName: Regular m_PointSize: 86 @@ -313,15 +316,20 @@ Texture2D: Hash: 00000000000000000000000000000000 m_ForcedFallbackFormat: 4 m_DownscaleFallback: 0 + m_IsAlphaChannelOptional: 0 serializedVersion: 2 m_Width: 0 m_Height: 0 m_CompleteImageSize: 0 + m_MipsStripped: 0 m_TextureFormat: 1 m_MipCount: 1 m_IsReadable: 1 + m_IsPreProcessed: 0 + m_IgnoreMasterTextureLimit: 0 m_StreamingMipmaps: 0 m_StreamingMipmapsPriority: 0 + m_VTOnly: 0 m_AlphaIsTransparency: 0 m_ImageCount: 1 m_TextureDimension: 2 @@ -335,9 +343,11 @@ Texture2D: m_WrapW: 0 m_LightmapFormat: 0 m_ColorSpace: 0 + m_PlatformBlob: image data: 0 _typelessdata: m_StreamData: + serializedVersion: 2 offset: 0 size: 0 path: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 98fb920..ebb429c 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -11,7 +11,7 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/Main_Game.unity guid: a8f76e9b00caa0c4d8dd7816278353d3 - - enabled: 1 - path: Assets/Scenes/Main_Credits.unity - guid: f97e723378691c045aab2acdcff9a80a + - enabled: 0 + path: + guid: 00000000000000000000000000000000 m_configObjects: {} diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 3c32d19..483881a 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -15,11 +15,11 @@ MonoBehaviour: m_PixelRect: serializedVersion: 2 x: 0 - y: 42.666668 - width: 1280 - height: 677.3334 + y: 43.2 + width: 1536 + height: 780.8 m_ShowMode: 4 - m_Title: Project + m_Title: Hierarchy m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 350} m_MaxSize: {x: 10000, y: 10000} @@ -44,8 +44,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1280 - height: 677.3333 + width: 1536 + height: 780.8 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -69,7 +69,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1280 + width: 1536 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -90,8 +90,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 657.3333 - width: 1280 + y: 760.8 + width: 1536 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -115,12 +115,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1280 - height: 627.3333 + width: 1536 + height: 730.8 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 116 + controlID: 77 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -138,8 +138,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 201.33333 - height: 627.3333 + width: 285.6 + height: 730.8 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 12} @@ -164,14 +164,14 @@ MonoBehaviour: - {fileID: 9} m_Position: serializedVersion: 2 - x: 201.33333 + x: 285.6 y: 0 - width: 760 - height: 627.3333 + width: 892.80005 + height: 730.8 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 69 + controlID: 22 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -182,23 +182,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 y: 0 - width: 760 - height: 338.66666 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 11} + width: 892.80005 + height: 502.4 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} - {fileID: 11} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -215,9 +215,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 338.66666 - width: 760 - height: 288.66666 + y: 502.4 + width: 892.80005 + height: 228.4 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} m_ActualView: {fileID: 15} @@ -243,12 +243,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 961.3333 + x: 1178.4 y: 0 - width: 318.6667 - height: 627.3333 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + width: 357.59998 + height: 730.8 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 18} m_Panes: - {fileID: 18} @@ -275,10 +275,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 201.33334 - y: 72.66667 - width: 758 - height: 317.66666 + x: 285.6 + y: 73.6 + width: 890.80005 + height: 481.4 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -291,7 +291,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1920, y: 1080} + m_TargetSize: {x: 818, y: 460.4} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -300,25 +300,25 @@ MonoBehaviour: m_VSyncEnabled: 1 m_Gizmos: 0 m_Stats: 0 - m_SelectedSizes: 03000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_SelectedSizes: 01000000000000000000000000000000000000000000000000000000000000000000000000000000 m_ZoomArea: m_HRangeLocked: 0 m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -640 - m_HBaseRangeMax: 640 - m_VBaseRangeMin: -360 - m_VBaseRangeMax: 360 + m_HBaseRangeMin: -327.2 + m_HBaseRangeMax: 327.2 + m_VBaseRangeMin: -184.16 + m_VBaseRangeMax: 184.16 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 m_VAllowExceedBaseRangeMax: 1 m_ScaleWithWindow: 0 - m_HSlider: 1 - m_VSlider: 1 + m_HSlider: 0 + m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -327,23 +327,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 758 - height: 296.66666 - m_Scale: {x: 1.2518069, y: 1.2518069} - m_Translation: {x: 378.99997, y: 148.33333} + width: 890.80005 + height: 460.4 + m_Scale: {x: 6.2499995, y: 6.25} + m_Translation: {x: 445.40002, y: 230.19995} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -302.76233 - y: -118.49538 - width: 605.5247 - height: 236.99075 + x: -71.26401 + y: -36.831993 + width: 142.52802 + height: 73.664 m_MinimalGUI: 1 - m_defaultScale: 0.41203701 - m_LastWindowPixelSize: {x: 1137, y: 476.5} + m_defaultScale: 1 + m_LastWindowPixelSize: {x: 1113.5, y: 601.75} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -370,9 +370,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 72.66667 - width: 200.33333 - height: 606.3333 + y: 73.6 + width: 284.6 + height: 709.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -380,9 +380,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 04630000 - m_LastClickedID: 0 - m_ExpandedIDs: 26fbffff586200005c620000 + m_SelectedIDs: 6c620000 + m_LastClickedID: 25196 + m_ExpandedIDs: 44c3ffff28fbffff586200006c6200007c62000080620000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -426,10 +426,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 241.6 + x: 285.6 y: 73.6 - width: 910 - height: 373.4 + width: 890.80005 + height: 481.4 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -686,9 +686,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 0.09423971, y: -3.0803127, z: -0.020880327} + m_Target: {x: -7.679989, y: -0.81887496, z: -6.3033347} speed: 2 - m_Value: {x: 0.09423971, y: -3.0803127, z: -0.020880327} + m_Value: {x: -6.258835, y: -0.5013503, z: -6.320906} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -739,9 +739,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 39.60757 + m_Target: 37.291195 speed: 2 - m_Value: 39.60757 + m_Value: 39.04837 m_Ortho: m_Target: 1 speed: 2 @@ -814,10 +814,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 201.33334 - y: 411.33334 - width: 758 - height: 267.66666 + x: 285.6 + y: 576 + width: 890.80005 + height: 207.4 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -835,22 +835,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/AnimatorsAnims + - Assets/TextMesh Pro/Fonts m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/AnimatorsAnims + - Assets/TextMesh Pro/Fonts m_LastFoldersGridSize: -1 - m_LastProjectPath: C:\Users\liam.ahlstrom\Documents\GitHub\RatAttack2D + m_LastProjectPath: C:\Users\alex.andersson2\Documents\RatAttack2D m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 00640000 - m_LastClickedID: 25600 - m_ExpandedIDs: 00000000c2630000c4630000c6630000ffffff7f + scrollPos: {x: 0, y: 68.600006} + m_SelectedIDs: 9e640000 + m_LastClickedID: 25758 + m_ExpandedIDs: 000000008264000084640000866400008864000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -878,7 +878,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000c2630000c4630000c6630000 + m_ExpandedIDs: 0000000082640000846400008664000088640000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1049,10 +1049,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 961.3334 - y: 72.66667 - width: 317.6667 - height: 606.3333 + x: 1178.4 + y: 73.6 + width: 356.59998 + height: 709.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default