이제 밀기만 하면 될 듯
This commit is contained in:
parent
016ea0484c
commit
18ef2d16e9
File diff suppressed because it is too large
Load Diff
|
|
@ -15,15 +15,10 @@ public class ResultPopup : PopupBase
|
|||
[SerializeField] private TextMeshProUGUI GoldTMP;
|
||||
public TextMeshProUGUI t_enemygold, t_mygold;
|
||||
|
||||
[SerializeField] private TextMeshProUGUI ButtonlabelTMP;
|
||||
[SerializeField] private TextMeshProUGUI DetailTMP;
|
||||
public GameObject go_milgiad;
|
||||
[SerializeField] private TextMeshProUGUI ButtonlabelTMP; // 밀기 버튼
|
||||
|
||||
[SerializeField] private GameObject[] NormalGameObjects;
|
||||
[SerializeField] private GameObject[] ClearChallengeObjects;
|
||||
[SerializeField] private GameObject GetHeartPanel;
|
||||
[SerializeField] private GameObject ForcedMoveButtonGO;
|
||||
|
||||
[SerializeField] private TextMeshProUGUI NextGameButtonTMP;
|
||||
|
||||
private CanvasGroup canvasGroup;
|
||||
|
||||
|
|
@ -87,24 +82,13 @@ public class ResultPopup : PopupBase
|
|||
_gameResult = gameResult;
|
||||
DSUtil.InActivateGameObjects(gos_bankrupt);
|
||||
GoldTMP.enabled = true;
|
||||
DetailTMP.enabled = false;
|
||||
|
||||
list_xinfo.ForEach(f => f.mul = 0); // 초기화
|
||||
|
||||
DetailTMP.text = GamePanel.Instance.GetDetailString(_gameResult);
|
||||
|
||||
if (GamePanel.Instance.IsChallengeMode)
|
||||
{
|
||||
NextGameButtonTMP.text = "데이트 하기";
|
||||
}
|
||||
else
|
||||
{
|
||||
NextGameButtonTMP.text = "다음 레벨 도전";
|
||||
}
|
||||
go_milgiad.SetActive(false);
|
||||
|
||||
if (gameResult)
|
||||
{ // win
|
||||
ButtonlabelTMP.text = "다음판 <size=40><color=yellow>2배</color></size>";
|
||||
ButtonlabelTMP.text = "밀기 4배\n<size=35>이번 판 무효";
|
||||
|
||||
if (fixedScore <= 0)
|
||||
{
|
||||
|
|
@ -195,10 +179,6 @@ public class ResultPopup : PopupBase
|
|||
|
||||
for (int i = 0; i < NormalGameObjects.Length; i++)
|
||||
NormalGameObjects[i].SetActive(false);
|
||||
for (int i = 0; i < ClearChallengeObjects.Length; i++)
|
||||
ClearChallengeObjects[i].SetActive(true);
|
||||
|
||||
GetHeartPanel.SetActive(false);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -207,11 +187,7 @@ public class ResultPopup : PopupBase
|
|||
|
||||
for (int i = 0; i < NormalGameObjects.Length; i++)
|
||||
NormalGameObjects[i].SetActive(true);
|
||||
for (int i = 0; i < ClearChallengeObjects.Length; i++)
|
||||
ClearChallengeObjects[i].SetActive(false);
|
||||
}
|
||||
|
||||
ForcedMoveButtonGO.SetActive(false);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -224,29 +200,19 @@ public class ResultPopup : PopupBase
|
|||
DSUtil.InActivateGameObjects(gos_bankrupt, 0);
|
||||
gos_bankrupt[0].GetComponent<RectTransform>().DOScale(1f, 1f).From(3f).SetEase(Ease.InExpo);
|
||||
gos_bankrupt[0].GetComponent<Image>().DOFade(1f, 1f).From(0f).SetEase(Ease.InExpo);
|
||||
GetHeartPanel.SetActive(true);
|
||||
|
||||
for (int i = 0; i < NormalGameObjects.Length; i++)
|
||||
NormalGameObjects[i].SetActive(false);
|
||||
for (int i = 0; i < ClearChallengeObjects.Length; i++)
|
||||
ClearChallengeObjects[i].SetActive(true);
|
||||
|
||||
GameManager.DB.AddHeart(1, this.name);
|
||||
|
||||
ForcedMoveButtonGO.SetActive(true);
|
||||
}
|
||||
else
|
||||
{
|
||||
GameManager.Sound.PlaySFX(ESFXType.Win);
|
||||
DSUtil.InActivateGameObjects(gos_result, 0);
|
||||
GetHeartPanel.SetActive(false);
|
||||
|
||||
for (int i = 0; i < NormalGameObjects.Length; i++)
|
||||
NormalGameObjects[i].SetActive(true);
|
||||
for (int i = 0; i < ClearChallengeObjects.Length; i++)
|
||||
ClearChallengeObjects[i].SetActive(false);
|
||||
|
||||
ForcedMoveButtonGO.SetActive(false);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -257,11 +223,11 @@ public class ResultPopup : PopupBase
|
|||
}
|
||||
else
|
||||
{ // lose
|
||||
GetHeartPanel.SetActive(false);
|
||||
ButtonlabelTMP.text = "밀기 2배\n<size=35>이번 판 무효";
|
||||
go_milgiad.SetActive(true);
|
||||
|
||||
GameManager.Sound.PlaySFX(ESFXType.Lose);
|
||||
DSUtil.InActivateGameObjects(gos_result, 1);
|
||||
ButtonlabelTMP.text = "이번판 무효";
|
||||
/* <size=40><color=yellow><3E><>ȿ</color></size>*/
|
||||
|
||||
if (fixedScore <= 0)
|
||||
|
|
@ -348,19 +314,11 @@ public class ResultPopup : PopupBase
|
|||
|
||||
for (int i = 0; i < NormalGameObjects.Length; i++)
|
||||
NormalGameObjects[i].SetActive(false);
|
||||
for (int i = 0; i < ClearChallengeObjects.Length; i++)
|
||||
ClearChallengeObjects[i].SetActive(false);
|
||||
|
||||
ForcedMoveButtonGO.SetActive(true);
|
||||
}
|
||||
else
|
||||
{
|
||||
ForcedMoveButtonGO.SetActive(false);
|
||||
|
||||
for (int i = 0; i < NormalGameObjects.Length; i++)
|
||||
NormalGameObjects[i].SetActive(true);
|
||||
for (int i = 0; i < ClearChallengeObjects.Length; i++)
|
||||
ClearChallengeObjects[i].SetActive(false);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -376,8 +334,6 @@ public class ResultPopup : PopupBase
|
|||
public void WinWithFirstBbug(long resultGold)
|
||||
{
|
||||
GoldTMP.enabled = true;
|
||||
DetailTMP.enabled = false;
|
||||
ForcedMoveButtonGO.SetActive(false);
|
||||
GameManager.Sound.PlaySFX(ESFXType.Win);
|
||||
|
||||
DSUtil.InActivateGameObjects(gos_result, 0);
|
||||
|
|
@ -389,17 +345,12 @@ public class ResultPopup : PopupBase
|
|||
|
||||
if (GamePanel.Instance.IsChallengeMode)
|
||||
{
|
||||
GetHeartPanel.SetActive(false);
|
||||
|
||||
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Ŭ<><C5AC><EFBFBD><EFBFBD> <20>ߴٸ<DFB4>
|
||||
if (GameManager.DB.AddCurrentChallengeCondition(_resultTotalGold, true))
|
||||
{
|
||||
GameManager.Sound.PlaySFX(ESFXType.Win_2);
|
||||
|
||||
for (int i = 0; i < NormalGameObjects.Length; i++)
|
||||
NormalGameObjects[i].SetActive(false);
|
||||
for (int i = 0; i < ClearChallengeObjects.Length; i++)
|
||||
ClearChallengeObjects[i].SetActive(true);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -407,8 +358,6 @@ public class ResultPopup : PopupBase
|
|||
|
||||
for (int i = 0; i < NormalGameObjects.Length; i++)
|
||||
NormalGameObjects[i].SetActive(true);
|
||||
for (int i = 0; i < ClearChallengeObjects.Length; i++)
|
||||
ClearChallengeObjects[i].SetActive(false);
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
@ -416,22 +365,16 @@ public class ResultPopup : PopupBase
|
|||
if (GameManager.DB.AddNormalGameProgress(_resultTotalGold))
|
||||
{
|
||||
GameManager.Sound.PlaySFX(ESFXType.Win_2);
|
||||
GetHeartPanel.SetActive(true);
|
||||
|
||||
for (int i = 0; i < NormalGameObjects.Length; i++)
|
||||
NormalGameObjects[i].SetActive(false);
|
||||
for (int i = 0; i < ClearChallengeObjects.Length; i++)
|
||||
ClearChallengeObjects[i].SetActive(true);
|
||||
}
|
||||
else
|
||||
{
|
||||
GameManager.Sound.PlaySFX(ESFXType.Win);
|
||||
GetHeartPanel.SetActive(false);
|
||||
|
||||
for (int i = 0; i < NormalGameObjects.Length; i++)
|
||||
NormalGameObjects[i].SetActive(true);
|
||||
for (int i = 0; i < ClearChallengeObjects.Length; i++)
|
||||
ClearChallengeObjects[i].SetActive(false);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -631,7 +574,6 @@ public class ResultPopup : PopupBase
|
|||
public void DetailToggle()
|
||||
{
|
||||
_isDetail = !_isDetail;
|
||||
DetailTMP.enabled = _isDetail;
|
||||
|
||||
if (_isDetail)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue