mirror of
https://github.com/DerTyp7/defrain-shooter-unity.git
synced 2025-10-29 20:52:10 +01:00
fixed merge
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user