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

Assets/Prefabs/AR.prefab

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

Assets/Prefabs/AR.prefab.rej

@@ -0,0 +1,16 @@
+diff a/Assets/Prefabs/AR.prefab b/Assets/Prefabs/AR.prefab	(rejected hunks)
+@@ -730,11 +730,11 @@
+     serializedVersion: 2
+     m_Bits: 0
+   m_LayerOverridePriority: 0
+-  m_IsTrigger: 0
++  m_IsTrigger: 1
+   m_ProvidesContacts: 0
+   m_Enabled: 1
+   serializedVersion: 2
+   m_Radius: 0.5000001
+   m_Height: 2
+   m_Direction: 1
+-  m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}
+\ No newline at end of file
++  m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}

Assets/Scenes/Story1.unity.rej

@@ -0,0 +1,64 @@
+diff a/Assets/Scenes/Story1.unity b/Assets/Scenes/Story1.unity	(rejected hunks)
+@@ -194,62 +194,6 @@
+   m_PrefabAsset: {fileID: 0}
+   m_GameObject: {fileID: 26477325}
+   m_CullTransparentMesh: 1
+---- !u!1 &50826110 stripped
+-GameObject:
+-  m_CorrespondingSourceObject: {fileID: 1804703078109025515, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
+-  m_PrefabInstance: {fileID: 104961602}
+-  m_PrefabAsset: {fileID: 0}
+---- !u!114 &50826113
+-MonoBehaviour:
+-  m_ObjectHideFlags: 0
+-  m_CorrespondingSourceObject: {fileID: 0}
+-  m_PrefabInstance: {fileID: 0}
+-  m_PrefabAsset: {fileID: 0}
+-  m_GameObject: {fileID: 50826110}
+-  m_Enabled: 1
+-  m_EditorHideFlags: 0
+-  m_Script: {fileID: 11500000, guid: a10d4b5b33d924c428453e46c9513163, type: 3}
+-  m_Name: 
+-  m_EditorClassIdentifier: Assembly-CSharp::Shoot
+-  bulletPrefab: {fileID: 4474395191186681843, guid: afa71643f370d394e8dd19e0ab40ab57, type: 3}
+-  spawnPointAR: {fileID: 2136079773}
+-  spawnPointPistol: {fileID: 0}
+-  AR: 1
+-  Pistole: 1
+---- !u!114 &50826114
+-MonoBehaviour:
+-  m_ObjectHideFlags: 0
+-  m_CorrespondingSourceObject: {fileID: 0}
+-  m_PrefabInstance: {fileID: 0}
+-  m_PrefabAsset: {fileID: 0}
+-  m_GameObject: {fileID: 50826110}
+-  m_Enabled: 1
+-  m_EditorHideFlags: 0
+-  m_Script: {fileID: 11500000, guid: 57a6119ff88b0eb45940808859180edd, type: 3}
+-  m_Name: 
+-  m_EditorClassIdentifier: Assembly-CSharp::EquipmentManager
+-  AR: {fileID: 1546402525}
+-  Pistole: {fileID: 3150477364047279588, guid: a0abf67d2f77de14aba69a9826c206df, type: 3}
+-  Verband: {fileID: 0}
+-  Knife: {fileID: 790623186319470878, guid: 3a2f64a76def43c41bb531d50c4a0696, type: 3}
+-  ARisOn: 1
+-  PistoleIsOn: 1
+-  VerbandIsOn: 1
+-  KnifeIsOn: 1
+---- !u!114 &50826116
+-MonoBehaviour:
+-  m_ObjectHideFlags: 0
+-  m_CorrespondingSourceObject: {fileID: 0}
+-  m_PrefabInstance: {fileID: 0}
+-  m_PrefabAsset: {fileID: 0}
+-  m_GameObject: {fileID: 50826110}
+-  m_Enabled: 1
+-  m_EditorHideFlags: 0
+-  m_Script: {fileID: 11500000, guid: db77dcbb78925b543b84b7789c1903b9, type: 3}
+-  m_Name: 
+-  m_EditorClassIdentifier: Assembly-CSharp::PlayerHealth
+-  maxHealth: 100
+-  currentHealth: 100
+ --- !u!1001 &79145418
+ PrefabInstance:
+   m_ObjectHideFlags: 0