Merge branch 'cn/develop' into cn/publish/preview

jiyue
2 parents 2b9d907e cddfa602
Showing 16 changed files with 506 additions and 117 deletions Show diff stats
src/ProtocolCode.lua
src/actions/ActivityAction.lua
src/actions/AdvAction.lua
src/actions/HangAction.lua
src/actions/HeroAction.lua
src/actions/RoleAction.lua
src/actions/StoreAction.lua
src/adv/Adv.lua
src/adv/AdvBattle.lua
src/models/Activity.lua
src/models/Daily.lua
src/models/RoleBattle.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
src/models/RoleTimeReset.lua
src/models/Store.lua
@@ -222,6 +222,7 @@ actionCodes = {
 	Store_getBattlePassRewardRpc = 562,	--赛季卡奖励
 	Store_getExploreCommandRewardRpc = 563, --探索指令
 	Store_getTotalRechargeAwardRpc = 564,	-- 累计充值
+	Store_monthCardRewardRpc = 565, --每日月卡+特刊奖励
 	Store_biliCloudRechargeRpc = 596,
 	Store_biliAndroidRechargeRpc = 597,
@@ -259,6 +260,7 @@ actionCodes = {
 	Activity_buyBattleCommandLvlRpc = 672,
 	Activity_returnerTaskRpc = 673,
 	Activity_actNewUserTaskRpc = 674,
+    Activity_buyBattleTicketRpc = 675,
 	Radio_startQuestRpc = 700,
 	Radio_finishQuestRpc = 701,
@@ -119,7 +119,7 @@ end
 function _M.signRpc(agent, data)
 	local role = agent.role
-	local serverT = skynet.timex()
+	local serverT = skynet.timex() - RESET_TIME * 3600
 	local tm = os.date("*t", serverT)
 	local curDay = tm.day
@@ -588,24 +588,23 @@ function _M.startBattleRpc(agent, data)
 		role.activity:getBattleTicket(actid)
 		num = battleCfg.type:toArray(true, "=")[3]
 		if count and count > 0 then
-			if battleCfg.rank == 0 then
-				return 7
+			if battleCfg.rank ~= 0 then
+                local bi = actData[id]
+                if not bi then return 8 end
+                local star = bi["star"] or 0
+                local maxP = bi["maxP"] or 0
+                -- 世界boss
+                if battleCfg.worldBoss_award ~= 0 then
+                    if maxP < 1 then
+                        return 9
+                    end
+                else
+                    if star < 1 then
+                        return 9
+                    end
+                end
 			end
-			local bi = actData[id]
-			if not bi then return 8 end
-			local star = bi["star"] or 0
-			local maxP = bi["maxP"] or 0
-			-- 世界boss
-			if battleCfg.worldBoss_award ~= 0 then
-				if maxP < 1 then
-					return 9
-				end
-			else
-				if star < 1 then
-					return 9
-				end
-			end
-			num = num * count
+            num = num * count
 		end
 		if ticket < num then
 			return 6
@@ -627,9 +626,7 @@ function _M.startBattleRpc(agent, data)
 		if count <= 0 then
 			return
 		end
-		if battleCfg.rank == 0 then
-			return 7
-		end
+
 		local bi = actData[id]
 		local star = bi["star"] or 0
 		local award = battleCfg.item_clear:toNumMap()
@@ -644,23 +641,26 @@ function _M.startBattleRpc(agent, data)
 		end
 		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)))
+        changeFlag = true
+        actData["ticket"] = ticket - num
-		if battleCfg.worldBoss_award ~= 0 and (bi["maxP"] or 0) > 0 then
-			bi["bossP"] = (bi["bossP"] or 0) + bi["maxP"] * count
+		if battleCfg.rank ~= 0 then
+            if battleCfg.worldBoss_award ~= 0 and (bi["maxP"] or 0) > 0 then
+                bi["bossP"] = (bi["bossP"] or 0) + bi["maxP"] * count
+            end
+
+            bi["sum"] = bi["sum"] + bi["top"] * count
+            actData[id] = bi
+
+            local rankVal = 0
+            if battleCfg.rank == 1 then
+                rankVal = bi["sum"]
+            elseif battleCfg.rank == 2 then
+                rankVal = bi["top"]
+            end
+            role:updateRankCommon(RANK_TYPE.ActBattleBoss, rankVal)
 		end
-		bi["sum"] = bi["sum"] + bi["top"] * count
-		actData["ticket"] = ticket - num
-		actData[id] = bi
-		changeFlag = true
-
-		local rankVal = 0
-		if battleCfg.rank == 1 then
-			rankVal = bi["sum"]
-		elseif battleCfg.rank == 2 then
-			rankVal = bi["top"]
-		end
-		role:updateRankCommon(RANK_TYPE.ActBattleBoss, rankVal)
 	end
 	if changeFlag then
 		role.activity:updateActData("ChallengeLevel", actData)
@@ -1466,4 +1466,30 @@ function _M.returnerTaskRpc(agent, data)
 	return true
 end
+function _M.buyBattleTicketRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local actid = msg.actid
+	local count = msg.count
+	if not role.activity:isOpenById(actid, "ChallengeLevel") then return 1 end
+    role.activity:getBattleTicket(actid)
+	local actData = role.activity:getActData("ChallengeLevel") or {}
+	local battleInfo = actData[id] or {}
+    --["activity_scrofa_tickets"] = { 10, 20, 30, 40, 50, 100, 150, 200, 200, 200 } 
+    local limit = #(globalCsv.activity_scrofa_tickets)
+    local curCount = actData["buyC"] or 0
+    if count <= 0 or curCount + count > limit then
+        return 2
+    end
+    local cost = globalCsv.activity_scrofa_tickets[curCount + 1]
+	if not role:checkItemEnough({[ItemId.Jade] = cost}) then return 3 end
+	role:costItems({[ItemId.Jade] = cost}, {log = {desc = "buyActivityBattleTicket", int1 = actid, int2 = count, cint1 = curCount}})
+    actData["ticket"] = (actData["ticket"] or 0) + 1
+    actData["buyC"] = curCount + count
+
+	role.activity:updateActData("ChallengeLevel", actData)
+	SendPacket(actionCodes.Activity_buyBattleTicketRpc, "")
+    return true
+end
+
 return _M
@@ -301,18 +301,16 @@ function _M.startHangRpc(agent, data)
 	local player = {}
 	local attrs = role:getTeamBattleInfo(format).heros
-	for attrName, _ in pairs(AdvAttsEnum) do
-		for _, hero in pairs(attrs) do
-			player[attrName] = (player[attrName] or 0) + hero[attrName]
+	for _, hero in pairs(attrs) do
+		--根据系数计算拾荒属性
+		role:checkPlayerAttr(hero)
+
+		for attrName, _ in pairs(AdvAttsEnum) do
+			player[attrName] =  (player[attrName] or 0) + hero[attrName]
 		end
-		player[attrName] = player[attrName] * (globalCsv.adv_battle_attr_ratio[attrName] or 1)
 	end
-	local battleV = 1 * player["hp"]
-		+ 2 * player["atk"]
-		+ 1.25 * player["def"]
-		+ 0.226 * player["hit"]
-		+ 0.26 * player["miss"]
+	local battleV = role:getSurvivability(player, #attrs)
 	--print(math.ceil(battleV), campSiteData.idleValue)
 	if math.ceil(battleV) < campSiteData.idleValue then return 9 end -- 战斗力是否满足
@@ -128,8 +128,8 @@ local function checkReward(role, isTreasure, carbonId)
 	--挂机得到的宝藏加入到挂机奖励
 	if isTreasure or false == true then
 		local treasureList= role.dailyData:checkTreasureList(carbonId or hangInfo.carbonId) or {}
-		if next(treasureList) ~= nil then
-			for id, val in pairs(treasureList) do
+		if next(treasureList) then
+			for _, val in pairs(treasureList) do
 				local award  = val.award:toNumMap()
 				for k,v in pairs(award) do
 					items[k] = (items[k] or 0) + v
@@ -1089,6 +1089,16 @@ function _M.drawHeroRpc(agent, data)
 	end
 	role:finishGuide(8)
+	--每次抽卡获得对应货币，可在招募商城购买道具
+	if buildTypeData["draw_type_item"] ~= 0 then
+		local drawTypeItem = {}
+		for id, count in pairs(buildTypeData["draw_type_item"]:toNumMap()) do
+            drawTypeItem[id] = count * drawCount[drawType]
+			drawAddReward[id] = drawTypeItem[id]
+		end
+		role:award(drawTypeItem, {log = {desc = "drawHero", int1 = btype}})
+	end
+
 	role:log("gacha", {
 		gacha_id = poolId, -- 卡池ID
 		gacha_type = btype, -- 卡池类型
@@ -340,6 +340,36 @@ function _M.loginRpc( agent, data )
 	return true
 end
+local function onCb1Back(newRole)
+	-- cb1活跃返利
+    skynet.timeout(0, function()
+		local cbbackd = cluster.query("center", "cb1backd")
+		local uid = newRole:getProperty("uid")
+		local roleId = newRole:getProperty("id")
+		local start = uid:find("_")
+		if start then
+			uid = uid:sub(start + 1)
+		end
+		if cbbackd then
+			local status, back = pcall(cluster.call, "center", cbbackd, "getCb1Reward", {uid = uid, id = roleId})
+			if status then
+				if back then
+                    if back == 0 then
+						mysqlproxy:insertEmail({roleId = roleId, emailId = MailId.CB1BackAward1, createtime = skynet.timex()})
+                    elseif back == 1 then
+						mysqlproxy:insertEmail({roleId = roleId, emailId = MailId.CB1BackAward2, createtime = skynet.timex()})
+                    end
+					newRole:mylog("cb1back", {key1 = uid, int2 = roleId, int1=back})
+				end
+			else
+				skynet.error("[ERROR] cb1backd cant call center uid: " .. uid .. " roleId:" .. roleId)
+			end
+		else
+			skynet.error("[ERROR] cb1backd cant call center uid: " .. uid .. " roleId:" .. roleId)
+		end
+    end)
+end
+
 function _M.createRpc(agent, data)
 	local msg = MsgPack.unpack(data)
 	local response = {}
@@ -446,6 +476,9 @@ function _M.createRpc(agent, data)
 		end
 	end)
+    -- cb1活跃回馈
+    onCb1Back(newRole)
+
 	return true
 end
@@ -547,4 +547,32 @@ function _M.getTotalRechargeAwardRpc(agent, data)
 	return true
 end
+function _M.monthCardRewardRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+    local mcid = msg.mcid
+	local smcid = msg.smcid
+
+	local reward,change = {}, {}
+	--月卡奖励
+	local tmpreward, tmpchange = role.storeData:getMonthCardDailyReward(mcid)
+	if tmpreward then
+		for k, v in pairs(tmpreward) do
+			reward[k] = (reward[k] or 0) + v
+		end
+		if tmpchange then table.insert(change, tmpchange) end
+	end
+
+    --特刊奖励
+	tmpreward, tmpchange = role.storeData:getSMonthCardDailyReward(smcid)
+	if tmpreward then
+		for k, v in pairs(tmpreward) do
+			reward[k] = (reward[k] or 0) + v
+		end
+		if tmpchange then table.insert(change, tmpchange) end
+	end
+	SendPacket(actionCodes.Store_monthCardRewardRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
+
 return _M
 \ No newline at end of file
@@ -930,18 +930,16 @@ function Adv:over(success, rewardRatio, overType)
 	local team = self.owner:getProperty("advTeam")
 	local player = {}
 	local attrs = self.owner:getTeamBattleInfo(team).heros
-	for attrName, _ in pairs(AdvAttsEnum) do
-		for _, hero in pairs(attrs) do
-			player[attrName] = (player[attrName] or 0) + hero[attrName]
+	for _, hero in pairs(attrs) do
+		--根据系数计算拾荒属性
+		self.owner:checkPlayerAttr(hero)
+
+		for attrName, _ in pairs(AdvAttsEnum) do
+			player[attrName] =  (player[attrName] or 0) + hero[attrName]
 		end
-		player[attrName] = player[attrName] * (globalCsv.adv_battle_attr_ratio[attrName] or 1)
 	end
-	local battleV = 1 * player["hp"]
-		+ 2 * player["atk"]
-		+ 1.25 * player["def"]
-		+ 0.226 * player["hit"]
-		+ 0.26 * player["miss"]
+	local battleV = self.owner:getSurvivability(player, #attrs)
 	local heroList = {team.leader, team.leader2}
 	for _, hid in pairs(team.heros) do
@@ -1714,7 +1712,7 @@ local function clickTrader(self, room, block, params)
 	local goodsData = csvdb["event_trader_goodsCsv"][block.event.shop[buyId][1]]
 	if not goodsData then return false, 5 end
-	local costCount = math.ceil(goodsData.price * (block.event.shop[buyId][2] or 100) / 100)
+	local costCount = math.ceil(goodsData.price * (1 - (block.event.shop[buyId][2] or 100) / 100))
 	if not self:cost({[goodsData.currency] = costCount}, {log = {desc = "clickTrader", int1 = block.event.id}}) then return false, 6 end --不够
 	self:backCost({[goodsData.currency] = costCount})
 	self:award({[goodsData.item] = goodsData.num}, {log = {desc = "clickTrader", int1 = block.event.id}}, {})
@@ -95,14 +95,13 @@ function Battle:initPlayer()
 		local attrs = self.adv.owner:getTeamBattleInfo(advTeam).heros
+		for _, hero in pairs(attrs) do
+			--根据系数计算拾荒属性
+			self.adv.owner:checkPlayerAttr(hero)
-		for attrName, _ in pairs(AdvAttsEnum) do
-			for _, hero in pairs(attrs) do
-				player[attrName] = (player[attrName] or 0) + hero[attrName]
+			for attrName, _ in pairs(AdvAttsEnum) do
+				player[attrName] =  (player[attrName] or 0) + hero[attrName]
 			end
-			player[attrName] = getAdvLvAttrUp(advAddAttrs, attrName, player[attrName]) * (globalCsv.adv_battle_attr_ratio[attrName] or 1)
-			-- player.growth[attrName] = player[attrName] * (globalCsv.adv_battle_attr_growth_ratio[attrName] or 1)
-			-- player[attrName] = player[attrName] + player.growth[attrName] * (player.level - 1)
 		end
 		player.hpMax = player.hp or 0
@@ -797,7 +797,12 @@ activityFunc[Activity.ActivityType.ChallengeLevel] = {
 	end,
 	["login"] = function(self, actType, actId)
 		self:getBattleTicket(actId)
-	end
+	end,
+	["crossDay"] = function(self, actType, notify)
+		local actData = self:getActData(actType)
+		actData["buyC"] = 0
+		self:updateActData(actType, actData, not notify)
+	end,
 }
 function Activity:onLoginActivity(actId)
@@ -170,26 +170,25 @@ function Daily:checkChapters()
 	local  chapters = {}
 	local tmp_chapters = {}
 	local treasureList = self:getProperty("treasureList")
-	if next(treasureList) ~= nil then
-		for id, curInfo in pairs(treasureList) do
-			if curInfo["end_time"] then
-				if skynet.timex() < curInfo["end_time"] then
-					tmp_chapters[curInfo.chapter_id] = curInfo
-				end
+	if next(treasureList) then
+		for _, curInfo in pairs(treasureList) do
+			if curInfo["expire_time"] or not curInfo["end_time"] then
+				tmp_chapters[curInfo.chapter_id] = curInfo
 			end
 		end
 	end
-
+	local hangInfo = self.owner:getProperty("hangInfo") or {}
 	for chapter_id, val in pairs(csvdb["idle_battleCsv"]) do
-		if self.owner:checkHangPass(chapter_id) then
-			if next(tmp_chapters) == nil then
-				chapters[chapter_id] = val
-			else
-				if not tmp_chapters[chapter_id] then
+		if chapter_id ~= hangInfo.carbonId then
+			if self.owner:checkHangPass(chapter_id) then
+				if next(tmp_chapters) and not tmp_chapters[chapter_id] then
+					chapters[chapter_id] = val
+				else
 					chapters[chapter_id] = val
 				end
 			end
 		end
+
 	end
 	return chapters
 end
@@ -348,9 +348,41 @@ function Role:checkBattle(battleType, params)
 	})
 end
+	local function initPlayer(player)
+		player["hp"] = player["hp"] or 0
+		player["atk"] = player["atk"] or 0
+		player["def"] = player["def"] or 0
+		player["hit"] = player["hit"] or 0
+		player["miss"] = player["miss"] or 0
+		player["crit"] = player["crit"] or 0
+		player["critHurt"] = player["critHurt"] or 0
+		player["pierce"] = player["pierce"] or 0
+		player["vampire"] = player["vampire"] or 0
+	end
+
+	function Role:checkPlayerAttr(player)
+		if next(player) == nil then return end
+		initPlayer(player)
+		player["hp"] = math.floor(player["hp"]  / globalCsv.adv_battle_attr_ratio["hp"])
+		player["atk"] = math.floor(player["atk"] / globalCsv.adv_battle_attr_ratio["atk"])
+		player["def"] = math.floor(player["def"]  / globalCsv.adv_battle_attr_ratio["def"])
+		player["hit"] = math.floor((player["hit"]  + player["miss"] )/ globalCsv.adv_battle_attr_ratio["hit"])
+		player["miss"] = math.floor((player["crit"] + player["critHurt"] + player["pierce"]  + player["vampire"])/ globalCsv.adv_battle_attr_ratio["miss"])
+	end
+	function Role:getSurvivability(player, heroCount)
+		if next(player) == nil then return 0 end
+		heroCount = heroCount or 1
+		initPlayer(player)
+		local battleV = (globalCsv.adv_battle_fight_points["hp"] * player["hp"]
+				+ globalCsv.adv_battle_fight_points["atk"] * player["atk"]
+				+ globalCsv.adv_battle_fight_points["def"] * player["def"]
+				+ globalCsv.adv_battle_fight_points["hit"] * player["hit"] )
+				* (1 + (player["miss"]- heroCount * globalCsv.adv_battle_fight_points["miss"])/ 100)
+		return battleV
+	end
 end
@@ -63,6 +63,8 @@ local ItemReason = {
 	giftTime = 147, -- 创角后的时间礼包
 	activityCrisis = 148, -- 物资危机奖励
     glodConvertRune = 149, -- 金币兑换铭文
+	monthCardReward = 150, --月卡奖励
+	smonthCardReward = 151, --特刊奖励
 	advHang = 301, -- 拾荒挂机
 	hangBattle = 302, -- 挂机战斗
@@ -107,6 +109,7 @@ local ItemReason = {
 	actMilecrisis = 1010, -- 物资危机
 	battleCommandTask = 1011,	-- 将军令任务
 	newUserTask = 1012,	-- 新玩家任务
+    buyActivityBattleTicket = 1013, -- 购买门票
 	-- 餐厅
 	greenHourse = 1101, -- 食材获得
@@ -391,7 +394,15 @@ local MethodType = {
 		currency_type = true, -- 购买道具消耗的货币类型，记录货币ID
 		shop_purchase_current = true, -- 购买道具消耗的货币数量
 		shop_id = true, -- 商店ID
-	}, 
+	},
+    month_card = { --月卡+特刊奖励
+		item_type = true, --月卡 1， 特刊 2
+        item_id = true, --月卡id
+        before_ex = true, --未领取奖励前的期
+        cur_ex = true, --剩余期数
+		reward_time = true,  --奖励时间
+        month_reward_detail = "json", --奖励物品 {'itemid1':123,'itemid2':456,………...}
+	},
 	--[[
 	100	添加好友
 	200	删除好友
@@ -2328,7 +2328,6 @@ function RolePlugin.bind(Role)
 		return rechargeId
 	end
-
 	function Role:recharge(params)
 		local id = tonumber(params.id)
 		local rechargeData = csvdb["shop_rechargeCsv"][id]
@@ -2353,8 +2352,16 @@ function RolePlugin.bind(Role)
 			end
 			self:gainDiamond({count = diamondCount, isRecharge = true, sid = params.sid, log = {desc = "recharge", int1 = id}})
 		elseif rechargeData.shop == 2 then  --通行证商店
+            --订阅奖励
 			reward, _ = self:award(rechargeData.itemFirst, {isRecharge = true, log = {desc = "recharge", int1 = id}})
-			self.storeData:onBuyCard(rechargeData.type, rechargeData.time, rechargeData.id, rechargeData.activity_id)
+
+            --签收奖励
+			local tmpreward, _ = self.storeData:onBuyCard(rechargeData.type, rechargeData.time, rechargeData.id, rechargeData.activity_id)
+			if tmpreward then
+				for k, v in pairs(tmpreward) do
+					reward[k] = (reward[k] or 0) + v
+				end
+			end
 		elseif rechargeData.shop == 3 then  -- 礼包商店
 			reward, _ = self:award(rechargeData.itemFirst, {isRecharge = true, log = {desc = "recharge", int1 = id}})
 		else
@@ -85,6 +85,7 @@ ResetFunc[&quot;CrossWeek&quot;] = function(self, notify, response)
 	response.dinerS = {}
 	self.activity:refreshWeekData(notify)
+	self.storeData:refreshWeekData(notify)
 	-- 跨周送一些道具
 	local BnousReward = self:getBnousPvpTicket()
@@ -8,24 +8,13 @@ end
 function Store:onLoad()
     local monEx = self:getProperty("monthCardEx")
-    local smonEx = self:getProperty("smonthCardEx")
     local monId = self:getProperty("monthCardId")
-    local smonId = self:getProperty("smonthCardId")
-    local timeNow = skynet.timex()
     local flag = false
-    if monEx > timeNow and monId == 0 then
+    if monEx > 0 and monId == 0 then
         self:updateProperty({field = "monthCardId", value = 101})
         self:updateProperty({field = "getMailT1", value = 0})
         flag = true
     end
-    if smonEx > timeNow and smonId == 0 then
-        self:updateProperty({field = "smonthCardId", value = 102})
-        self:updateProperty({field = "getMailT2", value = 0})
-        flag = true
-    end
-    if flag then
-        self:sendMonthCardEmail()
-    end
 end
 ActGoodsType = {
@@ -39,10 +28,13 @@ Store.schema = {
 	growFund		= {"number", 0},		-- 成长基金
     growFundR  = {"string", ""},        -- 成长基金领取记录
-	monthCardEx	= {"number", 0},		-- 月卡过期时间戳
+	monthCardEx	= {"number", 0},		-- 期数
 	monthCardId	= {"number", 0},		-- 月卡id
-    smonthCardEx	= {"number", 0},		-- 超级月卡过期时间戳
-    smonthCardId	= {"number", 0},		-- 超级月卡id
+    firstMonthCard =  {"number", 1},      -- 首次订阅月卡
+    monthCardReceive = {"number", 0},      -- 月卡奖励领取记录 当天 0-未领取， 1-已经领取
+
+    smonthCards = {"table", {}},     --特刊信息 {[id]={["buyCount"]=0, ["periods"]=0, ["openFlag"]= 1}} buyCount: 购买次数，periods: 剩余期数，openFlag: 是否开放标识
+    smonthCardReceive = {"number", 0},      -- 特刊奖励领取记录 当天 0-未领取， 1-已经领取
 	battleCard	= {"number", 0},		-- 赛季卡
 	battleFR = {"string", ""},		-- 免费赛季卡领取记录
@@ -60,6 +52,9 @@ Store.schema = {
     bpInfo = {"table", {}},         -- battle pass 探索指令  1={flag=0 为1表示买了，br=""付费领取记录, fr=""免费领取记录},2,3,4
     totalRR  = {"string", ""},        -- 累计充值奖励领取记录
+
+    dailyShop = {"table", {}},
+    weekShop = {"table", {}},
 }
 function Store:updateProperty(params)
@@ -82,9 +77,106 @@ function Store:updateProperty(params)
 end
 function Store:onCrossDay()
-    self:sendMonthCardEmail()
+    --self:sendMonthCardEmail()
     self:deleteExpireLimitGoods()
     --self:checkPaySignReward()
+
+    --刷新商店
+    self:flushDailyShop()
+
+    --重置月卡、特刊奖励领取记录
+    self:updateProperty({field = "monthCardReceive", value = 0})
+    self:updateProperty({field = "smonthCardReceive", value = 0})
+end
+
+function Store:refreshWeekData(notify)
+    self:flushWeekShop()
+end
+
+local SuperMonthCard = {}
+
+SuperMonthCard["buy"] = function(self, id)
+    local smonthCards = self:getProperty("smonthCards") or {}
+
+    local BuyMonthCard = {}
+    BuyMonthCard["renewal"]= function()
+        --续刊
+        if self:isMonthCardExpire() then return false end
+
+        local smonthCard = smonthCards[id] or {}
+        if next(smonthCard) then
+            local rechargeData = csvdb["shop_rechargeCsv"][id] or {}
+            local buyCount = smonthCard["buyCount"] or 0
+            if buyCount >= (rechargeData["limit"] or 3) then return false end
+
+            smonthCard["buyCount"] = (smonthCard["buyCount"] or 0) + 1
+
+            local card = csvdb["shop_cardCsv"][id] or {}
+            local periods = SuperMonthCard["periods"](self, id) + (card["cardPlusPeriods"] or 30)
+            smonthCard["periods"] = periods
+
+            self:updateProperty({filed = "smonthCards", value = smonthCards})
+            return true
+        end
+    end
+    BuyMonthCard["order"] = function()
+        --增刊条件 + 标识
+        for _, val in pairs(smonthCards) do
+            val["openFlag"] = 0
+        end
+
+        local card = csvdb["shop_cardCsv"][id] or {}
+        if (card["cardPlusFlag"] or 0) ~= 1 then return false end
+
+        --判断是否购买过增刊条件里的特刊
+
+        local cardPlusCondition = card["cardPlusCondition"] or 0
+        if self:isMonthCardExpire() or smonthCards[cardPlusCondition] == nil then return false end
+
+        local smonthCard = {["periods"] = (card["cardPlusPeriods"] or 30), ["buyCount"] = 1, ["openFlag"] = 1 }
+        smonthCards[id] = smonthCard
+
+        self:updateProperty({filed = "smonthCards", value = smonthCards})
+        return true
+    end
+
+    if SuperMonthCard["isExpired"](self, id) then
+        local smonthCard = smonthCards[id] or {}
+        if next(smonthCard) then
+            return BuyMonthCard["renewal"]()
+        else
+            return BuyMonthCard["order"]()
+        end
+    else
+        return BuyMonthCard["renewal"]()
+    end
+end
+
+SuperMonthCard["periods"] = function(self, id)
+    local smonthCards = self:getProperty("smonthCards") or {}
+    local smonthCard = smonthCards[id] or {}
+    return smonthCard["periods"] or 0
+end
+
+SuperMonthCard["isExpired"] = function (self, id)
+    local periods = SuperMonthCard["periods"](self, id)
+    return periods == 0
+end
+
+SuperMonthCard["itemDaily"] = function(self, id)
+    local cur_ex = SuperMonthCard["periods"](self, id)
+    if cur_ex == 0 then return nil, nil end
+    cur_ex = cur_ex - 1
+
+    local card = csvdb["shop_cardCsv"][id] or {}
+    local reward, change = self.owner:award(card["itemDaily"], {log = {desc = "smonthCardReward", int1 = id, int2 = cur_ex}})
+
+    local smonthCards = self:getProperty("smonthCards") or {}
+    local smonthCard = smonthCards[id] or {}
+    smonthCard["periods"] = cur_ex
+    self:updateProperty({field = "smonthCards", value = smonthCards})
+
+    return reward, change, cur_ex
 end
 -- 删除过期商品
@@ -139,15 +231,11 @@ function Store:sendMonthCardEmail()
 end
 function Store:isMonthCardExpire()
-    local timeNow = skynet.timex()
-    local ts = self:getProperty("monthCardEx")
-    return ts < timeNow
+    return self:getProperty("monthCardEx") == 0
 end
-function Store:isSuperMonthCardExpire()
-    local timeNow = skynet.timex()
-    local ts = self:getProperty("smonthCardEx")
-    return ts < timeNow
+function Store:isSuperMonthCardExpire(id)
+    return false
 end
 function Store:isPrivCardExpire()
@@ -225,23 +313,97 @@ function Store:getCurMonthCardLvl(isSuper)
     return cfg.level or 0
 end
+--获取月卡每日奖励
+function Store:getMonthCardDailyReward(id)
+    if self:isMonthCardExpire() or self:getProperty("monthCardReceive") == 1 then return nil, nil end
+
+    local before_ex = self:getProperty("monthCardEx")
+    self:updateProperty({field = "monthCardEx", delta = -1})
+    local cur_ex = self:getProperty("monthCardEx")
+
+    local actCfg = csvdb["shop_card"][id] or {}
+    local award = actCfg.itemDaily:toNumMap()
+    local reward, change = self.owner:award(award, {log = {desc = "monthCardReward", int1 = id, int2 = cur_ex}})
+
+    --今日月卡奖励已经领取
+    self:updateProperty({field = "monthCardReceive", value = 1})
+
+    self.owner:log("month_card", {
+        item_type = CardType.NormalMonthCard,
+        item_id = id, --月卡id
+        before_ex = before_ex, --未领取奖励前的期
+        cur_ex = cur_ex, --剩余期数
+        reward_time = skynet.timex(),  --奖励时间
+        month_reward_detail = reward,
+    })
+    return reward, change
+end
+
+--获取特刊每日奖励
+function Store:getSMonthCardDailyReward(id)
+    local before_ex = SuperMonthCard["periods"](self, id)
+    local reward, change, cur_ex= SuperMonthCard["itemDaily"](self, id)
+
+    --今日特刊奖励已经领取
+    self:updateProperty({field = "smonthCardReceive", value = 1})
+
+    self.owner:log("month_card", {
+        item_type = CardType.SuperMonthCard,
+        item_id = id, --月卡id
+        before_ex = before_ex, --未领取奖励前的期
+        cur_ex = cur_ex, --剩余期数
+        reward_time = skynet.timex(),  --奖励时间
+        month_reward_detail = reward,
+    })
+    return reward, change
+end
+
+function Store:firstBuyMonthCard(id)
+    if self:getProperty("firstMonthCard") == 1 then
+        self:updateProperty({field = "firstMonthCard", value = 0})
+        local card = csvdb["shop_cardCsv"][id] or {}
+        return self:award(card["cardFirst"], {log = {desc = "monthCardReward", int1 = id, int2 = 30}})
+    end
+    return nil
+end
+
 -- 购买通行证
 function Store:onBuyCard(type, duration, id, actid)
     local timeNow = skynet.timex()
     if type == CardType.NormalMonthCard then
         if self:isMonthCardExpire() then
             self:updateProperty({field = "monthCardId", value = id})
-            self:updateProperty({field = "monthCardEx", value = timeNow + duration})
-        else
-            self:updateProperty({field = "monthCardEx", value = self:getProperty("monthCardEx") + duration})
         end
-        self:sendMonthCardEmail()
+        self:updateProperty({field = "monthCardEx", value = self:getProperty("monthCardEx") + 30})
+
+        --初回特典  仅首次购买月卡时赠送SSR级角色"拉塔托娅"
+       local reward = {}
+        local tmpreward, _ = self:firstBuyMonthCard(id)
+        if tmpreward then
+            for k, v in pairs(tmpreward) do
+                reward[k] = (reward[k] or 0) + v
+            end
+        end
+
+        --签收奖励
+        tmpreward, _= self:getMonthCardDailyReward(id)
+        if tmpreward then
+            for k, v in pairs(tmpreward) do
+                reward[k] = (reward[k] or 0) + v
+            end
+        end
+        return reward
+    elseif type == CardType.SuperMonthCard then
+        if SuperMonthCard["buy"](self, id) then
+            return self:getSMonthCardDailyReward(id)
+        end
+        return nil, nil
     elseif type == CardType.NormalMonthCardLevelUp then
         if self:isMonthCardExpire() then
             skynet.error(string.format("month card expired, can not level up,%d,%d",self.owner:getProperty("id"), id))
         else
             local cfg = csvdb["shop_cardCsv"][id]
-            if not cfg then return end 
+            if not cfg then return end
             local dif = cfg.level - self:getCurMonthCardLvl(false)
             if dif > 1 and dif < 0 then
                 return
@@ -250,20 +412,13 @@ function Store:onBuyCard(type, duration, id, actid)
             self:updateProperty({field = "monthCardEx", value = self:getProperty("monthCardEx") + duration})
         end
         self:sendMonthCardEmail()
-    elseif type == CardType.SuperMonthCard then
-        if self:isSuperMonthCardExpire() then
-            self:updateProperty({field = "smonthCardId", value = id})
-            self:updateProperty({field = "smonthCardEx", value = timeNow + duration})
-        else
-            self:updateProperty({field = "smonthCardEx", value = self:getProperty("smonthCardEx") + duration})
-        end
-        self:sendMonthCardEmail()
+
     elseif type == CardType.SuperMonthCardLevelUp then
         if self:isSuperMonthCardExpire() then
             skynet.error(string.format("super month card expired, can not level up,%d,%d",self.owner:getProperty("id"), id))
         else
             local cfg = csvdb["shop_cardCsv"][id]
-            if not cfg then return end 
+            if not cfg then return end
             local dif = cfg.level - self:getCurMonthCardLvl(true)
             if dif > 1 and dif < 0 then
                 return
@@ -306,6 +461,7 @@ function Store:onBuyCard(type, duration, id, actid)
         self.owner:mylog("act_action", {desc="buyBc", int1=id, int2=actData["lvl"] or 0})
         self.owner.activity:updateActData("BattleCommand", actData)
     end
+    return nil, nil
 end
 --检测购买是否超过限制数量
@@ -548,6 +704,88 @@ function Store:OnTriggerLimitTimePackAfterTs(eventType, param)
     end
 end
+local function checkShopFinish(shop, shopPool)
+    local tmpShop = shopPool[shop.id] or {}
+    if next(tmpShop) then
+        if tmpShop.expire_ts then
+            if skynet.timex() > tmpShop.expire_ts then
+                shopPool[shop.id] = nil
+                return true
+            else
+                return false
+            end
+        else
+            tmpShop.expire_ts = skynet.timex() + tmpShop.cool_time * DAY_SEC
+            return false
+        end
+    else
+        return true
+    end
+end
+
+--随机日/周商店随机两个商品
+-- 1. 让缓存里的商品进入冷却时间
+-- 2. 删除缓存里的已经冷却好的商品
+-- 3. 随机两件商品放入缓存中
+function Store:flushDailyShop()
+    local dailyShop = self:getProperty("dailyShop") or {}
+    local tmpDailyShop = {}
+
+    for id, data in pairs(csvdb["shop_normalCsv"]) do
+        if data.shop == 1 and data.shopType == 3 then
+            if data.resetTime == 1 and checkShopFinish(data, dailyShop) then
+                tmpDailyShop[id] = {["id"] = data.id, ["weight"] = 100, ["cool_time"] = data.cool_time}
+            end
+        end
+    end
+
+    --随机两件商品放入缓存 跨天刷新
+    if next(tmpDailyShop) then
+        local id = math.randWeight(tmpDailyShop)
+        if id then
+            dailyShop[id] = tmpDailyShop[id]
+            tmpDailyShop[id] = nil
+        end
+
+        id = math.randWeight(tmpDailyShop)
+        if id then
+            dailyShop[id] = tmpDailyShop[id]
+            tmpDailyShop[id] = nil
+        end
+    end
+
+    self:updateProperty({field="dailyShop", value= dailyShop})
+end
+
+function Store:flushWeekShop()
+    local weekShop = self:getProperty("weekShop") or {}
+    local tmpWeekShop = {}
+
+    for id, data in pairs(csvdb["shop_normalCsv"]) do
+        if data.shop == 1 and data.shopType == 3 then
+            if data.resetTime == 2 and checkShopFinish(data, weekShop)then
+                tmpWeekShop[id] = {["id"] = data.id, ["weight"] = 100, ["cool_time"] = data.cool_time}
+            end
+        end
+    end
+
+    --随机两件商品放入缓存 跨周刷新
+    if next(tmpWeekShop) then
+        local id = math.randWeight(tmpWeekShop)
+        if id then
+            weekShop[id] = weekShop[id]
+            tmpWeekShop[id] = nil
+        end
+
+        id = math.randWeight(tmpWeekShop)
+        if id then
+            weekShop[id] = weekShop[id]
+            tmpWeekShop[id] = nil
+        end
+    end
+    self:updateProperty({field="weekShop", value= weekShop})
+end
+
 function Store:data()
     self:OnTriggerLimitTimePackAfterTs(TriggerEventType.AfterTs, skynet.timex())
 	return {
@@ -556,7 +794,6 @@ function Store:data()
         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"),
@@ -567,7 +804,10 @@ function Store:data()
         bpInfo = self:getProperty("bpInfo"),
         totalRR = self:getProperty("totalRR"),
         monthCardId  = self:getProperty("monthCardId"),
-        smonthCardId  = self:getProperty("smonthCardId"),
+        smonthCards  = self:getProperty("smonthCards"),
+        smonthCardReceive  = self:getProperty("smonthCardReceive"),
+        dailyShop  = self:getProperty("dailyShop"),
+        weekShop  = self:getProperty("weekShop"),
 	}
 end