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

* tr/bugfix: (76 commits) 美食币计算错误开启x品质时钟箱任务计数错误bug 活动结束回收邮件进入中继层补给药剂，补足到上限，扣除错误宝藏怪清空背包gm 修复拾荒结算时，返还药剂错误导致药水被吞的bug 进入拾荒自动补给药水，按当前等级下的携带最大数量计算获得所有SSR 且满级满觉醒同时获得全部满级金色铭文满精进充值mycard 拾荒bug pvp 匹配和失败扣减积分无论什么方式翻开中继层格子都给奖励跨天礼包重置月重置跨月拾荒失败也记录积分编队世界聊天等级15判断活动卡池结束回馈次数通关邮件折算碎片功能注释 ...

Merge branch 'tr/bugfix' into tr/publish/player
* tr/bugfix: (76 commits) 美食币计算错误开启x品质时钟箱任务计数错误bug 活动结束回收邮件进入中继层补给药剂，补足到上限，扣除错误宝藏怪清空背包gm 修复拾荒结算时，返还药剂错误导致药水被吞的bug 进入拾荒自动补给药水，按当前等级下的携带最大数量计算获得所有SSR 且满级满觉醒同时获得全部满级金色铭文满精进充值mycard 拾荒bug pvp 匹配和失败扣减积分无论什么方式翻开中继层格子都给奖励跨天礼包重置月重置跨月拾荒失败也记录积分编队世界聊天等级15判断活动卡池结束回馈次数通关邮件折算碎片功能注释 ...
zhouhaihai
2 parents 9d5ba8bf cb356900
Showing 35 changed files with 1423 additions and 263 deletions Show diff stats
src/GlobalVar.lua
src/ProtocolCode.lua
src/RedisKeys.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/HttpAction.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
@@ -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
 -- 属性枚举
@@ -72,7 +73,7 @@ ItemType = {
 	EquipBase 					= 9,	-- 基础装备
 	Rune						= 10,	-- 符文
 	Cuisine						= 11,	-- 料理（用于增加好感度、贩卖获得金币）
-	LunchBox 					= 12,	-- 便当盒（料理合成，冒险系统消耗道具）
+	Potion 						= 12,	-- 拾荒药剂
 	TimeBox 					= 13,	-- 时间箱（开启需要时间，随机产出道具）
 	AdvItem						= 14, 	-- 冒险道具
 	FuncOpen					= 15, 	-- 管理功能开放
@@ -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 = {
@@ -229,6 +229,8 @@ actionCodes = {
 	Activity_battleMilestoneRpc = 663,
 	Activity_bossRewardRpc = 664,
 	Activity_crisisMilestoneRpc = 665,
+	Activity_commonSignRpc = 666,
+	Activity_friendHelpRpc = 667,
  
 	Radio_startQuestRpc = 700,
 	Radio_finishQuestRpc = 701,
@@ -47,6 +47,7 @@ FRIEND_KEY = &quot;role:%d:friend&quot;	--哈希表 好友
 FRIEND_APPLY_KEY = "role:%d:apply"	-- sort set 申请列表
 FRIEND_BLACK_KEY = "role:%d:black" -- set 黑名单
 FRIEND_POINT = "role:%d:point" -- set 当天送给我心的人
+FRIEND_ENERGY = "role:%d:energy" -- set 送给我活动能量的好友
 FRIEND_RECOMMEND = "friend:recommend" -- sort set 登录排序 获取推荐好友
 CHAT_OFFLINE = "chat:offline:%d" --消息离线缓存
  
@@ -259,7 +259,10 @@ function _M.actCalendaTaskRpc(agent, data)
 		activity_reward = reward, -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
 	})
  
+	role:checkTaskEnter("FinishSpeTask", {taskId = taskId, actId = actId})
+
 	SendPacket(actionCodes.Activity_actCalendaTaskRpc, MsgPack.pack(role:packReward(reward, change)))
+
 	return true
 end
  
@@ -375,6 +378,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 +412,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 +488,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 +514,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 +525,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 +540,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 +572,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 +583,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 +860,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 +888,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)
@@ -868,4 +908,216 @@ function _M.bossRewardRpc(agent, data)
 	return true
 end
  
+function _M.commonSignRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local actid = msg.actid
+	local index = msg.index
+
+	if not role.activity:isOpenById(actid, "CommonSignIn") then return 1 end
+
+	local actData = role.activity:getActData("CommonSignIn")
+	if (actData[0] or 0) < index then
+		return 2
+	end
+	if (actData[index] or 0) == 1 then
+		return 3
+	end
+
+	local actCfg = csvdb["activity_signInCsv"][actid]
+	if not actCfg then return 4 end
+	actCfg = actCfg[index]
+	if not actCfg then return 5 end
+
+	actData[index] = 1
+	role.activity:updateActData("CommonSignIn", actData)
+
+	local award = actCfg.reward:toNumMap()
+	local reward, change = role:award(award, {log = {desc = "commonSign", int1 = actid, int2 = index}})
+	SendPacket(actionCodes.Activity_commonSignRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
+
+function _M.friendHelpRpc(agent, data)
+	local role = agent.role
+	local roleId = role:getProperty("id")
+	local msg = MsgPack.unpack(data)
+	local oper = tonumber(msg.oper) or -1
+	local award = {}
+	local result
+
+
+	local actid = 37
+	if not role.activity:isOpenById(actid, "FriendEnergy") then return 1 end
+	if oper < 1 or oper > 4 then return 2 end
+
+	local actCsv = csvdb["activity_ctrlCsv"][actid]
+	local getLimit = actCsv.condition
+	local gifts = actCsv.condition2:toTableArray(true)
+
+	local actData = role.activity:getActData("FriendEnergy") or {}
+
+	local function getIds()
+		local ids = {}
+		local friends = redisproxy:hgetall(FRIEND_KEY:format(roleId))
+		for i = 1, #friends , 2 do
+			local objId = tonumber(friends[i])
+			ids[objId] = 1
+		end
+		return ids
+	end
+
+	if oper == 1 then -- 赠送好友能量
+		local giveAE = actData.giveAE or {}
+		local objId = msg.roleId
+		local gift = gifts[1]
+		local ids = {}
+
+		if not objId then
+			return 3
+		end
+		if not redisproxy:hexists(FRIEND_KEY:format(roleId), objId) then
+			result = 2
+		end
+		if giveAE[objId] then
+			result = 1
+		end
+
+		if not result then
+			giveAE[objId] = 1
+			award[gift[1]] = gift[2]
+			redisproxy:sadd(FRIEND_ENERGY:format(objId), roleId)
+			rpcRole(objId, "SendPacket", actionCodes.Role_notifyNewEvent, MsgPack.pack({events = {actFriendGive = roleId}}))
+			actData.giveAE = giveAE
+		end
+	elseif oper == 2 then -- 收取能量
+		local objId = msg.roleId
+		local gift = gifts[2]
+		local getAE = actData.getAE or {}
+		local limit = actData.limit or 0
+
+		if limit >= getLimit then return 4 end
+		if not redisproxy:sismember(FRIEND_ENERGY:format(roleId), objId) then
+			result = 3
+		end
+		if getAE[objId] then
+			result = 2
+		end
+		if limit >= getLimit then
+			result = 1
+		end
+
+		if not result then
+			limit = limit + 1
+			getAE[objId] = 1
+			award[gift[1]] = gift[2]
+			redisproxy:srem(FRIEND_ENERGY:format(roleId), objId)
+			actData.limit = limit
+			actData.getAE = getAE
+		end
+	elseif oper == 3 then -- 一键送领全部
+		local giveAE = actData.giveAE or {}
+		local getAE = actData.getAE or {}
+		local gift1 = gifts[1]
+		local gift2 = gifts[2]
+		local limit = actData.limit or 0
+		local cmd1, cmd2 = 0, 0
+		local ids = getIds()
+
+		local members = {}
+		local temp = redisproxy:smembers(FRIEND_ENERGY:format(roleId))
+		for _, id in pairs(temp) do
+			members[tonumber(id)] = 1
+		end
+
+		redisproxy:pipelining(function(red)
+			for friendId, _ in pairs(ids) do
+				if not giveAE[friendId] then
+					giveAE[friendId] = 1
+					award[gift1[1]] = (award[gift1[1]] or 0) + gift1[2]
+					red:sadd(FRIEND_ENERGY:format(friendId), roleId)
+					rpcRole(friendId, "SendPacket", actionCodes.Role_notifyNewEvent, MsgPack.pack({events = {actFriendGive = roleId}}))
+					cmd1 = 2
+				end
+
+				if members[friendId] and not getAE[friendId] and limit <= getLimit then
+					cmd2 = 1
+					limit = limit + 1
+					getAE[friendId] = 1
+					award[gift2[1]] = (award[gift2[1]] or 0) + gift2[2]
+					red:srem(FRIEND_ENERGY:format(roleId), friendId)
+				end
+			end
+		end)
+
+		local sum = cmd1 + cmd2
+		if sum == 0 then
+			result = 3
+		elseif sum ~= 3 then
+			result = sum
+		end
+
+		actData.limit = limit
+		actData.giveAE = giveAE
+		actData.getAE = getAE
+	elseif oper == 4 then -- 抽大奖
+		local magic = actData.magic or 0
+		local rewards = actData.reward or {}
+		local rewardCsv = csvdb["activity_orderRewardsCsv"][actid]
+		local itemId1 = gifts[1][1]
+		local itemId2 = gifts[2][1]
+
+		local level = math.min(magic + 1,#rewardCsv)
+		local rewardData = rewardCsv[level]
+
+		local cost = {[itemId1] = rewardData.condition1, [itemId2] = rewardData.condition2}
+
+		if not role:checkItemEnough(cost) then return 7 end
+		role:costItems(cost, {log = {desc = "actFriendHelp", int1 = actid, int2 = level}})
+
+		if rewardData.reward ~= "" then
+			result = 1
+			award = rewardData.reward:toNumMap()
+		end
+		if rewardData.reward_random ~= "" then
+			result = 1
+			local pool = {}
+			for _, temp in pairs(rewardData.reward_random:toArray()) do
+				table.insert(pool, temp:toArray(true, "="))
+			end
+			local gift = pool[math.randWeight(pool, 3)]
+			award[gift[1]] = (award[gift[1]] or 0) + gift[2]
+		end
+		rewards[level] = 1
+		actData.reward = rewards
+		actData.magic = level
+	else
+		return 5
+	end
+
+	local ids = {}
+	local members = {}
+	local friendIds = getIds()
+	local temp = redisproxy:smembers(FRIEND_ENERGY:format(roleId))
+	for _, id in pairs(temp) do
+		members[tonumber(id)] = 1
+	end
+
+	for id, _ in pairs(friendIds) do
+		if members[id] then
+			ids[id] = 1
+		end
+	end
+
+	actData.new = ids
+
+	local reward, change
+	if next(award) then
+		reward, change = role:award(award, {log = {desc = "actFriendHelp", int1 = actid, int2 = level}})
+	end
+	role.activity:updateActData("FriendEnergy", actData)
+	SendPacket(actionCodes.Activity_friendHelpRpc, MsgPack.pack({result = result, reward = reward}))
+	return true
+end
+
 return _M
 \ No newline at end of file
@@ -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 = {}
@@ -344,6 +345,7 @@ function _M.endHangRpc(agent, data)
 	adv_idle_time = adv_idle_time * 60
  
 	local reward, isFull, change, heroFaithMap
+	local heroCnt = 0
 	if skynet.timex() >= info.time then
 		-- 最新需求加成取消
 		--[[
@@ -378,6 +380,7 @@ function _M.endHangRpc(agent, data)
 		for _, heroId in pairs(info.format.heros) do
 			local curFaith = addHeroFaith(role, heroId, exp)
 			heroFaithMap[heroId] = curFaith
+			heroCnt = heroCnt + 1
 		end
  
 		local totalReward = campSiteData.idleReward_1 .. " " .. campSiteData.idleReward_2
@@ -406,6 +409,7 @@ function _M.endHangRpc(agent, data)
 	role:mylog("adv_action", {desc = "endHang", int1 = chapterId, short1 = cancel and 1 or 0})
  
 	role:checkTaskEnter("AdvHang", {})
+	role:checkTaskEnter("AdvHangHeroCnt", {count = heroCnt})
  
 	SendPacket(actionCodes.Adv_endHangRpc, MsgPack.pack({reward = reward, change = change, isFull = isFull, heroFaith = heroFaithMap}))
 	return true
@@ -543,8 +547,8 @@ function _M.usePotionRpc(agent, data)
 	local msg = MsgPack.unpack(data)
 	local potionId = msg.potionId -- 营养剂Id
 	local target = msg.target -- {roomId = 1, blockId = 1} 选择的目标
-	local potionLv = role.dinerData:getProperty("dishTree"):getv(potionId, 0)
-	if potionLv == 0 then return 1 end
+	local potionLv = role.dinerData:getProperty("dishTree"):getv(potionId, 1)
+	if potionLv < 1 then return 1 end
  
 	local potionSet = csvdb["adv_potionCsv"][potionId]
 	if not potionSet then return 2 end
@@ -552,12 +556,9 @@ function _M.usePotionRpc(agent, data)
 	local potionData = potionSet[potionLv]
 	if not potionData then return 3 end
  
-	local potionBag = role:getProperty("potionBag")
-	local own = potionBag[potionId] or 0
-	if own <= 0 then return 4 end
-
 	if not isCanContinue(role) then return end
 	local adv = role:getAdvData()
+	if not adv:cost({[potionId] = 1}, {}, true) then return 4 end
 	if adv:isWaitChooseArtifact() then return end
  
 	adv:mylog({desc = "usePotion", int1 = potionId})
@@ -565,8 +566,7 @@ function _M.usePotionRpc(agent, data)
 	local status = adv:doActive(potionData.effect, target) -- target
 	if not status then return end
  
-	potionBag[potionId] = own - 1
-	role:updateProperty({field = "potionBag", value = potionBag})
+	adv:cost({[potionId] = 1}, {log = {desc = "usePotion", int1 = potionId}})
 	adv:pushBackEvent(AdvBackEventType.Potion, {id = potionId})
 	adv:afterRound()
 	adv:saveDB()
@@ -737,7 +737,7 @@ function _M.endBattleRpc(agent, data)
 	role:finishGuide(52)
 	-- 调理剂使用引导(生命药剂)
 	if not role:checkOverGuide(61) then
-		local potionBag = role:getProperty("potionBag")
+		local potionBag = role:getProperty("advItems"):toNumMap()
 		local own = potionBag[10] or 0
 		if own > 0 then
 			-- 造假
@@ -962,6 +962,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 +1007,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
@@ -13,7 +13,7 @@ function _M.makePotionRpc( agent, data )
 	local count = msg.count
 	if count < 1 then return 0 end
 	local potionBag = role:getProperty("potionBag")
-	local potionLv = role.dinerData:getProperty("dishTree"):getv(potionId, 0)
+	local potionLv = role.dinerData:getProperty("dishTree"):getv(potionId, 1)
 	if potionLv < 1 then return 1 end
  
 	local potionSet = csvdb["adv_potionCsv"][potionId]
@@ -22,20 +22,15 @@ function _M.makePotionRpc( agent, data )
 	local potionData = potionSet[potionLv]
 	if not potionData then return 3 end
  
-	local own = potionBag[potionId] or 0
-	if own+count > potionData.limit then
-		return 4
-	end
-
 	local cost = potionData.material:toNumMap()
 	for k, n in pairs(cost) do
 		cost[k] = n * count
 	end
 	if not role:checkItemEnough(cost) then
-		return 5
+		return 4
 	end
-
 	role:costItems(cost, {log = {desc = "makePotion", int1 = potionId, int2 = count}})
+	local own = potionBag[potionId] or 0
 	potionBag[potionId] = own + count
 	role:updateProperty({field = "potionBag", value = potionBag})
 	role:checkTaskEnter("PotionMake", {count = count, id = potionId})
@@ -129,8 +124,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)
@@ -385,22 +385,12 @@ function _M.talentUpRpc( agent, data )
 	local msg = MsgPack.unpack(data)
 	local dish = msg.dish
 	local dishTree = role.dinerData:getProperty("dishTree")
-	local dishLevel = dishTree:getv(dish, 0)
  
 	local talentSet = csvdb["diner_talentCsv"][dish]
 	if not talentSet then
 		return 1
 	end
  
-	local talentData = talentSet[dishLevel]
-	if not talentData then
-		return 2
-	end
-
-	if not talentSet[dishLevel+1] then
-		return 21
-	end
-
 	local typ = math.floor(dish/100 + 1)
 	local treeSet = csvdb["diner_treeCsv"][typ]
 	if not treeSet then
@@ -412,6 +402,17 @@ function _M.talentUpRpc( agent, data )
 		return 4
 	end
  
+	-- 调理剂的默认等级是1级
+	local dishLevel = dishTree:getv(dish, treeData.rarity == 2 and 1 or 0)
+	local talentData = talentSet[dishLevel]
+	if not talentData then
+		return 2
+	end
+
+	if not talentSet[dishLevel+1] then
+		return 21
+	end
+
 	local limit = talentData.pointFront:toNumMap()
 	for k,v in pairs(limit) do
 		local lv = dishTree:getv(k, 0)
@@ -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
@@ -259,6 +247,7 @@ table.insert(helpDes, {&quot;获得所有零件&quot;, &quot;get&quot;, &quot;RUNE&quot;})
 table.insert(helpDes, {"获得所有碎片", "get", "FRAG"})
 table.insert(helpDes, {"获得所有食物", "get", "FOOD"})
 table.insert(helpDes, {"获得所有角色", "get", "HERO"})
+table.insert(helpDes, {"获得满级满觉醒角色,满级满精进铭文", "get", "MAXHERO"})
 function _M.get(role, pms)
 	if pms.pm1 == "ALL" then
 		local reward = {}
@@ -275,7 +264,7 @@ function _M.get(role, pms)
 			end
 		end
 	elseif pms.pm1 == "RUNE" then
-		for itemId = 2000 , 3000 do
+		for itemId = 10000 , 20000 do
 			if csvdb["itemCsv"][itemId] then
 				role:award({[itemId] = 1}, {log = {desc = "gm"}})
 			end
@@ -298,6 +287,36 @@ function _M.get(role, pms)
 				role:award({[itemId] = 1}, {log = {desc = "gm"}})
 			end
 		end
+	elseif pms.pm1 == "MAXHERO" then
+		-- 给英雄
+		for itemId = 400 , 700 do
+			if csvdb["itemCsv"][itemId] then
+				role:award({[itemId] = 1}, {log = {desc = "gm"}})
+			end
+		end
+		-- 升满级
+		for _, hero in ipairs(role.heros) do
+			hero:updateProperty({field = "level", value = 140})
+			hero:updateProperty({field = "wakeL", value = #csvdb["unit_wakeCsv"]})
+		end
+
+		-- 添加铭文
+		for itemId = 10000 , 20000 do
+			if csvdb["itemCsv"][itemId] then
+				role:award({[itemId] = 1}, {log = {desc = "gm"}})
+			end
+		end
+		for _, rune in ipairs(role.runeBag) do
+			local typ = rune:getProperty("type")
+			local id = rune:getProperty("id")
+
+			local runeSet = csvdb["runeCsv"][typ]
+			if not runeSet then break end
+			local runeData = runeSet[id]
+			if not runeData then break end
+
+			rune:updateProperty({field = "level",value = runeData.lvLimit})
+		end
 	else
 		local itemId = tonum(pms.pm1)
 		if not csvdb["itemCsv"][itemId] then
@@ -539,6 +558,26 @@ function _M.actbattle(role, pms)
 	return "成功"
 end
  
+table.insert(helpDes, {"清空背包", "clearbag"})
+function _M.clearbag(role, pms)
+	-- 装备
+	role:updateProperty({field="equips", value = {}})
+	-- 道具
+	local items = role:getProperty("items"):toNumMap()
+	for k, v in pairs(items) do
+		role:addItem({itemId = k, count = -v, log = {desc = "gm"}})
+	end
+
+	-- 铭文
+	local uids = {}
+	for uid, _ in pairs(role.runeBag) do
+		table.insert(uids, uid)
+	end
+	role:delRunes(uids, {log = {desc = "gm"}})
+
+	return "成功"
+end
+
 function _M.helpRpc(agent, data)
 	SendPacket(actionCodes.Gm_helpRpc, MsgPack.pack({help = helpDes}))
 	return true
@@ -546,11 +585,23 @@ end
  
 function _M.test(role, pms)
 	local id = tonum(pms.pm1, 0)
+	local actid = nil
+	if id > 100 then
+		actid = tonum(pms.pm2, 0)
+	end
 	--local hero = require ("actions.HeroAction")
 	--hero.unlockPoolRpc({role = role}, MsgPack.pack({type = id}))
  
 	--role:sendMail(13, nil, "1=2", {111})
-	dump(redisproxy:zrevrange("rank:tower", 0 , 10, "WITHSCORES"))
+	local file = io.open("draw_hero_"..id..".csv", "a")
+	for i=1, 10000 do
+		local heroIds = _M.drawHero(role, id, actid)
+		for k, v in ipairs(heroIds) do
+			print((i - 1)* 10 + k, v)
+			file:write(v.."\n")
+		end
+	end
+	io.close(file)
 	return "成功"
 end
  
@@ -559,6 +610,12 @@ function _M.ayncPurchase(role, params)
 	return role:handlePurchase(params) or ""
 end
  
+-- 获取订单号
+function _M.getPurchaseOrder(role, params)
+	return role:getPurchaseOrderByPlatform(params) or ""
+end
+
+
 function _M.cz(role, pms)
 	local id = tonum(pms.pm1)
 	local csvData = csvdb["shop_rechargeCsv"][id]
@@ -575,5 +632,259 @@ function _M.cz(role, pms)
 	return "指令成功"
 end
  
+function _M.drawHero(role, t, act)
+	local btype = t	-- 1 2 3 4 5	卡池类型  4新手卡池 5心愿卡池
+	local subType = 1-- 定向卡池需要传 子类型
+	local drawType = 2 -- 1 单抽 2 十连
+	if btype ~= 1 then
+		subType = 1
+	end
+
+	local actid = act
+	-- 另开活动卡池
+	if actid then
+		--if not role.activity:isOpenById(actid, "ActHeroPool") then return end
+		local cfg = csvdb["activity_ctrlCsv"][actid]
+		if not cfg then return end
+
+		btype = cfg.condition
+	end
+
+	local buildTypeData = csvdb["build_typeCsv"][btype]
+	if not buildTypeData then return 2 end
+
+	local drawCount = {1, 10} -- 抽取次数
+	if not drawCount[drawType] then return 3 end
+
+	local draw_floor_back_counts = globalCsv.draw_floor_back_counts[btype]
+	local floorHeroCount = role:getProperty("floorHero")[btype] or 0
+
+	-- 抽取的池子
+	local poolMap = buildTypeData["pool"]:toNumMap()
+	local poolId = poolMap[subType]
+	if not poolId then return 5 end
+	
+	--TODO 活动覆盖
+	local actPoolId = role.activity:getActivityPool(btype, subType)
+	if actPoolId ~= 0 then
+		poolId = actPoolId
+	end
+
+	local unitPool = csvdb["build_unitCsv"][poolId]
+	if not unitPool then return 7 end
+
+	-- 开始抽
+	local resultPool = {}
+	local function fillDrawPool(isFloorBack)
+		local condition = {"rare"}
+		local values = {}
+
+
+		for idx, field in ipairs(condition) do
+			if not values[idx] then
+				local lpool = {}
+				local curIdx = 1
+				while unitPool[field .. "_" .. curIdx] do
+					lpool[curIdx] = {unitPool[field .. "_" .. curIdx]}
+					curIdx = curIdx + 1
+				end
+
+				if next(lpool) then
+					values[idx] =  math.randWeight(lpool, 1)
+				end
+			end
+		end
+
+		local weight = 0
+		local up_pool = nil
+		local rand_v = math.randomInt(1, 100)
+		if values[1] == HeroQuality.SR then
+			weight = unitPool["up_sr_weight"]
+			up_pool = unitPool["up_sr_id"]
+		elseif values[1] == HeroQuality.SSR then
+			weight = unitPool["up_ssr_weight"]
+			up_pool = unitPool["up_ssr_id"]
+		end
+		--print(poolId, rand_v, weight, up_pool, values[1])
+		if rand_v < weight and up_pool then
+			up_pool = up_pool:toArray(true, "=")
+			if btype == 5 then -- 爱心卡池，使用玩家设置的备选池子
+				up_pool = role:getProperty("wishPool")
+				up_pool[1] = 606
+				up_pool[2] = 607
+				up_pool[3] = 608
+			end
+			for k, v in ipairs(up_pool) do
+				resultPool[v] = {1}
+			end
+		else
+			for itemId, oneData in pairs(isFloorBack and csvdb["build_floorCsv"] or csvdb["build_poolCsv"]) do
+				local pool_str = "pool_" .. poolId
+				if oneData[pool_str] and oneData[pool_str] ~= "" then
+					local itemData = csvdb["itemCsv"][itemId]
+					while itemData do
+						if itemData.type ~= ItemType.Hero then break end
+						local heroData = csvdb["unitCsv"][itemData.id - ItemStartId.Hero]
+						if not heroData then break end
+						local ok = true
+						-- 保底是全随机，不用比较类型
+						if not isFloorBack then
+							for idx, field in ipairs(condition) do
+								if heroData[field] ~= values[idx] 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, 概率
+						end
+						break
+					end
+				end
+			end
+		end
+	end
+
+	local guideHero = nil
+	if role:getProperty("newerGuide") == "8=1" then
+		guideHero = globalCsv.newdraw_hero_item_id or 503
+	end
+
+	local ssrCount = 0
+	local reward = {}
+	local logReward = {}
+	local result = {}
+	for i = 1, drawCount[drawType] do
+		floorHeroCount = floorHeroCount + 1
+		local isFloorBack = draw_floor_back_counts and floorHeroCount >= draw_floor_back_counts
+		resultPool = {}
+		fillDrawPool(isFloorBack)
+		if not next(resultPool) then
+			skynet.error("random pool error, poolId:" .. poolId, isFloorBack)
+			return 8
+		end
+
+		local itemId = math.randWeight(resultPool, 1)
+		if guideHero then
+			itemId = guideHero
+		end
+
+		local itemData = csvdb["itemCsv"][itemId]
+		if itemData.quality == HeroQuality.SSR then
+			ssrCount = ssrCount + 1
+			if not guideHero then
+				-- 广播获得ssr英雄
+				local ntf = {heroId = itemData.id - ItemStartId.Hero, nick = role:getProperty("name")}
+				--mcast_util.pub_world(actionCodes.Role_broadGetSSR, MsgPack.pack(ntf))
+			end
+		end
+
+		if btype == 4 and role:getProperty("newerDraw") == 0 then		-- 新手卡池
+			if itemData.quality == HeroQuality.SSR then
+				floorHeroCount = 0
+			end
+		else
+			if itemData.quality >= HeroQuality.SR then
+				floorHeroCount = 0
+			end
+		end
+
+		if role:isHaveHero(itemData.id - ItemStartId.Hero) then
+			local fragId = itemData.id - ItemStartId.Hero
+			local heroData = csvdb["unitCsv"][fragId]
+			local count = globalCsv.draw_unit_tofragment[heroData.rare]
+			role:award({[fragId] = count}, {log = {desc = "drawHero", int1 = btype, int2 = poolId}})
+			logReward[fragId] = (logReward[fragId] or 0) + count
+			table.insert(reward, {id = fragId, count = count, from = itemId, fcount = 1})
+		else
+			role:award({[itemId] = 1}, {log = {desc = "drawHero", int1 = btype, int2 = poolId}})
+			logReward[itemId] = (logReward[itemId] or 0) + 1
+			table.insert(reward, {id = itemId, count = 1})
+		end
+	end
+
+	if draw_floor_back_counts then
+		local floorHero = role:getProperty("floorHero")
+		floorHero[btype] = floorHeroCount
+		role:setProperty("floorHero", floorHero)
+	end
+
+	if btype == 4 then
+		local newCount = role:getProperty("newerDraw")
+		role:updateProperty({field="newerDraw", value = newCount + drawCount[drawType]})
+	end
+
+	--SendPacket(actionCodes.Hero_drawHeroRpc, MsgPack.pack({reward = reward})) -- 这个 reward 是数组
+	for k, v in pairs(reward) do
+		local hero = v
+		if hero["from"] then
+			result[#result+1] = hero["from"]
+		else
+			result[#result+1] = hero["id"]
+		end
+	end
+
+	local feedbackId = buildTypeData["can_feedback"] or 0
+	if feedbackId ~= 0 then
+		-- 达到一定次数，给响应奖励
+		local oldVal = role:getProperty("repayHero") or 0
+		if actid then
+			local actData = role.activity:getActData("ActHeroPool")
+			oldVal = actData[btype] or 0
+		end
+		local newVal = oldVal + drawCount[drawType]
+		local drawCardReward, val = role:getDrawCardExtraReward(feedbackId, oldVal, newVal)
+		-- 空字符穿代表直接给英雄  走以前repayHeroRpc
+		if drawCardReward == "" then
+			local repayHeroMaxCount = role:getProperty("repayMaxC") or 0
+			repayHeroMaxCount = repayHeroMaxCount + 1
+
+			role:updateProperty({field = "repayMaxC", value = repayHeroMaxCount})
+			local even = repayHeroMaxCount % 2
+			local id = 0
+			if even == 1 then
+				id = math.randWeight(csvdb["build_giftCsv"], "pool_"..feedbackId)
+			else
+				local giftHeroSet = {}
+				for gid, cfg in pairs(csvdb["build_giftCsv"]) do
+					if cfg["pool_"..feedbackId] ~= 0 and not role:isHaveHero(gid - ItemStartId.Hero) then
+						giftHeroSet[gid] = {1}
+					end
+				end
+				if next(giftHeroSet) then
+					id = math.randWeight(giftHeroSet, 1)
+				end
+			end
+			if id == 0 then
+				id = math.randWeight(csvdb["build_giftCsv"], "pool_"..feedbackId)
+			end
+
+			local r,change = {}
+			local itemData = csvdb["itemCsv"][id]
+			--if itemData.type == ItemType.Hero and role:isHaveHero(itemData.id - ItemStartId.Hero) then
+			--	local fragId = itemData.id - ItemStartId.Hero
+			--	local heroData = csvdb["unitCsv"][fragId]
+			--	local count = globalCsv.draw_unit_tofragment[heroData.rare]
+			--	r, change = role:award({[fragId] = count}, {log = {desc = "drawHeroExtraReward"}})
+			--	--r = {id = fragId, count = count, from = id, fcount = 1}
+			--else
+			r, change = role:award({[id] = 1}, {log = {desc = "drawHeroExtraReward"}})
+			--end
+			SendPacket(actionCodes.Hero_drawHeroExtraRewardNtf, MsgPack.pack(role:packReward(r, change)))
+		elseif drawCardReward and drawCardReward ~= "" then
+			local r,change = {}
+			r, change = role:award(drawCardReward, {log = {desc = "drawHeroExtraReward", int1 = oldVal, int2 = newVal}})
+			SendPacket(actionCodes.Hero_drawHeroExtraRewardNtf, MsgPack.pack(role:packReward(r, change)))
+		end
+		if not actid then
+			role:updateProperty({field = "repayHero", value = val})
+		else
+			local actData = role.activity:getActData("ActHeroPool")
+			actData[btype] = val
+			role.activity:updateActData("ActHeroPool", actData)
+		end
+	end
+	return result
+end
+
  
 return _M
 \ No newline at end of file
@@ -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)
@@ -581,6 +591,8 @@ function _M.startBonusBattleRpc(agent, data)
  
 		local reward, change = bonusWinReward(role, bonusData, 3, count)
 		SendPacket(actionCodes.Hang_startBonusBattleRpc, MsgPack.pack({reward = reward, change = change}))
+
+		role:checkTaskEnter("BonusQuick", {count = count})
 	else
 		local bTeam = role:getTeamFormatByType(TeamSystemType.BonusBattle)
 		if not next(bTeam) then return 5 end
@@ -607,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 = {}
@@ -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]
@@ -147,6 +147,15 @@ function _M.gm_action(query)
 	return status
 end
  
+function _M.query_role(query)
+	if not query.uid then return "not found" end
+	local user = redisproxy:get(string.format("uid:%s", query.uid))
+	if not user then return "not found" end
+	local roleId = redisproxy:get(string_format("user:%s", string.upper(user)))
+	if not roleId then return "not found" end
+	return json.encode({roleId, user})
+end
+
 function _M.broadcast(query)
 	local msg = {}
 	local handle = {
@@ -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
@@ -179,6 +179,7 @@ function _M.finishQuestRpc(agent, data)
     msg["heroFaith"] = heroFaithMap
     SendPacket(actionCodes.Radio_finishQuestRpc, MsgPack.pack(msg))
  
+    role:checkTaskEnter("RadioTaskStart", {heroCnt = #task.heros})
  
     local herolist = {}
     for _, heroId in ipairs(task.heros) do
@@ -157,6 +157,7 @@ function _M.loginRpc( agent, data )
 	SERV_OPEN = redisproxy:hget("autoincrement_set", "server_start")
  
 	role:changeStructVersion() -- 数据结构 版本更新
+	role:getAdvData(true) -- 清掉不合格的数据
 	role:advEndlessSeasonCheck(true) -- 冒险赛季更新检查
  
 	-- 跨天登陆事件
@@ -586,9 +587,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 +611,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 +619,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
@@ -687,7 +688,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
@@ -847,6 +848,11 @@ function _M.taskRpc(agent, data)
 	local reward, change = role:award(taskData.reward, {log = {desc = "finishTask", int1 = taskType, int2 = taskId}})
 	local active = (taskStatus["a"] or 0) + taskData.active
  
+	-- 日常活动完成
+	if taskType == 1 then
+		role:checkTaskEnter("DailyTask", {pre = (taskStatus["a"] or 0), cur = active})
+	end
+
 	role:changeUpdates({
 		{ type = roleField[taskType], field = {"t", taskId}, value = -1 },
 		{ type = roleField[taskType], field = "a", value = active},
@@ -1013,6 +1019,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)
  
  
@@ -20,8 +20,6 @@ function Adv:ctor(owner)
 	self.advTask = self.owner:getProperty("advTask")
 	self.advMTask = self.owner:getProperty("advMTask")
 	self.advTaskChange = false -- 任务改变才更新
-
-	self:initByInfo(self.owner:getProperty("advInfo"))
 end
  
 function Adv:mylog(contents)
@@ -36,7 +34,8 @@ function Adv:mylog(contents)
 end
  
 --初始化adv 信息
-function Adv:initByInfo(advInfo)
+function Adv:initByInfo()
+	local advInfo = self.owner:getProperty("advInfo")
 	if not next(advInfo) then return end --还没有 开始新地图
  
 	self.chapterId = advInfo.chapterId
@@ -61,10 +60,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 +139,13 @@ 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
  
+	if self.level == 1 or self.isRelay then
+		self:supplyPotion()
+	end
+
 	self.maps = {}
 	self.maps[1] = AdvMap.new(self, 1, mapId, isEnter, isNewRelay)
  
@@ -153,8 +153,6 @@ function Adv:initByChapter(params)
  
 	self:initLayerTask()
  
-
-
 	self:checkTask(Adv.TaskType.Arrive)
 	self:checkAdvUnlock(1, self.level)
  
@@ -168,6 +166,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
@@ -389,18 +401,24 @@ function Adv:isRunning()
 	return false
 end
  
--- 强制结束
-function Adv:forceOver(notNotify)
-	if self:isRunning() then
-		
+-- 强制结束  逻辑和adv内部无关
+function Adv:forceOver(notNotify, force)
+	if self:isRunning() or force then
 		local advTeam = self.owner:getProperty("advTeam")
 		advTeam.player = nil
  
+		local advPotionCsv = csvdb["adv_potionCsv"]
+		local potionBag = self.owner:getProperty("potionBag")
+
 		local reward = self.owner:getProperty("advItems"):toNumMap()
 		for itemId, count in pairs(reward) do
-			reward[itemId] = math.ceil(count * globalCsv.adv_fail_reward_ratio / 100) -- 奖励相当于失败
+			if advPotionCsv[itemId] then
+				potionBag[itemId] = (potionBag[itemId] or 0) + count
+			else
+				reward[itemId] = math.ceil(count * globalCsv.adv_fail_reward_ratio / 100) -- 奖励相当于失败
+			end
 		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({
@@ -409,6 +427,7 @@ function Adv:forceOver(notNotify)
 			advItems = "",
 			advAFGet = {},
 			advAFWear = {},
+			potionBag = potionBag,
 		}, notNotify)
 	end
 end
@@ -789,9 +808,13 @@ function Adv:over(success, rewardRatio, overType)
 	self.battle.player:triggerPassive(Passive.ADV_OVER, {score = score, level = self.level})
  
 	local reward = {}
+	local advPotionCsv = csvdb["adv_potionCsv"]
+	local potionBag = self.owner:getProperty("potionBag")
 	for itemId, count in pairs(self.owner:getProperty("advItems"):toNumMap()) do
 		local itemCsv = csvdb["itemCsv"][itemId]
-		if not itemCsv then
+		if advPotionCsv[itemId] then
+			potionBag[itemId] = (potionBag[itemId] or 0) + count
+		elseif not itemCsv then
 			print("ERROR: no itemId in ItemCsv : ", itemId)
 		elseif itemCsv.type ~= ItemType.AdvItem then
 			reward[itemId] = math.ceil(count * rewardRatio / 100)
@@ -811,28 +834,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()
  
@@ -889,6 +913,7 @@ function Adv:over(success, rewardRatio, overType)
 		advItems = "",
 		advAFGet = {},
 		advAFWear = {},
+		potionBag = potionBag,
 	})
 	self:pushBackEvent(AdvBackEventType.End, {
 		success = success,
@@ -963,7 +988,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)
@@ -973,7 +998,8 @@ function Adv:award(gift, params, backRewardParams)
 		if globalCsv.adv_auto_useItem[itemId] and count > 0 then
 			autoUse[itemId] = count
 		else
-			local origin = items:getv(itemId, 0)
+			local transId = globalCsv.adv_item_potion[itemId] or itemId
+			local origin = items:getv(transId, 0)
 			local nums = origin + count
  
 			if csvdb["adv_artifactCsv"][itemId] then -- 获得神器
@@ -983,10 +1009,10 @@ function Adv:award(gift, params, backRewardParams)
 				end
 			else
 				if nums <= 0 then
-					items = items:delk(itemId)
+					items = items:delk(transId)
 					nums = 0
 				else
-					items = items:setv(itemId, nums)
+					items = items:setv(transId, nums)
 				end
  
 				if itemId == 16 and not self.owner:checkOverGuide(51,4) then
@@ -1064,6 +1090,7 @@ end
 -- 消耗物品 优先冒险背包  --check 只是检查够不够
 function Adv:cost(item, params, check)
 	local items = self.owner:getProperty("advItems")
+	local potionCsv = csvdb["adv_potionCsv"]
 	local less = {}
 	local advCost = {}
 	for itemId, count in pairs(item) do
@@ -1077,9 +1104,13 @@ function Adv:cost(item, params, check)
 			less[itemId] = -last
 		end
  
+		if potionCsv[itemId] and last < 0 then -- 只能使用冒险背包里的药水
+			return
+		end
 	end
 	if next(less) and not self.owner:checkItemEnough(less) then return end --不够
 	if check then return true end
+
 	self:award(advCost, params)
 	if next(less) then
 		self.owner:costItems(less, params)
@@ -1087,6 +1118,34 @@ function Adv:cost(item, params, check)
 	return true
 end
  
+-- 补满冒险背包药剂,从药剂背包扣除药水放到冒险背包
+function Adv:supplyPotion()
+	local potionCsv = csvdb["adv_potionCsv"]
+	local potionBag = self.owner:getProperty("potionBag")
+	local advItems = self.owner:getProperty("advItems")
+	local dishTree = self.owner.dinerData:getProperty("dishTree")
+	for potionId, set in pairs(potionCsv) do
+		local count = potionBag[potionId] or 0
+		if count > 0 then
+			local max = set[dishTree:getv(potionId,1)].limit
+			local old = advItems:getv(potionId,0)
+			local need = max - old
+
+			if need < count then
+				advItems = advItems:setv(potionId,max)
+				potionBag[potionId] = count - need
+			else
+				advItems = advItems:setv(potionId,old + count)
+				potionBag[potionId] = nil
+			end
+		end
+	end
+	self.owner:updateProperties({
+		advItems = advItems,
+		potionBag = potionBag,
+	})
+end
+
 --事件点击处理
 local function clickOut(self, room, block, params, isExit)
 	if self:getCurMap():checkOver() then --检查是否可以出去了
@@ -1112,6 +1171,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 +1188,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 +1740,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
@@ -2143,6 +2202,7 @@ function Adv:enemyDead(enemy, escape)
 				self:checkAchievement(Adv.AchievType.KillBossNoBuff, 1)
 				self:checkAchievement(Adv.AchievType.KillBossWithMWeapon, 1)
 				self:checkAchievement(Adv.AchievType.KillBossWithAMWeapon, 1)
+				self.owner:checkTaskEnter("AdvKillBoss")
 			elseif monsterData.type == 3 then
 				self:checkTask(Adv.TaskType.KillElite, 1, enemyId)
 			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 = {}
@@ -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=战斗额外掉落次数
@@ -30,6 +30,9 @@ Activity.ActivityType = {
 	ActShopGoods = 25, 	-- 活动商品
  
 	Crisis = 26, -- 宝藏怪活动
+
+	CommonSignIn = 28, 	--通用签到
+	FriendEnergy = 30, -- 好友互赠能量活动 
 }
  
 local function checkActivityType(activityType)
@@ -73,6 +76,9 @@ Activity.schema = {
  
 	act24		= {"table", {}, true},	-- 活动卡池 {id=repaynum}
 	act26 		= {"table", {}},	-- {task = {id = count}, socre = {id = status}}
+
+	act28		= {"table", {}},	-- 每日活跃签到 {0=day, 1=1,2=1,3=1}
+	act30 		= {"table", {}}, -- {magic = 0, limit = 0, reward = {id = 1, id = 1}, giveAE = {}, getAE = {}} 奖励字段1表示领取过奖励
 }
  
 function Activity:data()
@@ -91,7 +97,11 @@ function Activity:data()
 		act18 = self:getProperty("act18"),
 		act19 = self:getProperty("act19"),
 		act20 = self:getProperty("act20"),
+		act24 = self:getProperty("act24"),
 		act26 = self:getProperty("act26"),
+
+		act28 = self:getProperty("act28"),
+		act30 = self:getProperty("act30"),
 	}
 end
  
@@ -277,38 +287,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
  
-					self.owner:log("activity", {
-						activity_id = cfg.id, -- 活动ID（或活动指定任务的ID）
-						activity_type = actType, -- 活动类型，见活动类型枚举表
-						activity_reward = cfg.reward:toNumMap(), -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
-					})
+				--print(curData[0], cfg.condition1)
+				if not curData[cfg.id] and curData[0] >= cfg.condition1 then
+					if info.mailId then 
  
-					self.owner:sendMail(info.mailId, nil, cfg.reward, {cfg.condition1})
-					curData[cfg.id] = 1
+						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
+					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
@@ -427,7 +455,7 @@ activityFunc[Activity.ActivityType.PayBack] = {
 -- 英雄帖
 activityFunc[Activity.ActivityType.CalendaTask] = {
 	["init"] = function(self, actType, isCrossDay, notify)
-		local calTask = self.owner:getProperty("CalTask")
+		local calTask = self.owner:getProperty("calTask")
 		calTask = {}
 		local role = self.owner
 		local buildL = role.dinerData:getProperty("buildL")
@@ -452,8 +480,9 @@ activityFunc[Activity.ActivityType.CalendaTask] = {
 		role:checkTaskEnter("RuneQualityCollect", {})
  
 	end,
-	-- ["close"] = function(self, actType, notify)
-	-- end,
+	["close"] = function(self, actType, notify)
+		self.owner:updateProperty({field="calTask", value={}})
+	end,
 }
  
 -- 兑换
@@ -463,6 +492,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 +503,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 +539,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,
@@ -560,8 +598,8 @@ function Activity:closeActivity(actId, notify, notUpdateAct)
 	local actType = actData.showType
 	if activityFunc[actType] and activityFunc[actType]['close'] then
 		activityFunc[actType]["close"](self, actType, notify, actId)
-		self:recycleActItem(actId)
 	end
+	self:recycleActItem(actId)
 	if Activity.schema["act".. actType] then
 		if not Activity.schema["act" .. actType][3] then 
 			self:updateActData(actType, Activity.schema["act" .. actType][2], not notify or notUpdateAct)
@@ -680,7 +718,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
@@ -744,7 +782,46 @@ activityFunc[Activity.ActivityType.ActShopGoods] = {
 	end,
 }
  
+activityFunc[Activity.ActivityType.FriendEnergy] = {
+	["init"] = function (self, actType, isCrossDay, notify, actId)
+		local data = {magic = 0, limit = 0, reward = {}, giveAE = {}, getAE = {}, new = self:getActFriendNew()}
+		self:updateActData(actType, data, not notify)
+	end,
+	["login"] = function (self, actType)
+		local actData = self:getActData(actType) or {}
+		actData.new = self:getActFriendNew()
+		self:updateActData(actType, actData, not notify)
+	end,
+	["crossDay"] = function(self, actType, notify)
+		local actData = self:getActData(actType)
+		actData.limit = 0
+		actData.giveAE = {}
+		actData.getAE = {}
+		self:updateActData(actType, actData, not notify)
+	end,
+	["close"] = function (self, actType, notify, actId)
+		redisproxy:del(FRIEND_ENERGY:format(self.owner:getProperty("id")))
+	end
+}
+
+function Activity:getActFriendNew()
+	local roleId = self.owner:getProperty("id")
+	local friendIds = {}
+	local friends = redisproxy:hgetall(FRIEND_KEY:format(roleId))
+	for i = 1, #friends , 2 do
+		local objId = tonumber(friends[i])
+		friendIds[objId] = 1
+	end
  
+	local ids = {}
+	local members = redisproxy:smembers(FRIEND_ENERGY:format(roleId))
+	for _, id in pairs(members) do
+		if friendIds[tonumber(id)] then
+			ids[tonumber(id)] = 1
+		end
+	end
+	return ids
+end
  
 activityFunc[Activity.ActivityType.Crisis] = {
 	["check"] = function(self, actType, notify, atype, count) -- 检查
@@ -757,25 +834,27 @@ activityFunc[Activity.ActivityType.Crisis] = {
 		for id, actSet in pairs(actCsv) do
 			if actSet.type == atype then
 				local status = actData.task[id] or 0
-				status = status + count
-				if status >= actSet.condition1 then
-					local reward
-					if actSet.loop == 1 then
-						local rcount = math.floor(status / actSet.condition1)
-						reward = actSet.reward:toNumMap()
-						for itemId, itemC in pairs(reward) do
-							reward[itemId] = itemC * rcount
+				if status ~= -1 then
+					status = status + count
+					if status >= actSet.condition1 then
+						local reward
+						if actSet.loop == 1 then
+							local rcount = math.floor(status / actSet.condition1)
+							reward = actSet.reward:toNumMap()
+							for itemId, itemC in pairs(reward) do
+								reward[itemId] = itemC * rcount
+							end
+							status = status % actSet.condition1
+						else
+							reward = actSet.reward
+							status = -1
 						end
-						status = status % actSet.condition1
-					else
-						reward = actSet.reward
-						status = -1
-					end
  
-					self.owner:award(reward, {log = {desc = "activity_crisis"}, notNotify = not notify})
+						self.owner:award(reward, {log = {desc = "activity_crisis"}, notNotify = not notify})
+					end
+					actData.task[id] = status
+					change = true
 				end
-				actData.task[id] = status
-				change = true
 			end
 		end
 		if change then
@@ -786,4 +865,40 @@ activityFunc[Activity.ActivityType.Crisis] = {
 	end,
 }
  
+activityFunc[Activity.ActivityType.CommonSignIn] = {
+	["init"] = function(self, actType, isCrossDay, notify, actId)
+		if not isCrossDay then
+			activityFunc[Activity.ActivityType.CommonSignIn]["crossDay"](self, actType, notify, actId)
+		end
+	end,
+	["crossDay"] = function(self, actType, notify, actId)
+		local actCfg = csvdb["activity_ctrlCsv"][actId]
+		if not actCfg then return end
+		local conArr = actCfg.condition2:toArray(true, "=")
+		-- 0 登录即可， 1 达到指定活跃度
+		if conArr[1] ~= 0 then
+			return
+		end
+		local curData = self:getActData(actType) or {}
+		curData[0] = (curData[0] or 0) + 1
+		self:updateActData(actType, curData, not notify)
+	end,
+	["check"] = function(self, actType, notify, pre, cur) -- 检查
+		local isOpen, actId = self:isOpen(actType)
+		local actData = self:getActData(actType) or {}
+		local actCfg = csvdb["activity_ctrlCsv"][actId]
+		if not actCfg then return end
+		local conArr = actCfg.condition2:toArray("true", "=")
+		-- 0 登录即可， 1 达到指定活跃度
+		if conArr[1] ~= 1 then
+			return
+		end
+		local val = conArr[2] or 0
+		if pre < val and cur >= val then
+			actData[0] = (actData[0] or 0) + 1
+			self:updateActData(actType, actData, not notify)
+		end
+	end,
+}
+
 return Activity
@@ -201,7 +201,7 @@ function Diner:calSellReward(sell, delta, dishData)
 			upValue[ItemId.Gold] = (upValue[ItemId.Gold] or 0) + buildData.gold_up
 		end
 		if buildData.item_up > 0 then
-			upValue[ItemId.DinerCoin] = (upValue[ItemId.DinerCoin] or 0) + buildData.gold_up
+			upValue[ItemId.DinerCoin] = (upValue[ItemId.DinerCoin] or 0) + buildData.item_up 
 		end
 		if buildData and buildData.famous_up > 0 then
 			upValue[-1] = (upValue[-1] or 0) + buildData.famous_up
@@ -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
@@ -51,6 +51,8 @@ local ItemReason = {
 	actBattle = 135, -- 活动关卡
 	actMilestone = 136,	-- 活动关卡boss伤害里程碑
 	worldBossReward = 137,	-- 世界boss翻牌奖励
+	commonSign = 138,	-- 每日活跃签到
+	actFriendHelp = 139,-- 好友能量互助活动
  
  
 	advHang = 301, -- 拾荒挂机
@@ -122,6 +124,7 @@ local ItemReason = {
  
 	-- pvp 
 	pvpCHead = 1301, -- pvp 跨服竞技场头像
+	crossPvpBet = 1302, -- 竞猜
  
 	--adv
 	chooseEvent = 1351, -- 冒险选择
@@ -591,6 +594,7 @@ local LogType = {
 	guide = "common",
 	newdevice = "common",
 	cbback = "common",
+	cheat = "common",
  
 	in_item = "common",
 	out_item = "common",
@@ -131,6 +131,9 @@ function RolePlugin.bind(Role)
 					self:addItem(pms)
 				end
 			end,
+			[ItemType.Potion] = function ()
+				self:addPotion({id = itemId, count = count, notNotify = pms.notNotify, log = pms.log})
+			end,
 		}
 		-- 对数量筛查
 		count = checkItemCount(self, itemId, count)
@@ -286,10 +289,41 @@ 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
  
+	function Role:addPotion(params)
+		dump(params)
+		local pId = globalCsv.adv_item_potion[params.id]
+		local potionBag = self:getProperty("potionBag")
+		local origin = potionBag[pId] or 0
+		local nums = origin + params.count
+		potionBag[pId] = nums
+
+		self:logItems(params.id, origin, nums, params.log)
+		if params.log then
+			local log = clone(params.log)
+			if log["cint1"] or log["cint2"] then
+				print("addItem error log have cint1 or cint2  ", debug.traceback())
+			end
+			log["cint1"] = params.id
+			log["cint2"] = math.abs(params.count)
+			if params.count <= 0 then
+				self:mylog("out_item", log)
+			else
+				self:mylog("in_item", log)
+			end
+		else
+			print("addItem no log ", debug.traceback())
+		end
+
+		self:updateProperty({field = "potionBag", value = potionBag})
+		if not params.notNotify then
+			SendPacket(actionCodes.Role_updateItems, MsgPack.pack({[params.id] = params.count}))
+		end
+	end
+
 	function Role:addItem(params)
 		params = params or {}
 		params.count = math.floor(params.count or 0)
@@ -387,7 +421,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
  
@@ -804,9 +838,16 @@ function RolePlugin.bind(Role)
 		return runeSet
 	end
  
-	function Role:getAdvData()
+	function Role:getAdvData(notNotify)
 		if not self.advData then
 			self.advData = require("adv.Adv").new(self)
+			local status, err = pcall(function()
+				self.advData:initByInfo()
+			end)
+			if not status then
+				self.advData:forceOver(notNotify, true)
+				skynet.error("getAdvData error adv initByInfo " .. err)
+			end
 		end
 		return self.advData
 	end
@@ -830,7 +871,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 +883,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)
@@ -1470,6 +1541,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
@@ -1505,8 +1577,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
@@ -1543,7 +1622,6 @@ function RolePlugin.bind(Role)
 			if table.pack(next(newReward))[2] >= divisionData.limit then
 				return true
 			end
-			
 		end
  
 		local events = {}
@@ -1596,8 +1674,34 @@ function RolePlugin.bind(Role)
 		self:updateProperty({field = "redp", value = redp})
 	end
  
+	-- 网页支付获取订单号
+	function Role:getPurchaseOrderByPlatform(params)
+		local checkPlatform = {
+			["mycard"] = "mycard_product_id",
+		}
+		local pidField = checkPlatform[params.payMode or ""]
+		if not pidField or not params.product_id or params.product_id == "" then
+			return "no product"
+		end
+
+		for k , v in pairs(csvdb["shop_rechargeCsv"]) do
+			if not v[pidField] then return "no product" end
+			if v[pidField] == params.product_id then
+				if v.rmb ~= params.money then
+					return "error money"
+				end
+				-- 发现需要的id
+				local partnerOrderId = self:getPurchaseOrder(k, params.transactionId)
+				if partnerOrderId == "" then
+					return "no product"
+				end
+				return json.encode({order = partnerOrderId})
+			end
+		end
+	end
+
 	-- 获取充值订单号
-	function Role:getPurchaseOrder(rechargeId)
+	function Role:getPurchaseOrder(rechargeId, transactionId)
 		local roleId = self:getProperty("id")
 		local rechargeData = csvdb["shop_rechargeCsv"][rechargeId]
 		if not rechargeData then
@@ -1634,6 +1738,7 @@ function RolePlugin.bind(Role)
 			order = partnerOrderId, 
 			rechargeId = rechargeId, 
 			createTime = skynet.timex(),
+			transactionId = transactionId,
 		})
 		order:create()
 		-- 正在进行中的订单 缓存
@@ -1666,6 +1771,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
  
@@ -1709,12 +1817,12 @@ function RolePlugin.bind(Role)
 	request.product_id = data.product_id
 	request.pay_time = data.pay_time
 	request.transactionId = data.order_no
+	request.extension_info = data.extension_info
 	]]
 	function Role:handlePurchase(params)
 		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
@@ -1740,6 +1848,10 @@ function RolePlugin.bind(Role)
 		})
  
 		if not status then
+			if params.extension_info == "mycard_web" then
+				-- todo 发邮件
+				skynet.error("mycard_web " .. params.order)
+			end
 			SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ order = partnerOrderStr,
 				result = "success", reward = reward}))
 		end
@@ -9,7 +9,7 @@ local PVP_RANK_TIME_SORT_PRECISION = 360 -- 时间精度 每6分钟忽略差异
 local PVP_RANK_BASE_SCORE = globalCsv.pvp_base_score -- 初始积分
  
 -- 匹配规则改为以排名来匹配
-local PVP_GET_ROBOT_SCORE = 2400 -- 2400分以下低档位匹配机器人
+local PVP_GET_ROBOT_SCORE = 1300 -- 1300分以下低档位匹配机器人
 local PRE_RANGE_COUNT = 20 -- 每个档位人数
 local NEED_MATCH = 3 --匹配到多少人
  
@@ -73,7 +73,7 @@ function Role:changePvpScoreCommon(matchId, isWin)
 		if isWin then
 			local scoreChange = math.ceil(60 / (1 + 10 ^ ((myScore - matchScore) / 400)))
 			myScore = myScore + scoreChange
-			matchScore = matchScore - math.ceil(scoreChange / 3) -- 防守方失败时，扣分减为原来的1/3
+			matchScore = matchScore - math.ceil(scoreChange / 3 * 2) -- 防守方失败时，扣分减为原来的2/3
 		else
 			local scoreChange = math.ceil(60 / (1 + 10 ^ ((matchScore - myScore) / 400)))
 			myScore = myScore - scoreChange
@@ -139,7 +139,7 @@ function Role:changePvpScoreHigh(matchId, isWin)
 		if isWin then
 			local scoreChange = math.ceil(50 / (1 + 10 ^ ((myScore - matchScore) / 1000)))
 			myScore = myScore + scoreChange
-			matchScore = matchScore - math.ceil(scoreChange / 3) -- 防守方失败时，扣分减为原来的1/3
+			matchScore = matchScore - math.ceil(scoreChange / 3 * 2) -- 防守方失败时，扣分减为原来的2/3
 		else
 			local scoreChange = math.ceil(50 / (1 + 10 ^ ((matchScore - myScore) / 1000)))
 			myScore = myScore - scoreChange
@@ -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 -- 当前在本天 经过多少时间
@@ -34,6 +34,7 @@ local TaskType = {
 	HangBattle = 304,			-- 挂机战斗			- id
 	HangGetGold = 305,			-- 挂机获得齿轮		- count
 	BonusPass = 306,			-- 奖励副本通关		- id count
+	BonusQuick = 307, 			-- 奖励关卡扫荡		-- id count
  
 	-- 冒险相关
 	AdvPass = 401,				-- 冒险通过关			- id 	level 	score
@@ -50,6 +51,9 @@ local TaskType = {
 	AdvHang	= 412,				-- 代理拾荒次数
 	AdvMineKill = 413,			-- 宝藏怪击杀
 	AdvMineLayer = 414,			-- 宝藏洞激活
+	AdvKillBoss	= 415,			-- 拾荒击杀boss
+	AdvHangHeroCnt	= 416,		-- 拾荒人数
+	AdvPassFirst = 417,			-- 冒险首次通关			- id
  
 	--爬塔相关
 	TowerPass = 501,			-- 爬塔通关			- level
@@ -91,6 +95,9 @@ local TaskType = {
 	SignIn = 901,				-- 签到
 	Pay	= 902,					-- 充值
 	ShopAll = 903,				-- 在任意商店购买 	
+	DailyTask = 904,			-- 完成每日活跃任务
+	RadioTaskStart = 905,		-- 电台任务开始			
+	FinishSpeTask = 906,		-- 指定任务完成			
  
 	--功能未实现 todo
 	AdvShop = 1002,				-- 冒险商城
@@ -231,6 +238,7 @@ local ActivityListener = {
 		[TaskType.Pay] = {{Activity.ActivityType.PayBack, f("twd")}},
 		[TaskType.AdvMineKill] = {{Activity.ActivityType.Crisis, 1}},
 		[TaskType.AdvMineLayer] = {{Activity.ActivityType.Crisis, 2}},
+		[TaskType.DailyTask] = {{Activity.ActivityType.CommonSignIn, f("pre"), f("cur")}},
 	}
 }
  
@@ -240,7 +248,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")}},
 	}
 }
@@ -268,6 +276,14 @@ local CalendaTaskListener = {
 		[TaskType.HangGet]= {{18, 3, f("reward")}},
 		[TaskType.RuneQualityCollect]= {{19, 3}},
 		[TaskType.OpenBox]= {{20, 3, f("count"), f("quality")}},
+		[TaskType.RadioTaskStart] = {{21, 1}, {22, 3, f("heroCnt")}},
+		[TaskType.BonusQuick] = {{23, 1, f("count")}},
+		[TaskType.AdvHangHeroCnt] = {{24, 3, f("HeroCnt")}},
+		[TaskType.AdvKillBoss] = {{25, 1}},
+		[TaskType.AdvMineKill] = {{26, 1}},
+		[TaskType.PvpBattle] = {{27, 1}},
+		[TaskType.FinishSpeTask] = {{28, 3, f("taskId"), f("actId")}},
+
 	}
 }
  
@@ -690,7 +706,7 @@ function RoleTask.bind(Role)
 								calTask[id] = count
 							elseif cfg.type == 20 then	-- 开启x品质时钟箱子
 								if cfg.condition2 <= (param2 or 0) then
-									calTask[id] = (calTask[id] or 0) + param2
+									calTask[id] = (calTask[id] or 0) + param1
 								end
 							elseif cfg.type == 15 then -- 通关关卡
 								if (calTask[id] or 0) == 0 then
@@ -700,6 +716,15 @@ function RoleTask.bind(Role)
 										calTask[id] = 1
 									end
 								end
+							elseif cfg.type == 22 then	-- 电台任务出勤人数
+								calTask[id] = (calTask[id] or 0) + (param1 or 0)
+							elseif cfg.type == 24 then	-- 代理拾荒出勤人数
+								calTask[id] = (calTask[id] or 0) + (param1 or 0)
+							elseif cfg.type == 28 then	-- 完成指定任务
+								print(actId,param2, cfg.condition2, param1)
+								if actId == param2 and cfg.condition2 == param1 then
+									calTask[id] = (calTask[id] or 0) + 1
+								end
 							end
 						end
 					end
@@ -712,4 +737,4 @@ function RoleTask.bind(Role)
  
 end
  
-return RoleTask
 \ No newline at end of file
+return RoleTask
@@ -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