Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo

wangzhenxing 2024-02-24 00:09:42 +08:00
commit abec9fb5ad
2 changed files with 2 additions and 2 deletions

View File

@ -3850,7 +3850,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "\u65E0\u53EF\u9009\u62E9\u795E\u5C06\uFF01" m_Text: "\u65E0\u53EF\u9009\u62E9\u82F1\u96C4\uFF01"
--- !u!1 &6136696477422603182 --- !u!1 &6136696477422603182
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -231,7 +231,7 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择
end) end)
Util.AddOnceClick(cardBtn, function() Util.AddOnceClick(cardBtn, function()
if TrainBuildManager.CheckHeroIsTraining(heroData.dynamicId) then if TrainBuildManager.CheckHeroIsTraining(heroData.dynamicId) then
PopupTipPanel.ShowTip("神将正在特训") PopupTipPanel.ShowTip("英雄正在特训")
return return
end end
local isSelect = false local isSelect = false