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

This commit is contained in:
chenxi 2023-05-30 15:50:21 +08:00
commit fe8d9aede1

View File

@ -1150,13 +1150,8 @@ function BattleController:setGridBreakCondition(gridMap, posId, condition)
if not gridMap[posId] then if not gridMap[posId] then
gridMap[posId] = {} gridMap[posId] = {}
gridMap[posId][condition] = true gridMap[posId][condition] = true
return true, true
end
if gridMap[posId][condition] then
return false
end end
gridMap[posId][condition] = true gridMap[posId][condition] = true
return true, false
end end
function BattleController:tryShowSelectSkillComp(needDelay, onlyCommonSkill) function BattleController:tryShowSelectSkillComp(needDelay, onlyCommonSkill)