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 1/2] =?UTF-8?q?=E9=AD=82=E7=81=B5=E5=AE=9D=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=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 From aedad781aa23bfbd825e3c014b96d4aa1f0a1c4b Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 12 Nov 2021 11:30:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=81=B5=E5=85=BD=E5=AE=9D=E9=98=81?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=A6=82=E7=8E=87=E9=94=99=E8=AF=AF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua index 48ff16e394..1f8fef9333 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua @@ -185,7 +185,7 @@ function this:BuildRateData(actType,UpItem,upItemList) break end end - rateList = this:RefreshMonsterRate(upItemList,_upRateList) + rateList = this:RefreshMonsterRate(UpItem,_upRateList) elseif actType == ActivityTypeDef.XiangYaoDuoBao then local rewardData,showData,curScore = DynamicActivityManager.XiangYaoBuildData(activityType) for n,m in ipairs(upItemList) do