From 04b18aa4add33b7dfdbb089bde71bc191a9ab0af Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 3 Sep 2020 14:42:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E6=8A=80=E5=9C=BA=E6=9C=89=E5=85=8D?= =?UTF-8?q?=E8=B4=B9=E6=AC=A1=E6=95=B0=20=E6=97=B6=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E7=BA=A2=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Common/GlobalDefine.lua | 2 ++ .../~Lua/Modules/Arena/ArenaManager.lua | 23 +++++++++++++++++++ .../~Lua/Modules/Arena/View/ArenaView.lua | 1 + .../~Lua/Modules/Player/RedpotManager.lua | 11 +++++---- 4 files changed, 33 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 23e3bcc26e..a020b9a794 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -657,6 +657,8 @@ RedPointType = { --Arena_Type_TopMatch = 1071, --- 竞技场相关子红点 Arena_Shop = 10701, + Arena_Free = 10702,--免费挑战 + Arena_Reward= 10703,--宝箱奖励 --- 主界面商店大页签红点 Shop_Page_Recharge = 2530, diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua index d594164bc2..0535ac1ec2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaManager.lua @@ -187,6 +187,9 @@ function this.RequestArenaChallenge(index, isSkip, func) -- 不用回放直接显示结果 UIManager.OpenPanel(UIName.ArenaResultPopup, arg) end + + CheckRedPointStatus(RedPointType.Arena_Reward) + CheckRedPointStatus(RedPointType.Arena_Free) end) end @@ -343,4 +346,24 @@ end function this.SetHadTakeBoxData(boxId) this.hadTakeBox[boxId] = boxId end + +function this.FreeBattleRedCheck() + return this.GetArenaChallengeTimes() > 0 +end + +function this.RewardBoxRedCheck() + local arenaBattleReward = ConfigManager.GetConfig(ConfigName.ArenaBattleReward) + local baseData = this.GetArenaBaseData() + local allNums = baseData.successNums + baseData.failNums + local allBoxGetState = this.GetHadTakeBoxData() + for i = 1, 7 do + if arenaBattleReward[i] then + local state = 1--1 未完成 2 未领取 3 已完成allNums >= arenaBattleReward[i].BattleTimes and false + if allNums >= arenaBattleReward[i].BattleTimes and not allBoxGetState[i] then + return true + end + end + end + return false +end return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua b/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua index 16dfe0b2e9..482dd870a1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua @@ -348,6 +348,7 @@ function this.ShowRewardBoxProgressData() NetManager.TakeArenaBattleRewardRequest(i, function(msg) UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 1,function () this.ShowRewardBoxProgressData() + CheckRedPointStatus(RedPointType.Arena_Reward) end) end) end diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index ed9c040972..3b508c0556 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -136,10 +136,12 @@ function this.InitRedPointAllRelate() RPData:SetParent(RedPointType.Shop_Guild_Check, RedPointType.Shop_Tab_Guild) RPData:SetParent(RedPointType.Shop_Roam_Check, RedPointType.Shop_Tab_Roam) - -- + --竞技场 RPData:SetParent(RedPointType.Arena_Type_Normal, RedPointType.Arena) RPData:SetParent(RedPointType.Arena_Record, RedPointType.Arena_Type_Normal) RPData:SetParent(RedPointType.Arena_Shop, RedPointType.Arena_Type_Normal) + RPData:SetParent(RedPointType.Arena_Reward, RedPointType.Arena_Type_Normal) + RPData:SetParent(RedPointType.Arena_Free, RedPointType.Arena_Type_Normal) --工坊 RPData:SetParent(RedPointType.Refining_Weapon, RedPointType.Refining) @@ -247,8 +249,6 @@ function this.InitRedPointAllRelate() RPData:SetParent(RedPointType.FindFairy_FourView, RedPointType.FindFairy) -- 成就 RPData:SetParent(RedPointType.Achievement_Main, RedPointType.DailyTaskMain) - --大闹天宫 天宫秘宝 - --RPData:SetParent(RedPointType.Expedition_Treasure, RedPointType.OrdinaryExplore) end -- 注册红点检测方法 @@ -273,10 +273,13 @@ function this.RegisterRedCheckFunc() --RPData:AddCheckFunc(RedPointType.TreasureOfSl, TreasureOfSomebodyManagerV2.GetTreasureRedPointState) RPData:AddCheckFunc(RedPointType.Mail_Local, MailManager.GetMailRedPointState) - -- RPData:AddCheckFunc(RedPointType.Role, HeroManager.GetFormationHeroRedPoint) + --竞技场部分红点 + RPData:AddCheckFunc(RedPointType.Arena_Free, ArenaManager.FreeBattleRedCheck) + RPData:AddCheckFunc(RedPointType.Arena_Reward, ArenaManager.RewardBoxRedCheck) + ---=== 商店相关红点 RPData:AddCheckFunc(RedPointType.Arena_Shop, ShopManager.ShopRedCheck) RPData:AddCheckFunc(RedPointType.Shop_General_Check, ShopManager.ShopRedCheck)