Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
ZhangBiao 2021-08-03 15:29:37 +08:00
commit 3c83961895
2 changed files with 4 additions and 1 deletions

View File

@ -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:

View File

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