From 2cde942f47da2e29edfc082b1f83861ceb01db67 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 3 Jun 2021 12:04:04 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=99=90=E6=97=B6=E7=A5=88=E6=84=BF]=3D=3D=3D?= =?UTF-8?q?=3D=3D=E7=BA=A2=E7=82=B9=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Common/GlobalDefine.lua | 2 ++ .../DynamicActivity/TimeLimitUpHero.lua | 2 +- .../Modules/Operating/OperatingManager.lua | 22 +++++++++++++++++++ .../~Lua/Modules/Player/RedpotManager.lua | 2 ++ .../~Lua/Modules/Recruit/RecruitManager.lua | 2 ++ 5 files changed, 29 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index f166d59b9f..631ba32fe6 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -883,6 +883,8 @@ RedPointType = { QinglongSerectTreasureTrail = 10008, XiaoYaoYouRedPoint=10009, + --显示祈愿 + TimeLimitWish = 10010, --灵兽 PokemonMainCity = 790,--灵兽主界面 Pokemon_UpLv = 791,--灵兽升级 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua index 5c679e4c99..3d3c408f87 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua @@ -291,7 +291,7 @@ function TimeLimitUpHero:Recruit(actId,type,itemId) if msg.drop.Hero[1] then UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],actId,1,{RecruitType.PrayerSingle,RecruitType.PrayerTen},oneFunc2) end - CheckRedPointStatus(RedPointType.TimeLimited) + CheckRedPointStatus(RedPointType.TimeLimitWish) end,self.freeTimesId) end diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index 03f729ab58..185a9fc7b9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -769,6 +769,28 @@ function this.GetTimeLimitRedPointStatus() end end +--检测心愿抽卡活动红点 +function this.GetWishDrawRedPointStatus() + local activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LimitUpHero) + if not activityId then + return false + end + local wish=ConfigManager.TryGetConfigData(ConfigName.WishActivitySetting,1) + if not wish then + return false + end + local freeTimesId=wish.FreeTimes + local freeTime= 0 + if freeTimesId>0 then + freeTime= PrivilegeManager.GetPrivilegeRemainValue(freeTimesId) + RecruitManager.freeUseTimeList[freeTimesId]=freeTime + return freeTime and freeTime >= 1 + end +end + + + + function this.GetQiankunBoxRedPointStatus() local lotterySetting=ConfigManager.GetConfig(ConfigName.LotterySetting) local activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.QianKunBox) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index ccabb17b75..cc8e02c863 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -197,6 +197,7 @@ function this.InitRedPointAllRelate() --主题活动 RPData:SetParent(RedPointType.TimeLimited, RedPointType.DynamicActivity) + RPData:SetParent(RedPointType.TimeLimitWish, RedPointType.DynamicActivity) RPData:SetParent(RedPointType.QianKunBox, RedPointType.DynamicActivity) RPData:SetParent(RedPointType.DynamicActTask, RedPointType.DynamicActivity) RPData:SetParent(RedPointType.DynamicActRecharge, RedPointType.DynamicActivity) @@ -466,6 +467,7 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.Expedition_Treasure,TreasureOfHeavenManger.RedPoint) --主题活动 RPData:AddCheckFunc(RedPointType.TimeLimited,OperatingManager.GetTimeLimitRedPointStatus) + RPData:AddCheckFunc(RedPointType.TimeLimitWish,OperatingManager.GetWishDrawRedPointStatus) RPData:AddCheckFunc(RedPointType.QianKunBox,OperatingManager.GetQiankunBoxRedPointStatus) RPData:AddCheckFunc(RedPointType.DynamicActTask, OperatingManager.CheckDynamicActTaskRed) RPData:AddCheckFunc(RedPointType.DynamicActRecharge, OperatingManager.CheckLeiJiChongZhiRedData) diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua index b72da14913..e2aa7bdcb7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua @@ -48,6 +48,7 @@ function this.RecruitRequest(recruitType, func, privilegeId,_itemId,_itemNum) this.freeUseTimeList[privilegeId] = PrivilegeManager.GetPrivilegeRemainValue(privilegeId) -- CheckRedPointStatus(RedPointType.Recruit_Red) CheckRedPointStatus(RedPointType.TimeLimited) + CheckRedPointStatus(RedPointType.TimeLimitWish) CheckRedPointStatus(RedPointType.QianKunBox) CheckRedPointStatus(RedPointType.Pokemon_Recruit) end @@ -71,6 +72,7 @@ function this.RefreshFreeTime() -- CheckRedPointStatus(RedPointType.Recruit_Red) CheckRedPointStatus(RedPointType.Recruit_Normal) CheckRedPointStatus(RedPointType.TimeLimited) + CheckRedPointStatus(RedPointType.TimeLimitWish) CheckRedPointStatus(RedPointType.QianKunBox) end Game.GlobalEvent:DispatchEvent(GameEvent.Recruit.OnRecruitRefreshData)