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

熊润斐
2 parents 14ca7555 ab4aa967
Showing 32 changed files with 609 additions and 210 deletions Show diff stats
src/GlobalVar.lua
src/actions/ActivityAction.lua
src/actions/AdvAction.lua
src/actions/CarAction.lua
src/actions/DinerAction.lua
src/actions/EmailAction.lua
src/actions/GmAction.lua
src/actions/HangAction.lua
src/actions/HeroAction.lua
src/actions/PvpAction.lua
src/actions/RadioAction.lua
src/actions/RoleAction.lua
src/actions/StoreAction.lua
src/actions/TowerAction.lua
src/adv/Adv.lua
src/adv/AdvBlock.lua
src/adv/AdvMap.lua
src/adv/AdvPassive.lua
src/csvdata
src/models/Activity.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
 -- 属性枚举
@@ -141,7 +142,6 @@ ItemId = {
 TimeReset = {
 	CrossDay = 1,  --通用跨天
 	CrossWeek = 2,  --通用跨周
-	CrossMonth = 1, --通用跨月  索引使用跨天，在回调方法中判断是否跨越 跨月的前置条件是跨天
 	DinerRank = 1,  -- 餐厅排行榜
 	PvpRank = 2,  -- pvp排行榜
 	PvpHight = 11,  --高级竞技场
@@ -324,6 +324,7 @@ MailId = {
 	PayBackAward = 242,
 	CBBackAward = 243,
 	CBBackAward2 = 244,
+	ActivityPoolRet = 280,
 }
 TriggerEventType = {
@@ -375,6 +375,8 @@ function _M.hangDropRpc(agent, data)
 	local msg = MsgPack.unpack(data)
 	local actid = msg.actid
 	if not role.activity:isOpenById(actid, "HangDrop") then return 1 end
+	local actCtrlData = csvdb["activity_ctrlCsv"][actid]
+	if not actCtrlData then return end
 	local actCfg = csvdb["activity_putCsv"][actid]
 	if not actCfg then return 2 end
@@ -407,7 +409,7 @@ function _M.hangDropRpc(agent, data)
 		return 4
 	end
 	local num = math.floor((timeNow - actData)/ period)
-	num = num > 8 and 8 or num
+	num = num > actCtrlData.condition and actCtrlData.condition or num
 	if num == 0 then
 		return 5
 	end
@@ -483,8 +485,16 @@ function _M.startBattleRpc(agent, data)
 			local bi = actData[id]
 			if not bi then return 8 end
 			local star = bi["star"] or 0
-			if star < 1 then
-				return 9
+			local maxP = bi["maxP"] or 0
+			-- 世界boss
+			if battleCfg.worldBoss_award ~= 0 then
+				if maxP < 1 then
+					return 9
+				end
+			else
+				if star < 1 then
+					return 9
+				end
 			end
 			num = num * count
 		end
@@ -501,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
@@ -511,7 +522,7 @@ function _M.startBattleRpc(agent, data)
 			return 7
 		end
 		local bi = actData[id]
-		local star = bi["star"]
+		local star = bi["star"] or 0
 		local award = battleCfg.item_clear:toNumMap()
 		if getStarCount(battleCfg, star) == 3 then
 			local aw = battleCfg.perfect_reward:toNumMap()
@@ -526,10 +537,10 @@ function _M.startBattleRpc(agent, data)
 		SendPacket(actionCodes.Activity_startBattleRpc, MsgPack.pack(role:packReward(reward, change)))
 		if battleCfg.worldBoss_award ~= 0 and (bi["maxP"] or 0) > 0 then
-			bi["bossP"] = (bi["bossP"] or 0) + bi["maxP"]
+			bi["bossP"] = (bi["bossP"] or 0) + bi["maxP"] * count
 		end
-		bi["sum"] = bi["sum"] + bi["top"]
+		bi["sum"] = bi["sum"] + bi["top"] * count
 		actData["ticket"] = ticket - num
 		actData[id] = bi
 		changeFlag = true
@@ -558,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
@@ -566,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.Activity_endBattleRpc, MsgPack.pack({errorCode = 1}))
+		return true
+	end
+	role.__actBattleCache = nil
+
 	local actCfg = csvdb["activity_battleCsv"][actid]
 	if not actCfg then return 3 end
@@ -831,6 +857,7 @@ function _M.bossRewardRpc(agent, data)
 	local awardCfg = actCfg[index]
 	if not awardCfg then return 6 end
+	local totalAwardCnt = #actCfg
 	local preList = awardCfg.condition1:toArray(true, "=")
 	local actData = role.activity:getActData("ChallengeLevel") or {}
@@ -858,6 +885,16 @@ function _M.bossRewardRpc(agent, data)
 	if not ok then return 8 end
 	battleInfo["bossR"] = string.setbit(bossRecord, index)
+	local allFinish = true
+	for i = 1, totalAwardCnt do
+		if string.char(string.getbit(battleInfo["bossR"], i)) == "0" then
+			allFinish = false
+			break
+		end
+	end
+	if allFinish then
+		battleInfo["bossR"] = ""
+	end
 	battleInfo["bossP"] = bossPoint - 1
 	actData[id] = battleInfo
 	role.activity:updateActData("ChallengeLevel", actData)
@@ -57,6 +57,15 @@ local function checkFormat(role, format, checkAdvTeam)
 		end
 	end
+	-- 多队挂机 电台任务英雄也不能重用
+	local radioTask = role:getProperty("radioTask")
+	for id, taskInfo in pairs(radioTask) do
+		local heros = taskInfo["heros"] or {}
+		for _, heroId in ipairs(heros) do
+			hadHero[heroId] = true
+		end
+	end
+
 	if not format.leader then return end
 	if format.leader2 == format.leader then return end
 	local hadLeader = false
@@ -102,6 +111,8 @@ function _M.startAdvRpc( agent, data )
 	local advPass = role:getProperty("advPass")
+	if not checkFormat(role) then return 7 end
+
 	if AdvCommon.isEndless(chapterId) then -- 无尽模式判断
 		if chapterId ~= role.advElChapter then return end -- 不是当前进行的章节
@@ -118,37 +129,24 @@ function _M.startAdvRpc( agent, data )
 			if not relayData then return 14 end  -- 不是中继层
 			if advElM < relayData.unlockfloor then return 15 end --未解锁
 		end 
+
+		role.dailyData:updateProperty({field = "advElC", delta = 1})
 	else   -- 普通模式判断
-		if not role:checkAdvCount(chapterData.limitlevel) then return 2 end -- 是否有体力
 		if layer >= chapterData.limitlevel  then return 4 end
-		-- 关卡开放判断
-		if not role:advChapterIsOpen(chapterId) then return 5 end
+		local relayData = role:getAdvData():isHaveRelay(layer, chapterId, true) 
+		if not relayData then return 6 end  -- 不是中继层
 		if layer ~= 1 then
-			local relayData = role:getAdvData():isHaveRelay(layer, chapterId) 
-			if not relayData then return 6 end  -- 不是中继层
-			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
-	end
-	
-	if not checkFormat(role) then return 7 end
-
-	--local advTeam = role:getProperty("advTeam")
-	--table.clear(advTeam)
+		if not role:checkAdvCount(relayData.supply) then return 2 end -- 是否有体力
+		-- 关卡开放判断
+		if not role:advChapterIsOpen(chapterId) then return 5 end
-	--advTeam.heros = {}
-	--for slot, heroId in pairs(format.heros) do
-	--	advTeam.heros[slot] = heroId
-	--end
-	--advTeam.leader = format.leader
-	--advTeam.leader2 = format.leader2
-	--role:updateProperty({field = "advTeam", value = advTeam})
-	if AdvCommon.isEndless(chapterId) then
-		role.dailyData:updateProperty({field = "advElC", delta = 1})
-	else
-		role:changeAdvCount(chapterData.limitlevel)
+		role:changeAdvCount(relayData.supply)
 	end
-
+	
 	local support = {}  -- 支援效果
 	if AdvCommon.isEndless(chapterId) then
 		-- 选择的支援效果
@@ -168,6 +166,7 @@ function _M.startAdvRpc( agent, data )
 			end
 		end
 	end
+
 	role:getAdvData():initByChapter({
 		chapterId = chapterId, 
 		level = layer, 
@@ -175,6 +174,7 @@ function _M.startAdvRpc( agent, data )
 		isEnter = true, 
 		support = support,
 	})
+	
 	role:checkTaskEnter("AdvStart", {id = chapterId})
 	role:checkTaskEnter("AdvStartSelf", {id = chapterId})
 	role:getAdvData():popBackEvents() -- 清一下事件
@@ -192,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
@@ -214,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 -- 是否有体力
@@ -236,7 +236,8 @@ function _M.startHangRpc(agent, data)
 		+ 0.226 * player["hit"]
 		+ 0.26 * player["miss"]
-	if battleV < campSiteData.idleValue then return 9 end -- 战斗力是否满足
+	--print(math.ceil(battleV), campSiteData.idleValue)
+	if math.ceil(battleV) < campSiteData.idleValue then return 9 end -- 战斗力是否满足
 	local info = {}
 	info.format = {}
@@ -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
@@ -129,8 +129,8 @@ function _M.runeUpRpc( agent, data )
 	local runeData = runeSet[id]
 	if not runeData then return 5 end
-	local maxLv = #csvdb["rune_buildCsv"]
-	if level >= maxLv then return 6 end
+	--local maxLv = #csvdb["rune_buildCsv"]
+	if level >= runeData.lvLimit then return 6 end
 	local lvData = csvdb["rune_buildCsv"][level]
 	local cost = lvData.cost:toNumMap()
 	if not role:checkItemEnough(cost) then
@@ -305,7 +305,7 @@ function _M.expediteSellRpc( agent, data )
 	local gift = reward:toNumMap()
 	-- 特权卡获取加速获得额外道具
-	local coef = role.storeData:getProduceItemSpeedCoef()
+	local coef = 1 --role.storeData:getProduceItemSpeedCoef()
 	for k, v in pairs(gift) do
 		if coef > 1 then
 			v = math.floor(v * coef)
@@ -40,10 +40,17 @@ function _M.listRpc(agent, data)
 		local count = 1
 		for _, data in ipairs(result) do
 			local email = tarr2tab(data)
-			if tonum(email.createtime) > role:getProperty("ctime") 
-				and ( not email.mid or tonum(email.mid) == mid ) 
+			-- 0 需要判斷創角時間小於郵件創建時間 1 只需要在時間段內登陸即可領取
+			local delayType = tonum(email.delayType)
+			local flag = false
+			if delayType == 1 then
+				flag = skynet.timex() > tonum(email.createtime)
+			else 
+				flag = tonum(email.createtime) > role:getProperty("ctime")
+			end
+			if flag and ( not email.mid or tonum(email.mid) == mid ) 
 				and ( not email.endtime or tonum(email.endtime) > now )then
-				local time = math.max(tonum(email.timestamp, 0) or email.createtime)
+				local time = math.max(tonum(email.timestamp, 0) , tonum(email.createtime))
 				redisproxy:insertEmail({
 					roleId = roleId, 
 					emailId = 0,
@@ -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
@@ -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 = {}
@@ -663,7 +663,8 @@ function _M.getResetRewardRpc(agent, data)
 	while stage > 0 do
 		local curData = csvdb["unit_talent_"..heroCfgId.."Csv"][stage]
-		for lvl = 1, curTalentLvl - 1 do
+		local offset = stage == talent:getv(0,1) and curTalentLvl - 1 or #curData
+        for lvl = 1, offset do
 			local talentData = curData[lvl]
 			for itemId, count in pairs(talentData.money:toNumMap()) do
 				reward[itemId] = (reward[itemId] or 0) + count
@@ -853,6 +854,10 @@ function _M.drawHeroRpc(agent, data)
 		elseif values[1] == HeroQuality.SSR then
 			weight = unitPool["up_ssr_weight"]
 			up_pool = unitPool["up_ssr_id"]
+			if btype == 5 then
+				local wishPool = role:getProperty("wishPool") or {}
+				weight = weight * #wishPool
+			end
 		end
 		--print(poolId, rand_v, weight, up_pool, values[1])
 		if rand_v < weight and up_pool then
@@ -879,6 +884,15 @@ function _M.drawHeroRpc(agent, data)
 								if heroData[field] ~= values[idx] then ok = false break end
 							end
 						end
+						-- 随机剔除up池中的角色
+						if up_pool then
+							for k, v in ipairs(up_pool) do
+								if v == itemData.id then
+									ok = false
+									break
+								end
+							end
+						end
 						if not ok then break end
 						if oneData[pool_str] > 0 then
 							resultPool[itemId] = {oneData[pool_str]}  -- itemId, count, 概率
@@ -913,6 +927,7 @@ function _M.drawHeroRpc(agent, data)
 		local itemId = math.randWeight(resultPool, 1)
 		if guideHero then
 			itemId = guideHero
+			guideHero = nil
 		end
 		local itemData = csvdb["itemCsv"][itemId]
@@ -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
@@ -101,7 +101,26 @@ function _M.startQuestRpc(agent, data)
     radioTask[id] = taskData
     role:updateProperty({field="radioTask", value=radioTask, notNotify=true})
-	SendPacket(actionCodes.Radio_startQuestRpc, MsgPack.pack({id=id, task=taskData}))
+    SendPacket(actionCodes.Radio_startQuestRpc, MsgPack.pack({id=id, task=taskData}))
+
+    local herolist = {}
+    for _, heroId in ipairs(heros) do
+        local hero = role.heros[heroId]
+        if hero then
+            table.insert(herolist, hero:getProperty("type"))
+        end
+    end
+
+	--  讨伐行动 
+	role:log("punitive_action", {
+		mission_id	= id, --关卡ID
+		mission_herolist = herolist, -- 英雄ID，排序以玩家出战设置为准，示例：[111, 222, 333, 444, 555]
+		mission_success_rate = 0, -- 大成功几率
+		mission_reward = {}, -- 获得奖励，建议使用json格式记录。示例：{ itemid1: 1,  itemid2: 3,  itemid3: 5}
+		mission_result = 0, -- 战斗结果(0-无效，1-胜利，2-失败)
+        mission_roundtime = 0, -- 完成耗时（秒）
+        mission_cleartype = 1,  -- 1-开始; 2-完成(领取奖励时）
+	})
 	return true
 end
@@ -176,7 +195,8 @@ function _M.finishQuestRpc(agent, data)
 		mission_success_rate = totalCoef, -- 大成功几率
 		mission_reward = r, -- 获得奖励，建议使用json格式记录。示例：{ itemid1: 1,  itemid2: 3,  itemid3: 5}
 		mission_result = 1, -- 战斗结果(0-无效，1-胜利，2-失败)
-		mission_roundtime = config.time, -- 完成耗时（秒）
+        mission_roundtime = config.time, -- 完成耗时（秒）
+        mission_cleartype = 2,  -- 1-开始; 2-完成(领取奖励时）
 	})
 	return true
@@ -586,9 +586,9 @@ function _M.openTimeBoxRpc(agent, data)
 		else
 			local oldId, process, time = boxL[slot].id, boxL[slot].process, boxL[slot].time
 			local unitTime = globalCsv.box_key_time[oldId] * 60
-			local doneCnt = math.floor((process + skynet.timex() - time) / unitTime)
+			local doneCnt = time == 0 and 0 or math.floor((process + skynet.timex() - time) / unitTime)
 			if doneCnt > 0 then
-				reward = role:award({[oldId] = doneCnt}, {log = {desc = "openTimeBox", int1 = slot}})
+				reward = role:award({[oldId] = doneCnt}, {log = {desc = "openTimeBox", int1 = slot, int2 = oper}})
 			end
 		end
 		local limit = globalCsv.box_key_max[itemId] or 5
@@ -610,7 +610,7 @@ function _M.openTimeBoxRpc(agent, data)
 			local cost_pre = globalCsv.box_timeOpen_diamond:toArray(true, "=")
 			local costKey = math.ceil((stopTime - nowTime) / (cost_pre[1] * 60)) * cost_pre[2]
 			if not role:checkItemEnough({[ItemId.Diamond] = costKey}) then return 5 end
-			role:costItems({[ItemId.Diamond] = costKey}, {log = {desc = "openTimeBox", int1 = slot}})
+			role:costItems({[ItemId.Diamond] = costKey}, {log = {desc = "openTimeBox", int1 = slot, int2 = oper}})
 		else
 			stopTime = math.min(nowTime,time + globalCsv.box_productLine_time * 3600)
 		end
@@ -618,7 +618,7 @@ function _M.openTimeBoxRpc(agent, data)
 		local doneCnt = math.floor((process + stopTime - time) / unitTime)
 		if doneCnt > 0 then
-			reward = role:award({[itemId] = doneCnt}, {log = {desc = "openTimeBox", int1 = slot}})
+			reward = role:award({[itemId] = doneCnt}, {log = {desc = "openTimeBox", int1 = slot, int2 = oper}})
 		end
 		if role:getItemCount(itemId) >= globalCsv.box_key_max[itemId] then
 			nowTime = 0
@@ -640,6 +640,7 @@ function _M.openTimeBoxRpc(agent, data)
 		end
 		if role:getItemCount(costId) < count then return 8 end
+		if not role:checkItemEnough(costs) then return 9 end
 		role:costItems({[costId] = count}, {log = {desc = "openTimeBox"}})
@@ -686,7 +687,7 @@ function _M.openTimeBoxRpc(agent, data)
 				reward[id] = (reward[id] or 0) + num
 			end
 		end
-		reward, change = role:award(reward, {log = {desc = "openTimeBox", int1 = costId}})
+		reward, change = role:award(reward, {log = {desc = "openTimeBox", int1 = costId, int2 = oper}})
 	else
 		return
 	end
@@ -1012,6 +1013,10 @@ function _M.chatRpc(agent, data)
 				result = 1
 				return
 			end
+			if role:getProperty("level") < (globalCsv.chat_level or 15) then
+				result = 3
+				return
+			end
 			role._worldChatLimit = role._worldChatLimit or {start = 0, count = 0, canSayt = 0}  --第一次开始说话时间  从第一次说话次数  能说话的时间
@@ -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)
@@ -61,10 +61,10 @@ function Adv:initByInfo(advInfo)
 	self:initBattle(advInfo)
 end
 -- 找出level 是否存在中继层
-function Adv:isHaveRelay(level, chapterId)
+function Adv:isHaveRelay(level, chapterId, force)
 	level = level or self.level
 	chapterId = chapterId or self.chapterId
-	if level == 1 then return end
+	if level == 1 and not force then return end
 	local campsiteCsv = csvdb["adv_chapter_campsiteCsv"][chapterId]
 	for _, campsite in ipairs(campsiteCsv) do
@@ -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({
@@ -811,28 +819,29 @@ function Adv:over(success, rewardRatio, overType)
 		if not self:isEndless() and self.level >= chapterData.limitlevel then
 			self.owner:checkTaskEnter("AdvAllPass", {id = self.chapterId})
 		end
+	end
-		local roleId = self.owner:getProperty("id")
-		local oldMaxScore = tonum(redisproxy:zscore(self.owner:getAdvRankKey(), roleId))
-		if score > oldMaxScore then
-			local team = self.owner:getProperty("advTeam")
-			local curInfo = {
-				name = self.owner:getProperty("name"),
-				headId = self.owner:getProperty("headId"),
-				lv = self.owner:getProperty("level"),
-				batteV = self.owner:getTeamBattleValue(team.heros),
-				chapter = self.chapterId,
-				format = self.owner:getTeamHerosInfo(team).heros,
-			}
-			redisproxy:pipelining(function (red)
-				red:zadd(self.owner:getAdvRankKey(), score, roleId)	--更新分数
-				red:hset(RANK_ADV_INFO, roleId,  MsgPack.pack(curInfo))
-			end)
-		end
-		-- 通关的时候要把引导步骤设定到成就引导
-		if not self.owner:checkOverGuide(57) then
-			self.owner:saveGuide(57,1,true)
-		end
+	local roleId = self.owner:getProperty("id")
+	local oldMaxScore = tonum(redisproxy:zscore(self.owner:getAdvRankKey(), roleId))
+	if score > oldMaxScore then
+		local team = self.owner:getProperty("advTeam")
+		local curInfo = {
+			name = self.owner:getProperty("name"),
+			headId = self.owner:getProperty("headId"),
+			lv = self.owner:getProperty("level"),
+			batteV = self.owner:getTeamBattleValue(team.heros),
+			chapter = self.chapterId,
+			format = self.owner:getTeamHerosInfo(team).heros,
+		}
+		redisproxy:pipelining(function (red)
+			red:zadd(self.owner:getAdvRankKey(), score, roleId)	--更新分数
+			red:hset(RANK_ADV_INFO, roleId,  MsgPack.pack(curInfo))
+		end)
+	end
+	
+	-- 通关的时候要把引导步骤设定到成就引导
+	if not self.owner:checkOverGuide(57) then
+		self.owner:saveGuide(57,1,true)
 	end
 	self:clearAdvUnlockCache()
@@ -963,7 +972,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)
@@ -1112,6 +1121,11 @@ local function clickOut(self, room, block, params, isExit)
 			else
 				if self.level > (advPass[self.chapterId] or 0) then
 					self.owner:changeUpdates({{type = "advPass", field = self.chapterId, value = self.level}})
+
+				if (self.level >= csvdb["adv_chapterCsv"][self.chapterId].limitlevel) then --关卡结束
+					self.owner:checkTaskEnter("AdvPassFirst", {id = self.chapterId})
+				end
+
 				end
 			end
@@ -1124,6 +1138,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)
@@ -1675,12 +1690,6 @@ function Adv:clickBlock(roomId, blockId, params)
 	if not block.isOpen then
 		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
-			end
 			status = true
 		end
 	else
@@ -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 = {}
@@ -272,6 +272,10 @@ function Map:openBlock(roomId, blockId, isPlayer, ignoreBack)
 		if not ignoreBack then
 			self.adv:backBlockChange(roomId, blockId)
 		end
+		
+		if self.adv.isRelay and self:isAllOpen() then  -- 发放翻开的奖励
+			self.adv:passAdvRelay()
+		end
 	end
 	return status
 end
@@ -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=战斗额外掉落次数
-Subproject commit ccdf6fcc82fd0a38d1b00bc199baadfd81ec3ab1
+Subproject commit 76b7ed2b1684a9741a5c531e616acc31c8b5aa9d
@@ -91,6 +91,7 @@ function Activity:data()
 		act18 = self:getProperty("act18"),
 		act19 = self:getProperty("act19"),
 		act20 = self:getProperty("act20"),
+		act24 = self:getProperty("act24"),
 		act26 = self:getProperty("act26"),
 	}
 end
@@ -277,38 +278,56 @@ function Activity:checkWeeklyAct(actType, notify, count, pool)
 		local totalCnt = 0
 		local finishCnt = 0
 		local maxCondition = 0
-		for k, cfg in pairs(csvdb[info.table] or {}) do
-			totalCnt = totalCnt + 1
-			if maxCondition < cfg.condition1 then
-				maxCondition = cfg.condition1
-			end
-			if not curData[cfg.id] and curData[0] >= cfg.condition1 then
-				if info.mailId then 
+		local flag = true
+		while flag do
+			--print("tatal number :", curData[0])
+			for i = 1, #csvdb[info.table] do
+				local cfg = csvdb[info.table][i]
+			--for k, cfg in pairs(csvdb[info.table] or {}) do
+				totalCnt = totalCnt + 1
+				if maxCondition < cfg.condition1 then
+					maxCondition = cfg.condition1
+				end
+				--print("cur condition", cfg.condition1)
+				if curData[0] < cfg.condition1 then
+					flag = false
+					break
+				end
+
+				--print(curData[0], cfg.condition1)
+				if not curData[cfg.id] and curData[0] >= cfg.condition1 then
+					if info.mailId then 
-					self.owner:log("activity", {
-						activity_id = cfg.id, -- 活动ID（或活动指定任务的ID）
-						activity_type = actType, -- 活动类型，见活动类型枚举表
-						activity_reward = cfg.reward:toNumMap(), -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
-					})
+						self.owner:log("activity", {
+							activity_id = cfg.id, -- 活动ID（或活动指定任务的ID）
+							activity_type = actType, -- 活动类型，见活动类型枚举表
+							activity_reward = cfg.reward:toNumMap(), -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
+						})
-					self.owner:sendMail(info.mailId, nil, cfg.reward, {cfg.condition1})
-					curData[cfg.id] = 1
+						self.owner:sendMail(info.mailId, nil, cfg.reward, {cfg.condition1})
+						curData[cfg.id] = 1
+					end
+				end
+				if curData[cfg.id] then
+					finishCnt = finishCnt + 1
 				end
 			end
-			if curData[cfg.id] then
-				finishCnt = finishCnt + 1
-			end
-		end
-		if totalCnt == finishCnt then
-			roundData[actType] = curRound + 1
-			for k,v in pairs(curData) do
-				if k == 0 then
-					curData[k] = curData[0] >= maxCondition and curData[0] - maxCondition or 0
-				else
-					curData[k] = nil
+			if totalCnt == finishCnt then
+				roundData[actType] = (roundData[actType] or 0) + 1
+				for k,v in pairs(curData) do
+					if k == 0 then
+						curData[k] = curData[0] >= maxCondition and curData[0] - maxCondition or 0
+					else
+						curData[k] = nil
+					end
 				end
+				--print("cur round ".. roundData[actType], ctrlData.condition)
+				if roundData[actType] >= ctrlData.condition then
+					curData[0] = maxCondition
+					flag = false
+				end
+				self:updateProperty({field = "round", value = roundData, notNotify = not notify})
 			end
-			self:updateProperty({field = "round", value = roundData, notNotify = not notify})
 		end
 		self:updateActData(actType, curData, not notify)
 end
@@ -463,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
@@ -471,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,
@@ -507,6 +529,12 @@ activityFunc[Activity.ActivityType.ActHeroPool] = {
 		local actData = self:getActData(actType)
 		local cfg = csvdb["activity_ctrlCsv"][actId]
 		if not cfg then return end
+		-- 保底次数转换成万能碎片
+		--local count = math.ceil(((actData[cfg.condition] or 0) / 100) * 60)
+		--if count > 0 then
+		--	local gift = {[723] = count}
+		--	self.owner:sendMail(MailId.ActivityPoolRet, nil, gift, {})
+		--end
 		actData[cfg.condition] = nil
 		self:updateActData(actType, actData, not notify)
 	end,
@@ -680,7 +708,7 @@ function Activity:recycleActItem(actId)
 		local itemCount = role:getItemCount(fromId)
 		if itemCount > 0 then
 			costs[fromId] = (costs[fromId] or 0) + itemCount
-			gift[toId] = toNum * itemCount
+			gift[toId] = (gift[toId] or 0) + toNum * itemCount
 		end
 	end
 	if next(costs) then
@@ -53,22 +53,25 @@ function HeroPlugin.bind(Hero)
 		local talentAttrS = {}
 		-- 四个基础属性
-		local curData = csvdb["unit_talentCsv"][talent:getv(0, 1)]
-		local curTalentLvl = 0
-		if not curData then -- 已经满阶段了
-			local cfgName = "unit_talent_"..heroCfgId.."Csv"
-			curData = csvdb[cfgName][#csvdb[cfgName]]
-		else
-			curTalentLvl = talent:getv(1, 1)
-		end
-		for lvl, cfg in pairs(curData) do
-			if lvl < curTalentLvl or curTalentLvl == 0 then
-				if cfg.effect ~= 99 then
-					local curVal = talentAttrS[cfg.effect] or 0
-					if curVal < cfg.strength then
-						talentAttrS[cfg.effect] = cfg.strength
+		local cfgName = "unit_talent_"..heroCfgId.."Csv"
+		local curRank = talent:getv(0, 1)
+		local curLv = talent:getv(1,1) - 1
+		for i, value in ipairs(csvdb[cfgName]) do
+			if i <= curRank then
+				for lv, cfg in ipairs(value) do
+					if i < curRank or lv <= curLv then
+						if cfg.effect ~= 99 then
+							if not talentAttrS[cfg.effect] then
+								talentAttrS[AttsEnumEx[cfg.effect]] = 0
+							end
+							talentAttrS[AttsEnumEx[cfg.effect]] = cfg.strength
+						end
+					else
+						break
 					end
 				end
+			else
+				break
 			end
 		end
@@ -85,7 +88,7 @@ function HeroPlugin.bind(Hero)
 		for lvl = 1, #faithConfig do
 			if faith >= faithConfig[lvl].exp then
 				local add = faithConfig[lvl]["position_"..unitData.position]:toArray(true, "=")
-				faithAttr[add[1]] = (faithAttr[add[1]] or 0) + add[2]
+				faithAttr[AttsEnumEx[add[1]]] = (faithAttr[AttsEnumEx[add[1]]] or 0) + add[2]
 			end
 		end
 		for _, attrName in pairs(AttsEnumEx) do
@@ -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 or {}) 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 = 1, 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 true
+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
@@ -48,11 +49,38 @@ local bugFixSuduku = createVersionFunc(VersionType.DoOnly, function(role, params
 	end
 end)
+local bugFixRune = createVersionFunc(VersionType.DoOnly, function(role, params)
+	local had = false
+	for id, rune in pairs(role.runeBag) do
+		if math.floor(rune:getProperty("id") / 1000) == 16 then
+			local attrs = rune:getProperty("attrs")
+			local atk = attrs:getv(2, 0)
+			if atk ~= 0 then
+				attrs = attrs:delk(2):setv(1, atk)
+				had = true
+				rune:setProperty("attrs",attrs)
+			end
+		end
+	end
+	if had then
+		-- 补偿
+	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"}
@@ -69,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
@@ -106,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
@@ -116,7 +144,7 @@ function RoleChangeStruct.bind(Role)
 				end
 			end
 		end
-		self:setProperty("sversion", globalCsv.StructVersion)
+		self:setProperty("sversion", STRUCT_VERSION)
 	end
 end
@@ -122,6 +122,7 @@ local ItemReason = {
 	-- pvp 
 	pvpCHead = 1301, -- pvp 跨服竞技场头像
+	crossPvpBet = 1302, -- 竞猜
 	--adv
 	chooseEvent = 1351, -- 冒险选择
@@ -506,11 +507,12 @@ local MethodType = {
 	},
 	punitive_action = { --  讨伐行动 --TODO
 		mission_id	= true, --关卡ID
-		mission_herolist = true, -- 英雄ID，排序以玩家出战设置为准，示例：[111, 222, 333, 444, 555]
+		mission_herolist = "json", -- 英雄ID，排序以玩家出战设置为准，示例：[111, 222, 333, 444, 555]
 		mission_success_rate = true, -- 大成功几率
-		mission_reward = true, -- 获得奖励，建议使用json格式记录。示例：{ itemid1: 1,  itemid2: 3,  itemid3: 5}
+		mission_reward = "json", -- 获得奖励，建议使用json格式记录。示例：{ itemid1: 1,  itemid2: 3,  itemid3: 5}
 		mission_result = true, -- 战斗结果(0-无效，1-胜利，2-失败)
 		mission_roundtime = true, -- 完成耗时（秒）
+		mission_cleartype = true, -- 1-开始; 2-完成(领取奖励时）
 	},
 	hero_talent = { --英雄精进（原英雄天赋升级）  TODO
 		hero_id = true, --英雄ID
@@ -542,20 +544,26 @@ local function isIos(self)
 	return sid == 2
 end
-local appid, sdkId
+local sdkId
+local AppId = {
+	[1] = 4787,
+	[2] = 4788,
+	[3] = 4789,
+}
 local function getBaseLog(self)
 	local uid = self:getProperty("uid")
-	if not appid then
-		appid, sdkId = string.match(uid, "(.*)_(.*)")
-		if not appid then
+	local sid = self:getProperty("sid")
+	if not sdkId then
+		_, sdkId = string.match(uid, "(.*)_(.*)")
+		if not _ then
 			sdkId = uid
-			appid = 0
 		end
 	end
+
 	local log = {
 		server_id = server_id,
 		timestamp = skynet.timex(),
-		app_id = appid,
+		app_id = AppId[sid] or 0,
 		plat_id = isIos(self) and 0 or 1,
 		sdk_uid = sdkId,
 		account_id = uid,
@@ -584,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
@@ -356,13 +356,14 @@ function RolePlugin.bind(Role)
 			if not self:costDiamond(pms) then
 				return
 			end
-			itemCountT[ItemId.Diamond] = nil
 		end
 		for itemId, count in pairs(itemCountT) do
-			pms.itemId = itemId
-			pms.count = - count
-			self:addItem(pms)
-			self:itemDeltaEvent(pms)
+			if itemId ~= ItemId.Diamond then
+				pms.itemId = itemId
+				pms.count = - count
+				self:addItem(pms)
+				self:itemDeltaEvent(pms)
+			end
 		end
 		return true
 	end
@@ -386,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
@@ -829,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
@@ -842,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)
@@ -1362,7 +1393,7 @@ function RolePlugin.bind(Role)
 		end
 		format.heros = heros
 		format.supports = team.supports or {}
-		format.tactics = team.tactics or {}
+		format.tactics = team.tactics or nil
 		return format
 	end
@@ -1469,6 +1500,7 @@ function RolePlugin.bind(Role)
 		return function (now, role)
 			if name == "email" and role.sendMailFlag then
 				last_breath = now + sec
+				role.sendMailFlag = false
 				return true
 			end
 			if now >= last_breath then
@@ -1504,8 +1536,15 @@ function RolePlugin.bind(Role)
 				end)
 				for _, data in ipairs(redret) do
 					local email = tarr2tab(data)
-					if tonum(email.createtime) > self:getProperty("ctime") 
-						and ( not email.mid or tonum(email.mid) == mid ) 
+					-- 0 需要判斷創角時間小於郵件創建時間 1 只需要在時間段內登陸即可領取
+					local delayType = tonum(email.delayType)
+					local flag = false
+					if delayType == 1 then
+						flag = skynet.timex() > tonum(email.createtime)
+					else
+						flag = tonum(email.createtime) > self:getProperty("ctime")
+					end
+					if flag and ( not email.mid or tonum(email.mid) == mid )
 						and ( not email.endtime or tonum(email.endtime) > now )then
 						return true
 					end
@@ -1665,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
@@ -1713,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
@@ -521,7 +521,7 @@ function Role:changeCrossServerPvpSelfInfo(cType)
 		change[cType] = self:getProperty(cType)
 	elseif cType == "format" then
 		-- 是否过了时间
-		local crossTime = skynet.timex() - self:getTimeResetStartTime(TimeReset.PvpCross)
+		local crossTime = skynet.timex() - self:getTimeResetStartTime(TimeReset.PvpCross) + RESET_TIME * 3600
 		local aday = 3600 * 24
 		local day = math.ceil(crossTime / aday) -- 当前是第几个比赛日
 		local ctime = crossTime % aday -- 当前在本天 经过多少时间
@@ -530,7 +530,7 @@ function Role:changeCrossServerPvpSelfInfo(cType)
 			return 
 		end
 		change.battleV = self:getProperty("pvpTBVH")
-		change.heros = self:getProperty("pvpTSH")
+		change.team = self:getProperty("pvpTSH")
 		change.battleInfo = self:getProperty("pvpTBH")
 	end
@@ -615,7 +615,7 @@ end
 function Role:setCrossServerPvpBet(idx)
 	if not self:isTimeResetOpen(TimeReset.PvpCross) then return false , 1 end
-	local crossTime = skynet.timex() - self:getTimeResetStartTime(TimeReset.PvpCross)
+	local crossTime = skynet.timex() - self:getTimeResetStartTime(TimeReset.PvpCross) +  RESET_TIME * 3600
 	local aday = 3600 * 24
 	local day = math.ceil(crossTime / aday) -- 当前是第几个比赛日
 	local ctime = crossTime % aday -- 当前在本天 经过多少时间
@@ -50,6 +50,7 @@ local TaskType = {
 	AdvHang	= 412,				-- 代理拾荒次数
 	AdvMineKill = 413,			-- 宝藏怪击杀
 	AdvMineLayer = 414,			-- 宝藏洞激活
+	AdvPassFirst = 415,			-- 冒险首次通关			- id
 	--爬塔相关
 	TowerPass = 501,			-- 爬塔通关			- level
@@ -240,7 +241,7 @@ local StoreListener = {
 		[TaskType.HangPass] = {{TriggerEventType.HangPass, f("id")}},
 		[TaskType.RoleLevelUp] = {{TriggerEventType.LevelUp, f("level")}},
 		[TaskType.TowerPass] = {{TriggerEventType.TowerPass, f("level")}},
-		[TaskType.AdvPass] = {{TriggerEventType.AdvPass, f("id")}},
+		[TaskType.AdvPassFirst] = {{TriggerEventType.AdvPass, f("id")}},
 		[TaskType.AddHero] = {{TriggerEventType.AddNewHero, f("heroType")}, {TriggerEventType.SSRCount, f("ssrCount")}},
 	}
 }
@@ -23,6 +23,11 @@ ResetFunc[&quot;CrossDay&quot;] = function(self, notify, response, now)
 	end
 	self:setProperty("advMine", advMine)
+	local ltime = self:getProperty("ltime")
+	if isCrossMonth(ltime, now) then
+		self.storeData:resetStoreReored(3)		--商店跨月重置 time_reset表关联id 
+	end
+
 	response.dTask = {}
 	response.advSup = self:getProperty("advSup")
 	self:log("onLogin")
@@ -43,13 +48,6 @@ ResetFunc[&quot;CrossWeek&quot;] = function(self, notify, response)
 	response.dinerS = {}
 end
-ResetFunc["CrossMonth"] = function(self, notify, response)
-	local ltime = self:getProperty("ltime")
-	if isCrossMonth(ltime, skynet.timex()) then
-		self.storeData:resetStoreReored(3)		--商店跨月重置 time_reset表关联id
-	end
-end
-
 ResetFunc["DinerRank"] = function(self, notify, response)
 	self.dinerData:rankResetData(notify)
@@ -89,13 +87,10 @@ function Role:updateTimeReset(now, notify)
 			ResetFunc[funcName](self, notify, response, now)
 			resetMode[funcName] = true
 		end
-		if needResetId[resetId] then
-			-- 充值商城购买记录
-			self.storeData:resetStoreReored(resetId)
-		end
 	end
 	for resetId, round in pairs(needResetId) do
+		self.storeData:resetStoreReored(resetId)
 		timeReset[resetId] = round
 	end
 	self:setProperties({timeReset = timeReset, ltime = now})
@@ -69,7 +69,8 @@ local function mailQuene()
 				"attachments", email.attachments,
 				"endtime", email.endTime,
 				"mid", email.mid,
-				"timestamp", now
+				"timestamp", now,
+				"delayType", email.delayType
 			)
 		else
 			redisproxy:hmset(string_format("globalEmail:%s", gid), 
@@ -80,7 +81,8 @@ local function mailQuene()
 				"content", email.content,
 				"attachments", email.attachments,
 				"endtime", email.endTime,
-				"timestamp", now
+				"timestamp", now,
+				"delayType", email.delayType
 			)
 		end
 	end
@@ -84,7 +84,7 @@ function CMD.updateRoleInfo(change)
 	CMD.refreshRoleInfo(change)
 	local pvpd = cluster.query("center", "pvpd")
 	if pvpd then
-		pcall(cluster.call, "center", pvpd, "updateRoleInfo", change)
+		pcall(cluster.send, "center", pvpd, "updateRoleInfo", change)
 	end
 end
@@ -92,7 +92,7 @@ local function getDayAndTime()
 	local startTime = getStartTime()
 	local now = skynet.timex()
-	local crossTime = now - startTime
+	local crossTime = now - startTime + RESET_TIME * 3600
 	local aday = 3600 * 24
 	local day = math.ceil(crossTime / aday) -- 当前是第几个比赛日
 	local ctime = crossTime % aday -- 当前在本天 经过多少时间
@@ -100,7 +100,7 @@ end
 -- 判断是不是同一个月
 function isCrossMonth(target, now)
 	now = now or skynet.timex()
-	local tarTm = os.date("*t", target)
+	local tarTm = os.date("*t", target - RESET_TIME * 3600)
 	local nowTm = os.date("*t", now - RESET_TIME * 3600)
 	if tarTm.year == nowTm.year and tarTm.month == nowTm.month then
 		return false