Commit b9ffee245347eda5c5a4724f839a5390b6306a3b

Authored by zhouhaihai
2 parents bd378b4c e6ebee44

Merge branch 'develop' into qa

Showing 1 changed file with 4 additions and 4 deletions   Show diff stats
src/actions/HangAction.lua
@@ -215,18 +215,18 @@ function _M.roleFormatRpc(agent , data) @@ -215,18 +215,18 @@ function _M.roleFormatRpc(agent , data)
215 local hangTeam = role:getProperty("hangTeam") 215 local hangTeam = role:getProperty("hangTeam")
216 for slot, heroId in pairs(msg.heros) do 216 for slot, heroId in pairs(msg.heros) do
217 if not role.heros[heroId] then 217 if not role.heros[heroId] then
218 - return 218 + return 1
219 end 219 end
220 end 220 end
221 221
222 local supports = {} 222 local supports = {}
223 for slot, support in pairs(msg.supports or {}) do 223 for slot, support in pairs(msg.supports or {}) do
224 - if slot ~= 1 and slot ~= 2 then return end 224 + if slot ~= 1 and slot ~= 2 then return 2 end
225 local level = role.dinerData:getProperty("dishTree"):getv(support, 0) 225 local level = role.dinerData:getProperty("dishTree"):getv(support, 0)
226 - if level <= 0 then return end 226 + if level <= 0 then return 3 end
227 supports[slot] = support 227 supports[slot] = support
228 end 228 end
229 - if not checkLeader(hangTeam.heros, hangTeam.leader) then return end 229 + if not checkLeader(msg.heros, msg.leader) then return 4 end
230 230
231 table.clear(hangTeam) 231 table.clear(hangTeam)
232 hangTeam.heros = {} 232 hangTeam.heros = {}