Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
d17427269a
|
@ -421,11 +421,15 @@ end
|
|||
-- 获取所有正在编队的英雄id
|
||||
function this.AllFormationDeleCurHeroId(heroDid)
|
||||
for i, team in pairs(this.formationList) do
|
||||
local removeIndex
|
||||
for j = 1, #team.teamHeroInfos do
|
||||
if team.teamHeroInfos[j] and team.teamHeroInfos[j].heroId == heroDid then
|
||||
team.teamHeroInfos[j] = nil
|
||||
removeIndex = j
|
||||
end
|
||||
end
|
||||
if removeIndex then
|
||||
table.remove( team.teamHeroInfos, removeIndex)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -650,7 +650,7 @@ function this.GetUpStarHeroListData(heroRankUpGroupId, heroData)
|
|||
for n, w in pairs(FormationManager.formationList) do
|
||||
if this.heroResolveLicence[n] then
|
||||
for m = 1, #w.teamHeroInfos do
|
||||
if v.dynamicId == w.teamHeroInfos[m].heroId then
|
||||
if w.teamHeroInfos[m] and v.dynamicId == w.teamHeroInfos[m].heroId then
|
||||
local isFormationStr = this.GetHeroFormationStr(n)
|
||||
v.isFormation = isFormationStr
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue