Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
This commit is contained in:
commit
4516cc07ff
@ -1214,6 +1214,7 @@ function BattleController:generateGridType(skillTypeParameter)
|
||||
count = count + 1
|
||||
end
|
||||
end
|
||||
list = table.shuffle(list)
|
||||
if count > 0 then
|
||||
local minCount = math.min(skillTypeParameter[2], count)
|
||||
for i = minCount, 1, -1 do
|
||||
@ -1612,7 +1613,7 @@ function BattleController:shuffleBoard()
|
||||
local anySkillCount = 0
|
||||
local gridEntityCountMap = {}
|
||||
for posId, entity in pairs(self.battleData:getGridEnties()) do
|
||||
if not entity:isCantFallType() then
|
||||
if not entity:isCantFallType() and not entity:getIsIdle() then
|
||||
if entity:getSkillId() then
|
||||
local skillEntity = self.battleData:getSkillEntityBySkillId(entity:getSkillId())
|
||||
local elementType = skillEntity:getPosition()
|
||||
@ -1783,7 +1784,6 @@ function BattleController:findAttention()
|
||||
posIdMap = {}
|
||||
self:findLinkLine(posId, posIdMap, false, mainElementType, pathList)
|
||||
if table.nums(pathList) >= self:getMinEliminationCount() then
|
||||
Logger.printTable(pathList)
|
||||
find = true
|
||||
break
|
||||
end
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user