fixed merge

This commit is contained in:
juliuse98
2021-11-04 08:45:48 +01:00
parent 6ba99d7ead
commit 2868c0e89e
9 changed files with 267 additions and 251 deletions

View File

@@ -51,7 +51,9 @@ public class PlayerController : NetworkBehaviour
Grounded();
CheckGoundAngle();
UpdateMovement();
}
}
private void Grounded()
{
@@ -86,18 +88,7 @@ public class PlayerController : NetworkBehaviour
groundAngle = Vector3.Angle(hit.normal,transform.up);
}
}
private void Sprint()
{
if (Input.GetAxisRaw("Sprint") > 0 && isGrounded)
{
//Debug.Log("Sprint");
movementSpeed = sprintSpeed;
}
else
{
movementSpeed = walkSpeed;
}
}
private void OnDrawGizmos()
{
Gizmos.color = Color.red;
@@ -106,8 +97,19 @@ public class PlayerController : NetworkBehaviour
private void UpdateMovement()
{
if (Input.GetAxisRaw("Sprint") > 0 && isGrounded)
{
Debug.Log("Sprint");
movementSpeed = sprintSpeed;
}
else
{
movementSpeed = walkSpeed;
}
Debug.Log("ggg");
//Grounded
velocityY += gravity * Time.deltaTime;
if (isGrounded && velocityY < 0)