Animation tweaks and enemy tag
This commit is contained in:
parent
e0e2e1c6d7
commit
4e4c4eff5d
|
@ -254,12 +254,8 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
<<<<<<< Updated upstream
|
||||
maxHealth: 100
|
||||
damageTickDelay: 1
|
||||
=======
|
||||
maxHealth: 1
|
||||
>>>>>>> Stashed changes
|
||||
OnHealthZero:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
|
|
|
@ -17,15 +17,10 @@ public class EnemyAnimationHandler : MonoBehaviour
|
|||
}
|
||||
void EnemyDie()
|
||||
{
|
||||
<<<<<<< Updated upstream
|
||||
GetComponent<Collider2D>().enabled = false;
|
||||
GetComponent<NavMeshAgent>().enabled = false;
|
||||
|
||||
StartCoroutine(AnimationDie());
|
||||
=======
|
||||
if (!isDying)
|
||||
StartCoroutine(AnimationDie());
|
||||
>>>>>>> Stashed changes
|
||||
}
|
||||
|
||||
IEnumerator AnimationDie()
|
||||
|
|
Loading…
Reference in New Issue