diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua index 401a7f1f0b..948993f823 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua @@ -811,14 +811,11 @@ function this. CarbonRedCheck(redType) if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN) then return false end - --日常 - if redType == FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN then - if ActTimeCtrlManager.SingleFuncState(redType) then - for k,v in pairs(this.GetDailyCarbons(0)) do - if v and v.state then - return true - end + if redType == RedPointType.HeroExplore then + for k,v in pairs(this.GetDailyCarbons(0)) do + if v and v.state then + return true end end return false @@ -830,14 +827,14 @@ function this. CarbonRedCheck(redType) -- return false -- end --大闹天宫 - elseif redType == FUNCTION_OPEN_TYPE.EXPEDITION then - if ActTimeCtrlManager.SingleFuncState(redType) then + elseif redType == RedPointType.OrdinaryExplore then + if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.EXPEDITION) then return TreasureOfHeavenManger.RedPoint() end return false --车迟斗法 - elseif redType == FUNCTION_OPEN_TYPE.CARDELAY then - if ActTimeCtrlManager.IsQualifiled(redType) and PlayerManager.familyId ~= 0 + elseif redType == RedPointType.LegendExplore then + if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.CARDELAY) and PlayerManager.familyId ~= 0 and (GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Challenge) or GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Loot)) then return true diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua index a0481119c8..4a98d2818f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua @@ -177,6 +177,11 @@ function this.BcakUpdateUserExp(_msg) TapDBManager.SetLevel(this.level) --发送埋点数据 CustomEventManager.SendCustomEvents(FBSDKCustomEventType.RoleLv,this.level) + CheckRedPointStatus(RedPointType.OrdinaryExplore) + CheckRedPointStatus(RedPointType.HeroExplore) + CheckRedPointStatus(RedPointType.LegendExplore) + CheckRedPointStatus(RedPointType.People_Mirror) + end Game.GlobalEvent:DispatchEvent(GameEvent.Player.OnPlayerLvChange) if this.userLevelData and this.userLevelData[this.level] then @@ -203,6 +208,10 @@ function this.PromoteLevel(exp) --Log("¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥ 玩家升级增加经验"..this.userLevelData[this.level].AddEnergy.." "..BagManager.GetItemCountById(2)) --FightManager.SetAndGetSingleFightState3(this.level) RedPointManager.SetExploreRedPoint({ level = this.level }) + CheckRedPointStatus(RedPointType.OrdinaryExplore) + CheckRedPointStatus(RedPointType.HeroExplore) + CheckRedPointStatus(RedPointType.LegendExplore) + CheckRedPointStatus(RedPointType.People_Mirror) end this.maxEnergy = this.userLevelData[this.level].MaxEnergy diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 7fa3109850..7589b522d7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -396,10 +396,10 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.PoZhenZhuXianTask, OperatingManager.CheckPoZhenZhuXianTaskRed) RPData:AddCheckFunc(RedPointType.PoZhenZhuXianRecharge, OperatingManager.CheckLeiJiChongZhiRedData) - RPData:AddCheckFunc(RedPointType.OrdinaryExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.EXPEDITION) - RPData:AddCheckFunc(RedPointType.HeroExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN) - RPData:AddCheckFunc(RedPointType.EpicExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.MONSTER_COMING) - RPData:AddCheckFunc(RedPointType.LegendExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.CARDELAY) + RPData:AddCheckFunc(RedPointType.OrdinaryExplore, CarbonManager.CarbonRedCheck) + RPData:AddCheckFunc(RedPointType.HeroExplore, CarbonManager.CarbonRedCheck) + RPData:AddCheckFunc(RedPointType.EpicExplore, CarbonManager.CarbonRedCheck) + RPData:AddCheckFunc(RedPointType.LegendExplore, CarbonManager.CarbonRedCheck) --万象境副本 RPData:AddCheckFunc(RedPointType.People_Mirror, XuanYuanMirrorManager.CarbonRedCheck)