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

dev_chengFeng
ZhangBiao 2021-10-16 15:38:12 +08:00
commit 617a4f640b
1 changed files with 3 additions and 3 deletions

View File

@ -143,7 +143,7 @@ function BagResolveAnCompoundPanel:BindEvent()
this.SendBackCompoundReCallBack(drop)
end)
else
PopupTipPanel.ShowTip(Language[10183])
PopupTipPanel.ShowTip(Language[10183])
end
elseif itemData.itemConfig.ItemType==ItemType.Box then--宝箱
if compoundNum>0 then
@ -308,8 +308,8 @@ function this.OnShowLayout3Data()
compoundMaxNum=maxCompoundValue > gameSetting.HeroCompoundLimit and gameSetting.HeroCompoundLimit or maxCompoundValue
endHeroNum=gameSetting.HeroNumlimit-LengthOfTable(HeroManager.GetAllHeroDatas())
compoundMaxNum=compoundMaxNum >endHeroNum and endHeroNum or compoundMaxNum
if compoundMaxNum > 50 then
compoundMaxNum = 50
if compoundMaxNum > compoundMaxNum then
compoundMaxNum = compoundMaxNum
end
elseif itemData.itemConfig.ItemType==ItemType.Box then--宝箱
this.nameText.text=Language[10194]