Merge branch 'master_xma_local' into master_xma_test

dev_chengFeng
JieLing 2020-10-13 21:33:41 +08:00
commit 3cee54d991
1 changed files with 12 additions and 2 deletions

View File

@ -482,7 +482,7 @@ function this.SetSelectHero(isFirstIn,isFirstData,isMainIn)
table.insert(MapManager.trialHeroInfo,{heroId=h.dynamicId,tmpId=h.id,star=h.star,heroHp=10000,level=h.lv})
end
end
d=MapManager.trialHeroInfo
d = MapManager.trialHeroInfo
for k = 1, this.s_grid.transform.childCount do
this.s_grid.transform:GetChild(k-1).gameObject:SetActive(false)
end
@ -543,7 +543,17 @@ function this.SetSelectHero(isFirstIn,isFirstData,isMainIn)
end
end
else
choosed:SetActive(MapTrialManager.selectHeroDid==v.heroId)
if MapTrialManager.selectHeroDid ~= "" then
choosed:SetActive(MapTrialManager.selectHeroDid==v.heroId and v.heroHp >0)
else
if v.heroHp >0 then
choosed:SetActive(true)
MapTrialManager.selectHeroDid=v.heroId
else
choosed:SetActive(false)
MapTrialManager.selectHeroDid=""
end
end
end
--血量相关