将军令一键领取bug

liuzujun
2 parents 7cbf1146 2be863e2
Showing 11 changed files with 286 additions and 45 deletions Show diff stats
src/actions/ActivityAction.lua
src/actions/AdvAction.lua
src/actions/GmAction.lua
src/actions/HangAction.lua
src/actions/PvpAction.lua
src/actions/TowerAction.lua
src/adv/Adv.lua
src/models/Role.lua
src/models/RoleBattle.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
@@ -555,6 +555,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
@@ -623,6 +624,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
  
@@ -1167,6 +1180,7 @@ function _M.battleCommandRpc(agent, data)
 	local bpCfg = csvdb["activity_battlepass_rewardCsv"][actid]
 	if not bpCfg then return 3 end
  
+	local unlock = actData["unlock"] or 0
 	local award = {}
 	if not index then	-- 一键领取
 		for i = 1, #bpCfg do
@@ -1178,6 +1192,9 @@ function _M.battleCommandRpc(agent, data)
  
 			for _, info in ipairs(records) do
 				local typeKey, rewardKey = info[1], info[2]
+				if typeKey == "payR" and unlock == 0 then
+					break
+				end
 				local record = actData[typeKey] or ""
 				local flag = string.char(string.getbit(record, i))
 				if flag == "0" then
@@ -1321,7 +1338,8 @@ function _M.advLevelRpc(agent, data)
 	if not actCfg then return 3 end
  
 	local actData = role.activity:getActData("AdvLevel") or {}
-	local record = actData["r"]
+	local record = actData["r"] or ""
+	print(record, index)
 	local flag = string.char(string.getbit(record, index))
  
 	if flag == "1" then return 4 end
@@ -1330,7 +1348,8 @@ function _M.advLevelRpc(agent, data)
 	local totalVal = 0
 	for i = 1, #chapters do
 		local cid = chapters[i]
-		totalVal = totalVal + (actData[cid] or 0)
+		local info = actData[cid] or {}
+		totalVal = totalVal + (info["max"] or 0)
 	end
 	if totalVal < actCfg["condition1"] then return 5 end
  
@@ -170,7 +170,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 -- 是否有体力
 		-- 关卡开放判断
@@ -259,7 +260,7 @@ function _M.startHangRpc(agent, data)
 		end
 	end
  
-	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
@@ -281,7 +282,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 -- 是否有体力
@@ -36,26 +36,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 "解封杀成功"
@@ -63,18 +52,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
@@ -371,6 +359,7 @@ function _M.advt(role, pms)
 	local chapterId = tonum(pms.pm1)
 	local layer = tonum(pms.pm2)
 	local mapId = tonum(pms.pm3)
+	local actid = tonum(pms.pm4)
 	local advCsv = csvdb["adv_chapterCsv"][chapterId]
 	if not advCsv then return "不存在的章节" end
  
@@ -387,6 +376,7 @@ function _M.advt(role, pms)
 		level = layer, 
 		isEnter = true,
 		debugMapId = mapId,
+		actid = actid,
 	})
 	role:mylog("gm_action", {desc = "advt", int1 = chapterId, int2 = layer, key1 = pms.sender})
 	return "成功"
@@ -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)
@@ -609,6 +619,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
@@ -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)
  
  
@@ -143,9 +143,6 @@ 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
  
@@ -160,8 +157,6 @@ function Adv:initByChapter(params)
  
 	self:initLayerTask()
  
-
-
 	self:checkTask(Adv.TaskType.Arrive)
 	self:checkAdvUnlock(1, self.level)
  
@@ -175,6 +170,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
@@ -1227,6 +1236,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)
@@ -1779,10 +1789,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
@@ -53,6 +53,7 @@ Role.schema = {
 	banTime 			= {"number", 0},
 	banType 			= {"number", 0},
 	heartWarning 		= {"number", 0},
+	cheatCount			= {"number", 0},
 	ltime 				= {"number", 0}, -- 最后登录时间
 	ctime 				= {"number", skynet.timex()},  -- 创建时间
 	ignoreMt			= {"number", 0},  -- 忽略维护拦截
@@ -357,6 +358,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 {}
@@ -598,6 +598,7 @@ local LogType = {
 	guide = "common",
 	newdevice = "common",
 	cbback = "common",
+	cheat = "common",
  
 	in_item = "common",
 	out_item = "common",
@@ -867,7 +867,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
@@ -880,21 +879,53 @@ 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])
+			print(86400 * time)
+			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)