From 667bd98bd1fb72a58be87a3b3de0ca3f681a9cae Mon Sep 17 00:00:00 2001 From: zhouhaihai Date: Wed, 3 Feb 2021 11:01:50 +0800 Subject: [PATCH] 增加 0 的判断 --- src/adv/Adv.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/adv/Adv.lua b/src/adv/Adv.lua index b4bb351..c096613 100644 --- a/src/adv/Adv.lua +++ b/src/adv/Adv.lua @@ -1377,7 +1377,7 @@ local function checkChooseCondFunc(self, condStr, room, block, tag, chooseData) for _, room in pairs(self:getCurMap().rooms) do for _, block in pairs(room.blocks) do if block:isMonster() then - if not monsterId then return false end + if not monsterId or monsterId == 0 then return false end if block.event.id == monsterId then return false end @@ -1387,7 +1387,7 @@ local function checkChooseCondFunc(self, condStr, room, block, tag, chooseData) else for _, cblock in ipairs(self:getCurMap():getBlocksBySize(room.roomId, block.blockId, size)) do if cblock:isMonster() then - if not monsterId then return false end + if not monsterId or monsterId == 0 then return false end if cblock.event.id == monsterId then return false end @@ -1402,7 +1402,7 @@ local function checkChooseCondFunc(self, condStr, room, block, tag, chooseData) for _, room in pairs(self:getCurMap().rooms) do for _, block in pairs(room.blocks) do if block:isBuild() then - if not buildId then return false end + if not buildId or buildId == 0 then return false end if block.event.id == buildId then return false end @@ -1412,7 +1412,7 @@ local function checkChooseCondFunc(self, condStr, room, block, tag, chooseData) else for _, cblock in ipairs(self:getCurMap():getBlocksBySize(room.roomId, block.blockId, size)) do if cblock:isBuild() then - if not buildId then return false end + if not buildId or buildId == 0 then return false end if cblock.event.id == buildId then return false end @@ -1427,7 +1427,7 @@ local function checkChooseCondFunc(self, condStr, room, block, tag, chooseData) for _, room in pairs(self:getCurMap().rooms) do for _, block in pairs(room.blocks) do if block:isChoose() then - if not chooseId then return false end + if not chooseId or chooseId == 0 then return false end if block.event.id == chooseId then return false end @@ -1437,7 +1437,7 @@ local function checkChooseCondFunc(self, condStr, room, block, tag, chooseData) else for _, cblock in ipairs(self:getCurMap():getBlocksBySize(room.roomId, block.blockId, size)) do if cblock:isChoose() then - if not chooseId then return false end + if not chooseId or chooseId == 0 then return false end if cblock.event.id == chooseId then return false end -- libgit2 0.21.2