fix1.2

Assets/Scenes/Story1.unity

@@ -2210,6 +2210,9 @@ MonoBehaviour:
   rescueDistance: 3
   escapeDistance: 15
   runSpeed: 5
+<<<<<<< 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)
 --- !u!1660057539 &9223372036854775807
 SceneRoots:

Assets/Scripts/Bullet.cs

@@ -33,6 +33,9 @@ public class Bullet : MonoBehaviour
                 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)
         }
         else if(collision.gameObject.tag == "Wall")

Assets/Scripts/Shoot.cs

@@ -11,7 +11,12 @@ public class Shoot : MonoBehaviour
     void Start()
     {
 <<<<<<< 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>();
@@ -20,6 +25,7 @@ public class Shoot : MonoBehaviour
 
     void Update()
     {
+<<<<<<< HEAD
 <<<<<<< HEAD
         
         if ( AR == true && Input.GetKey(KeyCode.Mouse0))
@@ -28,6 +34,11 @@ public class Shoot : MonoBehaviour
         
         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)
         {
             Shot(spawnPointAR);
         }