Symmetrical/BGJ-2022.1
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Over' into Syntriax

Browse Source
This commit is contained in:
Syntriax
2022-02-22 22:03:24 +03:00
parent 231c93d189 eca7e130dd
commit 80842b86e1
3 changed files with 123 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

248
Assets/Scenes/OverDevScene.unity
View File

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

7
Assets/Scripts/Player/PlayerController.cs
View File

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