Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
9f2507879b
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue