diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 846ccc3615..6ee614e1de 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -273,6 +273,10 @@ function this.InitRedPointAllRelate() RPData:SetParent(RedPointType.HongMeng_Evory,RedPointType.HongMeng) RPData:SetParent(RedPointType.HongMeng_OpenBox,RedPointType.HongMeng) RPData:SetParent(RedPointType.HongMeng_UpTower,RedPointType.HongMeng) + + RPData:SetParent(RedPointType.Hero_Fetter,RedPointType.TianShuMiJuan) + RPData:SetParent(RedPointType.SoulPrint_Fetter,RedPointType.TianShuMiJuan) + RPData:SetParent(RedPointType.TianShuPokemon_Fetter,RedPointType.TianShuMiJuan) end -- 注册红点检测方法 @@ -453,10 +457,13 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.Pokemon_UpLv,PokemonManager.RefreshPokemonUpLvRedPoint) RPData:AddCheckFunc(RedPointType.Pokemon_UpStar,PokemonManager.RefreshPokemonUpStarRedPoint) RPData:AddCheckFunc(RedPointType.Pokemon_CanUpZhen,PokemonManager.RefreshPokemonCanUpZhenRedPoint) - RPData:AddCheckFunc(RedPointType.Pokemon_Fetter,PokemonManager.RefreshPokemonFetterRedPoint) RPData:AddCheckFunc(RedPointType.Pokemon_Recruit,PokemonManager.RefreshPokemonRecruitRedPoint) RPData:AddCheckFunc(RedPointType.Pokemon_ChipCompound,PokemonManager.PokemonChipCompoundRedPoint) + RPData:AddCheckFunc(RedPointType.Pokemon_Fetter,PokemonManager.RefreshPokemonFetterRedPoint) + RPData:AddCheckFunc(RedPointType.Hero_Fetter,TianShuMiJuanManger.CheckRedPointType) + RPData:AddCheckFunc(RedPointType.SoulPrint_Fetter,TianShuMiJuanManger.RefreshPokemonFetterRedPoint) + RPData:AddCheckFunc(RedPointType.TianShuPokemon_Fetter,TianShuMiJuanManger.RefreshPokemonFetterRedPoint) RPData:AddCheckFunc(RedPointType.HongMeng_Evory,HarmonyManager.RefreshEnvoyPoint) RPData:AddCheckFunc(RedPointType.HongMeng_OpenBox,HarmonyManager.RefreshOpenBoxPoint) diff --git a/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua index 1b9fe097e8..b9d4c90cf9 100644 --- a/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua @@ -9,15 +9,15 @@ local TabBox = require("Modules/Common/TabBox") local tabs = { [1] = { --神将 default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = "神将篇", - rpType = 0,funcType = -1,bg = "t_tianshumijuan_shengjiangditu",zi = "t_tianshumijuan_shenjiangpian_zi_zh", + rpType = RedPointType.Hero_Fetter,funcType = -1,bg = "t_tianshumijuan_shengjiangditu",zi = "t_tianshumijuan_shenjiangpian_zi_zh", }, [2] = { --魂印 default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = "魂印篇", - rpType = 0,funcType = FUNCTION_OPEN_TYPE.hunyin,bg = "t_tianshumijuan_hunyinditu",zi = "t_tianshumijuan_hunyingpian_zi_zh", --gamesetting.EquipSignUnlock + rpType = RedPointType.SoulPrint_Fetter,funcType = FUNCTION_OPEN_TYPE.hunyin,bg = "t_tianshumijuan_hunyinditu",zi = "t_tianshumijuan_hunyingpian_zi_zh", --gamesetting.EquipSignUnlock }, [3] = { --灵兽 default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = "灵兽篇", - rpType = 0,funcType = FUNCTION_OPEN_TYPE.POKEMON,bg = "t_tianshumijuan_lingshouditu",zi = "t_tianshumijuan_lingshoupian_zi_zh", + rpType = RedPointType.TianShuPokemon_Fetter,funcType = FUNCTION_OPEN_TYPE.POKEMON,bg = "t_tianshumijuan_lingshouditu",zi = "t_tianshumijuan_lingshoupian_zi_zh", }, } local curPage = 1 @@ -54,18 +54,14 @@ function TianShuMiJuanMainPanel.SetTabAdapter(newTab, index, status) img.sprite = Util.LoadSprite(tabs[index][status]) tabName.text = tabs[index].tabName - if tabs[index].funcType == 1 then - if gameSetting.EquipSignUnlock[1][2] > PlayerManager.level then - newTab.gameObject:SetActive(true) - else - newTab.gameObject:SetActive(false) - end - elseif tabs[index].funcType == FUNCTION_OPEN_TYPE.POKEMON then + if tabs[index].funcType > 0 then if ActTimeCtrlManager.SingleFuncState(tabs[index].funcType) then newTab.gameObject:SetActive(true) else newTab.gameObject:SetActive(false) end + else + newTab.gameObject:SetActive(true) end end diff --git a/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanManger.lua b/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanManger.lua index ec27b157b2..ff251afcaf 100644 --- a/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanManger.lua +++ b/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanManger.lua @@ -25,6 +25,16 @@ function this.OnLevelChange() this.CheckFetterStatus(3) end +function this.CheckRedPointType(redType) + if redType == RedPointType.Hero_Fetter then + this.CheckRedPoint(1) + elseif redType == RedPointType.SoulPrint_Fetter then + this.CheckRedPoint(2) + elseif redType == RedPointType.TianShuPokemon_Fetter then + this.CheckRedPoint(3) + end +end + function this.CreatSingleConfigData(configData) local data = {} data.id = configData.Id @@ -88,9 +98,12 @@ end function this.CheckRedPoint(fetterType) for k,v in pairs(this.fetterData) do if v.fetterType == fetterType and v.enabled == 0 then + LogGreen("fetterType:"..fetterType.." 红点亮了") return true end end + LogGreen("fetterType:"..fetterType.." 红点灰了") + return false end function this.IsCompound(Teamers,curPokemonSidList) @@ -108,7 +121,6 @@ end --根据type获取羁绊数据 function this.GetFetterDataByFetterType(fetterType) - LogGreen("fetterType:"..fetterType) local data = {} for k,v in pairs(this.fetterData) do if v.fetterType == fetterType and v.enabled ~= -2 then