Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
jiaoyangna 2021-04-01 14:56:50 +08:00
commit b663c351b3
1 changed files with 1 additions and 0 deletions

View File

@ -745,6 +745,7 @@ function ExpeditionMainPanel:HeroResurgence()
local roleDidDatas = {} local roleDidDatas = {}
local roleHurtDatas = {} local roleHurtDatas = {}
local _roleDatas = HeroManager.GetAllHeroDatas(1) local _roleDatas = HeroManager.GetAllHeroDatas(1)
_roleDatas = ExpeditionManager.GetAllHeroDatas(_roleDatas,1)
for i = 1, #_roleDatas do for i = 1, #_roleDatas do
local heroHp = 0 local heroHp = 0
if ExpeditionManager.heroInfo[_roleDatas[i].dynamicId] then if ExpeditionManager.heroInfo[_roleDatas[i].dynamicId] then