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

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

Merge branch 'tr/bugfix' into tr/publish/release
* tr/bugfix: 输出删掉登入刷新兑换活动商店兑换活动上线检测是否需要刷新修复存在的冒险进不去的玩家兑换商店不刷新bug 新增倍数 bugfix 同单号充值输出 relay 修改中继营地解锁条件防作弊活动战斗结束不发送战斗奖励活动免费礼包判断活动是否开启 # Conflicts: # src/csvdata
zhouhaihai
2 parents a42753c3 b2de779a
Showing 17 changed files with 324 additions and 61 deletions Show diff stats
src/GlobalVar.lua
src/actions/ActivityAction.lua
src/actions/AdvAction.lua
src/actions/GmAction.lua
src/actions/HangAction.lua
src/actions/PvpAction.lua
src/actions/StoreAction.lua
src/actions/TowerAction.lua
src/adv/Adv.lua
src/adv/AdvBlock.lua
src/adv/AdvPassive.lua
src/models/Activity.lua
src/models/Role.lua
src/models/RoleBattle.lua
src/models/RoleChangeStruct.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
@@ -16,6 +16,7 @@ TIME_ZONE = math.floor(os.difftime(START_RESET_TIME_BASE, os.time(os.date(&quot;!*t&quot;,
 START_RESET_TIME = START_RESET_TIME_BASE - TIME_ZONE * 3600
+STRUCT_VERSION = 3 -- 数据结构版本
 MAX_ROLE_NUM = 1000000
 -- 属性枚举
@@ -511,6 +511,7 @@ function _M.startBattleRpc(agent, data)
 			key = tostring(math.random()),
 			actid = actid,
 			id = id,
+			format = msg.format,
 		}
 		SendPacket(actionCodes.Activity_startBattleRpc, MsgPack.pack({key = role.__actBattleCache.key}))
 	else
@@ -568,7 +569,10 @@ function _M.endBattleRpc(agent, data)
 	local isWin = msg.isWin
 	local heros = msg.heros
 	local support = msg.support
-	if not role.activity:isOpenById(actid, "ChallengeLevel") then return 1 end
+	if not role.activity:isOpenById(actid, "ChallengeLevel") then
+		SendPacket(actionCodes.Activity_endBattleRpc, MsgPack.pack({}))
+		return true
+	end
 	if not role.__actBattleCache then return 2 end
@@ -576,6 +580,18 @@ function _M.endBattleRpc(agent, data)
 		SendPacket(actionCodes.Activity_endBattleRpc, MsgPack.pack({errorCode = 1}))
 	end
+	-- 防作弊
+	if not role:checkBattleCheat("act_battle", {
+		id = id,
+		isWin = isWin,
+		info = msg.info,
+		format = role.__actBattleCache.format
+	}) then
+		SendPacket(actionCodes.Hang_endBonusBattleRpc, MsgPack.pack({errorCode = 1}))
+		return true
+	end
+	role.__actBattleCache = nil
+
 	local actCfg = csvdb["activity_battleCsv"][actid]
 	if not actCfg then return 3 end
@@ -137,7 +137,8 @@ function _M.startAdvRpc( agent, data )
 		local relayData = role:getAdvData():isHaveRelay(layer, chapterId, true) 
 		if not relayData then return 6 end  -- 不是中继层
 		if layer ~= 1 then
-			if (advPass[chapterId] or 0) < relayData.floor then return 21 end
+			local advRelay = role:getProperty("advRelay") 
+			if not (advRelay[chapterId] or {})[layer] then return 21 end -- 没有开放
 		end
 		if not role:checkAdvCount(relayData.supply) then return 2 end -- 是否有体力
 		-- 关卡开放判断
@@ -191,7 +192,7 @@ function _M.startHangRpc(agent, data)
 	local format = msg.format --编队
 	local index = msg.index or 1--时间索引id
-	local chapterData = csvdb["adv_chapter_campsiteCsv"][chapterId]
+	local chapterData = csvdb["adv_chapter_campsiteCsv"][chapterId] 
 	if not chapterData then return 1 end
 	local campSiteData = chapterData[campId]
 	if not campSiteData then return 1 end
@@ -213,7 +214,7 @@ function _M.startHangRpc(agent, data)
 	if AdvCommon.isEndless(chapterId) then return 5 end -- 无尽没有代理
 	local advRelay = role:getProperty("advRelay") 
-	if not next(advRelay[chapterId] or {}) then return 6 end -- 没有开放
+	if not (advRelay[chapterId] or {})[campSiteData.floor] then return 6 end -- 没有开放
 	if not role:checkAdvCount(adv_idle_energy) then return 7 end -- 是否有体力
@@ -962,6 +963,9 @@ function _M.roleFormatRpc(agent , data)
 	local index = msg.index	-- 阵容索引
 	local title = msg.title -- 阵容名称
 	local team = {}
+
+	if role:getAdvData():isRunning() then return 3 end
+
 	for slot, heroId in pairs(msg.heros) do
 		if not role.heros[heroId] then
 			return 1
@@ -1004,6 +1008,9 @@ function _M.selectTeamRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
 	local index = msg.index	-- 阵容索引
+
+	if role:getAdvData():isRunning() then return 1 end
+
 	local team = role:getAdvTeamFormat(index)
 	if not next(team) then return end
 	team["index"] = index
@@ -40,26 +40,15 @@ function _M.ban(role, pms)
 	local time = tonum(pms.pm1, 1)
 	local ctype = tonum(pms.pm2, 0)
-	local isBan = role:getProperty("banTime") <= now
 	role:setBan(time, ctype)
-	if time > 0 then
-		role:sendGmMsg("server_accountBanned_1")
-		local agent = datacenter.get("agent", role:getProperty("id"))
-		if agent then
-			skynet.timeout(50, function ()
-				skynet.call(agent.gate_serv, "lua", "forcekick", agent.fd)
-			end)
-		end
-	end
-
 	role:mylog("gm_action", {desc = "ban", int1 = time, int2 = ctype, key1 = pms.sender})
-
-	return isBan and "解封杀成功" or "封杀成功"
+	return "封杀成功"
 end
+
 function _M.unban(role, pms)
 	role:setBan(0, 0)
-
+	role:setProperty("cheatCount", 0) -- 清除作弊次数
 	role:mylog("gm_action", {desc = "unban", key1 = pms.sender})
 	return "解封杀成功"
@@ -67,18 +56,17 @@ end
 function _M.gmmsg(role, pms)
 	role:sendGmMsg(pms.pm1, true)
-
-	local agent = datacenter.get("agent", role:getProperty("id"))
-	if agent then
-		skynet.timeout(50, function ()
-			skynet.call(agent.gate_serv, "lua", "forcekick", agent.fd)
-		end)
-	end
 	role:mylog("gm_action", {desc = "gmmsg", text1 = pms.pm1, key1 = pms.sender})
-
 	return "指令成功"
 end
+
+function _M.reset_rank(role, pms)
+	role:resetRank()
+	role:mylog("gm_action", {desc = "reset_rank",  key1 = pms.sender})
+	return "封杀成功"
+end
+
 function _M.silent(role, pms)
 	local pm1 = tonum(pms.pm1)
 	if pm1 < 1 then
@@ -235,6 +235,16 @@ function _M.endBattleRpc(agent, data)
 		return 4
 	end
+	-- 防作弊
+	if not role:checkBattleCheat("hang", {
+		id = carbonId,
+		isWin = isWin,
+		info = msg.info
+	}) then
+		SendPacket(actionCodes.Hang_endBattleRpc, MsgPack.pack({errorCode = 1}))
+		return true
+	end
+
 	local reward, change
 	if isWin then --win
 		role:hangFinish(carbonId)
@@ -607,6 +617,18 @@ function _M.endBonusBattleRpc(agent, data)
 		SendPacket(actionCodes.Hang_endBonusBattleRpc, MsgPack.pack({errorCode = 1}))
 		return true
 	end
+	role.__bonusBattleCache = nil
+
+	-- 防作弊
+	if not role:checkBattleCheat("bonus", {
+		id = id,
+		isWin = starNum and starNum > 0,
+		info = msg.info
+	}) then
+		SendPacket(actionCodes.Hang_endBonusBattleRpc, MsgPack.pack({errorCode = 1}))
+		return true
+	end
+
 	local bonusData = csvdb["bonus_battleCsv"][id]
 	local reward, change = {}
@@ -372,6 +372,16 @@ function _M.endBattleRpc(agent, data)
 	if not match then return end
+	-- 防作弊
+	if not role:checkBattleCheat("pvpc", {
+		isWin = isWin,
+		info = msg.info,
+		format = _pvpStartBattleCacheC.pvpTC,
+	}) then
+		SendPacket(actionCodes.Pvp_endBattleRpc, MsgPack.pack({errorCode = 1}))
+		return true
+	end
+
 	local temp = string.randWeight(csvdb["player_expCsv"][role:getProperty("level")].pvpBonus, true)
 	local reward, change = role:award({[temp[1]] = temp[2]}, {log = {desc = "pvpBattleC"}})
 	local myScore, matchScore, oldmyScore, oldMatchScore, myRank, oldMyRank = 0, 0, 0, 0, -1, -1
@@ -652,13 +662,22 @@ function _M.endBattleHRpc(agent, data)
 		end
 	end
+	-- 防作弊
+	if not role:checkBattleCheat("pvph", {
+		isWin = isWin,
+		info = msg.info,
+		format = _pvpStartBattleCacheH.pvpTH[#_pvpStartBattleCacheH.result]
+	}) then
+		SendPacket(actionCodes.Pvp_endBattleHRpc, MsgPack.pack({errorCode = 1}))
+		return true
+	end
+
 	if winCount >= 2 then
 		isWin = true
 	elseif loseCount >= 2 then
 		isWin = false
 	else -- 没结束
 		-- 返回继续战斗
-
 		local key = tostring(math.random())
 		_pvpStartBattleCacheH.key = key
 		local round = #_pvpStartBattleCacheH.result + 1
@@ -232,6 +232,13 @@ function _M.getFreeChestRpc(agent, data)
 	local config = csvdb["shop_rechargeCsv"][id]
 	if not config then return end
+	--判断是否是活动商品
+	if config.activity_id ~= 0 then
+		local actCfg = csvdb["activity_ctrlCsv"][config.activity_id]
+		if not actCfg then return 2 end
+		if not role.activity:isOpenById(config.activity_id, "ActShopGoods") then return 3 end
+	end
+
     local rechargeRecord = role.storeData:getProperty("payR")
 	local getCount = (rechargeRecord[id] or 0)
 	if getCount >= config.limit then
@@ -65,6 +65,15 @@ function _M.endBattleRpc(agent, data)
 	local curTower = csvdb["tower_battleCsv"][id] 
 	if not curTower then return 2 end
+	-- 防作弊
+	if not role:checkBattleCheat("tower", {
+		isWin = msg.starNum and msg.starNum > 0,
+		info = msg.info
+	}) then
+		SendPacket(actionCodes.Tower_endBattleRpc, MsgPack.pack({errorCode = 1}))
+		return true
+	end
+
 	local curCount, nextTime = getUpdateTime(towerInfo.c, towerInfo.t)
@@ -140,12 +140,8 @@ function Adv:initByChapter(params)
 		local chapter = self:isEndless() and -1 or self.chapterId
 		if not (advRelay[chapter] or {})[self.level] then
 			isNewRelay = true
-			advRelay[chapter] = advRelay[chapter] or {}
-			advRelay[chapter][self.level] = 1
-			self.owner:updateProperty({field = "advRelay", value = advRelay})
 		end
 	end
-
 	self.maps = {}
 	self.maps[1] = AdvMap.new(self, 1, mapId, isEnter, isNewRelay)
@@ -153,8 +149,6 @@ function Adv:initByChapter(params)
 	self:initLayerTask()
-
-
 	self:checkTask(Adv.TaskType.Arrive)
 	self:checkAdvUnlock(1, self.level)
@@ -168,6 +162,20 @@ function Adv:initByChapter(params)
 	end
 end
+function Adv:passAdvRelay()
+	local advRelay = self.owner:getProperty("advRelay")
+	local chapter = self:isEndless() and -1 or self.chapterId
+	if not (advRelay[chapter] or {})[self.level] then
+		advRelay[chapter] = advRelay[chapter] or {}
+		advRelay[chapter][self.level] = 1
+		self.owner:updateProperty({field = "advRelay", value = advRelay})
+		local relayData = self:isHaveRelay()
+		if relayData and relayData.award ~= "" then
+			self:pushBackEvent(AdvBackEventType.RelayReward, {items = self:award(relayData.award:toNumMap(), {log = {desc = "relayReward"}})})
+		end
+	end
+end
+
 function Adv:clear()
 	self.chapterId = nil
 	self.level = nil
@@ -400,7 +408,7 @@ function Adv:forceOver(notNotify)
 		for itemId, count in pairs(reward) do
 			reward[itemId] = math.ceil(count * globalCsv.adv_fail_reward_ratio / 100) -- 奖励相当于失败
 		end
-		self.owner:award(reward, {log = {desc = "advOver", int1 = self.chapterId}})
+		self.owner:award(reward, {log = {desc = "advOver", int1 = self.chapterId}, notNotify = notNotify})
 		self:clear()
 		self.owner:updateProperties({
@@ -963,7 +971,7 @@ function Adv:award(gift, params, backRewardParams)
 	local autoUse = {}
 	for itemId, count in pairs(tgift) do
-		if count > 0 then
+		if count > 0 and self.battle.player then
 			local buffAdd = self.battle.player:getRewardChange(itemId)
 			count = math.floor(math.max(0, (count + buffAdd[0]) * (1 + buffAdd[1]))) --附加 buff 的影响
 			self:checkTask(Adv.TaskType.Item, count, itemId)
@@ -1124,6 +1132,7 @@ local function clickOut(self, room, block, params, isExit)
 			end
 			if not self:isEndless() and (self.level >= csvdb["adv_chapterCsv"][self.chapterId].limitlevel) then --关卡结束
+				self:passAdvRelay()
 				self:over(true)
 			else
 				self.battle.player:triggerPassive(Passive.DOWN_LAYER)
@@ -1676,10 +1685,7 @@ function Adv:clickBlock(roomId, blockId, params)
 		if self.isRelay or checkAroundBlocks() then --开放
 			self:getCurMap():openBlock(roomId, blockId, true, true)
 			if self.isRelay and self:getCurMap():isAllOpen() then  -- 发放翻开的奖励
-				local relayData = self:isHaveRelay()
-				if relayData and relayData.award ~= "" then
-					self:pushBackEvent(AdvBackEventType.RelayReward, {items = self:award(relayData.award:toNumMap(), {log = {desc = "relayReward"}})})
-				end
+				self:passAdvRelay()
 			end
 			status = true
 		end
@@ -60,9 +60,9 @@ function Block:updateEvent(event, isInit)
 		end
 		self:randomEvent()
 	end
-	self:quickDrop()
 	if not isInit and self.isOpen then
+		self:quickDrop()
 		local newet = self:getEventType()
 		if oldet ~= newet then
 			local em = {}
@@ -532,7 +532,7 @@ function Passive:effect8(dropId)
 end
 --9=直接获得item（可在结算触发时使用）
-function Passive:effect9(itemId, triggerPms, ratio, max)
+function Passive:effect9(itemId, triggerPms, ratio, ratio2, max)
 	local cond = nil
 	if self.passiveData.value == 0 then
 		cond = triggerPms.score
@@ -542,7 +542,7 @@ function Passive:effect9(itemId, triggerPms, ratio, max)
 		return
 	end
 	if not cond then return end
-	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})
+	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})
 end
 --10=战斗额外掉落次数
@@ -482,6 +482,9 @@ activityFunc[Activity.ActivityType.Exchange] = {
 		actData[actId] = {}
 		self:updateActData(actType, actData, not notify)
 	end,
+	["login"] = function(self, actType, actId)
+		activityFunc[Activity.ActivityType.Exchange]["crossDay"](self, actType, true, actId)
+	end,
 	["crossDay"] = function(self, actType, notify, actId)
 		local actData = self:getActData(actType) or {}
 		local lastTs = actData["ts"] or 0
@@ -490,14 +493,14 @@ activityFunc[Activity.ActivityType.Exchange] = {
 		if not cfg then return end
 		local refreshTimes = cfg.condition2:toArray(false, "=")
 		for i = 1, #refreshTimes do
-			local rt = toUnixtime(refreshTimes[1]..string_format("%02x", RESET_TIME))
+			local rt = toUnixtime(refreshTimes[i]..string_format("%02x", RESET_TIME))
 			if timeNow >= rt and rt > lastTs then
 				lastTs = rt
 				actData = {}
 			end
 		end
-		if next(actData) then
-			actData["ts"] = lastTs
+		if not next(actData) then
+			actData["ts"] = timeNow
 			self:updateActData(actType, actData, not notify)
 		end
 	end,
@@ -53,10 +53,11 @@ Role.schema = {
 	banTime 			= {"number", 0},
 	banType 			= {"number", 0},
 	heartWarning 		= {"number", 0},
+	cheatCount			= {"number", 0},
 	ltime 				= {"number", 0}, -- 最后登录时间
 	ctime 				= {"number", skynet.timex()},  -- 创建时间
 	ignoreMt			= {"number", 0},  -- 忽略维护拦截
-	sversion			= {"number", globalCsv.StructVersion or 0}, -- 重整数据版本
+	sversion			= {"number", STRUCT_VERSION or 0}, -- 重整数据版本
 	timeReset			= {"table", {}}, --重置轮回记录
 	diamond				= {"number", 0},
 	reDiamond			= {"number", 0},
@@ -355,6 +356,7 @@ function Role:data()
 		advSup = self:getProperty("advSup"),
 		advC = self:getProperty("advC"),
 		advCT = self:getProperty("advCT"),
+		advRelay = self:getProperty("advRelay"),
 		hangPass = self:getProperty("hangPass"),
 		hangGift = self:getProperty("hangGift"),
@@ -21,13 +21,153 @@ local BattleType = {
 RoleBattle.bind = function (Role)
+local checkCheatAttrs = {
+	["hp"] = 1,
+	["atk"] = 1,
+	["def"] = 1,
+	["hit"] = 1,
+	["miss"] = 1,
+	["crit"] = 1,
+	["atkSpeed"] = 1,
+	["critHurt"] = 1,
+	-- ["vampire"] = 1,
+	-- ["pierce"] = 1,
+}
--- TODO 检查战斗是否作弊
-local function checkBattleCheat()
-
+local function checkOneCheat(selfTeamClient, selfTeamServer, enemyClient, enemyServer)
+	if not selfTeamClient or type(selfTeamClient) ~= "table" then return end
+	for unitType, clientInfo in pairs(selfTeamClient) do
+		local serverInfo = selfTeamServer[unitType]
+		if not serverInfo then return end
+		for attr, pm in pairs(checkCheatAttrs) do
+			if not clientInfo[attr] then return end
+		end
+		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
+		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
+		if b1 >= b2 * 2 then
+			return
+		end
+	end
+	return true
 end
+-- local function getRobotAttrs(info, strength)
+-- 	strength = strength or 10000
+-- 	local unitData = csvdb["unitCsv"][info.unitType]
+-- 	local enemy = {}
+-- 	for arr, _ in pairs(checkCheatAttrs) do
+-- 		enemy[arr] = unitData[attr] * info[attr] * strength / 10000
+-- 	end
+-- 	return enemy
+-- end
+
+-- --通过配表构建敌人队伍 通用
+-- function BattleEnter:packBattleEnemyCommon( carbonData )
+-- 	local enemys = {}
+-- 	local monsterSet = csvdb[carbonData.monster:match("/([^/]*)$") .. "Csv"]
+-- 	for phase = 1, #monsterSet do
+-- 		local allEnemys = table.values(monsterSet[phase])
+-- 		table.sort(allEnemys, function(a, b) return a.id < b.id end)
+-- 		local heros = {}
+-- 		for idx, enemy in ipairs(allEnemys) do
+-- 			local info = getRobotAttrs(enemy, carbonData.strength)
+-- 			enemys[idx] = info
+-- 		end
+-- 		break
+-- 	end
+-- 	return enemys
+-- end
+
+--  检查战斗是否作弊 
+function Role:checkBattleCheat(battleType, params)
+	if not params.isWin then return true end
+	local clientInfo = params.info or {}
+
+	if not BattleType[battleType] then
+		print(string.format("NO find battleType: %s", battleType))
+		return true
+	end
+	local selfTeamServer = {}
+	local enemyServer = {}
+
+	local cheat = {}
+	cheat["hang"] = function()
+		local team = self:getTeamBattleInfo(self:getTeamFormatByType(TeamSystemType.Hang))
+		for slot, hero in pairs(team.heros) do
+			local temp = {}
+			for arr, _ in pairs(checkCheatAttrs) do
+				temp[arr] = hero[arr]
+			end
+			selfTeamServer[hero.type] = temp
+		end
+		-- local carbonData = csvdb["idle_battleCsv"][params.id]
+		-- enemyServer = packBattleEnemyCommon(carbonData)
+	end
+	cheat["tower"] = function()
+		local team = self:getTeamBattleInfo(self:getTeamFormatByType(TeamSystemType.Tower))
+		for slot, hero in pairs(team.heros) do
+			local temp = {}
+			for arr, _ in pairs(checkCheatAttrs) do
+				temp[arr] = hero[arr]
+			end
+			selfTeamServer[hero.type] = temp
+		end
+		-- local carbonData = csvdb["tower_battleCsv"][params.id]
+		-- enemyServer = packBattleEnemyCommon(carbonData)
+	end
+	cheat["bonus"] = function()
+		local team = self:getTeamBattleInfo(self:getTeamFormatByType(TeamSystemType.BonusBattle))
+		for slot, hero in pairs(team.heros) do
+			local temp = {}
+			for arr, _ in pairs(checkCheatAttrs) do
+				temp[arr] = hero[arr]
+			end
+			selfTeamServer[hero.type] = temp
+		end
+		-- local carbonData = csvdb["bonus_battleCsv"][params.id]
+		-- enemyServer = packBattleEnemyCommon(carbonData)
+	end
+	cheat["pvpc"] = function()
+		if not params.format then return end
+		local team = self:getTeamBattleInfo(params.format)
+		for slot, hero in pairs(team.heros) do
+			local temp = {}
+			for arr, _ in pairs(checkCheatAttrs) do
+				temp[arr] = hero[arr]
+			end
+			selfTeamServer[hero.type] = temp
+		end
+	end
+	cheat["pvph"] = cheat["pvpc"]
+	cheat["act_battle"] = cheat["pvpc"]
+
+	cheat[battleType]()
+	local status = checkOneCheat(clientInfo.selfAttr, selfTeamServer, clientInfo.enemyAttr, enemyServer)
+	if not status then
+		local cheatCount = self:getProperty("cheatCount")
+		cheatCount = cheatCount + 1
+		self:setProperty("cheatCount", cheatCount)
+
+		local result = {clientSelf = {}, serverSelf = {}}
+		for k , v in pairs(clientInfo.selfAttr) do
+			result.clientSelf[tostring(k)] = v
+		end
+		for k , v in pairs(selfTeamServer) do
+			result.serverSelf[tostring(k)] = v
+		end
+		result = json.encode(result)
+		self:mylog("cheat", {desc = battleType, int1 = cheatCount, text1 = result})
+
+		for _, v in ipairs(globalCsv.cheat_check) do
+			if cheatCount == v[1] then
+				self:setBan(v[2] / 86400, 5)
+				break
+			end
+		end
+	end
+	return status
+end
 function Role:checkBattle(battleType, params)
 	local clientInfo = params.info or {}
@@ -31,6 +31,7 @@ local awardGift = createVersionFunc(VersionType.Override ,function(role, params)
 	print("awardGift" .. " >>> " .. params)
 end)
+
 local bugFixSuduku = createVersionFunc(VersionType.DoOnly, function(role, params)
 	local sudoku = role:getProperty("sudoku")
 	local phase = sudoku[-1] or 1
@@ -65,12 +66,21 @@ local bugFixRune = createVersionFunc(VersionType.DoOnly, function(role, params)
 		-- 补偿
 	end
 end)
+
+-- 清除 player 消失 的冒险
+local bugFixAdvPlayer = createVersionFunc(VersionType.Override, function(role, params)
+	if role:getAdvData():isRunning() and not role:getProperty("advTeam").player then
+		role:getAdvData():forceOver(true)
+	end
+end)
+
 ---------------------版本方法  end   ----------------------
 -- version 罗列start
 local versionList = {} -- version 列表
 versionList[1] = {bugFixSuduku, {}}
 versionList[2] = {bugFixRune, {}}
+versionList[3] = {bugFixAdvPlayer, {}}
 -- versionList[2] = {clearActivity, {5, 7}}
 -- versionList[3] = {changeStructF, "test1"}
 -- versionList[4] = {changeStructF, "test2"}
@@ -87,11 +97,11 @@ function RoleChangeStruct.bind(Role)
 	function Role:changeStructVersion()
 		local curVersion = self:getProperty("sversion")
-		if not globalCsv.StructVersion or curVersion >= globalCsv.StructVersion then return end
+		if not STRUCT_VERSION or curVersion >= STRUCT_VERSION then return end
 		local jumpVersion = {}
 		local versionTemp = {}
-		for version = curVersion + 1, globalCsv.StructVersion do
+		for version = curVersion + 1, STRUCT_VERSION do
 			local versionData = versionList[version]
 			if versionData then
 				if versionData[1].vType == VersionType.DoOnly then
@@ -124,7 +134,7 @@ function RoleChangeStruct.bind(Role)
 			end
 		end
-		for version = curVersion + 1, globalCsv.StructVersion do
+		for version = curVersion + 1, STRUCT_VERSION do
 			if not jumpVersion[version] then
 				local versionData = versionList[version]
 				if versionData[1].vType == VersionType.DoOnly or versionData[1].vType == VersionType.Override then
@@ -134,7 +144,7 @@ function RoleChangeStruct.bind(Role)
 				end
 			end
 		end
-		self:setProperty("sversion", globalCsv.StructVersion)
+		self:setProperty("sversion", STRUCT_VERSION)
 	end
 end
@@ -592,6 +592,7 @@ local LogType = {
 	guide = "common",
 	newdevice = "common",
 	cbback = "common",
+	cheat = "common",
 	in_item = "common",
 	out_item = "common",
@@ -286,7 +286,7 @@ function RolePlugin.bind(Role)
 			print("addPlayExp no log ", debug.traceback())
 		end
-		self:updateProperties({level = level, exp = newExp})
+		self:updateProperties({level = level, exp = newExp}, params.notNotify)
 		self:changeCrossServerPvpSelfInfo("level")
 	end
@@ -387,7 +387,7 @@ function RolePlugin.bind(Role)
 		end
 		if update then
-			self:updateProperty({field = "boxL", value = boxL})
+			self:updateProperty({field = "boxL", value = boxL, notNotify = pms.notNotify})
 		end
 	end
@@ -830,7 +830,6 @@ function RolePlugin.bind(Role)
 		self:setProperty("heartWarning", heartWarning)
 		if heartWarning == 50 then
 			self:setBan(30, 1) --封禁 30天
-			self:sendGmMsg("server_accountBanned_inGame_1")
 			return
 		end
 		if heartWarning < 50 and heartWarning % 5 == 0 then
@@ -843,21 +842,52 @@ function RolePlugin.bind(Role)
 		time = time or 0
 		banType = banType or 0
 		local now = skynet.timex()
-		if time == 0 then
+		if time <= 0 then
 			self:setProperty("banTime", 0)
 			self:setProperty("banType", 0)
 			self:setProperty("heartWarning", 0)
-			
 			self:mylog("role_action", {desc = "ban_rm"})
 		else
-			self:setProperty("banTime", now + 86400 * time)
+			self:sendGmMsg(globalCsv.ban_tips[banType] or globalCsv.ban_tips[0])
+			self:setProperty("banTime", math.ceil(now + 86400 * time))
 			self:setProperty("banType", banType)
-			self:mylog("role_action", {desc = "ban", int1 = time, int2 = banType})
+			self:resetRank()
+			self:mylog("role_action", {desc = "ban", int1 = math.ceil(time), int2 = banType})
 		end
 	end
+	-- 清掉所有排行榜
+	function Role:resetRank()
+		local roleId = self:getProperty("id")
+		redisproxy:pipelining(function (red)
+			red:zrem(RANK_TOWER, roleId)
+			for _, rk in pairs(RANK_ADV) do
+				red:zrem(rk, roleId)
+			end
+			for _, rk in pairs(RANK_DINER) do
+				red:zrem(rk, roleId)
+			end
+			for _, rk in pairs(RANK_PVP_COMMON_KEY) do
+				red:zrem(rk, roleId)
+			end
+			for _, rk in pairs(RANK_PVP_HIGHT_KEY) do
+				red:zrem(rk, roleId)
+			end
+			for _, ct in pairs(RANK_TYPE) do
+				red:zrem(RANK_COMMON .. ct, roleId)
+			end
+		end)
+	end
+
 	function Role:sendGmMsg(text, isNotKey)
 		SendPacket(actionCodes.Sys_maintainNotice, MsgPack.pack({ body = text, iskey = not isNotKey}))
+		
+		local agent = datacenter.get("agent", self:getProperty("id"))
+		if agent then
+			skynet.timeout(50, function ()
+				skynet.call(agent.gate_serv, "lua", "forcekick", agent.fd)
+			end)
+		end
 	end
 	-- function Role:getHeroActiveRelationData(heros)
@@ -1674,6 +1704,9 @@ function RolePlugin.bind(Role)
 		local dataSet = csvdb["shop_rechargeCsv"][rechargeId]
 		if orderObject:getProperty("finishTime") > 0 then
+			skynet.error(string.format("[recharge] is a finish order cpOrder: %s, platformOrder : %s, hadPlatformOrder: %s, id: %s, overTime : %s", 
+				partnerOrderStr, platformOrder, orderObject:getProperty("transactionId"), rechargeId, orderObject:getProperty("finishTime")
+			))
 			return false, "finsh"
 		end
@@ -1722,7 +1755,6 @@ function RolePlugin.bind(Role)
 		local roleId = self:getProperty("id")
 		local partnerOrderStr = params.order
-
 		local status, back = self:updatePurchaseOrder(partnerOrderStr, params.transactionId, "finsh")
 		if not status then
 			if back == "finsh" then