From 997aa4831f8961c35e88cad2ce99ce9b9af98654 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 20 Dec 2021 13:41:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=B3=E5=B0=8A=E9=99=8D=E4=B8=96=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=8B=8D=E8=84=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Adventure/AdventureManager.lua | 2 +- .../~Lua/Modules/Expert/PatFaceManager.lua | 2 +- .../ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua | 7 ++++++- .../ManagedResources/~Lua/Modules/Player/JumpManager.lua | 7 ++++++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureManager.lua b/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureManager.lua index 37c190c1f6..0345999ffc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureManager.lua @@ -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 diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua index a06d96be6f..89c1baf3f3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua @@ -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) diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua index 765d2dd0d3..6d8050fe84 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua @@ -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 diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 8018b5ee39..39a7084864 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -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])