fgb_ino
/
RandomGFGoStop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

이제 밀기만 하면 될 듯

This commit is contained in:
Ino 2025-08-30 16:00:39 +09:00
parent 016ea0484c
commit 18ef2d16e9
2 changed files with 11 additions and 1991 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1932
Assets/Resources/Prefabs/Popups/ResultPopup.prefab
View File

File diff suppressed because it is too large Load Diff

70
Assets/Scripts/UI/Popup/ResultPopup.cs
View File

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