PBA3H25ABU/ClearTheZone
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	Assets/Scenes/Story1.unity
This commit is contained in:
NBTEMP\bib
2026-08-20 11:32:10 +02:00
parent 0597756f41 b8d1d2d76a
commit 392d23632b
8 changed files with 107 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Prefabs/AR.prefab
+1 -1
View File
@@ -730,7 +730,7 @@ CapsuleCollider:
serializedVersion: 2 serializedVersion: 2
m_Bits: 0 m_Bits: 0
m_LayerOverridePriority: 0 m_LayerOverridePriority: 0
m_IsTrigger: 1 m_IsTrigger: 0
m_ProvidesContacts: 0 m_ProvidesContacts: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
Assets/Prefabs/AR.prefab.rej
+16
View File
@@ -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
+12 -11
View File
@@ -194,6 +194,8 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 26477325} m_GameObject: {fileID: 26477325}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
<<<<<<< HEAD
=======
--- !u!1 &50826110 stripped --- !u!1 &50826110 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 1804703078109025515, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3} m_CorrespondingSourceObject: {fileID: 1804703078109025515, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
@@ -252,6 +254,7 @@ MonoBehaviour:
m_EditorClassIdentifier: Assembly-CSharp::PlayerHealth m_EditorClassIdentifier: Assembly-CSharp::PlayerHealth
maxHealth: 100 maxHealth: 100
currentHealth: 100 currentHealth: 100
>>>>>>> 85ece045864c59c50ed55097c35e2c15b9051a0f
--- !u!1001 &79145418 --- !u!1001 &79145418
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -336,6 +339,10 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: PlayerRobot value: PlayerRobot
objectReference: {fileID: 0} 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} - target: {fileID: 7736108665850884707, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
propertyPath: m_LocalScale.x propertyPath: m_LocalScale.x
value: 4 value: 4
@@ -394,16 +401,7 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: 3795091336040275115, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3} - targetCorrespondingSourceObject: {fileID: 3795091336040275115, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
insertIndex: -1 insertIndex: -1
addedObject: {fileID: 1546402526} 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} m_SourcePrefab: {fileID: 100100000, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
--- !u!1 &347073536 --- !u!1 &347073536
GameObject: GameObject:
@@ -599,7 +597,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: Assembly-CSharp::HealthUI m_EditorClassIdentifier: Assembly-CSharp::HealthUI
healthText: {fileID: 1240748855} healthText: {fileID: 1240748855}
playerHealth: {fileID: 50826116} playerHealth: {fileID: 0}
--- !u!114 &535044339 --- !u!114 &535044339
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -2077,6 +2075,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2046372891} m_GameObject: {fileID: 2046372891}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
<<<<<<< HEAD
--- !u!4 &2136079773 stripped --- !u!4 &2136079773 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: 7448449092846401218, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3} m_CorrespondingSourceObject: {fileID: 7448449092846401218, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3}
@@ -2200,6 +2199,8 @@ MonoBehaviour:
rescueDistance: 3 rescueDistance: 3
escapeDistance: 15 escapeDistance: 15
runSpeed: 5 runSpeed: 5
=======
>>>>>>> b8d1d2d76a248f40835a9ccf66217c6bdd631231
--- !u!1660057539 &9223372036854775807 --- !u!1660057539 &9223372036854775807
SceneRoots: SceneRoots:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
Assets/Scenes/Story1.unity.rej
+64
View File
@@ -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
Assets/Scenes/moren opfa.unity
+1 -96
View File
@@ -119,11 +119,6 @@ NavMeshSettings:
debug: debug:
m_Flags: 0 m_Flags: 0
m_NavMeshData: {fileID: 0} m_NavMeshData: {fileID: 0}
--- !u!20 &112919646 stripped
Camera:
m_CorrespondingSourceObject: {fileID: 9017485172064717998, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
m_PrefabInstance: {fileID: 1229760994}
m_PrefabAsset: {fileID: 0}
--- !u!1 &718992221 --- !u!1 &718992221
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -237,95 +232,6 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1229760994
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1804703078109025515, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
propertyPath: m_Name
value: PlayerRobot
objectReference: {fileID: 0}
- target: {fileID: 2563429732134213952, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
propertyPath: PlayerCamera
value:
objectReference: {fileID: 112919646}
- target: {fileID: 2563429732134213952, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
propertyPath: Items.Array.size
value: 3
objectReference: {fileID: 0}
- target: {fileID: 2563429732134213952, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
propertyPath: 'Items.Array.data[0]'
value:
objectReference: {fileID: 5850548977863442861, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3}
- target: {fileID: 2563429732134213952, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
propertyPath: 'Items.Array.data[1]'
value:
objectReference: {fileID: 3150477364047279588, guid: a0abf67d2f77de14aba69a9826c206df, type: 3}
- target: {fileID: 2563429732134213952, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
propertyPath: 'Items.Array.data[2]'
value:
objectReference: {fileID: 790623186319470878, guid: 3a2f64a76def43c41bb531d50c4a0696, type: 3}
- target: {fileID: 3795091336040275115, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
propertyPath: m_LocalPosition.x
value: -0.0318
objectReference: {fileID: 0}
- target: {fileID: 3795091336040275115, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3795091336040275115, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
propertyPath: m_LocalPosition.z
value: 0.0242
objectReference: {fileID: 0}
- target: {fileID: 7736108665850884707, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
propertyPath: m_LocalPosition.x
value: 66.14095
objectReference: {fileID: 0}
- target: {fileID: 7736108665850884707, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
propertyPath: m_LocalPosition.y
value: 0.2199987
objectReference: {fileID: 0}
- target: {fileID: 7736108665850884707, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
propertyPath: m_LocalPosition.z
value: 43.59534
objectReference: {fileID: 0}
- target: {fileID: 7736108665850884707, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7736108665850884707, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7736108665850884707, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7736108665850884707, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7736108665850884707, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7736108665850884707, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7736108665850884707, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3}
--- !u!1 &1585096096 --- !u!1 &1585096096
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -412,7 +318,7 @@ Transform:
m_GameObject: {fileID: 1585096096} m_GameObject: {fileID: 1585096096}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 55.13, y: 9.57, z: 49.51} m_LocalPosition: {x: 55.13, y: 9.57, z: 247.9}
m_LocalScale: {x: 10, y: 18.479692, z: 1} m_LocalScale: {x: 10, y: 18.479692, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
@@ -702,4 +608,3 @@ SceneRoots:
- {fileID: 1734103110} - {fileID: 1734103110}
- {fileID: 718992225} - {fileID: 718992225}
- {fileID: 1585096100} - {fileID: 1585096100}
- {fileID: 1229760994}
Assets/Scripts/Bullet.cs
+1 -1
View File
@@ -27,9 +27,9 @@ public class ARBullet : MonoBehaviour
if (enemy != null) if (enemy != null)
{ {
enemy.TakeDamage(damage); enemy.TakeDamage(damage);
Destroy(gameObject);
} }
Destroy(gameObject);
} }
else if(collision.gameObject.tag == "Wall") else if(collision.gameObject.tag == "Wall")
{ {
Assets/Scripts/EnemyHealth.cs
+1
View File
@@ -1,3 +1,4 @@
//Oliver
using UnityEngine; using UnityEngine;
public class EnemyHealth : MonoBehaviour public class EnemyHealth : MonoBehaviour
Assets/Scripts/Shoot.cs
+10 -2
View File
@@ -14,15 +14,24 @@ public class Shoot : MonoBehaviour
void Start() void Start()
{ {
<<<<<<< HEAD
=======
if (weapon == null) if (weapon == null)
weapon = FindFirstObjectByType<WeaponReload>(); weapon = FindFirstObjectByType<WeaponReload>();
>>>>>>> 85ece045864c59c50ed55097c35e2c15b9051a0f
} }
void Update() void Update()
{ {
<<<<<<< HEAD
if (AR == true && Input.GetKey(KeyCode.Mouse0))
=======
if (PauseMenu.GameIsPaused) return; if (PauseMenu.GameIsPaused) return;
if (AR == true && Input.GetKey(KeyCode.Mouse0) && Time.time >= nextShotTime) if (AR == true && Input.GetKey(KeyCode.Mouse0) && Time.time >= nextShotTime)
>>>>>>> 85ece045864c59c50ed55097c35e2c15b9051a0f
{ {
Shot(spawnPointAR); Shot(spawnPointAR);
nextShotTime = Time.time + fireRate; nextShotTime = Time.time + fireRate;
@@ -37,7 +46,6 @@ public class Shoot : MonoBehaviour
if (spawnPoint == null || weapon == null || !weapon.UseAmmo()) return; if (spawnPoint == null || weapon == null || !weapon.UseAmmo()) return;
GameObject bullet = Instantiate(bulletPrefab, spawnPoint.position, spawnPoint.rotation); GameObject bullet = Instantiate(bulletPrefab, spawnPoint.position, spawnPoint.rotation);
bullet.transform.Rotate(90,0,0); bullet.transform.Rotate(90, 0, 0);
Destroy(bullet, 2);
} }
} }