puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev

Browse Source
This commit is contained in:
chenxi 2023-04-24 21:46:44 +08:00
commit 4516cc07ff
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lua/app/module/battle/controller/battle_controller.lua
View File

@ -1214,6 +1214,7 @@ function BattleController:generateGridType(skillTypeParameter)
count = count + 1 count = count + 1
end end
end end
list = table.shuffle(list)
if count > 0 then if count > 0 then
local minCount = math.min(skillTypeParameter[2], count) local minCount = math.min(skillTypeParameter[2], count)
for i = minCount, 1, -1 do for i = minCount, 1, -1 do
@ -1612,7 +1613,7 @@ function BattleController:shuffleBoard()
local anySkillCount = 0 local anySkillCount = 0
local gridEntityCountMap = {} local gridEntityCountMap = {}
for posId, entity in pairs(self.battleData:getGridEnties()) do 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 if entity:getSkillId() then
local skillEntity = self.battleData:getSkillEntityBySkillId(entity:getSkillId()) local skillEntity = self.battleData:getSkillEntityBySkillId(entity:getSkillId())
local elementType = skillEntity:getPosition() local elementType = skillEntity:getPosition()
@ -1783,7 +1784,6 @@ function BattleController:findAttention()
posIdMap = {} posIdMap = {}
self:findLinkLine(posId, posIdMap, false, mainElementType, pathList) self:findLinkLine(posId, posIdMap, false, mainElementType, pathList)
if table.nums(pathList) >= self:getMinEliminationCount() then if table.nums(pathList) >= self:getMinEliminationCount() then
Logger.printTable(pathList)
find = true find = true
break break
end end