fixe 2

2026-08-20 11:50:34 +02:00
parent 6d9fee91db
commit cf0d5e24ad
8 changed files with 323 additions and 2360 deletions
@@ -22,30 +22,15 @@ public class ARBullet : MonoBehaviour
    {
        if (collision.gameObject.tag == "Enemy")
        {
-<<<<<<< HEAD
-<<<<<<< HEAD
            Destroy(collision.gameObject);
-=======
-=======
->>>>>>> 392d23632b62942df19732b9e125c98967abd9e4
            EnemyHealth enemy = collision.gameObject.GetComponent<EnemyHealth>();

            if (enemy != null)
            {
                enemy.TakeDamage(damage);
-<<<<<<< HEAD
                Destroy(gameObject);
            }
-
-<<<<<<< HEAD
->>>>>>> parent of 392d236 (Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone)
-=======
->>>>>>> parent of 392d236 (Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone)
-=======
-            }
-
            Destroy(gameObject);
->>>>>>> 392d23632b62942df19732b9e125c98967abd9e4
        }
        else if(collision.gameObject.tag == "Wall")
        {