Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
Unknown committed 2022-02-25 03:16:40 -06:00
commit 6d43681db6
73 files changed
+12035 -4299

No files matched your search

+9 -5
View File
@@ -5,7 +5,7 @@ using UnityEngine;
public class PlayerMovement : MonoBehaviour
{
public Movement controller;
//public Animator animator;
public Animator animator;
public float runSpeed = 40f;
float horizontalMove = 0f;
bool jump = false;
@@ -13,9 +13,6 @@ public class PlayerMovement : MonoBehaviour
// Update is called once per frame
void Update() {
// Horizontal value is for the animation state machine. No code required, wow!
//animator.SetFloat("Horizontal", Input.GetAxis("Horizontal"));
horizontalMove = Input.GetAxisRaw("Horizontal") * runSpeed;
if (Input.GetButtonDown("Jump")) {
@@ -27,8 +24,15 @@ public class PlayerMovement : MonoBehaviour
} else if (Input.GetKeyUp(KeyCode.LeftShift)) {
crouch = false;
}
if(Movement.pause) {
animator.SetFloat("Horizontal", 0);
}
if (animator != null && !Movement.pause) {
animator.SetFloat("Horizontal", Input.GetAxis("Horizontal"));
animator.SetBool("Airborne", !controller.m_Grounded);
}
}
void FixedUpdate()
{
controller.Move(horizontalMove * Time.fixedDeltaTime, crouch, jump);