From cca8e87739a3aa1b7720c35eea0a2b41decac2d2 Mon Sep 17 00:00:00 2001 From: "NBTEMP\\bib" Date: Thu, 20 Aug 2026 09:52:06 +0200 Subject: [PATCH 1/7] Bullet und health script --- Assets/Scripts/Bullet.cs | 17 ++++++++++++----- Assets/Scripts/EnemyHealth.cs | 26 ++++++++++++++++++++++++++ Assets/Scripts/EnemyHealth.cs.meta | 2 ++ 3 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 Assets/Scripts/EnemyHealth.cs create mode 100644 Assets/Scripts/EnemyHealth.cs.meta diff --git a/Assets/Scripts/Bullet.cs b/Assets/Scripts/Bullet.cs index b780eaa..07bd725 100644 --- a/Assets/Scripts/Bullet.cs +++ b/Assets/Scripts/Bullet.cs @@ -1,32 +1,39 @@ //Oliver using UnityEngine; -public class Bullet : MonoBehaviour +public class ARBullet : MonoBehaviour { public float speed; - public int damage; + public int damage = 20; private Vector3 position = Vector3.forward; private Rigidbody rb; void Start() { GetComponent(); - } // Update is called once per frame void Update() { transform.Translate(position.normalized * speed * Time.deltaTime); + } private void OnCollisionEnter(Collision collision) { if (collision.gameObject.tag == "Enemy") { - Destroy(collision.gameObject); + EnemyHealth enemy = collision.gameObject.GetComponent(); + + if (enemy != null) + { + enemy.TakeDamage(damage); + } + + Destroy(gameObject); } else if(collision.gameObject.tag == "Wall") { - Destroy(this); + Destroy(gameObject); } } 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/EnemyHealth.cs.meta b/Assets/Scripts/EnemyHealth.cs.meta new file mode 100644 index 0000000..8f28e29 --- /dev/null +++ b/Assets/Scripts/EnemyHealth.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: e2665e725aa6c7642bb84ea1a671970a \ No newline at end of file From 8cd4da3aadcb696b83ffc628acc4c85d7b882d74 Mon Sep 17 00:00:00 2001 From: "NBTEMP\\bib" Date: Thu, 20 Aug 2026 10:42:41 +0200 Subject: [PATCH 2/7] Tag und Player prefab bearbeitet --- Assets/Prefabs/AR.prefab | 4 +- Assets/Prefabs/Bullet.prefab | 4 +- Assets/Prefabs/Enemy.prefab | 4 ++ Assets/Prefabs/PlayerRobot.prefab | 102 ++++++++++++++++++++++++++++-- Assets/Prefabs/Wand_Cube.prefab | 4 +- Assets/Scenes/Story1.unity | 4 ++ Assets/Scripts/Bullet.cs | 2 +- ProjectSettings/TagManager.asset | 1 + 8 files changed, 114 insertions(+), 11 deletions(-) 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/Bullet.prefab b/Assets/Prefabs/Bullet.prefab index 027f084..4df70cc 100644 --- a/Assets/Prefabs/Bullet.prefab +++ b/Assets/Prefabs/Bullet.prefab @@ -108,8 +108,8 @@ CapsuleCollider: serializedVersion: 2 m_Bits: 0 m_LayerOverridePriority: 0 - m_IsTrigger: 1 - m_ProvidesContacts: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 1 m_Enabled: 1 serializedVersion: 2 m_Radius: 0.50000006 diff --git a/Assets/Prefabs/Enemy.prefab b/Assets/Prefabs/Enemy.prefab index f30545d..c60080e 100644 --- a/Assets/Prefabs/Enemy.prefab +++ b/Assets/Prefabs/Enemy.prefab @@ -12,6 +12,10 @@ PrefabInstance: propertyPath: m_Name value: Enemy objectReference: {fileID: 0} + - target: {fileID: 1804703078109025515, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3} + propertyPath: m_TagString + value: Enemy + objectReference: {fileID: 0} - target: {fileID: 5751720733265742199, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3} propertyPath: m_LocalScale.z value: 1.0405 diff --git a/Assets/Prefabs/PlayerRobot.prefab b/Assets/Prefabs/PlayerRobot.prefab index 115b199..bb12c85 100644 --- a/Assets/Prefabs/PlayerRobot.prefab +++ b/Assets/Prefabs/PlayerRobot.prefab @@ -518,6 +518,12 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7736108665850884707} + - component: {fileID: -8680097485463909193} + - component: {fileID: 3850558004095404047} + - component: {fileID: 8277517180475632604} + - component: {fileID: -20445031427847984} + - component: {fileID: -4384355860610073638} + - component: {fileID: 6550645820472610807} m_Layer: 0 m_Name: PlayerRobot m_TagString: Player @@ -542,6 +548,98 @@ Transform: - {fileID: 5321993126539030583} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-8680097485463909193 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1804703078109025515} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a187176846a552d4e8321e8645b42c94, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Health + maxHP: 100 + curHP: 100 +--- !u!114 &3850558004095404047 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1804703078109025515} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a10d4b5b33d924c428453e46c9513163, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Shoot + bulletPrefab: {fileID: 0} + spawnPointAR: {fileID: 0} + spawnPointPistol: {fileID: 0} + AR: 1 + Pistole: 1 +--- !u!114 &8277517180475632604 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1804703078109025515} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 57a6119ff88b0eb45940808859180edd, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::EquipmentManager + AR: {fileID: 5850548977863442861, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3} + Pistole: {fileID: 3150477364047279588, guid: a0abf67d2f77de14aba69a9826c206df, type: 3} + Verband: {fileID: 0} + Knife: {fileID: 790623186319470878, guid: 3a2f64a76def43c41bb531d50c4a0696, type: 3} + ARisOn: 1 + PistoleIsOn: 0 + VerbandIsOn: 0 + KnifeIsOn: 0 +--- !u!114 &-20445031427847984 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1804703078109025515} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 33345f0f372370e4d903e361cc6ec87c, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::PausenManager + pauseMenuUI: {fileID: 0} +--- !u!114 &-4384355860610073638 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1804703078109025515} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e857b6f5c4484c449d9e726f2fc5d36, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::PlayerController + speed: 20 +--- !u!114 &6550645820472610807 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1804703078109025515} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0a3d6d3eb3a1b7845801a59185c759a3, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::WeaponReload + maxAmmo: 30 + currentAmmo: 0 + reloadTime: 1.5 --- !u!1 &1833995220940253086 GameObject: m_ObjectHideFlags: 0 @@ -1848,10 +1946,6 @@ MonoBehaviour: BottomClamp: -30 CameraAngleOverride: 0 LockCameraPosition: 0 - Items: - - {fileID: 5850548977863442861, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3} - - {fileID: 3150477364047279588, guid: a0abf67d2f77de14aba69a9826c206df, type: 3} - - {fileID: 790623186319470878, guid: 3a2f64a76def43c41bb531d50c4a0696, type: 3} --- !u!114 &1764945173950795790 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Wand_Cube.prefab b/Assets/Prefabs/Wand_Cube.prefab index b633c8a..b751501 100644 --- a/Assets/Prefabs/Wand_Cube.prefab +++ b/Assets/Prefabs/Wand_Cube.prefab @@ -110,5 +110,5 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} + m_Size: {x: 1.1021358, y: 1.0146888, z: 1.0440335} + m_Center: {x: -0.020207252, y: 0.007344739, z: -0.00059641735} diff --git a/Assets/Scenes/Story1.unity b/Assets/Scenes/Story1.unity index c790c6b..3e4bfc2 100644 --- a/Assets/Scenes/Story1.unity +++ b/Assets/Scenes/Story1.unity @@ -807,6 +807,10 @@ PrefabInstance: propertyPath: m_Name value: Enemy objectReference: {fileID: 0} + - target: {fileID: 8869766472872964854, guid: c7fd2b64609ae0a4ba9c9021ccf720b7, type: 3} + propertyPath: m_TagString + value: Enemy + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Scripts/Bullet.cs b/Assets/Scripts/Bullet.cs index 07bd725..2b50131 100644 --- a/Assets/Scripts/Bullet.cs +++ b/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") { diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index b8a86c3..3549a2c 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -6,6 +6,7 @@ TagManager: tags: - CinemachineTarget - Wall + - Enemy layers: - Default - TransparentFX From 4a23cacf12277ec01fbf2c25efc5b06309b3eecd Mon Sep 17 00:00:00 2001 From: "NBTEMP\\bib" Date: Thu, 20 Aug 2026 10:43:24 +0200 Subject: [PATCH 3/7] waffen realoden reapriert --- Assets/Scenes/Menue.unity | 20 +++++------ Assets/Scenes/Story1.unity | 54 ++++++++++++------------------ Assets/Scripts/Door_Rotate.cs | 2 ++ Assets/Scripts/EquipmentManager.cs | 2 ++ Assets/Scripts/PauseMenu.cs | 25 +++++++++++--- Assets/Scripts/PlayerController.cs | 6 ++++ Assets/Scripts/Shoot.cs | 13 +++++-- Assets/Scripts/WeaponReload.cs | 31 +++++++---------- 8 files changed, 84 insertions(+), 69 deletions(-) diff --git a/Assets/Scenes/Menue.unity b/Assets/Scenes/Menue.unity index ed0fbec..e8bfd47 100644 --- a/Assets/Scenes/Menue.unity +++ b/Assets/Scenes/Menue.unity @@ -1206,16 +1206,16 @@ MonoBehaviour: m_MoveRepeatRate: 0.1 m_XRTrackingOrigin: {fileID: 0} m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_PointAction: {fileID: 1054132383583890850, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MoveAction: {fileID: 3710738434707379630, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_SubmitAction: {fileID: 2064916234097673511, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_CancelAction: {fileID: -1967631576421560919, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_LeftClickAction: {fileID: 8056856818456041789, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MiddleClickAction: {fileID: 3279352641294131588, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_RightClickAction: {fileID: 3837173908680883260, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_ScrollWheelAction: {fileID: 4502412055082496612, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDevicePositionAction: {fileID: 4754684134866288074, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDeviceOrientationAction: {fileID: 1025543830046995696, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} m_DeselectOnBackgroundClick: 1 m_PointerBehavior: 0 m_CursorLockBehavior: 0 diff --git a/Assets/Scenes/Story1.unity b/Assets/Scenes/Story1.unity index c790c6b..b3eec6d 100644 --- a/Assets/Scenes/Story1.unity +++ b/Assets/Scenes/Story1.unity @@ -170,7 +170,7 @@ MonoBehaviour: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.392} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -214,6 +214,8 @@ MonoBehaviour: bulletPrefab: {fileID: 4474395191186681843, guid: afa71643f370d394e8dd19e0ab40ab57, type: 3} spawnPointAR: {fileID: 2136079773} spawnPointPistol: {fileID: 0} + weapon: {fileID: 1546402530} + fireRate: 0.15 AR: 1 Pistole: 1 --- !u!114 &50826114 @@ -486,10 +488,10 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1985753437} - m_TargetAssemblyTypeName: PausenManager, Assembly-CSharp - m_MethodName: lobby - m_Mode: 5 + - m_Target: {fileID: 535044339} + m_TargetAssemblyTypeName: PauseMenu, Assembly-CSharp + m_MethodName: ResumeGame + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -847,16 +849,16 @@ MonoBehaviour: m_MoveRepeatRate: 0.1 m_XRTrackingOrigin: {fileID: 0} m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_PointAction: {fileID: 1054132383583890850, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MoveAction: {fileID: 3710738434707379630, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_SubmitAction: {fileID: 2064916234097673511, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_CancelAction: {fileID: -1967631576421560919, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_LeftClickAction: {fileID: 8056856818456041789, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MiddleClickAction: {fileID: 3279352641294131588, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_RightClickAction: {fileID: 3837173908680883260, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_ScrollWheelAction: {fileID: 4502412055082496612, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDevicePositionAction: {fileID: 4754684134866288074, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDeviceOrientationAction: {fileID: 1025543830046995696, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} m_DeselectOnBackgroundClick: 1 m_PointerBehavior: 0 m_CursorLockBehavior: 0 @@ -974,9 +976,9 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1985753437} - m_TargetAssemblyTypeName: PausenManager, Assembly-CSharp - m_MethodName: Quit + - m_Target: {fileID: 535044339} + m_TargetAssemblyTypeName: PauseMenu, Assembly-CSharp + m_MethodName: QuitGame m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -1573,7 +1575,7 @@ RectTransform: m_GameObject: {fileID: 1597635426} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1783601023} @@ -1850,7 +1852,6 @@ GameObject: - component: {fileID: 1985753435} - component: {fileID: 1985753434} - component: {fileID: 1985753433} - - component: {fileID: 1985753437} m_Layer: 5 m_Name: "pausenmen\xFC" m_TagString: Untagged @@ -1944,19 +1945,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!114 &1985753437 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1985753432} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 33345f0f372370e4d903e361cc6ec87c, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::PausenManager - pauseMenuUI: {fileID: 0} --- !u!1 &2041741097 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Door_Rotate.cs b/Assets/Scripts/Door_Rotate.cs index 6ae7d62..9221a94 100644 --- a/Assets/Scripts/Door_Rotate.cs +++ b/Assets/Scripts/Door_Rotate.cs @@ -26,6 +26,8 @@ public class Door_Rotate : MonoBehaviour void Update() { + if (PauseMenu.GameIsPaused) return; + if (Input.GetKeyDown(KeyCode.E) && IsPlayerLooking()) { ToggleDoor(); diff --git a/Assets/Scripts/EquipmentManager.cs b/Assets/Scripts/EquipmentManager.cs index 5e3ddcb..e2dc8a7 100644 --- a/Assets/Scripts/EquipmentManager.cs +++ b/Assets/Scripts/EquipmentManager.cs @@ -19,6 +19,8 @@ public class EquipmentManager : MonoBehaviour // Update is called once per frame void Update() { + if (PauseMenu.GameIsPaused) return; + if(Input.GetKeyDown(KeyCode.Alpha2) && PistoleIsOn == false) { AR.SetActive(false); diff --git a/Assets/Scripts/PauseMenu.cs b/Assets/Scripts/PauseMenu.cs index 55757e9..0d966f2 100644 --- a/Assets/Scripts/PauseMenu.cs +++ b/Assets/Scripts/PauseMenu.cs @@ -6,14 +6,19 @@ public class PauseMenu : MonoBehaviour public GameObject pauseMenuUI; // Das Pausenmenü-Panel public GameObject hudUI; // Die Lebens- und Munitionsanzeige (HUD) - private bool isPaused = false; + public static bool GameIsPaused = false; + + void Start() + { + ResumeGame(); + } void Update() { // Überprüft, ob die ESC-Taste gedrückt wurde if (Input.GetKeyDown(KeyCode.Escape)) { - if (isPaused) + if (GameIsPaused) { ResumeGame(); } @@ -29,7 +34,7 @@ public class PauseMenu : MonoBehaviour pauseMenuUI.SetActive(true); // Pausenmenü anzeigen hudUI.SetActive(false); // Lebens- & Munitionsanzeige ausblenden Time.timeScale = 0f; // Spielzeit anhalten - isPaused = true; + GameIsPaused = true; // MAUSZEIGER FREIGEBEN (damit man Knöpfe drücken kann) Cursor.lockState = CursorLockMode.None; @@ -41,10 +46,20 @@ public class PauseMenu : MonoBehaviour pauseMenuUI.SetActive(false); // Pausenmenü ausblenden hudUI.SetActive(true); // Lebens- & Munitionsanzeige wieder anzeigen Time.timeScale = 1f; // Spielzeit weiterlaufen lassen - isPaused = false; + GameIsPaused = false; // MAUSZEIGER WIEDER SPERREN (fürs Gameplay) Cursor.lockState = CursorLockMode.Locked; Cursor.visible = false; } -} \ No newline at end of file + + public void QuitGame() + { + Time.timeScale = 1f; +#if UNITY_EDITOR + UnityEditor.EditorApplication.isPlaying = false; +#else + Application.Quit(); +#endif + } +} diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index ff50609..1a602d8 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -16,6 +16,12 @@ public class PlayerController : MonoBehaviour void Update() { + if (PauseMenu.GameIsPaused) + { + position = Vector3.zero; + return; + } + position = Vector3.zero; if (Input.GetKey(KeyCode.W)) { diff --git a/Assets/Scripts/Shoot.cs b/Assets/Scripts/Shoot.cs index c7107ac..aeb04e9 100644 --- a/Assets/Scripts/Shoot.cs +++ b/Assets/Scripts/Shoot.cs @@ -6,19 +6,26 @@ public class Shoot : MonoBehaviour [SerializeField] GameObject bulletPrefab; [SerializeField] Transform spawnPointAR; [SerializeField] Transform spawnPointPistol; + [SerializeField] WeaponReload weapon; + [SerializeField] float fireRate = 0.15f; [SerializeField] bool AR = true; [SerializeField] bool Pistole = true; + private float nextShotTime; + void Start() { - + if (weapon == null) + weapon = FindFirstObjectByType(); } void Update() { + if (PauseMenu.GameIsPaused) return; - if ( AR == true && Input.GetKey(KeyCode.Mouse0)) + if (AR == true && Input.GetKey(KeyCode.Mouse0) && Time.time >= nextShotTime) { Shot(spawnPointAR); + nextShotTime = Time.time + fireRate; } else if (Pistole == true && Input.GetKeyDown(KeyCode.Mouse0)) { @@ -27,6 +34,8 @@ public class Shoot : MonoBehaviour } public void Shot(Transform spawnPoint) { + if (spawnPoint == null || weapon == null || !weapon.UseAmmo()) return; + GameObject bullet = Instantiate(bulletPrefab, spawnPoint.position, spawnPoint.rotation); bullet.transform.Rotate(90,0,0); Destroy(bullet, 2); diff --git a/Assets/Scripts/WeaponReload.cs b/Assets/Scripts/WeaponReload.cs index 0e3db16..74031d2 100644 --- a/Assets/Scripts/WeaponReload.cs +++ b/Assets/Scripts/WeaponReload.cs @@ -17,6 +17,8 @@ public class WeaponReload : MonoBehaviour void Update() { + if (PauseMenu.GameIsPaused) return; + // Während nachgeladen wird, keine Aktionen zulassen if (isReloading) return; @@ -29,30 +31,21 @@ public class WeaponReload : MonoBehaviour return; } - // 2. Automatisches Nachladen beim Schießen, wenn das Magazin leer (<= 0) ist - if (Input.GetButtonDown("Fire1")) - { - if (currentAmmo > 0) - { - Shoot(); - } - else - { - // Magazin ist leer -> automatisch nachladen! - StartCoroutine(Reload()); - } - } } - void Shoot() + public bool UseAmmo() { - // Nur schießen, wenn das Pausemenü NICHT offen ist - if (PausenManager.GameIsPaused) return; + if (PauseMenu.GameIsPaused || isReloading) return false; + + if (currentAmmo <= 0) + { + StartCoroutine(Reload()); + return false; + } currentAmmo--; Debug.Log("Schuss gefeuert! Verbleibende Munition: " + currentAmmo); - - // Hier deinen normalen Schuss-Code einfügen (Raycast, Bullet-Prefab, Ton etc.) + return true; } // Coroutine für die Nachlade-Verzögerung @@ -73,4 +66,4 @@ public class WeaponReload : MonoBehaviour isReloading = false; Debug.Log("Nachladen abgeschlossen! Munition wieder voll: " + currentAmmo); } -} \ No newline at end of file +} From 1503b5dda63812765bb2bbb1b78f8f7542fcca84 Mon Sep 17 00:00:00 2001 From: GodGodGod20081 <94980235+GodGodGod20081@users.noreply.github.com> Date: Thu, 20 Aug 2026 10:43:54 +0200 Subject: [PATCH 4/7] =?UTF-8?q?t=C3=BCr=20bewegt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/moren opfa.unity | 97 +--------------------------------- 1 file changed, 1 insertion(+), 96 deletions(-) diff --git a/Assets/Scenes/moren opfa.unity b/Assets/Scenes/moren opfa.unity index 40c0aaf..dc8e5ec 100644 --- a/Assets/Scenes/moren opfa.unity +++ b/Assets/Scenes/moren opfa.unity @@ -119,11 +119,6 @@ NavMeshSettings: debug: m_Flags: 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 GameObject: m_ObjectHideFlags: 0 @@ -237,95 +232,6 @@ Transform: m_Children: [] m_Father: {fileID: 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 GameObject: m_ObjectHideFlags: 0 @@ -412,7 +318,7 @@ Transform: m_GameObject: {fileID: 1585096096} serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: @@ -702,4 +608,3 @@ SceneRoots: - {fileID: 1734103110} - {fileID: 718992225} - {fileID: 1585096100} - - {fileID: 1229760994} From d27b860d7295ddd7a91cf1c01c586d10e224af94 Mon Sep 17 00:00:00 2001 From: "NBTEMP\\bib" Date: Thu, 20 Aug 2026 11:10:17 +0200 Subject: [PATCH 5/7] bullet --- Assets/Scenes/Story1.unity | 78 +++-------------------------------- Assets/Scripts/Bullet.cs | 2 +- Assets/Scripts/EnemyHealth.cs | 1 + Assets/Scripts/Shoot.cs | 9 ++-- 4 files changed, 12 insertions(+), 78 deletions(-) diff --git a/Assets/Scenes/Story1.unity b/Assets/Scenes/Story1.unity index 3e4bfc2..1f60ea3 100644 --- a/Assets/Scenes/Story1.unity +++ b/Assets/Scenes/Story1.unity @@ -194,62 +194,6 @@ CanvasRenderer: 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 @@ -334,6 +278,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 @@ -392,16 +340,7 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 3795091336040275115, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3} insertIndex: -1 addedObject: {fileID: 1546402526} - 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_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3} --- !u!1 &347073536 GameObject: @@ -597,7 +536,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 @@ -2089,11 +2028,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 diff --git a/Assets/Scripts/Bullet.cs b/Assets/Scripts/Bullet.cs index 2b50131..07bd725 100644 --- a/Assets/Scripts/Bullet.cs +++ b/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") { diff --git a/Assets/Scripts/EnemyHealth.cs b/Assets/Scripts/EnemyHealth.cs index c2167b4..38b4c02 100644 --- a/Assets/Scripts/EnemyHealth.cs +++ b/Assets/Scripts/EnemyHealth.cs @@ -1,3 +1,4 @@ +//Oliver using UnityEngine; public class EnemyHealth : MonoBehaviour diff --git a/Assets/Scripts/Shoot.cs b/Assets/Scripts/Shoot.cs index c7107ac..4a46777 100644 --- a/Assets/Scripts/Shoot.cs +++ b/Assets/Scripts/Shoot.cs @@ -10,13 +10,13 @@ public class Shoot : MonoBehaviour [SerializeField] bool Pistole = true; void Start() { - + } void Update() { - - if ( AR == true && Input.GetKey(KeyCode.Mouse0)) + + if (AR == true && Input.GetKey(KeyCode.Mouse0)) { Shot(spawnPointAR); } @@ -28,7 +28,6 @@ public class Shoot : MonoBehaviour public void Shot(Transform spawnPoint) { GameObject bullet = Instantiate(bulletPrefab, spawnPoint.position, spawnPoint.rotation); - bullet.transform.Rotate(90,0,0); - Destroy(bullet, 2); + bullet.transform.Rotate(90, 0, 0); } } From abe59525e2c760b8a265ffa3ec51339b5b0d7dc0 Mon Sep 17 00:00:00 2001 From: "NBTEMP\\bib" Date: Thu, 20 Aug 2026 11:15:06 +0200 Subject: [PATCH 6/7] =?UTF-8?q?gro=C3=9Fer=20fehler?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Prefabs/AR.prefab | 4 +- Assets/Prefabs/AR.prefab.rej | 16 ++++++ Assets/Scenes/Story1.unity | 25 ++++----- Assets/Scenes/Story1.unity.rej | 64 ++++++++++++++++++++++ Assets/Scenes/moren opfa.unity | 97 +--------------------------------- Assets/Scripts/Bullet.cs | 2 +- Assets/Scripts/EnemyHealth.cs | 1 + Assets/Scripts/Shoot.cs | 12 ++++- 8 files changed, 104 insertions(+), 117 deletions(-) create mode 100644 Assets/Prefabs/AR.prefab.rej create mode 100644 Assets/Scenes/Story1.unity.rej diff --git a/Assets/Prefabs/AR.prefab b/Assets/Prefabs/AR.prefab index 6ad12fd..5dd5497 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: 1 + m_IsTrigger: 0 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} + m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697} \ No newline at end of file diff --git a/Assets/Prefabs/AR.prefab.rej b/Assets/Prefabs/AR.prefab.rej new file mode 100644 index 0000000..3f17e9a --- /dev/null +++ b/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} diff --git a/Assets/Scenes/Story1.unity b/Assets/Scenes/Story1.unity index f9655e0..73d00b7 100644 --- a/Assets/Scenes/Story1.unity +++ b/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: - - 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_AddedComponents: [] 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 diff --git a/Assets/Scenes/Story1.unity.rej b/Assets/Scenes/Story1.unity.rej new file mode 100644 index 0000000..3ea594b --- /dev/null +++ b/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 diff --git a/Assets/Scenes/moren opfa.unity b/Assets/Scenes/moren opfa.unity index 40c0aaf..dc8e5ec 100644 --- a/Assets/Scenes/moren opfa.unity +++ b/Assets/Scenes/moren opfa.unity @@ -119,11 +119,6 @@ NavMeshSettings: debug: m_Flags: 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 GameObject: m_ObjectHideFlags: 0 @@ -237,95 +232,6 @@ Transform: m_Children: [] m_Father: {fileID: 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 GameObject: m_ObjectHideFlags: 0 @@ -412,7 +318,7 @@ Transform: m_GameObject: {fileID: 1585096096} serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: @@ -702,4 +608,3 @@ SceneRoots: - {fileID: 1734103110} - {fileID: 718992225} - {fileID: 1585096100} - - {fileID: 1229760994} diff --git a/Assets/Scripts/Bullet.cs b/Assets/Scripts/Bullet.cs index 2b50131..07bd725 100644 --- a/Assets/Scripts/Bullet.cs +++ b/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") { diff --git a/Assets/Scripts/EnemyHealth.cs b/Assets/Scripts/EnemyHealth.cs index c2167b4..38b4c02 100644 --- a/Assets/Scripts/EnemyHealth.cs +++ b/Assets/Scripts/EnemyHealth.cs @@ -1,3 +1,4 @@ +//Oliver using UnityEngine; public class EnemyHealth : MonoBehaviour diff --git a/Assets/Scripts/Shoot.cs b/Assets/Scripts/Shoot.cs index aeb04e9..06c5434 100644 --- a/Assets/Scripts/Shoot.cs +++ b/Assets/Scripts/Shoot.cs @@ -14,15 +14,24 @@ public class Shoot : MonoBehaviour void Start() { +<<<<<<< HEAD + +======= if (weapon == null) weapon = FindFirstObjectByType(); +>>>>>>> 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; @@ -37,7 +46,6 @@ public class Shoot : MonoBehaviour if (spawnPoint == null || weapon == null || !weapon.UseAmmo()) return; GameObject bullet = Instantiate(bulletPrefab, spawnPoint.position, spawnPoint.rotation); - bullet.transform.Rotate(90,0,0); - Destroy(bullet, 2); + bullet.transform.Rotate(90, 0, 0); } } From 0597756f41be609250428f903afe09bbdb66b9d9 Mon Sep 17 00:00:00 2001 From: "NBTEMP\\bib" Date: Thu, 20 Aug 2026 11:31:38 +0200 Subject: [PATCH 7/7] gegner berabietet --- Assets/Prefabs/Enemy.prefab | 34 ++++++++ Assets/Scenes/Story1.unity | 122 ++++++++++++++++++++++++++- Assets/Scripts/EnemyShooter.cs | 46 ++++++++++ Assets/Scripts/EnemyShooter.cs.meta | 2 + Assets/Scripts/HostageRescue.cs | 49 +++++++++++ Assets/Scripts/HostageRescue.cs.meta | 2 + 6 files changed, 254 insertions(+), 1 deletion(-) create mode 100644 Assets/Scripts/EnemyShooter.cs create mode 100644 Assets/Scripts/EnemyShooter.cs.meta create mode 100644 Assets/Scripts/HostageRescue.cs create mode 100644 Assets/Scripts/HostageRescue.cs.meta diff --git a/Assets/Prefabs/Enemy.prefab b/Assets/Prefabs/Enemy.prefab index c60080e..fa7fd2c 100644 --- a/Assets/Prefabs/Enemy.prefab +++ b/Assets/Prefabs/Enemy.prefab @@ -96,6 +96,12 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5633379113638269974, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3} insertIndex: -1 addedObject: {fileID: 180122570269065527} + - targetCorrespondingSourceObject: {fileID: 5633379113638269974, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3} + insertIndex: -1 + addedObject: {fileID: 180122570269065528} + - targetCorrespondingSourceObject: {fileID: 5633379113638269974, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3} + insertIndex: -1 + addedObject: {fileID: 180122570269065529} m_SourcePrefab: {fileID: 100100000, guid: 6ea5f5e913c0b774fbcc2503ce1f5351, type: 3} --- !u!1 &3184574949717094923 stripped GameObject: @@ -124,3 +130,31 @@ NavMeshAgent: m_BaseOffset: 0 m_WalkableMask: 4294967295 m_ObstacleAvoidanceType: 4 +--- !u!114 &180122570269065528 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3184574949717094923} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e2665e725aa6c7642bb84ea1a671970a, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::EnemyHealth + maxHP: 100 +--- !u!114 &180122570269065529 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3184574949717094923} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 29f907e38ca44e3495ce692733ada681, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::EnemyShooter + shootRange: 25 + shootDelay: 1 + damage: 10 diff --git a/Assets/Scenes/Story1.unity b/Assets/Scenes/Story1.unity index f9655e0..ad49f59 100644 --- a/Assets/Scenes/Story1.unity +++ b/Assets/Scenes/Story1.unity @@ -1579,7 +1579,7 @@ RectTransform: m_GameObject: {fileID: 1597635426} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1783601023} @@ -2082,6 +2082,124 @@ Transform: m_CorrespondingSourceObject: {fileID: 7448449092846401218, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3} m_PrefabInstance: {fileID: 79145418} m_PrefabAsset: {fileID: 0} +--- !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 --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -2095,3 +2213,5 @@ SceneRoots: - {fileID: 896204980} - {fileID: 535044337} - {fileID: 1597635430} + - {fileID: 3100000001} + - {fileID: 3100000011} diff --git a/Assets/Scripts/EnemyShooter.cs b/Assets/Scripts/EnemyShooter.cs new file mode 100644 index 0000000..50b1658 --- /dev/null +++ b/Assets/Scripts/EnemyShooter.cs @@ -0,0 +1,46 @@ +using UnityEngine; + +public class EnemyShooter : MonoBehaviour +{ + public float shootRange = 25f; + public float shootDelay = 1f; + public int damage = 10; + + private PlayerHealth player; + private float nextShotTime; + + void Start() + { + player = FindFirstObjectByType(); + } + + void Update() + { + if (PauseMenu.GameIsPaused || player == null) return; + + Vector3 direction = player.transform.position - transform.position; + if (direction.magnitude > shootRange) return; + + direction.y = 0f; + if (direction != Vector3.zero) + transform.rotation = Quaternion.LookRotation(direction); + + if (Time.time >= nextShotTime && CanSeePlayer()) + { + player.TakeDamage(damage); + nextShotTime = Time.time + shootDelay; + } + } + + bool CanSeePlayer() + { + Vector3 start = transform.position + Vector3.up; + Vector3 target = player.transform.position + Vector3.up; + Vector3 direction = target - start; + + if (Physics.Raycast(start, direction.normalized, out RaycastHit hit, shootRange)) + return hit.collider.GetComponentInParent() != null; + + return false; + } +} diff --git a/Assets/Scripts/EnemyShooter.cs.meta b/Assets/Scripts/EnemyShooter.cs.meta new file mode 100644 index 0000000..9b9b9c6 --- /dev/null +++ b/Assets/Scripts/EnemyShooter.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 29f907e38ca44e3495ce692733ada681 diff --git a/Assets/Scripts/HostageRescue.cs b/Assets/Scripts/HostageRescue.cs new file mode 100644 index 0000000..7d7e3e1 --- /dev/null +++ b/Assets/Scripts/HostageRescue.cs @@ -0,0 +1,49 @@ +using UnityEngine; + +public class HostageRescue : MonoBehaviour +{ + public float rescueDistance = 3f; + public float escapeDistance = 15f; + public float runSpeed = 5f; + + private Transform player; + private bool rescued; + private Vector3 escapeDirection; + private Vector3 startPosition; + + void Start() + { + PlayerHealth playerHealth = FindFirstObjectByType(); + if (playerHealth != null) player = playerHealth.transform; + + startPosition = transform.position; + } + + void Update() + { + if (PauseMenu.GameIsPaused || player == null) return; + + if (rescued) + { + transform.position += escapeDirection * runSpeed * Time.deltaTime; + if (Vector3.Distance(startPosition, transform.position) >= escapeDistance) + enabled = false; + return; + } + + if (Vector3.Distance(transform.position, player.position) <= rescueDistance && + Input.GetKeyDown(KeyCode.E)) + { + RunAway(); + } + } + + void RunAway() + { + rescued = true; + startPosition = transform.position; + escapeDirection = (transform.position - player.position).normalized; + escapeDirection.y = 0f; + transform.rotation = Quaternion.LookRotation(escapeDirection); + } +} diff --git a/Assets/Scripts/HostageRescue.cs.meta b/Assets/Scripts/HostageRescue.cs.meta new file mode 100644 index 0000000..822696f --- /dev/null +++ b/Assets/Scripts/HostageRescue.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 62ea7866e4d846e2b5d207c6a3ec8afa