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

熊润斐
2 parents b0a09a24 2d046fcb
Showing 18 changed files with 1235 additions and 235 deletions Show diff stats
src/GlobalVar.lua
src/ProtocolCode.lua
src/actions/ActivityAction.lua
src/actions/AdvAction.lua
src/actions/GmAction.lua
src/actions/HeroAction.lua
src/actions/HttpAction.lua
src/actions/RoleAction.lua
src/adv/Adv.lua
src/models/Activity.lua
src/models/Diner.lua
src/models/Role.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
src/models/RoleTask.lua
src/models/RoleTimeReset.lua
src/models/Store.lua
src/services/httpweb.lua
@@ -155,6 +155,23 @@ TimeReset = {
 	DrawType3 = 19, -- 魔法 抽卡加成
 }
+-- TimeReset 索引数组
+TimeResetArray = {
+	"CrossDay",  --通用跨天
+	"CrossWeek",  --通用跨周
+	"DinerRank",  -- 餐厅排行榜
+	"PvpRank",  -- pvp排行榜
+	"PvpHight",  --高级竞技场
+	"PvpCross",  -- 跨服竞技场
+	"PvpShop", -- 竞技场商城
+	"DailyBattle2", -- 特殊-每日副本（贴纸）
+	"DailyBattle1", -- 特殊-每日副本（装备）
+	"DailyBattle3", -- 特殊-每日副本（时钟箱）
+	"DrawType1", -- 变异 抽卡加成
+	"DrawType2", -- 通常 抽卡加成
+	"DrawType3", -- 魔法 抽卡加成
+}
+
 GuideStep = {
 	AdvGuide = 41,
 	AdvRelay = 42,
@@ -224,6 +241,7 @@ AdvBackEventType = {
 	LinkChooseOver = 26, -- 连锁事件结束
 	BuffEffect = 27, -- buff 效果
 	PassiveEffect = 28, -- 被动 效果
+	ChooseDice = 29, -- 选择点随机效果
 }
 AdvScoreType = {
@@ -290,6 +308,7 @@ CardType = {
 	BattleCard = 5,	--赛季卡
 	PaySignCard = 6, -- 付费签到卡
 	BattlePassCard = 7, -- 探索指令
+	ActBattleCommandCard = 8, -- 战令活动卡
 }
 ShopPackType = {
@@ -325,6 +344,7 @@ MailId = {
 	CBBackAward = 243,
 	CBBackAward2 = 244,
 	ActivityPoolRet = 280,
+	MyCardBuy = 300,
 }
 TriggerEventType = {
@@ -231,6 +231,11 @@ actionCodes = {
 	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,
@@ -248,4 +253,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
@@ -266,6 +266,53 @@ function _M.actCalendaTaskRpc(agent, data)
 	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
+
 function _M.exchangeRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
@@ -1113,11 +1160,212 @@ function _M.friendHelpRpc(agent, data)
 	local reward, change
 	if next(award) then
-		reward, change = role:award(award, {log = {desc = "actFriendHelp", int1 = actid, int2 = level}})
+		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
-return _M
 \ No newline at end of file
+-- 战令活动奖励
+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
@@ -95,16 +95,49 @@ 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
@@ -113,6 +146,7 @@ function _M.startAdvRpc( agent, data )
 	if not checkFormat(role) then return 7 end
+	local cost = 0
 	if AdvCommon.isEndless(chapterId) then -- 无尽模式判断
 		if chapterId ~= role.advElChapter then return end -- 不是当前进行的章节
@@ -131,6 +165,7 @@ function _M.startAdvRpc( agent, data )
 		end 
 		role.dailyData:updateProperty({field = "advElC", delta = 1})
+		cost = 1
 	else   -- 普通模式判断
 		if layer >= chapterData.limitlevel  then return 4 end
@@ -145,7 +180,9 @@ function _M.startAdvRpc( agent, data )
 		if not role:advChapterIsOpen(chapterId) then return 5 end
 		role:changeAdvCount(relayData.supply)
+		cost = relayData.supply
 	end
+	role:checkTaskEnter("AdvCostPower", {count = cost})
 	local support = {}  -- 支援效果
 	if AdvCommon.isEndless(chapterId) then
@@ -173,6 +210,7 @@ function _M.startAdvRpc( agent, data )
 		isRelay = layer ~= 1, 
 		isEnter = true, 
 		support = support,
+		actid = actid
 	})
 	role:checkTaskEnter("AdvStart", {id = chapterId})
@@ -191,6 +229,40 @@ 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
+
+	-- 检查活动正确性
+	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
@@ -219,6 +291,8 @@ function _M.startHangRpc(agent, data)
 	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 = {}
@@ -390,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
@@ -406,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 "成功"
@@ -704,15 +706,18 @@ function _M.drawHero(role, t, act)
 		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] = 606
-				up_pool[2] = 607
-				up_pool[3] = 608
+				up_pool[1] = 408
+				up_pool[2] = 409
+				up_pool[3] = 410
 			end
 			for k, v in ipairs(up_pool) do
 				resultPool[v] = {1}
@@ -733,6 +738,14 @@ function _M.drawHero(role, t, act)
 								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, 概率
@@ -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
@@ -976,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
@@ -151,7 +151,7 @@ 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)))
+	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
@@ -166,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)
@@ -607,9 +608,9 @@ 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, int2 = oper}})
 		else
@@ -851,6 +852,8 @@ function _M.taskRpc(agent, data)
 	-- 日常活动完成
 	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({
@@ -913,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
@@ -40,6 +40,7 @@ function Adv:initByInfo()
 	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
@@ -84,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
@@ -94,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} -- 最后一个为当前的地图
@@ -183,6 +186,7 @@ end
 function Adv:clear()
 	self.chapterId = nil
 	self.level = nil
+	self.actid = nil
 	self.score = {}
 	self.round = 0
 	self.lastEnemyId = 1
@@ -205,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
@@ -771,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]
@@ -800,9 +809,57 @@ 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})
@@ -836,9 +893,10 @@ function Adv:over(success, rewardRatio, overType)
 		end
 	end
+
 	local roleId = self.owner:getProperty("id")
 	local oldMaxScore = tonum(redisproxy:zscore(self.owner:getAdvRankKey(), roleId))
-	if score > oldMaxScore then
+	if score > oldMaxScore and not self.actid then
 		local team = self.owner:getProperty("advTeam")
 		local curInfo = {
 			name = self.owner:getProperty("name"),
@@ -906,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})
@@ -924,6 +983,7 @@ function Adv:over(success, rewardRatio, overType)
 		scoreAward = scoreReward,
 		chapterId = chapterId,
 		backAdvCount = backAdvCount,
+		actid = actid
 	})
 end
@@ -1233,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
@@ -1270,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})
@@ -1309,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
@@ -1327,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
@@ -1341,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
@@ -1355,138 +1446,176 @@ 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]
+				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
+	local clearBlock_ = doChooseEffect(self, chooseData["button".. choose .."effect"], room, block, tag, chooseData)
+	clearBlock = clearBlock and clearBlock_
+	self:scoreChange(AdvScoreType.Event, chooseData.advScore) --增加加分
 	return true, clearBlock
 end
@@ -33,6 +33,12 @@ Activity.ActivityType = {
 	CommonSignIn = 28, 	--通用签到
 	FriendEnergy = 30, -- 好友互赠能量活动 
+	AdvLevel = 33,	-- 拾荒关卡
+	BattleCommand = 34, -- 战令活动
+	NewSign = 36, -- 活动签到，单独的签到界面
+	HeroBackFree = 37, -- 无损耗归还
+
+	BattleCommandTask = 38, -- 战令任务活动
 }
 local function checkActivityType(activityType)
@@ -79,6 +85,11 @@ Activity.schema = {
 	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()
@@ -102,6 +113,11 @@ function Activity:data()
 		act28 = self:getProperty("act28"),
 		act30 = self:getProperty("act30"),
+
+		act33 = self:getProperty("act33"),
+
+		act34 = self:getProperty("act34"),
+		act36 = self:getProperty("act36"),
 	}
 end
@@ -455,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)
@@ -480,8 +497,110 @@ activityFunc[Activity.ActivityType.CalendaTask] = {
 		role:checkTaskEnter("RuneQualityCollect", {})
 	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={}})
+		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,
 }
@@ -598,8 +717,8 @@ function Activity:closeActivity(actId, notify, notUpdateAct)
 	local actType = actData.showType
 	if activityFunc[actType] and activityFunc[actType]['close'] then
 		activityFunc[actType]["close"](self, actType, notify, actId)
-		self:recycleActItem(actId)
 	end
+	self:recycleActItem(actId)
 	if Activity.schema["act".. actType] then
 		if not Activity.schema["act" .. actType][3] then 
 			self:updateActData(actType, Activity.schema["act" .. actType][2], not notify or notUpdateAct)
@@ -619,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
@@ -870,11 +1001,13 @@ activityFunc[Activity.ActivityType.CommonSignIn] = {
 		if not isCrossDay then
 			activityFunc[Activity.ActivityType.CommonSignIn]["crossDay"](self, actType, notify, actId)
 		end
+		local taskStatus = self.owner:getProperty("dTask")
+		activityFunc[Activity.ActivityType.CommonSignIn]["check"](self, actType, notify, 0, (taskStatus["a"] or 0))
 	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", "=")
+		local conArr = actCfg.condition2:toArray(true, "=")
 		-- 0 登录即可， 1 达到指定活跃度
 		if conArr[1] ~= 0 then
 			return
@@ -888,7 +1021,7 @@ activityFunc[Activity.ActivityType.CommonSignIn] = {
 		local actData = self:getActData(actType) or {}
 		local actCfg = csvdb["activity_ctrlCsv"][actId]
 		if not actCfg then return end
-		local conArr = actCfg.condition2:toArray("true", "=")
+		local conArr = actCfg.condition2:toArray(true, "=")
 		-- 0 登录即可， 1 达到指定活跃度
 		if conArr[1] ~= 1 then
 			return
@@ -901,4 +1034,149 @@ activityFunc[Activity.ActivityType.CommonSignIn] = {
 	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
@@ -201,7 +201,7 @@ function Diner:calSellReward(sell, delta, dishData)
 			upValue[ItemId.Gold] = (upValue[ItemId.Gold] or 0) + buildData.gold_up
 		end
 		if buildData.item_up > 0 then
-			upValue[ItemId.DinerCoin] = (upValue[ItemId.DinerCoin] or 0) + buildData.gold_up
+			upValue[ItemId.DinerCoin] = (upValue[ItemId.DinerCoin] or 0) + buildData.item_up 
 		end
 		if buildData and buildData.famous_up > 0 then
 			upValue[-1] = (upValue[-1] or 0) + buildData.famous_up
@@ -155,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}
@@ -183,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
 }
@@ -410,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
@@ -53,6 +53,10 @@ local ItemReason = {
 	worldBossReward = 137,	-- 世界boss翻牌奖励
 	commonSign = 138,	-- 每日活跃签到
 	actFriendHelp = 139,-- 好友能量互助活动
+	actBattleCommand = 140,	-- 活动战令
+	actBuyBpLevel = 141, -- 购买活动战令等级
+	newSign = 142,-- 新的活动签到
+	advLevelStage = 143, -- 拾荒活动阶段奖励
 	advHang = 301, -- 拾荒挂机
@@ -94,6 +98,7 @@ local ItemReason = {
 	actPaySign = 1008, -- 活动付费签到
 	calendaTask = 1009,	-- 英雄帖
 	actMilecrisis = 1010, -- 物资危机
+	battleCommandTask = 1011,	-- 将军令任务
 	-- 餐厅
 	greenHourse = 1101, -- 食材获得
@@ -879,4 +884,4 @@ function RoleLog.bind(Role)
 end
-return RoleLog
 \ No newline at end of file
+return RoleLog
@@ -135,6 +135,15 @@ function RolePlugin.bind(Role)
 				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
@@ -515,6 +524,8 @@ function RolePlugin.bind(Role)
 		end
 		self:notifyUpdateProperty("diamond", self:getAllDiamond())
+
+		self:checkTaskEnter("CostDiamond", {count = count})
 		return true
 	end
@@ -1687,7 +1698,7 @@ function RolePlugin.bind(Role)
 		for k , v in pairs(csvdb["shop_rechargeCsv"]) do
 			if not v[pidField] then return "no product" end
 			if v[pidField] == params.product_id then
-				if v.rmb ~= params.money then
+				if v.twd * 100 ~= tonumber(params.money) then
 					return "error money"
 				end
 				-- 发现需要的id
@@ -1812,12 +1823,13 @@ function RolePlugin.bind(Role)
 	-- 充值 --
 	--[[
 	request.order = data.out_trade_no
-	request.amount = data.money / 100
+	request.amount = data.money
 	request.game_money = data.game_money
 	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")
@@ -1833,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 * 100 ~= tonumber(params.amount)) or (not params.is_mycard and rechargeData.rmb * 100 ~= 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
 			))
@@ -1849,8 +1861,7 @@ function RolePlugin.bind(Role)
 		if not status then
 			if params.extension_info == "mycard_web" then
-				-- todo 发邮件
-				skynet.error("mycard_web " .. params.order)
+				self:sendMail(MailId.MyCardBuy, nil, nil, {rechargeId})
 			end
 			SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ order = partnerOrderStr,
 				result = "success", reward = reward}))
@@ -1885,7 +1896,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
@@ -2125,6 +2136,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
@@ -15,6 +15,7 @@ local TaskType = {
 	HeroLvlCollect = 10,		-- 英雄等级收集进度
 	HeroQualityCollect = 11,	-- 英雄品质收集进度
 	HeroStarCollect = 12,		-- 英雄星级收集进度
+	DrawHeroNotFriend = 13,		-- 非友情招募		-- count
 	--装备相关
 	AddEquip = 101,				-- 获得装备			- equipId	rarity
@@ -53,7 +54,8 @@ local TaskType = {
 	AdvMineLayer = 414,			-- 宝藏洞激活
 	AdvKillBoss	= 415,			-- 拾荒击杀boss
 	AdvHangHeroCnt	= 416,		-- 拾荒人数
-	AdvPassFirst = 417,			-- 冒险首次通关			- id
+	AdvCostPower = 417,			-- 消耗体力
+	AdvPassFirst = 418,			-- 冒险首次通关			- id
 	--爬塔相关
 	TowerPass = 501,			-- 爬塔通关			- level
@@ -98,6 +100,10 @@ local TaskType = {
 	DailyTask = 904,			-- 完成每日活跃任务
 	RadioTaskStart = 905,		-- 电台任务开始			
 	FinishSpeTask = 906,		-- 指定任务完成			
+	AddItem = 907,				-- 获得道具
+	Login = 908,				-- 登入
+	CostDiamond = 909,			-- 消耗钻石
+	WeekTask = 910,				-- 完成每周活跃任务
 	--功能未实现 todo
 	AdvShop = 1002,				-- 冒险商城
@@ -239,6 +245,7 @@ local ActivityListener = {
 		[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")}},
 	}
 }
@@ -278,15 +285,27 @@ local CalendaTaskListener = {
 		[TaskType.OpenBox]= {{20, 3, f("count"), f("quality")}},
 		[TaskType.RadioTaskStart] = {{21, 1}, {22, 3, f("heroCnt")}},
 		[TaskType.BonusQuick] = {{23, 1, f("count")}},
-		[TaskType.AdvHangHeroCnt] = {{24, 3, f("HeroCnt")}},
+		[TaskType.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,
@@ -295,6 +314,7 @@ local TaskListeners = {
 	ActivityListener,
 	StoreListener,
 	CalendaTaskListener,
+	BattleCommandTaskListener,
 }
 local RoleTask = {}
@@ -623,15 +643,17 @@ 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("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
@@ -706,7 +728,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
@@ -721,17 +743,140 @@ function RoleTask.bind(Role)
 							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)
+								--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(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 = "calTask", value = calTask, notNotify = notNotify})
+		self:updateProperty({field = keyName, value = calTask, notNotify = notNotify})
 		--dump(calTask)
 	end
@@ -46,6 +46,8 @@ ResetFunc[&quot;CrossWeek&quot;] = function(self, notify, response)
 	response.wTask = {}
 	response.dinerS = {}
+
+	self.activity:refreshWeekData(notify)
 end
@@ -82,10 +84,14 @@ function Role:updateTimeReset(now, notify)
 	local resetMode = {}
 	local response = {}
-	for funcName, resetId in pairs(TimeReset) do
-		if needResetId[resetId] and ResetFunc[funcName] then
-			ResetFunc[funcName](self, notify, response, now)
-			resetMode[funcName] = true
+	for idx = 1, #TimeResetArray do
+		local funcName = TimeResetArray[idx]
+		local resetId = TimeReset[funcName]
+		if resetId then
+			if needResetId[resetId] and ResetFunc[funcName] then
+				ResetFunc[funcName](self, notify, response, now)
+				resetMode[funcName] = true
+			end
 		end
 	end
@@ -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
@@ -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))