From 6917dc8e1c699f6189557d57bc70fbb9d94562c1 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sat, 16 Oct 2021 15:12:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=83=8C=E5=8C=85=E7=A5=9E=E5=B0=86=E7=A2=8E?= =?UTF-8?q?=E7=89=87=E5=90=88=E6=88=90=E6=9C=80=E5=A4=A7=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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]