From 51e4e3206cd945a6f279b83624db5a39ffbe84f6 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 3 Aug 2021 15:24:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E6=88=90=E5=B0=B1=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E3=80=91=E4=BF=AE=E5=A4=8D=E5=BF=83=E9=AD=94=E5=BF=AB?= =?UTF-8?q?=E9=80=9F=E6=88=98=E6=96=97=E7=BB=93=E7=AE=97=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E9=80=9A=E8=BF=87=E6=88=90=E5=B0=B1=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E9=A2=86=E5=8F=96=E6=88=90=E5=B0=B1=E5=A5=96=E5=8A=B1=E5=90=8E?= =?UTF-8?q?=E5=8D=A1=E6=AD=BB=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Message/MissionDailyTipPanel.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Message/MissionDailyTipPanel.lua b/Assets/ManagedResources/~Lua/Modules/Message/MissionDailyTipPanel.lua index 39c71b09f6..8d7113a5e5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Message/MissionDailyTipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Message/MissionDailyTipPanel.lua @@ -32,6 +32,9 @@ function MissionDailyTipPanel:BindEvent() PopupTipPanel.ShowTip(Language[11305]) return end + if UIManager.IsOpen(UIName.RewardItemPopup) then--掉落界面打开时,关闭掉落界面 + UIManager.ClosePanel(UIName.RewardItemPopup, false) + end --LogGreen("showType:"..showType) UIManager.OpenPanel(UIName.MissionDailyPanel,showType == 1 and 1 or 4) self:ClosePanel() From f3ec57922895cbbdb91eac41e91885ee74f244e4 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 3 Aug 2021 15:26:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E5=A6=96=E6=99=B6=E7=A4=BC?= =?UTF-8?q?=E5=8C=85=E3=80=91=E5=88=A0=E9=99=A4=E5=89=8D=E5=BE=80=E9=82=AE?= =?UTF-8?q?=E7=AE=B1=E9=A2=86=E5=8F=96=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab b/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab index ff6877a639..f11f95ba50 100644 --- a/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab @@ -4790,7 +4790,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u8D2D\u4E70\u6210\u529F\u540E \u8BF7\u524D\u5F80\u90AE\u7BB1\u9886\u53D6" + m_Text: LanguageIndex: 11742 --- !u!1 &4699461434874433981 GameObject: