DEG-174 클리어 성공 실패 패널 경고 수정
This commit is contained in:
parent
a7437c8f74
commit
75a5d715eb
@ -109,7 +109,11 @@ public class DungeonLogic : MonoBehaviour
|
|||||||
_player.SetState(PlayerState.Win);
|
_player.SetState(PlayerState.Win);
|
||||||
|
|
||||||
// TODO: 강화 시스템으로 넘어가고 일상 맵으로 이동
|
// TODO: 강화 시스템으로 넘어가고 일상 맵으로 이동
|
||||||
GameManager.Instance.PanelManager.GetPanel("ClearPanelBG");
|
var clearPanel = GameManager.Instance.PanelManager.GetPanel("ClearPanelBG").GetComponent<ClearPanelController>();
|
||||||
|
clearPanel.Show(() =>
|
||||||
|
{
|
||||||
|
//Todo: 클리어 패널 이후 진행할 행동
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -128,7 +132,11 @@ 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);
|
||||||
|
|
||||||
GameManager.Instance.PanelManager.GetPanel("FailedPanelBG");
|
var failedPanel = GameManager.Instance.PanelManager.GetPanel("FailedPanelBG").GetComponent<FailedPanelController>();
|
||||||
|
failedPanel.Show(() =>
|
||||||
|
{
|
||||||
|
//Todo: 실패 패널 이후 진행할 행동
|
||||||
|
});
|
||||||
|
|
||||||
StartCoroutine(DelayedSceneChange()); // 5초 대기 후 전환
|
StartCoroutine(DelayedSceneChange()); // 5초 대기 후 전환
|
||||||
}
|
}
|
||||||
|
@ -4,7 +4,6 @@ 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
|
||||||
@ -12,23 +11,9 @@ 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;
|
|
||||||
|
|
||||||
private void Awake()
|
public Action onCompleted;
|
||||||
{
|
|
||||||
base.Awake();
|
|
||||||
_clearPanelBGImage = GetComponent<Image>();
|
|
||||||
}
|
|
||||||
private void Start()
|
|
||||||
{
|
|
||||||
//임시 코드
|
|
||||||
Show(() =>
|
|
||||||
{
|
|
||||||
Debug.Log("OnCompleted");
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Show(Action onCompleted)
|
public void Show(Action onCompleted)
|
||||||
{
|
{
|
||||||
@ -39,7 +24,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);
|
||||||
@ -49,7 +34,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))
|
||||||
|
@ -11,24 +11,9 @@ 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;
|
|
||||||
|
|
||||||
private void Awake()
|
public Action onCompleted;
|
||||||
{
|
|
||||||
base.Awake();
|
|
||||||
_failedPanelBGImage = GetComponent<Image>();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void Start()
|
|
||||||
{
|
|
||||||
//임시 코드
|
|
||||||
Show(() =>
|
|
||||||
{
|
|
||||||
Debug.Log("OnCompleted");
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Show(Action onCompleted)
|
public void Show(Action onCompleted)
|
||||||
{
|
{
|
||||||
@ -39,7 +24,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);
|
||||||
@ -49,7 +34,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))
|
||||||
|
BIN
Assets/Resources/Prefabs/Panels/ClearPanelBG.prefab
(Stored with Git LFS)
BIN
Assets/Resources/Prefabs/Panels/ClearPanelBG.prefab
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/Resources/Prefabs/Panels/FailedPanelBG.prefab
(Stored with Git LFS)
BIN
Assets/Resources/Prefabs/Panels/FailedPanelBG.prefab
(Stored with Git LFS)
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user