wasteland / server

Commit a8e6aef728148e51282c66fd937eb273c5124619

Authored by zhouhaihai
2 parents a42753c3 b2de779a

Merge branch 'tr/bugfix' into tr/publish/release 

* tr/bugfix:
  输出删掉
  登入刷新兑换活动商店
  兑换活动上线检测是否需要刷新
  修复存在的冒险进不去的玩家
  兑换商店不刷新bug
  新增倍数
  bugfix
  同单号充值输出
  relay
  修改中继营地解锁条件
  防作弊
  活动战斗结束不发送战斗奖励
  活动免费礼包判断活动是否开启

# Conflicts:
#	src/csvdata
Showing 17 changed files with 324 additions and 61 deletions   Show diff stats
Inline Side-by-side
src/GlobalVar.lua
  Show/Hide comments   View file @a8e6aef
... ... @@ -16,6 +16,7 @@ TIME_ZONE = math.floor(os.difftime(START_RESET_TIME_BASE, os.time(os.date("!*t",
16 16  
17 17 START_RESET_TIME = START_RESET_TIME_BASE - TIME_ZONE * 3600
18 18  
  19 +STRUCT_VERSION = 3 -- 数据结构版本
19 20  
20 21 MAX_ROLE_NUM = 1000000
21 22 -- 属性枚举
... ...
src/actions/ActivityAction.lua
  Show/Hide comments   View file @a8e6aef
... ... @@ -511,6 +511,7 @@ function _M.startBattleRpc(agent, data)
511 511 key = tostring(math.random()),
512 512 actid = actid,
513 513 id = id,
  514 + format = msg.format,
514 515 }
515 516 SendPacket(actionCodes.Activity_startBattleRpc, MsgPack.pack({key = role.__actBattleCache.key}))
516 517 else
... ... @@ -568,7 +569,10 @@ function _M.endBattleRpc(agent, data)
568 569 local isWin = msg.isWin
569 570 local heros = msg.heros
570 571 local support = msg.support
571   - if not role.activity:isOpenById(actid, "ChallengeLevel") then return 1 end
  572 + if not role.activity:isOpenById(actid, "ChallengeLevel") then
  573 + SendPacket(actionCodes.Activity_endBattleRpc, MsgPack.pack({}))
  574 + return true
  575 + end
572 576  
573 577 if not role.__actBattleCache then return 2 end
574 578  
... ... @@ -576,6 +580,18 @@ function _M.endBattleRpc(agent, data)
576 580 SendPacket(actionCodes.Activity_endBattleRpc, MsgPack.pack({errorCode = 1}))
577 581 end
578 582  
  583 + -- 防作弊
  584 + if not role:checkBattleCheat("act_battle", {
  585 + id = id,
  586 + isWin = isWin,
  587 + info = msg.info,
  588 + format = role.__actBattleCache.format
  589 + }) then
  590 + SendPacket(actionCodes.Hang_endBonusBattleRpc, MsgPack.pack({errorCode = 1}))
  591 + return true
  592 + end
  593 + role.__actBattleCache = nil
  594 +
579 595 local actCfg = csvdb["activity_battleCsv"][actid]
580 596 if not actCfg then return 3 end
581 597  
... ...
src/actions/AdvAction.lua
  Show/Hide comments   View file @a8e6aef
... ... @@ -137,7 +137,8 @@ function _M.startAdvRpc( agent, data )
137 137 local relayData = role:getAdvData():isHaveRelay(layer, chapterId, true)
138 138 if not relayData then return 6 end -- 不是中继层
139 139 if layer ~= 1 then
140   - if (advPass[chapterId] or 0) < relayData.floor then return 21 end
  140 + local advRelay = role:getProperty("advRelay")
  141 + if not (advRelay[chapterId] or {})[layer] then return 21 end -- 没有开放
141 142 end
142 143 if not role:checkAdvCount(relayData.supply) then return 2 end -- 是否有体力
143 144 -- 关卡开放判断
... ... @@ -191,7 +192,7 @@ function _M.startHangRpc(agent, data)
191 192 local format = msg.format --编队
192 193 local index = msg.index or 1--时间索引id
193 194  
194   - local chapterData = csvdb["adv_chapter_campsiteCsv"][chapterId]
  195 + local chapterData = csvdb["adv_chapter_campsiteCsv"][chapterId]
195 196 if not chapterData then return 1 end
196 197 local campSiteData = chapterData[campId]
197 198 if not campSiteData then return 1 end
... ... @@ -213,7 +214,7 @@ function _M.startHangRpc(agent, data)
213 214 if AdvCommon.isEndless(chapterId) then return 5 end -- 无尽没有代理
214 215  
215 216 local advRelay = role:getProperty("advRelay")
216   - if not next(advRelay[chapterId] or {}) then return 6 end -- 没有开放
  217 + if not (advRelay[chapterId] or {})[campSiteData.floor] then return 6 end -- 没有开放
217 218  
218 219  
219 220 if not role:checkAdvCount(adv_idle_energy) then return 7 end -- 是否有体力
... ... @@ -962,6 +963,9 @@ function _M.roleFormatRpc(agent , data)
962 963 local index = msg.index -- 阵容索引
963 964 local title = msg.title -- 阵容名称
964 965 local team = {}
  966 +
  967 + if role:getAdvData():isRunning() then return 3 end
  968 +
965 969 for slot, heroId in pairs(msg.heros) do
966 970 if not role.heros[heroId] then
967 971 return 1
... ... @@ -1004,6 +1008,9 @@ function _M.selectTeamRpc(agent, data)
1004 1008 local role = agent.role
1005 1009 local msg = MsgPack.unpack(data)
1006 1010 local index = msg.index -- 阵容索引
  1011 +
  1012 + if role:getAdvData():isRunning() then return 1 end
  1013 +
1007 1014 local team = role:getAdvTeamFormat(index)
1008 1015 if not next(team) then return end
1009 1016 team["index"] = index
... ...
src/actions/GmAction.lua
  Show/Hide comments   View file @a8e6aef
... ... @@ -40,26 +40,15 @@ function _M.ban(role, pms)
40 40 local time = tonum(pms.pm1, 1)
41 41 local ctype = tonum(pms.pm2, 0)
42 42  
43   - local isBan = role:getProperty("banTime") <= now
44 43 role:setBan(time, ctype)
45   - if time > 0 then
46   - role:sendGmMsg("server_accountBanned_1")
47   - local agent = datacenter.get("agent", role:getProperty("id"))
48   - if agent then
49   - skynet.timeout(50, function ()
50   - skynet.call(agent.gate_serv, "lua", "forcekick", agent.fd)
51   - end)
52   - end
53   - end
54   -
55 44 role:mylog("gm_action", {desc = "ban", int1 = time, int2 = ctype, key1 = pms.sender})
56   -
57   - return isBan and "解封杀成功" or "封杀成功"
  45 + return "封杀成功"
58 46 end
59 47  
  48 +
60 49 function _M.unban(role, pms)
61 50 role:setBan(0, 0)
62   -
  51 + role:setProperty("cheatCount", 0) -- 清除作弊次数
63 52 role:mylog("gm_action", {desc = "unban", key1 = pms.sender})
64 53  
65 54 return "解封杀成功"
... ... @@ -67,18 +56,17 @@ end
67 56  
68 57 function _M.gmmsg(role, pms)
69 58 role:sendGmMsg(pms.pm1, true)
70   -
71   - local agent = datacenter.get("agent", role:getProperty("id"))
72   - if agent then
73   - skynet.timeout(50, function ()
74   - skynet.call(agent.gate_serv, "lua", "forcekick", agent.fd)
75   - end)
76   - end
77 59 role:mylog("gm_action", {desc = "gmmsg", text1 = pms.pm1, key1 = pms.sender})
78   -
79 60 return "指令成功"
80 61 end
81 62  
  63 +
  64 +function _M.reset_rank(role, pms)
  65 + role:resetRank()
  66 + role:mylog("gm_action", {desc = "reset_rank", key1 = pms.sender})
  67 + return "封杀成功"
  68 +end
  69 +
82 70 function _M.silent(role, pms)
83 71 local pm1 = tonum(pms.pm1)
84 72 if pm1 < 1 then
... ...
src/actions/HangAction.lua
  Show/Hide comments   View file @a8e6aef
... ... @@ -235,6 +235,16 @@ function _M.endBattleRpc(agent, data)
235 235 return 4
236 236 end
237 237  
  238 + -- 防作弊
  239 + if not role:checkBattleCheat("hang", {
  240 + id = carbonId,
  241 + isWin = isWin,
  242 + info = msg.info
  243 + }) then
  244 + SendPacket(actionCodes.Hang_endBattleRpc, MsgPack.pack({errorCode = 1}))
  245 + return true
  246 + end
  247 +
238 248 local reward, change
239 249 if isWin then --win
240 250 role:hangFinish(carbonId)
... ... @@ -607,6 +617,18 @@ function _M.endBonusBattleRpc(agent, data)
607 617 SendPacket(actionCodes.Hang_endBonusBattleRpc, MsgPack.pack({errorCode = 1}))
608 618 return true
609 619 end
  620 + role.__bonusBattleCache = nil
  621 +
  622 + -- 防作弊
  623 + if not role:checkBattleCheat("bonus", {
  624 + id = id,
  625 + isWin = starNum and starNum > 0,
  626 + info = msg.info
  627 + }) then
  628 + SendPacket(actionCodes.Hang_endBonusBattleRpc, MsgPack.pack({errorCode = 1}))
  629 + return true
  630 + end
  631 +
610 632 local bonusData = csvdb["bonus_battleCsv"][id]
611 633  
612 634 local reward, change = {}
... ...
src/actions/PvpAction.lua
  Show/Hide comments   View file @a8e6aef
... ... @@ -372,6 +372,16 @@ function _M.endBattleRpc(agent, data)
372 372  
373 373 if not match then return end
374 374  
  375 + -- 防作弊
  376 + if not role:checkBattleCheat("pvpc", {
  377 + isWin = isWin,
  378 + info = msg.info,
  379 + format = _pvpStartBattleCacheC.pvpTC,
  380 + }) then
  381 + SendPacket(actionCodes.Pvp_endBattleRpc, MsgPack.pack({errorCode = 1}))
  382 + return true
  383 + end
  384 +
375 385 local temp = string.randWeight(csvdb["player_expCsv"][role:getProperty("level")].pvpBonus, true)
376 386 local reward, change = role:award({[temp[1]] = temp[2]}, {log = {desc = "pvpBattleC"}})
377 387 local myScore, matchScore, oldmyScore, oldMatchScore, myRank, oldMyRank = 0, 0, 0, 0, -1, -1
... ... @@ -652,13 +662,22 @@ function _M.endBattleHRpc(agent, data)
652 662 end
653 663 end
654 664  
  665 + -- 防作弊
  666 + if not role:checkBattleCheat("pvph", {
  667 + isWin = isWin,
  668 + info = msg.info,
  669 + format = _pvpStartBattleCacheH.pvpTH[#_pvpStartBattleCacheH.result]
  670 + }) then
  671 + SendPacket(actionCodes.Pvp_endBattleHRpc, MsgPack.pack({errorCode = 1}))
  672 + return true
  673 + end
  674 +
655 675 if winCount >= 2 then
656 676 isWin = true
657 677 elseif loseCount >= 2 then
658 678 isWin = false
659 679 else -- 没结束
660 680 -- 返回继续战斗
661   -
662 681 local key = tostring(math.random())
663 682 _pvpStartBattleCacheH.key = key
664 683 local round = #_pvpStartBattleCacheH.result + 1
... ...
src/actions/StoreAction.lua
  Show/Hide comments   View file @a8e6aef
... ... @@ -232,6 +232,13 @@ function _M.getFreeChestRpc(agent, data)
232 232 local config = csvdb["shop_rechargeCsv"][id]
233 233 if not config then return end
234 234  
  235 + --判断是否是活动商品
  236 + if config.activity_id ~= 0 then
  237 + local actCfg = csvdb["activity_ctrlCsv"][config.activity_id]
  238 + if not actCfg then return 2 end
  239 + if not role.activity:isOpenById(config.activity_id, "ActShopGoods") then return 3 end
  240 + end
  241 +
235 242 local rechargeRecord = role.storeData:getProperty("payR")
236 243 local getCount = (rechargeRecord[id] or 0)
237 244 if getCount >= config.limit then
... ...
src/actions/TowerAction.lua
  Show/Hide comments   View file @a8e6aef
... ... @@ -65,6 +65,15 @@ function _M.endBattleRpc(agent, data)
65 65 local curTower = csvdb["tower_battleCsv"][id]
66 66 if not curTower then return 2 end
67 67  
  68 + -- 防作弊
  69 + if not role:checkBattleCheat("tower", {
  70 + isWin = msg.starNum and msg.starNum > 0,
  71 + info = msg.info
  72 + }) then
  73 + SendPacket(actionCodes.Tower_endBattleRpc, MsgPack.pack({errorCode = 1}))
  74 + return true
  75 + end
  76 +
68 77 local curCount, nextTime = getUpdateTime(towerInfo.c, towerInfo.t)
69 78  
70 79  
... ...
src/adv/Adv.lua
  Show/Hide comments   View file @a8e6aef
... ... @@ -140,12 +140,8 @@ function Adv:initByChapter(params)
140 140 local chapter = self:isEndless() and -1 or self.chapterId
141 141 if not (advRelay[chapter] or {})[self.level] then
142 142 isNewRelay = true
143   - advRelay[chapter] = advRelay[chapter] or {}
144   - advRelay[chapter][self.level] = 1
145   - self.owner:updateProperty({field = "advRelay", value = advRelay})
146 143 end
147 144 end
148   -
149 145 self.maps = {}
150 146 self.maps[1] = AdvMap.new(self, 1, mapId, isEnter, isNewRelay)
151 147  
... ... @@ -153,8 +149,6 @@ function Adv:initByChapter(params)
153 149  
154 150 self:initLayerTask()
155 151  
156   -
157   -
158 152 self:checkTask(Adv.TaskType.Arrive)
159 153 self:checkAdvUnlock(1, self.level)
160 154  
... ... @@ -168,6 +162,20 @@ function Adv:initByChapter(params)
168 162 end
169 163 end
170 164  
  165 +function Adv:passAdvRelay()
  166 + local advRelay = self.owner:getProperty("advRelay")
  167 + local chapter = self:isEndless() and -1 or self.chapterId
  168 + if not (advRelay[chapter] or {})[self.level] then
  169 + advRelay[chapter] = advRelay[chapter] or {}
  170 + advRelay[chapter][self.level] = 1
  171 + self.owner:updateProperty({field = "advRelay", value = advRelay})
  172 + local relayData = self:isHaveRelay()
  173 + if relayData and relayData.award ~= "" then
  174 + self:pushBackEvent(AdvBackEventType.RelayReward, {items = self:award(relayData.award:toNumMap(), {log = {desc = "relayReward"}})})
  175 + end
  176 + end
  177 +end
  178 +
171 179 function Adv:clear()
172 180 self.chapterId = nil
173 181 self.level = nil
... ... @@ -400,7 +408,7 @@ function Adv:forceOver(notNotify)
400 408 for itemId, count in pairs(reward) do
401 409 reward[itemId] = math.ceil(count * globalCsv.adv_fail_reward_ratio / 100) -- 奖励相当于失败
402 410 end
403   - self.owner:award(reward, {log = {desc = "advOver", int1 = self.chapterId}})
  411 + self.owner:award(reward, {log = {desc = "advOver", int1 = self.chapterId}, notNotify = notNotify})
404 412  
405 413 self:clear()
406 414 self.owner:updateProperties({
... ... @@ -963,7 +971,7 @@ function Adv:award(gift, params, backRewardParams)
963 971  
964 972 local autoUse = {}
965 973 for itemId, count in pairs(tgift) do
966   - if count > 0 then
  974 + if count > 0 and self.battle.player then
967 975 local buffAdd = self.battle.player:getRewardChange(itemId)
968 976 count = math.floor(math.max(0, (count + buffAdd[0]) * (1 + buffAdd[1]))) --附加 buff 的影响
969 977 self:checkTask(Adv.TaskType.Item, count, itemId)
... ... @@ -1124,6 +1132,7 @@ local function clickOut(self, room, block, params, isExit)
1124 1132 end
1125 1133  
1126 1134 if not self:isEndless() and (self.level >= csvdb["adv_chapterCsv"][self.chapterId].limitlevel) then --关卡结束
  1135 + self:passAdvRelay()
1127 1136 self:over(true)
1128 1137 else
1129 1138 self.battle.player:triggerPassive(Passive.DOWN_LAYER)
... ... @@ -1676,10 +1685,7 @@ function Adv:clickBlock(roomId, blockId, params)
1676 1685 if self.isRelay or checkAroundBlocks() then --开放
1677 1686 self:getCurMap():openBlock(roomId, blockId, true, true)
1678 1687 if self.isRelay and self:getCurMap():isAllOpen() then -- 发放翻开的奖励
1679   - local relayData = self:isHaveRelay()
1680   - if relayData and relayData.award ~= "" then
1681   - self:pushBackEvent(AdvBackEventType.RelayReward, {items = self:award(relayData.award:toNumMap(), {log = {desc = "relayReward"}})})
1682   - end
  1688 + self:passAdvRelay()
1683 1689 end
1684 1690 status = true
1685 1691 end
... ...
src/adv/AdvBlock.lua
  Show/Hide comments   View file @a8e6aef
... ... @@ -60,9 +60,9 @@ function Block:updateEvent(event, isInit)
60 60 end
61 61 self:randomEvent()
62 62 end
63   - self:quickDrop()
64 63  
65 64 if not isInit and self.isOpen then
  65 + self:quickDrop()
66 66 local newet = self:getEventType()
67 67 if oldet ~= newet then
68 68 local em = {}
... ...
src/adv/AdvPassive.lua
  Show/Hide comments   View file @a8e6aef
... ... @@ -532,7 +532,7 @@ function Passive:effect8(dropId)
532 532 end
533 533  
534 534 --9=直接获得item（可在结算触发时使用）
535   -function Passive:effect9(itemId, triggerPms, ratio, max)
  535 +function Passive:effect9(itemId, triggerPms, ratio, ratio2, max)
536 536 local cond = nil
537 537 if self.passiveData.value == 0 then
538 538 cond = triggerPms.score
... ... @@ -542,7 +542,7 @@ function Passive:effect9(itemId, triggerPms, ratio, max)
542 542 return
543 543 end
544 544 if not cond then return end
545   - self.owner.battle.adv:award({[itemId] = math.floor(math.max(0, math.min(max, cond / ratio)))}, {log = {desc = "passive", int1 = self.id}}, {roomId = self.owner.roomId, blockId = self.owner.blockId})
  545 + self.owner.battle.adv:award({[itemId] = math.floor(math.max(0, math.min(max, cond / ratio * ratio2)))}, {log = {desc = "passive", int1 = self.id}}, {roomId = self.owner.roomId, blockId = self.owner.blockId})
546 546 end
547 547  
548 548 --10=战斗额外掉落次数
... ...
src/models/Activity.lua
  Show/Hide comments   View file @a8e6aef
... ... @@ -482,6 +482,9 @@ activityFunc[Activity.ActivityType.Exchange] = {
482 482 actData[actId] = {}
483 483 self:updateActData(actType, actData, not notify)
484 484 end,
  485 + ["login"] = function(self, actType, actId)
  486 + activityFunc[Activity.ActivityType.Exchange]["crossDay"](self, actType, true, actId)
  487 + end,
485 488 ["crossDay"] = function(self, actType, notify, actId)
486 489 local actData = self:getActData(actType) or {}
487 490 local lastTs = actData["ts"] or 0
... ... @@ -490,14 +493,14 @@ activityFunc[Activity.ActivityType.Exchange] = {
490 493 if not cfg then return end
491 494 local refreshTimes = cfg.condition2:toArray(false, "=")
492 495 for i = 1, #refreshTimes do
493   - local rt = toUnixtime(refreshTimes[1]..string_format("%02x", RESET_TIME))
  496 + local rt = toUnixtime(refreshTimes[i]..string_format("%02x", RESET_TIME))
494 497 if timeNow >= rt and rt > lastTs then
495 498 lastTs = rt
496 499 actData = {}
497 500 end
498 501 end
499   - if next(actData) then
500   - actData["ts"] = lastTs
  502 + if not next(actData) then
  503 + actData["ts"] = timeNow
501 504 self:updateActData(actType, actData, not notify)
502 505 end
503 506 end,
... ...
src/models/Role.lua
  Show/Hide comments   View file @a8e6aef
... ... @@ -53,10 +53,11 @@ Role.schema = {
53 53 banTime = {"number", 0},
54 54 banType = {"number", 0},
55 55 heartWarning = {"number", 0},
  56 + cheatCount = {"number", 0},
56 57 ltime = {"number", 0}, -- 最后登录时间
57 58 ctime = {"number", skynet.timex()}, -- 创建时间
58 59 ignoreMt = {"number", 0}, -- 忽略维护拦截
59   - sversion = {"number", globalCsv.StructVersion or 0}, -- 重整数据版本
  60 + sversion = {"number", STRUCT_VERSION or 0}, -- 重整数据版本
60 61 timeReset = {"table", {}}, --重置轮回记录
61 62 diamond = {"number", 0},
62 63 reDiamond = {"number", 0},
... ... @@ -355,6 +356,7 @@ function Role:data()
355 356 advSup = self:getProperty("advSup"),
356 357 advC = self:getProperty("advC"),
357 358 advCT = self:getProperty("advCT"),
  359 + advRelay = self:getProperty("advRelay"),
358 360  
359 361 hangPass = self:getProperty("hangPass"),
360 362 hangGift = self:getProperty("hangGift"),
... ...
src/models/RoleBattle.lua
  Show/Hide comments   View file @a8e6aef
... ... @@ -21,13 +21,153 @@ local BattleType = {
21 21  
22 22 RoleBattle.bind = function (Role)
23 23  
  24 +local checkCheatAttrs = {
  25 + ["hp"] = 1,
  26 + ["atk"] = 1,
  27 + ["def"] = 1,
  28 + ["hit"] = 1,
  29 + ["miss"] = 1,
  30 + ["crit"] = 1,
  31 + ["atkSpeed"] = 1,
  32 + ["critHurt"] = 1,
  33 + -- ["vampire"] = 1,
  34 + -- ["pierce"] = 1,
  35 +}
24 36  
25   --- TODO 检查战斗是否作弊
26   -local function checkBattleCheat()
27   -
  37 +local function checkOneCheat(selfTeamClient, selfTeamServer, enemyClient, enemyServer)
  38 + if not selfTeamClient or type(selfTeamClient) ~= "table" then return end
  39 + for unitType, clientInfo in pairs(selfTeamClient) do
  40 + local serverInfo = selfTeamServer[unitType]
  41 + if not serverInfo then return end
  42 + for attr, pm in pairs(checkCheatAttrs) do
  43 + if not clientInfo[attr] then return end
  44 + end
  45 + local b1 = ((clientInfo["hp"] + clientInfo["def"] * 7 + clientInfo["miss"] * 4) * (clientInfo["atk"] * 4 + clientInfo["hit"] * 2) * (1 + clientInfo["crit"]/100 * clientInfo["critHurt"]/100) * clientInfo["atkSpeed"] / 600000) ^ 0.8
  46 + local b2 = ((serverInfo["hp"] + serverInfo["def"] * 7 + serverInfo["miss"] * 4) * (serverInfo["atk"] * 4 + serverInfo["hit"] * 2) * (1 + serverInfo["crit"]/100 * serverInfo["critHurt"]/100) * serverInfo["atkSpeed"] / 600000) ^ 0.8
  47 + if b1 >= b2 * 2 then
  48 + return
  49 + end
  50 + end
  51 + return true
28 52 end
29 53  
  54 +-- local function getRobotAttrs(info, strength)
  55 +-- strength = strength or 10000
  56 +-- local unitData = csvdb["unitCsv"][info.unitType]
  57 +-- local enemy = {}
  58 +-- for arr, _ in pairs(checkCheatAttrs) do
  59 +-- enemy[arr] = unitData[attr] * info[attr] * strength / 10000
  60 +-- end
  61 +-- return enemy
  62 +-- end
  63 +
  64 +-- --通过配表构建敌人队伍 通用
  65 +-- function BattleEnter:packBattleEnemyCommon( carbonData )
  66 +-- local enemys = {}
  67 +-- local monsterSet = csvdb[carbonData.monster:match("/([^/]*)$") .. "Csv"]
  68 +-- for phase = 1, #monsterSet do
  69 +-- local allEnemys = table.values(monsterSet[phase])
  70 +-- table.sort(allEnemys, function(a, b) return a.id < b.id end)
  71 +-- local heros = {}
  72 +-- for idx, enemy in ipairs(allEnemys) do
  73 +-- local info = getRobotAttrs(enemy, carbonData.strength)
  74 +-- enemys[idx] = info
  75 +-- end
  76 +-- break
  77 +-- end
  78 +-- return enemys
  79 +-- end
  80 +
  81 +-- 检查战斗是否作弊
  82 +function Role:checkBattleCheat(battleType, params)
  83 + if not params.isWin then return true end
  84 + local clientInfo = params.info or {}
  85 +
  86 + if not BattleType[battleType] then
  87 + print(string.format("NO find battleType: %s", battleType))
  88 + return true
  89 + end
  90 + local selfTeamServer = {}
  91 + local enemyServer = {}
  92 +
  93 + local cheat = {}
  94 + cheat["hang"] = function()
  95 + local team = self:getTeamBattleInfo(self:getTeamFormatByType(TeamSystemType.Hang))
  96 + for slot, hero in pairs(team.heros) do
  97 + local temp = {}
  98 + for arr, _ in pairs(checkCheatAttrs) do
  99 + temp[arr] = hero[arr]
  100 + end
  101 + selfTeamServer[hero.type] = temp
  102 + end
  103 + -- local carbonData = csvdb["idle_battleCsv"][params.id]
  104 + -- enemyServer = packBattleEnemyCommon(carbonData)
  105 + end
  106 + cheat["tower"] = function()
  107 + local team = self:getTeamBattleInfo(self:getTeamFormatByType(TeamSystemType.Tower))
  108 + for slot, hero in pairs(team.heros) do
  109 + local temp = {}
  110 + for arr, _ in pairs(checkCheatAttrs) do
  111 + temp[arr] = hero[arr]
  112 + end
  113 + selfTeamServer[hero.type] = temp
  114 + end
  115 + -- local carbonData = csvdb["tower_battleCsv"][params.id]
  116 + -- enemyServer = packBattleEnemyCommon(carbonData)
  117 + end
  118 + cheat["bonus"] = function()
  119 + local team = self:getTeamBattleInfo(self:getTeamFormatByType(TeamSystemType.BonusBattle))
  120 + for slot, hero in pairs(team.heros) do
  121 + local temp = {}
  122 + for arr, _ in pairs(checkCheatAttrs) do
  123 + temp[arr] = hero[arr]
  124 + end
  125 + selfTeamServer[hero.type] = temp
  126 + end
  127 + -- local carbonData = csvdb["bonus_battleCsv"][params.id]
  128 + -- enemyServer = packBattleEnemyCommon(carbonData)
  129 + end
  130 + cheat["pvpc"] = function()
  131 + if not params.format then return end
  132 + local team = self:getTeamBattleInfo(params.format)
  133 + for slot, hero in pairs(team.heros) do
  134 + local temp = {}
  135 + for arr, _ in pairs(checkCheatAttrs) do
  136 + temp[arr] = hero[arr]
  137 + end
  138 + selfTeamServer[hero.type] = temp
  139 + end
  140 + end
  141 + cheat["pvph"] = cheat["pvpc"]
  142 + cheat["act_battle"] = cheat["pvpc"]
  143 +
  144 + cheat[battleType]()
30 145  
  146 + local status = checkOneCheat(clientInfo.selfAttr, selfTeamServer, clientInfo.enemyAttr, enemyServer)
  147 + if not status then
  148 + local cheatCount = self:getProperty("cheatCount")
  149 + cheatCount = cheatCount + 1
  150 + self:setProperty("cheatCount", cheatCount)
  151 +
  152 + local result = {clientSelf = {}, serverSelf = {}}
  153 + for k , v in pairs(clientInfo.selfAttr) do
  154 + result.clientSelf[tostring(k)] = v
  155 + end
  156 + for k , v in pairs(selfTeamServer) do
  157 + result.serverSelf[tostring(k)] = v
  158 + end
  159 + result = json.encode(result)
  160 + self:mylog("cheat", {desc = battleType, int1 = cheatCount, text1 = result})
  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
  168 + end
  169 + return status
  170 +end
31 171  
32 172 function Role:checkBattle(battleType, params)
33 173 local clientInfo = params.info or {}
... ...
src/models/RoleChangeStruct.lua
  Show/Hide comments   View file @a8e6aef
... ... @@ -31,6 +31,7 @@ local awardGift = createVersionFunc(VersionType.Override ,function(role, params)
31 31 print("awardGift" .. " >>> " .. params)
32 32 end)
33 33  
  34 +
34 35 local bugFixSuduku = createVersionFunc(VersionType.DoOnly, function(role, params)
35 36 local sudoku = role:getProperty("sudoku")
36 37 local phase = sudoku[-1] or 1
... ... @@ -65,12 +66,21 @@ local bugFixRune = createVersionFunc(VersionType.DoOnly, function(role, params)
65 66 -- 补偿
66 67 end
67 68 end)
  69 +
  70 +-- 清除 player 消失 的冒险
  71 +local bugFixAdvPlayer = createVersionFunc(VersionType.Override, function(role, params)
  72 + if role:getAdvData():isRunning() and not role:getProperty("advTeam").player then
  73 + role:getAdvData():forceOver(true)
  74 + end
  75 +end)
  76 +
68 77 ---------------------版本方法 end ----------------------
69 78  
70 79 -- version 罗列start
71 80 local versionList = {} -- version 列表
72 81 versionList[1] = {bugFixSuduku, {}}
73 82 versionList[2] = {bugFixRune, {}}
  83 +versionList[3] = {bugFixAdvPlayer, {}}
74 84 -- versionList[2] = {clearActivity, {5, 7}}
75 85 -- versionList[3] = {changeStructF, "test1"}
76 86 -- versionList[4] = {changeStructF, "test2"}
... ... @@ -87,11 +97,11 @@ function RoleChangeStruct.bind(Role)
87 97  
88 98 function Role:changeStructVersion()
89 99 local curVersion = self:getProperty("sversion")
90   - if not globalCsv.StructVersion or curVersion >= globalCsv.StructVersion then return end
  100 + if not STRUCT_VERSION or curVersion >= STRUCT_VERSION then return end
91 101  
92 102 local jumpVersion = {}
93 103 local versionTemp = {}
94   - for version = curVersion + 1, globalCsv.StructVersion do
  104 + for version = curVersion + 1, STRUCT_VERSION do
95 105 local versionData = versionList[version]
96 106 if versionData then
97 107 if versionData[1].vType == VersionType.DoOnly then
... ... @@ -124,7 +134,7 @@ function RoleChangeStruct.bind(Role)
124 134 end
125 135 end
126 136  
127   - for version = curVersion + 1, globalCsv.StructVersion do
  137 + for version = curVersion + 1, STRUCT_VERSION do
128 138 if not jumpVersion[version] then
129 139 local versionData = versionList[version]
130 140 if versionData[1].vType == VersionType.DoOnly or versionData[1].vType == VersionType.Override then
... ... @@ -134,7 +144,7 @@ function RoleChangeStruct.bind(Role)
134 144 end
135 145 end
136 146 end
137   - self:setProperty("sversion", globalCsv.StructVersion)
  147 + self:setProperty("sversion", STRUCT_VERSION)
138 148 end
139 149  
140 150 end
... ...
src/models/RoleLog.lua
  Show/Hide comments   View file @a8e6aef
... ... @@ -592,6 +592,7 @@ local LogType = {
592 592 guide = "common",
593 593 newdevice = "common",
594 594 cbback = "common",
  595 + cheat = "common",
595 596  
596 597 in_item = "common",
597 598 out_item = "common",
... ...
src/models/RolePlugin.lua
  Show/Hide comments   View file @a8e6aef
... ... @@ -286,7 +286,7 @@ function RolePlugin.bind(Role)
286 286 print("addPlayExp no log ", debug.traceback())
287 287 end
288 288  
289   - self:updateProperties({level = level, exp = newExp})
  289 + self:updateProperties({level = level, exp = newExp}, params.notNotify)
290 290 self:changeCrossServerPvpSelfInfo("level")
291 291 end
292 292  
... ... @@ -387,7 +387,7 @@ function RolePlugin.bind(Role)
387 387 end
388 388  
389 389 if update then
390   - self:updateProperty({field = "boxL", value = boxL})
  390 + self:updateProperty({field = "boxL", value = boxL, notNotify = pms.notNotify})
391 391 end
392 392 end
393 393  
... ... @@ -830,7 +830,6 @@ function RolePlugin.bind(Role)
830 830 self:setProperty("heartWarning", heartWarning)
831 831 if heartWarning == 50 then
832 832 self:setBan(30, 1) --封禁 30天
833   - self:sendGmMsg("server_accountBanned_inGame_1")
834 833 return
835 834 end
836 835 if heartWarning < 50 and heartWarning % 5 == 0 then
... ... @@ -843,21 +842,52 @@ function RolePlugin.bind(Role)
843 842 time = time or 0
844 843 banType = banType or 0
845 844 local now = skynet.timex()
846   - if time == 0 then
  845 + if time <= 0 then
847 846 self:setProperty("banTime", 0)
848 847 self:setProperty("banType", 0)
849 848 self:setProperty("heartWarning", 0)
850   -
851 849 self:mylog("role_action", {desc = "ban_rm"})
852 850 else
853   - self:setProperty("banTime", now + 86400 * time)
  851 + self:sendGmMsg(globalCsv.ban_tips[banType] or globalCsv.ban_tips[0])
  852 + self:setProperty("banTime", math.ceil(now + 86400 * time))
854 853 self:setProperty("banType", banType)
855   - self:mylog("role_action", {desc = "ban", int1 = time, int2 = banType})
  854 + self:resetRank()
  855 + self:mylog("role_action", {desc = "ban", int1 = math.ceil(time), int2 = banType})
856 856 end
857 857 end
858 858  
  859 + -- 清掉所有排行榜
  860 + function Role:resetRank()
  861 + local roleId = self:getProperty("id")
  862 + redisproxy:pipelining(function (red)
  863 + red:zrem(RANK_TOWER, roleId)
  864 + for _, rk in pairs(RANK_ADV) do
  865 + red:zrem(rk, roleId)
  866 + end
  867 + for _, rk in pairs(RANK_DINER) do
  868 + red:zrem(rk, roleId)
  869 + end
  870 + for _, rk in pairs(RANK_PVP_COMMON_KEY) do
  871 + red:zrem(rk, roleId)
  872 + end
  873 + for _, rk in pairs(RANK_PVP_HIGHT_KEY) do
  874 + red:zrem(rk, roleId)
  875 + end
  876 + for _, ct in pairs(RANK_TYPE) do
  877 + red:zrem(RANK_COMMON .. ct, roleId)
  878 + end
  879 + end)
  880 + end
  881 +
859 882 function Role:sendGmMsg(text, isNotKey)
860 883 SendPacket(actionCodes.Sys_maintainNotice, MsgPack.pack({ body = text, iskey = not isNotKey}))
  884 +
  885 + local agent = datacenter.get("agent", self:getProperty("id"))
  886 + if agent then
  887 + skynet.timeout(50, function ()
  888 + skynet.call(agent.gate_serv, "lua", "forcekick", agent.fd)
  889 + end)
  890 + end
861 891 end
862 892  
863 893 -- function Role:getHeroActiveRelationData(heros)
... ... @@ -1674,6 +1704,9 @@ function RolePlugin.bind(Role)
1674 1704 local dataSet = csvdb["shop_rechargeCsv"][rechargeId]
1675 1705  
1676 1706 if orderObject:getProperty("finishTime") > 0 then
  1707 + skynet.error(string.format("[recharge] is a finish order cpOrder: %s, platformOrder : %s, hadPlatformOrder: %s, id: %s, overTime : %s",
  1708 + partnerOrderStr, platformOrder, orderObject:getProperty("transactionId"), rechargeId, orderObject:getProperty("finishTime")
  1709 + ))
1677 1710 return false, "finsh"
1678 1711 end
1679 1712  
... ... @@ -1722,7 +1755,6 @@ function RolePlugin.bind(Role)
1722 1755 local roleId = self:getProperty("id")
1723 1756 local partnerOrderStr = params.order
1724 1757  
1725   -
1726 1758 local status, back = self:updatePurchaseOrder(partnerOrderStr, params.transactionId, "finsh")
1727 1759 if not status then
1728 1760 if back == "finsh" then
... ...