Compare commits

..

No commits in common. "c52d8f2c8097d9ce411ca47c0899a6d296090923" and "03a7ff4d6a41d75a9373e0db368ebfd7012c7a9a" have entirely different histories.

5 changed files with 45 additions and 22 deletions

View File

@ -109,11 +109,7 @@ public class DungeonLogic : MonoBehaviour
_player.SetState(PlayerState.Win); _player.SetState(PlayerState.Win);
// TODO: 강화 시스템으로 넘어가고 일상 맵으로 이동 // TODO: 강화 시스템으로 넘어가고 일상 맵으로 이동
var clearPanel = GameManager.Instance.PanelManager.GetPanel("ClearPanelBG").GetComponent<ClearPanelController>(); GameManager.Instance.PanelManager.GetPanel("ClearPanelBG");
clearPanel.Show(() =>
{
UpgradeManager.Instance.StartUpgrade();
});
} }
} }
@ -132,11 +128,7 @@ public class DungeonLogic : MonoBehaviour
_player.gameObject.layer = LayerMask.NameToLayer("Ignore Raycast"); _player.gameObject.layer = LayerMask.NameToLayer("Ignore Raycast");
_enemy.SetState(EnemyState.Idle); _enemy.SetState(EnemyState.Idle);
var failedPanel = GameManager.Instance.PanelManager.GetPanel("FailedPanelBG").GetComponent<FailedPanelController>(); GameManager.Instance.PanelManager.GetPanel("FailedPanelBG");
failedPanel.Show(() =>
{
//Todo: 실패 패널 이후 진행할 행동
});
StartCoroutine(DelayedSceneChange()); // 5초 대기 후 전환 StartCoroutine(DelayedSceneChange()); // 5초 대기 후 전환
} }

View File

@ -4,6 +4,7 @@ using System.Collections.Generic;
using DG.Tweening; using DG.Tweening;
using UnityEngine; using UnityEngine;
using UnityEngine.EventSystems; using UnityEngine.EventSystems;
using UnityEngine.PlayerLoop;
using UnityEngine.UI; using UnityEngine.UI;
public class ClearPanelController : PanelController, IPointerClickHandler public class ClearPanelController : PanelController, IPointerClickHandler
@ -11,10 +12,24 @@ public class ClearPanelController : PanelController, IPointerClickHandler
[SerializeField] private CanvasGroup clearPanel; [SerializeField] private CanvasGroup clearPanel;
[SerializeField] private Image clearPanelArmImage; [SerializeField] private Image clearPanelArmImage;
[SerializeField] private Image clearTextImage; [SerializeField] private Image clearTextImage;
[SerializeField] private Image clearPanelBGImage;
private Image _clearPanelBGImage;
public Action onCompleted; public Action onCompleted;
private void Awake()
{
base.Awake();
_clearPanelBGImage = GetComponent<Image>();
}
private void Start()
{
//임시 코드
Show(() =>
{
Debug.Log("OnCompleted");
});
}
public void Show(Action onCompleted) public void Show(Action onCompleted)
{ {
base.Show(); base.Show();
@ -24,7 +39,7 @@ public class ClearPanelController : PanelController, IPointerClickHandler
private void Init() private void Init()
{ {
clearPanelBGImage.DOFade(0, 0); _clearPanelBGImage.DOFade(0, 0);
clearTextImage.rectTransform.localScale = Vector3.zero; clearTextImage.rectTransform.localScale = Vector3.zero;
clearTextImage.DOFade(0, 0); clearTextImage.DOFade(0, 0);
clearPanel.DOFade(0, 0); clearPanel.DOFade(0, 0);
@ -34,7 +49,7 @@ public class ClearPanelController : PanelController, IPointerClickHandler
private void ClearAnimation() private void ClearAnimation()
{ {
Sequence seq = DOTween.Sequence(); 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(clearPanel.DOFade(1, 0.5f))
.Append(clearPanelArmImage.rectTransform.DORotate(new Vector3(0, 0, 15), 0.3f)) .Append(clearPanelArmImage.rectTransform.DORotate(new Vector3(0, 0, 15), 0.3f))
.Append(clearPanelArmImage.rectTransform.DORotate(Vector3.zero, 0.3f)) .Append(clearPanelArmImage.rectTransform.DORotate(Vector3.zero, 0.3f))
@ -46,5 +61,6 @@ public class ClearPanelController : PanelController, IPointerClickHandler
{ {
onCompleted?.Invoke(); onCompleted?.Invoke();
Hide(); Hide();
UpgradeManager.Instance.StartUpgrade();
} }
} }

View File

@ -11,10 +11,25 @@ public class FailedPanelController : PanelController, IPointerClickHandler
[SerializeField] private CanvasGroup failedPanel; [SerializeField] private CanvasGroup failedPanel;
[SerializeField] private Image failedPanelArmImage; [SerializeField] private Image failedPanelArmImage;
[SerializeField] private Image failedTextImage; [SerializeField] private Image failedTextImage;
[SerializeField] private Image failedPanelBGImage;
private Image _failedPanelBGImage;
public Action onCompleted; public Action onCompleted;
private void Awake()
{
base.Awake();
_failedPanelBGImage = GetComponent<Image>();
}
private void Start()
{
//임시 코드
Show(() =>
{
Debug.Log("OnCompleted");
});
}
public void Show(Action onCompleted) public void Show(Action onCompleted)
{ {
base.Show(); base.Show();
@ -24,7 +39,7 @@ public class FailedPanelController : PanelController, IPointerClickHandler
private void Init() private void Init()
{ {
failedPanelBGImage.DOFade(0, 0); _failedPanelBGImage.DOFade(0, 0);
failedTextImage.DOFade(0, 0); failedTextImage.DOFade(0, 0);
failedTextImage.rectTransform.DOScale(0, 0); failedTextImage.rectTransform.DOScale(0, 0);
failedPanel.DOFade(0, 0); failedPanel.DOFade(0, 0);
@ -34,7 +49,7 @@ public class FailedPanelController : PanelController, IPointerClickHandler
private void FailedAnimation() private void FailedAnimation()
{ {
Sequence seq = DOTween.Sequence(); 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(failedPanel.DOFade(1, 0.5f))
.Append(failedPanelArmImage.rectTransform.DORotate(new Vector3(0, 0, 15), 0.3f)) .Append(failedPanelArmImage.rectTransform.DORotate(new Vector3(0, 0, 15), 0.3f))
.Append(failedPanelArmImage.rectTransform.DORotate(Vector3.zero, 0.3f)) .Append(failedPanelArmImage.rectTransform.DORotate(Vector3.zero, 0.3f))

Binary file not shown.

Binary file not shown.