fix1
This commit is contained in:
@@ -22,7 +22,18 @@ public class Bullet : MonoBehaviour
|
||||
{
|
||||
if (collision.gameObject.tag == "Enemy")
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
Destroy(collision.gameObject);
|
||||
=======
|
||||
EnemyHealth enemy = collision.gameObject.GetComponent<EnemyHealth>();
|
||||
|
||||
if (enemy != null)
|
||||
{
|
||||
enemy.TakeDamage(damage);
|
||||
Destroy(gameObject);
|
||||
}
|
||||
|
||||
>>>>>>> parent of 392d236 (Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone)
|
||||
}
|
||||
else if(collision.gameObject.tag == "Wall")
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user