diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua index 88729ffe8a..f8f0e4d0ce 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua @@ -597,6 +597,7 @@ function this.GoIntoBackData(drop) CheckRedPointStatus(RedPointType.Recruit_Normal) CheckRedPointStatus(RedPointType.Recruit_ShenJiang) CheckRedPointStatus(RedPointType.Recruit_Friend) + CheckRedPointStatus(RedPointType.Sacred) end if (#drop.equipId > 0) then for i = 1, #drop.equipId do @@ -609,6 +610,10 @@ function this.GoIntoBackData(drop) for i = 1, #drop.Hero do HeroManager.UpdateHeroDatas(drop.Hero[i]) end + CheckRedPointStatus(RedPointType.PersonTrailHelp) + CheckRedPointStatus(RedPointType.BuddishTrailHelp) + CheckRedPointStatus(RedPointType.DemonTrailHelp) + CheckRedPointStatus(RedPointType.TaoistTrailHelp) end -- if (#drop.especialEquipId > 0) then -- for i = 1, #drop.especialEquipId do @@ -640,6 +645,10 @@ function this.GMCallBackData(drop) for i = 1, #drop.Hero do HeroManager.UpdateHeroDatas(drop.Hero[i]) end + CheckRedPointStatus(RedPointType.PersonTrailHelp) + CheckRedPointStatus(RedPointType.BuddishTrailHelp) + CheckRedPointStatus(RedPointType.DemonTrailHelp) + CheckRedPointStatus(RedPointType.TaoistTrailHelp) end -- if drop.especialEquipId and #drop.especialEquipId > 0 then -- for i = 1, #drop.especialEquipId do @@ -655,6 +664,7 @@ function this.GMCallBackData(drop) --SoulPrintManager.InitServerData(drop.soulEquip) PokemonManager.InitPokemonsData(drop.pokemon) end + CheckRedPointStatus(RedPointType.Sacred) end --将后端drop转为前端table @@ -678,9 +688,9 @@ function this.GetTableByBackDropData(drop) CheckRedPointStatus(RedPointType.Recruit_Normal) CheckRedPointStatus(RedPointType.Recruit_ShenJiang) CheckRedPointStatus(RedPointType.Recruit_Friend) + CheckRedPointStatus(RedPointType.Sacred) end if drop.equipId ~= nil and #drop.equipId > 0 then - Log("drop.equipId " .. #drop.equipId) for i = 1, #drop.equipId do local itemdata = {} itemdata.itemType = 2 @@ -697,7 +707,6 @@ function this.GetTableByBackDropData(drop) end end if drop.Hero ~= nil and #drop.Hero > 0 then - Log("drop.Hero " .. #drop.Hero) for i = 1, #drop.Hero do local itemdata = {} itemdata.itemType = 3 @@ -712,6 +721,10 @@ function this.GetTableByBackDropData(drop) table.insert(itemDataList, itemdata) HeroManager.UpdateHeroDatas(itemdata.backData) end + CheckRedPointStatus(RedPointType.PersonTrailHelp) + CheckRedPointStatus(RedPointType.BuddishTrailHelp) + CheckRedPointStatus(RedPointType.DemonTrailHelp) + CheckRedPointStatus(RedPointType.TaoistTrailHelp) end CheckRedPointStatus(RedPointType.Huaxutan_CompoundHero) -- if drop.especialEquipId ~= nil and #drop.especialEquipId > 0 then diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua index fe7669dca0..3d0d354402 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua @@ -816,6 +816,7 @@ function this. CarbonRedCheck(redType) return false --心魔 elseif redType == RedPointType.HeartDemon then + elseif redType == RedPointType.EpicExplore_LevleReward then if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.MONSTER_COMING) then for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.FloodConfig)) do diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index f0b7a320d2..b5aab7aeaa 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -2228,14 +2228,14 @@ end function this.GetHeroDataByProperty(_property, _lvLimit) local heros = {} local lvLimit = 0 - local allUpZhenHeroList = FormationManager.GetWuJinFormationHeroIds(FormationTypeDef.FORMATION_ENDLESS_MAP) + --local allUpZhenHeroList = FormationManager.GetWuJinFormationHeroIds(FormationTypeDef.FORMATION_ENDLESS_MAP) if _lvLimit then lvLimit = _lvLimit end local index = 1 for i, v in pairs(heroDatas) do if v.property == _property then - if v.lv >= lvLimit or allUpZhenHeroList[v.dynamicId] then + if v.lv >= lvLimit then heros[index] = v index = index + 1 end diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua index 5d353c00ad..bec9ae2050 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua @@ -36,6 +36,31 @@ function this.Initialize() this.fourMonsterData[i].canFightTime = 10 this.fourMonsterData[i].fourElementType = i end + + Game.GlobalEvent:AddEvent(GameEvent.FunctionCtrl.OnFunctionOpen, function(fightId) + if fightId == FUNCTION_OPEN_TYPE.FourElementTrail then + CheckRedPointStatus(RedPointType.PersonTrail) + CheckRedPointStatus(RedPointType.BuddishTrail) + CheckRedPointStatus(RedPointType.DemonTrail) + CheckRedPointStatus(RedPointType.TaoistTrail) + CheckRedPointStatus(RedPointType.PersonTrailHelp) + CheckRedPointStatus(RedPointType.BuddishTrailHelp) + CheckRedPointStatus(RedPointType.DemonTrailHelp) + CheckRedPointStatus(RedPointType.TaoistTrailHelp) + end + end) + Game.GlobalEvent:AddEvent(GameEvent.FunctionCtrl.OnFunctionClose, function(fightId) + if fightId == FUNCTION_OPEN_TYPE.FourElementTrail then + CheckRedPointStatus(RedPointType.PersonTrail) + CheckRedPointStatus(RedPointType.BuddishTrail) + CheckRedPointStatus(RedPointType.DemonTrail) + CheckRedPointStatus(RedPointType.TaoistTrail) + CheckRedPointStatus(RedPointType.PersonTrailHelp) + CheckRedPointStatus(RedPointType.BuddishTrailHelp) + CheckRedPointStatus(RedPointType.DemonTrailHelp) + CheckRedPointStatus(RedPointType.TaoistTrailHelp) + end + end) end function this.InitFourMonsterData(msg) @@ -667,9 +692,10 @@ function this.CheckHelpFightRedPoint(redType) end end return false - elseif redType == RedPointType.DemonTrailHelp then + elseif redType == RedPointType.DemonTrailHelp then local heros = HeroManager.GetHeroDataByProperty(3,0) if not heros or #heros < 1 then + LogGreen("#heros:"..#heros) return false end if this.fourMonsterData[3] and this.fourMonsterData[3].openState > 0 then diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index bd0ea5d37d..5cc86d69d1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -183,8 +183,8 @@ function this.InitRedPointAllRelate() -- --试炼副本 -- RPData:SetParent(RedPointType.EpicExplore_OpenCarbon, RedPointType.EpicExplore) -- RPData:SetParent(RedPointType.EpicExplore_GetReward, RedPointType.EpicExplore) - RPData:SetParent(RedPointType.EpicExplore_LevleReward, RedPointType.EpicExplore) - RPData:SetParent(RedPointType.EpicExplore_MoppingUp, RedPointType.EpicExplore) + RPData:SetParent(RedPointType.EpicExplore_LevleReward, RedPointType.HeartDemon) + RPData:SetParent(RedPointType.EpicExplore_MoppingUp, RedPointType.HeartDemon) -- --精英副本 -- RPData:SetParent(RedPointType.HeroExplore_OpenMap, RedPointType.HeroExplore) -- RPData:SetParent(RedPointType.HeroExplore_Feats, RedPointType.HeroExplore) @@ -279,7 +279,6 @@ function this.InitRedPointAllRelate() --建木神树 RPData:SetParent(RedPointType.Sacred,RedPointType.Sacred_roleInfo) - RPData:SetParent(RedPointType.Sacred_roleInfo,RedPointType.Sacred_roleList) RPData:SetParent(RedPointType.Sacred_roleInfo,RedPointType.Practice) RPData:SetParent(RedPointType.Hero_Fetter,RedPointType.TianShuMiJuan) RPData:SetParent(RedPointType.SoulPrint_Fetter,RedPointType.TianShuMiJuan) @@ -480,7 +479,7 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.OrdinaryExplore, CarbonManager.CarbonRedCheck) RPData:AddCheckFunc(RedPointType.HeroExplore, CarbonManager.CarbonRedCheck) - RPData:AddCheckFunc(RedPointType.HeartDemon, CarbonManager.CarbonRedCheck) + --RPData:AddCheckFunc(RedPointType.HeartDemon, CarbonManager.CarbonRedCheck) RPData:AddCheckFunc(RedPointType.EpicExplore_LevleReward, CarbonManager.CarbonRedCheck) RPData:AddCheckFunc(RedPointType.EpicExplore_MoppingUp, MonsterCampManager.CarbonRedCheck) RPData:AddCheckFunc(RedPointType.LegendExplore, CarbonManager.CarbonRedCheck) diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua index b73f4e0096..16f9dc686e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua @@ -129,7 +129,7 @@ function Practice:BindEvent() BindRedPointObject(RedPointType.Practice_upgrade,self.redPoint) BindRedPointObject(RedPointType.Practice_imprint,self.imprintRedPoint) - BindRedPointObject(RedPointType.Sacred_roleList,self.treeRed) + BindRedPointObject(RedPointType.Sacred_roleInfo,self.treeRed) end function Practice:BtnClickEvent() NetManager.UpPracticeLevelRequest(function () @@ -375,7 +375,7 @@ function Practice:OnDestroy() SubUIManager.Close(self.playerInfoView) self.playerInfoView = nil end - ClearRedPointObject(RedPointType.Sacred_roleList,self.treeRed) + ClearRedPointObject(RedPointType.Sacred_roleInfo,self.treeRed) ClearRedPointObject(RedPointType.Practice_upgrade,self.redPoint) ClearRedPointObject(RedPointType.Practice_imprint,self.imprintRedPoint) self.itemList = {} diff --git a/Assets/ManagedResources/~Lua/View/FourTrailSingleHelpHero.lua b/Assets/ManagedResources/~Lua/View/FourTrailSingleHelpHero.lua index daa6b99889..ff8cf299e8 100644 --- a/Assets/ManagedResources/~Lua/View/FourTrailSingleHelpHero.lua +++ b/Assets/ManagedResources/~Lua/View/FourTrailSingleHelpHero.lua @@ -7,6 +7,12 @@ local redTrailType = { [3] = RedPointType.DemonTrailHelp, [4] = RedPointType.TaoistTrailHelp, } +local redTrailType1 = { + [1] = RedPointType.PersonTrail, + [2] = RedPointType.BuddishTrail, + [3] = RedPointType.DemonTrail, + [4] = RedPointType.TaoistTrail, +} function FourTrailSingleHelpHero:New(gameObject) local b = {} b.gameObject = gameObject @@ -172,6 +178,7 @@ function FourTrailSingleHelpHero:SetIcon2(heroData) PopupTipPanel.ShowTip(string.format("已选择神将,获得%s%s",item.itemNum,ConfigManager.GetConfigData(ConfigName.ItemConfig,item.itemId).Name)) end CheckRedPointStatus(redTrailType[self.curType]) + CheckRedPointStatus(redTrailType1[self.curType]) self:SetIcon2(heroData) end) end