fixe 2

Assets/Scripts/Bullet.cs

@@ -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")
         {

Assets/Scripts/EnemyHealth.cs

@@ -1,7 +1,4 @@
-<<<<<<< HEAD
-=======
 //Oliver
->>>>>>> 392d23632b62942df19732b9e125c98967abd9e4
 using UnityEngine;
 
 public class EnemyHealth : MonoBehaviour

Assets/Scripts/Shoot.cs

@@ -14,53 +14,32 @@ public class Shoot : MonoBehaviour
 
     void Start()
     {
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-        
-=======
-        if (weapon == null)
-            weapon = FindFirstObjectByType<WeaponReload>();
->>>>>>> parent of 392d236 (Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone)
-=======
-        if (weapon == null)
-            weapon = FindFirstObjectByType<WeaponReload>();
->>>>>>> parent of 392d236 (Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone)
-=======
 
-=======
         if (weapon == null)
             weapon = FindFirstObjectByType<WeaponReload>();
->>>>>>> 85ece045864c59c50ed55097c35e2c15b9051a0f
->>>>>>> 392d23632b62942df19732b9e125c98967abd9e4
+        if (weapon == null)
+            weapon = FindFirstObjectByType<WeaponReload>();
+        if (weapon == null)
+            weapon = FindFirstObjectByType<WeaponReload>();
     }
 
     void Update()
     {
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
         
         if ( AR == true && Input.GetKey(KeyCode.Mouse0))
-=======
         if (PauseMenu.GameIsPaused) return;
         
         if (AR == true && Input.GetKey(KeyCode.Mouse0) && Time.time >= nextShotTime)
->>>>>>> parent of 392d236 (Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone)
-=======
+
         if (PauseMenu.GameIsPaused) return;
         
         if (AR == true && Input.GetKey(KeyCode.Mouse0) && Time.time >= nextShotTime)
->>>>>>> parent of 392d236 (Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone)
-=======
+
 
         if (AR == true && Input.GetKey(KeyCode.Mouse0))
-=======
         if (PauseMenu.GameIsPaused) return;
         
         if (AR == true && Input.GetKey(KeyCode.Mouse0) && Time.time >= nextShotTime)
->>>>>>> 85ece045864c59c50ed55097c35e2c15b9051a0f
->>>>>>> 392d23632b62942df19732b9e125c98967abd9e4
         {
             Shot(spawnPointAR);
             nextShotTime = Time.time + fireRate;