Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
3c83961895
|
@ -4790,7 +4790,7 @@ MonoBehaviour:
|
||||||
m_HorizontalOverflow: 1
|
m_HorizontalOverflow: 1
|
||||||
m_VerticalOverflow: 1
|
m_VerticalOverflow: 1
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\u8D2D\u4E70\u6210\u529F\u540E \u8BF7\u524D\u5F80\u90AE\u7BB1\u9886\u53D6"
|
m_Text:
|
||||||
LanguageIndex: 11742
|
LanguageIndex: 11742
|
||||||
--- !u!1 &4699461434874433981
|
--- !u!1 &4699461434874433981
|
||||||
GameObject:
|
GameObject:
|
||||||
|
|
|
@ -32,6 +32,9 @@ function MissionDailyTipPanel:BindEvent()
|
||||||
PopupTipPanel.ShowTip(Language[11305])
|
PopupTipPanel.ShowTip(Language[11305])
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
if UIManager.IsOpen(UIName.RewardItemPopup) then--掉落界面打开时,关闭掉落界面
|
||||||
|
UIManager.ClosePanel(UIName.RewardItemPopup, false)
|
||||||
|
end
|
||||||
--LogGreen("showType:"..showType)
|
--LogGreen("showType:"..showType)
|
||||||
UIManager.OpenPanel(UIName.MissionDailyPanel,showType == 1 and 1 or 4)
|
UIManager.OpenPanel(UIName.MissionDailyPanel,showType == 1 and 1 or 4)
|
||||||
self:ClosePanel()
|
self:ClosePanel()
|
||||||
|
|
Loading…
Reference in New Issue