Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
commit
abec9fb5ad
|
@ -3850,7 +3850,7 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u65E0\u53EF\u9009\u62E9\u795E\u5C06\uFF01"
|
||||
m_Text: "\u65E0\u53EF\u9009\u62E9\u82F1\u96C4\uFF01"
|
||||
--- !u!1 &6136696477422603182
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -231,7 +231,7 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择
|
|||
end)
|
||||
Util.AddOnceClick(cardBtn, function()
|
||||
if TrainBuildManager.CheckHeroIsTraining(heroData.dynamicId) then
|
||||
PopupTipPanel.ShowTip("该神将正在特训")
|
||||
PopupTipPanel.ShowTip("该英雄正在特训")
|
||||
return
|
||||
end
|
||||
local isSelect = false
|
||||
|
|
Loading…
Reference in New Issue