Commit 3bbb90ba45cdb9a8847db95be0096b590ad65da7
1 parent
e089be2e
冒险次数
Showing
1 changed file
with
13 additions
and
23 deletions
Show diff stats
src/actions/AdvAction.lua
| @@ -102,6 +102,8 @@ function _M.startAdvRpc( agent, data ) | @@ -102,6 +102,8 @@ function _M.startAdvRpc( agent, data ) | ||
| 102 | 102 | ||
| 103 | local advPass = role:getProperty("advPass") | 103 | local advPass = role:getProperty("advPass") |
| 104 | 104 | ||
| 105 | + if not checkFormat(role) then return 7 end | ||
| 106 | + | ||
| 105 | if AdvCommon.isEndless(chapterId) then -- 无尽模式判断 | 107 | if AdvCommon.isEndless(chapterId) then -- 无尽模式判断 |
| 106 | 108 | ||
| 107 | if chapterId ~= role.advElChapter then return end -- 不是当前进行的章节 | 109 | if chapterId ~= role.advElChapter then return end -- 不是当前进行的章节 |
| @@ -118,37 +120,23 @@ function _M.startAdvRpc( agent, data ) | @@ -118,37 +120,23 @@ function _M.startAdvRpc( agent, data ) | ||
| 118 | if not relayData then return 14 end -- 不是中继层 | 120 | if not relayData then return 14 end -- 不是中继层 |
| 119 | if advElM < relayData.unlockfloor then return 15 end --未解锁 | 121 | if advElM < relayData.unlockfloor then return 15 end --未解锁 |
| 120 | end | 122 | end |
| 123 | + | ||
| 124 | + role.dailyData:updateProperty({field = "advElC", delta = 1}) | ||
| 121 | else -- 普通模式判断 | 125 | else -- 普通模式判断 |
| 122 | - if not role:checkAdvCount(chapterData.limitlevel) then return 2 end -- 是否有体力 | ||
| 123 | if layer >= chapterData.limitlevel then return 4 end | 126 | if layer >= chapterData.limitlevel then return 4 end |
| 124 | - -- 关卡开放判断 | ||
| 125 | - if not role:advChapterIsOpen(chapterId) then return 5 end | ||
| 126 | 127 | ||
| 128 | + local relayData = role:getAdvData():isHaveRelay(layer, chapterId) | ||
| 129 | + if not relayData then return 6 end -- 不是中继层 | ||
| 127 | if layer ~= 1 then | 130 | if layer ~= 1 then |
| 128 | - local relayData = role:getAdvData():isHaveRelay(layer, chapterId) | ||
| 129 | - if not relayData then return 6 end -- 不是中继层 | ||
| 130 | if (advPass[chapterId] or 0) < relayData.floor then return 21 end | 131 | if (advPass[chapterId] or 0) < relayData.floor then return 21 end |
| 131 | end | 132 | end |
| 132 | - end | ||
| 133 | - | ||
| 134 | - if not checkFormat(role) then return 7 end | ||
| 135 | - | ||
| 136 | - --local advTeam = role:getProperty("advTeam") | ||
| 137 | - --table.clear(advTeam) | 133 | + if not role:checkAdvCount(relayData.supply) then return 2 end -- 是否有体力 |
| 134 | + -- 关卡开放判断 | ||
| 135 | + if not role:advChapterIsOpen(chapterId) then return 5 end | ||
| 138 | 136 | ||
| 139 | - --advTeam.heros = {} | ||
| 140 | - --for slot, heroId in pairs(format.heros) do | ||
| 141 | - -- advTeam.heros[slot] = heroId | ||
| 142 | - --end | ||
| 143 | - --advTeam.leader = format.leader | ||
| 144 | - --advTeam.leader2 = format.leader2 | ||
| 145 | - --role:updateProperty({field = "advTeam", value = advTeam}) | ||
| 146 | - if AdvCommon.isEndless(chapterId) then | ||
| 147 | - role.dailyData:updateProperty({field = "advElC", delta = 1}) | ||
| 148 | - else | ||
| 149 | - role:changeAdvCount(chapterData.limitlevel) | 137 | + role:changeAdvCount(relayData.supply) |
| 150 | end | 138 | end |
| 151 | - | 139 | + |
| 152 | local support = {} -- 支援效果 | 140 | local support = {} -- 支援效果 |
| 153 | if AdvCommon.isEndless(chapterId) then | 141 | if AdvCommon.isEndless(chapterId) then |
| 154 | -- 选择的支援效果 | 142 | -- 选择的支援效果 |
| @@ -168,6 +156,7 @@ function _M.startAdvRpc( agent, data ) | @@ -168,6 +156,7 @@ function _M.startAdvRpc( agent, data ) | ||
| 168 | end | 156 | end |
| 169 | end | 157 | end |
| 170 | end | 158 | end |
| 159 | + | ||
| 171 | role:getAdvData():initByChapter({ | 160 | role:getAdvData():initByChapter({ |
| 172 | chapterId = chapterId, | 161 | chapterId = chapterId, |
| 173 | level = layer, | 162 | level = layer, |
| @@ -175,6 +164,7 @@ function _M.startAdvRpc( agent, data ) | @@ -175,6 +164,7 @@ function _M.startAdvRpc( agent, data ) | ||
| 175 | isEnter = true, | 164 | isEnter = true, |
| 176 | support = support, | 165 | support = support, |
| 177 | }) | 166 | }) |
| 167 | + | ||
| 178 | role:checkTaskEnter("AdvStart", {id = chapterId}) | 168 | role:checkTaskEnter("AdvStart", {id = chapterId}) |
| 179 | role:checkTaskEnter("AdvStartSelf", {id = chapterId}) | 169 | role:checkTaskEnter("AdvStartSelf", {id = chapterId}) |
| 180 | role:getAdvData():popBackEvents() -- 清一下事件 | 170 | role:getAdvData():popBackEvents() -- 清一下事件 |