至尊降世添加拍脸
parent
7002f1ac42
commit
997aa4831f
|
@ -235,7 +235,7 @@ function this.GetIsMaxTime()
|
|||
return
|
||||
end
|
||||
if this.stateTime >= (this.adventureOffline - 1) * 3600 then
|
||||
if not UIManager.IsOpen(UIName.SupremeHeroPopup) then
|
||||
if not UIManager.IsOpen(UIName.SupremeHeroPopup) or not UIManager.IsOpen(UIName.SupremeHeroPopupNew) then
|
||||
UIManager.OpenPanel(UIName.FightAreaRewardFullPopup)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -109,7 +109,7 @@ function this.PatFaceSpecialMonitorOpenRules(v,patFaceAllData,type,starUpGiftNum
|
|||
end
|
||||
elseif v.OpenRules[1] == 5 then
|
||||
local activityId = ActivityGiftManager.IsActivityTypeOpen(v.OpenRules[2])
|
||||
if activityId and activityId==42 then
|
||||
if activityId and (activityId==42 or activityId==4201) then
|
||||
this.PatFaceSpecialMonitor(v,patFaceAllData,type,starUpGiftNum)
|
||||
elseif activityId and activityId==v.Values then
|
||||
this.PatFaceSpecialMonitor(v,patFaceAllData,type,starUpGiftNum)
|
||||
|
|
|
@ -334,7 +334,12 @@ function PatFacePanel:OnShowOb3Data()
|
|||
end
|
||||
--第四种显示
|
||||
function PatFacePanel:OnShowOb4Data()
|
||||
UIManager.OpenPanel(UIName.SupremeHeroPopup,function() self:ClosePanel() end)
|
||||
local actId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.SupremeHero)
|
||||
if actId == 42 then
|
||||
UIManager.OpenPanel(UIName.SupremeHeroPopup,function() self:ClosePanel() end)
|
||||
else
|
||||
UIManager.OpenPanel(UIName.SupremeHeroPopupNew,function() self:ClosePanel() end)
|
||||
end
|
||||
end
|
||||
--第五种显示 五星成长礼
|
||||
local timeOb5
|
||||
|
|
|
@ -711,7 +711,12 @@ local jumpDic = {
|
|||
UIManager.OpenPanel(UIName.FirstRechargePanel)
|
||||
end,
|
||||
[JumpType.ZhiZunJiangShi] = function(data)
|
||||
UIManager.OpenPanel(UIName.SupremeHeroPopup)
|
||||
local actId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.SupremeHero)
|
||||
if actId == 42 then
|
||||
UIManager.OpenPanel(UIName.SupremeHeroPopup)
|
||||
else
|
||||
UIManager.OpenPanel(UIName.SupremeHeroPopupNew)
|
||||
end
|
||||
end,
|
||||
[JumpType.SurpriseBox] = function(data)
|
||||
local activityId = ActivityGiftManager.IsActivityTypeOpen(data[1])
|
||||
|
|
Loading…
Reference in New Issue