Commit 251b105a1fc2a5d7f3f2bf866eed7488b6a6f1ef
Merge branch 'tr/bugfix' of 120.26.43.151:wasteland/server into tr/bugfix
Showing
1 changed file
with
13 additions
and
23 deletions
Show diff stats
src/actions/AdvAction.lua
| @@ -111,6 +111,8 @@ function _M.startAdvRpc( agent, data ) | @@ -111,6 +111,8 @@ function _M.startAdvRpc( agent, data ) | ||
| 111 | 111 | ||
| 112 | local advPass = role:getProperty("advPass") | 112 | local advPass = role:getProperty("advPass") |
| 113 | 113 | ||
| 114 | + if not checkFormat(role) then return 7 end | ||
| 115 | + | ||
| 114 | if AdvCommon.isEndless(chapterId) then -- 无尽模式判断 | 116 | if AdvCommon.isEndless(chapterId) then -- 无尽模式判断 |
| 115 | 117 | ||
| 116 | if chapterId ~= role.advElChapter then return end -- 不是当前进行的章节 | 118 | if chapterId ~= role.advElChapter then return end -- 不是当前进行的章节 |
| @@ -127,37 +129,23 @@ function _M.startAdvRpc( agent, data ) | @@ -127,37 +129,23 @@ function _M.startAdvRpc( agent, data ) | ||
| 127 | if not relayData then return 14 end -- 不是中继层 | 129 | if not relayData then return 14 end -- 不是中继层 |
| 128 | if advElM < relayData.unlockfloor then return 15 end --未解锁 | 130 | if advElM < relayData.unlockfloor then return 15 end --未解锁 |
| 129 | end | 131 | end |
| 132 | + | ||
| 133 | + role.dailyData:updateProperty({field = "advElC", delta = 1}) | ||
| 130 | else -- 普通模式判断 | 134 | else -- 普通模式判断 |
| 131 | - if not role:checkAdvCount(chapterData.limitlevel) then return 2 end -- 是否有体力 | ||
| 132 | if layer >= chapterData.limitlevel then return 4 end | 135 | if layer >= chapterData.limitlevel then return 4 end |
| 133 | - -- 关卡开放判断 | ||
| 134 | - if not role:advChapterIsOpen(chapterId) then return 5 end | ||
| 135 | 136 | ||
| 137 | + local relayData = role:getAdvData():isHaveRelay(layer, chapterId) | ||
| 138 | + if not relayData then return 6 end -- 不是中继层 | ||
| 136 | if layer ~= 1 then | 139 | if layer ~= 1 then |
| 137 | - local relayData = role:getAdvData():isHaveRelay(layer, chapterId) | ||
| 138 | - if not relayData then return 6 end -- 不是中继层 | ||
| 139 | if (advPass[chapterId] or 0) < relayData.floor then return 21 end | 140 | if (advPass[chapterId] or 0) < relayData.floor then return 21 end |
| 140 | end | 141 | end |
| 141 | - end | ||
| 142 | - | ||
| 143 | - if not checkFormat(role) then return 7 end | ||
| 144 | - | ||
| 145 | - --local advTeam = role:getProperty("advTeam") | ||
| 146 | - --table.clear(advTeam) | 142 | + if not role:checkAdvCount(relayData.supply) then return 2 end -- 是否有体力 |
| 143 | + -- 关卡开放判断 | ||
| 144 | + if not role:advChapterIsOpen(chapterId) then return 5 end | ||
| 147 | 145 | ||
| 148 | - --advTeam.heros = {} | ||
| 149 | - --for slot, heroId in pairs(format.heros) do | ||
| 150 | - -- advTeam.heros[slot] = heroId | ||
| 151 | - --end | ||
| 152 | - --advTeam.leader = format.leader | ||
| 153 | - --advTeam.leader2 = format.leader2 | ||
| 154 | - --role:updateProperty({field = "advTeam", value = advTeam}) | ||
| 155 | - if AdvCommon.isEndless(chapterId) then | ||
| 156 | - role.dailyData:updateProperty({field = "advElC", delta = 1}) | ||
| 157 | - else | ||
| 158 | - role:changeAdvCount(chapterData.limitlevel) | 146 | + role:changeAdvCount(relayData.supply) |
| 159 | end | 147 | end |
| 160 | - | 148 | + |
| 161 | local support = {} -- 支援效果 | 149 | local support = {} -- 支援效果 |
| 162 | if AdvCommon.isEndless(chapterId) then | 150 | if AdvCommon.isEndless(chapterId) then |
| 163 | -- 选择的支援效果 | 151 | -- 选择的支援效果 |
| @@ -177,6 +165,7 @@ function _M.startAdvRpc( agent, data ) | @@ -177,6 +165,7 @@ function _M.startAdvRpc( agent, data ) | ||
| 177 | end | 165 | end |
| 178 | end | 166 | end |
| 179 | end | 167 | end |
| 168 | + | ||
| 180 | role:getAdvData():initByChapter({ | 169 | role:getAdvData():initByChapter({ |
| 181 | chapterId = chapterId, | 170 | chapterId = chapterId, |
| 182 | level = layer, | 171 | level = layer, |
| @@ -184,6 +173,7 @@ function _M.startAdvRpc( agent, data ) | @@ -184,6 +173,7 @@ function _M.startAdvRpc( agent, data ) | ||
| 184 | isEnter = true, | 173 | isEnter = true, |
| 185 | support = support, | 174 | support = support, |
| 186 | }) | 175 | }) |
| 176 | + | ||
| 187 | role:checkTaskEnter("AdvStart", {id = chapterId}) | 177 | role:checkTaskEnter("AdvStart", {id = chapterId}) |
| 188 | role:checkTaskEnter("AdvStartSelf", {id = chapterId}) | 178 | role:checkTaskEnter("AdvStartSelf", {id = chapterId}) |
| 189 | role:getAdvData():popBackEvents() -- 清一下事件 | 179 | role:getAdvData():popBackEvents() -- 清一下事件 |