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

dev_chengFeng
jiaoyangna 2021-09-23 09:51:59 +08:00
commit 6b6c6b48db
1 changed files with 3 additions and 2 deletions

View File

@ -163,6 +163,7 @@ function RewardItemPopup:OnOpen(...)
this.qiJieCondition:SetActive(compShowType == 10)--七界试炼
this.dropGrid:SetActive(false)
this.dropGridArena:SetActive(false)
this.lvAndExpGo:SetActive(compShowType == 1)
-- 设置背景遮罩的显隐
local isHideBG = args[6]
this.btnBack:GetComponent("Image").color = Color.New(0, 0, 0, isHideBG and 0 or 0.8)
@ -183,8 +184,8 @@ function RewardItemPopup:OnOpen(...)
elseif compShowType == CompShowType.fourElement then
this.ShengYingShow(args[8])
end
--如果没有掉落就return
if not drop or (#drop.itemlist < 1 and #drop.equipId < 1 and #drop.Hero < 1 and #drop.soulEquip < 1 and #drop.pokemon < 1) then
--如果没有掉落就return
if not drop or (#drop.itemlist < 1 and #drop.equipId < 1 and #drop.Hero < 1 and #drop.soulEquip < 1 and #drop.pokemon < 1) then
return
end