Commit 7cd50d1984605902076836eaea69fcafa2329ab3
1 parent
b216676d
gm
Showing
1 changed file
with
8 additions
and
4 deletions
Show diff stats
src/actions/GmAction.lua
@@ -356,7 +356,9 @@ function _M.adv(role, pms) | @@ -356,7 +356,9 @@ function _M.adv(role, pms) | ||
356 | 356 | ||
357 | local advData = csvdb["adv_chapterCsv"][chapterId] | 357 | local advData = csvdb["adv_chapterCsv"][chapterId] |
358 | if not advData then return end | 358 | if not advData then return end |
359 | - layer = math.min(layer, advData.limitlevel) | 359 | + if math.floor(chapterId / 100) ~= 2 then |
360 | + layer = math.min(layer, advData.limitlevel) | ||
361 | + end | ||
360 | local advPass = role:getProperty("advPass") | 362 | local advPass = role:getProperty("advPass") |
361 | local addPre | 363 | local addPre |
362 | addPre = function(chapterId) | 364 | addPre = function(chapterId) |
@@ -384,13 +386,15 @@ function _M.advt(role, pms) | @@ -384,13 +386,15 @@ function _M.advt(role, pms) | ||
384 | local layer = tonum(pms.pm2) | 386 | local layer = tonum(pms.pm2) |
385 | local advData = csvdb["adv_chapterCsv"][chapterId] | 387 | local advData = csvdb["adv_chapterCsv"][chapterId] |
386 | if not advData then return "不存在的章节" end | 388 | if not advData then return "不存在的章节" end |
387 | - layer = math.min(layer, advData.limitlevel) | ||
388 | - local advData = role:getAdvData() | ||
389 | 389 | ||
390 | + local advData = role:getAdvData() | ||
390 | if not advData.chapterId then | 391 | if not advData.chapterId then |
391 | return "先随便开启一关" | 392 | return "先随便开启一关" |
392 | end | 393 | end |
393 | - | 394 | + if not advData:isEndless() then |
395 | + layer = math.min(layer, advData.limitlevel) | ||
396 | + end | ||
397 | + | ||
394 | _M.adv(role, {pm1 = chapterId, pm2 = layer - 1}) | 398 | _M.adv(role, {pm1 = chapterId, pm2 = layer - 1}) |
395 | 399 | ||
396 | 400 |