Commit b021e351789a5713cb23dcb59d2f9bdee8cce72c
Merge branch 'tr/bugfix' of 120.26.43.151:wasteland/server into tr/bugfix
Showing
2 changed files
with
3 additions
and
3 deletions
Show diff stats
src/actions/AdvAction.lua
| @@ -134,7 +134,7 @@ function _M.startAdvRpc( agent, data ) | @@ -134,7 +134,7 @@ function _M.startAdvRpc( agent, data ) | ||
| 134 | else -- 普通模式判断 | 134 | else -- 普通模式判断 |
| 135 | if layer >= chapterData.limitlevel then return 4 end | 135 | if layer >= chapterData.limitlevel then return 4 end |
| 136 | 136 | ||
| 137 | - local relayData = role:getAdvData():isHaveRelay(layer, chapterId) | 137 | + local relayData = role:getAdvData():isHaveRelay(layer, chapterId, true) |
| 138 | if not relayData then return 6 end -- 不是中继层 | 138 | if not relayData then return 6 end -- 不是中继层 |
| 139 | if layer ~= 1 then | 139 | if layer ~= 1 then |
| 140 | if (advPass[chapterId] or 0) < relayData.floor then return 21 end | 140 | if (advPass[chapterId] or 0) < relayData.floor then return 21 end |
src/adv/Adv.lua
| @@ -61,10 +61,10 @@ function Adv:initByInfo(advInfo) | @@ -61,10 +61,10 @@ function Adv:initByInfo(advInfo) | ||
| 61 | self:initBattle(advInfo) | 61 | self:initBattle(advInfo) |
| 62 | end | 62 | end |
| 63 | -- 找出level 是否存在中继层 | 63 | -- 找出level 是否存在中继层 |
| 64 | -function Adv:isHaveRelay(level, chapterId) | 64 | +function Adv:isHaveRelay(level, chapterId, force) |
| 65 | level = level or self.level | 65 | level = level or self.level |
| 66 | chapterId = chapterId or self.chapterId | 66 | chapterId = chapterId or self.chapterId |
| 67 | - if level == 1 then return end | 67 | + if level == 1 and not force then return end |
| 68 | 68 | ||
| 69 | local campsiteCsv = csvdb["adv_chapter_campsiteCsv"][chapterId] | 69 | local campsiteCsv = csvdb["adv_chapter_campsiteCsv"][chapterId] |
| 70 | for _, campsite in ipairs(campsiteCsv) do | 70 | for _, campsite in ipairs(campsiteCsv) do |