Merge branch 'china/dev' into china/local
commit
234bc919e0
|
@ -61,10 +61,11 @@ function this:FormationAdapter()
|
|||
this.power.text = monsterData.bossTeaminfo.totalForce
|
||||
local monsterCongig = {}
|
||||
if monsterData.bossTeaminfo.teamInfo and monsterData.bossTeaminfo.teamInfo > 0 then
|
||||
local monsterGroup = ConfigManager.TryGetConfigDataByKey(ConfigName.ExpeditionRecruitConfig,"HeroId",monsterData.bossTeaminfo.teamInfo)
|
||||
if monsterGroup and monsterGroup.getHero then
|
||||
monsterCongig = ConfigManager.TryGetConfigData(ConfigName.HeroConfig,monsterGroup.getHero)
|
||||
end
|
||||
monsterCongig = ConfigManager.TryGetConfigData(ConfigName.HeroConfig,monsterData.bossTeaminfo.teamInfo)
|
||||
-- local monsterGroup = ConfigManager.TryGetConfigDataByKey(ConfigName.ExpeditionRecruitConfig,"HeroId",monsterData.bossTeaminfo.teamInfo)
|
||||
-- if monsterGroup and monsterGroup.getHero then
|
||||
-- monsterCongig = ConfigManager.TryGetConfigData(ConfigName.HeroConfig,monsterGroup.getHero)
|
||||
-- end
|
||||
if not monsterCongig then return end
|
||||
local heroConfig = monsterCongig
|
||||
this.LiveName = GetResourcePath(heroConfig.Live)
|
||||
|
|
Loading…
Reference in New Issue