diff --git a/Assets/ManagedResources/~Lua/Data/ConfigData.lua b/Assets/ManagedResources/~Lua/Data/ConfigData.lua index a67c2fd34e..ae5b267e96 100644 --- a/Assets/ManagedResources/~Lua/Data/ConfigData.lua +++ b/Assets/ManagedResources/~Lua/Data/ConfigData.lua @@ -162,6 +162,7 @@ ConfigName = { ThemeActivityTaskConfig = "ThemeActivityTaskConfig", ExchangeRate = "ExchangeRate", CustomEventConfig = "CustomEventConfig", + ExpeditionRecruitConfig = "ExpeditionRecruitConfig", } require "Framework/GameDataBase" diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Trail.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Trail.lua index a197df56de..9c54aa0b64 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Trail.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Trail.lua @@ -61,16 +61,13 @@ function this:FormationAdapter() this.power.text = monsterData.bossTeaminfo.totalForce local monsterCongig = {} if monsterData.bossTeaminfo.teamInfo and monsterData.bossTeaminfo.teamInfo > 0 then - local monsterGroup = ConfigManager.TryGetConfigData(ConfigName.MonsterGroup,monsterData.bossTeaminfo.teamInfo) - if monsterGroup and monsterGroup.Contents and #monsterGroup.Contents > 0 then - if monsterGroup.Contents[1] and monsterGroup.Contents[1][1] then - monsterCongig = ConfigManager.TryGetConfigData(ConfigName.MonsterConfig,monsterGroup.Contents[1][1]) - end + LogGreen("monsterData.bossTeaminfo.teamInfo "..monsterData.bossTeaminfo.teamInfo) + local monsterGroup = ConfigManager.TryGetConfigDataByKey(ConfigName.ExpeditionRecruitConfig,"HeroId",monsterData.bossTeaminfo.teamInfo)--ConfigManager.TryGetConfigData(ConfigName.MonsterGroup,monsterData.bossTeaminfo.teamInfo) + if monsterGroup and monsterGroup.getHero then + monsterCongig = ConfigManager.TryGetConfigData(ConfigName.HeroConfig,monsterGroup.getHero) end if not monsterCongig then return end - local demonId = monsterCongig.MonsterId - --monsterData.bossTeaminfo.hero[i].remainHp monsterCongig.Level - local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId) + local heroConfig = monsterCongig this.LiveName = GetResourcePath(heroConfig.Live) this.LiveGO = poolManager:LoadLive(this.LiveName, this.live2dRoot.transform, Vector3.one * heroConfig.Scale, Vector3.New(heroConfig.Position[1],heroConfig.Position[2],0))