Merge branch 'bugfix' into tr/qa

熊润斐
2 parents 1d9f6269 e1b5f6ec
Showing 15 changed files with 303 additions and 98 deletions Show diff stats
src/GlobalVar.lua
src/actions/ActivityAction.lua
src/actions/HangAction.lua
src/actions/HeroAction.lua
src/actions/RoleAction.lua
src/actions/StoreAction.lua
src/agent.lua
src/csvdata
src/models/Activity.lua
src/models/Email.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
src/models/RoleTask.lua
src/models/Store.lua
src/services/globald.lua
@@ -134,7 +134,6 @@ ItemId = {
 	RuneFragment = 24,
 	HeroFC = {700, 701, 702, 703},  --通用角色碎片
 	AdvKey = 80, -- 冒险钥匙
-	BoxKey = 60, -- 拆解工具
 	AdvPower = 4701, -- 拾荒体力
 	CrisisScore = 8010, -- 积分
 }
@@ -323,6 +322,8 @@ MailId = {
 	PaySignAward = 241,
 	PayBackAward = 242,
+	CBBackAward = 243,
+	CBBackAward2 = 244,
 }
 TriggerEventType = {
@@ -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
 				-- 奖励
@@ -525,6 +525,10 @@ 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
@@ -656,7 +660,7 @@ 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]
@@ -675,8 +679,6 @@ function _M.endBattleRpc(agent, data)
 			role:updateRankCommon(RANK_TYPE.ActBattleBoss, rankVal)
 		end
 	end
-	actData[id] = battleInfo
-	role.activity:updateActData("ChallengeLevel", actData)
 	if (oldStarNum == 0 and newStarNum > 0) or battleCfg.rank ~= 0 then
 		reward = battleCfg.item_clear:toNumMap()
@@ -703,6 +705,13 @@ function _M.endBattleRpc(agent, data)
 		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({
@@ -793,8 +802,8 @@ function _M.crisisMilestoneRpc(agent, data)
 	end
 	actData.score[id] = -1
 	role.activity:updateActData("Crisis", actData)
-	
-	local reward, change = role:award(curCsv.award, {log = {desc = "actMilecrisis", int1 = actid}})
+
+	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
@@ -815,11 +824,47 @@ function _M.bossRewardRpc(agent, data)
 	local battleCfg = actCfg[id]
 	if not battleCfg then return 3 end
-	if battleCfg.boss_reward_id == 0 then return 4 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 = mileCfg.reward:toNumMap()
-	--local reward, change = role:award(award, {log = {desc = "actMilestone", int1 = actid, int2 = index}})
-	--SendPacket(actionCodes.Activity_battleMilestoneRpc, MsgPack.pack(role:packReward(reward, change)))
+	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
@@ -560,10 +560,10 @@ 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")
+	if not bonusStar[bonusData.unlock] or bonusStar[bonusData.unlock] == 0 then return 4 end
-	local bonusStar = role:getProperty("bonusStar")
 	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}
@@ -724,10 +724,13 @@ 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]
@@ -761,7 +764,7 @@ function _M.drawHeroRpc(agent, data)
 	local drawCount = {1, 10} -- 抽取次数
 	if not drawCount[drawType] then return 3 end
-	local draw_floor_back_counts = globalCsv.draw_floor_back_counts[btype]
+	local draw_floor_back_counts = globalCsv.draw_floor_back_counts[btype] or 10
 	local floorHeroCount = role:getProperty("floorHero")[btype] or 0
 	-- 计算抽卡消耗品
@@ -974,11 +977,16 @@ function _M.drawHeroRpc(agent, data)
 	})
 	SendPacket(actionCodes.Hero_drawHeroRpc, MsgPack.pack({reward = reward})) -- 这个 reward 是数组
-	if (buildTypeData["can_feedback"] or 0) == 1 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
@@ -988,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
@@ -1001,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 = {}
@@ -1021,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
@@ -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,131 @@ 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
-		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)
-		-- 随机奖励
+
+		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
+
+		if role:getItemCount(costId) < count then return 8 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
@@ -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 }))
@@ -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}
-Subproject commit 591f2b4097214f9f5bf3b746f86ac704cbc9ea44
+Subproject commit ccdf6fcc82fd0a38d1b00bc199baadfd81ec3ab1
@@ -58,7 +58,7 @@ 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表示领取过该档位的奖励
@@ -71,6 +71,7 @@ Activity.schema = {
 	act19		= {"number", 0},	  -- {挂机信息}
 	act20		= {"table", {}},	  -- {id=扭蛋抽出数量}
+	act24		= {"table", {}, true},	-- 活动卡池 {id=repaynum}
 	act26 		= {"table", {}},	-- {task = {id = count}, socre = {id = status}}
 }
@@ -90,6 +91,7 @@ function Activity:data()
 		act18 = self:getProperty("act18"),
 		act19 = self:getProperty("act19"),
 		act20 = self:getProperty("act20"),
+		act26 = self:getProperty("act26"),
 	}
 end
@@ -384,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)
@@ -492,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)
@@ -543,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
@@ -731,7 +753,7 @@ activityFunc[Activity.ActivityType.Crisis] = {
 		local actData = self:getActData(actType) or {}
 		actData.task = actData.task or {}
 		local change = false
-		local actCsv = csvData["activity_crisisCsv"][actId]
+		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
@@ -740,7 +762,7 @@ activityFunc[Activity.ActivityType.Crisis] = {
 					local reward
 					if actSet.loop == 1 then
 						local rcount = math.floor(status / actSet.condition1)
-						local reward = actSet.reward:toNumMap()
+						reward = actSet.reward:toNumMap()
 						for itemId, itemC in pairs(reward) do
 							reward[itemId] = itemC * rcount
 						end
@@ -749,6 +771,7 @@ activityFunc[Activity.ActivityType.Crisis] = {
 						reward = actSet.reward
 						status = -1
 					end
+
 					self.owner:award(reward, {log = {desc = "activity_crisis"}, notNotify = not notify})
 				end
 				actData.task[id] = status
@@ -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
@@ -50,6 +50,7 @@ local ItemReason = {
 	actHangDrop = 134, -- 掉落活动奖励
 	actBattle = 135, -- 活动关卡
 	actMilestone = 136,	-- 活动关卡boss伤害里程碑
+	worldBossReward = 137,	-- 世界boss翻牌奖励
 	advHang = 301, -- 拾荒挂机
@@ -90,6 +91,7 @@ local ItemReason = {
 	actSign = 1007, -- 活动签到
 	actPaySign = 1008, -- 活动付费签到
 	calendaTask = 1009,	-- 英雄帖
+	actMilecrisis = 1010, -- 物资危机
 	-- 餐厅
 	greenHourse = 1101, -- 食材获得
@@ -581,6 +583,7 @@ local LogType = {
 	logout = "common",
 	guide = "common",
 	newdevice = "common",
+	cbback = "common",
 	in_item = "common",
 	out_item = "common",
@@ -362,10 +362,34 @@ function RolePlugin.bind(Role)
 			pms.itemId = itemId
 			pms.count = - count
 			self:addItem(pms)
+			self:itemDeltaEvent(pms)
 		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()
@@ -1580,15 +1604,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
 		--判断是否是活动商品
-		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
+		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
@@ -1835,10 +1861,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
@@ -148,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")}},
 	}
@@ -174,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")}},
@@ -211,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")}},
@@ -392,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")
@@ -175,7 +175,7 @@ end
 function CMD.start()
 	check_mail_queue()
-	check_battle_act_close()
+	--check_battle_act_close()
 end
 local function __init__()