xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

Merge pull request #344 from SHADE-DP/PlayerController 

Fix collisionTag and playercontroller issue
This commit is contained in:
Sri Sham Haran 2023-02-04 02:09:12 +08:00 committed by GitHub
parent b2473c0c48 79c1bb229a
commit 0297627599
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 589 additions and 473 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Assets/CollisionTags.SHConfig
View File

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

431
Assets/Scenes/Level1Scene.shade
View File

File diff suppressed because it is too large Load Diff

612
Assets/Scenes/MainGame.shade
View File

File diff suppressed because it is too large Load Diff

5
Assets/Scripts/Gameplay/Player/SC_PlayerController.cs
View File

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