Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

gaoxin 2020-11-02 23:20:07 +08:00
commit 10b2020170
1 changed files with 4 additions and 4 deletions

View File

@ -350,14 +350,14 @@ function this.SingleHeroDataShow(go,_heroData,isGray)
end
return
end
selectHeroData[heroData.dynamicId]=heroData
choosed:SetActive(true)
this.selectText.text = Language[11775]..LengthOfTable(selectHeroData).."/"..maxSelectNum
--如果选中灵兽的数量为最大
if LengthOfTable(selectHeroData)==maxSelectNum then
if LengthOfTable(selectHeroData)>=maxSelectNum then
PopupTipPanel.ShowTip(string.format(Language[12396],maxSelectNum))
return
end
choosed:SetActive(true)
selectHeroData[heroData.dynamicId]=heroData
this.selectText.text = Language[11775]..LengthOfTable(selectHeroData).."/"..maxSelectNum
if isPokemon==false then
--todo 首次点击灵兽,置灰所有碎片
this.ScrollView:SetData(heroDatas, function (index, go)