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

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

Assets/Scenes/Story1.unity

@@ -194,6 +194,8 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 26477325}
   m_CullTransparentMesh: 1
+<<<<<<< HEAD
+=======
 --- !u!1 &50826110 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 1804703078109025515, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
@@ -252,6 +254,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: Assembly-CSharp::PlayerHealth
   maxHealth: 100
   currentHealth: 100
+>>>>>>> 85ece045864c59c50ed55097c35e2c15b9051a0f
 --- !u!1001 &79145418
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -336,6 +339,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: PlayerRobot
       objectReference: {fileID: 0}
+    - target: {fileID: 3850558004095404047, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
+      propertyPath: bulletPrefab
+      value: 
+      objectReference: {fileID: 4474395191186681843, guid: afa71643f370d394e8dd19e0ab40ab57, type: 3}
     - target: {fileID: 7736108665850884707, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
       propertyPath: m_LocalScale.x
       value: 4
@@ -394,16 +401,7 @@ PrefabInstance:
     - targetCorrespondingSourceObject: {fileID: 3795091336040275115, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
       insertIndex: -1
       addedObject: {fileID: 1546402526}
-    m_AddedComponents:
+    m_AddedComponents: []
-    - targetCorrespondingSourceObject: {fileID: 1804703078109025515, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 50826114}
-    - targetCorrespondingSourceObject: {fileID: 1804703078109025515, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 50826113}
-    - targetCorrespondingSourceObject: {fileID: 1804703078109025515, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 50826116}
   m_SourcePrefab: {fileID: 100100000, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
 --- !u!1 &347073536
 GameObject:
@@ -599,7 +597,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: Assembly-CSharp::HealthUI
   healthText: {fileID: 1240748855}
-  playerHealth: {fileID: 50826116}
+  playerHealth: {fileID: 0}
 --- !u!114 &535044339
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2077,11 +2075,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2046372891}
   m_CullTransparentMesh: 1
---- !u!4 &2136079773 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 7448449092846401218, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3}
-  m_PrefabInstance: {fileID: 79145418}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0

Assets/Scripts/Bullet.cs

@@ -27,9 +27,9 @@ public class ARBullet : MonoBehaviour
             if (enemy != null)
             {
                 enemy.TakeDamage(damage);
-                Destroy(gameObject);
             }
 
+            Destroy(gameObject);
         }
         else if(collision.gameObject.tag == "Wall")
         {

Assets/Scripts/EnemyHealth.cs

@@ -1,3 +1,4 @@
+//Oliver
 using UnityEngine;
 
 public class EnemyHealth : MonoBehaviour

Assets/Scripts/Shoot.cs

@@ -14,15 +14,24 @@ public class Shoot : MonoBehaviour
 
     void Start()
     {
+<<<<<<< HEAD
+
+=======
         if (weapon == null)
             weapon = FindFirstObjectByType<WeaponReload>();
+>>>>>>> 85ece045864c59c50ed55097c35e2c15b9051a0f
     }
 
     void Update()
     {
+<<<<<<< HEAD
+
+        if (AR == true && Input.GetKey(KeyCode.Mouse0))
+=======
         if (PauseMenu.GameIsPaused) return;
         
         if (AR == true && Input.GetKey(KeyCode.Mouse0) && Time.time >= nextShotTime)
+>>>>>>> 85ece045864c59c50ed55097c35e2c15b9051a0f
         {
             Shot(spawnPointAR);
             nextShotTime = Time.time + fireRate;
@@ -38,6 +47,5 @@ public class Shoot : MonoBehaviour
 
         GameObject bullet = Instantiate(bulletPrefab, spawnPoint.position, spawnPoint.rotation);
         bullet.transform.Rotate(90, 0, 0);
-        Destroy(bullet, 2);
     }
 }