Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
This commit is contained in:
commit
adca98cb90
@ -1959,8 +1959,8 @@ function BattleController:getShuffleBoardInfo()
|
|||||||
else
|
else
|
||||||
if entity:getSkillId() then
|
if entity:getSkillId() then
|
||||||
haveSkill = true
|
haveSkill = true
|
||||||
add = entity:canLink()
|
|
||||||
end
|
end
|
||||||
|
add = entity:canLink()
|
||||||
end
|
end
|
||||||
if add then
|
if add then
|
||||||
table.insert(tempList, entity)
|
table.insert(tempList, entity)
|
||||||
|
|||||||
@ -262,7 +262,7 @@ function HeroEntity:getActiveTogueSkills()
|
|||||||
if id then
|
if id then
|
||||||
table.insert(list, id)
|
table.insert(list, id)
|
||||||
else
|
else
|
||||||
return
|
break
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user