From 04dc4f7db60c66dcd76c8ad76b5be87cbff2fcc1 Mon Sep 17 00:00:00 2001 From: Ino Date: Thu, 11 Sep 2025 08:44:28 +0900 Subject: [PATCH] =?UTF-8?q?"=EB=AF=B8=EC=85=98=EC=9D=B4=20=EC=97=86?= =?UTF-8?q?=EC=9D=84=20=EB=95=8C=20=EC=97=BF=EB=B3=B4=EA=B8=B0=20=ED=95=A0?= =?UTF-8?q?=20=EA=B2=BD=EC=9A=B0,=20=EB=AF=B8=EC=85=98=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EB=B6=80=EB=B6=84=EC=9D=80=20=EC=95=88=EB=B3=B4?= =?UTF-8?q?=EC=9D=B4=EA=B2=8C=20UI=EB=A5=BC=20=EC=88=A8=EA=B8=B0=EA=B1=B0?= =?UTF-8?q?=EB=82=98=20""=EB=AF=B8=EC=85=98=20=EC=97=86=EC=9D=8C""=20?= =?UTF-8?q?=EC=9D=B4=EB=9D=BC=EB=8A=94=20=ED=85=8D=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EB=A7=8C=20=EC=B6=9C=EB=A0=A5=ED=95=B4=EC=95=BC=20=ED=95=A8=20?= =?UTF-8?q?(=E2=80=BBx0=20=EA=B0=99=EC=9D=80=20=EB=B0=B0=EC=88=98=EB=8F=84?= =?UTF-8?q?=20=ED=91=9C=EA=B8=B0=20=EC=95=88=ED=95=A8)=20"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Prefabs/Popups/PreviewUIPopup.prefab | 6 ++++-- Assets/Scripts/UI/Popup/Mission/MissionOpenPopup_Main.cs | 6 ++++++ Assets/Scripts/UI/Popup/Mission/MissionOpenPopup_Sub.cs | 6 ++++++ Assets/Scripts/UI/Popup/PreviewUIPopup.cs | 5 +++++ 4 files changed, 21 insertions(+), 2 deletions(-) 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()