wasteland / server

Commit 5a8b84a1309937ee2b67a42ac770f5d19712fa12

Authored by zhouhaihai
2 parents 2e611bcf 4083e99a

Merge branch 'tr/bugfix' into tr/bugfix-qa 

* tr/bugfix:
  可能的报错点
  结算正常
  删除自动封号
  输出删掉
Showing 3 changed files with 13 additions and 14 deletions   Show diff stats
Inline Side-by-side
src/actions/ActivityAction.lua
  Show/Hide comments   View file @5a8b84a
... ... @@ -590,7 +590,7 @@ function _M.endBattleRpc(agent, data)
590 590 info = msg.info,
591 591 format = role.__actBattleCache.format
592 592 }) then
593   - SendPacket(actionCodes.Hang_endBonusBattleRpc, MsgPack.pack({errorCode = 1}))
  593 + SendPacket(actionCodes.Activity_endBattleRpc, MsgPack.pack({errorCode = 1}))
594 594 return true
595 595 end
596 596 role.__actBattleCache = nil
... ...
src/models/RoleBattle.lua
  Show/Hide comments   View file @5a8b84a
... ... @@ -145,28 +145,28 @@ function Role:checkBattleCheat(battleType, params)
145 145  
146 146 local status = checkOneCheat(clientInfo.selfAttr, selfTeamServer, clientInfo.enemyAttr, enemyServer)
147 147 if not status then
148   - local cheatCount = self:getProperty("cheatCount")
149   - cheatCount = cheatCount + 1
150   - self:setProperty("cheatCount", cheatCount)
  148 + -- local cheatCount = self:getProperty("cheatCount")
  149 + -- cheatCount = cheatCount + 1
  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
157 157 result.serverSelf[tostring(k)] = v
158 158 end
159 159 result = json.encode(result)
160   - self:mylog("cheat", {desc = battleType, int1 = cheatCount, text1 = result})
  160 + self:mylog("cheat", {desc = battleType, int1 = 1, text1 = result})
161 161  
162   - for _, v in ipairs(globalCsv.cheat_check) do
163   - if cheatCount == v[1] then
164   - self:setBan(v[2] / 86400, 5)
165   - break
166   - end
167   - end
  162 + -- for _, v in ipairs(globalCsv.cheat_check) do
  163 + -- if cheatCount == v[1] then
  164 + -- self:setBan(v[2] / 86400, 5)
  165 + -- break
  166 + -- end
  167 + -- end
168 168 end
169   - return status
  169 + return true
170 170 end
171 171  
172 172 function Role:checkBattle(battleType, params)
... ...
src/models/RolePlugin.lua
  Show/Hide comments   View file @5a8b84a
... ... @@ -883,7 +883,6 @@ function RolePlugin.bind(Role)
883 883 self:mylog("role_action", {desc = "ban_rm"})
884 884 else
885 885 self:sendGmMsg(globalCsv.ban_tips[banType] or globalCsv.ban_tips[0])
886   - print(86400 * time)
887 886 self:setProperty("banTime", math.ceil(now + 86400 * time))
888 887 self:setProperty("banType", banType)
889 888 self:resetRank()
... ...