From ffd0685d97f0bdc469e114561f9a3130f86a01ef Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 28 Jul 2021 11:20:27 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E3=80=91=E6=9C=AA=E8=A7=A3=E9=94=81=E7=81=B5=E5=85=BD=E5=B1=B1?= =?UTF-8?q?=EF=BC=8C=E7=81=B5=E5=85=BD=E6=8B=9B=E5=8B=9F=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=89=8D=E5=BE=80=E6=8F=90=E7=A4=BA=E6=B4=BB=E5=8A=A8=E6=9C=AA?= =?UTF-8?q?=E5=BC=80=E5=90=AF=EF=BC=8C=E5=BA=94=E6=8F=90=E7=A4=BA=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=9C=AA=E8=A7=A3=E9=94=81=20=E3=80=90=E7=BA=A2?= =?UTF-8?q?=E7=82=B9=E3=80=91=E8=BD=A6=E8=BF=9F=E6=96=97=E6=B3=95=E7=9A=84?= =?UTF-8?q?=E7=BA=A2=E7=82=B9=E4=BB=8D=E7=BB=91=E5=9C=A8=E5=89=AF=E6=9C=AC?= =?UTF-8?q?=E5=85=A5=E5=8F=A3=E5=A4=84=EF=BC=8C=E8=80=8C=E9=9D=9E=E5=85=AC?= =?UTF-8?q?=E4=BC=9A=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/DynamicActivity/DynamicActivityManager.lua | 4 ++++ .../ManagedResources/~Lua/Modules/Player/JumpManager.lua | 6 ++++++ .../~Lua/Modules/Player/RedpotManager.lua | 8 ++++---- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index 0c98c6fcf5..e247d5503a 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -490,6 +490,10 @@ function this.IsActivityOpenByJumpIndex(pageIndex, jumpIndex) if tb[i].IfBack then if tb[i].ActiveType > 0 then local id = ActivityGiftManager.IsActivityTypeOpen(tb[i].ActiveType) + -- return id and id > 0 and ActivityGiftManager.IsQualifiled(tb[i].ActiveType) + if not ActivityGiftManager.IsQualifiled(tb[i].ActiveType) then + return 1 + end return id and id > 0 and ActivityGiftManager.IsQualifiled(tb[i].ActiveType) elseif tb[i].FunType > 0 then return ActTimeCtrlManager.SingleFuncState(tb[i].FunType) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 607823c3b3..dcd567ed36 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -757,6 +757,11 @@ function this.JumpActivity(data,skipfactor) this.isOpen = false return end + if isOpen == 1 then + PopupTipPanel.ShowTip("功能尚未开启") + this.isOpen = false + return + end if DynamicActivityManager.curActivityType == data then DynamicActivityManager.RemoveUIList() end @@ -800,6 +805,7 @@ function this.GoJumpWithoutTip(_jumpId) end function this.GoJump(_jumpId,fun) + Log("jumpId:"..tostring(_jumpId)) this.isOpen = true this.jumpId = _jumpId local jumpSData = JumpConfig[_jumpId] diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 603cd61de0..7e1007e35a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -100,10 +100,10 @@ end -- 初始化红点关系 function this.InitRedPointAllRelate() - RPData:SetParent(RedPointType.OrdinaryExplore, RedPointType.ExploreMain) - RPData:SetParent(RedPointType.HeroExplore, RedPointType.ExploreMain) - RPData:SetParent(RedPointType.EpicExplore, RedPointType.ExploreMain) - RPData:SetParent(RedPointType.LegendExplore, RedPointType.ExploreMain) + RPData:SetParent(RedPointType.OrdinaryExplore, RedPointType.ExploreMain)--大闹天宫 + RPData:SetParent(RedPointType.HeroExplore, RedPointType.ExploreMain)--日常副本 + RPData:SetParent(RedPointType.EpicExplore, RedPointType.ExploreMain)--心魔试炼 + RPData:SetParent(RedPointType.LegendExplore, RedPointType.Guild)--车迟斗法 RPData:SetParent(RedPointType.People_Mirror, RedPointType.Vientiane) RPData:SetParent(RedPointType.Trial, RedPointType.Vientiane)