diff --git a/Assets/Resources/Prefabs/Popups/PreviewUIPopup.prefab b/Assets/Resources/Prefabs/Popups/PreviewUIPopup.prefab index fbacdd3..b76699e 100644 --- a/Assets/Resources/Prefabs/Popups/PreviewUIPopup.prefab +++ b/Assets/Resources/Prefabs/Popups/PreviewUIPopup.prefab @@ -1551,6 +1551,8 @@ MonoBehaviour: - {fileID: 6282846932038403616} - {fileID: 8582663628830745958} - {fileID: 3518317505259489695} + m_MissionOpenPopup_Main: {fileID: 1077994391374812257} + m_MissionOpenPopup_Sub: {fileID: 4938741057591613838} --- !u!1 &3392032435278874687 GameObject: m_ObjectHideFlags: 0 @@ -3350,7 +3352,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5530246707204506897 RectTransform: m_ObjectHideFlags: 0 @@ -4258,7 +4260,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8802628057108190579 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/UI/Popup/Mission/MissionOpenPopup_Main.cs b/Assets/Scripts/UI/Popup/Mission/MissionOpenPopup_Main.cs index 46d9f9b..bd863eb 100644 --- a/Assets/Scripts/UI/Popup/Mission/MissionOpenPopup_Main.cs +++ b/Assets/Scripts/UI/Popup/Mission/MissionOpenPopup_Main.cs @@ -10,6 +10,12 @@ public class MissionOpenPopup_Main : uScrollViewMgr private void OnEnable() { + if (GamePanel.Instance.CurMission == eMainMission.Max) + { + gameObject.SetActive(false); + return; + } + t_rate.text = $"x{GamePanel.Instance.dic_missionRate[GamePanel.Instance.CurMission]}"; MissionCards = Get_ShowUICards(GamePanel.Instance.CurMission); Set_ScrollView(MissionCards); diff --git a/Assets/Scripts/UI/Popup/Mission/MissionOpenPopup_Sub.cs b/Assets/Scripts/UI/Popup/Mission/MissionOpenPopup_Sub.cs index 5aee393..8afdc84 100644 --- a/Assets/Scripts/UI/Popup/Mission/MissionOpenPopup_Sub.cs +++ b/Assets/Scripts/UI/Popup/Mission/MissionOpenPopup_Sub.cs @@ -9,6 +9,12 @@ public class MissionOpenPopup_Sub : MonoBehaviour private void OnEnable() { + if (GamePanel.Instance.CurSubMission == eSubMission.Max) + { + gameObject.SetActive(false); + return; + } + t_rate.text = $"x{GamePanel.Instance.dic_submisstionRate[GamePanel.Instance.CurSubMission]}"; t_msg.text = Get_ShowUIText(GamePanel.Instance.CurSubMission); } diff --git a/Assets/Scripts/UI/Popup/PreviewUIPopup.cs b/Assets/Scripts/UI/Popup/PreviewUIPopup.cs index 4d84ce8..c5e212f 100644 --- a/Assets/Scripts/UI/Popup/PreviewUIPopup.cs +++ b/Assets/Scripts/UI/Popup/PreviewUIPopup.cs @@ -8,6 +8,8 @@ public class PreviewUIPopup : PopupBase public TextMeshProUGUI[] texts; // 0 소지금, 1 레벨, 2 0점 X 0배, 3 고, 4 흔듦, 5 뻑 public TextMeshProUGUI[] texts_mission; // 0 메인 미션, 1 서브 미션 public TextMeshProUGUI[] texts_cardcount; // 0 광, 1 열끗, 2 띠, 3 피 + public MissionOpenPopup_Main m_MissionOpenPopup_Main; + public MissionOpenPopup_Sub m_MissionOpenPopup_Sub; public override void ShowPopup(int drawOrder) { @@ -23,6 +25,9 @@ public class PreviewUIPopup : PopupBase texts[3].text = GamePanel.Instance.AI_Go.ToString(); texts[4].text = GamePanel.Instance.AI_Bell.ToString(); texts[5].text = GamePanel.Instance.AI_Bbug.ToString(); + + m_MissionOpenPopup_Main.gameObject.SetActive(true); + m_MissionOpenPopup_Sub.gameObject.SetActive(true); } void Set_Point()