DEG-49 [Refactor] 클리어 성공 실패 패널 리팩토링

의미 없는 코루틴 삭제

Assets/LYM/Scripts/ClearPanelController.cs

@@ -3,19 +3,37 @@ using System.Collections;
 using System.Collections.Generic;
 using DG.Tweening;
 using UnityEngine;
+using UnityEngine.EventSystems;
 using UnityEngine.PlayerLoop;
 using UnityEngine.UI;
 
-public class ClearPanelController : MonoBehaviour
+public class ClearPanelController : PanelController, IPointerClickHandler
 {
     [SerializeField] private CanvasGroup clearPanel;
     [SerializeField] private Image clearPanelArmImage;
     [SerializeField] private Image clearTextImage;
 
     private Image _clearPanelBGImage;
+    public Action onCompleted;
+    
+    private void Awake()
+    {
+        base.Awake();
+        _clearPanelBGImage = GetComponent<Image>();
+    }
     private void Start()
     {
-        _clearPanelBGImage = GetComponent<Image>();
+        //임시 코드
+        Show(() =>
+        {
+            Debug.Log("OnCompleted");
+        });
+    }
+
+    public void Show(Action onCompleted)
+    {
+        base.Show();
+        this.onCompleted = onCompleted;
         Init();
     }
 
@@ -25,24 +43,23 @@ public class ClearPanelController : MonoBehaviour
         clearTextImage.rectTransform.localScale = Vector3.zero;
         clearTextImage.DOFade(0, 0);
         clearPanel.DOFade(0, 0);
-        StartCoroutine(ClearAnimationCoroutine());
+        ClearAnimation();
     }
     
-    private IEnumerator ClearAnimationCoroutine()
+    private void ClearAnimation()
     {
-        _clearPanelBGImage.DOFade(0.98f, 0.5f).OnComplete(() =>
+        Sequence seq = DOTween.Sequence();
-        {
+        seq.Append(_clearPanelBGImage.DOFade(0.98f, 0.5f))
-            clearPanel.DOFade(1, 0.5f).OnComplete(() =>
+            .Append(clearPanel.DOFade(1, 0.5f))
-            {
+            .Append(clearPanelArmImage.rectTransform.DORotate(new Vector3(0, 0, 15), 0.3f))
-                clearPanelArmImage.rectTransform.DORotate(new Vector3(0, 0, 15), 0.3f).OnComplete((() =>
+            .Append(clearPanelArmImage.rectTransform.DORotate(Vector3.zero, 0.3f))
-                {
+            .Join(clearTextImage.rectTransform.DOScale(1f, 0.5f).SetEase(Ease.OutBack))
-                    clearPanelArmImage.rectTransform.DORotate(Vector3.zero, 0.3f);
+            .Join(clearTextImage.DOFade(1, 0.5f));
-                }));
+    }
-                clearTextImage.rectTransform.DOScale(1f, 0.5f).SetEase(Ease.OutBack);
+
-                clearTextImage.DOFade(1, 0.5f);
+    public void OnPointerClick(PointerEventData eventData)
-            });
+    {
-        });
+        onCompleted?.Invoke();
-        
+        Hide();
-        yield return null;
     }
 }

Assets/LYM/Scripts/FailedPanelController.cs

@@ -1,45 +1,65 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 using DG.Tweening;
+using UnityEngine.EventSystems;
 
-public class FailedPanelController : MonoBehaviour
+public class FailedPanelController : PanelController, IPointerClickHandler
 {
     [SerializeField] private CanvasGroup failedPanel;
     [SerializeField] private Image failedPanelArmImage;
     [SerializeField] private Image failedTextImage;
 
     private Image _failedPanelBGImage;
-    private void Start()
+    public Action onCompleted;
+    
+    private void Awake()
     {
+        base.Awake();
         _failedPanelBGImage = GetComponent<Image>();
-        Init();
     }
 
+    private void Start()
+    {
+        //임시 코드
+        Show(() =>
+        {
+            Debug.Log("OnCompleted");
+        });
+    }
+
+    public void Show(Action onCompleted)
+    {
+        base.Show();
+        this.onCompleted = onCompleted;
+        Init();
+    }
+    
     private void Init()
     {
         _failedPanelBGImage.DOFade(0, 0);
         failedTextImage.DOFade(0, 0);
         failedTextImage.rectTransform.DOScale(0, 0);
         failedPanel.DOFade(0, 0);
-        StartCoroutine(FailedAnimationCoroutine());
+        FailedAnimation();
     }
 
-    private IEnumerator FailedAnimationCoroutine()
+    private void FailedAnimation()
     {
-        _failedPanelBGImage.DOFade(0.98f, 0.5f).OnComplete(() =>
+        Sequence seq = DOTween.Sequence();
-        {
+        seq.Append(_failedPanelBGImage.DOFade(0.98f, 0.5f))
-            failedPanel.DOFade(1, 0.5f).OnComplete(() =>
+            .Append(failedPanel.DOFade(1, 0.5f))
-            {
+            .Append(failedPanelArmImage.rectTransform.DORotate(new Vector3(0, 0, 15), 0.3f))
-                failedPanelArmImage.rectTransform.DORotate(new Vector3(0, 0, 15), 0.3f).OnComplete((() =>
+            .Append(failedPanelArmImage.rectTransform.DORotate(Vector3.zero, 0.3f))
-                {
+            .Join(failedTextImage.rectTransform.DOScale(1f, 0.5f).SetEase(Ease.OutBack))
-                    failedPanelArmImage.rectTransform.DORotate(Vector3.zero, 0.3f);
+            .Join(failedTextImage.DOFade(1, 0.5f));
-                }));
-                failedTextImage.rectTransform.DOScale(1f, 0.5f).SetEase(Ease.OutBack);
-                failedTextImage.DOFade(1, 0.5f);
-            });
-        });
-        yield return null;
     }
-}
+
+    public void OnPointerClick(PointerEventData eventData)
+    {
+        onCompleted?.Invoke();
+        Hide();
+    }
+}

Assets/LYM/Scripts/PanelController.cs

@@ -9,7 +9,7 @@ public class PanelController : MonoBehaviour
 {
     private CanvasGroup _canvasGroup;
     
-    private void Awake()
+    protected void Awake()
     {
         _canvasGroup = GetComponent<CanvasGroup>();
         if (_canvasGroup == null) return;