Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
gaoxin 2021-11-12 11:59:46 +08:00
commit 9f2507879b
2 changed files with 8 additions and 9 deletions

View File

@ -185,7 +185,7 @@ function this:BuildRateData(actType,UpItem,upItemList)
break break
end end
end end
rateList = this:RefreshMonsterRate(upItemList,_upRateList) rateList = this:RefreshMonsterRate(UpItem,_upRateList)
elseif actType == ActivityTypeDef.XiangYaoDuoBao then elseif actType == ActivityTypeDef.XiangYaoDuoBao then
local rewardData,showData,curScore = DynamicActivityManager.XiangYaoBuildData(activityType) local rewardData,showData,curScore = DynamicActivityManager.XiangYaoBuildData(activityType)
for n,m in ipairs(upItemList) do for n,m in ipairs(upItemList) do

View File

@ -322,17 +322,16 @@ function RewardTalismanSingleShowPopup2:OnShow()
ForceRebuildLayout(self.midBar.transform) ForceRebuildLayout(self.midBar.transform)
ForceRebuildLayout(self.midBar.transform) ForceRebuildLayout(self.midBar.transform)
ForceRebuildLayout(self.midBar.transform) ForceRebuildLayout(self.midBar.transform)
if self.isShowGet then local maxHeight = self.isShowGet and 250 or 850
self.mid:GetComponent("LayoutElement").minHeight = 850 local sizeDelta = GetPreferredHeight(self.midBar.transform)
if sizeDelta >= maxHeight then
self.mid:GetComponent("LayoutElement").minHeight = maxHeight
else else
local sizeDelta = GetPreferredHeight(self.midBar.transform) self.mid:GetComponent("LayoutElement").minHeight = sizeDelta
if sizeDelta >= 850 then
self.mid:GetComponent("LayoutElement").minHeight = 850
else
self.mid:GetComponent("LayoutElement").minHeight = sizeDelta
end
end end
if self.func then if self.func then
self.func() self.func()
end end