From eb81667c2922a12bcd0b1ed3264b0fa7a95c2a18 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 27 Apr 2021 15:28:18 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=A2=8E=E7=89=87=E5=90=88=E6=88=90?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua index ab10a21674..e9d62426b2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua @@ -299,7 +299,10 @@ function this.OnShowLayout3Data() local maxCompoundValue = math.floor(itemData.num/itemData.itemConfig.UsePerCount) compoundMaxNum=maxCompoundValue > gameSetting.HeroCompoundLimit and gameSetting.HeroCompoundLimit or maxCompoundValue endHeroNum=gameSetting.HeroNumlimit-LengthOfTable(HeroManager.GetAllHeroDatas()) - compoundMaxNum= 50 > endHeroNum and endHeroNum or 50 + compoundMaxNum=compoundMaxNum >endHeroNum and endHeroNum or compoundMaxNum + if compoundMaxNum > 50 then + compoundMaxNum = 50 + end elseif itemData.itemConfig.ItemType==ItemType.Box then--宝箱 this.nameText.text=Language[10194] this.btnCompoundText.text=Language[10195]