Merge branch 'bugfix' into player

# Conflicts: # src/main.lua

Merge branch 'bugfix' into player
# Conflicts: # src/main.lua
熊润斐
2 parents 803170fd c7991bb0
Showing 48 changed files with 1001 additions and 334 deletions Show diff stats
robot/robot.conf
robot/robot.lua
robot/robot_config.lua
robot/robot_main.lua
robot/robot_pool.lua
robot/start.lua
robot/unitTest/adv.lua
robot/unitTest/hero.lua
robot/unitTest/item.lua
src/GlobalVar.lua
src/ProtocolCode.lua
src/RedisKeys.lua
src/actions/ActivityAction.lua
src/actions/DinerAction.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
 root = "./"
-thread = 8
+thread = 4
 logger = nil
 harbor = 0
-start = "start"	-- main script
+start = "robot_main"	-- main script
 bootstrap = "snlua bootstrap"	-- The service for bootstrap
  
 lua_path = root .."skynet/lualib/?.lua;"..root.."robot/?.lua;"..root.."src/?.lua"
@@ -16,6 +16,7 @@ local eventListener = {}
  
 local ignoreListener = {
 	["Role.updateProperty"] = function(data)
+		if not client.role then return end
 		local msg = MsgPack.unpack(data)
 		for _, one in pairs(msg) do
 			client.role[one.key] = one.newValue
@@ -80,7 +81,7 @@ function triggerListener(listener, data)
 			ignoreListener[listener](data)
 		end
 	else
-		log(listener .. " no handle!!!")
+		-- log(listener .. " no handle!!!")
 	end
 end
  
@@ -103,8 +104,8 @@ function sendServer(actionCode, bin)
 end
  
 function requestServer(actionCode, bin, callback, isKeep)
-	sendServer(actionCode, bin)
 	addListener(actionCode, callback, isKeep)
+	sendServer(actionCode, bin)
 end
  
 local function heartBeat()
@@ -120,7 +121,7 @@ local function startUnit(unit)
  
 	local ok, unitTest = pcall(require, "unitTest." .. unit)
 	if not ok then
-		print("unitTest load error : " .. unitTest)
+		log("unitTest load error : " .. unitTest)
 	end
  
 	unitTest.new(client):startTest()
@@ -130,6 +131,8 @@ end
 -- 登录成功开始任务
 function CMD.task()
 	heartBeat()
+	-- 20 秒后开始执行任务 错开登录
+	skynet.sleep(math.randomInt(2000, 3000))
 	startUnit()
 end
  
@@ -142,7 +145,7 @@ function CMD.start(fd, id)
 	client.uname = uname
 	local status, body = httpc.get(config.http, "/login?" .. httpGetFormatData({token = uname, device = "test", channel = "develop"}))
 	if tonumber(status) ~= 200 then
-		print("http get error", uname, body)
+		log("http get error", uname, body)
 		return
 	end
 	local servInfo = json.decode(body)
@@ -170,7 +173,7 @@ skynet.register_protocol {
 	dispatch = function(session, address, cmd, data)
 		local actionName = actionHandlers[cmd]
 		if not actionName then
-			print("actionName not exist", actionName)
+			log("actionName not exist", actionName)
 			return
 		end
  
@@ -10,7 +10,7 @@ end
  
  
 return {
-	http = "http://106.13.60.20:9090", -- 登录服
+	http = "http://192.168.0.199:9090", -- 登录服
 	host = "127.0.0.1", --服务器地址
 	port = 12001,  	-- 服务器端口
  
@@ -20,15 +20,15 @@ return {
 	max = 200, 	-- 最大玩家数 必须大于 online 数
 	online_time = {10 * 60, 20 * 60}, -- 在线时间控制 秒
  
-	uname_prefix = "robot", --机器名称前缀
+	uname_prefix = "robothehe", --机器名称前缀
  
  
 	-- 机器上线后的行为
 	units = {
 		chat = {weight = 100}, -- 聊天
 		item = {weight = 100}, -- 物品操作
-		hero = {weight = 500}, -- 英雄 
-		hang = {weight = 1000}, -- 挂机战斗 
+		hero = {weight = 500}, -- 英雄
+		hang = {weight = 1000}, -- 挂机战斗
 		tower = {weight = 500}, -- 爬塔
 		car = {weight = 100}, -- 爬塔
 		pvp = {weight = 500}, -- pvp
@@ -0,0 +1,21 @@
+local skynet = require "skynet"
+local config = require "robot_config"
+
+local preOnlineCount = 10
+
+
+skynet.start(function()
+	local need = math.ceil(config.online / preOnlineCount)
+	local inpre = math.ceil(config.inpre / need)
+	local idRange = math.ceil(config.max / need)
+	local curId = 1
+	local poold = skynet.newservice("robot_pool")
+	local pooldObj = skynet.call(poold, "lua", "start", config.online + preOnlineCount)
+
+	for i = 1, need do
+		local start = skynet.newservice("start")
+		skynet.send(start, "lua", "start", poold, pooldObj, preOnlineCount, curId, curId + idRange - 1, inpre)
+		curId = curId + idRange
+	end
+	skynet.exit()	
+end)
 \ No newline at end of file
@@ -0,0 +1,46 @@
+--[[
+	deque 为了减少锁竞争，尽量保证 a服务 push；b服务 pop
+]]
+local skynet = require "skynet"
+local deque = require "deque"
+
+local CMD = {}
+local factory
+
+local PRE_FEED_COUNT = 5
+local dead = 0
+-- agent死亡，通知poold补充，当累计到5个agent时，马上生成5个agent放入poold中
+-- 当然这里也可以写得更复杂，参考redis落地规则
+function CMD.feed()
+	dead = dead + 1
+	if dead == PRE_FEED_COUNT then
+		dead = 0
+		for i=1, PRE_FEED_COUNT do
+			factory:push(skynet.newservice("robot"))
+		end
+	end
+end
+
+-- 系统启动，生成count个agent放入双端队列中
+function CMD.start(count)
+	factory, addr = deque.new(count)
+
+	for i = 1, count do
+		factory:push(skynet.newservice("robot"))
+	end
+
+	return addr
+end
+
+local function __init__()
+	skynet.dispatch("lua", function (_, _, command, ...)
+		local f = CMD[command]
+		if command == "start" then
+			skynet.ret(skynet.pack(f(...)))
+			return
+		end
+		f(...)
+	end)
+end
+
+skynet.start(__init__)
@@ -5,32 +5,37 @@ local config = require &quot;robot_config&quot;
 local skynet = require "skynet"
 local netpack = require "skynet.netpack"
 local socketdriver = require "skynet.socketdriver"
+local deque = require "deque"
 local string_format = string.format
  
+local poold, pooldObj, onlineCount, startId, endId, inpre
+local factory
+
 local queue = {}
 local fd2serv = {}
 local id2fd = {}
 local MSG = {}
-local id_max = 0 -- robot id
+local id_max 
  
  
 function MSG.open( ... )
-	print("open", ...)
+	log("open", ...)
 end
  
 function MSG.close(fd)
 	if fd2serv[fd] and not fd2serv[fd].closing then
 		fd2serv[fd].closing = true
 		skynet.call(fd2serv[fd].agent, "lua", "exit")
-		log(string_format("logout %s", fd2serv[fd].id))
+		pcall(skynet.send, poold, "lua", "feed")
  
+		log(string_format("logout %s", fd2serv[fd].id))
 		id2fd[fd2serv[fd].id] = nil
 		fd2serv[fd] = nil
 	end
 end
  
 function MSG.error(fd, msg)
-	print("MSG.error", fd, msg)
+	log("MSG.error", fd, msg)
 	MSG.close(fd)
 end
  
@@ -72,13 +77,14 @@ skynet.register_protocol {
 }
  
 local function add_robot()
-	local robot = skynet.newservice("robot")
+	local time = skynet.time()
+	local robot = factory:pop()
 	local fd = socketdriver.connect(config.host, config.port)
 	socketdriver.start(fd)
 	local id
-	if id_max >= config.max then
+	if id_max >= endId then
 		while true do
-			id = math.randomInt(1, config.max)
+			id = math.randomInt(startId, endId)
 			if not id2fd[id] then
 				break
 			end
@@ -89,9 +95,8 @@ local function add_robot()
 	end
 	fd2serv[fd] = {agent = robot, id = id}
 	id2fd[id] = fd
-	pcall(skynet.call, robot, "lua", "start", fd, id)
+	pcall(skynet.call, robot, "lua", "start", fd, id, prefix)
 	log(string_format("login %s", fd2serv[fd].id))
-
 	-- 定时下线
 	skynet.timeout(math.randomInt(config.online_time[1], config.online_time[2]) * 100, function()
 		MSG.close(fd)
@@ -106,8 +111,8 @@ local function online()
 	end
  
 	-- 及时补充人数
-	if curCount < config.online then
-		for i = curCount + 1, config.online do
+	if curCount < onlineCount then
+		for i = curCount + 1, onlineCount do
 			add_robot()
 		end
 	end
@@ -116,11 +121,18 @@ local function online()
 	skynet.timeout(100, online)
 end
  
-local function start()
+local function start(pooldp, pooldObj, onlineCountp, startIdp, endIdp, inprep)
 	log("start testing ...")
  
-	for i = 1, config.online, config.inpre do
-		for j = 1, config.inpre do
+	factory = deque.clone(pooldObj)
+	poold, onlineCount, startId, endId, inpre = pooldp, onlineCountp, startIdp, endIdp, inprep
+	id_max = startId - 1
+
+	for i = 1, onlineCount, inpre do
+		for j = 1, inpre do
+			if i + j - 1 > onlineCount then
+				break
+			end
 			add_robot()
 		end
 		skynet.sleep(100)
@@ -131,5 +143,10 @@ local function start()
 end
  
 skynet.start(function()
-	skynet.fork(start)
+	skynet.dispatch("lua", function (_, _, command, ...)
+		if command == "start" then
+			start(...)
+			return
+		end
+	end)
 end)
 \ No newline at end of file
@@ -8,6 +8,8 @@ local _M = class(&quot;hang&quot;, require(&quot;unitTest.unitTest&quot;))
  
 function _M:start()
 	sendServer(actionCodes.Gm_clientRequest,  MsgPack.pack({cmd = "fb", pm1 = 10606}))
+	requestServer(actionCodes.Adv_roleFormatRpc,  MsgPack.pack({index = 1, title = "hehe", leader = 1, leader2 = 2, heros = {[1] = 1, [2] = 2}}))
+	requestServer(actionCodes.Adv_selectTeamRpc,  MsgPack.pack({index = 1}))
 	self:task()
 end
  
@@ -24,8 +26,8 @@ function _M:task()
 end
  
 function _M:startAdv()
-	sendServer(actionCodes.Gm_clientRequest,  MsgPack.pack({cmd = "advf", pm1 = 10606}))
-	requestServer(actionCodes.Adv_startAdvRpc,  MsgPack.pack({chapterId = 101, format = {leader = 1, leader2 = 2, heros = {[1] = 1, [2] = 2}}}))
+	sendServer(actionCodes.Gm_clientRequest,  MsgPack.pack({cmd = "advf"}))
+	requestServer(actionCodes.Adv_startAdvRpc,  MsgPack.pack({chapterId = 101}))
 	requestServer(actionCodes.Adv_exitAdvRpc, '')
 end
  
@@ -35,8 +35,8 @@ function _M:drawHero10()
 end
  
 function _M:createHeroRandom()
-	sendServer(actionCodes.Gm_clientRequest,  MsgPack.pack({cmd = "get", pm1 = 703, pm2 = 20}))
-	requestServer(actionCodes.Hero_createHeroRandomRpc, MsgPack.pack({itemId = 703}))
+	sendServer(actionCodes.Gm_clientRequest,  MsgPack.pack({cmd = "get", pm1 = 722, pm2 = 40}))
+	requestServer(actionCodes.Hero_createHeroRandomRpc, MsgPack.pack({itemId = 722}))
 end
  
  
@@ -14,7 +14,7 @@ end
 local taskMap = {
 	saleItem = {100},
 	openItem = {100},
-	openTimeBox = {100},
+	-- openTimeBox = {100},
 }
  
 function _M:task()
@@ -31,8 +31,8 @@ end
  
  
 function _M:openItem()
-	sendServer(actionCodes.Gm_clientRequest,  MsgPack.pack({cmd = "get", pm1 = 701, pm2 = 20}))
-	requestServer(actionCodes.Role_openItemRpc, MsgPack.pack({itemId = 701, count = 1}))
+	sendServer(actionCodes.Gm_clientRequest,  MsgPack.pack({cmd = "get", pm1 = 831, pm2 = 1}))
+	requestServer(actionCodes.Role_openItemRpc, MsgPack.pack({itemId = 831, count = 1}))
 end
  
 function _M:openTimeBox()
@@ -134,8 +134,8 @@ ItemId = {
 	RuneFragment = 24,
 	HeroFC = {700, 701, 702, 703},  --通用角色碎片
 	AdvKey = 80, -- 冒险钥匙
-	BoxKey = 60, -- 拆解工具
 	AdvPower = 4701, -- 拾荒体力
+	CrisisScore = 8010, -- 积分
 }
  
 TimeReset = {
@@ -292,6 +292,10 @@ CardType = {
 	BattlePassCard = 7, -- 探索指令
 }
  
+ShopPackType = {
+	ActShopPack = 5,	-- 活动礼包
+}
+
 HeroQuality = {
 	N = 1,
 	R = 2,
@@ -318,6 +322,8 @@ MailId = {
  
 	PaySignAward = 241,
 	PayBackAward = 242,
+	CBBackAward = 243,
+	CBBackAward2 = 244,
 }
  
 TriggerEventType = {
@@ -227,6 +227,8 @@ actionCodes = {
 	Activity_endBattleRpc = 661,
 	Activity_battleRankRpc = 662,
 	Activity_battleMilestoneRpc = 663,
+	Activity_bossRewardRpc = 664,
+	Activity_crisisMilestoneRpc = 665,
  
 	Radio_startQuestRpc = 700,
 	Radio_finishQuestRpc = 701,
@@ -19,6 +19,7 @@ R_ORDER = &quot;order:%d:%d&quot;
 RANK_COMMON 	= "rank:common:"
 RANK_TYPE = {
     ActBattleBoss = "act_battle_boss",
+    ActCrisis = "crisis",
 }
  
 -- rank
@@ -192,13 +192,13 @@ function _M.actPaySignRpc(agent, data)
 	local open, actId = role.activity:isOpen("PaySignIn")
 	if not open then return 2 end
  
-	local diffDay = diffFromTs(ts) + 1
+	--local diffDay = diffFromTs(ts) + 1
  
 	local curData = role.activity:getActData("PaySignIn")
 	if not curData then return 3 end
 	local reward, change = {}
 	for day, csvData in ipairs(csvdb["pay_signInCsv"]) do
-		if day <= diffDay and day == dayIndex then
+		if day <= (curData[0] or 0) and day == dayIndex then
 			if not curData[day] then
 				curData[day] = 1
 				-- 奖励
@@ -268,7 +268,8 @@ function _M.exchangeRpc(agent, data)
 	local msg = MsgPack.unpack(data)
 	local actid = msg.actid
 	local id = msg.id
-	if not role.activity:isOpenById(actid) then return 1 end
+	local count = msg.count
+	if not role.activity:isOpenById(actid, "Exchange") then return 1 end
  
 	local exchangeCfg = csvdb["activity_exchangeCsv"][actid]
 	if not exchangeCfg then return 2 end
@@ -278,18 +279,26 @@ function _M.exchangeRpc(agent, data)
 	local curCount = exchangeData[id] or 0
 	local actCfg = exchangeCfg[id]
 	local limitArr = actCfg.limit:toArray(true, "=")
-	if curCount >= limitArr[2] then return 4 end
+	if curCount + count > limitArr[2] then return 4 end
  
 	local costs = actCfg.goods:toNumMap()
+	for k,v in pairs(costs) do
+		costs[k] = v * count
+	end
 	if not role:checkItemEnough(costs) then return 5 end
 	role:costItems(costs, {log = {desc = "actExchange", int1 = actid, int2 = id}})
  
-	curCount = curCount + 1
+	curCount = curCount + count
 	exchangeData[id] = curCount
 	curData[actid] = exchangeData
 	role.activity:updateActData("Exchange", curData)
  
-	local reward, change = role:award(actCfg.award, {log = {desc = "actExchange", int1 = actid, int2 = id}})
+	local award = actCfg.award:toNumMap()
+	for k,v in pairs(award) do
+		award[k] = v * count
+	end
+
+	local reward, change = role:award(award, {log = {desc = "actExchange", int1 = actid, int2 = id}})
  
  
 	SendPacket(actionCodes.Activity_exchangeRpc, MsgPack.pack(role:packReward(reward, change)))
@@ -304,7 +313,7 @@ function _M.gachakonRpc(agent, data)
  
 	if count > 10 then return end
  
-	if not role.activity:isOpenById(actid) then return 1 end
+	if not role.activity:isOpenById(actid, "Gachakon") then return 1 end
  
 	local actCtrlData = csvdb["activity_ctrlCsv"][actid]
 	if not actCtrlData then return 2 end
@@ -316,6 +325,7 @@ function _M.gachakonRpc(agent, data)
 	local gachakonInfo = role.activity:getActData("Gachakon") or {}
 	local award = {}
 	local remain = 0
+	local showAward = {}
 	for i = 1, count do
 		local tmpCfg = clone(actCfg)
 		remain = 0
@@ -335,6 +345,7 @@ function _M.gachakonRpc(agent, data)
 		if not id then return 4 end
 		gachakonInfo[id] = (gachakonInfo[id] or 0) + 1
 		local curAward = tmpCfg[id].award:toNumMap()
+		table.insert(showAward, curAward)
 		for k, v in pairs(curAward) do
 			award[k] = (award[k] or 0) + v
 		end
@@ -355,7 +366,7 @@ function _M.gachakonRpc(agent, data)
 	end
 	role.activity:updateActData("Gachakon", gachakonInfo)
  
-	SendPacket(actionCodes.Activity_gachakonRpc, MsgPack.pack(role:packReward(reward, change)))
+	SendPacket(actionCodes.Activity_gachakonRpc, MsgPack.pack(showAward))
 	return true
 end
  
@@ -363,7 +374,7 @@ function _M.hangDropRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
 	local actid = msg.actid
-	if not role.activity:isOpenById(actid) then return 1 end
+	if not role.activity:isOpenById(actid, "HangDrop") then return 1 end
  
 	local actCfg = csvdb["activity_putCsv"][actid]
 	if not actCfg then return 2 end
@@ -380,7 +391,7 @@ function _M.hangDropRpc(agent, data)
 			if type == 1 then
 				local actId = arr[2]
 				local carbonId = arr[3]
-				if not role.activity:isOpenById(actid) then return 3 end
+				if not role.activity:isOpenById(actId, "ChallengeLevel") then return 3 end
 				local clInfo = role.activity:getActData("ChallengeLevel") or {}
 				if not clInfo[carbonId] then
 					break
@@ -437,7 +448,7 @@ function _M.startBattleRpc(agent, data)
 	local actid = msg.actid
 	local id = msg.id
 	local count = msg.count
-	if not role.activity:isOpenById(actid) then return 1 end
+	if not role.activity:isOpenById(actid, "ChallengeLevel") then return 1 end
  
 	local actCfg = csvdb["activity_battleCsv"][actid]
 	if not actCfg then return 2 end
@@ -461,9 +472,10 @@ function _M.startBattleRpc(agent, data)
 	-- check cost
 	local changeFlag = false
 	local ticket = actData["ticket"]
+	local num = 0	-- cost num
 	if battleCfg.type ~= "" then
 		role.activity:getBattleTicket(actid)
-		local num = battleCfg.type:toArray(true, "=")[3]
+		num = battleCfg.type:toArray(true, "=")[3]
 		if count and count > 0 then
 			if battleCfg.rank == 0 then
 				return 7
@@ -479,9 +491,10 @@ function _M.startBattleRpc(agent, data)
 		if ticket < num then
 			return 6
 		end
-		actData["ticket"] = ticket - num
 		changeFlag = true
 	end
+	-- 解锁活动剧情
+	role:checkStoryStatus(false, 5, id)
  
 	if not count then
 		role.__actBattleCache = {
@@ -512,7 +525,12 @@ function _M.startBattleRpc(agent, data)
 		local reward, change  = role:award(award, {log = {desc = "actBattle", int1 = actid, int2 = count or 0}})
 		SendPacket(actionCodes.Activity_startBattleRpc, MsgPack.pack(role:packReward(reward, change)))
  
+		if battleCfg.worldBoss_award ~= 0 and (bi["maxP"] or 0) > 0 then
+			bi["bossP"] = (bi["bossP"] or 0) + bi["maxP"]
+		end
+
 		bi["sum"] = bi["sum"] + bi["top"]
+		actData["ticket"] = ticket - num
 		actData[id] = bi
 		changeFlag = true
  
@@ -540,7 +558,7 @@ function _M.endBattleRpc(agent, data)
 	local isWin = msg.isWin
 	local heros = msg.heros
 	local support = msg.support
-	if not role.activity:isOpenById(actid) then return 1 end
+	if not role.activity:isOpenById(actid, "ChallengeLevel") then return 1 end
  
 	if not role.__actBattleCache then return 2 end
  
@@ -556,6 +574,14 @@ function _M.endBattleRpc(agent, data)
  
 	local actData = role.activity:getActData("ChallengeLevel") or {}
  
+	-- 总输出
+	local dmg = 0
+	for k, v in pairs(msg.info.damage) do
+		if k % 100 == 2 then
+			dmg = dmg + v
+		end
+	end
+
 	local reward, change = {}, nil
  
 	local battleInfo = actData[id] or {}
@@ -611,6 +637,10 @@ function _M.endBattleRpc(agent, data)
 		check[7] = function(_, cond)
 			return msg.info.atime and msg.info.atime <= cond
 		end
+		-- 8 总输出值  msg.info.atime
+		check[8] = function(_, cond)
+			return dmg >= cond
+		end
 		curStar = 0
 		local sweepConds = battleCfg.sweep_condition:toTableArray(true)
  		for i, cond in ipairs(sweepConds) do
@@ -618,8 +648,11 @@ function _M.endBattleRpc(agent, data)
  				curStar = curStar + (1 << (i - 1))
  			end
  		end
- 	else
- 		curStar = 0
+	 else
+		curStar = 0
+		if battleCfg.rank ~= 0 then
+			curStar = 1
+		end
 	end
 	local oldStarNum = getStarCount(battleCfg, battleInfo["star"] or 0)
 	local newStarNum = getStarCount(battleCfg, curStar)
@@ -627,14 +660,13 @@ function _M.endBattleRpc(agent, data)
 		battleInfo["star"] = curStar
 	end
  
-	if battleCfg.rank ~= 0 then
+	if battleCfg.rank ~= 0 and isWin then
+		-- 消耗门票
+		role.activity:getBattleTicket(actid)
+		local num = battleCfg.type:toArray(true, "=")[3]
+		actData["ticket"] = math.max(actData["ticket"] - num, 0)
+
 		-- 更新排行榜 最高伤害
-		local dmg = 0
-		for k, v in pairs(msg.info.damage) do
-			if k % 100 == 2 then
-				dmg = dmg + v
-			end
-		end
 		battleInfo["top"] = math.max(battleInfo["top"] or 0, dmg)
 		battleInfo["sum"] = (battleInfo["sum"] or 0) + dmg
 		local rankVal = 0
@@ -647,13 +679,11 @@ function _M.endBattleRpc(agent, data)
 			role:updateRankCommon(RANK_TYPE.ActBattleBoss, rankVal)
 		end
 	end
-	actData[id] = battleInfo
-	role.activity:updateActData("ChallengeLevel", actData)
  
-	if oldStarNum == 0 or battleCfg.rank ~= 0 then
+	if (oldStarNum == 0 and newStarNum > 0) or battleCfg.rank ~= 0 then
 		reward = battleCfg.item_clear:toNumMap()
 	end
-	if (oldStarNum < 3 and newStarNum == 3) or battleCfg.rank ~= 0 then
+	if (oldStarNum < 3 and newStarNum == 3) or (battleCfg.rank ~= 0 and newStarNum == 3) then
 		local aw = battleCfg.perfect_reward:toNumMap()
 		for k, v in pairs(aw) do
 			reward[k] = (reward[k] or 0) + v
@@ -670,6 +700,18 @@ function _M.endBattleRpc(agent, data)
 		supports = support,
 	})
  
+	-- 解锁活动剧情
+	if newStarNum >= 3 then
+		role:checkStoryStatus(false, 5, id)
+	end
+
+	if battleCfg.worldBoss_award ~= 0 and msg.point then
+		battleInfo["bossP"] = (battleInfo["bossP"] or 0) + msg.point
+		battleInfo["maxP"] = math.max(msg.point, (battleInfo["maxP"] or 0))
+	end
+	actData[id] = battleInfo
+	role.activity:updateActData("ChallengeLevel", actData)
+
 	reward, change  = role:award(reward, {log = {desc = "actBattle", int1 = actid, int2 = newStarNum}})
  
 	SendPacket(actionCodes.Activity_endBattleRpc, MsgPack.pack({
@@ -684,10 +726,15 @@ function _M.battleRankRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
 	local actid = msg.actid
-	if not role.activity:isOpenById(actid) then return 1 end
-
-	local rankInfo = role:getRankInfoCommon(RANK_TYPE.ActBattleBoss)
-
+	local cfg = csvdb["activity_ctrlCsv"][actid]
+	if not cfg then return 1 end
+	if not role.activity:isOpen(cfg.showType) then return 2 end
+	local actTypeToRank = {
+		[role.activity.ActivityType.ChallengeLevel] = RANK_TYPE.ActBattleBoss,
+		[role.activity.ActivityType.Crisis] = RANK_TYPE.ActCrisis,
+	}
+	if not actTypeToRank[cfg.showType] then return end
+	local rankInfo = role:getRankInfoCommon(actTypeToRank[cfg.showType])
 	SendPacket(actionCodes.Activity_battleRankRpc, MsgPack.pack(rankInfo))
 	return true
 end
@@ -699,7 +746,7 @@ function _M.battleMilestoneRpc(agent, data)
 	local id = msg.id
 	local index = msg.index
  
-	if not role.activity:isOpenById(actid) then return 1 end
+	if not role.activity:isOpenById(actid, "ChallengeLevel") then return 1 end
  
 	local actCfg = csvdb["activity_mileageCsv"][actid]
 	if not actCfg then return 3 end
@@ -732,4 +779,93 @@ function _M.battleMilestoneRpc(agent, data)
 	return true
 end
  
+function _M.crisisMilestoneRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local actid = msg.actid
+	local id = msg.id
+	if not role.activity:isOpenById(actid, "Crisis") then return 1 end
+	local actCfg = csvdb["activity_mileageCsv"][actid]
+	if not actCfg then return 3 end
+
+	local curCsv = actCfg[id]
+	if not curCsv then return 4 end
+
+	if role:getItemCount(ItemId.CrisisScore) < curCsv.condition then
+		return 5
+	end
+
+	local actData = role.activity:getActData("Crisis") or {}
+	actData.score = actData.score or {}
+	if actData.score[id] then
+		return 6
+	end
+	actData.score[id] = -1
+	role.activity:updateActData("Crisis", actData)
+
+	local reward, change = role:award(curCsv.reward, {log = {desc = "actMilecrisis", int1 = actid}})
+	SendPacket(actionCodes.Activity_crisisMilestoneRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
+
+
+function _M.bossRewardRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local actid = msg.actid
+	local id = msg.id
+	local index = msg.index
+
+	if not role.activity:isOpenById(actid, "ChallengeLevel") then return 1 end
+
+	local actCfg = csvdb["activity_battleCsv"][actid]
+	if not actCfg then return 2 end
+
+	local battleCfg = actCfg[id]
+	if not battleCfg then return 3 end
+
+	if battleCfg.worldBoss_award == 0 then return 4 end
+
+	actCfg = csvdb["activity_wordboss_awardCsv"][battleCfg.worldBoss_award]
+	if not actCfg then return 5 end
+	local awardCfg = actCfg[index]
+	if not awardCfg then return 6 end
+
+	local preList = awardCfg.condition1:toArray(true, "=")
+
+	local actData = role.activity:getActData("ChallengeLevel") or {}
+	local battleInfo = actData[id] or {}
+	local bossPoint = battleInfo["bossP"] or 0
+	if bossPoint < 1 then return 7 end
+
+	local bossRecord = battleInfo["bossR"] or ""
+	local r = string.char(string.getbit(bossRecord, index))
+	if r == "1" then
+		return 9
+	end
+	local ok = false
+	if #preList == 0 then
+		ok = true
+	else
+		for _, i in ipairs(preList) do
+			local flag = string.char(string.getbit(bossRecord, i))
+			if flag == "1" then
+				ok = true
+				break
+			end
+		end
+	end
+	if not ok then return 8 end
+
+	battleInfo["bossR"] = string.setbit(bossRecord, index)
+	battleInfo["bossP"] = bossPoint - 1
+	actData[id] = battleInfo
+	role.activity:updateActData("ChallengeLevel", actData)
+
+	local award = awardCfg.reward:toNumMap()
+	local reward, change = role:award(award, {log = {desc = "worldBossReward", int1 = actid, int2 = index}})
+	SendPacket(actionCodes.Activity_bossRewardRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
+
 return _M
 \ No newline at end of file
@@ -598,6 +598,7 @@ function _M.updateTaskRpc( agent, data )
 		restaurant_order_status = cmd, -- 订单任务状态，接受:0, 拒绝:1, 完成:2
 		restaurant_order_rwd = reward or {}, -- 订单完成奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
 		restaurant_order_lv = taskData.rarity, -- 订单品质等级，普通:0, 稀有:1, 顶级:2, 豪华:3
+		restaurant_order_type = 1, -- 订单任务类型，0:特殊顾客，1:特别订单
 	})
  
 	role.dinerData:updateProperty({field = "order", value = json.encode(orders)})
@@ -896,6 +897,14 @@ function _M.entrustRpc(agent , data)
  
 		reward, change = role:award(curData.reward, {log = {desc = "dinerEntrus", int1 = entrustId}})
 		table.remove(entrust, 1)
+
+		role:log("restaurant_order", {
+			restaurant_order_id = entrustId, -- 订单任务ID
+			restaurant_order_status = 2, -- 订单任务状态，接受:0, 拒绝:1, 完成:2
+			restaurant_order_rwd = reward or {}, -- 订单完成奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
+			restaurant_order_lv = curData.type, -- 订单品质等级，普通:0, 稀有:1, 顶级:2, 豪华:3
+			restaurant_order_type = 0, -- 订单任务类型，0:特殊顾客，1:特别订单
+		})
 	elseif ctype == 2 then		-- 放弃
 		table.remove(entrust, 1)
 	else
@@ -502,6 +502,11 @@ function _M.guide(role, pms)
 				end
 			end
 		end
+		for _, data in pairs(csvdb["guide_unlockCsv"]) do
+			if data.type == 0 or data.type == 3 then
+				str = str:setv(data.id,1)
+			end
+		end
 		role:updateProperty({field = "funcGuide", value = str})
 		role:mylog("gm_action", {desc = "sguide", key1 = pms.sender})
  
@@ -524,6 +529,16 @@ function _M.guide(role, pms)
 	return "成功"
 end
  
+table.insert(helpDes, {"挑战关卡次数", "actbattle"})
+function _M.actbattle(role, pms)
+	if not role.activity:isOpen("ChallengeLevel") then return end
+	local actData = role.activity:getActData("ChallengeLevel")
+	actData["ticket"] = 100
+	role.activity:updateActData("ChallengeLevel", actData)
+
+	return "成功"
+end
+
 function _M.helpRpc(agent, data)
 	SendPacket(actionCodes.Gm_helpRpc, MsgPack.pack({help = helpDes}))
 	return true
@@ -498,46 +498,49 @@ function _M.buyBonusCountRpc(agent, data)
 	return true
 end
  
-local function bonusWinReward(role, bonusData, bwin, count)
+local function bonusWinReward(role, bonusData, rewardType, count)
 	count = count or 1
-	local open, actId = role.activity:isOpen("BonusDouble")
-	local actData = csvdb["activity_ctrlCsv"][actId]
-	local extraCnt = role.storeData:getBonusExtraFightCount()
-
-	local coef = 1
-	if open and actData then
-		coef = tonumber(actData.condition2)
-	end
-	local bonusC = role.dailyData:getProperty("bonusC")
-	bonusC[bonusData.type] = bonusC[bonusData.type] or {c = 0, b = 0}
-	if globalCsv.bonus_daily_count * coef + extraCnt - bonusC[bonusData.type]["c"] < count then return false, 1 end
-	bonusC[bonusData.type]["c"] = bonusC[bonusData.type]["c"] + count
-	role.dailyData:updateProperty({field = "bonusC", value = bonusC})
  
-	local reward, change
-	reward = bonusData.reward:toNumMap()
-	for itemId, c in pairs(reward) do
-		reward[itemId] = c * count
-	end
-	for i = 1, count do
-		local chance = bonusData.chance:randWeight(true)
-		if chance[1] ~= 0 then
-			reward[chance[1]] = (reward[chance[1]] or 0) + chance[2]
+	local reward, change = {}
+	if rewardType == 1 or rewardType == 4 then
+		for k, v in pairs(bonusData.clear_reward:toNumMap()) do
+			reward[k] = (reward[k] or 0) + v
 		end
 	end
  
-	for k, v  in pairs(reward) do
-		reward[k] = v * (coef > 1 and actData.condition or 1)
-	end
-	
-	if bwin then -- 满星 额外奖励
+	if rewardType == 2 or rewardType == 4 then
 		for k, v in pairs(bonusData.perfect_reward:toNumMap()) do
 			reward[k] = (reward[k] or 0) + v
 		end
 	end
-	reward, change = role:award(reward, {log = {desc = "bonusBattle", int1 = id}})
-	role:checkTaskEnter("BonusPass", {id = id, count = count})
-	return true, reward, change
+
+	if rewardType == 3 then
+		local open, actId = role.activity:isOpen("BonusDouble")
+		local actData
+		if open then
+			actData = csvdb["activity_ctrlCsv"][actId]
+		end
+
+		reward = bonusData.reward:toNumMap()
+		for itemId, c in pairs(reward) do
+			reward[itemId] = c * count
+		end
+		for i = 1, count do
+			local chance = bonusData.chance:randWeight(true)
+			if chance[1] ~= 0 then
+				reward[chance[1]] = (reward[chance[1]] or 0) + chance[2]
+			end
+		end
+		if open and actData then
+			for k, v  in pairs(reward) do
+				reward[k] = v * (actData.condition > 1 and actData.condition or 1)
+			end
+		end
+	end
+	
+	reward, change = role:award(reward, {log = {desc = "bonusBattle", int1 = bonusData.id}})
+	role:checkTaskEnter("BonusPass", {id = bonusData.id, count = count})
+	return reward, change
 end
  
 function _M.startBonusBattleRpc(agent, data)
@@ -557,25 +560,26 @@ function _M.startBonusBattleRpc(agent, data)
 	end
  
 	if not bonusData then return 3 end
-	if not role:checkHangPass(bonusData.unlock) then return 4 end
+	local bonusStar = role:getProperty("bonusStar")
  
-	local bonusC = role.dailyData:getProperty("bonusC")
-	bonusC[bonusData.type] = bonusC[bonusData.type] or {c = 0, b = 0}
+	if bonusData.unlock ~= 0 and (not bonusStar[bonusData.unlock] or bonusStar[bonusData.unlock] == 0) then return 4 end
  
-	local actData = csvdb["activity_ctrlCsv"][actId]
+	if bonusStar[id] and bonusStar[id] >= (1 << #bonusData.sweep_condition:toTableArray(true)) - 1 then 
+			local bonusC = role.dailyData:getProperty("bonusC")
+			bonusC[bonusData.type] = bonusC[bonusData.type] or {c = 0, b = 0}
+
+			local actData = csvdb["activity_ctrlCsv"][actId]
+			local extraCnt = role.storeData:getBonusExtraFightCount()
+			local coef = 1
+			if open and actData then
+				coef = tonumber(actData.condition2)
+			end
+			if math.illegalNum(count, 1, globalCsv.bonus_daily_count * coef + extraCnt - bonusC[bonusData.type]["c"]) then return 7 end
  
-	local extraCnt = role.storeData:getBonusExtraFightCount()
-	local coef = 1
-	if open and actData then
-		coef = tonumber(actData.condition2)
-	end
-	
-	if math.illegalNum(count, 1, globalCsv.bonus_daily_count * coef + extraCnt - bonusC[bonusData.type]["c"]) then return 7 end
+			bonusC[bonusData.type]["c"] = bonusC[bonusData.type]["c"] + count
+			role.dailyData:updateProperty({field = "bonusC", value = bonusC})
  
-	local bonusStar = role:getProperty("bonusStar")
-	if bonusStar[id] and bonusStar[id] >= (1 << #bonusData.sweep_condition:toTableArray(true)) - 1 then 
-		local status, reward, change = bonusWinReward(role, bonusData, nil, count)
-		if not status then return 10 * (reward or 0) end
+		local reward, change = bonusWinReward(role, bonusData, 3, count)
 		SendPacket(actionCodes.Hang_startBonusBattleRpc, MsgPack.pack({reward = reward, change = change}))
 	else
 		local bTeam = role:getTeamFormatByType(TeamSystemType.BonusBattle)
@@ -605,15 +609,16 @@ function _M.endBonusBattleRpc(agent, data)
 	end
 	local bonusData = csvdb["bonus_battleCsv"][id]
  
-	local reward, change
+	local reward, change = {}
  
 	local bonusStar = role:getProperty("bonusStar")
+	local oldStar = bonusStar[id] or 0
 	local curStar = 0
  	if starNum and starNum > 0 then
  		-- 胜利扣除次数
  
  		local bTeam = role:getTeamFormatByType(TeamSystemType.BonusBattle)
- 		local herosInfo = role:getTeamHerosInfo(bTeam.heros)
+ 		local herosInfo = role:getTeamHerosInfo(bTeam).heros
  
  		local check = {}
  		-- 1 通关
@@ -671,12 +676,23 @@ function _M.endBonusBattleRpc(agent, data)
  			end
  		end
  		local status
- 		status, reward, change = bonusWinReward(role, bonusData, curStar >= (1 << #sweepConds) - 1)
- 		if not status then return 10 + (reward or 0) end
+ 		local rewardType = 0
+ 		if curStar >= (1 << #sweepConds) - 1 then -- 满星
+ 			rewardType = 2
+ 			if oldStar == 0 then  --通关
+ 				rewardType = 4
+ 			end
+ 		elseif oldStar == 0 then --通关
+ 			rewardType = 1
+ 		end
+
+ 		if rewardType ~= 0 then
+	 		reward, change = bonusWinReward(role, bonusData, rewardType)
+	 	end
  	else
- 		curStar = 0
+ 		curStar = oldStar
  	end
- 	if curStar ~= bonusStar[id] then
+ 	if curStar ~= oldStar then
  		bonusStar[id] = curStar
  		role:updateProperty({field = "bonusStar", value = bonusStar})
  	end
@@ -146,7 +146,9 @@ function _M.talentRpc(agent, data)
 	local talent = hero:getProperty("talent")
 	local heroCfgId = hero:getProperty("type")
 	local curStage = talent:getv(0, 1)
+	local oldStage = curStage
 	local curLevel = talent:getv(1, 1)
+	local oldLevel = curLevel
 	local curData = csvdb["unit_talent_"..heroCfgId.."Csv"][curStage]
 	if not curData then return 1 end
 	local oldSkillLv = hero:getSkillLevel(1)
@@ -174,13 +176,16 @@ function _M.talentRpc(agent, data)
  
 	hero:updateProperty({field = "talent", value = talent})
  
+
 	role:log("hero_talent", {
 		hero_id = hero:getProperty("type"), --英雄ID
-		hero_talent_id = curStage, --天赋ID
-		hero_talent_cost = cost, -- 英雄天赋升级消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
-		hero_talent_levelbef = oldSkillLv, -- 英雄技能升级前等级
-		hero_talent_level = hero:getSkillLevel(1), -- 英雄技能升级后等级
+		hero_talent_stagebef = oldStage, --英雄精进升级前停留阶段
+		hero_talent_stage = curStage, --英雄精进升级后停留阶段
+		hero_talent_cost = cost, --英雄精进升级消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,….}
+		hero_talent_subid = curData[oldLevel].effect, --升级属性ID，生命、攻击、防御、命中、闪避分别对应（0，1，2，3，4）
+		hero_talent_sublevel = curData[oldLevel].level, --升级属性等级，如生命升级从1到2，则记录2
 	})
+
 	hero:mylog({desc = "talent", int1 = talent:getv(0, 1), int2 = talent:getv(1, 1)})
  
 	SendPacket(actionCodes.Hero_talentRpc, '')
@@ -447,7 +452,6 @@ function _M.referEquipsRpc(agent, data)
 		end
 	end
  
-	local oldAttr = hero:getTotalAttrs()
 	local oldBattleV = hero:getProperty("battleV")
 	local wear = {}
  
@@ -477,16 +481,14 @@ function _M.referEquipsRpc(agent, data)
 	-- 更新角色
 	hero:updateProperty({field = "equip", value = curEquip})
  
-	local curAttr = hero:getTotalAttrs()
-	local attrChange = getChangeAttrJson(oldAttr, curAttr)
 	for typ, data in pairs(wear) do
 		role:log("equip_wear", {
 			hero_id = hero:getProperty("type"), --英雄ID
 			equip_id = data.id, --装备ID
 			equip_wear_action = data.act, --装备操作类型：装备：0，卸载：1
 			equip_wear_part = typ, --装备部位，记录部位ID
-			equip_wear_result = curAttr, --装备操作后结果，记录属性变化，json格式记录，{“aa”:1234,"bb":4567}
-			equip_wear_change = attrChange, --装备操作变化值，记录属性变化，记录正负值，json格式记录，{“aa”:1234,"bb":-45}
+			equip_wear_scorebef = oldBattleV,	--装备前英雄评分
+			equip_wear_score = hero:getProperty("battleV"), --装备后英雄评分
 			equip_wear_mode = isAuto and 0 or 1, --用以区分自动装备还是手动装备，自动记录为0，手动记录为1
 		})
 	end
@@ -712,6 +714,7 @@ end
 function _M.drawHeroRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
+	local actid = msg.actid
  
 	if not role:isFuncUnlock(FuncUnlock.GetHero) then return 1 end
 	local btype = msg.pool	-- 1 2 3 4 5	卡池类型  4新手卡池 5心愿卡池
@@ -721,14 +724,38 @@ function _M.drawHeroRpc(agent, data)
 		subType = 1
 		if btype == 4 and role:getProperty("newerDraw") >= 10 then
 			subType = 2
+			if(role:getProperty("newerDraw") >= 30) then
+				return 30
+			end
 		end
 	end
  
+	-- 另开活动卡池
+	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
+
 	if btype == 1 then
 		-- 判断定向卡池活动开启
 		if not role.activity:isOpen("RaceDraw") then
 			return
 		end
+	elseif btype == 2 then
+		if role:getProperty("newerGuide") ~= "8=1" then
+			-- 判断普通卡池
+			if role.activity:isOpen("WishHeroPool") then
+				return
+			end
+		end
+	elseif btype == 5 then
+		-- 判断心愿单卡池
+		if not role.activity:isOpen("WishHeroPool") then
+			return
+		end
 	end
  
 	local buildTypeData = csvdb["build_typeCsv"][btype]
@@ -945,16 +972,21 @@ function _M.drawHeroRpc(agent, data)
 		gacha_up = 0, -- 卡池UP角色
 		gacha_times = drawCount[drawType], -- 抽卡次数
 		gacha_reward = logReward, -- 抽卡结果，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
-		currency = cost, -- 购买道具消耗的货币
+		gacha_cost = cost, -- 购买道具消耗的货币
 		gacha_cnt = floorHeroCount,
 	})
 	SendPacket(actionCodes.Hero_drawHeroRpc, MsgPack.pack({reward = reward})) -- 这个 reward 是数组
  
-	if btype == 1 or btype == 2 then
+	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(oldVal, newVal)
+		local drawCardReward, val = role:getDrawCardExtraReward(feedbackId, oldVal, newVal)
 		-- 空字符穿代表直接给英雄  走以前repayHeroRpc
 		if drawCardReward == "" then
 			local repayHeroMaxCount = role:getProperty("repayMaxC") or 0
@@ -964,11 +996,11 @@ function _M.drawHeroRpc(agent, data)
 			local even = repayHeroMaxCount % 2
 			local id = 0
 			if even == 1 then
-				id = math.randWeight(csvdb["build_giftCsv"], "pool_1")
+				id = math.randWeight(csvdb["build_giftCsv"], "pool_"..feedbackId)
 			else
 				local giftHeroSet = {}
 				for gid, cfg in pairs(csvdb["build_giftCsv"]) do
-					if cfg["pool_1"] ~= 0 and not role:isHaveHero(gid - ItemStartId.Hero) then
+					if cfg["pool_"..feedbackId] ~= 0 and not role:isHaveHero(gid - ItemStartId.Hero) then
 						giftHeroSet[gid] = {1}
 					end
 				end
@@ -977,7 +1009,7 @@ function _M.drawHeroRpc(agent, data)
 				end
 			end
 			if id == 0 then
-				id = math.randWeight(csvdb["build_giftCsv"], "pool_1")
+				id = math.randWeight(csvdb["build_giftCsv"], "pool_"..feedbackId)
 			end
  
 			local r,change = {}
@@ -997,7 +1029,13 @@ function _M.drawHeroRpc(agent, data)
 			r, change = role:award(drawCardReward, {log = {desc = "drawHeroExtraReward", int1 = oldVal, int2 = newVal}})
 			SendPacket(actionCodes.Hero_drawHeroExtraRewardNtf, MsgPack.pack(role:packReward(r, change)))
 		end
-		role:updateProperty({field = "repayHero", value = val})
+		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 true
 end
@@ -187,6 +187,9 @@ function _M.online(query)
 	return count
 end
  
+function _M.dbqlen(query)
+	return skynet.call(redisd, "debug", "INFO")
+end
  
 function _M.account_init(query, body)
 	if not query.id  or not body or body == "" then return "指令不存在" end
@@ -135,7 +135,7 @@ local function getMatchInfo(role, pvpList, battleCache, dbKey, infoFuncName, inf
 				if k == "battleInfo" then
 					battleCache[curInfo.roleId] = v
 				else
-					if (k == "heros" or k == "battleV") and infoCache then
+					if (k == "team" or k == "battleV") and infoCache then
 						infoCache[curInfo.roleId] = infoCache[curInfo.roleId] or {}
 						infoCache[curInfo.roleId][k] = v
 					end
@@ -705,12 +705,12 @@ function _M.endBattleHRpc(agent, data)
 		info.winId = info.isWin and roleId or match.id
 		info.isWin = nil
 		selfTeam[_idx] = {
-			heros = role:getTeamHerosInfo(_pvpStartBattleCacheH.pvpTH[_idx].heros),
+			team = role:getTeamHerosInfo(_pvpStartBattleCacheH.pvpTH[_idx]),
 			battleV = role:getTeamBattleValue(_pvpStartBattleCacheH.pvpTH[_idx].heros)
 		}
 		if match.t == 1 and _pvpStartBattleCacheH.enemyT then
 			enemyTeam[_idx] = {
-				heros = _pvpStartBattleCacheH.enemyT["heros"][_idx],
+				team = _pvpStartBattleCacheH.enemyT["team"][_idx],
 				battleV = _pvpStartBattleCacheH.enemyT["battleV"][_idx]
 			}
 		end
@@ -101,7 +101,26 @@ function _M.startQuestRpc(agent, data)
     radioTask[id] = taskData
     role:updateProperty({field="radioTask", value=radioTask, notNotify=true})
  
-	SendPacket(actionCodes.Radio_startQuestRpc, MsgPack.pack({id=id, task=taskData}))
+    SendPacket(actionCodes.Radio_startQuestRpc, MsgPack.pack({id=id, task=taskData}))
+
+    local herolist = {}
+    for _, heroId in ipairs(heros) do
+        local hero = role.heros[heroId]
+        if hero then
+            table.insert(herolist, hero:getProperty("type"))
+        end
+    end
+
+	--  讨伐行动 
+	role:log("punitive_action", {
+		mission_id	= id, --关卡ID
+		mission_herolist = herolist, -- 英雄ID，排序以玩家出战设置为准，示例：[111, 222, 333, 444, 555]
+		mission_success_rate = 0, -- 大成功几率
+		mission_reward = {}, -- 获得奖励，建议使用json格式记录。示例：{ itemid1: 1,  itemid2: 3,  itemid3: 5}
+		mission_result = 0, -- 战斗结果(0-无效，1-胜利，2-失败)
+        mission_roundtime = 0, -- 完成耗时（秒）
+        mission_cleartype = 1,  -- 1-开始; 2-完成(领取奖励时）
+	})
 	return true
 end
  
@@ -158,7 +177,28 @@ function _M.finishQuestRpc(agent, data)
     msg["big"] = bigSuccess
     msg["id"] = id
     msg["heroFaith"] = heroFaithMap
-	SendPacket(actionCodes.Radio_finishQuestRpc, MsgPack.pack(msg))
+    SendPacket(actionCodes.Radio_finishQuestRpc, MsgPack.pack(msg))
+    
+
+    local herolist = {}
+    for _, heroId in ipairs(task.heros) do
+        local hero = role.heros[heroId]
+        if hero then
+            table.insert(herolist, hero:getProperty("type"))
+        end
+    end
+
+	--  讨伐行动 
+	role:log("punitive_action", {
+		mission_id	= id, --关卡ID
+		mission_herolist = herolist, -- 英雄ID，排序以玩家出战设置为准，示例：[111, 222, 333, 444, 555]
+		mission_success_rate = totalCoef, -- 大成功几率
+		mission_reward = r, -- 获得奖励，建议使用json格式记录。示例：{ itemid1: 1,  itemid2: 3,  itemid3: 5}
+		mission_result = 1, -- 战斗结果(0-无效，1-胜利，2-失败)
+        mission_roundtime = config.time, -- 完成耗时（秒）
+        mission_cleartype = 2,  -- 1-开始; 2-完成(领取奖励时）
+	})
+
 	return true
 end
  
@@ -300,6 +300,7 @@ function _M.loginRpc( agent, data )
 	if msg.newdevice then
 		role:mylog("newdevice", {key1 = agent.ip:toArray(false, ":")[1]})
 	end
+
 	return true
 end
  
@@ -372,6 +373,38 @@ function _M.createRpc(agent, data)
 	end
  
 	SendPacket(actionCodes.Role_createRpc, MsgPack.pack(response))
+
+	-- cb付费返利
+	skynet.timeout(0, function()
+		local cbbackd = cluster.query("center", "cbbackd")
+		local uid = newRole:getProperty("uid")
+		local start = uid:find("_")
+		if start then
+			uid = uid:sub(start + 1)
+		end
+		if cbbackd then
+			local status, back = pcall(cluster.call, "center", cbbackd, "getCbBack", {uid = uid, id = roleId})
+			if status then
+				if back and next(back) and back.reward and next(back.reward) then
+					local reward = ""
+					for itemId, count in pairs(back.reward) do
+						reward = reward:setv(itemId, count)
+					end
+					if back.reward[70] then
+						redisproxy:insertEmail({roleId = roleId, emailId = MailId.CBBackAward2, contentPms = {back.money}, createtime = skynet.timex(), attachments = reward})
+					else
+						redisproxy:insertEmail({roleId = roleId, emailId = MailId.CBBackAward, contentPms = {back.money}, createtime = skynet.timex(), attachments = reward})
+					end
+					newRole:mylog("cbback", {key1 = uid, int2 = roleId})
+				end
+			else
+				skynet.error("[ERROR] cbbackd cant call center uid: " .. uid .. " roleId:" .. roleId)
+			end
+		else
+			skynet.error("[ERROR] cbbackd cant call center uid: " .. uid .. " roleId:" .. roleId)
+		end
+	end)
+	
 	return true
 end
  
@@ -537,82 +570,132 @@ function _M.openTimeBoxRpc(agent, data)
 	local slot = msg.slot  -- 位置 1 - 6
  
 	-- 特权卡时间箱额外栏位
-	local privExtraCnt = role.storeData:getTimeBoxSlotExtraCount()
-	if oper == 1 then
-		if math.illegalNum(slot, 1, role:getFuncLv(FuncOpenType.TimeBoxSlot) + privExtraCnt) then return end
-	end
+	-- local privExtraCnt = role.storeData:getTimeBoxSlotExtraCount()
+	-- if oper == 1 then
+	-- 	if math.illegalNum(slot, 1, role:getFuncLv(FuncOpenType.TimeBoxSlot) + privExtraCnt) then return end
+	-- end
  
 	local boxL = role:getProperty("boxL")
-	local reward, change = {}
-	if oper == 1 then	-- 打开
+	local reward, change
+	if oper == 1 then -- 构建开始(包括切换构建的id)
 		local itemId = msg.itemId
-		if role:getItemCount(itemId) < 1 then return end
 		local itemData = csvdb["itemCsv"][itemId]
-		local randomData = csvdb["item_randomCsv"][itemId]
-		if not itemData or not randomData or randomData.openTime <= 0 then return end
-
-		if boxL[slot] then return end
-		role:costItems({[itemId] = 1}, {log = {desc = "openTimeBox"}})
-		boxL[slot] = {id = itemId, time = skynet.timex() + randomData.openTime}
-		role:pushMsg({type = "box", slot = slot, time = randomData.openTime})
-	elseif oper == 2 then -- 领取
+		if not itemData then return 1 end
+		if not boxL[slot] then
+			boxL[slot] = {}
+		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)
+			if doneCnt > 0 then
+				reward = role:award({[oldId] = doneCnt}, {log = {desc = "openTimeBox", int1 = slot}})
+			end
+		end
+		local limit = globalCsv.box_key_max[itemId] or 5
+		if role:getItemCount(itemId) >= limit then return 3 end
+
+		boxL[slot] = {id = itemId, process = 0, time = skynet.timex()}
+		role:pushMsg({type = "box", slot = slot, time = skynet.timex() + globalCsv.box_productLine_time * 3600})
+	elseif oper == 2 then -- 重置运行时间（可以使用加速）
 		local quick = msg.quick
-		if not boxL[slot] then return end
-		local costKey = 0
-		if boxL[slot].time > skynet.timex() then -- 没开完
-			if not quick then return end
+		if not boxL[slot] then return 4 end
+
+		local itemId, process, time = boxL[slot].id, boxL[slot].process, boxL[slot].time
+		local nowTime = skynet.timex()
+		local stopTime = nowTime
+		local itemData = csvdb["itemCsv"][itemId]
+		local unitTime = globalCsv.box_key_time[itemId] * 60
+		if quick then
+			stopTime = time + globalCsv.box_productLine_time * 3600
 			local cost_pre = globalCsv.box_timeOpen_diamond:toArray(true, "=")
-			costKey = math.ceil((boxL[slot].time - skynet.timex()) / (cost_pre[1] * 60)) * cost_pre[2]
-			if not role:checkItemEnough({[ItemId.BoxKey] = costKey}) then return end
-			role:costItems({[ItemId.BoxKey] = costKey}, {log = {desc = "openTimeBox"}})
-			role:pushCancel({type = "box", slot = slot})
+			local costKey = math.ceil((stopTime - nowTime) / (cost_pre[1] * 60)) * cost_pre[2]
+			if not role:checkItemEnough({[ItemId.Diamond] = costKey}) then return 5 end
+			role:costItems({[ItemId.Diamond] = costKey}, {log = {desc = "openTimeBox", int1 = slot}})
+		else
+			stopTime = math.min(nowTime,time + globalCsv.box_productLine_time * 3600)
+		end
+		role:pushCancel({type = "box", slot = slot})
+
+		local doneCnt = math.floor((process + stopTime - time) / unitTime)
+		if doneCnt > 0 then
+			reward = role:award({[itemId] = doneCnt}, {log = {desc = "openTimeBox", int1 = slot}})
+		end
+		if role:getItemCount(itemId) >= globalCsv.box_key_max[itemId] then
+			nowTime = 0
+		end
+
+		boxL[slot] = {id = itemId, process = (process + stopTime - time) % unitTime, time = nowTime}
+		role:pushMsg({type = "box", slot = slot, time = nowTime + globalCsv.box_productLine_time * 3600})
+	elseif oper == 3 then -- 开箱子
+		local costId = msg.costId
+		local costs = (msg.costs or ""):toNumMap()
+		if not costId or not csvdb["itemCsv"][costId] or not next(costs) then return 6 end
+		
+		local costIdData = csvdb["itemCsv"][costId]
+		local count = 0
+		for itemId, num in pairs(costs) do
+			local itemIdData = csvdb["itemCsv"][itemId]
+			if not itemIdData or not csvdb["item_randomCsv"][itemId] or costIdData.quality ~= itemIdData.quality then return 7 end
+			count = count + num
 		end
-		local boxId = boxL[slot].id
-		local itemData = csvdb["itemCsv"][boxId]
-		local randomData = csvdb["item_randomCsv"][itemData.id]
-		local costTime = skynet.timex() - (boxL[slot].time - randomData.openTime)
-		-- 随机奖励
+
+		if role:getItemCount(costId) < count then return 8 end
+		if not role:checkItemEnough(costs) then return 9 end
+
+		role:costItems({[costId] = count}, {log = {desc = "openTimeBox"}})
+
 		reward = {}
-		for i = 1, 10 do
-			local num = randomData["num" .. i] 
-			local gift = randomData["gift" .. i]
-			if num and gift and num > 0 and gift ~= "" then
-				local pool = {}
-				for _, temp in ipairs(gift:toArray()) do
-					local set = temp:toArray(true, "=")
-					table.insert(pool, set)
+		for itemId, value in pairs(costs) do
+			local tempReward = {}
+			local randomData = csvdb["item_randomCsv"][itemId]
+			local itemData = csvdb["itemCsv"][itemId]
+			role:costItems({[itemId] = value}, {log = {desc = "openTimeBox"}})
+			for _ = 1, value do
+				for i = 1, 10 do
+					local num = randomData["num" .. i] 
+					local gift = randomData["gift" .. i]
+					if num and gift and num > 0 and gift ~= "" then
+						local pool = {}
+						for _, temp in ipairs(gift:toArray()) do
+							local set = temp:toArray(true, "=")
+							table.insert(pool, set)
+						end
+
+						local needCount = math.min(#pool, num)
+						for j = 1, needCount do
+							local idx = math.randWeight(pool, 3)
+							tempReward[pool[idx][1]] = (tempReward[pool[idx][1]] or 0) + pool[idx][2]
+							table.remove(pool, idx)
+						end
+					end
 				end
+			end
+			tempReward[0] = nil
+			role:checkTaskEnter("OpenBox", {id = itemId, count=value, quality=itemData.quality})
+			role:log("carriage_dismantle", {
+				item_id = itemId, -- 道具id
+				item_type = itemData.type, -- 道具类型，具体见枚举表中道具类型枚举表
+				item_level = 0, -- 道具等级
+				item_number = 1, -- 道具变化数量的绝对值
+				carriage_dismantle_type = 1, -- 拆解方式，时间到期:0，钥匙开启:1
+				carriage_dismantle_time = 0, -- 拆解耗时，填写实际耗时
+				carriage_dismantle_cost = value, -- 拆解花费钥匙数量，未使用填写0
+				carriage_dismantle_rwd = tempReward, -- 拆解获得物资，json格式记录，{'itemid1':2,'itemid2':3,…………..}
+			})
  
-				local needCount = math.min(#pool, num)
-				for j = 1, needCount do
-					local idx = math.randWeight(pool, 3)
-					reward[pool[idx][1]] = (reward[pool[idx][1]] or 0) + pool[idx][2]
-					table.remove(pool, idx)
-				end
+			for id, num in pairs(tempReward) do
+				reward[id] = (reward[id] or 0) + num
 			end
 		end
-		reward[0] = nil
-
-		boxL[slot] = nil
-		reward, change = role:award(reward, {log = {desc = "openTimeBox", int1 = boxId}})
-		role:checkTaskEnter("OpenBox", {id = boxId, count=1, quality=itemData.quality})
-
-		role:log("carriage_dismantle", {
-			item_id = boxId, -- 道具id
-			item_type = itemData.type, -- 道具类型，具体见枚举表中道具类型枚举表
-			item_level = 0, -- 道具等级
-			item_number = 1, -- 道具变化数量的绝对值
-			carriage_dismantle_type = quick and 1 or 0, -- 拆解方式，时间到期:0，钥匙开启:1
-			carriage_dismantle_time = costTime, -- 拆解耗时，填写实际耗时
-			carriage_dismantle_cost = costKey, -- 拆解花费钥匙数量，未使用填写0
-			carriage_dismantle_rwd = reward, -- 拆解获得物资，json格式记录，{'itemid1':2,'itemid2':3,…………..}
-		})
+		reward, change = role:award(reward, {log = {desc = "openTimeBox", int1 = costId}})
 	else
 		return
 	end
  
-	role:setProperty("boxL") --刷新
-	role:changeUpdates({{type = "boxL", field = slot, value = boxL[slot], isOnlyToC = true}}) -- 通知客户端
+	role:setProperty("boxL",boxL) --刷新
+	if slot then
+		role:changeUpdates({{type = "boxL", field = slot, value = boxL[slot], isOnlyToC = true}}) -- 通知客户端
+	end
 	SendPacket(actionCodes.Role_openTimeBoxRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -724,11 +807,12 @@ function _M.unLockStoryBookRpc(agent, data)
 	local storyStatus = role:getProperty("storyB")
 	if storyStatus[storyId] and storyStatus[storyId].s then return end  --不需要解锁
  
-	local cost = storyBookData.lockItem:toNumMap()
-	if not cost or not next(cost) then return end
-	if not role:checkItemEnough(cost) then return end  -- 消耗品不足
-
-	role:costItems(cost, {log = {desc = "unlockStory", int1 = storyId}})
+	if storyBookData.lockItem ~= "free" then
+		local cost = storyBookData.lockItem:toNumMap()
+		if not cost or not next(cost) then return end
+		if not role:checkItemEnough(cost) then return end  -- 消耗品不足
+		role:costItems(cost, {log = {desc = "unlockStory", int1 = storyId}})
+	end
  
 	-- 解锁
 	storyStatus[storyId] = storyStatus[storyId] or {}
@@ -807,6 +891,12 @@ function _M.taskActiveRpc(agent, data)
 		{ type = roleField[taskType], field = {"at", taskId}, value = -1 }
 	})
  
+	role:log("task_reward", {
+		task_reward_id = taskId * 100 + taskType, --任务奖励ID
+		task_reward_type = 3, --任务奖励类型，见 任务奖励类型枚举表
+		task_reward_detail = reward, --任务奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
+	})
+
 	SendPacket(actionCodes.Role_taskActiveRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -13,6 +13,9 @@ function _M.rechargeRpc(agent , data)
  
 	--创建订单号
 	local partnerOrderId = role:getPurchaseOrder(id)
+	if partnerOrderId == "" then
+		return 1
+	end
 	SendPacket(actionCodes.Store_rechargeRpc, MsgPack.pack({ order = partnerOrderId }))
  
 	if true then return end
@@ -149,25 +149,15 @@ function Adv:initByChapter(params)
 	self.maps = {}
 	self.maps[1] = AdvMap.new(self, 1, mapId, isEnter, isNewRelay)
  
-	self:initBattle(nil)
+	self:initBattle(nil, isToNext)
  
 	self:initLayerTask()
  
-	-- 支援效果生效一些
-	self:activeSomeSupport()
+
  
 	self:checkTask(Adv.TaskType.Arrive)
 	self:checkAdvUnlock(1, self.level)
  
-	if isToNext then
-		self.battle.player:afterLayer() -- 玩家的buff 清理一下
-	end
-
-	-- 不是中继层  加上 层 和 地图的buff和被动
-	if not self.isRelay then
-		self.battle:initMapEffect()
-	end
-
 	-- 中继进入奖励
 	if relayData and isEnter then
 		self:awardRelay(relayData, notNotify)
@@ -456,8 +446,20 @@ function Adv:clearAdvUnlockCache()
 	self.cacheUnlock = {}
 end
  
-function Adv:initBattle(info)
+function Adv:initBattle(info, isToNext)
 	self.battle = require("adv.AdvBattle").new(self)
+	-- 支援效果生效一些
+	self:activeSomeSupport()
+	
+	-- 不是中继层  加上 层 和 地图的buff和被动
+	if not self.isRelay then
+		self.battle:initMapEffect()
+	end
+
+	if isToNext then
+		self.battle.player:afterLayer() -- 玩家的buff 清理一下
+	end
+
 	for _, passiveC in ipairs(self.cachePassiveEvent or {}) do
 		self.battle:triggerPassive(passiveC[1], passiveC[2])
 	end
@@ -468,7 +470,7 @@ function Adv:initBattle(info)
 		map:initBattleAfter()
 	end
 	--下层
-	if not info and self.level ~= 1 then
+	if not info and isToNext then
 		self.battle.player:attrChangeCondBuffCheck(1)
 	end
  
@@ -820,7 +822,7 @@ function Adv:over(success, rewardRatio, overType)
 				lv = self.owner:getProperty("level"),
 				batteV = self.owner:getTeamBattleValue(team.heros),
 				chapter = self.chapterId,
-				format = self.owner:getTeamHerosInfo(team.heros),
+				format = self.owner:getTeamHerosInfo(team).heros,
 			}
 			redisproxy:pipelining(function (red)
 				red:zadd(self.owner:getAdvRankKey(), score, roleId)	--更新分数
@@ -1094,10 +1096,10 @@ local function clickOut(self, room, block, params, isExit)
 		end
  
 		if #self.mapStack > 1 then -- 处于夹层中
+			self:backLayer(-1)
 			local oldMapIdx = self:getCurMapIdx()
 			table.remove(self.mapStack) --退出夹层
 			self.battle:iLayerChange(oldMapIdx)
-			self:backLayer(-1)
 		else --处于底层
  
 			local advPass = self.owner:getProperty("advPass")
@@ -1129,8 +1131,8 @@ local function clickOut(self, room, block, params, isExit)
 				if curFloorData then
 					self:award({[ItemId.AdvPoint] = curFloorData.exp}, {log = {desc = "passReward", int1 = self.chapterId, int2 = self.level}}, {})
 				end
+				self:backNext() --下一关
 				local isHaveRelay = self:isHaveRelay(self.level)
-
 				if isHaveRelay and not self.isRelay then 
 					self:initByChapter({
 						chapterId = self.chapterId, 
@@ -1148,7 +1150,6 @@ local function clickOut(self, room, block, params, isExit)
 						notNotify = true,
 					})
 				end
-				self:backNext() --下一关
 			end
  
 		end
@@ -1554,6 +1555,7 @@ local function clickBuild(self, room, block, params)
 		end
 		advMine[2].co = mineCo2
 		self.owner:setProperty("advMine", advMine)
+		self.owner:checkTaskEnter("AdvMineLayer")
 	end
  
 	self:checkTask(Adv.TaskType.Build, 1, oldId)
@@ -1604,6 +1606,7 @@ end
  
 local function clickLayer(self, room, block, params)
 	local oldMapIdx = self:getCurMapIdx()
+	self:backLayer(1)
 	if block.event.mapIdx then
 		table.insert(self.mapStack, block.event.mapIdx) --进入夹层
 	else
@@ -1620,7 +1623,6 @@ local function clickLayer(self, room, block, params)
 		self:checkAchievement(Adv.AchievType.EnterILayer, 1, mapId)
 	end
 	self.battle:iLayerChange(oldMapIdx)
-	self:backLayer(1)
 	return true
 end
  
@@ -2051,6 +2053,7 @@ function Adv:enemyDead(enemy, escape)
 				advMine[2].co = mineCo2
 				advMine[2].ch = mineCh
 				self.owner:setProperty("advMine", advMine)
+				self.owner:checkTaskEnter("AdvMineKill")
 			else
 				local toClick = enemy:hadBuff(Buff.CHANGE_DROP_TO_CLICK)
 				if toClick then
@@ -35,7 +35,7 @@ Buff.Buff_NO_PASSIVE_MONSTER = 31 -- 地图被动刷新不出来怪物
 Buff.SNEAK = 32 --潜行
 Buff.DROP_BUFF_BY_ENEMY = 33 -- 怪物掉落加成  -- 怪物使用
 Buff.GET_PASSIVE = 34 -- 获得 passive -- 结束失效
-Buff.OBSTACLE_CHANGE = 35 -- 看守类型改变  -- 怪物使用  0 - 1
+Buff.OBSTACLE_CHANGE = 35 -- 看守类型改变  -- 怪物使用  2 - 1
 Buff.DISABLE_AURA = 36 -- 禁用光环
 Buff.GET_AURA = 37 -- 获得光环
  
@@ -9,6 +9,7 @@ Filter.BUFF_BY_ID = 6 -- 指定id的buff
 Filter.CAMP = 7 -- 玩家是指定阵营
 Filter.RANGE = 8 -- 筛选范围 （触发是地块）
 Filter.CLASSIFY = 9 -- 标签
+Filter.NO_BUFF_BY_ID = 10 -- 没有指定id的buff
  
 local FilterFactory = {}
 FilterFactory[Filter.HP_UP_WITH_EQUAL] = function (_Filter)
@@ -47,7 +48,6 @@ FilterFactory[Filter.CAMP] = function (_Filter)
 		return role:getHerosCamp(role:getProperty("advTeam").heros) == self.value
 	end
 end
-
 FilterFactory[Filter.RANGE] = function (_Filter)
 	_Filter._execute = function (self, target, params)
 		if params and self.owner.blockId and self.owner.roomId  and params.blockId and params.roomId then
@@ -57,13 +57,18 @@ FilterFactory[Filter.RANGE] = function (_Filter)
 		return false
 	end
 end
-
 FilterFactory[Filter.CLASSIFY] = function (_Filter)
 	_Filter._execute = function (self, target)
 		return target.isClassify and target:isClassify(self.value)
 	end
 end
  
+FilterFactory[Filter.NO_BUFF_BY_ID] = function (_Filter)
+	_Filter._execute = function (self, target)
+		return not target:hadBuffById(self.value)
+	end
+end
+
 function Filter:ctor(params)
 	self.owner = params.owner
 	self.skill = params.skill
@@ -87,6 +92,9 @@ function Filter:getTarget(params)
 	if self.oType == 2 and params.releaser then
 		target = params.releaser
 	end
+	if self.oType == 3 then
+		target = self.owner.battle.player
+	end
 	return target
 end
  
@@ -662,7 +662,7 @@ end
  
 function Enemy:getObstacle()
 	local obstacle = csvdb["event_monsterCsv"][self.monsterId].obstacle
-	if obstacle == 0 and self:hadBuff(Buff.OBSTACLE_CHANGE) then
+	if obstacle == 2 and self:hadBuff(Buff.OBSTACLE_CHANGE) then
 		obstacle = 1
 	end
 	return obstacle
@@ -15,6 +15,7 @@ redisproxy = require &quot;shared.redisproxy&quot;
 datacenter = require "skynet.datacenter"
 mcast_util = require "services/mcast_util"
 csvdb = require "shared.csvdata"
+cluster = require "skynet.cluster"
  
 local CMD = {}
 local agentInfo = {}  -- { client_fd, role, gate_serv, open_timer}
@@ -364,11 +365,6 @@ skynet.start(function()
 		return info
 	end)
  
-	redisd = skynet.localname(".redis")
-	if tonumber(skynet.getenv "logd") == 1 then
-		logd = skynet.localname(".log")
-	end
-
 	cs = queue()
  
 	pvpd = skynet.localname(".pvpcross")
-Subproject commit f019454e533ec12642ab9d7518c80b73c1cc00bb
+Subproject commit ccdf6fcc82fd0a38d1b00bc199baadfd81ec3ab1
@@ -2,24 +2,41 @@ local skynet = require &quot;skynet&quot;
  
 local max_client = tonumber(skynet.getenv("max_client"))
 local max_queue = tonumber(skynet.getenv("max_queue"))
+local work_count = tonumber(skynet.getenv("thread"))
+local use_logd = tonumber(skynet.getenv("logd"))
  
 skynet.start(function()
 	print("Server start")
 	skynet.newservice("debug_console", tonumber(skynet.getenv("debug_port")))
  
  
+	-- 启动redis
+	for i = 1, work_count do
+		local redisd = skynet.newservice("services/redisd", i)
+		skynet.call(redisd, "lua", "open", {
+			redishost = skynet.getenv("redis_host"),
+			redisport = tonumber(skynet.getenv("redis_port")),
+			redisdb = tonumber(skynet.getenv("redis_db")),
+			auth = skynet.getenv("redis_auth")
+		})
+	end
+
+	--启动log
+	if use_logd == 1 then
+		for i = 1, work_count * 2 do
+			local logd = skynet.newservice("services/logd", i)
+			skynet.call(logd, "lua", "open")
+		end
+	end
+
 	local httpd = skynet.newservice("services/httpweb", tonumber(skynet.getenv("httpweb_port")))
 	local watchdog = skynet.newservice("services/watchdog", max_client)
  
+
 	skynet.call(watchdog, "lua", "start", {
 		port = tonumber(skynet.getenv("server_port")),
 		maxclient = max_client + max_queue + 10,
 		httpd = httpd,
-
-		redishost = skynet.getenv("redis_host"),
-		redisport = tonumber(skynet.getenv("redis_port")),
-		redisdb = tonumber(skynet.getenv("redis_db")),
-		auth = skynet.getenv("redis_auth"),
 	})
  
 	skynet.exit()
@@ -24,8 +24,13 @@ Activity.ActivityType = {
 	Exchange = 18,	-- 兑换活动
 	HangDrop = 19,	-- 挂机掉落活动
 	Gachakon = 20,	-- 扭蛋活动
-}
  
+	WishHeroPool = 23, 	-- 心愿卡池
+	ActHeroPool = 24, -- 活动卡池
+	ActShopGoods = 25, 	-- 活动商品
+
+	Crisis = 26, -- 宝藏怪活动
+}
  
 local function checkActivityType(activityType)
 	if type(activityType) == "string" then
@@ -41,12 +46,19 @@ function Activity:ctor(properties)
 	self._isOpen = {}
 end
  
+function Activity:getType(actType)
+	if type(actType) == "string" then
+		actType = Activity.ActivityType[actType]
+	end
+	return actType or 0
+end
+
  
 Activity.schema = {
 	actime 		= {"table", {}},  -- 最近检查某项活动的开始时间  {id = time}
 	round		= {"table", {}},  -- 记录活动到了第几轮  {id = roundnum}
 	act4		= {"table", {}},  -- {0 = day, 1= -1, 2 = -1} == 签到活动
-	act6		= {"table", {}},  -- {1 = 1, 2 = 1} == 付费签到活动
+	act6		= {"table", {}},  -- {0 = day, 1 = 1, 2 = 1} == 付费签到活动
 	act8		= {"number", 0},  -- 充值返利 
  
 	act11		= {"table", {}},  -- {0 = 贩卖数量, 1=1, 2=1}  贩卖周活动  1表示领取过该档位的奖励
@@ -58,6 +70,9 @@ Activity.schema = {
 	act18		= {"table", {}, true},	  -- {id=兑换数量}
 	act19		= {"number", 0},	  -- {挂机信息}
 	act20		= {"table", {}},	  -- {id=扭蛋抽出数量}
+
+	act24		= {"table", {}, true},	-- 活动卡池 {id=repaynum}
+	act26 		= {"table", {}},	-- {task = {id = count}, socre = {id = status}}
 }
  
 function Activity:data()
@@ -76,6 +91,7 @@ function Activity:data()
 		act18 = self:getProperty("act18"),
 		act19 = self:getProperty("act19"),
 		act20 = self:getProperty("act20"),
+		act26 = self:getProperty("act26"),
 	}
 end
  
@@ -153,7 +169,12 @@ function Activity:isOpen(activityType)
 	return false
 end
  
-function Activity:isOpenById(id)
+function Activity:isOpenById(id, activityType)
+	activityType = checkActivityType(activityType)
+	local cfg = csvdb["activity_ctrlCsv"][id]
+	if not cfg then return false end
+	if activityType ~= 0 and cfg.showType ~= activityType then return false end
+
 	return self._isOpen[id]
 end
  
@@ -365,6 +386,11 @@ activityFunc[Activity.ActivityType.PaySignIn] = {
 	["init"] = function(self, actType, isCrossDay, notify)
 		self:updateActData(actType, {}, not notify)
 	end,
+	["crossDay"] = function(self, actType, notify)
+		local curData = self:getActData(actType)
+		curData[0] = (curData[0] or 0) + 1
+		self:updateActData(actType, curData, not notify)
+	end,
 	["close"] = function(self, actType, notify)
 		self.owner.storeData:SetActGoodsFlag("paySignIn", 0)
  
@@ -473,6 +499,19 @@ activityFunc[Activity.ActivityType.Gachakon] = {
 	end,
 }
  
+-- 活动卡池
+activityFunc[Activity.ActivityType.ActHeroPool] = {
+	["init"] = function(self, actType, isCrossDay, notify, actId)
+	end,
+	["close"] = function(self, actType, notify, actId)
+		local actData = self:getActData(actType)
+		local cfg = csvdb["activity_ctrlCsv"][actId]
+		if not cfg then return end
+		actData[cfg.condition] = nil
+		self:updateActData(actType, actData, not notify)
+	end,
+}
+
 -- 挂机掉落
 activityFunc[Activity.ActivityType.HangDrop] = {
 	["init"] = function(self, actType, isCrossDay, notify, actId)
@@ -524,7 +563,9 @@ function Activity:closeActivity(actId, notify, notUpdateAct)
 		self:recycleActItem(actId)
 	end
 	if Activity.schema["act".. actType] then
-		self:updateActData(actType, Activity.schema["act" .. actType][2], not notify or notUpdateAct)
+		if not Activity.schema["act" .. actType][3] then 
+			self:updateActData(actType, Activity.schema["act" .. actType][2], not notify or notUpdateAct)
+		end
 	end
 end
  
@@ -689,5 +730,60 @@ function Activity:getBattleTicket(actId)
 	end
 end
  
+activityFunc[Activity.ActivityType.ActShopGoods] = {
+	["init"] = function(self, actType, isCrossDay, notify, actId)
+	end,
+	["close"] = function(self, actType, notify)
+		local rechargeRecord = self.owner.storeData:getProperty("payR")
+		for id, cfg in pairs(csvdb["shop_rechargeCsv"]) do
+			if cfg.shop == 3 and cfg.type == ShopPackType.ActShopPack then
+				rechargeRecord[id] = nil
+			end
+		end
+		self.owner.storeData:updateProperty({field="payR", value=rechargeRecord})
+	end,
+}
+
+
+
+activityFunc[Activity.ActivityType.Crisis] = {
+	["check"] = function(self, actType, notify, atype, count) -- 检查
+		count = count or 1
+		local isOpen, actId = self:isOpen(actType)
+		local actData = self:getActData(actType) or {}
+		actData.task = actData.task or {}
+		local change = false
+		local actCsv = csvdb["activity_crisisCsv"][actId]
+		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
+						end
+						status = status % actSet.condition1
+					else
+						reward = actSet.reward
+						status = -1
+					end
+
+					self.owner:award(reward, {log = {desc = "activity_crisis"}, notNotify = not notify})
+				end
+				actData.task[id] = status
+				change = true
+			end
+		end
+		if change then
+			-- 更新下排行榜
+			self.owner:updateRankCommon(RANK_TYPE.ActCrisis, self.owner:getItemCount(ItemId.CrisisScore))
+			self:updateActData(actType, actData)
+		end
+	end,
+}
  
 return Activity
@@ -62,7 +62,11 @@ function Email:data()
 		end
  
 		if attachments == "" and emailData.attachment ~= "" then
-			attachments = emailData.attachment:format(table.unpack(rewardPms))
+			if next(rewardPms) then
+				attachments = emailData.attachment:format(table.unpack(rewardPms))
+			else
+				attachments = emailData.attachment
+			end
 		end
 	end
  
@@ -44,7 +44,7 @@ function Role:checkBattle(battleType, params)
  
 	local fixData = {
 		hang = function()
-			for slot, hero in pairs(self:getProperty("hangTS")) do
+			for slot, hero in pairs(self:getProperty("hangTS").heros) do
 				selflist[slot] = hero.type
 			end
 			heroscore = self:getProperty("hangTBV")
@@ -59,7 +59,7 @@ function Role:checkBattle(battleType, params)
 		end,
 		tower = function()
 			local towerF = self:getTeamFormatByType(TeamSystemType.Tower)
-			for slot, hero in pairs(self:getTeamHerosInfo(towerF.heros)) do
+			for slot, hero in pairs(self:getTeamHerosInfo(towerF).heros) do
 				selflist[slot] = hero.type
 			end
 			heroscore = self:getTeamBattleValue(towerF.heros)
@@ -74,7 +74,7 @@ function Role:checkBattle(battleType, params)
 		end,
 		bonus = function()
 			local bTeam = self:getTeamFormatByType(TeamSystemType.BonusBattle)
-			for slot, hero in pairs(self:getTeamHerosInfo(bTeam.heros)) do
+			for slot, hero in pairs(self:getTeamHerosInfo(bTeam).heros) do
 				selflist[slot] = hero.type
 			end
 			heroscore = self:getTeamBattleValue(bTeam.heros)
@@ -88,7 +88,7 @@ function Role:checkBattle(battleType, params)
 			end
 		end,
 		act_battle = function()
-			for slot, hero in pairs(self:getTeamHerosInfo(params.heros)) do
+			for slot, hero in pairs(self:getTeamHerosInfo(params).heros) do
 				selflist[slot] = hero.type
 			end
 			heroscore = self:getTeamBattleValue(params.heros)
@@ -102,7 +102,7 @@ function Role:checkBattle(battleType, params)
 			end
 		end,
 		pvpc = function()
-			for slot, hero in pairs(self:getProperty("pvpTSC")) do
+			for slot, hero in pairs(self:getProperty("pvpTSC").heros) do
 				selflist[slot] = hero.type
 			end
 			heroscore = self:getProperty("pvpTBVC")
@@ -124,7 +124,7 @@ function Role:checkBattle(battleType, params)
 		pvph = function()
 			for idx, team in pairs(self:getProperty("pvpTSH")) do
 				selflist[idx] = selflist[idx] or {}
-				for slot, hero in pairs(team) do
+				for slot, hero in pairs(team.heros) do
 					selflist[idx][slot] = hero.type
 				end
 			end
@@ -19,8 +19,8 @@ RoleCross.bind = function (Role)
 	-- 好友详细队伍信息
 	function Role:friendInfo()
 		local info = self:friendSInfo()
-		local heros = self:getProperty("pvpTBVC") ~= 0 and self:getProperty("pvpTSC") or self:getProperty("hangTS")
-		info.heros = heros
+		local team = self:getProperty("pvpTBVC") ~= 0 and self:getProperty("pvpTSC") or self:getProperty("hangTS")
+		info.team = team
 		return info
 	end
  
@@ -36,7 +36,7 @@ RoleCross.bind = function (Role)
 			level = self:getProperty("level"),
 			headId = self:getProperty("headId"),
 			battleV = self:getProperty("pvpTBVC"),
-			heros = self:getProperty("pvpTSC"),
+			team = self:getProperty("pvpTSC"),
 			battleInfo = self:getProperty("pvpTBC")
 		}
 		return info
@@ -49,7 +49,7 @@ RoleCross.bind = function (Role)
 			level = self:getProperty("level"),
 			headId = self:getProperty("headId"),
 			battleV = self:getProperty("pvpTBVH"),
-			heros = self:getProperty("pvpTSH"),
+			team = self:getProperty("pvpTSH"),
 			battleInfo = self:getProperty("pvpTBH")
 		}
 		return info
@@ -281,7 +281,7 @@ function CMD.friendInfo(roleId)
 		headId = info.headId,
 		ltime = info.ltime,
 		battleV = info.pvpTBVC ~= 0 and info.pvpTBVC or info.hangTBV,
-		heros =  info.pvpTBVC ~= 0 and info.pvpTSC or info.hangTS
+		team =  info.pvpTBVC ~= 0 and info.pvpTSC or info.hangTS
 	}
 end
  
@@ -297,7 +297,7 @@ function CMD.pvpCInfo(roleId)
 		level = info.level,
 		headId = info.headId,
 		battleV = info.pvpTBVC,
-		heros = info.pvpTSC,
+		team = info.pvpTSC,
 		battleInfo = info.pvpTBC
 	}
 end
@@ -309,7 +309,7 @@ function CMD.pvpHInfo(roleId)
 		level = info.level,
 		headId = info.headId,
 		battleV = info.pvpTBVH,
-		heros = info.pvpTSH,
+		team = info.pvpTSH,
 		battleInfo = info.pvpTBH
 	}
 end
 local serverId = skynet.getenv("servId")
 local server_id = (skynet.getenv("serverType") or "localtest") .. "_" .. serverId
+local logproxy = require "shared.logproxy"
  
 --[[
 	100	购买/兑换行为			
@@ -49,6 +50,7 @@ local ItemReason = {
 	actHangDrop = 134, -- 掉落活动奖励
 	actBattle = 135, -- 活动关卡
 	actMilestone = 136,	-- 活动关卡boss伤害里程碑
+	worldBossReward = 137,	-- 世界boss翻牌奖励
  
  
 	advHang = 301, -- 拾荒挂机
@@ -89,6 +91,7 @@ local ItemReason = {
 	actSign = 1007, -- 活动签到
 	actPaySign = 1008, -- 活动付费签到
 	calendaTask = 1009,	-- 英雄帖
+	actMilecrisis = 1010, -- 物资危机
  
 	-- 餐厅
 	greenHourse = 1101, -- 食材获得
@@ -251,13 +254,6 @@ local MethodType = {
 		hero_break_result = "json", -- 英雄突破效果，可记录效果ID，或json格式记录提升效果，{攻击：20,闪避：20,……..}
 		hero_break_level = true, -- 英雄突破后等级上限
 	},
-	hero_talent = { --英雄天赋升级 
-		hero_id = true, -- 英雄ID
-		hero_talent_cost = "json", -- 英雄天赋升级消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
-		hero_talent_levelbef = true, -- 英雄技能升级前等级
-		hero_talent_level = true, -- 英雄技能升级后等级
-		hero_talent_id = true, -- 天赋id
-	},
 	hero_jewel = { --英雄铭文
 		hero_id = true, -- 英雄ID
 		hero_jewel_sequence = "ucode", -- 铭文装备编号，用以关联一次装备时产生的多条日志
@@ -287,7 +283,7 @@ local MethodType = {
 		gacha_up = true, -- 卡池UP角色
 		gacha_times = true, -- 抽卡次数
 		gacha_reward = "json", -- 抽卡结果，建议使用json格式记录。示例：{ "XX": "1", "XXX": "3"}
-		currency = "json", -- 消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
+		gacha_cost = "json", -- 消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,………...}
 		gacha_cnt = true, -- 保底计数
 	},
 	equip_wear = { --装备穿戴与卸载
@@ -295,8 +291,8 @@ local MethodType = {
 		equip_id = true, --装备ID
 		equip_wear_action = true, --装备操作类型：装备：0，卸载：1
 		equip_wear_part = true, --装备部位，记录部位ID
-		equip_wear_result = "json", --装备操作后结果，记录属性变化，json格式记录，{“aa”:1234,"bb":4567}
-		equip_wear_change = "json", --装备操作变化值，记录属性变化，记录正负值，json格式记录，{“aa”:1234,"bb":-45}
+		equip_wear_scorebef = true, --装备前英雄评分
+		equip_wear_score = true, --装备后英雄评分
 		equip_wear_mode = true, --用以区分自动装备还是手动装备，自动记录为0，手动记录为1
 		equip_wear_seqid = "ucode", --自动穿戴时记录的系列ID，用以关联一次性装备时候产生的多条记录
 	},
@@ -413,6 +409,7 @@ local MethodType = {
 		restaurant_order_status = true, -- 订单任务状态，接受:0, 拒绝:1, 完成:2
 		restaurant_order_rwd = "json", -- 订单完成奖励，json格式记录，{"itemid1":123,"itemid2":12,……….}
 		restaurant_order_lv = true, -- 订单品质等级，普通:0, 稀有:1, 顶级:2, 豪华:3
+		restaurant_order_type = true,	-- 订单任务类型，0:特殊顾客，1:特别订单
 	},
 	restaurant_collect = { --餐厅顾客图谱 
 		restaurant_collect_id = true, -- 图谱收集ID
@@ -504,6 +501,28 @@ local MethodType = {
 		mission_pick_fund_beflv = true, -- 资助前资助等级
 		mission_pick_fund_aftlv = true, -- 资助后资助等级
 	},
+	function_open = { -- 功能开启日志	
+		function_id	= true, --功能ID
+	},
+	punitive_action = { --  讨伐行动 --TODO
+		mission_id	= true, --关卡ID
+		mission_herolist = "json", -- 英雄ID，排序以玩家出战设置为准，示例：[111, 222, 333, 444, 555]
+		mission_success_rate = true, -- 大成功几率
+		mission_reward = "json", -- 获得奖励，建议使用json格式记录。示例：{ itemid1: 1,  itemid2: 3,  itemid3: 5}
+		mission_result = true, -- 战斗结果(0-无效，1-胜利，2-失败)
+		mission_roundtime = true, -- 完成耗时（秒）
+		mission_cleartype = true, -- 1-开始; 2-完成(领取奖励时）
+	},
+	hero_talent = { --英雄精进（原英雄天赋升级）  TODO
+		hero_id = true, --英雄ID
+		hero_talent_stagebef = true, --英雄精进升级前停留阶段
+		hero_talent_stage = true, --英雄精进升级后停留阶段
+		hero_talent_cost = "json", --英雄精进升级消耗，json格式记录，{道具ID1：消耗数量1,道具ID2：消耗数量2,….}
+		hero_talent_subid = true, --升级属性ID，生命、攻击、防御、命中、闪避分别对应（0，1，2，3，4）
+		hero_talent_sublevel = true, --升级属性等级，如生命升级从1到2，则记录2
+	},
+
+	
 }
  
 local function printError(info)
@@ -524,20 +543,26 @@ local function isIos(self)
 	return sid == 2
 end
  
-local appid, sdkId
+local sdkId
+local AppId = {
+	[1] = 4787,
+	[2] = 4788,
+	[3] = 4789,
+}
 local function getBaseLog(self)
 	local uid = self:getProperty("uid")
-	if not appid then
-		appid, sdkId = string.match(uid, "(.*)_(.*)")
-		if not appid then
+	local sid = self:getProperty("sid")
+	if not sdkId then
+		_, sdkId = string.match(uid, "(.*)_(.*)")
+		if not _ then
 			sdkId = uid
-			appid = 0
 		end
 	end
+
 	local log = {
 		server_id = server_id,
 		timestamp = skynet.timex(),
-		app_id = appid,
+		app_id = AppId[sid] or 0,
 		plat_id = isIos(self) and 0 or 1,
 		sdk_uid = sdkId,
 		account_id = uid,
@@ -565,6 +590,7 @@ local LogType = {
 	logout = "common",
 	guide = "common",
 	newdevice = "common",
+	cbback = "common",
  
 	in_item = "common",
 	out_item = "common",
@@ -765,8 +791,7 @@ function RoleLog.bind(Role)
 				end
 			end
 		end
-		if not logd then return end
-		pcall(skynet.send, logd, "lua", "log", doc, "bi")
+		logproxy:log(doc, "bi")
 	end
  
 	function Role:logItems(itemId, before, after, log)
@@ -825,8 +850,7 @@ function RoleLog.bind(Role)
 			end
 		end
 		doc["@type"] = logType
-		if not logd then return end
-		pcall(skynet.send, logd, "lua", "log", doc, "log")
+		logproxy:log(doc, "log")
 	end
  
  
@@ -356,16 +356,41 @@ function RolePlugin.bind(Role)
 			if not self:costDiamond(pms) then
 				return
 			end
-			itemCountT[ItemId.Diamond] = nil
 		end
 		for itemId, count in pairs(itemCountT) do
-			pms.itemId = itemId
-			pms.count = - count
-			self:addItem(pms)
+			if itemId ~= ItemId.Diamond then
+				pms.itemId = itemId
+				pms.count = - count
+				self:addItem(pms)
+				self:itemDeltaEvent(pms)
+			end
 		end
 		return true
 	end
  
+	function Role:itemDeltaEvent(pms)
+		self:eventBoxL(pms)
+	end
+
+	-- 拆解室的生产线启动
+	function Role:eventBoxL(pms)
+		local limit = globalCsv.box_key_max[pms.itemId]
+		if not limit then return end
+
+		local update = false
+		local boxL = self:getProperty("boxL") or {}
+		for slot, data in pairs(boxL) do
+			if data.time == 0 and data.id == pms.itemId and self:getItemCount(pms.itemId) < limit then
+				update = true
+				data.time = skynet.timex()
+			end
+		end
+
+		if update then
+			self:updateProperty({field = "boxL", value = boxL})
+		end
+	end
+
 	function Role:getItemCount(itemId)
 		if itemId == ItemId.Diamond then
 			return self:getAllDiamond()
@@ -1014,6 +1039,7 @@ function RolePlugin.bind(Role)
  
 		if csvdb["itemCsv"][func] and csvdb["itemCsv"][func].type == ItemType.FuncOpen then
 			local unlockData = csvdb["unlockCsv"][func]
+			self:log("function_open", {function_id = func})
 			if unlockData.type == 4 then -- 解锁神器
 				if self:getProperty("advAFOpen")[unlockData.value1] ~= 1 then
 					self:changeUpdates({{type = "advAFOpen", field = unlockData.value1, value = 1}})
@@ -1176,7 +1202,7 @@ function RolePlugin.bind(Role)
 			lv = self:getProperty("level"),
 			batteV = battleV,
 			level = level,
-			format = self:getTeamHerosInfo(towerTeam.heros),
+			format = self:getTeamHerosInfo(towerTeam).heros,
 		}
 		local roleId = self:getProperty("id")
 		redisproxy:pipelining(function (red)
@@ -1324,9 +1350,10 @@ function RolePlugin.bind(Role)
 		return teamInfo
 	end
  
-	function Role:getTeamHerosInfo(heroIds)
+	function Role:getTeamHerosInfo(team)
+		local format = {}
 		local heros = {}
-		for slot, heroId in pairs(heroIds or {}) do
+		for slot, heroId in pairs(team.heros or {}) do
 			local hero = self.heros[heroId]
 			heros[slot] = {
 				type = hero:getProperty("type"),
@@ -1334,7 +1361,10 @@ function RolePlugin.bind(Role)
 				wakeL = hero:getProperty("wakeL"),
 			}
 		end
-		return heros
+		format.heros = heros
+		format.supports = team.supports or {}
+		format.tactics = team.tactics or nil
+		return format
 	end
  
 	function Role:getTeamBattleValue(heros)
@@ -1352,7 +1382,7 @@ function RolePlugin.bind(Role)
 		if not team then return end
  
 		self:setProperties({
-			hangTS = self:getTeamHerosInfo(team.heros),
+			hangTS = self:getTeamHerosInfo(team),
 			hangTB = self:getTeamBattleInfo(team),
 			hangTBV = self:getTeamBattleValue(team.heros),
 		})
@@ -1400,7 +1430,7 @@ function RolePlugin.bind(Role)
 			self:updateProperty({field = "pvpTC", value = team})
 		end
 		self:setProperties({
-			pvpTSC = self:getTeamHerosInfo(team.heros),
+			pvpTSC = self:getTeamHerosInfo(team),
 			pvpTBC = self:getTeamBattleInfo(team),
 			pvpTBVC = self:getTeamBattleValue(team.heros),
 		})
@@ -1416,7 +1446,7 @@ function RolePlugin.bind(Role)
 		local pvpTSH, pvpTBH, pvpTBVH = {}, {}, {}
 		for i = 1, 3 do
 			if team[i] then
-				pvpTSH[i] = self:getTeamHerosInfo(team[i].heros)
+				pvpTSH[i] = self:getTeamHerosInfo(team[i])
 				pvpTBH[i] = self:getTeamBattleInfo(team[i])
 				pvpTBVH[i] = self:getTeamBattleValue(team[i].heros)
 			end
@@ -1575,10 +1605,17 @@ function RolePlugin.bind(Role)
 			return ""
 		end
 		local limit = rechargeData.limit
-	    local rechargeRecord = self:getProperty("payR") or {}
+	    local rechargeRecord = self.storeData:getProperty("payR") or {}
 	    if limit ~= 0 and limit <= (rechargeRecord[rechargeId] or 0) then
 	        return ""
-	    end
+		end
+		
+		--判断是否是活动商品
+		if rechargeData.activity_id ~= 0 then
+			local actCfg = csvdb["activity_ctrlCsv"][rechargeData.activity_id]
+			if not actCfg then return "" end
+			if not self.activity:isOpenById(rechargeData.activity_id, "ActShopGoods") then return "" end
+		end
  
 	    local orderId = redisproxy:hget(string.format(R_ORDERS, roleId), rechargeId)
 	    if orderId then
@@ -1596,6 +1633,7 @@ function RolePlugin.bind(Role)
 			key = orderKey, 
 			order = partnerOrderId, 
 			rechargeId = rechargeId, 
+			createTime = skynet.timex(),
 		})
 		order:create()
 		-- 正在进行中的订单 缓存
@@ -1639,7 +1677,7 @@ function RolePlugin.bind(Role)
 		-- 开始下单
 		if status == "success" then
 		elseif status == "fail" then
-			redisproxy:hdel(string.format(R_ORDERS, roleId), rechargeId)
+			-- redisproxy:hdel(string.format(R_ORDERS, roleId), rechargeId)
 		elseif status == "finsh" then
 			orderObject:setProperty("finishTime", skynet.time())
 			redisproxy:hdel(string.format(R_ORDERS, roleId), rechargeId)
@@ -1824,10 +1862,10 @@ function RolePlugin.bind(Role)
 	end
  
 	-- 抽卡阶段奖励
-	function Role:getDrawCardExtraReward(oldVal, newVal)
+	function Role:getDrawCardExtraReward(feedbackId, oldVal, newVal)
 		local reward = nil
 		local maxCount = 0
-		for k, v in pairs(csvdb["build_extraRewardCsv"]) do
+		for k, v in pairs(csvdb["build_extraRewardCsv"][feedbackId]) do
 			if oldVal < k and newVal >= k then
 				reward = v["reward"] or ""
 			end
@@ -233,7 +233,6 @@ function Role:refreshPvpMatch(score, rank, rankKey)
 		if low < 0 then
 			low = 0
 		end
-		print(low, heigh)
 		local rangeIds = redisproxy:ZREVRANGE(dbKey, low, heigh)
 		local lastRangeIds = {}
 		for idx, one in ipairs(rangeIds) do
@@ -48,6 +48,8 @@ local TaskType = {
 	AdvScore = 410, 			-- 冒险分数			- score		
 	AdvDraw = 411, 				-- 冒险资助			- count		ptype
 	AdvHang	= 412,				-- 代理拾荒次数
+	AdvMineKill = 413,			-- 宝藏怪击杀
+	AdvMineLayer = 414,			-- 宝藏洞激活
  
 	--爬塔相关
 	TowerPass = 501,			-- 爬塔通关			- level
@@ -146,7 +148,7 @@ local CommonListener = {
 		[TaskType.AdvStartSelf] = {{24}},
 		[TaskType.ShopAll] = {{25, f("count")}},
 		[TaskType.RuneUp] = {{26}},
-		[TaskType.OpenBox] = {{27, 1, f("id")}},
+		[TaskType.OpenBox] = {{27, f("count"), f("id")}},
 		[TaskType.AdvDraw] = {{28, f("count"), f("ptype")}},
 		[TaskType.PotionMake] = {{29, f("count"), f("id")}},
 	}
@@ -172,7 +174,7 @@ local AchievListener = {
 		[TaskType.FoodSellGold] = {{15, f("count")}},
 		[TaskType.DinerPopular] = {{16, f("count")}},
 		[TaskType.TowerPass] = {{17, f("level")}},
-		[TaskType.OpenBox] = {{18}},
+		[TaskType.OpenBox] = {{18, f("count")}},
 		[TaskType.DinerLevelUp] = {{19, f("level"), f("type")}},
 		[TaskType.DinerTalentUp] = {{20, 1, f("type")}},
 		[TaskType.HangGetGold] = {{21, f("count")}},
@@ -209,7 +211,7 @@ local SudokuListener = {
 		[TaskType.AdvDraw] = {{10, f("count")}},
 		[TaskType.DinerLevelUp] = {{11, f("level"), f("type")}},
 		[TaskType.FoodSell] = {{12, f("count")}},
-		[TaskType.OpenBox] = {{13, 1}},
+		[TaskType.OpenBox] = {{13, f("count")}},
 		[TaskType.TowerPass] = {{14, f("level")}},
 		[TaskType.PvpWin] = {{15, 1}},
 		[TaskType.DinerTalentUp] = {{16, f("level"), f("type")}},
@@ -218,6 +220,7 @@ local SudokuListener = {
 }
  
 local Activity = require("models.Activity")
+
 local ActivityListener = {
 	func = "checkActivityTask",
 	listen = {
@@ -226,6 +229,8 @@ local ActivityListener = {
 		[TaskType.AdvDraw] = {{Activity.ActivityType.AdvDraw, f("count")}},
 		[TaskType.OpenBox] = {{Activity.ActivityType.OpenBox, f("count")}},
 		[TaskType.Pay] = {{Activity.ActivityType.PayBack, f("twd")}},
+		[TaskType.AdvMineKill] = {{Activity.ActivityType.Crisis, 1}},
+		[TaskType.AdvMineLayer] = {{Activity.ActivityType.Crisis, 2}},
 	}
 }
  
@@ -266,7 +271,6 @@ local CalendaTaskListener = {
 	}
 }
  
-
 local TaskListeners = {
 	StoryListener,
 	CommonListener,
@@ -358,11 +362,22 @@ function RoleTask.bind(Role)
 		return true
 	end
  
+	local function checkStoryStatusByActBattle(role, data, status, cond1)	-- cond1 carbonId
+		local actid = data.sort
+		if not role.activity:isOpenById(actid) then return end
+		if cond1 and tonumber(data.unlockData) == cond1 then
+			status.s = 1
+			return true
+		end
+		return
+	end
+
 	local checkstoryStatusFunc = {
 		[1] = checkStoryStatusByHang,
 		[2] = checkStoryStatusByLove,
 		[3] = checkStoryStatusByMultStar,
 		[4] = checkStoryStatusByAdv,
+		[5] = checkStoryStatusByActBattle,
 	}
  
 	function Role:checkStoryStatus(notNotify, stype, cond1, cond2, cond3)
@@ -298,6 +298,8 @@ function Store:resetStoreReored(resetId)
                     end
                 end
             end
+        else
+            payRecord[k] = nil
         end
     end
     self:updateProperty({field = "payR", value = payRecord})
@@ -307,6 +309,8 @@ function Store:resetStoreReored(resetId)
             if config.resetTime == resetId then
                 buyRecord[k] = nil
             end
+        else
+            buyRecord[k] = nil
         end
     end
     self:updateProperty({field = "buyR", value = buyRecord})
@@ -388,6 +392,9 @@ function Store:onBuyPaySignCard(dur)
 	curTs = getServerOpenTs()
  
     self:SetActGoodsFlag("paySignIn", curTs)
+    local actData = self.owner.activity:getActData("PaySignIn")
+    actData[0] = 1
+    self.owner.activity:updateActData("PaySignIn", actData)
  
     --local actGoodsFlag = self:getProperty("actGoodsFlag") or {}
     --local goodsIndex = GetActGoodsIndex("paySignIn")
@@ -6,6 +6,7 @@ local xxtea = require &quot;xxtea&quot;
 local deque = require "deque"
 local datacenter = require "skynet.datacenter"
 local agent_queued = require "services.agent_queued"
+local logproxy = require "shared.logproxy"
  
 local pcall = pcall
 local string_format = string.format
@@ -139,11 +140,11 @@ function _M:check_agent_status()
 		end
 	end
  
-	if now >= next_log_time and now % 60 == 0 and logd then
+	if now >= next_log_time and now % 60 == 0 then
 		next_log_time = now + 60
 		local count = table_nums(self.u2f)
 		datacenter.set("onlineCount", count)
-		pcall(skynet.send, logd, "lua", "log", {["@type"] = "online", count = count}, "log")
+		logproxy:log({["@type"] = "online", count = count}, "log")
 	end
 end
  
@@ -34,8 +34,6 @@ local steps = {
 }
  
 skynet.start(function ()
-	redisd = skynet.localname(".redis")
-
 	redisproxy = require("shared.redisproxy")
  
 	local new = redisproxy:hsetnx("autoincrement_set", "server_start", os.date("%Y%m%d", skynet.timex())) == 1
@@ -175,7 +175,7 @@ end
  
 function CMD.start()
 	check_mail_queue()
-	check_battle_act_close()
+	--check_battle_act_close()
 end
  
 local function __init__()
@@ -190,7 +190,6 @@ local function __init__()
 			end
 		end
 	end)
-	redisd = skynet.localname(".redis")
 	skynet.register(".globald")
  
 end
@@ -53,12 +53,8 @@ end
 local CMD = require "actions.HttpAction"
  
 local function start()
-	redisd = skynet.localname(".redis")
 	globalCsv = csvdb["GlobalDefineCsv"]
  
-	if tonumber(skynet.getenv "logd") == 1 then
-		logd = skynet.localname(".log")
-	end
  
 	local listen_socket = socket.listen("0.0.0.0", port)
 	print("Listen web port " .. port)
@@ -77,11 +73,11 @@ local function start()
 					return 
 				end
 				local query = urllib.parse_query(query)
-				if query.key ~= key then
-					response(id, 404)
-					socket.close(id) 
-					return 
-				end
+				-- if query.key ~= key then
+				-- 	response(id, 404)
+				-- 	socket.close(id) 
+				-- 	return 
+				-- end
 				local content = CMD[cmd](query, body)
 				if not content then
 					code = 404
@@ -2,12 +2,12 @@ local skynet = require &quot;skynet&quot;
 local queue = require "skynet.queue"
 local bson = require "bson"
 local socketdriver = require "skynet.socketdriver"
-
 local serverId = tonumber(skynet.getenv("servId"))
  
 require "shared.init"
 require "skynet.manager"
  
+local logdIdx = ...
 local table_insert = table.insert
 local pairs = pairs
 local ipairs = ipairs
@@ -15,6 +15,7 @@ local string_format = string.format
  
 local logId = 0
 local CMD, cs = {}
+local prefix = "wasteland" .. logdIdx .. "S" .. serverId ..  "C" 
  
 local logHandle = {
 	bi = {
@@ -33,7 +34,7 @@ local logHandle = {
 			doc["game_name"] = "wasteland"
 			doc["env"] = "cb"
 			doc["game_name_type"] = "guaji"
-			doc["log_id"] = "wastelandC" .. logId .. "S" .. serverId .. "T" ..  now
+			doc["log_id"] = prefix .. logId .. "T" ..  now
 			logId = (logId + 1) % 10000000
 		end
 	},
@@ -135,7 +136,7 @@ local function __init__()
 	end)
 	cs = queue()
  
-	skynet.register(".log")
+	skynet.register(".logd" .. logdIdx)
 end
  
 skynet.start(__init__)
@@ -289,7 +289,6 @@ end
  
 ------------------------------------------------------
 function CMD.start()
-	redisd = skynet.localname(".redis")
 	globalCsv = csvdb["GlobalDefineCsv"]
  
 	pvpInfo = require("models.Pvpd").new({key = "cross:pvpInfo"})
@@ -3,7 +3,7 @@ require &quot;skynet.manager&quot;
 local redis = require "skynet.db.redis"
  
 local db
-
+local idx = ...
 local command = {}
  
 function command.open(conf)
@@ -25,7 +25,7 @@ skynet.start(function()
 		end
 	end)
 	skynet.info_func(function()
-		skynet.ret(skynet.pack(skynet.call(skynet.self(), "debug", "STAT")))
+		return skynet.stat("mqlen")
 	end)
-	skynet.register ".redis"
+	skynet.register(".redis" .. idx)
 end)
 \ No newline at end of file
 local skynet = require "skynet"
 require "skynet.manager"
-local redisproxy = require "shared.redisproxy"
 local socket = require "skynet.socket"
 local netpack = require "skynet.netpack"
 local datacenter = require "skynet.datacenter"
@@ -47,7 +46,7 @@ function SOCKET.data(fd, msg)
  	end
 end
  
-local use_logd = tonumber(skynet.getenv "logd")
+
  
 -- @desc: agent状态定时检测
 function check_agent_status()
@@ -65,11 +64,7 @@ end
  
 function CMD.start(conf)
 	skynet.call(gate_serv, "lua", "open" , conf)
-	skynet.call(redisd, "lua", "open", conf)
-
-	if use_logd == 1 then
-		skynet.call(logd, "lua", "open")
-	end
+	
 	skynet.call(pvpd, "lua", "start")
 	-- 开启agent状态检测定时器
 	check_agent_status()
@@ -110,17 +105,11 @@ skynet.start(function()
 		end
 	end)
 	skynet.register ".watchdog"
-	-- 数据库服务
-	redisd = skynet.newservice("services/redisd")
  
 	-- 提前加载好
 	csvdata.init()
 	print("launch csvdatad ...")
  
-	-- 日志服务
-	if use_logd == 1 then
-		logd = skynet.newservice("services/logd")
-	end
 	-- pvp 服务
 	pvpd = skynet.newservice("services/pvpd")
 	cluster.register("pvpd", pvpd)
@@ -0,0 +1,23 @@
+
+local skynet = require "skynet"
+local logd_count = tonumber(skynet.getenv("thread")) * 2
+local use_logd = tonumber(skynet.getenv("logd"))
+
+
+local logd
+skynet.init(function()
+	if use_logd then
+		local idx = math.randomInt(1, logd_count)
+		logd = skynet.localname(".logd" .. idx)
+	end
+end)
+
+local logproxy = {}
+
+function logproxy:log(doc, logTo)
+	if use_logd and logd then
+		pcall(skynet.send, logd, "lua", "log", doc, logTo)
+	end
+end
+
+return logproxy
 \ No newline at end of file
 local skynet = require "skynet"
-local harbor = require "skynet.harbor"
+require "utils.init"
+
+local redisd_count = tonumber(skynet.getenv("thread"))
+local redisd
+skynet.init(function()
+	local idx = math.randomInt(1, redisd_count)
+	redisd = skynet.localname(".redis" .. idx)
+end)
  
 local table_insert = table.insert
  
 local redisproxy = {}
  
-
 local isUsePika = false