wasteland / server

Commit 3e5f46ca08055cc8cc882f0760d55700180bd18d

Authored by liuzujun
2 parents 0c54995a 4083e99a

Merge branch 'tr/bugfix' of 120.26.43.151:wasteland/server into tr/bugfix

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
Inline Side-by-side
src/actions/ActivityAction.lua
  Show/Hide comments   View file @3e5f46c
... ... @@ -587,7 +587,7 @@ function _M.endBattleRpc(agent, data)
587 587 info = msg.info,
588 588 format = role.__actBattleCache.format
589 589 }) then
590   - SendPacket(actionCodes.Hang_endBonusBattleRpc, MsgPack.pack({errorCode = 1}))
  590 + SendPacket(actionCodes.Activity_endBattleRpc, MsgPack.pack({errorCode = 1}))
591 591 return true
592 592 end
593 593 role.__actBattleCache = nil
... ...
src/models/RoleBattle.lua
  Show/Hide comments   View file @3e5f46c
... ... @@ -150,7 +150,7 @@ function Role:checkBattleCheat(battleType, params)
150 150 -- self:setProperty("cheatCount", cheatCount)
151 151  
152 152 local result = {clientSelf = {}, serverSelf = {}}
153   - for k , v in pairs(clientInfo.selfAttr) do
  153 + for k , v in pairs(clientInfo.selfAttr or {}) do
154 154 result.clientSelf[tostring(k)] = v
155 155 end
156 156 for k , v in pairs(selfTeamServer) do
... ...