Commit 111937b9dcb5f325c4e92c31f7e4868e9446618a

Authored by zhouhaihai
1 parent e587a3aa

自己不清楚 格子

Showing 1 changed file with 15 additions and 3 deletions   Show diff stats
@@ -1388,19 +1388,31 @@ local function chooseCommon(self, room, block, chooseData, choose, tag) @@ -1388,19 +1388,31 @@ local function chooseCommon(self, room, block, chooseData, choose, tag)
1388 [14] = function() -- 指定地块召唤 指定类型的id 1388 [14] = function() -- 指定地块召唤 指定类型的id
1389 local change = self:getCurMap():layEventToStage(effect[2], effect[3], effect[4], effect[5]) 1389 local change = self:getCurMap():layEventToStage(effect[2], effect[3], effect[4], effect[5])
1390 for _, one in ipairs(change) do 1390 for _, one in ipairs(change) do
1391 - self:backBlockChange(one[1].roomId, one[2].blockId) 1391 + if one[1].roomId == room.roomId and one[2].blockId == block.blockId then
  1392 + clearBlock = false
  1393 + else
  1394 + self:backBlockChange(one[1].roomId, one[2].blockId)
  1395 + end
1392 end 1396 end
1393 end, 1397 end,
1394 [15] = function() -- 移除指定事件 1398 [15] = function() -- 移除指定事件
1395 local change = self:getCurMap():clearEventById(effect[2], effect[3], effect[4]) 1399 local change = self:getCurMap():clearEventById(effect[2], effect[3], effect[4])
1396 for _, one in ipairs(change) do 1400 for _, one in ipairs(change) do
1397 - self:backBlockChange(one[1].roomId, one[2].blockId) 1401 + if one[1].roomId == room.roomId and one[2].blockId == block.blockId then
  1402 + clearBlock = false
  1403 + else
  1404 + self:backBlockChange(one[1].roomId, one[2].blockId)
  1405 + end
1398 end 1406 end
1399 end, 1407 end,
1400 [16] = function() -- 指定事件转移 1408 [16] = function() -- 指定事件转移
1401 local change = self:getCurMap():eventChangeToOther(effect[2], effect[3], effect[4], effect[5], effect[6]) 1409 local change = self:getCurMap():eventChangeToOther(effect[2], effect[3], effect[4], effect[5], effect[6])
1402 for _, one in ipairs(change) do 1410 for _, one in ipairs(change) do
1403 - self:backBlockChange(one[1].roomId, one[2].blockId) 1411 + if one[1].roomId == room.roomId and one[2].blockId == block.blockId then
  1412 + clearBlock = false
  1413 + else
  1414 + self:backBlockChange(one[1].roomId, one[2].blockId)
  1415 + end
1404 end 1416 end
1405 end, 1417 end,
1406 } 1418 }