diff --git a/Assets/Scripts/Player/PlayerController.cs b/Assets/Scripts/Player/PlayerController.cs index bf44f0c..578dac4 100644 --- a/Assets/Scripts/Player/PlayerController.cs +++ b/Assets/Scripts/Player/PlayerController.cs @@ -206,7 +206,7 @@ namespace Player private void Jump() { BaseSpeed = MaxAirSpeed; - _playerRigidbody2D.velocity = Vector2.up.normalized * DefaultJumpForce; + _playerRigidbody2D.velocity = new Vector2(_playerRigidbody2D.velocity.x, DefaultJumpForce); _canJump = false; } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 4b167ad..e9be43b 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -268,7 +268,99 @@ PlayerSettings: AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 m_BuildTargetIcons: [] - m_BuildTargetPlatformIcons: [] + m_BuildTargetPlatformIcons: + - m_BuildTarget: Android + m_Icons: + - m_Textures: [] + m_Width: 432 + m_Height: 432 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 324 + m_Height: 324 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 216 + m_Height: 216 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 162 + m_Height: 162 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 108 + m_Height: 108 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 81 + m_Height: 81 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 0 + m_SubKind: m_BuildTargetBatching: [] m_BuildTargetGraphicsJobs: - m_BuildTarget: MacStandaloneSupport diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 142f6da..6e5357a 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -14,18 +14,18 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 3} - - {fileID: 9} - - {fileID: 14} + - {fileID: 8} + - {fileID: 13} m_Position: serializedVersion: 2 x: 0 y: 30 - width: 1536 - height: 730.8 + width: 1280 + height: 579.3333 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 6655 + controlID: 511 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -46,10 +46,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 303.2 - y: 472.80002 - width: 877.99994 - height: 310.59998 + x: 1 + y: 19 + width: 730.6667 + height: 387 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -75,19 +75,19 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -768 - m_HBaseRangeMax: 768 - m_VBaseRangeMin: -432 - m_VBaseRangeMax: 432 + m_HBaseRangeMin: -640 + m_HBaseRangeMax: 640 + m_VBaseRangeMin: -360 + m_VBaseRangeMax: 360 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 m_VAllowExceedBaseRangeMax: 1 m_ScaleWithWindow: 0 m_HSlider: 0 - m_VSlider: 1 + m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -96,23 +96,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 877.99994 - height: 289.59998 - m_Scale: {x: 0.33518517, y: 0.33518517} - m_Translation: {x: 438.99997, y: 144.79997} + width: 730.6667 + height: 366 + m_Scale: {x: 0.5083333, y: 0.5083333} + m_Translation: {x: 365.33334, y: 183} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1309.7238 - y: -431.99994 - width: 2619.4475 - height: 863.99994 + x: -718.68854 + y: -360 + width: 1437.3771 + height: 720 m_MinimalGUI: 1 - m_defaultScale: 0.33518517 - m_LastWindowPixelSize: {x: 1097.4999, y: 388.24997} + m_defaultScale: 0.5083333 + m_LastWindowPixelSize: {x: 1096, y: 580.5} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000100000100 @@ -137,12 +137,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 303.2 - height: 730.8 + width: 253.33333 + height: 579.3333 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 6632 + controlID: 482 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -160,8 +160,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 303.2 - height: 381.6 + width: 253.33333 + height: 302.66666 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 5} @@ -190,9 +190,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 73.6 - width: 302.2 - height: 360.6 + y: 72.66667 + width: 252.33333 + height: 281.66666 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -202,7 +202,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ecfaffff0afbffff0cfbfffff6620000 + m_ExpandedIDs: febbffff00bcffff6cbfffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -242,17 +242,16 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 381.6 - width: 303.2 - height: 349.19998 + y: 302.66666 + width: 253.33333 + height: 276.66666 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 7} m_Panes: - {fileID: 7} - - {fileID: 8} m_Selected: 0 - m_LastSelected: 1 + m_LastSelected: 0 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -274,9 +273,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 455.2 - width: 302.2 - height: 328.19998 + y: 375.33334 + width: 252.33333 + height: 255.66666 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -294,21 +293,21 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/Scenes m_Globs: [] m_OriginalText: m_ViewMode: 0 m_StartGridSize: 64 m_LastFolders: [] m_LastFoldersGridSize: -1 - m_LastProjectPath: N:\Game Developement\Unity\GameJam\BGJ-2022.1 + m_LastProjectPath: D:\Unity\BGJ-2022.1 m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} m_SelectedIDs: dc3c0000 m_LastClickedID: 15580 - m_ExpandedIDs: ffffffff000000004c630000a6630000a8630000aa630000ac630000ae630000b0630000b2630000b4630000b6630000b8630000ba630000bc630000be630000c2630000c4630000 + m_ExpandedIDs: ffffffff409b0000789b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -334,9 +333,9 @@ MonoBehaviour: m_ResourceFile: m_AssetTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: fc620000 + m_SelectedIDs: fabbffff m_LastClickedID: 0 - m_ExpandedIDs: ffffffff000000004c630000a6630000a8630000aa630000ac630000ae630000b0630000b2630000b4630000b6630000b8630000ba630000bc630000be630000c2630000c4630000 + m_ExpandedIDs: ffffffff409b0000789b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -361,8 +360,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: fc620000 - m_LastClickedInstanceID: 25340 + m_SelectedInstanceIDs: fabbffff + m_LastClickedInstanceID: -17414 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000d03c0000 m_RenameOverlay: @@ -393,34 +392,6 @@ MonoBehaviour: m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 170 --- !u!114 &8 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Console - m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 455.2 - width: 303 - height: 328.19998 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] ---- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -433,19 +404,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 10} - - {fileID: 13} + - {fileID: 9} + - {fileID: 11} m_Position: serializedVersion: 2 - x: 303.2 + x: 253.33333 y: 0 - width: 879.99994 - height: 730.8 + width: 732.6667 + height: 579.3333 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 6656 ---- !u!114 &10 + controlID: 512 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -455,24 +426,24 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 y: 0 - width: 879.99994 - height: 399.2 + width: 732.6667 + height: 408 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 11} + m_ActualView: {fileID: 2} m_Panes: - - {fileID: 11} - - {fileID: 12} - m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &11 + - {fileID: 10} + - {fileID: 2} + m_Selected: 1 + m_LastSelected: 0 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -492,10 +463,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 303.2 - y: 73.6 - width: 877.99994 - height: 378.2 + x: 253.33334 + y: 72.66667 + width: 730.6667 + height: 387 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -506,7 +477,7 @@ MonoBehaviour: collapsed: 0 displayed: 1 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: -100, y: -25.600006} + snapOffsetDelta: {x: -98.66669, y: -26} snapCorner: 3 id: Tool Settings index: 0 @@ -559,7 +530,7 @@ MonoBehaviour: containerId: overlay-toolbar__top floating: 0 collapsed: 0 - displayed: 1 + displayed: 0 snapOffset: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 @@ -603,7 +574,7 @@ MonoBehaviour: containerId: overlay-container--right floating: 0 collapsed: 0 - displayed: 0 + displayed: 1 snapOffset: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 @@ -719,9 +690,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -25.330248, y: -2.0593255, z: -0.20706767} + m_Target: {x: -24.763855, y: 1.0450014, z: -0.22300033} speed: 2 - m_Value: {x: -25.330248, y: -2.0593255, z: -0.20706767} + m_Value: {x: -24.763855, y: 1.0450014, z: -0.22300033} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -763,7 +734,7 @@ MonoBehaviour: m_Value: 1 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 2, y: 2} + m_Size: {x: 1, y: 1} m_ShowGrid: 1 m_GridAxis: 1 m_gridOpacity: 0.5 @@ -772,9 +743,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 14.378537 + m_Target: 17.975992 speed: 2 - m_Value: 14.378537 + m_Value: 17.975992 m_Ortho: m_Target: 1 speed: 2 @@ -799,42 +770,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &12 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3f683d99f24875748a6656966ca9cea0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 240, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Tile Palette - m_Image: {fileID: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 303.2 - y: 73.6 - width: 877.99994 - height: 378.2 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_PreviewResizer: - m_CachedPref: -50 - m_ControlHash: 1964396721 - m_PrefName: Preview_TilemapBrushInspector - m_Palette: {fileID: 4017893543754070076, guid: 8877a796019eec64dbfa40866abf571c, type: 3} - m_DrawGridGizmo: 1 - m_DrawGizmos: 0 ---- !u!114 &13 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -844,23 +780,51 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 399.2 - width: 879.99994 - height: 331.59998 - m_MinSize: {x: 202, y: 221} + y: 408 + width: 732.6667 + height: 171.33331 + m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 2} + m_ActualView: {fileID: 12} m_Panes: - - {fileID: 2} + - {fileID: 12} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &14 +--- !u!114 &12 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Console + m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 253.33334 + y: 480.6667 + width: 730.6667 + height: 150.33331 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -875,18 +839,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1183.2 + x: 986 y: 0 - width: 352.80005 - height: 730.8 + width: 294 + height: 579.3333 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 15} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 15} + - {fileID: 14} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &15 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -906,10 +870,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1183.2001 - y: 73.6 - width: 351.80005 - height: 709.8 + x: 986 + y: 72.66667 + width: 293 + height: 558.3333 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -920,7 +884,7 @@ MonoBehaviour: m_CachedPref: 160 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: 25340 + m_LastInspectedObjectInstanceID: -17414 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0