Merge branch 'temp' into player

zhouhaihai
2 parents 786b8a44 70aa8660
Showing 29 changed files with 1261 additions and 236 deletions Show diff stats
config/develop.lua
src/GlobalVar.lua
src/ProtocolCode.lua
src/RedisKeys.lua
src/actions/ActivityAction.lua
src/actions/AdvAction.lua
src/actions/CarAction.lua
src/actions/DinerAction.lua
src/actions/EmailAction.lua
src/actions/GmAction.lua
src/actions/HangAction.lua
src/actions/HeroAction.lua
src/actions/HttpAction.lua
src/actions/PvpAction.lua
src/actions/RoleAction.lua
src/actions/StoreAction.lua
src/actions/TowerAction.lua
src/adv/Adv.lua
src/adv/AdvBattle.lua
src/adv/AdvMap.lua
@@ -2,7 +2,7 @@ include(&quot;basic.lua&quot;)
 logd = 0 -- 是否开启日志
 thread = 4
-codeurl = "106.13.60.20:9090"
+codeurl = "192.168.8.223:9090"
 servId = 1
 max_client = 300
@@ -2,6 +2,7 @@ XXTEA_KEY = &quot;699D448D6D24f7F941E9F6E99F823E18&quot;
 RESET_TIME = 0
 START_RESET_TIME_BASE = 1584316800 -- 0时区
+DAY_SEC = 86400
 TIME_ZONE = math.floor(os.difftime(START_RESET_TIME_BASE, os.time(os.date("!*t", START_RESET_TIME_BASE))) / 3600)  -- 本地时区
 START_RESET_TIME = START_RESET_TIME_BASE - TIME_ZONE * 3600
@@ -128,6 +129,7 @@ ItemId = {
 TimeReset = {
 	CrossDay = 1,  --通用跨天
 	CrossWeek = 2,  --通用跨周
+	CrossMonth = 1, --通用跨月  索引使用跨天，在回调方法中判断是否跨越 跨月的前置条件是跨天
 	DinerRank = 1,  -- 餐厅排行榜
 	PvpRank = 2,  -- pvp排行榜
 	PvpHight = 11,  --高级竞技场
@@ -259,3 +261,41 @@ RedPointTags = {
 	PvpCR = 1,
 	PvpHR = 2,
 }
+
+RefreshType = {
+	RefreshType_Daily = 1,		-- 日刷新
+	RefreshType_Weekly = 2,		-- 周刷新
+	RefreshType_Monthly = 3,	-- 月刷新
+}
+
+CardType = {
+	NormalMonthCard = 1,	--普通月卡
+	SuperMonthCard = 2,	--超级月卡
+	PrivilegeCard = 3, --特权卡
+	GrowFund = 4,	--成长助力
+	BattleCard = 5,	--赛季卡
+}
+
+HeroQuality = {
+	N = 1,
+	R = 2,
+	SR = 3,
+	SSR = 4,
+}
+
+MailId = {
+	MonthCard = 201,
+	SuperMonthCard = 202,
+	MonthCardEx = 203,
+	SuperMonthCardEx = 204,
+	BattleCardAward = 210,
+
+	ActDrawCard = 231,
+	ActOpenBox = 232,
+	ActAdvDraw = 233,
+	ActSellFood = 234,
+	ActDrawCardReward = 221,
+	ActOpenBoxReward = 222,
+	ActAdvDrawReward = 223,
+	ActSellFoodReward = 224,
+}
@@ -6,6 +6,7 @@ actionCodes = {
 	Sys_innerErrorMsg = 4,
 	Sys_commonNotice = 5,
 	Sys_maintainNotice = 6,
+	Sys_customNotice = 7,
 	Gm_clientRequest = 20,
 	Gm_receiveResponse = 21,
@@ -87,6 +88,7 @@ actionCodes = {
 	Hero_getResetRewardRpc = 219,
 	Hero_drawHeroRpc = 220,
 	Hero_repayHeroRpc = 221,
+	Hero_unlockPoolRpc = 222,
 	Hang_startRpc = 251,
 	Hang_checkRpc = 252,
@@ -182,6 +184,11 @@ actionCodes = {
 	Store_ayncPurchaseRpc = 555,
 	Store_myCardRechargeRpc = 556,
 	Store_iosRechargeRpc = 557,
+	Store_shopBuyRpc = 558,
+	Store_updateproperty = 559,
+	Store_getFreeChestRpc = 560,
+	Store_getGrowFundRewardRpc = 561,	--成长助力奖励
+	Store_getBattlePassRewardRpc = 562,	--赛季卡奖励
 	Email_listRpc = 600,
@@ -11,6 +11,7 @@ R_RUNEIDS = &quot;role:%d:runeIds&quot;      -- 玩家拥有符文自增id
 R_RUNE = "role:%d:rune:%d"       -- 符文详细信息
 R_EMAIL = "role:%d:emailIds" --邮件列表
 R_EMAIL_ITEM = "email:%d:%d" --邮件
+R_STORE = "role:%d:store"   -- 商店
 -- rank
@@ -32,9 +32,9 @@ function _M.sudokuRpc(agent, data)
 	if (sudoku.task[phase][id] or 0) < curData.con1 then return 2 end
 	sudoku.task[phase][id] = -1
-	local task = role:award(curData.reward, {log = {desc = "sudoku", int1 = id, int2 = phase}}) -- 任务奖励
+	local task, tchange = role:award(curData.reward, {log = {desc = "sudoku", int1 = id, int2 = phase}}) -- 任务奖励
-	local reward = {}
+	local reward, rchange = {}
 	local rId = {}
 	for pid, pdata in pairs(csvdb["guide_sudoku_rewardCsv"][phase] or {}) do
 		local pos = pdata.pos:toArray(true, "=")
@@ -60,14 +60,14 @@ function _M.sudokuRpc(agent, data)
 	if not next(reward) then
 		reward = nil
 	else
-		reward = role:award(reward, {log = {desc = "sudokuR", int1 = id, int2 = phase}})
+		reward, rchange = role:award(reward, {log = {desc = "sudokuR", int1 = id, int2 = phase}})
 	end
 	role:updateProperty({field = "sudoku", value = sudoku})
 	role:log("act_action", {desc = "sudoku", int1 = id, int2 = phase})
-	SendPacket(actionCodes.Activity_sudokuRpc, MsgPack.pack({task = task, reward = reward, rId = rId}))
+	SendPacket(actionCodes.Activity_sudokuRpc, MsgPack.pack({task = role:packReward(task, tchange), reward = role:packReward(reward, rchange), rId = rId}))
 	return true
 end
@@ -90,7 +90,7 @@ function _M.sudokuRewardRpc(agent, data)
 		end
 	end
-	local reward = role:award(globalCsv.guide_sudoku_reward[phase], {log = {desc = "sudokuRP", int1 = phase}})
+	local reward, change = role:award(globalCsv.guide_sudoku_reward[phase], {log = {desc = "sudokuRP", int1 = phase}})
 	sudoku[-1] = phase + 1
 	sudoku.task[phase] = nil
@@ -100,7 +100,7 @@ function _M.sudokuRewardRpc(agent, data)
 	end
 	role:updateProperty({field = "sudoku", value = sudoku})
-	SendPacket(actionCodes.Activity_sudokuRewardRpc, MsgPack.pack(reward))
+	SendPacket(actionCodes.Activity_sudokuRewardRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -125,10 +125,10 @@ function _M.signRpc(agent, data)
 	end
 	signs[curDay] = yearMonth
-	local reward = role:award(monthData[curDay].item, {log = {desc = "sign", int1 = yearMonth, int2 = curDay}})
+	local reward, change = role:award(monthData[curDay].item, {log = {desc = "sign", int1 = yearMonth, int2 = curDay}})
 	role:changeUpdates({{type = "sign", field = curDay, value = yearMonth}})
-	SendPacket(actionCodes.Activity_signRpc, MsgPack.pack(reward))
+	SendPacket(actionCodes.Activity_signRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -138,7 +138,7 @@ function _M.actSignRpc(agent, data)
 	if not role.activity:isOpen("Sign") then return 1 end
 	local curData = role.activity:getActData("Sign")
-	local reward = {}
+	local reward, change = {}
 	for day, csvData in ipairs(csvdb["new_signInCsv"]) do
 		if day <= (curData[0] or 0) then
 			if not curData[day] then
@@ -154,9 +154,9 @@ function _M.actSignRpc(agent, data)
 	end
 	if next(reward) then
 		role.activity:updateActData("Sign", curData)
-		reward = role:award(reward, {log = {desc = "actSign"}})
+		reward, change = role:award(reward, {log = {desc = "actSign"}})
 	end
-	SendPacket(actionCodes.Activity_actSignRpc, MsgPack.pack(reward))
+	SendPacket(actionCodes.Activity_actSignRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -187,23 +187,23 @@ function _M.startHangRpc(agent, data)
 	local format = msg.format --编队
 	local chapterData = csvdb["adv_chapterCsv"][chapterId]
-	if not chapterData then return end
-	if chapterData.idleReward == "" then return end --没有奖励 没有挂机
+	if not chapterData then return 1 end
+	if chapterData.idleReward == "" then return 2 end --没有奖励 没有挂机
 	local advHang = role:getProperty("advHang")
-	if advHang[chapterId] then return end --正在挂机
+	if advHang[chapterId] then return 3 end --正在挂机
-	if role:getAdvData():isRunning() and role:getAdvData().chapterId == chapterId then return end
+	if role:getAdvData():isRunning() and role:getAdvData().chapterId == chapterId then return 4 end
-	if AdvCommon.isEndless(chapterId) then return end -- 无尽没有代理
+	if AdvCommon.isEndless(chapterId) then return 5 end -- 无尽没有代理
 	local advRelay = role:getProperty("advRelay") 
-	if not next(advRelay[chapterId] or {}) then return end -- 没有开放
+	if not next(advRelay[chapterId] or {}) then return 6 end -- 没有开放
-	if not role:checkAdvCount(chapterData.limitlevel) then return end -- 是否有体力
+	if not role:checkAdvCount(chapterData.limitlevel) then return 7 end -- 是否有体力
-	if not checkFormat(role, format, role:getAdvData():isRunning()) then return end --编队是否正确
+	if not checkFormat(role, format, role:getAdvData():isRunning()) then return 8 end --编队是否正确
 	local player = {}
 	local attrs = role:getTeamBattleInfo(format).heros
@@ -220,7 +220,7 @@ function _M.startHangRpc(agent, data)
 		+ 0.226 * player["hit"]
 		+ 0.26 * player["miss"]
-	if battleV < chapterData.idleValue then return end -- 战斗力是否满足
+	if battleV < chapterData.idleValue then return 9 end -- 战斗力是否满足
 	local info = {}
 	info.format = {}
@@ -290,7 +290,7 @@ function _M.endHangRpc(agent, data)
 	local chapterData = csvdb["adv_chapterCsv"][chapterId]
 	if not chapterData then return end
-	local reward, isFull
+	local reward, isFull, change
 	if skynet.timex() >= info.time then
 		-- 英雄加成
 		local idleUnit = chapterData.idleUnit:toNumMap()
@@ -321,7 +321,7 @@ function _M.endHangRpc(agent, data)
 		for itemId, count in pairs(idleReward) do
 			idleReward[itemId] = math.floor(count * (maxCampsite.idleValue + upUnit) / 100)
 		end
-		reward = role:award(idleReward, {log = {desc = "advHang", int1 = chapterId}})
+		reward, change = role:award(idleReward, {log = {desc = "advHang", int1 = chapterId}})
 	else
 		if cancel then
 			role:changeAdvCount(-chapterData.limitlevel)
@@ -339,7 +339,7 @@ function _M.endHangRpc(agent, data)
 	role:log("adv_action", {desc = "endHang", int1 = chapterId, short1 = cancel and 1 or 0})
-	SendPacket(actionCodes.Adv_endHangRpc, MsgPack.pack({reward = reward, isFull = isFull}))
+	SendPacket(actionCodes.Adv_endHangRpc, MsgPack.pack({reward = reward, change = change, isFull = isFull}))
 	return true
 end
@@ -381,9 +381,9 @@ function _M.finishTaskRpc(agent, data)
 	if not isCanContinue(role) then return end
 	local adv = role:getAdvData()
 	local taskId = msg.taskId  -- -1 则是主线任务
-	local status, reward
+	local status, reward, change
 	if taskId == -1 then
-		status, reward = adv:finishMTask()
+		status, reward, change = adv:finishMTask()
 	else
 		status, reward = adv:finishTask(taskId)
 		adv:checkAchievement(adv.AchievType.TaskLayer, 1, taskId)
@@ -395,7 +395,7 @@ function _M.finishTaskRpc(agent, data)
 	adv:log({desc = "finishTask", int1 = taskId})
-	SendPacket(actionCodes.Adv_finishTaskRpc, MsgPack.pack({reward = reward}))
+	SendPacket(actionCodes.Adv_finishTaskRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -749,11 +749,11 @@ function _M.repayWheelSurfRpc(agent, data)
 	advDrawB[ptype] = advDrawB[ptype] - globalCsv.adv_draw_back_cond
 	role:updateProperty({field = "advDrawB", value = advDrawB})
 	local gift = drawData["pool3"]:randWeight(true)
-	local reward = {[gift[1]] = gift[2]}
-	reward = role:award(reward, {log = {desc = "advRepayWheelSurf", int1 = ptype}})
+	local reward, change = {[gift[1]] = gift[2]}
+	reward, change = role:award(reward, {log = {desc = "advRepayWheelSurf", int1 = ptype}})
 	role:log("adv_action", {desc = "advRepayWheelSurf", int1 = ptype})
-	SendPacket(actionCodes.Adv_repayWheelSurfRpc, MsgPack.pack({reward = reward}))
+	SendPacket(actionCodes.Adv_repayWheelSurfRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -766,17 +766,17 @@ function _M.finishAchievRpc(agent, data)
 	local adv = role:getAdvData()
-	local status, reward
+	local status, reward, change
 	if ctype == 1 then
-		status, reward = adv:finishAchievement(chapterId, taskId)
+		status, reward, change = adv:finishAchievement(chapterId, taskId)
 	elseif ctype == 2 then
-		status, reward = adv:getAchievementReward(chapterId, taskId)
+		status, reward, change = adv:getAchievementReward(chapterId, taskId)
 	end
 	if not status then return end
 	adv:updateAchievement()
 	role:log("adv_action", {desc = "finishAchiev", short1 = ctype, int1 = chapterId, int2 = taskId})
-	SendPacket(actionCodes.Adv_finishAchievRpc, MsgPack.pack({reward = reward}))
+	SendPacket(actionCodes.Adv_finishAchievRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -150,7 +150,7 @@ function _M.saleEquipRpc(agent, data )
 		local own = role:getEquipCount(typ,lv)
 		if math.illegalNum(count, 1, own)  then return end
 	end
-	local reward = {}
+	local reward, change = {}
 	local allCount = 0
 	for id, count in pairs(backs) do
 		allCount = allCount + count
@@ -165,11 +165,11 @@ function _M.saleEquipRpc(agent, data )
 		end
 	end
 	role:checkTaskEnter("SaleEquip", {count = allCount})
-	reward = role:award(reward, {log = {desc = "saleEquip"}})
+	reward, change = role:award(reward, {log = {desc = "saleEquip"}})
 	role:log("role_action", {desc = "saleEquip", int1 = allCount})
-	SendPacket(actionCodes.Car_saleEquipRpc, MsgPack.pack({reward = reward}))
+	SendPacket(actionCodes.Car_saleEquipRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -179,7 +179,7 @@ function _M.saleRuneRpc(agent, data )
 	local backs = msg.backs
 	if not backs then return end
-	local reward = {}
+	local reward, change = {}
 	local count = 0
 	for _, uid in pairs(backs) do
 		count = count + 1
@@ -196,9 +196,9 @@ function _M.saleRuneRpc(agent, data )
 	role:delRunes(backs, {log = {desc = "saleRune"}})
 	role:checkTaskEnter("DecoRune", {count = count})
-	reward = role:award(reward, {log = {desc = "saleRune"}})
+	reward, change = role:award(reward, {log = {desc = "saleRune"}})
-	SendPacket(actionCodes.Car_saleRuneRpc, MsgPack.pack({reward = reward}))
+	SendPacket(actionCodes.Car_saleRuneRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -141,19 +141,19 @@ function _M.removeSellRpc( agent, data )
 	end
 	role.dinerData:updateSell(slot)
-	local reward = {}
+	local reward, change = {}
 	local cost = dishData.material:toNumMap()
 	for k, n in pairs(cost) do
 		local sum = n*sell.count
 		reward[k] = sum
 	end
-	reward = role:award(reward, {log = {desc = "removeSell"}})
+	reward, change = role:award(reward, {log = {desc = "removeSell"}})
 	sells[slot].count = 0
 	role:log("diner_action", {desc = "removeSell", int1 = dish})
 	role.dinerData:updateProperty({field = "sells", value = json.encode(sells)})
-	SendPacket(actionCodes.Diner_removeSellRpc, MsgPack.pack({reward = reward}))
+	SendPacket(actionCodes.Diner_removeSellRpc, MsgPack.pack({reward = reward, change = change}))
 	return true
 end
@@ -195,7 +195,7 @@ function _M.getSellRewardRpc( agent, data )
 			role:checkTaskEnter("FoodSellGold", {count = v})
 		end
 	end
-	role:award(gift, {log = {desc = "dinerSell"}})
+	local reward, change = role:award(gift, {log = {desc = "dinerSell"}})
 	role.dinerData:popularAdd(popular)
@@ -206,7 +206,7 @@ function _M.getSellRewardRpc( agent, data )
 	role:log("diner_action", {desc = "sell"})
-	SendPacket(actionCodes.Diner_getSellRewardRpc, MsgPack.pack({reward = reward}))
+	SendPacket(actionCodes.Diner_getSellRewardRpc, MsgPack.pack({reward = reward, change = change}))
 	return true
 end
@@ -261,12 +261,20 @@ function _M.expediteSellRpc( agent, data )
 	role.dinerData:setProperty("expedite",count+1)
 	role.dinerData:notifyUpdateProperty("expedite", count+1)
 	local gift = reward:toNumMap()
+
+	-- 特权卡获取加速获得额外道具
+	local coef = role.storeData:getProduceItemSpeedCoef()
 	for k, v in pairs(gift) do
+		if coef > 1 then
+			v = math.floor(v * coef)
+			gift[k] = v
+		end
 		if k == ItemId.Gold then
 			role:checkTaskEnter("FoodSellGold", {count = v})
 		end
 	end
-	role:award(gift, {log = {desc = "dinerSell"}})
+	local change
+	reward, change = role:award(gift, {log = {desc = "dinerSell"}})
 	role.dinerData:popularAdd(popular)
@@ -278,7 +286,7 @@ function _M.expediteSellRpc( agent, data )
 	role:log("diner_action", {desc = "sellQ"})
-	SendPacket(actionCodes.Diner_expediteSellRpc, MsgPack.pack({reward = reward,popular = popular}))
+	SendPacket(actionCodes.Diner_expediteSellRpc, MsgPack.pack({reward = reward, change = change, popular = popular}))
 	return true
 end
@@ -493,7 +501,7 @@ function _M.updateTaskRpc( agent, data )
 		return 5
 	end
-
+	local reward, change
 	if cmd == 0 then
 		if order.status ~= 0 then
 			return 30
@@ -522,7 +530,7 @@ function _M.updateTaskRpc( agent, data )
 		end
 		role:log("diner_action", {desc = "finishTask", int1 = order.id})
-		role:award(taskData.reward, {log = {desc = "dinerFinishTask", int1 = order.id}})
+		reward, change = role:award(taskData.reward, {log = {desc = "dinerFinishTask", int1 = order.id}})
 		table.remove(orders,index)
 		role:checkTaskEnter("OverOderTask", {rarity = taskSet.rarity})
 	else
@@ -530,7 +538,7 @@ function _M.updateTaskRpc( agent, data )
 	end
 	role.dinerData:updateProperty({field = "order", value = json.encode(orders)})
-	SendPacket(actionCodes.Diner_updateTaskRpc, '')
+	SendPacket(actionCodes.Diner_updateTaskRpc, MsgPack.pack({reward = reward, change = change}))
 	return true
 end
@@ -681,12 +689,12 @@ function _M.getGreenhouseRpc( agent, data )
 		end
 	end
 	role.dinerData:updateProperty({field = "gfood", value = gfood})
-	local reward = role:award(reward, {log = {desc = "greenHourse", int1 = level}})
+	local reward, change = role:award(reward, {log = {desc = "greenHourse", int1 = level}})
 	role:checkTaskEnter("FoodMGet")
 	role:log("diner_action", {desc = "greenHourse"})
-	SendPacket(actionCodes.Diner_getGreenhouseRpc, MsgPack.pack({reward = reward}))
+	SendPacket(actionCodes.Diner_getGreenhouseRpc, MsgPack.pack({reward = reward, change = change}))
 	return true
 end
@@ -798,7 +806,7 @@ function _M.entrustRpc(agent , data)
 	local entrustId = entrust[1]
 	if not entrustId then return end
-	local reward
+	local reward, change
 	if ctype == 1 then -- 完成
 		local curData = csvdb["diner_missionCsv"][entrustId]
 		if not curData then return end
@@ -813,7 +821,7 @@ function _M.entrustRpc(agent , data)
 			return
 		end
-		reward = role:award(curData.reward, {log = {desc = "dinerEntrus", int1 = entrustId}})
+		reward, change = role:award(curData.reward, {log = {desc = "dinerEntrus", int1 = entrustId}})
 		table.remove(entrust, 1)
 	elseif ctype == 2 then		-- 放弃
 		table.remove(entrust, 1)
@@ -824,7 +832,7 @@ function _M.entrustRpc(agent , data)
 	role:log("diner_action", {desc = "entrus", short1 = ctype, int1 = entrustId})
-	SendPacket(actionCodes.Diner_entrustRpc, MsgPack.pack({reward = reward}))
+	SendPacket(actionCodes.Diner_entrustRpc, MsgPack.pack({reward = reward, change = change}))
 	return true
 end
@@ -845,12 +853,12 @@ function _M.collectRpc(agent , data)
 	for slot, _ in pairs(sells) do
 		role.dinerData:updateSell(slot)
 	end
-	local reward = role:award(customerData.reward, {log = {desc = "dinerCollect", int1 = id}})
+	local reward, change = role:award(customerData.reward, {log = {desc = "dinerCollect", int1 = id}})
 	customer[id] = 1
 	role.dinerData:updateProperty({field = "customer", value = customer}) -- 解锁了
 	role:log("diner_action", {desc = "collect", int1 = id})
-	SendPacket(actionCodes.Diner_collectRpc, MsgPack.pack({reward = reward}))
+	SendPacket(actionCodes.Diner_collectRpc, MsgPack.pack({reward = reward, change = change}))
 	return true
 end
@@ -874,13 +882,13 @@ function _M.comboRewardRpc(agent , data)
 	end
 	comboStatus[id] = 1
-	local reward = role:award(comboData.reward, {log = {desc = "dinerCombo", int1 = id}})
+	local reward, change = role:award(comboData.reward, {log = {desc = "dinerCombo", int1 = id}})
 	role.dinerData:updateProperty({field = "comboStatus", value = comboStatus}) -- 解锁了
 	role:log("diner_action", {desc = "combo", int1 = id})
-	SendPacket(actionCodes.Diner_comboRewardRpc, MsgPack.pack({reward = reward}))
+	SendPacket(actionCodes.Diner_comboRewardRpc, MsgPack.pack({reward = reward, change = change}))
 	return true
 end
@@ -86,7 +86,7 @@ function _M.drawAllAttachRpc(agent, data)
 	local role = agent.role
 	local roleId = role:getProperty("id")
-	local reward = {}
+	local reward, change = {}
 	local ids = {}
 	local emails = loadEmails(roleId)
@@ -95,19 +95,18 @@ function _M.drawAllAttachRpc(agent, data)
 			local attachments = getEmailAttachments(email)
 			if attachments ~= "" then
 				local emailId = email:getProperty("id")
-				local items = role:award(attachments, {log = {desc = "draw_attach", int1 = emailId, key1 = email:getProperty("title")}})
 				ids[emailId] = 1
 				red:hset(string.format(R_EMAIL_ITEM, roleId, emailId), "status", 2) 
 				role:log("mail_action", {desc = "draw_attach", int1 = emailId, key1 = email:getProperty("title"), key2 = attachments})
-				for key, v in pairs(items) do
+				for key, v in pairs(attachments:toNumMap()) do
 					reward[key] = (reward[key] or 0) + v
 				end
 			end
 		end
 	end)
-
-	SendPacket(actionCodes.Email_drawAllAttachRpc, MsgPack.pack({ids = ids, reward = reward}))
+	reward, change = role:award(reward, {log = {desc = "draw_attach"}})
+	SendPacket(actionCodes.Email_drawAllAttachRpc, MsgPack.pack({ids = ids, reward = reward, change = change}))
 	return true
 end
@@ -125,9 +124,9 @@ function _M.drawAttachRpc(agent, data)
 	local attachments = getEmailAttachments(email)
 	if attachments == "" then return end
-	local reward = role:award(attachments, {log = {desc = "draw_attach", int1 = emailId, key1 = email:getProperty("title")}})
+	local reward, change = role:award(attachments, {log = {desc = "draw_attach", int1 = emailId, key1 = email:getProperty("title")}})
 	redisproxy:hset(rds, "status", 2) 	-- 领取标记
-	SendPacket(actionCodes.Email_drawAttachRpc, MsgPack.pack({reward = reward}))
+	SendPacket(actionCodes.Email_drawAttachRpc, MsgPack.pack({reward = reward, change = change}))
 	role:log("mail_action", {desc = "draw_attach", int1 = id, key1 = email:getProperty("title"), key2 = attachments})
 	return true
@@ -512,11 +512,17 @@ function _M.helpRpc(agent, data)
 	return true
 end
+function _M.test(role, pms)
+	local id = tonum(pms.pm1, 0)
+	--local hero = require ("actions.HeroAction")
+	--hero.unlockPoolRpc({role = role}, MsgPack.pack({type = id}))
+	role.storeData:onBattleCardReset()
+	return "成功"
+end
+
 -- 充值回调
 function _M.ayncPurchase(role, params)
 	return role:handlePurchase(params) or ""
 end
-
-
 return _M
 \ No newline at end of file
@@ -19,19 +19,26 @@ local _M = {}
 local function checkReward(role)
 	local hangInfo = role:getProperty("hangInfo")
 	if not hangInfo.carbonId or not hangInfo.coinTime or not hangInfo.itemTime then
-		return
+		return false
 	end
 	local carbonData = csvdb["idle_battleCsv"][hangInfo.carbonId]
 	local nowCoinTime = math.min(skynet.timex(), hangInfo.endCoinTime or 0)
 	local nowItemTime = math.min(skynet.timex(), hangInfo.endItemTime or 0)
-	local coinCount = math.max(0, math.floor((nowCoinTime - hangInfo.coinTime) / globalCsv.idle_money_produce_cd))
-	hangInfo.coinTime = hangInfo.coinTime + coinCount * globalCsv.idle_money_produce_cd
+	-- 此次挂机，其中翻倍时长占多少
+	local doubleTime = role.activity:getActHangDoubleTime(hangInfo.coinTime, nowCoinTime)
+	local normalTime = nowCoinTime - hangInfo.coinTime - doubleTime
+
+	local coinCount = math.max(0, math.floor((normalTime) / globalCsv.idle_money_produce_cd))
+	local coinDoubleCount = math.max(0, math.floor((doubleTime) / globalCsv.idle_money_produce_cd)) * 2
+	hangInfo.coinTime = nowCoinTime
-	local itemCount = math.max(0, math.floor((nowItemTime - hangInfo.itemTime) / globalCsv.idle_item_produce_cd))
-	hangInfo.itemTime = hangInfo.itemTime + itemCount * globalCsv.idle_item_produce_cd
+	normalTime = nowItemTime - hangInfo.itemTime
+	local itemCount = math.max(0, math.floor((normalTime) / globalCsv.idle_item_produce_cd))
+	hangInfo.itemTime = nowItemTime
 	local items = role:getProperty("hangBag")
+	coinCount = coinCount + coinDoubleCount
 	items[ItemId.Gold] = (items[ItemId.Gold] or 0) + coinCount * carbonData.money
 	items[ItemId.Exp] = (items[ItemId.Exp] or 0) + coinCount * carbonData.exp
 	items[ItemId.PlayerExp] = (items[ItemId.PlayerExp] or 0) + coinCount * carbonData.playerExp
@@ -48,7 +55,10 @@ local function checkReward(role)
 			curIC = curIC + count
 		end
 	end
-	local selfFC = role:getProperty("hangBagLimit")	--再加上月卡的栏位 TODO
+
+	-- 特权卡挂机额外栏位
+	local privExtraCnt = role.storeData:getHangSlotExtraCount()
+	local selfFC = role:getProperty("hangBagLimit") + privExtraCnt
 	local selfIC = selfFC * globalCsv.idle_field_limit
 	local function randomItem()
@@ -58,34 +68,42 @@ local function checkReward(role)
 		local tempPool = clone(pool)
 		while #tempPool > 0 do
 			local idx = math.randWeight(tempPool, 3)
-			local cur = pool[idx]
-			if (items[cur[1]] and math.ceil((items[cur[1]] + cur[2]) / globalCsv.idle_field_limit) > math.ceil(items[cur[1]] / globalCsv.idle_field_limit))
-					or not items[cur[1]] then	--要占用新栏位的情况
-				local addFC
-				if not items[cur[1]] then
-					addFC = math.ceil(cur[2] / globalCsv.idle_field_limit)
-				else
-					local frontC = items[cur[1]] % globalCsv.idle_field_limit
-					if frontC == 0 then
-						frontC = globalCsv.idle_field_limit
-					end
-					addFC = math.ceil((cur[2] - (globalCsv.idle_field_limit - frontC)) / globalCsv.idle_field_limit)
+			local cur = clone(pool[idx])
+			if cur[1] ~= 1 then  -- 轮空 id
+				if cur[1] == ItemId.BreakCost and doubleTime > 0 then
+					cur[2] = cur[2] * 2
 				end
-				if curFC + addFC <= selfFC then
-					curFC = curFC + addFC
-					items[cur[1]] = (items[cur[1]] or 0) + cur[2]
-					break
+				if (items[cur[1]] and math.ceil((items[cur[1]] + cur[2]) / globalCsv.idle_field_limit) > math.ceil(items[cur[1]] / globalCsv.idle_field_limit))
+						or not items[cur[1]] then	--要占用新栏位的情况
+					local addFC
+					if not items[cur[1]] then
+						addFC = math.ceil(cur[2] / globalCsv.idle_field_limit)
+					else
+						local frontC = items[cur[1]] % globalCsv.idle_field_limit
+						if frontC == 0 then
+							frontC = globalCsv.idle_field_limit
+						end
+						addFC = math.ceil((cur[2] - (globalCsv.idle_field_limit - frontC)) / globalCsv.idle_field_limit)
+					end
+					if curFC + addFC <= selfFC then
+						curFC = curFC + addFC
+						items[cur[1]] = (items[cur[1]] or 0) + cur[2]
+						break
+					else
+						--加不了，换别的东西
+						table.remove(tempPool, idx)
+					end
 				else
-					--加不了，换别的东西
-					table.remove(tempPool, idx)
+					items[cur[1]] = items[cur[1]] + cur[2]
+					break
 				end
 			else
-				items[cur[1]] = items[cur[1]] + cur[2]
 				break
 			end
 		end
 		curIC = curIC + 1
 	end
+
 	for i = 1, itemCount do
 		randomItem()
 	end
@@ -93,6 +111,8 @@ local function checkReward(role)
 	if coinCount > 0 or itemCount > 0 then
 		return true
 	end
+
+	return false
 end
 --开始一个新的关卡
@@ -187,7 +207,8 @@ function _M.endBattleRpc(agent, data)
 	local msg = MsgPack.unpack(data)
 	local hangInfo = role:getProperty("hangInfo")
 	if not msg.key or msg.key ~= _BattleKey then 
-		return 1
+		SendPacket(actionCodes.Hang_endBattleRpc, MsgPack.pack({errorCode = 1}))
+		return true
 	end
 	local carbonId = msg.carbonId
 	local carbonData = csvdb["idle_battleCsv"][carbonId]
@@ -203,7 +224,7 @@ function _M.endBattleRpc(agent, data)
 	if role:checkHangPass(carbonId) then 
 		return 4
 	end
-	local reward
+	local reward, change
 	if msg.starNum and msg.starNum > 0 then --win
 		role:hangFinish(carbonId)
 		if carbonData.main ~= 1 then
@@ -217,7 +238,7 @@ function _M.endBattleRpc(agent, data)
 		for itemId, count in pairs(carbonData.item_clear:toNumMap()) do
 			reward[itemId] = count
 		end
-		reward = role:award(reward, {log = {desc = "hangBattle", int1 = carbonId}})
+		reward, change = role:award(reward, {log = {desc = "hangBattle", int1 = carbonId}})
 		role:checkTaskEnter("HangPass", {id = carbonId})
 	end
@@ -229,6 +250,7 @@ function _M.endBattleRpc(agent, data)
 	SendPacket(actionCodes.Hang_endBattleRpc, MsgPack.pack({
 		starNum = msg.starNum, 
 		reward = reward,
+		change = change,
 		}))
 	return true
 end
@@ -276,7 +298,7 @@ function _M.getRewardRpc(agent , data)
 	checkReward(role)
 	local items = role:getProperty("hangBag")
 	if not next(items) then return end
-	local reward = role:award(items, {log = {desc = "hangReward"}})
+	local reward, change = role:award(items, {log = {desc = "hangReward"}})
 	table.clear(items)
 	local hangInfo = role:getProperty("hangInfo")
 	local nowTime = skynet.timex()
@@ -291,7 +313,8 @@ function _M.getRewardRpc(agent , data)
 		role:checkTaskEnter("HangGetGold", {count = reward[ItemId.Gold]})
 	end
 	SendPacket(actionCodes.Hang_getRewardRpc, MsgPack.pack({
-		reward = reward
+		reward = reward,
+		change = change
 	}))
 	return true
 end
@@ -389,13 +412,23 @@ function _M.quickRpc(agent , data)
 		reward[cur[1]] = (reward[cur[1]] or 0) + cur[2]
 	end
-	reward = role:award(reward, {log = {desc = "quickHang", int1 = hangInfo.carbonId}})
+	-- 特权卡获取加速获得额外道具
+	local coef = role.storeData:getProduceItemSpeedCoef()
+	if coef > 1 then
+		for k, cnt in pairs(reward) do
+			reward[k] = math.floor(cnt * coef)
+		end
+	end
+
+	local change
+	reward, change = role:award(reward, {log = {desc = "quickHang", int1 = hangInfo.carbonId}})
 	if reward[ItemId.Gold] then
 		role:checkTaskEnter("HangGetGold", {count = reward[ItemId.Gold]})
 	end
 	role:checkTaskEnter("HangQuick")
 	SendPacket(actionCodes.Hang_quickRpc, MsgPack.pack({
-		reward = reward
+		reward = reward,
+		change = change
 	}))
 	return true
 end
@@ -494,10 +527,13 @@ function _M.endBonusBattleRpc(agent, data)
 	local starNum = msg.starNum
 	if not role.__bonusBattleCache then return 1 end
-	if role.__bonusBattleCache.id ~= id or role.__bonusBattleCache.key ~= key then return 2 end
+	if role.__bonusBattleCache.id ~= id or role.__bonusBattleCache.key ~= key then 
+		SendPacket(actionCodes.Hang_endBonusBattleRpc, MsgPack.pack({errorCode = 1}))
+		return true
+	end
 	local bonusData = csvdb["bonus_battleCsv"][id]
-	local reward
+	local reward, change
  	if starNum and starNum > 0 then
  		-- 胜利扣除次数
  		local bonusC = role.dailyData:getProperty("bonusC")
@@ -511,7 +547,7 @@ function _M.endBonusBattleRpc(agent, data)
 		if chance[1] ~= 0 then
 			reward[chance[1]] = (reward[chance[1]] or 0) + chance[2]
 		end
- 		reward = role:award(reward, {log = {desc = "bonusBattle", int1 = id}})
+ 		reward, change = role:award(reward, {log = {desc = "bonusBattle", int1 = id}})
  		role:checkTaskEnter("BonusPass", {id = id})
  	end
@@ -519,7 +555,9 @@ function _M.endBonusBattleRpc(agent, data)
 	SendPacket(actionCodes.Hang_endBonusBattleRpc, MsgPack.pack({
 		starNum = starNum, 
-		reward = reward}))
+		reward = reward,
+		change = change
+	}))
 	return true
 end
@@ -534,12 +572,12 @@ function _M.hangGiftRpc(agent, data)
 	local hangGift = role:getProperty("hangGift")
 	if hangGift[id] then return 2 end
-	local reward = role:award(carbonData.item_clear_special, {log = {desc = "hangGift", int1 = id}})
+	local reward, change = role:award(carbonData.item_clear_special, {log = {desc = "hangGift", int1 = id}})
 	role:log("hang_action", {desc = "hangGift",  int1 = id})
 	role:changeUpdates({{type = "hangGift", field = id, value = 1}})
-	SendPacket(actionCodes.Hang_hangGiftRpc, MsgPack.pack(reward))
+	SendPacket(actionCodes.Hang_hangGiftRpc, MsgPack.pack({reward = reward, change = change}))
 	return true
 end
@@ -577,9 +615,9 @@ function _M.chatLineRpc(agent, data)
 	chatline[id] = skynet.timex()
 	role:updateProperty({field = "chatline", value = chatline})
-	local reward = role:award(idleData.chatline_reward, {log = {desc = "chatline", int1 = id}})
+	local reward, change = role:award(idleData.chatline_reward, {log = {desc = "chatline", int1 = id}})
-	SendPacket(actionCodes.Hang_chatLineRpc, MsgPack.pack(reward))
+	SendPacket(actionCodes.Hang_chatLineRpc, MsgPack.pack({reward = reward, change = change}))
 	return true
 end
@@ -600,15 +600,12 @@ function _M.createHeroRandomRpc(agent, data)
 	local temp = randomData.gift1:randWeight(true)
 	if not temp or not next(temp) then return end
-	local reward = {}
-	if role:isHaveHero(temp[1]) then
-		reward = {[temp[1]] = cost}
-	else
-		reward = {[temp[1] + ItemStartId.Hero] = 1}
-	end
+
 	role:costItems({[itemId] = cost}, {log = {desc = "createHeroRandom"}})
-	reward = role:award(reward, {log = {desc = "createHeroRandom"}})
-	SendPacket(actionCodes.Hero_createHeroRandomRpc, MsgPack.pack({reward = reward}))
+	local reward, change = role:award({[temp[1] + ItemStartId.Hero] = 1}, {log = {desc = "createHeroRandom"}})
+
+
+	SendPacket(actionCodes.Hero_createHeroRandomRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -677,15 +674,14 @@ function _M.getResetRewardRpc(agent, data)
 	for itemId, count in pairs(reward) do
 		reward[itemId] = math.floor(count * globalCsv.unit_back_discount)
 	end
-	reward = role:award(reward, {log = {desc = "resetHero", int1 = msg.id, int2 = hero:getProperty("type")}})
+	local change
+	reward, change = role:award(reward, {log = {desc = "resetHero", int1 = msg.id, int2 = hero:getProperty("type")}})
-	SendPacket(actionCodes.Hero_getResetRewardRpc, MsgPack.pack({reward = reward}))
+	SendPacket(actionCodes.Hero_getResetRewardRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
-
-
-function _M.drawHeroRpc(agent, data)
+function _M.unuse_drawHeroRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
@@ -923,32 +919,213 @@ function _M.drawHeroRpc(agent, data)
 	return true
 end
--- function _M.repayHeroRpc(agent, data)
--- 	local role = agent.role
+function _M.drawHeroRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
--- 	local repayHero = role:getProperty("repayHero")
--- 	if repayHero < globalCsv.draw_super_repay_count then
--- 		return
--- 	end
+	if not role:isFuncUnlock(FuncUnlock.GetHero) then return end
+	local btype = msg.pool	-- 1 2 3	卡池类型
+	local subType = msg.subType	or 1-- 定向卡池需要传 子类型
+	local drawType = msg.type -- 1 单抽 2 十连
+	local guide = msg.guide -- 是否是引导抽的
+	if btype ~= 1 then
+		subType = 1
+	end
+	
+	local buildTypeData = csvdb["build_typeCsv"][btype]
+	if not buildTypeData then return 1 end
--- 	role:updateProperty({field = "repayHero", value = 0})
--- 	local id = math.randWeight(csvdb["build_giftCsv"], "pool_1")
-
--- 	local reward = {}
--- 	local itemData = csvdb["itemCsv"][id]
--- 	if itemData.type == ItemType.Hero and role:isHaveHero(itemData.id - ItemStartId.Hero) then
--- 		local fragId = itemData.id - ItemStartId.Hero
--- 		local heroData = csvdb["unitCsv"][fragId]
--- 		local count = globalCsv.draw_unit_tofragment[heroData.rare]
--- 		role:award({[fragId] = count}, {log = {desc = "heroRepay"}})
--- 		reward = {id = fragId, count = count, from = id, fcount = 1}
--- 	else
--- 		role:award({[id] = 1}, {log = {desc = "heroRepay"}})
--- 		reward = {id = id, count = 1}
--- 	end
--- 	role:log("hero_action", {desc = "heroRepay"})
--- 	SendPacket(actionCodes.Hero_repayHeroRpc, MsgPack.pack({reward = reward}))
--- 	return true
--- end
+	local drawCount = {1, 10} -- 抽取次数
+	if not drawCount[drawType] then return 2 end
+
+	-- 计算抽卡消耗品
+	local cost = {}
+	local lastCount = drawCount[drawType]
+	for _, costType in ipairs({"draw_card", "draw_coin"}) do
+		if buildTypeData[costType] ~= "" then
+			local curCost = buildTypeData[costType]:toArray(true, "=")
+			local hadCount = role:getItemCount(curCost[1])
+			local curCount = math.floor(hadCount / curCost[2])
+			if curCount >= lastCount then
+				cost[curCost[1]] = curCost[2] * lastCount
+				lastCount = 0
+				break
+			elseif curCount > 0 then
+				cost[curCost[1]] = curCost[2] * curCount
+				lastCount = lastCount - curCount
+			end
+		end
+	end
+	if lastCount > 0 then -- 钱不够
+		return 3
+	end
+
+	-- 抽取的池子
+	local poolMap = buildTypeData["pool"]:toNumMap()
+	local poolId = poolMap[subType]
+	if not poolId then return end
+	
+	--判断定向卡池是否开启
+	if btype == 1 then
+			if not role:isTimeResetOpen(TimeReset["DrawType" .. subType]) then
+				local unlockPool = role.dailyData:getProperty("unlockPool")
+				if not unlockPool[subType] then
+					return 1
+				end
+			end
+	end
+
+	--TODO 活动覆盖
+
+	local unitPool = csvdb["build_unitCsv"][poolId]
+	if not unitPool then return 4 end
+
+	-- 开始抽
+	local resultPool = {}
+	local function fillDrawPool()
+		local condition = {"rare", "camp"}
+		local values = {}
+
+		for idx, field in ipairs(condition) do
+			if not values[idx] then
+				local lpool = {}
+				local curIdx = 1
+				while unitPool[field .. "_" .. curIdx] do
+					lpool[curIdx] = {unitPool[field .. "_" .. curIdx]}
+					curIdx = curIdx + 1
+				end
+
+				if next(lpool) then
+					values[idx] =  math.randWeight(lpool, 1)
+				end
+			end
+		end
+
+		for itemId, oneData in pairs(csvdb["build_poolCsv"]) do
+			if oneData["pool_" .. poolId] and oneData["pool_" .. poolId] ~= "" then
+				local itemData = csvdb["itemCsv"][itemId]
+				while itemData do
+					if itemData.type ~= ItemType.Hero then break end
+					local heroData = csvdb["unitCsv"][itemData.id - ItemStartId.Hero]
+					if not heroData then break end
+					local ok = true
+					for idx, field in ipairs(condition) do
+						if heroData[field] ~= values[idx] then ok = false break end
+					end
+					if not ok then break end
+					if oneData["pool_" .. poolId] > 0 then
+						resultPool[itemId] = {oneData["pool_" .. poolId]}  -- itemId, count, 概率
+					end
+					break
+				end
+			end
+		end
+	end
+
+	role:costItems(cost, {log = {desc = "drawHero", short1 = btype, int1 = poolId}})
+
+	local ssrCount = 0
+	local reward = {}
+	for i = 1, drawCount[drawType] do
+		resultPool = {}
+		while not next(resultPool) do
+			fillDrawPool()
+		end
+
+		-- 引导必送 613 丝路德
+		local itemId = guide and 613 or math.randWeight(resultPool, 1)
+		local itemData = csvdb["itemCsv"][itemId]
+		if itemData.quality == HeroQuality.SSR then
+			ssrCount = ssrCount + 1
+		end
+
+		if role:isHaveHero(itemData.id - ItemStartId.Hero) then
+			local fragId = itemData.id - ItemStartId.Hero
+			local heroData = csvdb["unitCsv"][fragId]
+			local count = globalCsv.draw_unit_tofragment[heroData.rare]
+			role:award({[fragId] = count}, {log = {desc = "drawHero", short1 = btype, int1 = poolId}})
+			table.insert(reward, {id = fragId, count = count, from = itemId, fcount = 1})
+		else
+			role:award({[itemId] = 1}, {log = {desc = "drawHero", short1 = btype, int1 = poolId}})
+			table.insert(reward, {id = itemId, count = 1})
+		end
+	end
+
+	if btype == 1 or btype == 2 then
+		local repayHero = role:getProperty("repayHero") or 0
+		repayHero = repayHero + drawCount[drawType]
+		role:updateProperty({field = "repayHero", value = repayHero})
+	end
+
+	role:checkTaskEnter("DrawHero", {pool = btype, count = drawCount[drawType]})
+	if ssrCount > 0 then
+		role:checkTaskEnter("DrawSSR", {count = ssrCount})
+	end
+	role:log("hero_action", {desc = "drawHero", short1 = btype, int1 = drawCount[drawType], int2 = poolId})
+	SendPacket(actionCodes.Hero_drawHeroRpc, MsgPack.pack({reward = reward})) -- 这个 reward 是数组
+	return true
+end
+
+function _M.repayHeroRpc(agent, data)
+	local role = agent.role
+
+	local repayHero = role:getProperty("repayHero")
+	local cnt = globalCsv.draw_times_to_get_ssr or 100
+	if repayHero < cnt then
+		return
+	end
+	local result = repayHero - cnt
+
+	role:updateProperty({field = "repayHero", value = result})
+	local id = math.randWeight(csvdb["build_giftCsv"], "pool_1")
+
+	local reward = {}
+	local itemData = csvdb["itemCsv"][id]
+	if itemData.type == ItemType.Hero and role:isHaveHero(itemData.id - ItemStartId.Hero) then
+		local fragId = itemData.id - ItemStartId.Hero
+		local heroData = csvdb["unitCsv"][fragId]
+		local count = globalCsv.draw_unit_tofragment[heroData.rare]
+		role:award({[fragId] = count}, {log = {desc = "heroRepay"}})
+		reward = {id = fragId, count = count, from = id, fcount = 1}
+	else
+		role:award({[id] = 1}, {log = {desc = "heroRepay"}})
+		reward = {id = id, count = 1}
+	end
+	role:log("hero_action", {desc = "heroRepay", int1=result})
+	SendPacket(actionCodes.Hero_repayHeroRpc, MsgPack.pack({reward = reward}))
+	return true
+end
+
+function _M.unlockPoolRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+
+	if not role:isFuncUnlock(FuncUnlock.GetHero) then return end
+	local type = msg.type -- 指定定向卡池需要类型  1, 2, 3
+	local needCost = true
+	--当前开启的类型不用解锁
+	if role:isTimeResetOpen(TimeReset["DrawType" .. type]) then
+		needCost = false
+	end
+	--已经解锁的不需要重复解锁
+	local unlockPool = role.dailyData:getProperty("unlockPool")
+	if unlockPool[type] then
+		needCost = false
+	end
+
+	if needCost then
+		if not role:costDiamond({count = globalCsv.draw_unlock_pool_diamond or 300, log = {desc = "unlockPool", short1 = type}}) then
+			return
+		end
+	end
+
+	unlockPool[type] = 1
+	role.dailyData:updateProperty({field="unlockPool", value = unlockPool})
+	role.dailyData:updateProperty({field="curPool", value = type})
+
+	role:log("hero_action", {desc = "unlockPool", short1=type})
+	SendPacket(actionCodes.Hero_unlockPoolRpc, MsgPack.pack({}))
+	return true
+end
 return _M
 \ No newline at end of file
@@ -148,13 +148,32 @@ function _M.gm_action(query)
 end
 function _M.broadcast(query)
-	local bin = MsgPack.pack({body = query.content})
-	local codes = {
-		["common"] = actionCodes.Sys_commonNotice,
-		["maintain"] = actionCodes.Sys_maintainNotice,
+	local msg = {}
+	local handle = {
+		["common"] = {
+			code = actionCodes.Sys_commonNotice,
+			exec = function()
+				msg["body"] = query.content
+			end
+		},
+		["maintain"] = {
+			code = actionCodes.Sys_maintainNotice,
+			exec = function()
+				msg["body"] = query.content
+			end
+		},
+		["custom"] = {
+			code = actionCodes.Sys_customNotice,
+			exec = function()
+				msg["title"] = query.title
+				msg["body"] = query.content
+				msg["logout"] = query.logout
+			end
+		}
 	}
-	if not codes[query.cmd] then return "错误" end
-	mcast_util.pub_world(codes[query.cmd], bin)
+	if not handle[query.cmd] then return "错误" end
+	handle[query.cmd].exec()
+	mcast_util.pub_world(handle[query.cmd].code, MsgPack.pack(msg))
 	return "广播成功"
 end
@@ -311,7 +311,8 @@ function _M.endBattleRpc(agent, data)
 	local msg = MsgPack.unpack(data)
 	if not msg.key or not _pvpStartBattleCacheC or msg.key ~= _pvpStartBattleCacheC.key then 
-		return 1
+		SendPacket(actionCodes.Pvp_endBattleRpc, MsgPack.pack({errorCode = 1}))
+		return true
 	end
 	if not msg.idx or msg.idx ~= _pvpStartBattleCacheC.idx then
@@ -334,7 +335,7 @@ function _M.endBattleRpc(agent, data)
 	if not match then return end
 	local temp = string.randWeight(csvdb["player_expCsv"][role:getProperty("level")].pvpBonus, true)
-	local reward = role:award({[temp[1]] = temp[2]}, {log = {desc = "pvpBattleC"}})
+	local reward, change = role:award({[temp[1]] = temp[2]}, {log = {desc = "pvpBattleC"}})
 	local myScore, matchScore, oldmyScore, oldMatchScore, myRank, oldMyRank = role:changePvpScoreCommon(match.t == 1 and match.id or -1, isWin)
 	_pvpBattleInfoCacheC = {}  --重新发阵容了 没毛病
@@ -349,12 +350,13 @@ function _M.endBattleRpc(agent, data)
 		["time"] = now,
 	}
 	local status, body = httpc.get(remoteUrl, "/applyvideo?" .. httpGetFormatData(params), {}, {})
-	local video = nil
+	local video, headers = nil, nil
 	if tonumber(status) == 200 then
 		local result = json.decode(body)
 		video = result.name
+		headers = result.headers
 	else
-		skynet.error("applyvideo", "error", status, body, content)
+		skynet.error("applyvideo", "error", status, body)
 	end
 	-- 加入战斗记录
@@ -394,6 +396,7 @@ function _M.endBattleRpc(agent, data)
 	SendPacket(actionCodes.Pvp_endBattleRpc, MsgPack.pack({
 		reward = reward,
+		change = change,
 		myScore = myScore,
 		matchScore = matchScore,
 		oldmyScore = oldmyScore,
@@ -401,6 +404,7 @@ function _M.endBattleRpc(agent, data)
 		myRank = myRank,
 		oldMyRank = oldMyRank,
 		video = video,
+		headers = headers,
 	}))
 	return true
 end
@@ -536,7 +540,8 @@ function _M.endBattleHRpc(agent, data)
 	local msg = MsgPack.unpack(data)
 	if not msg.key or not _pvpStartBattleCacheH or msg.key ~= _pvpStartBattleCacheH.key then 
-		return 1
+		SendPacket(actionCodes.Pvp_endBattleHRpc, MsgPack.pack({errorCode = 1}))
+		return true
 	end
 	if not msg.idx or msg.idx ~= _pvpStartBattleCacheH.idx then
@@ -565,12 +570,13 @@ function _M.endBattleHRpc(agent, data)
 		["time"] = now,
 	}
 	local status, body = httpc.get(remoteUrl, "/applyvideo?" .. httpGetFormatData(params), {}, {})
-	local video = nil
+	local video, headers = nil, nil
 	if tonumber(status) == 200 then
 		local result = json.decode(body)
 		video = result.name
+		headers = result.headers
 	else
-		skynet.error("applyvideo", "error", status, body, content)
+		skynet.error("applyvideo", "error", status, body)
 	end
 	table.insert(_pvpStartBattleCacheH.result, {
@@ -611,13 +617,14 @@ function _M.endBattleHRpc(agent, data)
 			key = key, --战斗校验 key
 			round = round, -- 战斗场数索引
 			video = video, -- 返回让客户端上传录像
+			headers = headers,
 		}))
 		return true
 	end
 	-- 战斗结束了发奖 
 	local temp = string.randWeight(csvdb["player_expCsv"][role:getProperty("level")].pvpgroupBonus, true)
-	local reward = role:award({[temp[1]] = temp[2]}, {log = {desc = "pvpBattleH"}})
+	local reward, change = role:award({[temp[1]] = temp[2]}, {log = {desc = "pvpBattleH"}})
 	local myScore, matchScore, oldmyScore, oldMatchScore, myRank, oldMyRank = 0, 0, 0, 0, 0, 0
 	if role:isTimeResetOpen(TimeReset.PvpHight) then 
 		myScore, matchScore, oldmyScore, oldMatchScore, myRank, oldMyRank = role:changePvpScoreHigh(match.t == 1 and match.id or -1, isWin)
@@ -690,6 +697,7 @@ function _M.endBattleHRpc(agent, data)
 	SendPacket(actionCodes.Pvp_endBattleHRpc, MsgPack.pack({
 		reward = reward,
+		change = change,
 		myScore = myScore,
 		matchScore = matchScore,
 		oldmyScore = oldmyScore,
@@ -833,10 +841,10 @@ function _M.highDivisionGiftRpc(agent, data)
 		pvpHGift = {},
 	})
-	local reward = role:award(newReward, {log = {desc = "pvpDivisionH"}})
+	local reward, change = role:award(newReward, {log = {desc = "pvpDivisionH"}})
 	role:log("pvp_action", {desc = "pvpDivisionH"})
-	SendPacket(actionCodes.Pvp_highDivisionGiftRpc, MsgPack.pack({reward = reward}))
+	SendPacket(actionCodes.Pvp_highDivisionGiftRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -867,11 +875,11 @@ function _M.shopBuyRpc(agent, data)
 	for id, c in pairs(gift) do
 		gift[id] = c * count
 	end
-	local reward = role:award(gift, {log = {desc = "pvpShop", int1 = id, int2 = count}})
+	local reward, change = role:award(gift, {log = {desc = "pvpShop", int1 = id, int2 = count}})
 	role:log("pvp_action", {desc = "pvpShop", int1 = id, int2 = count})
-	SendPacket(actionCodes.Pvp_shopBuyRpc, MsgPack.pack({reward = reward}))
+	SendPacket(actionCodes.Pvp_shopBuyRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -95,7 +95,6 @@ function _M.loginRpc( agent, data )
 		role:load()
 		role:loadAll()
 		role:startActionUcode()
-		role:setProperty("ltime", now)
 	else
 		role:reloadWhenLogin()
 	end
@@ -128,8 +127,10 @@ function _M.loginRpc( agent, data )
 	redisproxy:zadd(FRIEND_RECOMMEND, now, roleId)
-	for _, name in ipairs({"dailyData", "dinerData", "activity"}) do
+	for _, name in ipairs({"dailyData", "dinerData", "activity", "storeData"}) do
 		response[name] = role[name]:data()
+		--print("["..name.."]")
+		--dump(response[name])
 	end
 	response.role = role:data()
@@ -408,9 +409,9 @@ function _M.saleItemRpc(agent, data)
 	end	
 	role:costItems(backs, {log = {desc = "saleItem"}})
-	local reward = role:award(reward, {log = {desc = "saleItem"}})
+	local reward, change = role:award(reward, {log = {desc = "saleItem"}})
 	role:checkTaskEnter("DecoFrag", {count = fragCount})
-	SendPacket(actionCodes.Role_saleItemRpc, MsgPack.pack({reward = reward}))
+	SendPacket(actionCodes.Role_saleItemRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -447,9 +448,10 @@ function _M.openItemRpc(agent, data)
 	reward[0] = nil
 	role:costItems({[itemId] = count}, {log = {desc = "openItem"}})
-	reward = role:award(reward, {log = {desc = "openItem", int1 = itemId, int2 = count}})
+	local change
+	reward, change = role:award(reward, {log = {desc = "openItem", int1 = itemId, int2 = count}})
-	SendPacket(actionCodes.Role_openItemRpc, MsgPack.pack({reward = reward}))
+	SendPacket(actionCodes.Role_openItemRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -458,10 +460,15 @@ function _M.openTimeBoxRpc(agent, data)
 	local msg = MsgPack.unpack(data)
 	local oper = msg.oper  -- 操作 1 - 2
 	local slot = msg.slot  -- 位置 1 - 6
-	if math.illegalNum(slot, 1, role:getFuncLv(FuncOpenType.TimeBoxSlot)) then return 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 = {}
+	local reward, change = {}
 	if oper == 1 then	-- 打开
 		local itemId = msg.itemId
 		if role:getItemCount(itemId) < 1 then return end
@@ -509,15 +516,15 @@ function _M.openTimeBoxRpc(agent, data)
 		reward[0] = nil
 		boxL[slot] = nil
-		reward = role:award(reward, {log = {desc = "openTimeBox", int1 = boxId}})
-		role:checkTaskEnter("OpenBox", {id = boxId})
+		reward, change = role:award(reward, {log = {desc = "openTimeBox", int1 = boxId}})
+		role:checkTaskEnter("OpenBox", {id = boxId, count=1})
 	else
 		return
 	end
 	role:setProperty("boxL") --刷新
 	role:changeUpdates({{type = "boxL", field = slot, value = boxL[slot], isOnlyToC = true}}) -- 通知客户端
-	SendPacket(actionCodes.Role_openTimeBoxRpc, MsgPack.pack({reward = reward}))
+	SendPacket(actionCodes.Role_openTimeBoxRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -568,9 +575,10 @@ function _M.openSpeedUpBoxRpc(agent, data)
 	end
 	role:costItems({[id] = count}, {log = {desc = "speedUpBox"}})
-	reward = role:award(reward, {log = {desc = "speedUpBox"}, int1 = id, int2 = count})
+	local change
+	reward, change = role:award(reward, {log = {desc = "speedUpBox"}, int1 = id, int2 = count})
-	SendPacket(actionCodes.Role_openSpeedUpBoxRpc, MsgPack.pack({reward = reward}))
+	SendPacket(actionCodes.Role_openSpeedUpBoxRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -596,8 +604,8 @@ function _M.storyBookRewardRpc(agent, data)
 	storyStatus[storyId] = storyStatus[storyId] or {}
 	storyStatus[storyId].s = -1
 	role:changeUpdates({{ type = "storyB", field = storyId, value = storyStatus[storyId] }})
-	local reward = role:award(storyBookData.gift, {log = {desc = "storybookReward", int1 = storyId}})
-	SendPacket(actionCodes.Role_storyBookRewardRpc, MsgPack.pack({reward = reward}))
+	local reward, change = role:award(storyBookData.gift, {log = {desc = "storybookReward", int1 = storyId}})
+	SendPacket(actionCodes.Role_storyBookRewardRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -633,7 +641,7 @@ function _M.taskRpc(agent, data)
 	if not role:isFuncUnlock(FuncUnlock.TaskAchiv) then return end
-	local taskType = msg.type -- 1 日常 2 周长
+	local taskType = msg.type -- 1 日常 2 周常
 	local taskId = msg.id --任务id
 	local roleField = {"dTask", "wTask"}
 	if not roleField[taskType] then return 1 end
@@ -648,15 +656,18 @@ function _M.taskRpc(agent, data)
 		return 3
 	end
-	local reward = role:award(taskData.reward, {log = {desc = "finishTask", int1 = taskType, int2 = taskId}})
+	local reward, change = role:award(taskData.reward, {log = {desc = "finishTask", int1 = taskType, int2 = taskId}})
 	local active = (taskStatus["a"] or 0) + taskData.active
 	role:changeUpdates({
 		{ type = roleField[taskType], field = {"t", taskId}, value = -1 },
-		{ type = roleField[taskType], field = "a", value = active}
+		{ type = roleField[taskType], field = "a", value = active},
 	})
-	SendPacket(actionCodes.Role_taskRpc, MsgPack.pack({reward = reward}))
+	local oldVal = role:getProperty("battlePoint") or 0
+	role:updateProperty({field = "battlePoint", value = oldVal + taskData.active})
+
+	SendPacket(actionCodes.Role_taskRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -681,12 +692,12 @@ function _M.taskActiveRpc(agent, data)
 		return
 	end
-	local reward = role:award(taskData.reward, {log = {desc = "taskActive", int1 = taskType, int2 = taskId}})
+	local reward, change = role:award(taskData.reward, {log = {desc = "taskActive", int1 = taskType, int2 = taskId}})
 	role:changeUpdates({
 		{ type = roleField[taskType], field = {"at", taskId}, value = -1 }
 	})
-	SendPacket(actionCodes.Role_taskActiveRpc, MsgPack.pack({reward = reward}))
+	SendPacket(actionCodes.Role_taskActiveRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -712,7 +723,7 @@ function _M.achiveRpc(agent, data)
 		return 3
 	end
-	local reward = role:award(achiveTask.reward, {log = {desc = "finishAchive", int1 = taskId}})
+	local reward, change = role:award(achiveTask.reward, {log = {desc = "finishAchive", int1 = taskId}})
 	role:changeUpdates({
 		{ type = "achiveV", field = taskId, value = skynet.timex() }
 	})
@@ -745,7 +756,7 @@ function _M.achiveRpc(agent, data)
 		end
 	end
-	SendPacket(actionCodes.Role_achiveRpc, MsgPack.pack({reward = reward}))
+	SendPacket(actionCodes.Role_achiveRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -921,11 +932,12 @@ function _M.drawCodeRpc(agent, data)
 		if ret == 0 then
 			local giftId = tonumber(result.giftId)
 			role:setProperty("codeStr", codestr:setv(giftId, 1))
-			local reward = role:award(result.gift, {log = {desc = "drawCode", key1 = code, int1 = giftId}})
+			local reward, change = role:award(result.gift, {log = {desc = "drawCode", key1 = code, int1 = giftId}})
 			SendPacket(actionCodes.Role_drawCodeRpc, MsgPack.pack({
 				result = ret,
 				reward = reward,
+				change = change,
 			}))
 			return true
 		end
@@ -1044,10 +1056,12 @@ function _M.goldBuyRpc(agent, data)
 	if goldC == 0 then
 		return 3
 	end
+	local coef = role.storeData:getGearExchangeCoef()
+	goldC = goldC * coef
 	role.dailyData:updateProperty({field = "goldBuyT", value = curT + 1})
 	role:costItems({[ItemId.Diamond] = costD}, {log = {desc = "goldBuy"}})
-	local reward = role:award({[ItemId.Gold] = goldC}, {log = {desc = "goldBuy"}})
-	SendPacket(actionCodes.Role_goldBuyRpc, MsgPack.pack({reward = reward}))
+	local reward, change = role:award({[ItemId.Gold] = math.floor(goldC)}, {log = {desc = "goldBuy"}})
+	SendPacket(actionCodes.Role_goldBuyRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
@@ -255,4 +255,169 @@ function _M.dinerBuyRpc(agent , data)
 	return true
 end
+function _M.shopBuyRpc(agent , data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local id = msg.id
+	local count = msg.count or 1
+
+	local dataSet = csvdb["shop_normalCsv"][id]
+	if not dataSet then return end
+
+	local buyRecord = role.storeData:getProperty("buyR")
+	if math.illegalNum(count, 1, (dataSet.limit == 0 and math.huge or dataSet.limit - (buyRecord[id] or 0))) then 
+		skynet.error(string.format("shop buy over limit, user_id:%d, goods_id:%d", role:getProperty("id"), id))
+		return 1 
+	end
+
+	local cost = {[dataSet.icon] = dataSet.cost * count}
+
+	local desc = "unknown"
+	if dataSet.shop == 1 then		-- 普通商店
+		desc = "dailyShop"
+		local dailySDD = role.dailyData:getProperty("dailySDD")
+		if dailySDD[id] then -- 折扣
+			cost = math.ceil(dataSet.cost * (1 - dataSet.disount / 100))
+		end
+	elseif dataSet.shop == 2 then		-- 美食商店
+		desc = "dinerShop"
+	elseif dataSet.shop == 3 then		-- 竞技场商店
+		desc = "pvpShop"
+	end
+
+	if not role:checkItemEnough(cost) then return end
+
+	if dataSet.limit ~= 0 then
+		buyRecord[id] = (buyRecord[id] or 0) + count
+		role.storeData:updateProperty({field = "buyR", value = buyRecord})
+	end
+	role:costItems(cost, {log = {desc = desc, int1 = id, int2 = count}})
+
+	local gift = {}
+	for _id, _count in pairs(dataSet.gift:toNumMap()) do
+		gift[_id] = _count * count
+	end
+	local reward = role:award(gift, {log = {desc = desc, int1 = id, int2 = count}})
+	
+	if dataSet.shop == 1 then
+		role:checkTaskEnter("ShopAll", {count = count})
+	end
+	role:log("role_action", {desc = desc, int1 = id, int2 = count})
+
+	SendPacket(actionCodes.Store_shopBuyRpc, MsgPack.pack({reward = reward}))
+	return true
+end
+
+function _M.getFreeChestRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local id = msg.id
+
+	local config = csvdb["shop_rechargeCsv"][id]
+	if not config then return end
+
+    local rechargeRecord = role.storeData:getProperty("payR")
+	local getCount = (rechargeRecord[id] or 0)
+	if getCount >= config.limit then
+		return 1
+	end
+	local reward, _ = role:award(config.itemFirst, {log = {desc = "freeGift", int1 = id}})
+
+	rechargeRecord[id] = getCount + 1
+	role.storeData:updateProperty({field = "payR", value = rechargeRecord})
+
+	SendPacket(actionCodes.Store_getFreeChestRpc, MsgPack.pack({reward = reward}))
+	return true
+end
+
+function _M.getGrowFundRewardRpc(agent, data)	
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local id = msg.id
+
+	local config = csvdb["reward_newbeeCsv"][id]
+	if not config then return end
+
+    local growFundFlag = role.storeData:getProperty("growFund")
+	local growFundRecord = role.storeData:getProperty("growFundR")
+	
+	if growFundFlag == 0 then
+		skynet.error("user do not buy grow fund")
+		return 1
+	end
+
+	if not role:checkHangPass(config.condition) then
+		skynet.error(string.format("user do not finish hang pass, user_id:%d", role:getProperty("id")))
+		return 1
+	end
+
+	local b = string.getbit(growFundRecord, id)
+	if string.char(b) == "1" then
+		return 1
+	end
+
+	growFundRecord = string.setbit(growFundRecord, id)
+	role.storeData:updateProperty({field = "growFundR", value = growFundRecord})
+
+	local gift = config.giftFree .. " " .. config.giftLimit
+	local reward, _ = role:award(gift, {log = {desc = "grownFund", int1 = id}})
+
+	SendPacket(actionCodes.Store_getGrowFundRewardRpc, MsgPack.pack({reward = reward}))
+	return true
+end
+
+function _M.getBattlePassRewardRpc(agent, data)	
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local id = msg.id
+
+	local config = csvdb["reward_battlepassCsv"][id]
+	if not config then return end
+
+	local timeNow = skynet.timex()
+    local battleCardFlag = role.storeData:getProperty("battleCard")
+	local battleCardFreeRecord = role.storeData:getProperty("battleFR")
+	local battleCardLimitRecord = role.storeData:getProperty("battleLR")
+
+	local freeFlag = string.char(string.getbit(battleCardFreeRecord, id))
+	local limitFlag = string.char(string.getbit(battleCardLimitRecord, id))
+
+	if freeFlag == "1" and limitFlag == "1" then
+		skynet.error("user already get battle pass reward")
+		return 1
+	end
+
+	if battleCardFlag == 1 and limitFlag == "1" then
+		return 1
+	end
+
+	if role:getProperty("battlePoint") < config.point then
+		skynet.error(string.format("user do not have enough battle point, user_id:%d", role:getProperty("id")))
+		return 1
+	end
+
+	local gift = ""
+	if  freeFlag == "0" then
+		gift = config.giftFree
+
+		battleCardFreeRecord = string.setbit(battleCardFreeRecord, id)
+		role.storeData:updateProperty({field = "battleFR", value = battleCardFreeRecord})
+	end
+
+	if battleCardFlag == 1 and limitFlag == "0" then
+		if gift ~= "" then
+			gift = gift .. " "
+		end
+		gift = gift .. config.giftLimit
+
+		battleCardLimitRecord = string.setbit(battleCardLimitRecord, id)
+		role.storeData:updateProperty({field = "battleLR", value = battleCardLimitRecord})
+	end
+	
+	local reward, _ = role:award(gift, {log = {desc = "battleCard", int1 = id}})
+
+	SendPacket(actionCodes.Store_getBattlePassRewardRpc, MsgPack.pack({reward = reward}))
+	return true
+end
+
 return _M
 \ No newline at end of file
@@ -90,21 +90,24 @@ function _M.endBattleRpc(agent, data)
 	local passTime = msg.passTime
 	local towerInfo = role:getProperty("towerInfo")
-	if towerInfo.l ~= id or not towerInfo.k or towerInfo.k ~= key then return 1 end
+	if towerInfo.l ~= id or not towerInfo.k or towerInfo.k ~= key then 
+		SendPacket(actionCodes.Tower_endBattleRpc, MsgPack.pack({errorCode = 1}))
+		return true
+	end
 	local curTower = csvdb["tower_battleCsv"][id] 
 	if not curTower then return 2 end
 	local curCount, nextTime = getUpdateTime(towerInfo.c, towerInfo.t)
-	local reward
+	local reward, change
 	if msg.starNum and msg.starNum > 0 then --win
 		curCount = math.min(curCount + 1, globalCsv.tower_count_limit) -- 返还次数
 		--排行榜
 		role:setTowerRank(towerInfo.l)
 		towerInfo.l = towerInfo.l + 1
-		reward = role:award(curTower.reward, {log = {desc = "towerBattle", int1 = id}})
+		reward, change = role:award(curTower.reward, {log = {desc = "towerBattle", int1 = id}})
 		role:checkTaskEnter("TowerPass", {level = towerInfo.l - 1})
 	end
@@ -115,7 +118,7 @@ function _M.endBattleRpc(agent, data)
 	role:log("tower_action", {desc = "endBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = id})
-	SendPacket(actionCodes.Tower_endBattleRpc, MsgPack.pack({reward = reward}))
+	SendPacket(actionCodes.Tower_endBattleRpc, MsgPack.pack({reward = reward, change = change}))
 	return true
 end
@@ -778,7 +778,7 @@ function Adv:over(success, rewardRatio, overType)
 	local backAdvCount
 	if not self:isEndless() then
-		backAdvCount = chapterData.limitlevel - self.level
+		backAdvCount = math.floor((chapterData.limitlevel - self.level) / globalCsv.adv_daily_count_back_radio) *  globalCsv.adv_daily_count_back_radio
 		self.owner:changeAdvCount(-backAdvCount)
 	end
@@ -1897,16 +1897,16 @@ function Adv:enemyDead(enemy, escape)
 			self:checkAchievement(Adv.AchievType.Kill, 1, enemyId)
 			self:checkAchievement(Adv.AchievType.KillHadBuff, 1, enemy)
-			self:checkAchievement(Adv.TaskType.KillWithBuff, 1)
-			self:checkAchievement(Adv.TaskType.KillNoBuff, 1)
+			self:checkAchievement(Adv.AchievType.KillWithBuff, 1)
+			self:checkAchievement(Adv.AchievType.KillNoBuff, 1)
 			self:checkAchievement(Adv.AchievType.KillWithMWeapon, 1)
 			self:checkAchievement(Adv.AchievType.KillWithAMWeapon, 1)
 			if monsterData.type == 2 then
 				self:checkTask(Adv.TaskType.KillBoss, 1, enemyId)
-				self:checkAchievement(Adv.TaskType.KillBoss, 1, enemyId)
-				self:checkAchievement(Adv.TaskType.KillBossWithBuff, 1)
-				self:checkAchievement(Adv.TaskType.KillBossNoBuff, 1)
+				self:checkAchievement(Adv.AchievType.KillBoss, 1, enemyId)
+				self:checkAchievement(Adv.AchievType.KillBossWithBuff, 1)
+				self:checkAchievement(Adv.AchievType.KillBossNoBuff, 1)
 				self:checkAchievement(Adv.AchievType.KillBossWithMWeapon, 1)
 				self:checkAchievement(Adv.AchievType.KillBossWithAMWeapon, 1)
 			elseif monsterData.type == 3 then
@@ -332,6 +332,15 @@ function Battle:afterRound()
 	for i = #self.builds[mapIdx], 1, -1 do
 		if self.builds[mapIdx][i].isDead then
 			local build = table.remove(self.builds[mapIdx], i)
+			
+			local room = self.adv:getCurMap().rooms[build.roomId]
+			if room then
+				local block = room.blocks[build.blockId]
+				if block then
+					block:clear()
+					self.adv:backBlockChange(build.roomId, build.blockId)
+				end
+			end
 			build:clear()
 		end
 	end
@@ -256,7 +256,7 @@ function Map:openBlock(roomId, blockId, isPlayer, ignoreBack)
 	if status then
 		if isPlayer then
-			self.adv.battle.player:triggerPassive(Passive.OPEN_BLOCK)
+			self.adv.battle:triggerPassive(Passive.OPEN_BLOCK)
 			self.adv.owner:checkTaskEnter("AdvOpenBlock")
 			-- 潜行检查
@@ -183,12 +183,12 @@ function AdvTask.bind(Adv)
 	-- 完成主线任务
 	function Adv:finishMTask()
-		local ok, reward
+		local ok, reward, change
 		if self.advMTask.status == -1 then  --已完成带领取
 			local mainTaskData = csvdb["adv_questCsv"][self.advMTask.id]
 			if not mainTaskData then return end
 			if mainTaskData.reward == 1 then
-				reward = self.owner:award(mainTaskData.rewardValue, {log = {desc = "advMainTask", int1 = self.advMTask.id}})
+				reward, change = self.owner:award(mainTaskData.rewardValue, {log = {desc = "advMainTask", int1 = self.advMTask.id}})
 			end
 			self.advMTask.id = self.advMTask.id + 1
 			self.advMTask.status = 0
@@ -204,7 +204,7 @@ function AdvTask.bind(Adv)
 			ok = true
 			advTaskChange.m = true
 		end
-		return ok, reward
+		return ok, reward, change
 	end
 	function Adv:updateTask(notNotify)
@@ -388,7 +388,7 @@ function AdvTask.bind(Adv)
 		local achievData = (csvdb["adv_achievementCsv"][chapterId] or {})[taskId]
 		local status = (self.owner:getProperty(achievField)[chapterId] or {})[taskId] or -1
-		local reward = {}
+		local reward, change = {}
 		if status >= achievData.value1 then
 			insertChange(self, chapterId, taskId, -1)
 			local count = (self.owner:getProperty(achievField)[chapterId] or {})[-1] or 0
@@ -396,8 +396,8 @@ function AdvTask.bind(Adv)
 			insertChange(self, chapterId, -1, count)
 			-- 发放奖励
-			reward = self.owner:award(achievData.reward, {log = {desc = "advAchiev", int1 = chapterId, int2 = taskId}})
-			return true, reward
+			reward, change = self.owner:award(achievData.reward, {log = {desc = "advAchiev", int1 = chapterId, int2 = taskId}})
+			return true, reward, change
 		end
 	end
@@ -408,9 +408,9 @@ function AdvTask.bind(Adv)
 		local status = ((self.owner:getProperty(achievField)[chapterId] or {})["pts"] or {})[taskId] or 0
 		if status == -1 or count < achievData.pt then return end
-		local reward = self.owner:award(achievData.reward, {log = {desc = "advAchievReward", int1 = chapterId, int2 = taskId}})
+		local reward, change = self.owner:award(achievData.reward, {log = {desc = "advAchievReward", int1 = chapterId, int2 = taskId}})
 		insertChange(self, chapterId, taskId, -1, true)
-		return true, reward
+		return true, reward, change
 	end
 	function Adv:updateAchievement(notNotify)
-Subproject commit bc23b59073a7200db7f84316fa049019f5495796
+Subproject commit f52151f947b019976eac7ef15ec914bf7d552d64
@@ -3,6 +3,11 @@ local string_format = string.format
 Activity.ActivityType = {
 	Sign = 1,  -- 签到
+	DoubleDrop = 2, -- 双倍掉落
+	FoodSell = 3,	--贩卖周 料理
+	DrawHero = 4,	--抽卡周 招募
+	AdvDraw = 5,	--拾荒抽周 资助
+	OpenBox = 6,	--拆解周 时钟箱
 }
@@ -23,13 +28,23 @@ end
 Activity.schema = {
 	actime 		= {"table", {}},  -- 最近检查某项活动的开始时间  {id = time}
+	round		= {"table", {}},  -- 记录活动到了第几轮  {id = roundnum}
 	act1		= {"table", {}},  -- {0 = day, 1= -1, 2 = -1} == 签到活动
+	act3		= {"table", {}},  -- {0 = 抽卡次数, 1=1, 2=1}  抽卡周活动  1表示领取过该档位的奖励
+	act4		= {"table", {}},  -- {0 = 贩卖数量, 1=1, 2=1}  贩卖周活动  1表示领取过该档位的奖励
+	act5		= {"table", {}},  -- {0 = 拆解数量, 1=1, 2=1}  拆解周活动  1表示领取过该档位的奖励
+	act6		= {"table", {}},  -- {0 = 拾荒消耗远古金币数量, 1=1, 2=1}  拾荒周活动  1表示领取过该档位的奖励
 }
 function Activity:data()
 	return {
 		actime = self:getProperty("actime"),
+		round = self:getProperty("round"),
 		act1 = self:getProperty("act1"),
+		act3 = self:getProperty("act3"),
+		act4 = self:getProperty("act4"),
+		act5 = self:getProperty("act5"),
+		act6 = self:getProperty("act6"),
 	}
 end
@@ -162,6 +177,133 @@ activityFunc[Activity.ActivityType.Sign] = {
 	end,
 }
+--loop1：累计料理贩卖N次
+--loop2：累计招募N次
+--loop3：累计资助N次
+--loop4：时钟箱拆解N个
+function Activity:checkWeeklyAct(actType, notify, count)
+		local actInfoMap = {
+			[Activity.ActivityType.DrawHero] = {mailId = MailId.ActDrawCardReward, table = "activity_loop2Csv"},
+			[Activity.ActivityType.AdvDraw] = {mailId = MailId.ActAdvDrawReward, table = "activity_loop3Csv"},
+			[Activity.ActivityType.OpenBox] = {mailId = MailId.ActOpenBoxReward, table = "activity_loop4Csv"},
+			[Activity.ActivityType.FoodSell] = {mailId = MailId.ActSellFoodReward, table = "activity_loop1Csv"}
+		}
+		local info = actInfoMap[actType]
+		if not info then return end
+
+		local curData = self:getActData(actType)
+		local roundData = self:getProperty("round")
+		local curRound = roundData[actType] or 0
+		local ctrlData = csvdb["activity_ctrlCsv"][actType]
+		if not ctrlData then return end
+		if curRound >= ctrlData.condition then
+			return
+		end
+		curData[0] = (curData[0] or 0) + count
+		local totalCnt = 0
+		local finishCnt = 0
+		local maxCondition = 0
+		for k, cfg in pairs(csvdb[info.table] or {}) do
+			totalCnt = totalCnt + 1
+			if maxCondition < cfg.condition1 then
+				maxCondition = cfg.condition1
+			end
+			if not curData[cfg.id] and curData[0] >= cfg.condition1 then
+				if info.mailId then 
+					self.owner:sendMail(info.mailId, nil, cfg.reward, {cfg.condition1})
+					curData[cfg.id] = 1
+				end
+			end
+			if curData[cfg.id] then
+				finishCnt = finishCnt + 1
+			end
+		end
+		if totalCnt == finishCnt then
+			roundData[actType] = curRound + 1
+			for k,v in pairs(curData) do
+				if k == 0 then
+					curData[k] = curData[0] >= maxCondition and curData[0] - maxCondition or 0
+				else
+					curData[k] = nil
+				end
+			end
+			self:updateProperty({field = "round", value = roundData, notNotify = not notify})
+		end
+		self:updateActData(actType, curData, not notify)
+end
+
+-- 抽卡周
+activityFunc[Activity.ActivityType.DrawHero] = {
+	["check"] = function(self, actType, notify, count) -- 检查
+		self:checkWeeklyAct(actType, notify, count)
+	end,
+	["init"] = function(self, actType, isCrossDay, notify)
+		local roundData = self:getProperty("round")
+		roundData[actType] = 0
+		self:updateProperty({field = "round",  value = roundData, notNotify = not notify})
+	end,
+	-- ["close"] = function(self, actType, notify)
+	-- end,
+	["crossDay"] = function(self, actType, notify)
+		print("cross day draw card")
+		self.owner:sendMail(MailId.ActDrawCard)
+	end,
+}
+
+-- 售卖周
+activityFunc[Activity.ActivityType.FoodSell] = {
+	["check"] = function(self, actType, notify, count) -- 检查
+		self:checkWeeklyAct(actType, notify, count)
+	end,
+	["init"] = function(self, actType, isCrossDay, notify)
+		local roundData = self:getProperty("round")
+		roundData[actType] = 0
+		self:updateProperty({field = "round",  value = roundData, notNotify = not notify})
+	end,
+	-- ["close"] = function(self, actType, notify)
+	-- end,
+	["crossDay"] = function(self, actType, notify)
+		print("cross day sell food")
+		self.owner:sendMail(MailId.ActSellFood)
+	end,
+}
+
+-- 拾荒周
+activityFunc[Activity.ActivityType.AdvDraw] = {
+	["check"] = function(self, actType, notify, count) -- 检查
+		self:checkWeeklyAct(actType, notify, count)
+	end,
+	["init"] = function(self, actType, isCrossDay, notify)
+		local roundData = self:getProperty("round")
+		roundData[actType] = 0
+		self:updateProperty({field = "round",  value = roundData, notNotify = not notify})
+	end,
+	-- ["close"] = function(self, actType, notify)
+	-- end,
+	["crossDay"] = function(self, actType, notify)
+		print("cross day act adv cost")
+		self.owner:sendMail(MailId.ActAdvDraw)
+	end,
+}
+
+-- 拆解周
+activityFunc[Activity.ActivityType.OpenBox] = {
+	["check"] = function(self, actType, notify, count) -- 检查
+		self:checkWeeklyAct(actType, notify, count)
+	end,
+	["init"] = function(self, actType, isCrossDay, notify)
+		local roundData = self:getProperty("round")
+		roundData[actType] = 0
+		self:updateProperty({field = "round",  value = roundData, notNotify = not notify})
+	end,
+	-- ["close"] = function(self, actType, notify)
+	-- end,
+	["crossDay"] = function(self, actType, notify)
+		print("cross day open box")
+		self.owner:sendMail(MailId.ActOpenBox)
+	end,
+}
+
 function Activity:initActivity(actType, isCrossDay, notify)
 	if activityFunc[actType] and activityFunc[actType]['close'] then
 		activityFunc[actType]["init"](self, actType, isCrossDay, notify)
@@ -172,7 +314,9 @@ function Activity:closeActivity(actType, notify, notUpdateAct)
 	if activityFunc[actType] and activityFunc[actType]['close'] then
 		activityFunc[actType]["close"](self, actType, notify)
 	end
-	self:updateActData(actType, Activity.schema["act" .. actType][2], not notify or notUpdateAct)
+	if Activity.schema["act".. actType] then
+		self:updateActData(actType, Activity.schema["act" .. actType][2], not notify or notUpdateAct)
+	end
 end
 function Activity:refreshDailyData(notify)
@@ -193,5 +337,23 @@ function Activity:checkActivity(notNotify, activityType, ...)
 	end
 end
+-- 获取此次挂机掉落翻倍时长
+function Activity:getActHangDoubleTime(lastTs, nowTs)
+	local type = "DoubleDrop"
+	local actId = checkActivityType(type)
+	local isOpen = self:isOpen(type)
+	local openTs = self:getProperty("actime")[actId] or 0
+	local timeNow = skynet.timex()
+	lastTs =  math.max(lastTs, openTs)
+	if isOpen then
+		if nowTs > openTs and nowTs > lastTs then
+			return nowTs - lastTs
+		else
+			return 0
+		end
+	end
+	return 0
+end
+
-return Activity
 \ No newline at end of file
+return Activity
@@ -25,6 +25,9 @@ Daily.schema = {
 	advSupRe		= {"number", 0}, 		-- 冒险支援效果刷新次数
 	goldBuyT		= {"number", 0}, 		-- 金币购买次数
+
+	unlockPool		= {"table", {}},		-- 解锁的属性卡池
+	curPool 		= {"number", 0},		-- 属性卡池当前索引
 }
 function Daily:updateProperty(params)
@@ -63,8 +66,8 @@ function Daily:refreshDailyData(notify)
 	-- 每日折扣搞一下
 	local dailySDD = {}
 	local sddPool = {}
-	for id, data in pairs(csvdb["shop_diamondCsv"]) do
-		if data.disount ~= 0 then
+	for id, data in pairs(csvdb["shop_normalCsv"]) do
+		if data.shop == 1 and data.disount ~= 0 then
 			table.insert(sddPool, id)
 		end
 	end
@@ -97,6 +100,8 @@ function Daily:data()
 		dailySDD = self:getProperty("dailySDD"),
 		advSupRe = self:getProperty("advSupRe"),
 		goldBuyT = self:getProperty("goldBuyT"),
+		unlockPool = self:getProperty("unlockPool"),
+		curPool = self:getProperty("curPool"),
 	}
 end
@@ -20,12 +20,14 @@ function Role:ctor( properties )
 	Role.super.ctor(self, properties)
 	self.ignoreHeartbeat = false
 	self.dailyData = nil
+	self.storeData = nil
 	self.heros = {}
 	self.runeBag = {}
 	self.advData = nil
 	self.activity = nil
 	self.advElChapter = tonum(redisproxy:hget("adv_season", "chapter"), globalCsv.adv_endless_default_chapter) -- 无尽模式记录的赛季对应章节
 	self.advOverTime = tonum(redisproxy:hget("adv_season", "overTime")) -- 无尽模式关闭时间戳
+	self.sendMailFlag = false		--发送邮件标识
 end
 Role.schema = {
@@ -140,12 +142,13 @@ Role.schema = {
 	rechargeF			= {"table", {}}, -- 是否首次充值某一项 -- —{[id] = 1}  -- 不存在就是没有充值过
 	dinerS				= {"table", {}}, -- 美食币商城 购买记录 {[id] = count}
+	battlePoint			= {"number", 0}, -- 赛季卡使用的活跃点
 	rmbC				= {"number", 0}, -- 人民币重置额
 	emailSync			= {"number", 0}, -- 已经同步到的邮件Id
-	-- repayHero			= {"number", 0}, -- 超级招募 回馈
+	repayHero			= {"number", 0}, -- 招募次数 (除去友情招募)
 	floorHero			= {"table", {}}, -- 招募保底 -- {[poolId] = count}
 	ssrUp				= {"table", {}}, -- ssr up -- {[poolId] = count}
 	newerDraw			= {"table", {}}, -- 新手池子 {N, 1} 抽了多少次, 是否出了ssr
@@ -360,9 +363,10 @@ function Role:data()
 		rechargeF = self:getProperty("rechargeF"),
 		dinerS = self:getProperty("dinerS"),
+		battlePoint = self:getProperty("battlePoint"),
 		rmbC = self:getProperty("rmbC"),
-		-- repayHero = self:getProperty("repayHero"),
+		repayHero = self:getProperty("repayHero"),
 		newerDraw = self:getProperty("newerDraw"),
 		floorHero = self:getProperty("floorHero"),
@@ -11,6 +11,7 @@ function RolePlugin.bind(Role)
 		self:loadHeros()
 		self:loadDiner()
 		self:loadActivity()
+		self:loadStoreInfo()
 	end
 	function Role:reloadWhenLogin()
@@ -144,10 +145,16 @@ function RolePlugin.bind(Role)
 				end
 			end
 		end
-
+		if not next(allChange) then allChange = nil end
 		return reward, allChange --实际获得的奖励 和 最高级奖励转化过程
 	end
+
+	function Role:packReward(reward, change)
+		if not reward then return nil end
+		return {reward = reward, change = change}
+	end
+
 	function Role:awardExpireItem(expireTime, gift, params)
 		if expireTime <= skynet.timex() then
 			return 
@@ -537,6 +544,18 @@ function RolePlugin.bind(Role)
 		-- 放role 里面了
 	end
+	function Role:loadStoreInfo()
+		local roleId = self:getProperty("id")
+		local dataKey = string.format(R_STORE, roleId)
+		self.storeData = require("models.Store").new({key = dataKey})
+		self.storeData.owner = self
+		if not redisproxy:exists(dataKey) then
+			self.storeData:create()
+		else
+			self.storeData:load()
+		end
+	end
+
 	function Role:addEquip(equipType, equipLv, count, pms)
 		pms = pms or {}
 		if count ~= count then return end
@@ -1324,9 +1343,13 @@ function RolePlugin.bind(Role)
 		self:checkNewEvent(now)
 	end
-	local function breath(sec)
+	local function breath(sec, name)
 		local last_breath = 0
-		return function (now)
+		return function (now, role)
+			if name == "email" and role.sendMailFlag then
+				last_breath = now + sec
+				return true
+			end
 			if now >= last_breath then
 				last_breath = now + sec
 				return true
@@ -1335,8 +1358,8 @@ function RolePlugin.bind(Role)
 		end
 	end
 	local breathes = {
-		["email"] = breath(120), -- email
-		["pvphg"] = breath(300), -- 高级竞技场 奖励满的红点
+		["email"] = breath(120, "email"), -- email
+		["pvphg"] = breath(300, "pvphg"), -- 高级竞技场 奖励满的红点
 	}
 	function Role:checkNewEvent(now)
 		if now - self:getProperty("ltime") < 5 then
@@ -1377,6 +1400,8 @@ function RolePlugin.bind(Role)
 					red:hget(string.format(R_EMAIL_ITEM, roleId, id), "status")
 				end
 			end)
+
+			self.SendMailFlag = false
 			for index, id in ipairs(emailIds) do
 				if tonumber(redret[index]) == 0 then
 					return true
@@ -1401,7 +1426,7 @@ function RolePlugin.bind(Role)
 		local events = {}
 		for name, breath in pairs(breathes) do
-			if breath(now) and checks[name] then
+			if breath(now, self) and checks[name] then
 				local status = checks[name]()
 				if status then
 					if status == true then
@@ -1494,7 +1519,7 @@ function RolePlugin.bind(Role)
 			return
 		end
-		local diamond = self:recharge({ 
+		local reward = self:recharge({ 
 			id = orderObject:getProperty("rechargeId"),
 			transactionId = params.transactionId,
 			pay_time = params.pay_time,
@@ -1505,7 +1530,7 @@ function RolePlugin.bind(Role)
 		redisproxy:srem(string.format("role:%d:orders", roleId), partnerOrderStr)
 		SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ order = partnerOrderStr,
-			result = "success", diamond = diamond}))
+			result = "success", reward = reward}))
 		return orderObject:getProperty("rechargeId")
 	end
@@ -1519,8 +1544,13 @@ function RolePlugin.bind(Role)
 			return
 		end
+		if not self.storeData:checkRechargeRecord(rechargeData.limit, id) then
+			return 1
+		end
+
 		local diamondCount = 0
-		if rechargeData.type == 0 then -- 钻石
+		local reward = {}
+		if rechargeData.shop == 1 then -- 钻石
 			local rechargeF = self:getProperty("rechargeF")
 			diamondCount = rechargeData.diamond + rechargeData.diamondExtra
 			if not rechargeF[id] then
@@ -1529,21 +1559,45 @@ function RolePlugin.bind(Role)
 				self:updateProperty({field = "rechargeF", value = rechargeF})
 			end
 			self:gainDiamond({count = diamondCount, isRecharge = true, log = {desc = "recharge", int1 = id}})
-		elseif rechargeData.type == 1 then  --月卡
-			return
-		elseif rechargeData.type == 2 then  -- 赛季通行证
-			return
+		elseif rechargeData.shop == 2 then  --通行证商店
+			reward, _ = self:award(rechargeData.itemFirst, {log = {desc = "recharge", int1 = id}})
+			self.storeData:onBuyCard(rechargeData.type, rechargeData.time)
+		elseif rechargeData.shop == 3 then  -- 礼包商店
+			reward, _ = self:award(rechargeData.itemFirst, {log = {desc = "recharge", int1 = id}})
 		else
+			skynet.error("invalid recharge shop type " .. id)
 			return
 		end
+		if diamondCount > 0 then
+			reward[ItemId.Diamond] = (reward[ItemId.Diamond] or 0) + diamondCount
+		end
+
 		-- 累充
 		local rmb = rechargeData.rmb
 		self:updateProperty({field = "rmbC", delta = rmb})
 		self:log("role_action", {desc = "recharge", int1 = id, int2 = rmb, key1 = params.transactionId, key2 = params.order, long1 = params.pay_time})
-		return diamondCount
+		return reward
+	end
+
+	--直接给玩家发送邮件，立即推送小红点
+	function Role:sendMail(mailId, createTime, reward, contentPms)
+		local tgift = {}
+		if type(reward) == "string" then
+			for _, one in pairs(reward:toTableArray(true)) do
+				tgift[one[1]] = (tgift[one[1]] or 0) + one[2]
+			end
+		else
+			tgift = reward or {}
+		end
+		local gift = ""
+		for k, v in pairs(tgift) do
+			gift = gift .. k.."="..v.." "
+		end
+		redisproxy:insertEmail({roleId = self:getProperty("id"), emailId = mailId, createtime = createTime, attachments = gift, contentPms = contentPms})
+		self.sendMailFlag = true
 	end
 end
@@ -205,10 +205,14 @@ local SudokuListener = {
 	}
 }
+local Activity = require("models.Activity")
 local ActivityListener = {
 	func = "checkActivityTask",
-	listener = {
-
+	listen = {
+		[TaskType.DrawHero] = {{Activity.ActivityType.DrawHero, f("count")}},
+		[TaskType.FoodSell] = {{Activity.ActivityType.FoodSell, f("count")}},
+		[TaskType.AdvDraw] = {{Activity.ActivityType.AdvDraw, f("count")}},
+		[TaskType.OpenBox] = {{Activity.ActivityType.OpenBox, f("count")}},
 	}
 }
@@ -10,6 +10,7 @@ ResetFunc[&quot;CrossDay&quot;] = function(self, notify, response, now)
 	self.dailyData:refreshDailyData(notify)
 	self.dinerData:refreshDailyData(notify)
 	self.activity:refreshDailyData(notify)
+	self.storeData:onCrossDay()
 	self:setProperty("dTask", {})
 	self:advRandomSupportEffect(not notify)
@@ -29,6 +30,14 @@ ResetFunc[&quot;CrossWeek&quot;] = function(self, notify, response)
 	response.dinerS = {}
 end
+ResetFunc["CrossMonth"] = function(self, notify, response)
+	local ltime = self:getProperty("ltime")
+	if isCrossMonth(ltime, skynet.timex()) then
+		print("cross month")
+		self.storeData:resetStoreReored(3)		--商店跨月重置 time_reset表关联id
+	end
+end
+
 ResetFunc["DinerRank"] = function(self, notify, response)
 	self.dinerData:rankResetData(notify)
@@ -51,9 +60,11 @@ function Role:updateTimeReset(now, notify)
 	local needResetId = {}
 	for resetId, resetData in pairs(csvdb["time_resetCsv"]) do
-		local curRound = math.floor((passTime - resetData.start) / resetData.interval)
-		if not timeReset[resetId] or curRound ~= timeReset[resetId] then
-			needResetId[resetId] = curRound
+		if resetData.interval > 0 then
+			local curRound = math.floor((passTime - resetData.start) / resetData.interval)
+			if not timeReset[resetId] or curRound ~= timeReset[resetId] then
+				needResetId[resetId] = curRound
+			end
 		end
 	end
 	if not next(needResetId) then return end
@@ -66,13 +77,19 @@ function Role:updateTimeReset(now, notify)
 			ResetFunc[funcName](self, notify, response, now)
 			resetMode[funcName] = true
 		end
+		if needResetId[resetId] then
+			-- 充值商城购买记录
+			self.storeData:resetStoreReored(resetId)
+		end
 	end
 	for resetId, round in pairs(needResetId) do
 		timeReset[resetId] = round
 	end
-	self:setProperty("timeReset", timeReset)
+	self:setProperties({timeReset = timeReset, ltime = now})
+
 	response.timeReset = timeReset
+	response.ltime = ltime
 	if notify then
 		self:notifyUpdateProperties(response)
@@ -0,0 +1,285 @@
+-- 商店数据
+
+local Store = class("Store", require("shared.ModelBase"))
+
+function Store:ctor(properties)
+	Store.super.ctor(self, properties)
+end
+
+Store.schema = {
+	buyR		= {"table", {}},		-- 购买商品记录 {id=count}
+	payR	= {"table", {}},		-- 充值记录 {id=count}
+	growFund		= {"number", 0},		-- 成长基金
+	growFundR  = {"string", ""},        -- 成长基金领取记录
+	monthCardEx	= {"number", 0},		-- 月卡过期时间戳
+	smonthCardEx	= {"number", 0},		-- 超级月卡过期时间戳
+	battleCard	= {"number", 0},		-- 赛季卡
+	battleFR = {"string", ""},		-- 免费赛季卡领取记录
+    battleLR = {"string", ""},		-- 付费赛季卡领取记录
+    limitTPack = {"table", {}},      -- 限时礼包 {id=expire_ts}
+    privCardEx = {"number", 0},          -- 特权卡过期时间戳
+    getMailT1 = {"number",0},       -- 上次发送月卡福利邮件的时间
+    getMailT2 = {"number",0},       -- 上次发送超级月卡福利邮件的时间
+}
+
+function Store:updateProperty(params)
+	params = params or {}
+	if not self.schema[params.field] then
+		return
+	end
+	local oldValue = self:getProperty(params.field)
+	if params.value then
+		self:setProperty(params.field, params.value)
+	elseif params.delta then
+		self:incrProperty(params.field, params.delta)
+	else
+		return
+	end
+	local newValue = self:getProperty(params.field)
+	if not params.notNotify then
+		self:notifyUpdateProperty(params.field, newValue, oldValue)
+	end
+end
+
+function Store:onCrossDay()
+    self:sendMonthCardEmail()
+    self:deleteExpireLimitGoods()
+end
+
+-- 删除过期商品
+function Store:deleteExpireLimitGoods()
+    local timeNow = skynet.timex()
+    local limitGoodsList = self:getProperty("limitTPack")
+    for k, v in pairs(limitGoodsList) do
+        if timeNow > v then
+            limitGoodsList[k] = nil
+        end
+    end
+end
+
+-- 发送月卡邮件
+function Store:sendMonthCardEmail()
+    local timeNow = skynet.timex()
+    local tabs = {{ex="monthCardEx", t="getMailT1", mail=MailId.MonthCard, alert=MailId.MonthCardEx}, 
+    {ex="smonthCardEx", t="getMailT2", mail=MailId.SuperMonthCard, alert=MailId.SuperMonthCardEx}}
+    for _, v in ipairs(tabs) do
+        local ex  = self:getProperty(v.ex)
+        local ts  = self:getProperty(v.t) or 0
+        local mailId = v.mail
+        local alertId = v.alert
+        local alertTs = dayLater(ex) - DAY_SEC
+        if ex > timeNow then
+            local cnt = 0
+            if ts == 0 then
+                cnt = 1
+            else
+                local diff = math.floor((dayLater(timeNow) - dayLater(ts))/DAY_SEC)
+                diff = diff < 0 and 0 or diff
+                diff = diff > 31 and 31 or diff
+                cnt = diff
+            end
+            for i = cnt - 1, 0, -1  do
+                local createTs = timeNow - i * DAY_SEC
+                self.owner:sendMail(mailId, createTs)
+                -- 过期头一天发提醒邮件
+                if dayLater(createTs) == alertTs then
+                    self.owner:sendMail(alertId, createTs)
+                end
+            end
+            if cnt > 0 then
+                self:updateProperty({field=v.t, value=timeNow})
+            end
+        end
+    end
+end
+
+function Store:isMonthCardExpire()
+    local timeNow = skynet.timex()
+    local ts = self:getProperty("monthCardEx")
+    return ts < timeNow
+end
+
+function Store:isSuperMonthCardExpire()
+    local timeNow = skynet.timex()
+    local ts = self:getProperty("smonthCardEx")
+    return ts < timeNow
+end
+
+function Store:isPrivCardExpire()
+    local timeNow = skynet.timex()
+    local ts = self:getProperty("privCardEx")
+    return ts < timeNow
+end
+
+-- 挂机栏位 特权卡额外个数
+function Store:getHangSlotExtraCount()
+    if self:isPrivCardExpire() then
+        return 0
+    end
+
+    return globalCsv.shop_priv_card_hang_slot_cnt or 4
+end
+
+-- 探索加速/餐厅加速 特权卡系数
+function Store:getProduceItemSpeedCoef()
+    if self:isPrivCardExpire() then
+        return 1
+    end
+    local coef = (globalCsv.shop_priv_card_produce_coef or 25)/ 100
+    return 1 + coef
+end
+
+-- 拆解室栏位 特权卡额外个数
+function Store:getTimeBoxSlotExtraCount()
+    if self:isPrivCardExpire() then
+        return 0
+    end
+
+    return globalCsv.shop_priv_time_box_slot_cnt or 3
+end
+
+-- 齿轮兑换 特权卡系数
+function Store:getGearExchangeCoef()
+    if self:isPrivCardExpire() then
+        return 1
+    end
+
+    local coef = (globalCsv.shop_priv_exchange_gear_coef or 50)/ 100
+    return 1 + coef
+end
+
+-- 购买通行证
+function Store:onBuyCard(type, duration)
+    local timeNow = skynet.timex()
+    if type == CardType.NormalMonthCard then
+        if self:isMonthCardExpire() then
+            self:updateProperty({field = "monthCardEx", value = timeNow + duration})
+        else
+            self:updateProperty({field = "monthCardEx", value = self:getProperty("monthCardEx") + duration})
+        end
+        self:sendMonthCardEmail()
+    elseif type == CardType.SuperMonthCard then
+        if self:isSuperMonthCardExpire() then
+            self:updateProperty({field = "smonthCardEx", value = timeNow + duration})
+        else
+            self:updateProperty({field = "smonthCardEx", value = self:getProperty("smonthCardEx") + duration})
+        end
+        self:sendMonthCardEmail()
+    elseif type == CardType.PrivilegeCard then
+        if self:isPrivCardExpire() then
+            self:updateProperty({field = "privCardEx", value = timeNow + duration})
+        else
+            self:updateProperty({field = "privCardEx", value = self:getProperty("privCardEx") + duration})
+        end
+    elseif type == CardType.GrowFund then
+        self:updateProperty({field = "growFund", value = 1})
+    elseif type == CardType.BattleCard then
+        self:updateProperty({field = "battleCard", value = 1})
+    end
+end
+
+--检测购买是否超过限制数量
+function Store:checkRechargeRecord(limit, id)
+    local rechargeRecord = self:getProperty("payR")
+    if limit ~= 0 and limit <= (rechargeRecord[id] or 0) then
+        skynet.error(string.format("recharge id:%d count over limit, user id:%d", id, self.owner:getProperty("id")))
+        return false
+    end
+    rechargeRecord[id] = (rechargeRecord[id] or 0) + 1
+    self:updateProperty({field = "payR", value = rechargeRecord})
+    return true
+end
+
+function Store:notifyUpdateProperty(field, newValue, oldValue)
+	local datas = {
+		key = field,
+		newValue = newValue,
+		oldValue = oldValue,
+	}
+	SendPacket(actionCodes.Store_updateproperty, MsgPack.pack(datas))
+end
+
+-- 赛季卡重置 需要把未能领取的奖励通过邮件发送
+function Store:onBattleCardReset()
+    local gift = {}
+    local function concatGift(data)
+        for key, v in pairs(data:toNumMap()) do
+            gift[key] = (gift[key] or 0) + v
+        end
+    end
+    local battleCardFlag = self:getProperty("battleCard")
+    local battleCardFreeRecord = self:getProperty("battleFR")
+    local battleCardLimitRecord = self:getProperty("battleLR")
+    local battlePoint = self.owner:getProperty("battlePoint")
+
+    for id, config in pairs(csvdb["reward_battlepassCsv"]) do
+        if config then
+            local freeFlag = string.char(string.getbit(battleCardFreeRecord, id))
+            local limitFlag = string.char(string.getbit(battleCardLimitRecord, id))
+            
+            if battlePoint < config.point then
+                break
+            end
+            if freeFlag == "0" then
+                concatGift(config.giftFree)
+            end
+            if limitFlag == "0" and battleCardFlag == 1 then
+                concatGift(config.giftLimit)
+            end
+        end
+    end	
+    self.owner:sendMail(MailId.BattleCardAward, nil, gift)
+    -- 计算剩余奖励
+    self:updateProperty({field = "battleCard", value=0})
+    self:updateProperty({field = "battleFR", value=""})
+    self:updateProperty({field = "battleLR", value=""})
+    self.owner:updateProperty({field = "battlePoint", value=0})
+end
+
+-- 重置购买记录
+function Store:resetStoreReored(resetId)
+    local payRecord = self:getProperty("payR") or {}
+    local buyRecord = self:getProperty("buyR") or {}
+    for k, v in pairs(payRecord) do
+        local config = csvdb["shop_rechargeCsv"][k]
+        if config then
+            if config.resetTime == resetId then
+                payRecord[k] = nil
+                --通行证商店
+                if config.shop == 2 then
+                    if config.type == CardType.BattleCard then
+                        self:onBattleCardReset()
+                    end
+                end
+            end
+        end
+    end
+    self:updateProperty({field = "payR", value = payRecord})
+    for k, v in pairs(buyRecord) do
+        local config = csvdb["shop_normalCsv"][k]
+        if config then
+            if config.resetTime == resetId then
+                buyRecord[k] = nil
+            end
+        end
+    end
+    self:updateProperty({field = "buyR", value = buyRecord})
+end
+
+function Store:data()
+	return {
+        buyR		= self:getProperty("buyR"),
+        payR	= self:getProperty("payR"),
+        growFund		= self:getProperty("growFund"),
+        growFundR  = self:getProperty("growFundR"),
+        monthCardEx  = self:getProperty("monthCardEx"),
+        smonthCardEx  = self:getProperty("smonthCardEx"),
+        battleCard  = self:getProperty("battleCard"),
+        battleFR  = self:getProperty("battleFR"),
+        battleLR  = self:getProperty("battleLR"),
+        limitTPack = self:getProperty("limitTPack"),
+        privCardEx = self:getProperty("privCardEx"),
+	}
+end
+
+return Store
 \ No newline at end of file