消除bug修复

This commit is contained in:
xiekaidong 2023-04-24 20:49:53 +08:00
parent 5d20ad362d
commit 405aad10f7
3 changed files with 7 additions and 5 deletions

View File

@ -134,13 +134,15 @@ function BattleManager:getFirstLineLastRowPosId(row, column)
return self:getPosId(1 - row, column) return self:getPosId(1 - row, column)
end end
function BattleManager:getAroundPosIdsByList(posId, boardrange, cludePosIdsMap, randomExclusion) function BattleManager:getAroundPosIdsByList(posId, boardrange, cludePosIdsMap)
local posIdInfos = {} local posIdInfos = {}
local randomExclusion = {}
for _, info in ipairs(boardrange) do for _, info in ipairs(boardrange) do
local list = self:getAroundPosIds(posId, info.type, info.range, cludePosIdsMap, randomExclusion) local list = self:getAroundPosIds(posId, info.type, info.range, cludePosIdsMap, randomExclusion)
for _, info in ipairs(list) do for _, info in ipairs(list) do
table.insert(posIdInfos, info) table.insert(posIdInfos, info)
cludePosIdsMap[info.posId] = nil cludePosIdsMap[info.posId] = nil
randomExclusion[info.posId] = true
end end
end end

View File

@ -14,15 +14,15 @@ local function _takeElimination(posId, skillEntity, gridEntities, sequenceEntiti
cludePosIdsMap[posId] = true cludePosIdsMap[posId] = true
end end
end end
local randomExclusion = {}
for _, entity in ipairs(sequenceEntities) do for _, entity in ipairs(sequenceEntities) do
randomExclusion[entity:getPosId()] = true cludePosIdsMap[entity:getPosId()] = nil
end end
local posIdInfos = ModuleManager.BattleManager:getAroundPosIdsByList(posId, boardrange, cludePosIdsMap, randomExclusion) local posIdInfos = ModuleManager.BattleManager:getAroundPosIdsByList(posId, boardrange, cludePosIdsMap)
cludePosIdsMap = {} cludePosIdsMap = {}
for _, info in ipairs(posIdInfos) do for _, info in ipairs(posIdInfos) do
cludePosIdsMap[info.posId] = info cludePosIdsMap[info.posId] = info
end end
DataManager.BattleData:cacheSkillInfluenceGrids(cludePosIdsMap) DataManager.BattleData:cacheSkillInfluenceGrids(cludePosIdsMap)
end end
end end

View File

@ -174,7 +174,7 @@ function BattleGridEntity:canChangeInfo()
end end
function BattleGridEntity:canInfluenceBySkill() function BattleGridEntity:canInfluenceBySkill()
if self:isEmptyType() then if self:isEmptyType() and not self:getIsIdle() then
return true return true
end end
return false return false