Merge branch 'tr/bugfix-qa' into cn/develop

熊润斐
2 parents 9114aab3 6df9d5e1
Showing 37 changed files with 2518 additions and 434 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,  --高级竞技场
@@ -224,6 +224,7 @@ AdvBackEventType = {
 	LinkChooseOver = 26, -- 连锁事件结束
 	BuffEffect = 27, -- buff 效果
 	PassiveEffect = 28, -- 被动 效果
+	ChooseDice = 29, -- 选择点随机效果
 }
  
 AdvScoreType = {
@@ -290,6 +291,7 @@ CardType = {
 	BattleCard = 5,	--赛季卡
 	PaySignCard = 6, -- 付费签到卡
 	BattlePassCard = 7, -- 探索指令
+	ActBattleCommandCard = 8, -- 战令活动卡
 }
  
 ShopPackType = {
@@ -324,6 +326,7 @@ MailId = {
 	PayBackAward = 242,
 	CBBackAward = 243,
 	CBBackAward2 = 244,
+	ActivityPoolRet = 280,
 }
  
 TriggerEventType = {
@@ -232,6 +232,13 @@ actionCodes = {
 	Activity_battleMilestoneRpc = 663,
 	Activity_bossRewardRpc = 664,
 	Activity_crisisMilestoneRpc = 665,
+	Activity_commonSignRpc = 666,
+	Activity_friendHelpRpc = 667,
+	Activity_battleCommandRpc = 668,
+	Activity_actBattleCommandTaskRpc = 669,
+	Activity_newSignRpc = 670,
+	Activity_advLevelRpc = 671,
+	Activity_buyBattleCommandLvlRpc = 672,
  
 	Radio_startQuestRpc = 700,
 	Radio_finishQuestRpc = 701,
@@ -249,4 +256,4 @@ for key, value in pairs(actionCodes) do
 		actionHandlers[value + rpcResponseBegin] = handlerName .. "Response"
 	end
 	actionHandlers[value] = string.gsub(key, "_", ".")
-end
 \ No newline at end of file
+end
@@ -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,57 @@ 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
+
+function _M.actBattleCommandTaskRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local taskId = msg.id
+	local calTask = role:getProperty("bcTask") or {}
+	local record = calTask["r"] or {}
+	local flag = record[taskId] or 0
+	if flag == 1 then return 1 end
+	local open, actId = role.activity:isOpen("BattleCommandTask")
+	local actData = csvdb["activity_ctrlCsv"][actId]
+	if not open then return 2 end
+	if not actData then return 3 end
+
+	local taskList = csvdb["activity_taskCsv"][actData.condition]
+	if not taskList then return 4 end
+	local taskCfg = taskList[taskId]
+	if not taskCfg then return 5 end
+	if taskCfg.key ~= actData.condition then return 6 end
+
+	if (calTask[taskId] or 0) < taskCfg.condition1 then return 7 end
+
+	local open, actId = role.activity:isOpen("BattleCommand")
+	local actData = csvdb["activity_ctrlCsv"][actId]
+	if not open then return 2 end
+	if not actData then return 3 end
+
+
+	record[taskId] = 1
+	calTask["r"] = record
+
+	role:updateProperty({field = "bcTask", value = calTask})
+
+	local reward, change = role:award(taskCfg.reward, {log = {desc = "battleCommandTask"}})
+
+	role:log("activity", {
+		activity_id = taskId, -- 活动ID（或活动指定任务的ID）
+		activity_type = role.activity.ActivityType.BattleCommandTask, -- 活动类型，见活动类型枚举表
+		activity_reward = reward, -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
+	})
+
+	role:checkTaskEnter("FinishSpeTask", {taskId = taskId, actId = actId})
+
+	SendPacket(actionCodes.Activity_actBattleCommandTaskRpc, MsgPack.pack(role:packReward(reward, change)))
+
 	return true
 end
  
@@ -511,6 +561,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
@@ -539,7 +590,7 @@ function _M.startBattleRpc(agent, data)
 			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
@@ -568,7 +619,10 @@ function _M.endBattleRpc(agent, data)
 	local isWin = msg.isWin
 	local heros = msg.heros
 	local support = msg.support
-	if not role.activity:isOpenById(actid, "ChallengeLevel") then return 1 end
+	if not role.activity:isOpenById(actid, "ChallengeLevel") then
+		SendPacket(actionCodes.Activity_endBattleRpc, MsgPack.pack({}))
+		return true
+	end
  
 	if not role.__actBattleCache then return 2 end
  
@@ -576,6 +630,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
  
@@ -889,4 +955,417 @@ function _M.bossRewardRpc(agent, data)
 	return true
 end
  
-return _M
 \ No newline at end of file
+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}})
+	end
+	role.activity:updateActData("FriendEnergy", actData)
+	SendPacket(actionCodes.Activity_friendHelpRpc, MsgPack.pack({result = result, reward = reward}))
+	return true
+end
+
+-- 战令活动奖励
+function _M.battleCommandRpc(agent, data)	
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local actid = msg.actid		-- 活动id
+	local index = msg.index			-- 领取的阶段id
+	local pay = msg.pay		-- 是否是超级奖励
+
+	if not role.activity:isOpenById(actid, "BattleCommand") then return 1 end
+	local actCtrlData = csvdb["activity_ctrlCsv"][actid]
+
+	if not actCtrlData then return end
+
+	local actData = role.activity:getActData("BattleCommand") or {}
+	if pay and not actData["unlock"] then return 2 end
+
+	local bpCfg = csvdb["activity_battlepass_rewardCsv"][actid]
+	if not bpCfg then return 3 end
+
+	local unlock = actData["unlock"] or 0
+	local award = {}
+	if not index then	-- 一键领取
+		for i = 1, #bpCfg do
+			local cfg = bpCfg[i]
+			if not cfg then return 4 end
+
+			if (actData["lvl"] or 0) < cfg["type"] then break end
+			local records = {{"freeR", "rewardNormal"}, {"payR", "rewardHigh"}}
+
+			for _, info in ipairs(records) do
+				local typeKey, rewardKey = info[1], info[2]
+				if typeKey == "payR" and unlock == 0 then
+					break
+				end
+				local record = actData[typeKey] or ""
+				local flag = string.char(string.getbit(record, i))
+				if flag == "0" then
+					record = string.setbit(record, i)
+					local awd = cfg[rewardKey]
+					for k, v in pairs(awd:toNumMap()) do
+						award[k] = (award[k] or 0) + v
+					end
+				end
+				actData[typeKey] = record
+
+			end
+		end
+	else
+		bpCfg = bpCfg[index]
+		if not bpCfg then return 4 end
+
+		if (actData["lvl"] or 0) < bpCfg["type"] then return 5 end
+
+		local record = ""
+		if pay then
+			record = actData["payR"] or ""
+		else
+			record = actData["freeR"] or ""
+		end
+
+		local flag = string.char(string.getbit(record, index))
+
+		if flag == "1" then
+			return 6
+		end
+
+		record = string.setbit(record, index)
+		local awd = ""
+		if pay then
+			actData["payR"] = record
+			awd = bpCfg["rewardHigh"]
+		else
+			actData["freeR"] = record
+			awd = bpCfg["rewardNormal"]
+		end
+		for k, v in pairs(awd:toNumMap()) do
+			award[k] = (award[k] or 0) + v
+		end
+	end
+
+	role.activity:updateActData("BattleCommand", actData)
+
+	local reward, change = role:award(award, {log = {desc = "actBattleCommand", int1 = actid, int2 = index}})
+
+	SendPacket(actionCodes.Activity_battleCommandRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
+
+function _M.buyBattleCommandLvlRpc(agent, data)	
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local actid = msg.actid		-- 活动id
+	local count = msg.count
+
+	if not role.activity:isOpenById(actid, "BattleCommand") then return 1 end
+	local actCtrlData = csvdb["activity_ctrlCsv"][actid]
+
+	if not actCtrlData then return 2 end
+
+	local bpCfg = csvdb["activity_battlepass_rewardCsv"][actid]
+	if not bpCfg then return 3 end
+
+	local actData = role.activity:getActData("BattleCommand") or {}
+
+	local curLvl = actData["lvl"] or 0
+	local nextLvl = curLvl + count
+	if curLvl >= bpCfg[#bpCfg]["type"] then return 4 end
+	local cost = 0
+	for i = 1, #bpCfg do
+		local cfg = bpCfg[i]
+		if cfg["type"] > curLvl and cfg["type"] <= nextLvl then
+			cost = cost + cfg["cost"]
+		elseif cfg["type"] > nextLvl then
+			break
+		end
+	end
+	if cost == 0 then return 5 end
+
+	if not role:checkItemEnough({[ItemId.Diamond] = cost}) then return 6 end
+	role:costItems({[ItemId.Diamond] = cost}, {log = {desc = "actBuyBpLevel", int1 = curLvl}})
+	actData["lvl"] = nextLvl
+	role.activity:updateActData("BattleCommand", actData)
+
+	SendPacket(actionCodes.Activity_buyBattleCommandLvlRpc, MsgPack.pack({}))
+	return true
+end
+
+function _M.newSignRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+
+	local open, actId = role.activity:isOpen("NewSign")
+	if not open then return 1 end
+
+	local actData = role.activity:getActData("NewSign")
+	if actData[actData[0] or 0] then
+		return 2
+	end
+
+	local actCfg = csvdb["activity_signInCsv"][actId]
+	if not actCfg then return 4 end
+
+	local sumDay = actData[0] or 0
+	local award = {}
+	for k, data in pairs(actCfg) do
+		if not actData[data.day] and data.day <= sumDay then
+			for id, value in pairs(data.reward:toNumMap()) do
+				award[id] = (award[id] or 0) + value
+			end
+			actData[data.day] = 1
+		end
+	end
+
+	local reward, change
+	if next(award) then
+		role.activity:updateActData("NewSign", actData)
+		reward, change = role:award(award, {log = {desc = "newSign", int1 = actId, int2 = sumDay}})
+	end
+
+	SendPacket(actionCodes.Activity_newSignRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
+
+-- 活动拾荒领取阶段奖励
+function _M.advLevelRpc(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, "AdvLevel") then return 1 end
+
+	local actCfg = csvdb["activity_stagesAwardCsv"][actid]
+	if not actCfg then return 2 end
+	actCfg = actCfg[index]
+	if not actCfg then return 3 end
+
+	local actData = role.activity:getActData("AdvLevel") or {}
+	local record = actData["r"] or ""
+	local flag = string.char(string.getbit(record, index))
+
+	if flag == "1" then return 4 end
+
+	local chapters = actCfg["condition2"]:toArray(true, "=")
+	local totalVal = 0
+	for i = 1, #chapters do
+		local cid = chapters[i]
+		local info = actData[cid] or {}
+		totalVal = totalVal + (info["max"] or 0)
+	end
+	if totalVal < actCfg["condition1"] then return 5 end
+
+	actData["r"] = string.setbit(record, index)
+	role.activity:updateActData("AdvLevel", actData)
+
+	local reward, change = role:award(actCfg.reward, {log = {desc = "advLevelStage", int1 = actid, int2 = index}})
+
+	SendPacket(actionCodes.Activity_advLevelRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
+
+return _M
@@ -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
@@ -86,22 +95,58 @@ function _M.startAdvRpc( agent, data )
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
 	local chapterId = msg.chapterId --关卡id
+	local actid = msg.actid	--活动id
 	local layer = msg.layer or 1	--选择层数
 	--local format = msg.format 		--编队
 	local supportIdx = msg.supportIdx --选择的支援效果
 	if not role:isFuncUnlock(FuncUnlock.Adv) then return end
-	
+
 	--上一个关卡结束才可以开始新的关卡
 	if role:getAdvData():isRunning() then return 8 end
 	local advHang = role:getProperty("advHang")
 	-- if advHang[chapterId] then return 9 end --正在挂机
  
+	-- 检查活动正确性
+	if actid then
+		if not role.activity:isOpenById(actid, "AdvLevel") then 
+			return 20
+		end
+		local actCfg = csvdb["activity_adv_chapterCsv"][actid]
+		if not actCfg then return 21 end
+		actCfg = actCfg[chapterId]
+		if not actCfg then return 22 end
+
+		if actCfg["unlockTime"] ~= 0 then
+			local st = toUnixtime(actCfg["unlockTime"]..string_format("%02x", RESET_TIME))
+			if st > skynet.timex() then return 23 end
+		end
+
+		if actCfg["prepose"] ~= "" then
+			local type, cid = actCfg["prepose"]:toArray(true, "=")
+			if type == 1 then
+				local actData = role.activity:getActData("ChallengeLevel")
+				local battleInfo = actData[cid] or {}
+				if (battleInfo["star"] or 0) == 0 then
+					return 24
+				end
+			elseif type == 2 then
+				local actData = role.activity:getActData("AdvLevel")
+				local advInfo = actData[cid] or {}
+				if not advInfo["pass"] then
+					return 25
+				end
+			end
+		end
+	end
  
 	local chapterData = csvdb["adv_chapterCsv"][chapterId]
 	if not chapterData or layer < 1 then return  1 end
  
 	local advPass = role:getProperty("advPass")
  
+	if not checkFormat(role) then return 7 end
+
+	local cost = 0
 	if AdvCommon.isEndless(chapterId) then -- 无尽模式判断
  
 		if chapterId ~= role.advElChapter then return end -- 不是当前进行的章节
@@ -118,37 +163,27 @@ 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})
+		cost = 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)
+		cost = relayData.supply
 	end
-
+	role:checkTaskEnter("AdvCostPower", {count = cost})
+	
 	local support = {}  -- 支援效果
 	if AdvCommon.isEndless(chapterId) then
 		-- 选择的支援效果
@@ -168,13 +203,16 @@ function _M.startAdvRpc( agent, data )
 			end
 		end
 	end
+
 	role:getAdvData():initByChapter({
 		chapterId = chapterId, 
 		level = layer, 
 		isRelay = layer ~= 1, 
 		isEnter = true, 
 		support = support,
+		actid = actid
 	})
+	
 	role:checkTaskEnter("AdvStart", {id = chapterId})
 	role:checkTaskEnter("AdvStartSelf", {id = chapterId})
 	role:getAdvData():popBackEvents() -- 清一下事件
@@ -191,8 +229,42 @@ function _M.startHangRpc(agent, data)
 	local campId = msg.campId or 2 --营地id
 	local format = msg.format --编队
 	local index = msg.index or 1--时间索引id
+	local actid = msg.actid
  
-	local chapterData = csvdb["adv_chapter_campsiteCsv"][chapterId]
+	-- 检查活动正确性
+	if actid then
+		if not role.activity:isOpenById(actid, "AdvLevel") then 
+			return 20
+		end
+		local actCfg = csvdb["activity_adv_chapterCsv"][actid]
+		if not actCfg then return 21 end
+		actCfg = actCfg[chapterId]
+		if not actCfg then return 22 end
+
+		if actCfg["unlockTime"] ~= 0 then
+			local st = toUnixtime(actCfg["unlockTime"]..string_format("%02x", RESET_TIME))
+			if st > skynet.timex() then return 23 end
+		end
+
+		if actCfg["prepose"] ~= "" then
+			local type, cid = actCfg["prepose"]:toArray(true, "=")
+			if type == 1 then
+				local actData = role.activity:getActData("ChallengeLevel")
+				local battleInfo = actData[cid] or {}
+				if (battleInfo["star"] or 0) == 0 then
+					return 24
+				end
+			elseif type == 2 then
+				local actData = role.activity:getActData("AdvLevel")
+				local advInfo = actData[cid] or {}
+				if not advInfo["pass"] then
+					return 25
+				end
+			end
+		end
+	end
+
+	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,11 +286,13 @@ 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 -- 是否有体力
  
+	role:checkTaskEnter("AdvCostPower", {count = adv_idle_energy})
+
 	if not checkFormat(role, format, role:getAdvData():isRunning()) then return 8 end --编队是否正确
  
 	local player = {}
@@ -236,7 +310,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 +419,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 +454,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 +483,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 +621,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 +630,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 +640,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 +811,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 +1036,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 +1081,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})
@@ -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
@@ -371,6 +390,7 @@ function _M.advt(role, pms)
 	local chapterId = tonum(pms.pm1)
 	local layer = tonum(pms.pm2)
 	local mapId = tonum(pms.pm3)
+	local actid = tonum(pms.pm4)
 	local advCsv = csvdb["adv_chapterCsv"][chapterId]
 	if not advCsv then return "不存在的章节" end
  
@@ -387,6 +407,7 @@ function _M.advt(role, pms)
 		level = layer, 
 		isEnter = true,
 		debugMapId = mapId,
+		actid = actid,
 	})
 	role:mylog("gm_action", {desc = "advt", int1 = chapterId, int2 = layer, key1 = pms.sender})
 	return "成功"
@@ -539,6 +560,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 +587,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 +612,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 +634,270 @@ 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"]
+			if btype == 5 then
+				weight = 3 * weight
+			end
+		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] = 408
+				up_pool[2] = 409
+				up_pool[3] = 410
+			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 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, 概率
+						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 = {}
@@ -617,7 +617,7 @@ function _M.getResetRewardRpc(agent, data)
 	if level <= 1 and talent == "" then return end
  
 	local pay = true
-	if level <= 60 then
+	if level <= 60 or role.activity:isOpen("HeroBackFree") then
 		pay = false
 	end
  
@@ -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
@@ -926,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]
@@ -974,6 +976,9 @@ function _M.drawHeroRpc(agent, data)
 	end
  
 	role:checkTaskEnter("DrawHero", {pool = btype, count = drawCount[drawType]})
+	if btype ~= 3 then
+		role:checkTaskEnter("DrawHeroNotFriend", {pool = btype, count = drawCount[drawType]})
+	end
 	if ssrCount > 0 then
 		role:checkTaskEnter("DrawSSR", {count = ssrCount})
 	end
@@ -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) -- 冒险赛季更新检查
  
 	-- 跨天登陆事件
@@ -165,6 +166,7 @@ function _M.loginRpc( agent, data )
 		role.activity:checkActivityStatus(now, false, false)
 		role:log("onLogin")
 	end
+	role:checkTaskEnter("Login", {})
  
 	redisproxy:zadd(FRIEND_RECOMMEND, now, roleId)
  
@@ -586,9 +588,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
@@ -606,11 +608,11 @@ function _M.openTimeBoxRpc(agent, data)
 		local itemData = csvdb["itemCsv"][itemId]
 		local unitTime = globalCsv.box_key_time[itemId] * 60
 		if quick then
-			stopTime = time + globalCsv.box_productLine_time * 3600
+			stopTime = nowTime + quick
 			local cost_pre = globalCsv.box_timeOpen_diamond:toArray(true, "=")
-			local costKey = math.ceil((stopTime - nowTime) / (cost_pre[1] * 60)) * cost_pre[2]
+			local costKey = math.ceil(quick / (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 +620,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 +689,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 +849,13 @@ 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})
+	else
+		role:checkTaskEnter("WeekTask", {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},
@@ -907,62 +916,96 @@ function _M.achiveRpc(agent, data)
 	local taskId = msg.id --任务id
  
 	if not role:isFuncUnlock(FuncUnlock.TaskAchiv) then return end
-	
-	local achiveTask = csvdb["achievementCsv"][taskId]
-	if not achiveTask then return 1 end
-
 	local achiveT = role:getProperty("achiveT")
 	local achiveV = role:getProperty("achiveV")
+	local fuxRecord = role:getProperty("fuxR") or 0
+
+	local groups = {}
+
+	if not taskId then
+		local awards = {}
+		for id, cfg in pairs(csvdb["achievementCsv"]) do
+			-- 没领过
+			if not achiveV[id] then
+				if (achiveT[cfg.type] or 0) >= cfg.condition1 then
+					local award = cfg.reward:toNumMap()
+					for k, v in pairs(award) do
+						awards[k] = (awards[k] or 0) + v
+					end
+					achiveV[id] = skynet.timex()
+					groups[cfg.group] = 1
+
+					role:log("achievement", {
+						achievement_id = cfg.id, -- 成就id
+						achievement_type = cfg.type, -- 成就类型，具体枚举表中成就类型枚举表
+						achievement_reward = award, -- 达成成就奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
+					})
+				end
+			end
+		end
+		if not next(awards) then
+			return 5
+		end
+		local reward, change = role:award(awards, {log = {desc = "finishAchive", int1 = 0}})
+		role:updateProperty({field = "achiveV", value = achiveV})
  
-	if achiveV[taskId] then return 2 end
+		SendPacket(actionCodes.Role_achiveRpc, MsgPack.pack(role:packReward(reward, change)))
+	else
+		local achiveTask = csvdb["achievementCsv"][taskId]
+		if not achiveTask then return 1 end
  
-	local curStatus = achiveT[achiveTask.type] or 0
-	local maxc = achiveTask.condition1
+		if achiveV[taskId] then return 2 end
  
-	if maxc > curStatus then
-		return 3
-	end
+		local curStatus = achiveT[achiveTask.type] or 0
+		local maxc = achiveTask.condition1
  
-	local reward, change = role:award(achiveTask.reward, {log = {desc = "finishAchive", int1 = taskId}})
-	role:changeUpdates({
-		{ type = "achiveV", field = taskId, value = skynet.timex() }
-	})
+		if maxc > curStatus then
+			return 3
+		end
  
-	-- 复兴奖励
-	if csvdb["achievement_groupCsv"][achiveTask.group].bookmark == 3 then
-		local overCount = 0
-		for tId, status in pairs(achiveV) do
-			local tData = csvdb["achievementCsv"][tId]
-			if tData then
-				local groupData = csvdb["achievement_groupCsv"][tData.group]
-				if groupData.bookmark == 3 then
-					overCount = overCount + 1
+		local reward, change = role:award(achiveTask.reward, {log = {desc = "finishAchive", int1 = taskId}})
+		role:changeUpdates({
+			{ type = "achiveV", field = taskId, value = skynet.timex() }
+		})
+		groups[achiveTask.group] = 1
+
+		role:log("achievement", {
+			achievement_id = taskId, -- 成就id
+			achievement_type = achiveTask.type, -- 成就类型，具体枚举表中成就类型枚举表
+			achievement_reward = reward, -- 达成成就奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
+		})
+
+		SendPacket(actionCodes.Role_achiveRpc, MsgPack.pack(role:packReward(reward, change)))
+	end
+	
+	for group, _ in pairs(groups) do
+		-- 复兴奖励
+		if csvdb["achievement_groupCsv"][group].bookmark == 3 then
+			local overCount = 0
+			local preMaxCount = fuxRecord or 0
+			for tId, status in pairs(achiveV) do
+				local tData = csvdb["achievementCsv"][tId]
+				if tData then
+					local groupData = csvdb["achievement_groupCsv"][tData.group]
+					if groupData.bookmark == 3 then
+						overCount = overCount + 1
+					end
 				end
 			end
-		end
-
-		for level, pData in pairs(csvdb["achievement_rewardCsv"]) do
-			if pData.request == overCount then
-				-- 发放奖励
-				redisproxy:insertEmail({
-					roleId = role:getProperty("id"), 
-					emailId = 101,
-					attachments = pData.reward,
-					contentPms = {pData.level},
-				})
-			elseif pData.request > overCount then
-				 break
+			local flag = false
+			for level, pData in pairs(csvdb["achievement_rewardCsv"]) do
+				if preMaxCount < pData.request and overCount >= pData.request then
+					role:sendMail(101, skynet.timex(), pData.reward, {pData.level})
+					flag = true
+				end
 			end
+			if flag then
+				role:updateProperty({field = "fuxR", value = overCount, notNotify = true})
+			end
+			break
 		end
 	end
-	
-	role:log("achievement", {
-		achievement_id = taskId, -- 成就id
-		achievement_type = achiveTask.type, -- 成就类型，具体枚举表中成就类型枚举表
-		achievement_reward = reward, -- 达成成就奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
-	})
  
-	SendPacket(actionCodes.Role_achiveRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
  
@@ -1013,6 +1056,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}  --第一次开始说话时间  从第一次说话次数  能说话的时间
  
@@ -310,6 +310,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,11 +34,13 @@ 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
 	self.level = advInfo.level or 1
+	self.actid = advInfo.actid
 	self.round = advInfo.round or 0
 	self.score = advInfo.score or {}
 	self.isRelay = advInfo.isRelay
@@ -61,10 +61,10 @@ function Adv:initByInfo(advInfo)
 	self:initBattle(advInfo)
 end
 -- 找出level 是否存在中继层
-function Adv:isHaveRelay(level, chapterId)
+function Adv:isHaveRelay(level, chapterId, force)
 	level = level or self.level
 	chapterId = chapterId or self.chapterId
-	if level == 1 then return end
+	if level == 1 and not force then return end
  
 	local campsiteCsv = csvdb["adv_chapter_campsiteCsv"][chapterId]
 	for _, campsite in ipairs(campsiteCsv) do
@@ -85,6 +85,7 @@ function Adv:initByChapter(params)
 	local isEnter = params.isEnter 
 	local support = params.support
 	local debugMapId = params.debugMapId
+	local actid = params.actid
  
 	if not self.chapterId then -- 开始新的章节
 		self.chapterId = chapterId
@@ -95,6 +96,7 @@ function Adv:initByChapter(params)
  
 	self.level = level or 1
 	self.round = 0
+	self.actid = self.actid or actid
 	self.score = self.score or {}
 	self.lastEnemyId = 1
 	self.mapStack = {1} -- 最后一个为当前的地图
@@ -140,12 +142,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 +156,6 @@ function Adv:initByChapter(params)
  
 	self:initLayerTask()
  
-
-
 	self:checkTask(Adv.TaskType.Arrive)
 	self:checkAdvUnlock(1, self.level)
  
@@ -168,9 +169,24 @@ 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
+	self.actid = nil
 	self.score = {}
 	self.round = 0
 	self.lastEnemyId = 1
@@ -193,6 +209,7 @@ function Adv:saveDB(notNotify)
 		advInfo.level = self.level
 		advInfo.round = self.round
 		advInfo.score = self.score
+		advInfo.actid = self.actid
 		advInfo.isRelay = self.isRelay
 		advInfo.lastEId = self.lastEnemyId
 		advInfo.mstack = self.mapStack
@@ -389,18 +406,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 +432,7 @@ function Adv:forceOver(notNotify)
 			advItems = "",
 			advAFGet = {},
 			advAFWear = {},
+			potionBag = potionBag,
 		}, notNotify)
 	end
 end
@@ -752,6 +776,10 @@ function Adv:isEndless()
 	return AdvCommon.isEndless(self.chapterId)
 end
  
+function Adv:isActivity()
+	return self.actid ~= nil
+end
+
 function Adv:getCurFloorData()
 	local chapter = self.chapterId % 100
 	return (csvdb["adv_chapter_floorCsv"][self.chapterId] or {})[self.level]
@@ -781,17 +809,69 @@ function Adv:over(success, rewardRatio, overType)
  
 	local score = self.owner:fixAdvScoreChange(self:getScore())
 	local scoreInfo = self.score
+
+	local scoreCoef = chapterData.scoreAward
+	local itemId = ItemId.OldCoin
+	-- 拾荒活动关卡相关处理
+	if self.actid then
+		while true do
+			if not self.owner.activity:isOpenById(self.actid, "AdvLevel") then 
+				break
+			end
+			local actCfg = csvdb["activity_adv_chapterCsv"][self.actid]
+			if not actCfg then break end
+			actCfg = actCfg[self.chapterId]
+			if not actCfg then break end
+			local arr = actCfg["transform"]:toArray(true, "=")
+			itemId, scoreCoef = arr[1], arr[2]
+			local actData = self.owner.activity:getActData("AdvLevel")
+
+			-- 计算活动积分up
+			local upMap = actCfg["upCharacter"]
+			local team = self.owner:getProperty("advTeam")
+			local format = self.owner:getTeamHerosInfo(team).heros
+			local upVal = 0
+			for _, hero in pairs(format) do
+				local heroId = hero["type"]
+				upVal = upVal + (upMap[heroId] or 0)
+			end
+			score = math.floor(score * (1 + upVal / 100))
+
+			local advInfo = actData[self.chapterId] or {}
+			--print("upVal", upVal, score, advInfo["max"], itemId, scoreCoef)
+			local maxScore = advInfo["max"] or 0
+			local flag = false
+			if success then
+					advInfo["pass"] = 1
+					flag = true
+			end
+			-- 更新活动最大积分
+			if score > maxScore then
+				advInfo["max"] = score
+				actData[self.chapterId] = advInfo
+				flag = true
+			end
+			if flag then
+				self.owner.activity:updateActData("AdvLevel", actData)
+			end
+			break
+		end
+	end
  
-	local scoreReward = math.floor(score / chapterData.scoreAward)
-	self.owner:award({[ItemId.OldCoin] = scoreReward}, {log = {desc = "advOver", int1 = self.chapterId}})
+	local scoreReward = math.floor(score / scoreCoef)
+	self.owner:award({[itemId] = scoreReward}, {log = {desc = "advOver", int1 = self.chapterId}})
  
 	-- 被动技会影响奖励
 	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,25 +891,27 @@ 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
+
+	local roleId = self.owner:getProperty("id")
+	local oldMaxScore = tonum(redisproxy:zscore(self.owner:getAdvRankKey(), roleId))
+	if score > oldMaxScore and not self.actid 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)
@@ -882,6 +964,7 @@ function Adv:over(success, rewardRatio, overType)
 	})
  
 	local chapterId = self.chapterId
+	local actid = self.actid
 	self:clear()
 	self.owner:checkTaskEnter("AdvScore", {score = score})
  
@@ -889,6 +972,7 @@ function Adv:over(success, rewardRatio, overType)
 		advItems = "",
 		advAFGet = {},
 		advAFWear = {},
+		potionBag = potionBag,
 	})
 	self:pushBackEvent(AdvBackEventType.End, {
 		success = success,
@@ -899,6 +983,7 @@ function Adv:over(success, rewardRatio, overType)
 		scoreAward = scoreReward,
 		chapterId = chapterId,
 		backAdvCount = backAdvCount,
+		actid = actid
 	})
 end
  
@@ -963,7 +1048,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 +1058,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 +1069,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 +1150,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 +1164,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 +1178,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 +1231,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 +1248,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)
@@ -1168,24 +1293,22 @@ local function clickMonster(self, room, block, params)
 	return true
 end
  
-local function chooseCommon(self, room, block, chooseData, choose, tag)
-	if not choose then return end
-	if not chooseData or not chooseData["button".. choose .."cond"] then return end
  
-	local conds = chooseData["button".. choose .."cond"]:toTableArray(true)
+local function checkChooseCondFunc(self, condStr, room, block, tag, chooseData)
+	chooseData = chooseData or {}
 	local checkCond = {
 		-- 没有条件
 		[0] = function()
 			return true
 		end,
 		-- 拥有道具
-		[1] = function(_, itemId, count)
+		[1] = function(itemId, count)
 			if self:cost({[itemId] = count}, {log = {desc = "chooseEvent", key1 = tag, int1 = chooseData.id}}, true) then
 				return true
 			end
 		end,
 		-- xx角色（todo 队长）
-		[2] = function(_, heroType)
+		[2] = function(heroType)
 			for slot, heroId in pairs(self.owner:getProperty("advTeam").heros) do
 				local hero = self.owner.heros[heroId]
 				if hero and hero:getProperty("type") == heroType then
@@ -1205,38 +1328,38 @@ local function chooseCommon(self, room, block, chooseData, choose, tag)
 			return true
 		end,
 		--制定属性 
-		[4] = function(_, attrType, value)
+		[4] = function(attrType, value)
 			if (self.battle.player[AttsEnumEx[attrType]] or 0) >= value then
 				return true
 			end
 		end,
 		-- 提交一个物品
-		[5] = function (_, itemId, count)
+		[5] = function (itemId, count)
 			if self:cost({[itemId] = count}, {log = {desc = "chooseEvent", key1 = tag, int1 = chooseData.id}}) then
 				self:backCost({[itemId] = count})
 				return true
 			end
 		end,
 		-- sp 到达指定值
-		[6] = function(_, value)
+		[6] = function(value)
 			if self.battle.player.sp >= value then
 				self.battle.player:changeSp(-value)
 				return true
 			end
 		end,
 		--7=拥有指定buff指定层数
-		[7] = function(_, buffId, layer)
+		[7] = function(buffId, layer)
 			local buff = self.battle.player:getBuffById(buffId)
 			if buff and buff:getLayer() >= layer then
 				return true
 			end
 		end,
 		--8=拥有x神器
-		[8] = function(_, artifactId)
+		[8] = function(artifactId)
 			return self:isHaveArtifact(artifactId)
 		end,
 		-- 9 = 生命值大于x%
-		[9] = function (_, value)
+		[9] = function (value)
 			local cost = value / 100 * self.battle.player.hpMax
 			if self.battle.player.hp > cost then
 				self.battle.player:hurt(cost, nil, {hurtType = 6, buffId = -1})
@@ -1244,16 +1367,27 @@ local function chooseCommon(self, room, block, chooseData, choose, tag)
 			end
 		end,
 		-- 10 = 未获得x神器
-		[10] = function(_, artifactId)
+		[10] = function(artifactId)
 			return not self:isHaveArtifact(artifactId)
 		end,
 		-- 11 = 地图上没有指定id 的怪
-		[11] = function(_, monsterId)
-			for _, room in pairs(self:getCurMap().rooms) do
-				for _, block in pairs(room.blocks) do
-					if block:isMonster() then
+		[11] = function(monsterId, size)
+			if not size or size == 0 then
+				for _, room in pairs(self:getCurMap().rooms) do
+					for _, block in pairs(room.blocks) do
+						if block:isMonster() then
+							if not monsterId then return false end
+							if block.event.id == monsterId then
+								return false
+							end
+						end
+					end
+				end
+			else
+				for _, cblock in ipairs(self:getCurMap():getBlocksBySize(room.roomId, block.blockId, size)) do
+					if cblock:isMonster() then
 						if not monsterId then return false end
-						if block.event.id == monsterId then
+						if cblock.event.id == monsterId then
 							return false
 						end
 					end
@@ -1262,12 +1396,23 @@ local function chooseCommon(self, room, block, chooseData, choose, tag)
 			return true
 		end,
 		-- 12 = 地图上没有指定id 的建筑
-		[12] = function(_, buildId)
-			for _, room in pairs(self:getCurMap().rooms) do
-				for _, block in pairs(room.blocks) do
-					if block:isBuild() then
+		[12] = function(buildId, size)
+			if not size or size == 0 then
+				for _, room in pairs(self:getCurMap().rooms) do
+					for _, block in pairs(room.blocks) do
+						if block:isBuild() then
+							if not buildId then return false end
+							if block.event.id == buildId then
+								return false
+							end
+						end
+					end
+				end
+			else
+				for _, cblock in ipairs(self:getCurMap():getBlocksBySize(room.roomId, block.blockId, size)) do
+					if cblock:isBuild() then
 						if not buildId then return false end
-						if block.event.id == buildId then
+						if cblock.event.id == buildId then
 							return false
 						end
 					end
@@ -1276,12 +1421,23 @@ local function chooseCommon(self, room, block, chooseData, choose, tag)
 			return true
 		end,
 		-- 13 = 地图上没有指定的 选择点
-		[13] = function(_, chooseId)
-			for _, room in pairs(self:getCurMap().rooms) do
-				for _, block in pairs(room.blocks) do
-					if block:isChoose() then
+		[13] = function(chooseId, size)
+			if not size or size == 0 then
+				for _, room in pairs(self:getCurMap().rooms) do
+					for _, block in pairs(room.blocks) do
+						if block:isChoose() then
+							if not chooseId then return false end
+							if block.event.id == chooseId then
+								return false
+							end
+						end
+					end
+				end
+			else
+				for _, cblock in ipairs(self:getCurMap():getBlocksBySize(room.roomId, block.blockId, size)) do
+					if cblock:isChoose() then
 						if not chooseId then return false end
-						if block.event.id == chooseId then
+						if cblock.event.id == chooseId then
 							return false
 						end
 					end
@@ -1290,138 +1446,175 @@ local function chooseCommon(self, room, block, chooseData, choose, tag)
 			return true
 		end,
  	}
- 	for _, cond in ipairs(conds) do
+
+ 	local status, count = true, 0
+ 	for _, cond in ipairs(condStr:toTableArray(true)) do
  		assert(not cond[1] or checkCond[cond[1]], "error cond, event_" .. (tag or "choose") .. "Csv id :" .. block.event.id)
-		if cond[1] and not checkCond[cond[1]](table.unpack(cond)) then return end
+		if not checkCond[cond[1]](select(2, table.unpack(cond))) then 
+			status =  false
+		else
+			count = count + 1
+		end
  	end
-	
-	local clearBlock = chooseData.keep ~= 1
-	local effects = chooseData["button".. choose .."effect"]:toTableArray(true)
-	for _, effect in ipairs(effects) do
-		local doEffect = {
-			[1] = function() -- 获得某道具N个
-				local count = effect[3] or 1
-				local reward = {}
-				for i = 1, count do
-					local dropData = csvdb["event_dropCsv"][effect[2]]
-					if dropData then
-						local item = dropData["range"]:randWeight(true)
-						reward[item[1]] = (reward[item[1]] or 0) + item[2]
-					else
-						skynet.error(string.format("[ERROR]: event_dropCsv no id %s in %s id: %s",  effect[2], tag, chooseData.id))
-					end
-				end
-				self:award(reward, {log = {desc = "chooseEvent", key1 = tag, int1 = chooseData.id}}, {roomId = room.roomId, blockId = block.blockId})
-			end,
-			[2] = function() --获得冒险buff
-				local layer = effect[3] or 1
-				for i = 1, layer do
-					self.battle.player:addBuff(effect[2])
-				end
-			end,
-			[3] = function() --发现怪物
-				self:getCurMap():addNewMonsterRand(effect[2], {room, block})
-				self:pushBackEvent(AdvBackEventType.Monster, {id = effect[2]})
-				clearBlock = false
-			end,
-			[4] = function() --无事发生
-			end,
-			[5] = function() --5=属性枚举=数值;直接增加玩家属性
-				local attr
-				if effect[3] == 0 then
-					attr = "sp"
+ 	return status, count
+end
+
+local function doChooseEffect(self, effectStr, room, block, tag, chooseData)
+	chooseData = chooseData or {}
+	local clearBlock = true
+	local doEffect = {
+		[1] = function(dropId, count) -- 获得某道具N个
+			count = count or 1
+			local reward = {}
+			for i = 1, count do
+				local dropData = csvdb["event_dropCsv"][dropId]
+				if dropData then
+					local item = dropData["range"]:randWeight(true)
+					reward[item[1]] = (reward[item[1]] or 0) + item[2]
 				else
-					attr = AttsEnumEx[effect[3]]
-					if not AdvAttsEnum[attr] then return end
+					skynet.error(string.format("[ERROR]: event_dropCsv no id %s in %s id: %s",  dropId, tag, chooseData.id))
 				end
-				self.battle.player:addBaseAttr(attr, effect[4], effect[2])
-			end,
-			[6] = function() -- 商店
-				block:updateEvent({
-					etype = AdvEventType.Trader,
-					id = effect[2]
-				})
-				self:pushBackEvent(AdvBackEventType.Trader, {id = effect[2]})
-				clearBlock = false
-			end,
-			[7] = function() -- 建筑
-				block:updateEvent({
-					etype = AdvEventType.Build,
-					id = effect[2]
-				})
-				clearBlock = false
-			end,
-			[8] = function() -- 选择
-				block:updateEvent({
-					etype = AdvEventType.Choose,
-					id = effect[2]
-				})
-				clearBlock = false
-			end,
-			[9] = function() -- click
-				block:updateEvent({
-					etype = AdvEventType.Click,
-					id = effect[2]
-				})
-				clearBlock = false
-			end,
-			[10] = function() -- 陷阱
-				block:updateEvent({
-					etype = AdvEventType.Trap,
-					id = effect[2]
-				})
-				clearBlock = false
-			end,
-			[11] = function()  -- 获得神器
-				self:waitChooseArtifact() --等待获取神器
-			end,
-			[12] = function()
-				-- buffId
-				local targers = self.battle.player:getTeam(2, nil, nil, true)
-				for _, target in pairs(targers) do
-					target:addBuff(effect[2])
+			end
+			self:award(reward, {log = {desc = "chooseEvent", key1 = tag, int1 = chooseData.id}}, {roomId = room.roomId, blockId = block.blockId})
+		end,
+		[2] = function(buffId, layer) --获得冒险buff
+			self.battle.player:addBuff(buffId, nil, layer or 1)
+		end,
+		[3] = function(id) --发现怪物
+			self:getCurMap():addNewMonsterRand(id, {room, block})
+			self:pushBackEvent(AdvBackEventType.Monster, {id = id})
+			clearBlock = false
+		end,
+		[4] = function() --无事发生
+		end,
+		[5] = function(addType, attrType, value) --5=属性枚举=数值;直接增加玩家属性
+			local attr
+			if attrType == 0 then
+				attr = "sp"
+			else
+				attr = AttsEnumEx[attrType]
+				if not AdvAttsEnum[attr] then return end
+			end
+			self.battle.player:addBaseAttr(attr, value, addType)
+		end,
+		[6] = function(id) -- 商店
+			block:updateEvent({
+				etype = AdvEventType.Trader,
+				id = id
+			})
+			self:pushBackEvent(AdvBackEventType.Trader, {id = id})
+			clearBlock = false
+		end,
+		[7] = function(id) -- 建筑
+			block:updateEvent({
+				etype = AdvEventType.Build,
+				id = id
+			})
+			clearBlock = false
+		end,
+		[8] = function(id) -- 选择
+			block:updateEvent({
+				etype = AdvEventType.Choose,
+				id = id
+			})
+			clearBlock = false
+		end,
+		[9] = function(id) -- click
+			block:updateEvent({
+				etype = AdvEventType.Click,
+				id = id
+			})
+			clearBlock = false
+		end,
+		[10] = function(id) -- 陷阱
+			block:updateEvent({
+				etype = AdvEventType.Trap,
+				id = id
+			})
+			clearBlock = false
+		end,
+		[11] = function()  -- 获得神器
+			self:waitChooseArtifact() --等待获取神器
+		end,
+		[12] = function(id)
+			-- buffId
+			local targers = self.battle.player:getTeam(2, nil, nil, true)
+			for _, target in pairs(targers) do
+				target:addBuff(id)
+			end
+		end,
+		[13] = function() -- 显示地图
+			self:getCurMap():showMap()
+			self:backMapShow()
+		end,
+		[14] = function(eventType, eventId, count, stage) -- 指定地块召唤 指定类型的id
+			local change = self:getCurMap():layEventToStage(eventType, eventId, count, stage)
+			for _, one in ipairs(change) do
+				if one[1].roomId == room.roomId and  one[2].blockId == block.blockId then
+					clearBlock = false
+				else
+					self:backBlockChange(one[1].roomId, one[2].blockId)
 				end
-			end,
-			[13] = function() -- 显示地图
-				self:getCurMap():showMap()
-				self:backMapShow()
-			end,
-			[14] = function() -- 指定地块召唤 指定类型的id
-				local change = self:getCurMap():layEventToStage(effect[2], effect[3], effect[4], effect[5])
-				for _, one in ipairs(change) do
-					if one[1].roomId == room.roomId and  one[2].blockId == block.blockId then
-						clearBlock = false
-					else
-						self:backBlockChange(one[1].roomId, one[2].blockId)
-					end
+			end
+		end,
+		[15] = function(eventType, eventId, count) -- 移除指定事件
+			local change = self:getCurMap():clearEventById(eventType, eventId, count)
+			for _, one in ipairs(change) do
+				if one[1].roomId == room.roomId and  one[2].blockId == block.blockId then
+					clearBlock = false
+				else
+					self:backBlockChange(one[1].roomId, one[2].blockId)
 				end
-			end,
-			[15] = function() -- 移除指定事件
-				local change = self:getCurMap():clearEventById(effect[2], effect[3], effect[4])
-				for _, one in ipairs(change) do
-					if one[1].roomId == room.roomId and  one[2].blockId == block.blockId then
-						clearBlock = false
-					else
-						self:backBlockChange(one[1].roomId, one[2].blockId)
-					end
+			end
+		end,
+		[16] = function(eventTypeF, eventIdF, eventTypeT, eventIdT, count) -- 指定事件转移
+			local change = self:getCurMap():eventChangeToOther(eventTypeF, eventIdF, eventTypeT, eventIdT, count)
+			for _, one in ipairs(change) do
+				if one[1].roomId == room.roomId and  one[2].blockId == block.blockId then
+					clearBlock = false
+				else
+					self:backBlockChange(one[1].roomId, one[2].blockId)
 				end
-			end,
-			[16] = function() -- 指定事件转移
-				local change = self:getCurMap():eventChangeToOther(effect[2], effect[3], effect[4], effect[5], effect[6])
-				for _, one in ipairs(change) do
-					if one[1].roomId == room.roomId and  one[2].blockId == block.blockId then
-						clearBlock = false
-					else
-						self:backBlockChange(one[1].roomId, one[2].blockId)
-					end
+			end
+		end,
+		[17] = function(eventId)
+			local diceCsv = csvdb["event_choose_diceCsv"][eventId]
+			if not diceCsv then return end
+			local weight = math.randomInt(1, 12)
+			local sum = 0
+			local needEffect = nil
+			local pool = {}
+			for _, v in ipairs(diceCsv) do
+				local status, okCount = checkChooseCondFunc(self, v.cond, room, block, tag .. " dice", chooseData)
+				pool[#pool + 1] = v.weight + okCount * v.weightUp
+				sum = sum + pool[#pool + 1]
+				if sum >= weight and not needEffect then
+					-- 达成效果
+					needEffect = v.effect
 				end
-			end,
-		}
+			end
+			if needEffect then
+				self:pushBackEvent(AdvBackEventType.ChooseDice, {id = eventId, pool = pool, result = weight})
+				clearBlock = doChooseEffect(self, needEffect, room, block, tag .. " dice", chooseData)
+			end
+		end,
+	}
+
+	for _, effect in ipairs(effectStr:toTableArray(true)) do
 		assert(doEffect[effect[1]], "error effect, event_" .. (tag or "choose") .. "Csv id :" .. (block.event and block.event.id or 0) .. "effect  " .. effect[1])
-		doEffect[effect[1]]()
+		doEffect[effect[1]](select(2, table.unpack(effect)))
 	end
-	self:scoreChange(AdvScoreType.Event, chooseData.advScore) --增加加分
+	return clearBlock
+end
+
  
+local function chooseCommon(self, room, block, chooseData, choose, tag)
+	if not choose then return end
+	if not chooseData or not chooseData["button".. choose .."cond"] then return end
+ 	if not checkChooseCondFunc(self, chooseData["button".. choose .."cond"], room, block, tag, chooseData) then return end
+	local clearBlock = chooseData.keep ~= 1
+	clearBlock = clearBlock and doChooseEffect(self, chooseData["button".. choose .."effect"], room, block, tag, chooseData)
+	self:scoreChange(AdvScoreType.Event, chooseData.advScore) --增加加分
 	return true, clearBlock
 end
  
@@ -1675,12 +1868,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 +2330,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=战斗额外掉落次数
-Subproject commit fb22d12670f863528582d09b9499198350902990
+Subproject commit 5c618b16315e74aaa111b3e84dbc4da3f7b3d699
@@ -30,6 +30,15 @@ Activity.ActivityType = {
 	ActShopGoods = 25, 	-- 活动商品
  
 	Crisis = 26, -- 宝藏怪活动
+
+	CommonSignIn = 28, 	--通用签到
+	FriendEnergy = 30, -- 好友互赠能量活动 
+	AdvLevel = 33,	-- 拾荒关卡
+	BattleCommand = 34, -- 战令活动
+	NewSign = 36, -- 活动签到，单独的签到界面
+	HeroBackFree = 37, -- 无损耗归还
+
+	BattleCommandTask = 38, -- 战令任务活动
 }
  
 local function checkActivityType(activityType)
@@ -73,6 +82,14 @@ 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表示领取过奖励
+
+	act33 		= {"table", {}}, -- 拾荒关卡活动 {id={max=最大积分, pass=1}, r=""}
+
+	act34		= {"table", {}},	-- 战令记录{unlock = 1, freeR = "", payR = "", lvl = 10, sum = 100}
+	act36 		= {"table", {}}, -- 每日活跃签到 {0=day, 1=1,2=1,3=1}
 }
  
 function Activity:data()
@@ -91,7 +108,16 @@ 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"),
+
+		act33 = self:getProperty("act33"),
+
+		act34 = self:getProperty("act34"),
+		act36 = self:getProperty("act36"),
 	}
 end
  
@@ -445,8 +471,9 @@ 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 = {}
+		self.owner:updateProperty({field="calTask", value=calTask})
 		local role = self.owner
 		local buildL = role.dinerData:getProperty("buildL")
 		local curLevel = buildL:getv(1, 1)
@@ -470,8 +497,111 @@ activityFunc[Activity.ActivityType.CalendaTask] = {
 		role:checkTaskEnter("RuneQualityCollect", {})
  
 	end,
-	-- ["close"] = function(self, actType, notify)
-	-- end,
+	["crossDay"] = function(self, actType, notify, actId)
+		local actData = self.owner:getProperty("calTask") or {}
+		local record = actData["r"] or {}
+		local actCfg = csvdb["activity_taskCsv"][actId]
+		if not actCfg then return end
+		local change = false
+		for taskId, cfg in pairs(actCfg) do
+			if cfg["resetType"] == 1 then 	-- 每日重置
+				record[taskId] = nil
+				actData[taskId] = nil
+				change = true
+			end
+		end
+		if change then
+			self.owner:updateProperty({field="calTask", value=actData})
+		end
+	end,
+	["crossWeek"] = function(self, actType, notify, actId)
+		local actData = self.owner:getProperty("calTask") or {}
+		local record = actData["r"] or {}
+		local actCfg = csvdb["activity_taskCsv"][actId]
+		if not actCfg then return end
+		local change = false
+		for taskId, cfg in pairs(actCfg) do
+			if cfg["resetType"] == 2 then 	-- 每周重置
+				record[taskId] = nil
+				actData[taskId] = nil
+				change = true
+			end
+		end
+		if change then
+			self.owner:updateProperty({field="calTask", value=actData})
+		end
+	end,
+	["close"] = function(self, actType, notify)
+		self.owner:updateProperty({field="calTask", value={}})
+	end,
+}
+
+-- 活动任务 仅供春节活动使用 防冲突
+activityFunc[Activity.ActivityType.BattleCommandTask] = {
+	["init"] = function(self, actType, isCrossDay, notify)
+		local bcTask = self.owner:getProperty("bcTask")
+		bcTask = {}
+		self.owner:updateProperty({field="bcTask", value=bcTask})
+		local role = self.owner
+		local buildL = role.dinerData:getProperty("buildL")
+		local curLevel = buildL:getv(1, 1)
+		role:checkTaskEnter("DinerLevelUp", {level = curLevel})
+
+		role:checkTaskEnter("HeroLvlCollect", {})
+		role:checkTaskEnter("HeroQualityCollect", {})
+
+		local curPopular = role.dinerData:getProperty("popular")
+		role:checkTaskEnter("DinerPopular", {count = curPopular})
+
+		local rLevel = role:getProperty("level")
+		role:checkTaskEnter("RoleLevelUp", {level = rLevel})
+
+		local towerInfo = role:getProperty("towerInfo")
+		role:checkTaskEnter("TowerPass", {level = towerInfo.l})
+		--"PvpWin"
+		--role:checkTaskEnter("HangPass", {id = 0})
+		role:checkCalendaTask(true, 15, 3)
+		role:checkTaskEnter("HeroStarCollect", {})
+		role:checkTaskEnter("RuneQualityCollect", {})
+
+	end,
+	["crossDay"] = function(self, actType, notify, actId)
+		local actData = self.owner:getProperty("bcTask") or {}
+		local record = actData["r"] or {}
+		local actCfg = csvdb["activity_taskCsv"][actId]
+		if not actCfg then return end
+		local change = false
+		for taskId, cfg in pairs(actCfg) do
+			if cfg["resetType"] == 1 then 	-- 每日充值
+				record[taskId] = nil
+				actData[taskId] = nil
+				change = true
+			end
+		end
+		if change then
+			self.owner:updateProperty({field="bcTask", value=actData})
+		end
+	end,
+	["crossWeek"] = function(self, actType, notify, actId)
+		local actData = self.owner:getProperty("bcTask") or {}
+		local record = actData["r"] or {}
+		local actCfg = csvdb["activity_taskCsv"][actId]
+		if not actCfg then return end
+		local change = false
+		for taskId, cfg in pairs(actCfg) do
+			if cfg["resetType"] == 2 then 	-- 每周重置
+				record[taskId] = nil
+				actData[taskId] = nil
+				change = true
+			end
+		end
+		if change then
+			self.owner:updateProperty({field="bcTask", value=actData})
+		end
+	end,
+	["close"] = function(self, actType, notify)
+		self.owner:updateProperty({field="bcTask", value={}})
+	end,
 }
  
 -- 兑换
@@ -481,6 +611,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
@@ -489,14 +622,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,
@@ -525,6 +658,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,
@@ -599,6 +738,18 @@ function Activity:refreshDailyData(notify)
 	end
 end
  
+function Activity:refreshWeekData(notify)
+	for actId, status in pairs(self._isOpen) do
+		local actData = csvdb["activity_ctrlCsv"][actId]
+		if status and actData then
+			local actType = actData.showType
+			if activityFunc[actType] and activityFunc[actType]['crossWeek'] then
+				activityFunc[actType]["crossWeek"](self, actType, notify, actId)
+			end
+		end
+	end
+end
+
 function Activity:checkActivity(notNotify, activityType, ...)
 	if not activityType then return end
 	if not self:isOpen(activityType) then return end
@@ -698,7 +849,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
@@ -762,7 +913,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) -- 检查
@@ -775,25 +965,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
@@ -804,4 +996,185 @@ 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,
+}
+
+activityFunc[Activity.ActivityType.BattleCommand] = {
+	["init"] = function (self, actType, isCrossDay, notify, actId)
+		local data = {unlock = 0, freeR = "", payR = "", lvl = 0, sum = 0, week = 0}
+		self:updateActData(actType, data, not notify)
+	end,
+	["check"] = function(self, actType, notify, id, count) -- 检查	itemid, count
+		local isOpen, actId = self:isOpen(actType)
+		local actData = self:getActData(actType) or {}
+		local actCfg = csvdb["activity_ctrlCsv"][actId]
+		if not actCfg then return end
+		if actCfg.condition1 == "" then return end
+		local arr = actCfg.condition2:toArray(true, "=")
+		local itemIdWeek, itemIdNormal, limit = arr[1], arr[2], arr[3]
+		if (itemIdWeek == id or itemIdNormal == id) and count > 0 then
+			if itemIdWeek == id then
+				if (actData["week"] or 0) >= limit then
+					return
+				end
+				local old = actData["week"] or 0
+				actData["week"] = math.min(old + count, limit)
+				count = actData["week"] - old
+			end
+			local total = actData["sum"] + count
+			local curLvl = actData["lvl"] or 0
+			if actCfg.condition == 1 then		-- 代表sum需要转换为等级
+				local bpCfg = csvdb["activity_battlepass_rewardCsv"][actId]
+				if not bpCfg then return end
+				for i = 1, #bpCfg do
+					local cfg = bpCfg[i]
+					if cfg["type"] > curLvl then
+						if total < cfg["condition"] then break end
+						total = total - cfg["condition"]
+						curLvl = curLvl + 1
+					end
+				end
+				actData["lvl"] = curLvl
+				actData["sum"] = total
+			end
+
+			self:updateActData(actType, actData)
+		end
+	end,
+	["crossWeek"] = function(self, actType, notify, actId)
+		local actData = self:getActData(actType) or {}
+		actData["week"] = 0
+		self:updateActData(actType, actData, true)
+	end,
+}
+
+
+activityFunc[Activity.ActivityType.NewSign] = {
+	-- ["check"] = function(self, actType, notify) -- 检查
+	-- end,
+	["init"] = function(self, actType, isCrossDay, notify)
+		if not isCrossDay then
+			activityFunc[Activity.ActivityType.NewSign]["crossDay"](self, actType, notify)
+		end
+	end,
+	-- ["close"] = function(self, actType, notify)
+	-- end,
+	["crossDay"] = function(self, actType, notify)
+		local curData = self:getActData(actType)
+		curData[0] = (curData[0] or 0) + 1
+		local actData = csvdb["activity_signInCsv"][48] or {}
+		if curData[0] > #actData then return end -- 满了就忽略了
+
+		-- 没满更新一下
+		self:updateActData(actType, curData, not notify)
+	end,
+}
+
+local function closeActAdvHang(role, chapterId)
+	local advHang = role:getProperty("advHang")
+	local info = advHang[chapterId]
+	if not info then return end
+
+	local index = info.index or 1
+	local chapterData = csvdb["adv_chapter_campsiteCsv"][chapterId]
+	if not chapterData then return end
+	local campSiteData = chapterData[info.campId or 2]
+	if not campSiteData then return 1 end
+	if campSiteData.idleReward_1 == "" and campSiteData.idleReward_2 == "" then return 2 end --没有奖励 没有挂机
+
+	local adv_idle_time = globalCsv.adv_idle_time[index]
+	local adv_idle_energy = globalCsv.adv_idle_energy[index]
+	local adv_idle_reward_coef = globalCsv.adv_idle_reward[index]
+	if not adv_idle_time or not adv_idle_energy or not adv_idle_reward_coef then
+		return 2
+	end
+	adv_idle_time = adv_idle_time * 60
+	
+	local reward, isFull, change, heroFaithMap
+	local heroCnt = 0
+	if skynet.timex() >= info.time then
+		-- 增加英雄信赖
+		local exp = info.duration / 60
+		heroFaithMap = {}
+		for _, heroId in pairs(info.format.heros) do
+			local curFaith = role:addHeroFaith(heroId, exp)
+			heroFaithMap[heroId] = curFaith
+			heroCnt = heroCnt + 1
+		end
+
+		local totalReward = campSiteData.idleReward_1 .. " " .. campSiteData.idleReward_2
+
+		local idleReward = totalReward:toNumMap()
+		for itemId, count in pairs(idleReward) do
+			idleReward[itemId] = count * adv_idle_reward_coef
+		end
+		reward, change = role:award(idleReward, {log = {desc = "advHang", int1 = chapterId}})
+	end
+	
+	role:changeUpdates({{type = "advHang", field = chapterId, value = nil}})
+
+	role:mylog("adv_action", {desc = "endHang", int1 = chapterId, short1 = 2})
+
+	role:checkTaskEnter("AdvHang", {})
+	role:checkTaskEnter("AdvHangHeroCnt", {count = heroCnt})
+end
+
+activityFunc[Activity.ActivityType.AdvLevel] = {
+	-- ["check"] = function(self, actType, notify) -- 检查
+	-- end,
+	["init"] = function(self, actType, isCrossDay, notify)
+	end,
+	["close"] = function(self, actType, notify, actid)
+		local actCfg = csvdb["activity_adv_chapterCsv"][actid]
+		if not actCfg then return end
+		for chapterId, _ in ipairs(actCfg) do
+			local advPass = self.owner:getProperty("advPass")
+			advPass[chapterId] = nil
+			self.owner:updateProperty({field="advPass", value=advPass})
+
+			-- 关闭活动代理拾荒
+			closeActAdvHang(chapterId)
+		end
+		-- 强制关闭活动拾荒关卡
+		local adv = self.owner:getAdvData()
+		if adv:isRunning() and adv:isActivity() then
+			adv:forceOver()
+		end
+
+	end,
+}
+
 return Activity
@@ -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},
@@ -154,6 +155,7 @@ Role.schema = {
  
 	achiveT				= {"table", {}}, -- 成就计数统计 achivement_type  {id = status}
 	achiveV				= {"table", {}}, -- 成就领奖统计 achivement  {id = status}
+	fuxR				= {"number", 0}, -- 复兴成就最大完成数量	
  
 	rechargeF			= {"table", {}}, -- 是否首次充值某一项 -- —{[id] = 1}  -- 不存在就是没有充值过
 	dinerS				= {"table", {}}, -- 美食币商城 购买记录 {[id] = count}
@@ -182,6 +184,7 @@ Role.schema = {
 	feedback			= {"table", {}}, -- 反馈相关信息  {flag = false, count = 0} 	flag是否评论过，count 提示次数
  
 	calTask				= {"table", {}}, -- 英雄令活动 日历任务活动
+	bcTask				= {"table", {}}, -- 英雄令活动 日历任务活动 临时使用
 	radioTask			= {"table", {}}, -- 电台任务 {id = {time=end_ts,heros=heros}}	表crusadeCsv
 }
  
@@ -355,6 +358,7 @@ function Role:data()
 		advSup = self:getProperty("advSup"),
 		advC = self:getProperty("advC"),
 		advCT = self:getProperty("advCT"),
+		advRelay = self:getProperty("advRelay"),
  
 		hangPass = self:getProperty("hangPass"),
 		hangGift = self:getProperty("hangGift"),
@@ -408,6 +412,7 @@ function Role:data()
 		feedback = self:getProperty("feedback"),
 		ctime = self:getProperty("ctime"),
 		calTask = self:getProperty("calTask"),
+		bcTask = self:getProperty("bcTask"),
 		radioTask = self:getProperty("radioTask"),
 	}
 end
@@ -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,12 @@ local ItemReason = {
 	actBattle = 135, -- 活动关卡
 	actMilestone = 136,	-- 活动关卡boss伤害里程碑
 	worldBossReward = 137,	-- 世界boss翻牌奖励
+	commonSign = 138,	-- 每日活跃签到
+	actFriendHelp = 139,-- 好友能量互助活动
+	actBattleCommand = 140,	-- 活动战令
+	actBuyBpLevel = 141, -- 购买活动战令等级
+	newSign = 142,-- 新的活动签到
+	advLevelStage = 143, -- 拾荒活动阶段奖励
  
  
 	advHang = 301, -- 拾荒挂机
@@ -92,6 +98,7 @@ local ItemReason = {
 	actPaySign = 1008, -- 活动付费签到
 	calendaTask = 1009,	-- 英雄帖
 	actMilecrisis = 1010, -- 物资危机
+	battleCommandTask = 1011,	-- 将军令任务
  
 	-- 餐厅
 	greenHourse = 1101, -- 食材获得
@@ -122,6 +129,7 @@ local ItemReason = {
  
 	-- pvp 
 	pvpCHead = 1301, -- pvp 跨服竞技场头像
+	crossPvpBet = 1302, -- 竞猜
  
 	--adv
 	chooseEvent = 1351, -- 冒险选择
@@ -591,6 +599,7 @@ local LogType = {
 	guide = "common",
 	newdevice = "common",
 	cbback = "common",
+	cheat = "common",
  
 	in_item = "common",
 	out_item = "common",
@@ -875,4 +884,4 @@ function RoleLog.bind(Role)
  
  
 end
-return RoleLog
 \ No newline at end of file
+return RoleLog
@@ -131,7 +131,19 @@ 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,
 		}
+
+		if count > 0 then
+			local itemCfg = csvdb["itemCsv"][itemId]
+			local itemType = 0
+			if itemCfg then
+				itemType = itemCfg.type
+			end
+			self:checkTaskEnter("AddItem", {id = itemId, count = count, type = itemType})
+		end
 		-- 对数量筛查
 		count = checkItemCount(self, itemId, count)
 		if count ~= 0 then
@@ -286,10 +298,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 +430,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
  
@@ -481,6 +524,8 @@ function RolePlugin.bind(Role)
 		end
  
 		self:notifyUpdateProperty("diamond", self:getAllDiamond())
+
+		self:checkTaskEnter("CostDiamond", {count = count})
 		return true
 	end
  
@@ -804,9 +849,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 +882,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 +894,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 +1552,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 +1588,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 +1633,6 @@ function RolePlugin.bind(Role)
 			if table.pack(next(newReward))[2] >= divisionData.limit then
 				return true
 			end
-			
 		end
  
 		local events = {}
@@ -1596,8 +1685,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.twd ~= tonumber(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 +1749,7 @@ function RolePlugin.bind(Role)
 			order = partnerOrderId, 
 			rechargeId = rechargeId, 
 			createTime = skynet.timex(),
+			transactionId = transactionId,
 		})
 		order:create()
 		-- 正在进行中的订单 缓存
@@ -1666,6 +1782,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 +1828,13 @@ 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
+	request.is_mycard = 1
 	]]
 	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
@@ -1725,7 +1845,7 @@ function RolePlugin.bind(Role)
 		end
 		local rechargeId = back
 		local rechargeData = csvdb["shop_rechargeCsv"][rechargeId]
-		if rechargeData.rmb ~= tonumber(params.amount) then
+		if (params.is_mycard and rechargeData.twd ~= tonumber(params.amount)) or (not params.is_mycard and rechargeData.rmb ~= tonumber(params.amount)) then
 			skynet.error(string.format("[recharge] fake order: %s, roleId: %d, order: %s,  rmb %s, get %s", 
 				params.transactionId, roleId, partnerOrderStr, rechargeData.rmb, params.amount
 			))
@@ -1740,6 +1860,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
@@ -1773,7 +1897,7 @@ function RolePlugin.bind(Role)
 			self:gainDiamond({count = diamondCount, isRecharge = true, log = {desc = "recharge", int1 = id}})
 		elseif rechargeData.shop == 2 then  --通行证商店
 			reward, _ = self:award(rechargeData.itemFirst, {isRecharge = true, log = {desc = "recharge", int1 = id}})
-			self.storeData:onBuyCard(rechargeData.type, rechargeData.time, rechargeData.id)
+			self.storeData:onBuyCard(rechargeData.type, rechargeData.time, rechargeData.id, rechargeData.activity_id)
 		elseif rechargeData.shop == 3 then  -- 礼包商店
 			reward, _ = self:award(rechargeData.itemFirst, {isRecharge = true, log = {desc = "recharge", int1 = id}})
 		else
@@ -2013,6 +2137,15 @@ function RolePlugin.bind(Role)
 		return {list = list, rank = rank}
 	end
  
+	function Role:addHeroFaith(heroId, exp)
+		local hero = self.heros[heroId]
+		if not hero then
+			return
+		end
+
+		hero:addHeroFaith(exp)
+		return hero:getProperty("faith")
+	end
  
 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 -- 当前在本天 经过多少时间
@@ -15,6 +15,7 @@ local TaskType = {
 	HeroLvlCollect = 10,		-- 英雄等级收集进度
 	HeroQualityCollect = 11,	-- 英雄品质收集进度
 	HeroStarCollect = 12,		-- 英雄星级收集进度
+	DrawHeroNotFriend = 13,		-- 非友情招募		-- count
  
 	--装备相关
 	AddEquip = 101,				-- 获得装备			- equipId	rarity
@@ -34,6 +35,7 @@ local TaskType = {
 	HangBattle = 304,			-- 挂机战斗			- id
 	HangGetGold = 305,			-- 挂机获得齿轮		- count
 	BonusPass = 306,			-- 奖励副本通关		- id count
+	BonusQuick = 307, 			-- 奖励关卡扫荡		-- id count
  
 	-- 冒险相关
 	AdvPass = 401,				-- 冒险通过关			- id 	level 	score
@@ -50,6 +52,10 @@ local TaskType = {
 	AdvHang	= 412,				-- 代理拾荒次数
 	AdvMineKill = 413,			-- 宝藏怪击杀
 	AdvMineLayer = 414,			-- 宝藏洞激活
+	AdvKillBoss	= 415,			-- 拾荒击杀boss
+	AdvHangHeroCnt	= 416,		-- 拾荒人数
+	AdvCostPower = 417,			-- 消耗体力
+	AdvPassFirst = 418,			-- 冒险首次通关			- id
  
 	--爬塔相关
 	TowerPass = 501,			-- 爬塔通关			- level
@@ -91,6 +97,13 @@ local TaskType = {
 	SignIn = 901,				-- 签到
 	Pay	= 902,					-- 充值
 	ShopAll = 903,				-- 在任意商店购买 	
+	DailyTask = 904,			-- 完成每日活跃任务
+	RadioTaskStart = 905,		-- 电台任务开始			
+	FinishSpeTask = 906,		-- 指定任务完成			
+	AddItem = 907,				-- 获得道具
+	Login = 908,				-- 登入
+	CostDiamond = 909,			-- 消耗钻石
+	WeekTask = 910,				-- 完成每周活跃任务
  
 	--功能未实现 todo
 	AdvShop = 1002,				-- 冒险商城
@@ -231,6 +244,8 @@ 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")}},
+		[TaskType.AddItem] = {{Activity.ActivityType.BattleCommand, f("id"), f("count")}},
 	}
 }
  
@@ -240,7 +255,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,9 +283,29 @@ 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("count")}},
+		[TaskType.AdvKillBoss] = {{25, 1}},
+		[TaskType.AdvMineKill] = {{26, 1}},
+		[TaskType.PvpBattle] = {{27, 1}},
+		[TaskType.FinishSpeTask] = {{28, 3, f("taskId"), f("actId")}},
+		[TaskType.Login] = {{29, 1}},
+		[TaskType.DailyTask] = {{30, 2, f("cur")}},
+		[TaskType.WeekTask] = {{31, 2, f("cur")}},
+		[TaskType.MakeFood] = {{32, 1, f("count")}},
+		[TaskType.AddItem] = {{33, 3, f("type"), f("count")}},
+		[TaskType.CostDiamond] = {{34, 1, f("count")}},
+		[TaskType.DrawHeroNotFriend] = {{35, 1, f("count")}},
+		[TaskType.AdvCostPower] = {{36, 1, f("count")}},
 	}
 }
  
+local BattleCommandTaskListener = {
+	func = "checkBattleCommandTask",
+	listen = CalendaTaskListener["listen"]
+}
+
 local TaskListeners = {
 	StoryListener,
 	CommonListener,
@@ -279,6 +314,7 @@ local TaskListeners = {
 	ActivityListener,
 	StoreListener,
 	CalendaTaskListener,
+	BattleCommandTaskListener,
 }
  
 local RoleTask = {}
@@ -607,15 +643,136 @@ function RoleTask.bind(Role)
 	end
  
 	function Role:checkCalendaTask(notNotify, mainType, subType, param1, param2)
-		--print("check calenda taskl", mainType, subType, param1, param2)
+		--print("check calenda task", mainType, subType, param1, param2)
+		local actEnum = "CalendaTask"
+		local keyName = "calTask"
+		if not self.activity then return end
+		local open, actId = self.activity:isOpen(actEnum)
+		local actData = csvdb["activity_ctrlCsv"][actId]
+		if not actData then return end
+		if not open then return end
+
+		local change = false
+		local calTask = self:getProperty(keyName) or {}
+		param1 = param1 or 1
+
+		local cid = actData.condition
+		for k, taskList in pairs(csvdb["activity_taskCsv"]) do
+			if k == cid then
+				for id, cfg in pairs(taskList) do
+					if cfg.type == mainType then
+						if subType == 1 then	-- 增加数值
+							calTask[id] = (calTask[id] or 0) + param1
+						elseif subType == 2 then	-- 直接赋值
+							calTask[id] = param1
+						elseif subType == 3 then	-- 自定义类型
+							if cfg.type == 7 then	-- 英雄品质收集进度
+								local count = 0
+								for _, hero in pairs(self.heros) do
+									local unitData = csvdb["unitCsv"][hero:getProperty("type")]
+									if unitData then
+										if cfg.condition2 <= unitData.rare then
+											count = count + 1
+										end
+									end
+								end
+								if (calTask[id] or 0) < count then
+									calTask[id] = count
+								end
+							elseif cfg.type == 5 then	-- 英雄等级收集进度
+								local count = 0
+								for _, hero in pairs(self.heros) do
+									if cfg.condition2 <= hero:getProperty("level") then
+										count = count + 1
+									end
+								end
+								if (calTask[id] or 0) < count then
+									calTask[id] = count
+								end
+							elseif cfg.type == 16 then	-- 英雄星级收集进度
+								local count = 0
+								for _, hero in pairs(self.heros) do
+									if cfg.condition2 <= hero:getProperty("wakeL") then
+										count = count + 1
+									end
+								end
+								if (calTask[id] or 0) < count then
+									calTask[id] = count
+								end
+							elseif cfg.type == 18 then	-- 挂机累计收获id,y个
+								for rid, v in pairs(param1) do
+									if cfg.condition2 == rid then
+										calTask[id] = (calTask[id] or 0) + v
+									end
+								end
+							elseif cfg.type == 19 then	-- x名英雄装备y品质以上符文套装
+								local count = 0
+								for _, hero in pairs(self.heros) do
+									local rcount = 0
+									for _,uid in pairs(hero:getRunes()) do
+										if uid > 0 then
+											local runeData = self.runeBag[uid]
+											if runeData then 
+												local csvData = csvdb["runeCsv"][runeData:getProperty("type")][runeData:getProperty("id")]
+
+												if csvData and cfg.condition2 <= csvData.rarity then
+													rcount = rcount + 1
+												end
+											end
+										end
+									end
+									if rcount == 6 then
+										count = count + 1
+									end
+								end
+								calTask[id] = count
+							elseif cfg.type == 20 then	-- 开启x品质时钟箱子
+								if cfg.condition2 <= (param2 or 0) then
+									calTask[id] = (calTask[id] or 0) + param1
+								end
+							elseif cfg.type == 15 then -- 通关关卡
+								if (calTask[id] or 0) == 0 then
+									local hangPass = self:getProperty("hangPass")
+									local diff = math.floor(cfg.condition2 / 10000)
+									if (hangPass[diff] or 0) >= cfg.condition1 then
+										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
+							elseif cfg.type == 33 then	-- 获得指定类型道具多少个
+								if cfg.condition2 == param1 then
+									calTask[id] = (calTask[id] or 0) + (param2 or 0)
+								end
+							end
+						end
+					end
+				end
+			end
+		end
+		self:updateProperty({field = keyName, value = calTask, notNotify = notNotify})
+		--dump(calTask)
+	end
+
+	function Role:checkBattleCommandTask(notNotify, mainType, subType, param1, param2)
+		--print("check battle command task", mainType, subType, param1, param2)
+		local actEnum = "BattleCommandTask"
+		local keyName = "bcTask"
 		if not self.activity then return end
-		local open, actId = self.activity:isOpen("CalendaTask")
+		local open, actId = self.activity:isOpen(actEnum)
 		local actData = csvdb["activity_ctrlCsv"][actId]
 		if not actData then return end
 		if not open then return end
  
 		local change = false
-		local calTask = self:getProperty("calTask") or {}
+		local calTask = self:getProperty(keyName) or {}
 		param1 = param1 or 1
  
 		local cid = actData.condition
@@ -690,7 +847,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,16 +857,29 @@ 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
+							elseif cfg.type == 33 then	-- 获得指定类型道具多少个
+								if cfg.condition2 == param1 then
+									calTask[id] = (calTask[id] or 0) + (param2 or 0)
+								end
 							end
 						end
 					end
 				end
 			end
 		end
-		self:updateProperty({field = "calTask", value = calTask, notNotify = notNotify})
+		self:updateProperty({field = keyName, value = calTask, notNotify = notNotify})
 		--dump(calTask)
 	end
  
 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")
@@ -41,13 +46,8 @@ ResetFunc[&quot;CrossWeek&quot;] = function(self, notify, response)
  
 	response.wTask = {}
 	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
+	self.activity:refreshWeekData(notify)
 end
  
  
@@ -89,13 +89,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})
@@ -186,7 +186,7 @@ end
  
  
 -- 购买通行证
-function Store:onBuyCard(type, duration, id)
+function Store:onBuyCard(type, duration, id, actid)
     local timeNow = skynet.timex()
     if type == CardType.NormalMonthCard then
         if self:isMonthCardExpire() then
@@ -221,6 +221,18 @@ function Store:onBuyCard(type, duration, id)
         info["flag"] = 1
         bpInfo[index] = info
         self:updateProperty({field = "bpInfo", value = bpInfo})
+    elseif type == CardType.ActBattleCommandCard then
+        if not self.owner.activity:isOpenById(actid, "ActShopGoods") then
+            return
+        end
+        local actCfg = csvdb["activity_ctrlCsv"][actid]
+        if not actCfg then return end
+        local actData = self.owner.activity:getActData("BattleCommand") or {}
+        actData["unlock"] = 1
+        if actCfg.condition ~= 0 then
+            actData["lvl"] = (actData["lvl"] or 0) + actCfg.condition
+        end
+        self.owner.activity:updateActData("BattleCommand", actData)
     end
 end
  
@@ -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
@@ -41,8 +41,10 @@ local port = ...
 port = tonumber(port)
  
 local key = "zhaolu1234dangge"
-local function response(id, ...)
-	local ok, err = httpd.write_response(sockethelper.writefunc(id), ...)
+local function response(id, code, body)
+	local ok, err = httpd.write_response(sockethelper.writefunc(id), code, body, {
+		["Connection"] = "Close",
+	})
 	if not ok then
 		-- if err == sockethelper.socket_error , that means socket closed.
 		skynet.error(string.format("fd = %d, %s", id, err))
@@ -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