Added fighting animation

This commit is contained in:
Giovani
2020-02-01 23:51:06 -05:00
parent 8eafec7521
commit 346c246554
5 changed files with 106 additions and 11 deletions

View File

@@ -49,7 +49,7 @@ public class EventControls : MonoBehaviour
currentPlayerCollider = playerCollider;
currentEnemyCollider = enemyCollider;
player.DisablePlayerMovement();
player.StartEncounter();
Physics2D.IgnoreCollision(playerCollider, enemyCollider, true);
eventTriggered = true;
@@ -205,7 +205,7 @@ public class EventControls : MonoBehaviour
if (currentEnemyCollider != null)
Physics2D.IgnoreCollision(currentPlayerCollider, currentEnemyCollider, false);
if (!isInBattle)
player.EnablePlayerMovement();
player.EndEncounter();
currentPlayerCollider = null;
currentEnemyCollider = null;

View File

@@ -24,12 +24,11 @@ public class Player : MonoBehaviour
[SerializeField] private SpriteRenderer healthBar;
[SerializeField] private SpriteRenderer staminaBar;
private Rigidbody2D rigidBody;
new private Collider2D collider;
private Animator animator;
private bool isMovementEnabled = true;
private bool isFighting = false;
private void Start()
{
@@ -213,15 +212,18 @@ public class Player : MonoBehaviour
animator.SetBool("IsRunning", Mathf.Abs(rigidBody.velocity.x) > runErrorThreshold);
animator.SetBool("IsGround", IsPlayerOnGround());
animator.SetFloat("YVelocity", rigidBody.velocity.y);
animator.SetBool("IsFighting", isFighting);
}
public void DisablePlayerMovement()
public void StartEncounter()
{
isFighting = true;
isMovementEnabled = false;
}
public void EnablePlayerMovement()
public void EndEncounter()
{
isFighting = false;
isMovementEnabled = true;
}