From 021b0e03bed0c1e69467b050071f49b706addd99 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 12 Nov 2021 11:26:02 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AD=82=E7=81=B5=E5=AE=9D=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Popup/RewardTalismanSingleShowPopup2.lua | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua index f1d952528b..f764445d6d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua @@ -322,17 +322,16 @@ function RewardTalismanSingleShowPopup2:OnShow() ForceRebuildLayout(self.midBar.transform) ForceRebuildLayout(self.midBar.transform) ForceRebuildLayout(self.midBar.transform) + - if self.isShowGet then - self.mid:GetComponent("LayoutElement").minHeight = 850 + local maxHeight = self.isShowGet and 250 or 850 + local sizeDelta = GetPreferredHeight(self.midBar.transform) + if sizeDelta >= maxHeight then + self.mid:GetComponent("LayoutElement").minHeight = maxHeight else - local sizeDelta = GetPreferredHeight(self.midBar.transform) - if sizeDelta >= 850 then - self.mid:GetComponent("LayoutElement").minHeight = 850 - else - self.mid:GetComponent("LayoutElement").minHeight = sizeDelta - end + self.mid:GetComponent("LayoutElement").minHeight = sizeDelta end + if self.func then self.func() end