From c08a1d6656a4d0ac40a5d5fc11d050b45e91aefd Mon Sep 17 00:00:00 2001 From: Lim0_C Date: Fri, 25 Apr 2025 17:54:31 +0900 Subject: [PATCH] =?UTF-8?q?DEG-85=20[Feat]=20=ED=8C=9D=EC=97=85=ED=8C=A8?= =?UTF-8?q?=EB=84=90=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/LYM/Scenes/MainUI.unity | 4 +- Assets/LYM/Scripts/PanelController.cs | 30 ++++++++++++ Assets/LYM/Scripts/PanelController.cs.meta | 11 +++++ Assets/LYM/Scripts/PopupPanelController.cs | 47 +++++++++++++++++++ .../LYM/Scripts/PopupPanelController.cs.meta | 11 +++++ .../LYM/Sprites/{mainBGG.png => mainBG.png} | 0 .../{mainBGG.png.meta => mainBG.png.meta} | 0 Assets/LYM/UIPrefabs/MainUIPanel.prefab | 3 ++ Assets/LYM/UIPrefabs/MainUIPanel.prefab.meta | 7 +++ Assets/LYM/UIPrefabs/PopupPanel.prefab | 3 ++ Assets/LYM/UIPrefabs/PopupPanel.prefab.meta | 7 +++ 11 files changed, 121 insertions(+), 2 deletions(-) create mode 100644 Assets/LYM/Scripts/PanelController.cs create mode 100644 Assets/LYM/Scripts/PanelController.cs.meta create mode 100644 Assets/LYM/Scripts/PopupPanelController.cs create mode 100644 Assets/LYM/Scripts/PopupPanelController.cs.meta rename Assets/LYM/Sprites/{mainBGG.png => mainBG.png} (100%) rename Assets/LYM/Sprites/{mainBGG.png.meta => mainBG.png.meta} (100%) create mode 100644 Assets/LYM/UIPrefabs/MainUIPanel.prefab create mode 100644 Assets/LYM/UIPrefabs/MainUIPanel.prefab.meta create mode 100644 Assets/LYM/UIPrefabs/PopupPanel.prefab create mode 100644 Assets/LYM/UIPrefabs/PopupPanel.prefab.meta diff --git a/Assets/LYM/Scenes/MainUI.unity b/Assets/LYM/Scenes/MainUI.unity index 6f13fcf6..c4243e79 100644 --- a/Assets/LYM/Scenes/MainUI.unity +++ b/Assets/LYM/Scenes/MainUI.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d8218984e4327ce87c85e0dad3f2a2264b406306dffe699bf150a99260d3fe6b -size 157168 +oid sha256:23fcb265373f7effc85cd0962ae12997a9e71d2d917e9d6df64e386791b9ea08 +size 144436 diff --git a/Assets/LYM/Scripts/PanelController.cs b/Assets/LYM/Scripts/PanelController.cs new file mode 100644 index 00000000..2cc6cb45 --- /dev/null +++ b/Assets/LYM/Scripts/PanelController.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +[RequireComponent(typeof(CanvasGroup))] +public class PanelController : MonoBehaviour +{ + private CanvasGroup _canvasGroup; + + private void Awake() + { + _canvasGroup = GetComponent(); + if (_canvasGroup == null) return; + _canvasGroup.alpha = 0; + } + + public void Show() + { + if (_canvasGroup == null) return; + _canvasGroup.alpha = 1; + } + + public void Hide() + { + if (_canvasGroup == null) return; + _canvasGroup.alpha = 0; + } +} diff --git a/Assets/LYM/Scripts/PanelController.cs.meta b/Assets/LYM/Scripts/PanelController.cs.meta new file mode 100644 index 00000000..86e4cf78 --- /dev/null +++ b/Assets/LYM/Scripts/PanelController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 560d1480f9972024da2f147dcb690c0b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/LYM/Scripts/PopupPanelController.cs b/Assets/LYM/Scripts/PopupPanelController.cs new file mode 100644 index 00000000..089763f1 --- /dev/null +++ b/Assets/LYM/Scripts/PopupPanelController.cs @@ -0,0 +1,47 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class PopupPanelController : PanelController +{ + [SerializeField] private GameObject confirmButton; + [SerializeField] private GameObject contradictButton; + + public delegate void OnConfirmDelegate(); + private OnConfirmDelegate _onConfirmDelegate; + public delegate void OnContradictDelegate(); + private OnContradictDelegate _onContradictDelegate; + private void Start() + { + Show(false, "", () => {}); + } + + public void Show(bool isNeed2Contradict, string message, OnConfirmDelegate onConfirm) + { + confirmButton.SetActive(isNeed2Contradict); + _onConfirmDelegate = onConfirm; + base.Show(); + } + + public void Show(bool isNeed2Contradict, string message, OnConfirmDelegate onConfirm, OnContradictDelegate onContradict) + { + confirmButton.SetActive(isNeed2Contradict); + _onConfirmDelegate = onConfirm; + _onContradictDelegate = onContradict; + base.Show(); + } + + public void OnClickConfirm() + { + _onConfirmDelegate?.Invoke(); + base.Hide(); + } + + public void OnClickContradict() + { + _onContradictDelegate?.Invoke(); + base.Hide(); + } +} \ No newline at end of file diff --git a/Assets/LYM/Scripts/PopupPanelController.cs.meta b/Assets/LYM/Scripts/PopupPanelController.cs.meta new file mode 100644 index 00000000..e33c25ec --- /dev/null +++ b/Assets/LYM/Scripts/PopupPanelController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 91387cf2e2f0f8e48af58f5ebd0a58be +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/LYM/Sprites/mainBGG.png b/Assets/LYM/Sprites/mainBG.png similarity index 100% rename from Assets/LYM/Sprites/mainBGG.png rename to Assets/LYM/Sprites/mainBG.png diff --git a/Assets/LYM/Sprites/mainBGG.png.meta b/Assets/LYM/Sprites/mainBG.png.meta similarity index 100% rename from Assets/LYM/Sprites/mainBGG.png.meta rename to Assets/LYM/Sprites/mainBG.png.meta diff --git a/Assets/LYM/UIPrefabs/MainUIPanel.prefab b/Assets/LYM/UIPrefabs/MainUIPanel.prefab new file mode 100644 index 00000000..eb46e257 --- /dev/null +++ b/Assets/LYM/UIPrefabs/MainUIPanel.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d951d2756a976bfa7d109f17af909e819878aa660d08693d7c17f1487cc97d1 +size 22787 diff --git a/Assets/LYM/UIPrefabs/MainUIPanel.prefab.meta b/Assets/LYM/UIPrefabs/MainUIPanel.prefab.meta new file mode 100644 index 00000000..89727c37 --- /dev/null +++ b/Assets/LYM/UIPrefabs/MainUIPanel.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: af302cb7f34774949ac2f82724408b56 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/LYM/UIPrefabs/PopupPanel.prefab b/Assets/LYM/UIPrefabs/PopupPanel.prefab new file mode 100644 index 00000000..7d12a91b --- /dev/null +++ b/Assets/LYM/UIPrefabs/PopupPanel.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a7c303f7b26626ff10a444da5807c0b78c8f067179c3bf164f7e6cf61f14e61 +size 27163 diff --git a/Assets/LYM/UIPrefabs/PopupPanel.prefab.meta b/Assets/LYM/UIPrefabs/PopupPanel.prefab.meta new file mode 100644 index 00000000..9a75e746 --- /dev/null +++ b/Assets/LYM/UIPrefabs/PopupPanel.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7a9a730163181d242b2cac0393580c66 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: