From 1db2ec9a945fe417cf38e9f58404cc102b6ec59f Mon Sep 17 00:00:00 2001 From: "NBTEMP\\bib" Date: Thu, 20 Aug 2026 11:35:03 +0200 Subject: [PATCH] fix1 --- Assets/Prefabs/AR.prefab | 4 +- Assets/Prefabs/AR.prefab.rej.meta | 7 ++ Assets/Scenes/Story1.unity | 121 ++++++++++++++++++++++++++++ Assets/Scenes/Story1.unity.rej.meta | 7 ++ Assets/Scripts/Bullet.cs | 11 +++ Assets/Scripts/EnemyHealth.cs | 26 ++++++ Assets/Scripts/Shoot.cs | 11 +++ 7 files changed, 185 insertions(+), 2 deletions(-) create mode 100644 Assets/Prefabs/AR.prefab.rej.meta create mode 100644 Assets/Scenes/Story1.unity.rej.meta create mode 100644 Assets/Scripts/EnemyHealth.cs diff --git a/Assets/Prefabs/AR.prefab b/Assets/Prefabs/AR.prefab index 5dd5497..6ad12fd 100644 --- a/Assets/Prefabs/AR.prefab +++ b/Assets/Prefabs/AR.prefab @@ -730,11 +730,11 @@ CapsuleCollider: 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} diff --git a/Assets/Prefabs/AR.prefab.rej.meta b/Assets/Prefabs/AR.prefab.rej.meta new file mode 100644 index 0000000..3d022a3 --- /dev/null +++ b/Assets/Prefabs/AR.prefab.rej.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3d43fd09c613a6c46adf72ed678bfd8c +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Story1.unity b/Assets/Scenes/Story1.unity index c790c6b..7e80c4d 100644 --- a/Assets/Scenes/Story1.unity +++ b/Assets/Scenes/Story1.unity @@ -2090,6 +2090,127 @@ Transform: m_CorrespondingSourceObject: {fileID: 7448449092846401218, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3} m_PrefabInstance: {fileID: 79145418} m_PrefabAsset: {fileID: 0} +<<<<<<< HEAD +======= +--- !u!1001 &3100000001 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 666541161848099966, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3} + propertyPath: m_LocalPosition.x + value: 515 + objectReference: {fileID: 0} + - target: {fileID: 666541161848099966, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 666541161848099966, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3} + propertyPath: m_LocalPosition.z + value: 120 + objectReference: {fileID: 0} + - target: {fileID: 8869766472872964854, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3} + propertyPath: m_Name + value: Test Geisel 1 + objectReference: {fileID: 0} + - target: {fileID: 8869766472872964854, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3} + propertyPath: m_TagString + value: Untagged + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 180122570269065527, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3} + - {fileID: 180122570269065528, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3} + - {fileID: 180122570269065529, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3184574949717094923, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3} + insertIndex: -1 + addedObject: {fileID: 3100000003} + m_SourcePrefab: {fileID: 100100000, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3} +--- !u!1 &3100000002 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3184574949717094923, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3} + m_PrefabInstance: {fileID: 3100000001} + m_PrefabAsset: {fileID: 0} +--- !u!114 &3100000003 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3100000002} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62ea7866e4d846e2b5d207c6a3ec8afa, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::HostageRescue + rescueDistance: 3 + escapeDistance: 15 + runSpeed: 5 +--- !u!1001 &3100000011 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 666541161848099966, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3} + propertyPath: m_LocalPosition.x + value: 500 + objectReference: {fileID: 0} + - target: {fileID: 666541161848099966, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 666541161848099966, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3} + propertyPath: m_LocalPosition.z + value: 130 + objectReference: {fileID: 0} + - target: {fileID: 8869766472872964854, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3} + propertyPath: m_Name + value: Test Geisel 2 + objectReference: {fileID: 0} + - target: {fileID: 8869766472872964854, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3} + propertyPath: m_TagString + value: Untagged + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 180122570269065527, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3} + - {fileID: 180122570269065528, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3} + - {fileID: 180122570269065529, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3184574949717094923, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3} + insertIndex: -1 + addedObject: {fileID: 3100000013} + m_SourcePrefab: {fileID: 100100000, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3} +--- !u!1 &3100000012 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3184574949717094923, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3} + m_PrefabInstance: {fileID: 3100000011} + m_PrefabAsset: {fileID: 0} +--- !u!114 &3100000013 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3100000012} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62ea7866e4d846e2b5d207c6a3ec8afa, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::HostageRescue + rescueDistance: 3 + escapeDistance: 15 + runSpeed: 5 +>>>>>>> parent of 392d236 (Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone) --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Story1.unity.rej.meta b/Assets/Scenes/Story1.unity.rej.meta new file mode 100644 index 0000000..1deaa88 --- /dev/null +++ b/Assets/Scenes/Story1.unity.rej.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 053b45c74c5f27248b1fa23c2f2c241f +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Bullet.cs b/Assets/Scripts/Bullet.cs index b780eaa..039963c 100644 --- a/Assets/Scripts/Bullet.cs +++ b/Assets/Scripts/Bullet.cs @@ -22,7 +22,18 @@ public class Bullet : MonoBehaviour { if (collision.gameObject.tag == "Enemy") { +<<<<<<< HEAD Destroy(collision.gameObject); +======= + EnemyHealth enemy = collision.gameObject.GetComponent(); + + if (enemy != null) + { + enemy.TakeDamage(damage); + Destroy(gameObject); + } + +>>>>>>> parent of 392d236 (Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone) } else if(collision.gameObject.tag == "Wall") { diff --git a/Assets/Scripts/EnemyHealth.cs b/Assets/Scripts/EnemyHealth.cs new file mode 100644 index 0000000..c2167b4 --- /dev/null +++ b/Assets/Scripts/EnemyHealth.cs @@ -0,0 +1,26 @@ +using UnityEngine; + +public class EnemyHealth : MonoBehaviour +{ + public int maxHP = 100; + private int curHP; + + void Start() + { + curHP = maxHP; + } + public void TakeDamage(int damageAmount) + { + curHP -= damageAmount; + + if (curHP <= 0) + { + Die(); + } + } + + void Die() + { + Destroy(gameObject); + } +} diff --git a/Assets/Scripts/Shoot.cs b/Assets/Scripts/Shoot.cs index c7107ac..3483814 100644 --- a/Assets/Scripts/Shoot.cs +++ b/Assets/Scripts/Shoot.cs @@ -10,13 +10,24 @@ public class Shoot : MonoBehaviour [SerializeField] bool Pistole = true; void Start() { +<<<<<<< HEAD +======= + if (weapon == null) + weapon = FindFirstObjectByType(); +>>>>>>> parent of 392d236 (Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone) } void Update() { +<<<<<<< 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) { Shot(spawnPointAR); }