diff --git a/Assets/KSH/DungeonLogic.cs b/Assets/KSH/DungeonLogic.cs index 0e0d3e80..337505e8 100644 --- a/Assets/KSH/DungeonLogic.cs +++ b/Assets/KSH/DungeonLogic.cs @@ -109,7 +109,11 @@ public class DungeonLogic : MonoBehaviour _player.SetState(PlayerState.Win); // TODO: 강화 시스템으로 넘어가고 일상 맵으로 이동 - GameManager.Instance.PanelManager.GetPanel("ClearPanelBG"); + var clearPanel = GameManager.Instance.PanelManager.GetPanel("ClearPanelBG").GetComponent(); + clearPanel.Show(() => + { + //Todo: 클리어 패널 이후 진행할 행동 + }); } } @@ -128,7 +132,11 @@ public class DungeonLogic : MonoBehaviour _player.gameObject.layer = LayerMask.NameToLayer("Ignore Raycast"); _enemy.SetState(EnemyState.Idle); - GameManager.Instance.PanelManager.GetPanel("FailedPanelBG"); + var failedPanel = GameManager.Instance.PanelManager.GetPanel("FailedPanelBG").GetComponent(); + failedPanel.Show(() => + { + //Todo: 실패 패널 이후 진행할 행동 + }); StartCoroutine(DelayedSceneChange()); // 5초 대기 후 전환 } diff --git a/Assets/LYM/Scripts/ClearPanelController.cs b/Assets/LYM/Scripts/ClearPanelController.cs index 8de3197a..0dcb65f2 100644 --- a/Assets/LYM/Scripts/ClearPanelController.cs +++ b/Assets/LYM/Scripts/ClearPanelController.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using DG.Tweening; using UnityEngine; using UnityEngine.EventSystems; -using UnityEngine.PlayerLoop; using UnityEngine.UI; public class ClearPanelController : PanelController, IPointerClickHandler @@ -12,23 +11,9 @@ public class ClearPanelController : PanelController, IPointerClickHandler [SerializeField] private CanvasGroup clearPanel; [SerializeField] private Image clearPanelArmImage; [SerializeField] private Image clearTextImage; - - private Image _clearPanelBGImage; - public Action onCompleted; + [SerializeField] private Image clearPanelBGImage; - private void Awake() - { - base.Awake(); - _clearPanelBGImage = GetComponent(); - } - private void Start() - { - //임시 코드 - Show(() => - { - Debug.Log("OnCompleted"); - }); - } + public Action onCompleted; public void Show(Action onCompleted) { @@ -39,7 +24,7 @@ public class ClearPanelController : PanelController, IPointerClickHandler private void Init() { - _clearPanelBGImage.DOFade(0, 0); + clearPanelBGImage.DOFade(0, 0); clearTextImage.rectTransform.localScale = Vector3.zero; clearTextImage.DOFade(0, 0); clearPanel.DOFade(0, 0); @@ -49,7 +34,7 @@ public class ClearPanelController : PanelController, IPointerClickHandler private void ClearAnimation() { Sequence seq = DOTween.Sequence(); - seq.Append(_clearPanelBGImage.DOFade(0.98f, 0.5f)) + seq.Append(clearPanelBGImage.DOFade(0.98f, 0.5f)) .Append(clearPanel.DOFade(1, 0.5f)) .Append(clearPanelArmImage.rectTransform.DORotate(new Vector3(0, 0, 15), 0.3f)) .Append(clearPanelArmImage.rectTransform.DORotate(Vector3.zero, 0.3f)) diff --git a/Assets/LYM/Scripts/FailedPanelController.cs b/Assets/LYM/Scripts/FailedPanelController.cs index 1aa06d8f..a1c9b402 100644 --- a/Assets/LYM/Scripts/FailedPanelController.cs +++ b/Assets/LYM/Scripts/FailedPanelController.cs @@ -11,24 +11,9 @@ public class FailedPanelController : PanelController, IPointerClickHandler [SerializeField] private CanvasGroup failedPanel; [SerializeField] private Image failedPanelArmImage; [SerializeField] private Image failedTextImage; - - private Image _failedPanelBGImage; - public Action onCompleted; + [SerializeField] private Image failedPanelBGImage; - private void Awake() - { - base.Awake(); - _failedPanelBGImage = GetComponent(); - } - - private void Start() - { - //임시 코드 - Show(() => - { - Debug.Log("OnCompleted"); - }); - } + public Action onCompleted; public void Show(Action onCompleted) { @@ -39,7 +24,7 @@ public class FailedPanelController : PanelController, IPointerClickHandler private void Init() { - _failedPanelBGImage.DOFade(0, 0); + failedPanelBGImage.DOFade(0, 0); failedTextImage.DOFade(0, 0); failedTextImage.rectTransform.DOScale(0, 0); failedPanel.DOFade(0, 0); @@ -49,7 +34,7 @@ public class FailedPanelController : PanelController, IPointerClickHandler private void FailedAnimation() { Sequence seq = DOTween.Sequence(); - seq.Append(_failedPanelBGImage.DOFade(0.98f, 0.5f)) + seq.Append(failedPanelBGImage.DOFade(0.98f, 0.5f)) .Append(failedPanel.DOFade(1, 0.5f)) .Append(failedPanelArmImage.rectTransform.DORotate(new Vector3(0, 0, 15), 0.3f)) .Append(failedPanelArmImage.rectTransform.DORotate(Vector3.zero, 0.3f)) diff --git a/Assets/Resources/Prefabs/Panels/ClearPanelBG.prefab b/Assets/Resources/Prefabs/Panels/ClearPanelBG.prefab index 889b9daf..79b0f08d 100644 --- a/Assets/Resources/Prefabs/Panels/ClearPanelBG.prefab +++ b/Assets/Resources/Prefabs/Panels/ClearPanelBG.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c152074f798e97965cd62d61edc5f7362e64fcd74d1a05db54edb331695686d2 -size 11276 +oid sha256:f4982d1d015ff6b0652e4ce4585f1b9861a60c045252ad3aef0b5e6129e31bf3 +size 11327 diff --git a/Assets/Resources/Prefabs/Panels/FailedPanelBG.prefab b/Assets/Resources/Prefabs/Panels/FailedPanelBG.prefab index 7b59d102..2fec0e6b 100644 --- a/Assets/Resources/Prefabs/Panels/FailedPanelBG.prefab +++ b/Assets/Resources/Prefabs/Panels/FailedPanelBG.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e416bb4099887505fda17a2e8d5c5bd672921eefc0680b22bd4c85e6a1f0f9b1 -size 11567 +oid sha256:7f18b1056ccd86c81e11fa6ef244b8727b68e40159cd18e9d3eeec17b5dadd15 +size 11619