From 24f6333726e3f90e622612769550c336038dd8bd Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Mon, 21 Sep 2020 18:44:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E9=97=AE=E9=A2=98=EF=BC=9A?= =?UTF-8?q?=20=20=20=20=E8=AF=95=E7=82=BC=E8=8A=82=E7=82=B9=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E7=AB=8B=E7=BB=98=E4=B8=8E=E6=8B=9B=E5=8B=9F=E5=BE=97?= =?UTF-8?q?=E5=88=B0=E7=9A=84=E4=B8=8D=E4=B8=80=E8=87=B4=20=20=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Data/ConfigData.lua | 1 + .../Expedition/View/ExpeditionMonsterInfo_Trail.lua | 13 +++++-------- 2 files changed, 6 insertions(+), 8 deletions(-) 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))