wasteland / server

Commit 251b105a1fc2a5d7f3f2bf866eed7488b6a6f1ef

Authored by liuzujun
2 parents a1d80fd6 3bbb90ba

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
Inline Side-by-side
src/actions/AdvAction.lua
  Show/Hide comments   View file @251b105
... ... @@ -111,6 +111,8 @@ function _M.startAdvRpc( agent, data )
111 111  
112 112 local advPass = role:getProperty("advPass")
113 113  
  114 + if not checkFormat(role) then return 7 end
  115 +
114 116 if AdvCommon.isEndless(chapterId) then -- 无尽模式判断
115 117  
116 118 if chapterId ~= role.advElChapter then return end -- 不是当前进行的章节
... ... @@ -127,37 +129,23 @@ function _M.startAdvRpc( agent, data )
127 129 if not relayData then return 14 end -- 不是中继层
128 130 if advElM < relayData.unlockfloor then return 15 end --未解锁
129 131 end
  132 +
  133 + role.dailyData:updateProperty({field = "advElC", delta = 1})
130 134 else -- 普通模式判断
131   - if not role:checkAdvCount(chapterData.limitlevel) then return 2 end -- 是否有体力
132 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 139 if layer ~= 1 then
137   - local relayData = role:getAdvData():isHaveRelay(layer, chapterId)
138   - if not relayData then return 6 end -- 不是中继层
139 140 if (advPass[chapterId] or 0) < relayData.floor then return 21 end
140 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 147 end
160   -
  148 +
161 149 local support = {} -- 支援效果
162 150 if AdvCommon.isEndless(chapterId) then
163 151 -- 选择的支援效果
... ... @@ -177,6 +165,7 @@ function _M.startAdvRpc( agent, data )
177 165 end
178 166 end
179 167 end
  168 +
180 169 role:getAdvData():initByChapter({
181 170 chapterId = chapterId,
182 171 level = layer,
... ... @@ -184,6 +173,7 @@ function _M.startAdvRpc( agent, data )
184 173 isEnter = true,
185 174 support = support,
186 175 })
  176 +
187 177 role:checkTaskEnter("AdvStart", {id = chapterId})
188 178 role:checkTaskEnter("AdvStartSelf", {id = chapterId})
189 179 role:getAdvData():popBackEvents() -- 清一下事件
... ...