diff --git a/Assets/Scenes/OverDevScene.unity b/Assets/Scenes/OverDevScene.unity index e6eed4f..ac7fb76 100644 --- a/Assets/Scenes/OverDevScene.unity +++ b/Assets/Scenes/OverDevScene.unity @@ -179,140 +179,96 @@ CompositeCollider2D: m_ColliderPaths: - m_Collider: {fileID: 434782291} m_ColliderPaths: - - - X: -39999900 - Y: 29999959 - - X: -39999900 - Y: 40000041 - - X: -39999959 - Y: 40000100 - - X: -120000041 - Y: 40000100 - - X: -120000100 - Y: 40000041 - - X: -120000100 - Y: 29999959 - - X: -120000041 - Y: 29999900 - - X: -39999959 - Y: 29999900 - - - X: -499999900 - Y: 29999959 - - X: -499999900 - Y: 40000041 - - X: -499999959 - Y: 40000100 - - X: -580000041 - Y: 40000100 - - X: -580000100 - Y: 40000041 - - X: -580000100 - Y: 29999959 - - X: -580000041 - Y: 29999900 - - X: -499999959 - Y: 29999900 - - - X: -129999900 - Y: -41 - - X: -129999900 - Y: 10000041 - - X: -129999959 - Y: 10000100 - - X: -210000041 - Y: 10000100 - - X: -210000100 - Y: 10000041 - - X: -210000100 - Y: -41 - - X: -210000041 - Y: -100 - - X: -129999959 - Y: -100 + - - X: -40000000 + Y: 40000000 + - X: -120000000 + Y: 40000000 + - X: -120000000 + Y: 30000000 + - X: -40000000 + Y: 30000000 + - - X: -500000000 + Y: 40000000 + - X: -580000000 + Y: 40000000 + - X: -580000000 + Y: 30000000 + - X: -500000000 + Y: 30000000 - - X: -409999900 - Y: -41 + Y: 20000041 + - X: -409999959 + Y: 20000100 + - X: -490000041 + Y: 20000100 + - X: -490000100 + Y: 20000041 + - X: -490000100 + Y: 10000041 + - X: -490000041 + Y: 10000100 + - X: -409999959 + Y: 10000100 - X: -409999900 Y: 10000041 - - X: -409999959 - Y: 10000100 - - X: -490000041 - Y: 10000100 - - X: -490000100 + - - X: -129999900 + Y: 20000041 + - X: -129999959 + Y: 20000100 + - X: -210000041 + Y: 20000100 + - X: -210000100 + Y: 20000041 + - X: -210000100 Y: 10000041 - - X: -490000100 - Y: -41 - - X: -490000041 - Y: -100 - - X: -409999959 - Y: -100 - - - X: -229999900 - Y: -30000041 - - X: -229999900 - Y: -19999959 - - X: -229999959 - Y: -19999900 - - X: -390000041 - Y: -19999900 - - X: -390000100 - Y: -19999959 - - X: -390000100 - Y: -30000041 - - X: -390000041 - Y: -30000100 - - X: -229999959 - Y: -30000100 - - - X: 50000100 - Y: -130000041 - - X: 50000100 - Y: -69999959 - - X: 50000041 - Y: -69999900 - - X: -270000041 - Y: -69999900 - - X: -270000100 - Y: -69999959 - - X: -270000100 + - X: -210000041 + Y: 10000100 + - X: -129999959 + Y: 10000100 + - X: -129999900 + Y: 10000041 + - - X: -230000000 + Y: -20000000 + - X: -390000000 + Y: -20000000 + - X: -390000000 + Y: -30000000 + - X: -230000000 + Y: -30000000 + - - X: 50000000 Y: -70000000 - - X: -509999900 + - X: -670000000 Y: -70000000 - - X: -509999900 - Y: -69999959 - - X: -509999959 - Y: -69999900 - - X: -670000041 - Y: -69999900 - - X: -670000100 - Y: -69999959 - - X: -670000100 - Y: -130000041 - - X: -670000041 - Y: -130000100 - - X: 50000041 - Y: -130000100 + - X: -670000000 + Y: -130000000 + - X: 50000000 + Y: -130000000 m_CompositePaths: m_Paths: - - - {x: -50.000027, y: 2.99999} - - {x: -50.000027, y: 4.00001} - - {x: -58.000015, y: 3.9999747} - - {x: -57.999973, y: 2.99999} - - - {x: -4.0000253, y: 2.99999} - - {x: -4.0000253, y: 4.00001} - - {x: -12.00001, y: 3.9999747} - - {x: -11.999974, y: 2.99999} - - - {x: -41.000027, y: -0.00001} - - {x: -41.000027, y: 1.00001} - - {x: -49.00001, y: 0.9999748} - - {x: -48.999973, y: -0.00001} - - - {x: -13.000026, y: -0.00001} - - {x: -13.000026, y: 1.00001} - - {x: -21.00001, y: 0.9999748} - - {x: -20.999975, y: -0.00001} - - - {x: -23.000027, y: -3.00001} - - {x: -23.000027, y: -1.99999} - - {x: -39.00001, y: -2.0000253} - - {x: -38.999973, y: -3.00001} - - - {x: 4.9999747, y: -13.00001} - - {x: 4.9999747, y: -6.9999905} - - {x: -67.000015, y: -7.0000257} - - {x: -66.99998, y: -13.00001} + - - {x: -4.000029, y: 3} + - {x: -4.000029, y: 4} + - {x: -12, y: 3.999971} + - {x: -11.99997, y: 3} + - - {x: -50.00003, y: 3} + - {x: -50.00003, y: 4} + - {x: -58, y: 3.999971} + - {x: -57.99997, y: 3} + - - {x: -41.000027, y: 1.00001} + - {x: -41.000027, y: 2.00001} + - {x: -49.00001, y: 1.9999748} + - {x: -48.999973, y: 1.00001} + - - {x: -13.000026, y: 1.00001} + - {x: -13.000026, y: 2.00001} + - {x: -21.00001, y: 1.9999748} + - {x: -20.999975, y: 1.00001} + - - {x: -23.000029, y: -3} + - {x: -23.000029, y: -2} + - {x: -39, y: -2.0000293} + - {x: -38.999973, y: -3} + - - {x: 4.999971, y: -13} + - {x: 4.999971, y: -7} + - {x: -67, y: -7.0000296} + - {x: -66.99997, y: -13} m_VertexDistance: 0.0005 m_OffsetDistance: 0.00005 --- !u!19719996 &434782291 @@ -4890,7 +4846,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -49, y: 0, z: 0} + - first: {x: -49, y: 1, z: 0} second: serializedVersion: 2 m_TileIndex: 0 @@ -4900,7 +4856,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -48, y: 0, z: 0} + - first: {x: -48, y: 1, z: 0} second: serializedVersion: 2 m_TileIndex: 1 @@ -4910,7 +4866,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -47, y: 0, z: 0} + - first: {x: -47, y: 1, z: 0} second: serializedVersion: 2 m_TileIndex: 2 @@ -4920,7 +4876,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -46, y: 0, z: 0} + - first: {x: -46, y: 1, z: 0} second: serializedVersion: 2 m_TileIndex: 3 @@ -4930,7 +4886,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -45, y: 0, z: 0} + - first: {x: -45, y: 1, z: 0} second: serializedVersion: 2 m_TileIndex: 4 @@ -4940,7 +4896,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -44, y: 0, z: 0} + - first: {x: -44, y: 1, z: 0} second: serializedVersion: 2 m_TileIndex: 5 @@ -4950,7 +4906,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -43, y: 0, z: 0} + - first: {x: -43, y: 1, z: 0} second: serializedVersion: 2 m_TileIndex: 6 @@ -4960,7 +4916,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -42, y: 0, z: 0} + - first: {x: -42, y: 1, z: 0} second: serializedVersion: 2 m_TileIndex: 7 @@ -4970,7 +4926,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -21, y: 0, z: 0} + - first: {x: -21, y: 1, z: 0} second: serializedVersion: 2 m_TileIndex: 0 @@ -4980,7 +4936,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -20, y: 0, z: 0} + - first: {x: -20, y: 1, z: 0} second: serializedVersion: 2 m_TileIndex: 1 @@ -4990,7 +4946,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -19, y: 0, z: 0} + - first: {x: -19, y: 1, z: 0} second: serializedVersion: 2 m_TileIndex: 2 @@ -5000,7 +4956,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -18, y: 0, z: 0} + - first: {x: -18, y: 1, z: 0} second: serializedVersion: 2 m_TileIndex: 3 @@ -5010,7 +4966,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -17, y: 0, z: 0} + - first: {x: -17, y: 1, z: 0} second: serializedVersion: 2 m_TileIndex: 4 @@ -5020,7 +4976,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -16, y: 0, z: 0} + - first: {x: -16, y: 1, z: 0} second: serializedVersion: 2 m_TileIndex: 5 @@ -5030,7 +4986,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -15, y: 0, z: 0} + - first: {x: -15, y: 1, z: 0} second: serializedVersion: 2 m_TileIndex: 6 @@ -5040,7 +4996,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -14, y: 0, z: 0} + - first: {x: -14, y: 1, z: 0} second: serializedVersion: 2 m_TileIndex: 7 @@ -5536,6 +5492,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 2662163039882375473, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} + propertyPath: orthographic size + value: 15 + objectReference: {fileID: 0} - target: {fileID: 2662163039948621854, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} propertyPath: m_RootOrder value: 2 @@ -5588,6 +5548,10 @@ PrefabInstance: propertyPath: m_Follow value: objectReference: {fileID: 1053905692} + - target: {fileID: 2662163040849090936, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} + propertyPath: m_Lens.OrthographicSize + value: 15 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3} --- !u!1001 &7008207193554258683 diff --git a/Assets/Scripts/Player/PlayerController.cs b/Assets/Scripts/Player/PlayerController.cs index 917ec4d..8568dd8 100644 --- a/Assets/Scripts/Player/PlayerController.cs +++ b/Assets/Scripts/Player/PlayerController.cs @@ -18,8 +18,8 @@ namespace Player private const float DecelerationScale = 60.0f; private const float RespawnLimit = -60.0f; - private const float FallMultiplier = 4.0f; - private const float LowJumpMultiplier = 4.0f; + private const float FallMultiplier = 5.0f; + private const float LowJumpMultiplier = 20.0f; private PlayerInput _controls; private Rigidbody2D _playerRigidbody2D; @@ -228,7 +228,8 @@ namespace Player public void OnInteract(InputAction.CallbackContext context) { if (_playerInteractableTrigger.IsCollided) - throw new NotImplementedException(); + { + } } public void OnClimb(InputAction.CallbackContext context) diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 12fc309..0f5c529 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -25,7 +25,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 7443 + controlID: 9136 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -142,7 +142,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 7407 + controlID: 9100 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -334,7 +334,7 @@ MonoBehaviour: m_ResourceFile: m_AssetTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: 88e4ffff m_LastClickedID: 0 m_ExpandedIDs: ffffffff0000000032630000686300006c6300006e6300007063000076630000786300007a630000946d0000386f000060760000ea7600006a7d0000328000003a8000003e8000004280000046800000 m_RenameOverlay: @@ -361,8 +361,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 + m_SelectedInstanceIDs: 88e4ffff + m_LastClickedInstanceID: -7032 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000d03c0000 m_RenameOverlay: @@ -444,7 +444,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 7444 + controlID: 9137 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -719,9 +719,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -26.021915, y: 1.3598123, z: -0.17697303} + m_Target: {x: -17.311716, y: 1.6540871, z: -0.15957722} speed: 2 - m_Value: {x: -26.021915, y: 1.3598123, z: -0.17697303} + m_Value: {x: -17.311716, y: 1.6540871, z: -0.15957722} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -772,9 +772,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 15.805061 + m_Target: 14.065454 speed: 2 - m_Value: 15.805061 + m_Value: 14.065454 m_Ortho: m_Target: 1 speed: 2 @@ -879,8 +879,8 @@ MonoBehaviour: y: 0 width: 352.80005 height: 730.8 - 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: 15} m_Panes: - {fileID: 15} @@ -920,7 +920,7 @@ MonoBehaviour: m_CachedPref: 160 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 + m_LastInspectedObjectInstanceID: -7032 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0