Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone

# Conflicts:
#	Assets/Scenes/Story1.unity
#	Assets/Scenes/Story1.unity.rej
#	Assets/Scripts/Bullet.cs
#	Assets/Scripts/EnemyHealth.cs
#	Assets/Scripts/Shoot.cs

Assets/Prefabs/AR.prefab

@@ -730,7 +730,7 @@ CapsuleCollider:
     serializedVersion: 2
     m_Bits: 0
   m_LayerOverridePriority: 0
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 2

Assets/Prefabs/AR.prefab.rej.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3d43fd09c613a6c46adf72ed678bfd8c
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/Story1.unity

@@ -2081,6 +2081,11 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 7448449092846401218, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3}
   m_PrefabInstance: {fileID: 79145418}
   m_PrefabAsset: {fileID: 0}
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+=======
+>>>>>>> 392d23632b62942df19732b9e125c98967abd9e4
 --- !u!1001 &3100000001
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2199,8 +2204,15 @@ MonoBehaviour:
   rescueDistance: 3
   escapeDistance: 15
   runSpeed: 5
+<<<<<<< HEAD
+<<<<<<< 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)
+=======
 =======
 >>>>>>> b8d1d2d76a248f40835a9ccf66217c6bdd631231
+>>>>>>> 392d23632b62942df19732b9e125c98967abd9e4
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0

Assets/Scenes/Story1.unity.rej

@@ -1,4 +1,16 @@
 diff a/Assets/Scenes/Story1.unity b/Assets/Scenes/Story1.unity	(rejected hunks)
+<<<<<<< HEAD
+@@ -2210,6 +2210,9 @@
+   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:
+=======
 @@ -194,62 +194,6 @@
    m_PrefabAsset: {fileID: 0}
    m_GameObject: {fileID: 26477325}
@@ -62,3 +74,4 @@ diff a/Assets/Scenes/Story1.unity b/Assets/Scenes/Story1.unity	(rejected hunks)
  --- !u!1001 &79145418
  PrefabInstance:
    m_ObjectHideFlags: 0
+>>>>>>> 392d23632b62942df19732b9e125c98967abd9e4

Assets/Scenes/Story1.unity.rej.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 053b45c74c5f27248b1fa23c2f2c241f
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Bullet.cs

@@ -22,14 +22,30 @@ 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,4 +1,7 @@
+<<<<<<< HEAD
+=======
 //Oliver
+>>>>>>> 392d23632b62942df19732b9e125c98967abd9e4
 using UnityEngine;
 
 public class EnemyHealth : MonoBehaviour

Assets/Scripts/Shoot.cs

@@ -15,23 +15,52 @@ 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
     }
 
     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;