Merge branch 'main' into SP3-141-Camera-System

This commit is contained in:
maverickdgg 2023-02-04 02:10:16 +08:00
commit 5b6217f923
4 changed files with 589 additions and 473 deletions

View File

@ -1,10 +1,10 @@
0 1 1111111000000000
1 2 1111111000000000
2 3 1111010000000000
3 4 1111110000000000
4 5 1101110000000000
5 6 1111111000000000
6 7 1100011000000000
0 StaticObject 1100000000000000
1 Player 1100000000000000
2 Food 1000000000000000
3 Breakable 1100000000000000
4 ScoringWallCollider 0100000000000000
5 Homeowner 1100000000000000
6 Camera 1100000000000000
7 8 0000000000000000
8 9 0000000000000000
9 10 0000000000000000

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -151,6 +151,8 @@ public class PlayerController : Script
camArm = GetComponentInChildren<CameraArm>();
Rotation();
MoveKey();
Sprint();
Jump();
GotCaught();
//Debug.Log($"{currentState}");
@ -161,10 +163,7 @@ public class PlayerController : Script
protected override void fixedUpdate()
{
MoveKey();
Move();
Sprint();
Gravity();
//Debug.Log($"X: {rb.LinearVelocity.x}" + $" Z: {rb.LinearVelocity.z}");
}