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: 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()