From 2e7ddb5fb478b07c6f1b145753eadf69a1edf490 Mon Sep 17 00:00:00 2001 From: "DESKTOP-VVOCIJO\\PC" Date: Mon, 1 Jun 2026 15:04:14 +0900 Subject: [PATCH] =?UTF-8?q?2026-06-01=20=EB=8D=B0=EB=93=9C=EC=A1=B4=20?= =?UTF-8?q?=EB=A7=8C=EB=93=A4=EA=B8=B0=20=EC=A7=84=ED=96=89=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/01_Scenes/GameScene.unity | 4 ++-- Assets/01_Scenes/StartScene.unity | 4 ++-- Assets/02_Scripts/Managers/GameManager.cs | 8 ++++++++ Assets/02_Scripts/Player/PlayerController.cs | 11 +++++++++++ Assets/02_Scripts/UI/RestartUI.cs | 18 ++++++++++++++++++ Assets/02_Scripts/UI/RestartUI.cs.meta | 2 ++ Assets/02_Scripts/Zone.meta | 8 ++++++++ Assets/02_Scripts/Zone/DeadZone.cs | 14 ++++++++++++++ Assets/02_Scripts/Zone/DeadZone.cs.meta | 2 ++ .../LiberationSans SDF - Fallback.asset | 4 ++-- ProjectSettings/ProjectSettings.asset | 2 +- 11 files changed, 70 insertions(+), 7 deletions(-) create mode 100644 Assets/02_Scripts/UI/RestartUI.cs create mode 100644 Assets/02_Scripts/UI/RestartUI.cs.meta create mode 100644 Assets/02_Scripts/Zone.meta create mode 100644 Assets/02_Scripts/Zone/DeadZone.cs create mode 100644 Assets/02_Scripts/Zone/DeadZone.cs.meta diff --git a/Assets/01_Scenes/GameScene.unity b/Assets/01_Scenes/GameScene.unity index 26abaca..33d03c5 100644 --- a/Assets/01_Scenes/GameScene.unity +++ b/Assets/01_Scenes/GameScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6bf26388866bb2c7faf0570443c5fc5121e63bac9b80a9a838f6397e71a08fa1 -size 168830 +oid sha256:4936fa60de559c7c0bec4dc9602ff8e5525c773c8cd27af575fe8c6c6188455f +size 182976 diff --git a/Assets/01_Scenes/StartScene.unity b/Assets/01_Scenes/StartScene.unity index ae4d75f..4cf7aea 100644 --- a/Assets/01_Scenes/StartScene.unity +++ b/Assets/01_Scenes/StartScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f46d50e1afd61a9ce131b0b6edde597187ddc1175512f8b0ed330830bb79fa3 -size 64259 +oid sha256:c6458ae7b67f619741ded5457e5ddfc7134cf35f8530d7d68b1e8437eaa036ba +size 64261 diff --git a/Assets/02_Scripts/Managers/GameManager.cs b/Assets/02_Scripts/Managers/GameManager.cs index 79830a6..5812abc 100644 --- a/Assets/02_Scripts/Managers/GameManager.cs +++ b/Assets/02_Scripts/Managers/GameManager.cs @@ -10,6 +10,8 @@ public class GameManager : MonoBehaviour,ISceneInitializable public WaveManager WaveM {get; private set;} + public RestartUI Restart {get; private set;} + private void Awake() { @@ -28,5 +30,11 @@ public void OnSceneLoaded() SkillSupporter = Object.FindFirstObjectByType(); LocalPlayer = Object.FindFirstObjectByType(); WaveM = Object.FindFirstObjectByType(); + Restart = Object.FindFirstObjectByType(); + } + + public void GameRestart() + { + Debug.Log("다시시작"); } } diff --git a/Assets/02_Scripts/Player/PlayerController.cs b/Assets/02_Scripts/Player/PlayerController.cs index 1bb5d1c..749fac8 100644 --- a/Assets/02_Scripts/Player/PlayerController.cs +++ b/Assets/02_Scripts/Player/PlayerController.cs @@ -1775,5 +1775,16 @@ public void TakeDamage(int amount, Vector2 hitVelocity = default, string hitReac _health.TakeDamage(amount); Debug.Log($"{name} 피격: -{amount} (HP: {_health.CurrentHealth}/{_health.MaxHealth})"); + + if(_health.CurrentHealth <= 0) + { + PlayerDead(); + } + } + + public void PlayerDead() + { + //재시작 UI 띄우기 + GameManager.Instance.Restart.ShowRestart(); } } diff --git a/Assets/02_Scripts/UI/RestartUI.cs b/Assets/02_Scripts/UI/RestartUI.cs new file mode 100644 index 0000000..61fe022 --- /dev/null +++ b/Assets/02_Scripts/UI/RestartUI.cs @@ -0,0 +1,18 @@ +using UnityEngine; +using UnityEngine.UI; + +public class RestartUI : MonoBehaviour +{ + [SerializeField] GameObject RestartRoot; + [SerializeField] Button RestartButton; + + private void Start() + { + RestartButton.onClick.AddListener(()=>GameManager.Instance.GameRestart()); + } + + public void ShowRestart() + { + RestartRoot.SetActive(true); + } +} diff --git a/Assets/02_Scripts/UI/RestartUI.cs.meta b/Assets/02_Scripts/UI/RestartUI.cs.meta new file mode 100644 index 0000000..efe8715 --- /dev/null +++ b/Assets/02_Scripts/UI/RestartUI.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 6f1fff5578632d94a8da5d5b817993ad \ No newline at end of file diff --git a/Assets/02_Scripts/Zone.meta b/Assets/02_Scripts/Zone.meta new file mode 100644 index 0000000..8cd2ef0 --- /dev/null +++ b/Assets/02_Scripts/Zone.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2d9190260bedb76469ecb2e74a484e34 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02_Scripts/Zone/DeadZone.cs b/Assets/02_Scripts/Zone/DeadZone.cs new file mode 100644 index 0000000..9f24cab --- /dev/null +++ b/Assets/02_Scripts/Zone/DeadZone.cs @@ -0,0 +1,14 @@ +using UnityEngine; + +public class DeadZone : MonoBehaviour +{ + private void OnTriggerEnter2D(Collider2D other) + { + if(other.GetComponentInParent() != null) + { + PlayerController p = other.GetComponentInParent(); + + p.TakeDamage(9999999); + } + } +} diff --git a/Assets/02_Scripts/Zone/DeadZone.cs.meta b/Assets/02_Scripts/Zone/DeadZone.cs.meta new file mode 100644 index 0000000..aafa982 --- /dev/null +++ b/Assets/02_Scripts/Zone/DeadZone.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: f04acdf6d5c2075499cc53d22714d058 \ No newline at end of file diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset index 3763740..a51f2db 100644 --- a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset +++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a73237e48a3b6c0164ad0ffd483edeb7f27dab722aaf42dada64a71c184dbdd7 -size 25217 +oid sha256:14ed992af37c34b6993928b196f13db6fc2940dd1dcb0c5cec3fb03210a98728 +size 551003 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 1db29e1..407d63c 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:24cbd8e352b8d71726305c7a7b5834d776e2799fbbd017be1bd48621f11628bb +oid sha256:fb746600aa5bc9bc99198d954d34257f502227e8b93e4eaffe298d3b4a3949f5 size 26799