diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua index 93ee76eb63..c18a27e21b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua @@ -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]