Merge branch 'cn/develop' into cn/player

jiyue
2 parents becc5827 d4876585
Showing 26 changed files with 670 additions and 146 deletions Show diff stats
src/ProtocolCode.lua
src/actions/ActivityAction.lua
src/actions/AdvAction.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/csvdata
src/models/Activity.lua
src/models/Email.lua
src/models/Role.lua
src/models/RoleBattle.lua
@@ -8,6 +8,7 @@ actionCodes = {
 	Sys_maintainNotice = 6,
 	Sys_customNotice = 7,
 	Sys_checkQueue = 8,
+	Sys_gameNotice = 9,
 	Gm_clientRequest = 20,
 	Gm_receiveResponse = 21,
@@ -222,6 +223,7 @@ actionCodes = {
 	Store_getBattlePassRewardRpc = 562,	--赛季卡奖励
 	Store_getExploreCommandRewardRpc = 563, --探索指令
 	Store_getTotalRechargeAwardRpc = 564,	-- 累计充值
+	Store_monthCardRewardRpc = 565, --每日月卡+特刊奖励
 	Store_biliCloudRechargeRpc = 596,
 	Store_biliAndroidRechargeRpc = 597,
@@ -259,6 +261,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,40 +626,44 @@ 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()
-		if getStarCount(battleCfg, star) == 3 then
-			local aw = battleCfg.perfect_reward:toNumMap()
-			for k, v in pairs(aw) do
-				award[k] = (award[k] or 0) + v
-			end
-		end
+
+		if battleCfg.rank ~= 0 then
+            if getStarCount(battleCfg, star) == 3 then
+                local aw = battleCfg.perfect_reward:toNumMap()
+                for k, v in pairs(aw) do
+                    award[k] = (award[k] or 0) + v
+                end
+            end
+        end
 		for k, v in pairs(award) do
 			award[k] = v * count
 		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)
@@ -1434,7 +1437,7 @@ function _M.returnerTaskRpc(agent, data)
 	local TaskCsv = csvdb["activity_taskCsv"][76] or {}
 	local taskData = TaskCsv[taskId]
 	if not taskData then return 2 end
-	if curAllDay < taskData.day then return 2 end
+	if curAllDay < taskData.day then return 5 end
 	local status = returner.status or {}
 	if status[taskId] then return 3 end
@@ -1466,4 +1469,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 -- 战斗力是否满足
@@ -112,6 +112,8 @@ function _M.addSellRpc( agent, data )
 	role:mylog("diner_action", {desc = "addSell", int1 = dish, int2 = count})
+	role:mylog("diner_action", {desc = "onSell", short1 = 1, int1 = dish, int2 = count, cint1 = msg.slot, cint2 = count, cint3 = dishLevel})
+
 	role.dinerData:updateProperty({field = "sells", value = json.encode(sells)})
 	SendPacket(actionCodes.Diner_addSellRpc, "")
 	return true
@@ -192,7 +194,10 @@ function _M.getSellRewardRpc( agent, data )
 		}
 		deltaTimes[slot] = temp.deltaTime
 		local sellCount = oldCount - temp.lastCount
-		role:mylog("diner_action", {desc = "sell", int1 = sellDish, int2 = sellCount})
+        if sellCount > 0 then
+            role:mylog("diner_action", {desc = "sell", int1 = sellDish, int2 = sellCount})
+            role:mylog("diner_action", {desc = "onSell", short1 = 2, int1 = sellDish, int2 = sellCount, cint1 = tonumber(slot), cint2 = temp.lastCount, cint3 = sell.level})
+        end
 	end
 	sells = json.decode(role.dinerData:getProperty("sells"))
 	for slot, sell in pairs(sells) do
@@ -310,6 +315,9 @@ function _M.expediteSellRpc( agent, data )
 				restaurant_sale_coin = rewards[ItemId.DinerCoin] or 0, -- 售卖获得美食币
 				restaurant_sale_gear = rewards[ItemId.Gold] or 0, -- 售卖获得齿轮
 			})
+            if result.expediteCount > 0 then
+                role:mylog("diner_action", {desc = "onSell", short1 = 3, int1 = sell.dish, int2 = result.expediteCount, cint1 = tonumber(slot), cint2 = result.lastCount, cint3 = sell.level})
+            end
 		end
 	end
@@ -129,7 +129,7 @@ function _M.drawAllAttachRpc(agent, data)
 			for key, v in pairs(attachments:toNumMap()) do
 				reward[key] = (reward[key] or 0) + v
 			end
-			role:mylog("mail_action", {desc = "draw_attach", int1 = email:getProperty("emailId"), key1 = email:getProperty("title"), key2 = attachments})
+			--role:mylog("mail_action", {desc = "draw_attach", int1 = email:getProperty("emailId"), key1 = email:getProperty("title"), key2 = attachments})
 		end
 	end
 	if role:checkRuneFullyByReward(reward) then return 1 end
@@ -168,7 +168,7 @@ function _M.drawAttachRpc(agent, data)
 	email:setProperty("status", 2, true)
 	email:log(role, 2)
 	SendPacket(actionCodes.Email_drawAttachRpc, MsgPack.pack({reward = reward, change = change}))
-	role:mylog("mail_action", {desc = "draw_attach", int1 = email:getProperty("emailId"), key1 = email:getProperty("title"), key2 = attachments})
+	--role:mylog("mail_action", {desc = "draw_attach", int1 = email:getProperty("emailId"), key1 = email:getProperty("title"), key2 = attachments})
 	return true
 end
@@ -184,7 +184,7 @@ function _M.checkRpc(agent, data)
 	email:setProperty("status", 1, true)
 	email:log(role, 1)
-	role:mylog("mail_action", {desc = "check_mail", int1 = id})
+	--role:mylog("mail_action", {desc = "check_mail", int1 = id})
 	SendPacket(actionCodes.Email_checkRpc, '')
 	return true
@@ -38,6 +38,7 @@ function _M.ban(role, pms)
 	role:setBan(time, ctype)
 	role:mylog("gm_action", {desc = "ban", int1 = time, int2 = ctype, key1 = pms.sender})
+
 	return "封杀成功"
 end
@@ -64,14 +65,16 @@ function _M.reset_rank(role, pms)
 end
 function _M.silent(role, pms)
-	local pm1 = tonum(pms.pm1)
+	local pm1 = tonum(pms.pm1, 0)
+    dump(pms, pm1)
 	if pm1 < 1 then
 		role:updateProperty({field = "silent", value = 0})
+        role:setProperty("silentType", 0)
 		return "解禁言成功"
 	end
 	role:updateProperty({field = "silent", value = specTime({hour = 0}, skynet.timex()) + pm1 * 86400})
-
-	role:mylog("gm_action", {desc = "silent", int1 = pms.pm1, key1 = pms.sender})
+    role:setProperty("silentType", pms.pm2 or 0)
+	role:mylog("gm_action", {desc = "silent", int1 = pm1, key1 = pms.sender})
 	return "禁言成功"
 end
@@ -353,10 +353,12 @@ function _M.endBattleRpc(agent, data)
 		reward = reward,
 	})
-	local team = role:getProperty("pvpTC")
+	--local team = role:getProperty("pvpTC")
+    local team = role:getTeamFormatByType(TeamSystemType.Hang)
 	local battleTime = skynet.timex() - role._StartBattleTs
-	role:mylog("hang_action", {desc = "hangBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = carbonId, int2 = role:getProperty("hangTBV"), cint1 = role:getHerosCamp(team.heros), cint2 = battleTime})
+	role:mylog("hang_action", {desc = "hangBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = carbonId, int2 = role:getProperty("hangTBV"), 
+    cint1 = role:getHerosCamp(team.heros), cint2 = battleTime, key1 = role:getHerosLogStr(team.heros), key2 = role:getRewardLogStr(reward)})
 	SendPacket(actionCodes.Hang_endBattleRpc, MsgPack.pack({
 		starNum = msg.starNum, 
@@ -1040,6 +1040,7 @@ function _M.drawHeroRpc(agent, data)
 			end
 		end
+        local itemCount = 1
 		if role:isHaveHero(itemData.id - ItemStartId.Hero) then
 			local fragId = itemData.id - ItemStartId.Hero
 			local heroData = csvdb["unitCsv"][fragId]
@@ -1047,6 +1048,7 @@ function _M.drawHeroRpc(agent, data)
 			role:award({[fragId] = count}, {log = {desc = "drawHero", int1 = btype, int2 = poolId, short1=isFloorBack and 1 or 0}})
 			logReward[fragId] = (logReward[fragId] or 0) + count
 			table.insert(reward, {id = fragId, count = count, from = itemId, fcount = 1})
+            itemCount = count
 		else
 			role:award({[itemId] = 1}, {log = {desc = "drawHero", int1 = btype, int2 = poolId, short1=isFloorBack and 1 or 0}})
 			logReward[itemId] = (logReward[itemId] or 0) + 1
@@ -1064,6 +1066,10 @@ function _M.drawHeroRpc(agent, data)
 		dailyDrawCnt = dailyDrawCnt + 1
 		role:checkTaskEnter("DrawHeroLimitPack", {count = dailyDrawCnt})
+
+        local ssrUpMap = role:getProperty("ssrUp") or {}
+        local ssrFloorCnt = ssrUpMap[poolId] or 0
+        role:mylog("hero_action", {desc = "drawHero", int1=poolId, int2=btype, short1 = drawCount[drawType], cint1 = ssrFloorCnt, cint2 = itemId, cint3 = itemCount})
 	end
 	role:award(drawAddReward, {log = {desc = "drawHero", int1 = btype}})
@@ -1089,6 +1095,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, -- 卡池类型
@@ -1099,7 +1115,7 @@ function _M.drawHeroRpc(agent, data)
 		gacha_cnt = floorHeroCount,
 	})
-	role:mylog("hero_action", {desc = "drawHero", int1=poolId, int2=btype, short1 = drawCount[drawType]})
+	--role:mylog("hero_action", {desc = "drawHero", int1=poolId, int2=btype, short1 = drawCount[drawType]})
 	SendPacket(actionCodes.Hero_drawHeroRpc, MsgPack.pack({reward = reward, subReward = drawAddReward})) -- 这个 reward 是数组
 	local feedbackId = buildTypeData["can_feedback"] or 0
@@ -143,6 +143,7 @@ function _M.gm_action(query)
 	role:startActionUcode()
 	local status = gmFuncs[query.cmd](role, query)
 	role:endActionUcode()
+    role:update()
 	return status
 end
@@ -208,7 +209,14 @@ function _M.broadcast(query)
 				msg["body"] = query.content
 				msg["logout"] = query.logout
 			end
-		}
+		},
+		["game"] = {
+			code = actionCodes.Sys_gameNotice,
+			exec = function()
+				msg["new"] = query.status
+				msg["channels"] = query.channels
+			end
+		},
 	}
 	if not handle[query.cmd] then return "错误" end
 	handle[query.cmd].exec()
@@ -472,7 +472,8 @@ function _M.endBattleRpc(agent, data)
 		reward = reward,
 		rank = myRank,
 	})
-	role:mylog("pvp_action", {desc = "battleEnd", short1 = 1, int1 = isWin and 1 or 0, int2 = revenge and 1 or 0})
+	role:mylog("pvp_action", {desc = "battleEnd", short1 = 1, int1 = isWin and 1 or 0, int2 = revenge and 1 or 0, cint1 = oldMyRank, cint2 = myRank, 
+    cint3 = match.id, long1 = 1, key1 = msg.key, key2 = role:getHerosLogStr(role:getProperty("pvpTC").heros)})
 	_pvpBattleInfoCacheC = {}  --重新发阵容了 没毛病
 	_pvpRecordInfoCacheC = {} -- 记录刷新了
@@ -578,7 +579,6 @@ function _M.startBattleHRpc(agent, data)
 	if not revenge then
 		-- 次数扣一波
-        print("xxxxx")
 		local pvpFreeH = role.dailyData:getProperty("pvpFreeH")
 		if pvpFreeH >= globalCsv.pvp_battle_free_count_high then
 			local cost = {[ItemId.PvpKey] = globalCsv.pvp_battle_high_cost}
@@ -676,11 +676,13 @@ function _M.endBattleHRpc(agent, data)
 		video = video,
 	})
+    local curStatus
 	-- 检查是否结束战斗
 	local winCount, loseCount = 0, 0
 	for _, status in pairs(_pvpStartBattleCacheH.result) do
 		if status.isWin then
 			winCount = winCount + 1
+            curStatus = true
 		else
 			loseCount = loseCount + 1
 		end
@@ -696,6 +698,8 @@ function _M.endBattleHRpc(agent, data)
 		return true
 	end
+    local curHTeam = _pvpStartBattleCacheH.pvpTH[#_pvpStartBattleCacheH.result] or {}
+
 	if winCount >= 2 then
 		isWin = true
 	elseif loseCount >= 2 then
@@ -720,6 +724,8 @@ function _M.endBattleHRpc(agent, data)
 			video = video, -- 返回让客户端上传录像
 			headers = headers,
 		}))
+        role:mylog("pvp_action", {desc = "battleEnd", short1 = 2, int1 = curStatus and 1 or 0, int2 = revenge and 1 or 0, cint1 = 0, cint2 = 0, 
+        cint3 = match.id, long1 = #_pvpStartBattleCacheH.result, key1 = msg.key, key2 = role:getHerosLogStr(curHTeam.heros)})
 		return true
 	end
 	if revenge and isWin then
@@ -814,6 +820,8 @@ function _M.endBattleHRpc(agent, data)
 		rank = myRank,
 	})
+    role:mylog("pvp_action", {desc = "battleEnd", short1 = 2, int1 = curStatus and 1 or 0, int2 = revenge and 1 or 0, cint1 = oldMyRank, cint2 = myRank, 
+    cint3 = match.id, long1 = #_pvpStartBattleCacheH.result, key1 = msg.key, key2 = role:getHerosLogStr(curHTeam.heros)})
 	_pvpBattleInfoCacheH = {}  --重新发阵容了 没毛病
 	_pvpRecordInfoCacheH = {} -- 记录刷新了
@@ -825,7 +833,7 @@ function _M.endBattleHRpc(agent, data)
 	if isWin then
 		role:checkTaskEnter("PvpWin", {score = myScore})
 	end
-	role:mylog("pvp_action", {desc = "battleEnd", short1 = 2, int1 = isWin and 1 or 0, int2 = revenge and 1 or 0})
+
 	SendPacket(actionCodes.Pvp_endBattleHRpc, MsgPack.pack({
 		reward = reward,
@@ -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
@@ -1183,7 +1216,7 @@ function _M.chatRpc(agent, data)
 		[1] = function ()
 			if role:getProperty("silent") > now then  --禁言
 				result = 1
-				return
+				--return
 			end
 			if role:getProperty("level") < (globalCsv.chat_level or 15) then
 				result = 3
@@ -1212,7 +1245,12 @@ function _M.chatRpc(agent, data)
 					return
 				end
 			end
-			mcast_util.pub_world(actionCodes.Role_chat, MsgPack.pack(response))
+            if result == 1 then
+                SendPacket(actionCodes.Role_chat, MsgPack.pack(response))
+                result = 0
+            else
+                mcast_util.pub_world(actionCodes.Role_chat, MsgPack.pack(response))
+            end
 			-- pcall(skynet.send, '.globald', "lua", "sendWorldMsg", role._channelIdx, response)
 			role:mylog("role_action", {desc = "chatWorld", text1 = content})
 		end,
@@ -1328,7 +1366,7 @@ function _M.drawCodeRpc(agent, data)
 				gift_name = "", -- 礼包名称
 				gift_reason = 0, -- 礼包发放原因，见发放原因枚举表
 			})
-			role:mylog("role_action", {desc = "drawCode", int1 = giftId, key1 = code})
+			role:mylog("role_action", {desc = "drawCode", int1 = giftId, key1 = code, key2 = role:getRewardLogStr(result.gift)})
 			SendPacket(actionCodes.Role_drawCodeRpc, MsgPack.pack({
 				result = ret,
 				reward = reward,
@@ -307,9 +307,11 @@ function _M.shopBuyRpc(agent , data)
 	if not role:checkItemEnough(cost) then return 4 end
+    local limitStr = ""
 	if dataSet.limit ~= 0 then
 		buyRecord[id] = (buyRecord[id] or 0) + count
 		role.storeData:updateProperty({field = "buyR", value = buyRecord})
+        limitStr = string.format("%s/%s", buyRecord[id], dataSet.limit)
 	end
 	role:costItems(cost, {log = {desc = desc, int1 = id, int2 = count, short1 = dataSet.shop}})
@@ -333,7 +335,7 @@ function _M.shopBuyRpc(agent , data)
 		shop_purchase_current = costCount or 0, -- 购买道具消耗的货币数量
 		shop_id = dataSet.shop, -- 商店ID
 	})
-	role:mylog("role_action", {desc = desc, int1 = id, int2 = count})
+	role:mylog("role_action", {desc = "shopBuy", int1 = id, int2 = count, short1=dataSet.shop, key1 = limitStr})
 	SendPacket(actionCodes.Store_shopBuyRpc, MsgPack.pack({reward = reward}))
 	return true
 end
@@ -546,4 +548,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
@@ -150,7 +150,11 @@ function _M.endBattleRpc(agent, data)
 		rank = rank,
 		tower = towerType + 1
 	})
-	role:mylog("tower_action", {desc = "endBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = id})
+    local team = role:getTowerTeamFormat(towerType + 1)
+
+
+	role:mylog("tower_action", {desc = "endBattle", short1 = msg.starNum > 0 and 1 or 0, int1 = id, int2 =  towerType, 
+    cint1 = curLevel, key1 = role:getHerosLogStr(team.heros), key2 = role:getRewardLogStr(reward)})
 	SendPacket(actionCodes.Tower_endBattleRpc, MsgPack.pack({reward = reward, change = change}))
 	return true
@@ -924,24 +924,23 @@ function Adv:over(success, rewardRatio, overType)
 	end
 	self:clearAdvUnlockCache()
-	self:mylog({desc = "over", short1 = success and 1 or 0, int1 = overType, int2 = self.chapterId, long1 = self.level})
+	local team = self.owner:getProperty("advTeam")
+	self:mylog({desc = "over", short1 = success and 1 or 0, int1 = overType, int2 = self.chapterId, long1 = self.level, 
+    key1 = self.owner:getRewardLogStr(reward), key2 = self.owner:getHerosLogStr(team.heros)})
-	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 +1713,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
-Subproject commit 8e6c36f6d7a90dbec06c5a28d8538b80a65ca910
+Subproject commit 4d894270d4aeb6352a29dfd3a8686cbaea5b427c
@@ -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)
@@ -33,6 +33,8 @@ function Email:log(role, action)
 		mail_friend_id = 0, -- 收件方账号id
 		mail_friend_roleid = 0, -- 收件方角色id
 	})
+	role:mylog("mail_action", {desc = "onMail", int1 = self:getProperty("id"), int2 = self:getProperty("status"), cint1 = self:getProperty("emailId"), 
+    short1 = action, key1=self:getProperty("title"), key2=self:getProperty("attachments")})
 end
 function Email:data()
@@ -8,6 +8,7 @@ local RoleChangeStruct = import(&quot;.RoleChangeStruct&quot;) --角色数据额结构更
 local RolePvp = import(".RolePvp")  -- pvp
 local RoleCross = import(".RoleCross") -- 跨服务请求相关
 local RoleBattle = import(".RoleBattle") -- 跨服务请求相关
+local mysqlproxy = require "shared.mysqlproxy"
 RoleLog.bind(Role)
 RolePlugin.bind(Role)
@@ -56,6 +57,7 @@ Role.schema = {
 	lday				= {"number", 0},
 	banTime 			= {"number", 0},
 	banType 			= {"number", 0},
+	banReason 			= {"string", "", "", 512},
 	heartWarning 		= {"number", 0},
 	cheatCount			= {"number", 0},
 	ltime 				= {"number", 0}, -- 最后登录时间
@@ -79,6 +81,7 @@ Role.schema = {
 	-- loveStatus			= {"string", ""}, --统计角色的最高 好感度等级 类型相关 -- type=loveL type=loveL
 	crown				= {"number", 0},	-- 看伴娘
 	silent				= {"number", 0}, --禁言解禁时间
+	silentType 			= {"number", 0},    -- 禁言类型
 	timeGift 			= {"number", 0}, -- 创建角色时间礼包
 	bagLimit 			= {"table", globalCsv.store_limit_max},
@@ -345,6 +348,7 @@ end
 function Role:data()
 	return {
 		id = self:getProperty("id"),
+		uid = self:getProperty("uid"),
 		name = self:getProperty("name"),
 		intro = self:getProperty("intro"),
 		headId = self:getProperty("headId"),
@@ -358,7 +362,8 @@ function Role:data()
 		timeReset = self:getProperty("timeReset"),
 		diamond = self:getAllDiamond(),
 		bagLimit = self:getProperty("bagLimit"),
-		silent = self:getProperty("silent"),
+		--silent = self:getProperty("silent"),
+		silent = 0,
 		timeGift = self:getProperty("timeGift"),
 		advPass = self:getProperty("advPass"),
@@ -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,9 @@ local ItemReason = {
 	giftTime = 147, -- 创角后的时间礼包
 	activityCrisis = 148, -- 物资危机奖励
     glodConvertRune = 149, -- 金币兑换铭文
+    shopBuy = 150,  -- 商店购买
+	monthCardReward = 151, --月卡奖励
+	smonthCardReward = 152, --特刊奖励
 	advHang = 301, -- 拾荒挂机
 	hangBattle = 302, -- 挂机战斗
@@ -107,6 +110,7 @@ local ItemReason = {
 	actMilecrisis = 1010, -- 物资危机
 	battleCommandTask = 1011,	-- 将军令任务
 	newUserTask = 1012,	-- 新玩家任务
+    buyActivityBattleTicket = 1013, -- 购买门票
 	-- 餐厅
 	greenHourse = 1101, -- 食材获得
@@ -391,7 +395,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	删除好友
 local httpc = require("http.httpc")
 local md5 = require "md5"
 local cjson = require "shared.json"
+local mysqlproxy = require "shared.mysqlproxy"
 local serverId = tonumber(skynet.getenv("servId"))
 local RolePlugin = {}
@@ -337,6 +338,8 @@ function RolePlugin.bind(Role)
 			end
 			log["cint1"] = params.id
 			log["cint2"] = math.abs(params.count)
+			log["cint3"] = nums
+			log["long1"] = origin
 			if params.count <= 0 then
 				self:mylog("out_item", log)
 			else
@@ -377,6 +380,8 @@ function RolePlugin.bind(Role)
 			end
 			log["cint1"] = params.itemId
 			log["cint2"] = math.abs(params.count)
+			log["cint3"] = nums
+			log["long1"] = origin
 			if params.count <= 0 then
 				self:mylog("out_item", log)
 			else
@@ -494,6 +499,7 @@ function RolePlugin.bind(Role)
 			end
 			log["cint1"] = origin
 			log["cint2"] = count
+			log["cint3"] = origin + count
 			self:mylog("in_diamond", log)
 		else
 			print("gainDiamond no log ", debug.traceback())
@@ -547,6 +553,7 @@ function RolePlugin.bind(Role)
 			end
 			log["cint1"] = origin
 			log["cint2"] = count
+			log["cint3"] = origin - count
 			self:mylog("out_diamond", log)
 		else
 			print("costDiamond no log ", debug.traceback())
@@ -905,7 +912,8 @@ function RolePlugin.bind(Role)
 				end
 				log["cint1"] = sparkUid
-				log["cint2"] = params.cfg_id
+				log["cint2"] = params.id
+				log["cint3"] = 0
 				self:mylog("in_spark", log)
 			else
@@ -935,6 +943,7 @@ function RolePlugin.bind(Role)
 					log["cint1"] = sparkId
 					log["cint2"] = spark:getProperty("cfg_id")
+					log["cint3"] = spark:getProperty("level")
 					self:mylog("out_spark", log)
 				else
@@ -1144,6 +1153,38 @@ function RolePlugin.bind(Role)
 	-- 	return result
 	-- end
+	function Role:getRewardLogStr(gift)
+        if not gift then return '' end
+		local tgift = {}
+		if type(gift) == "string" then
+			for _, one in pairs(gift:toTableArray(true)) do
+				tgift[one[1]] = (tgift[one[1]] or 0) + one[2]
+			end
+		else
+			tgift = gift
+		end
+        local t = {}
+        for k, v in pairs(tgift) do
+            local name = csvdb['itemCsv'][k].name
+            table.insert(t, string.format("%s*%s", name, v))
+        end
+        return table.concat(t, ',')
+    end
+
+	function Role:getHerosLogStr(heros)
+		local t = {}
+		for _, id in pairs(heros or {}) do
+			local hero = self.heros[id]
+			if hero then
+				local name = csvdb["unitCsv"][hero:getProperty("type")].name
+                local level = hero:getProperty("level")
+                local wakeL = hero:getProperty("wakeL")
+                table.insert(t, string.format("%s(%s %s)", name,level,wakeL))
+			end
+		end
+        return table.concat(t, ',')
+	end
+
 	function Role:getHerosCamp(heros)
 		local had = {}
 		for _, id in pairs(heros or {}) do
@@ -2174,16 +2215,16 @@ function RolePlugin.bind(Role)
 			if not self.activity:isOpenById(rechargeData.activity_id, "ActShopGoods") then return "" end
 		end
-		local orderId = redisproxy:hget(string.format(R_ORDERS, roleId), rechargeId)
-		if orderId then
-			local uid = orderId * MAX_SVR_ID + serverId
-			local orderObject = require("models.Order").new({ key = string.format("%d", uid), id = uid })
-			if orderObject:load() and orderObject:getProperty("rechargeId") == rechargeId and math.abs(skynet.timex() - orderObject:getProperty("createTime")) < 5 * 60 then
-				return string.format("%d", uid)
-			end
-		end
+		-- local orderId = redisproxy:hget(string.format(R_ORDERS, roleId), rechargeId)
+		-- if orderId then
+		-- 	local uid = orderId * MAX_SVR_ID + serverId
+		-- 	local orderObject = require("models.Order").new({ key = string.format("%d", uid), id = uid })
+		-- 	if orderObject:load() and orderObject:getProperty("rechargeId") == rechargeId and math.abs(skynet.timex() - orderObject:getProperty("createTime")) < 5 * 60 then
+		-- 		return string.format("%d", uid)
+		-- 	end
+		-- end
-		orderId = redisproxy:hincrby("autoincrement_set", "order", 1)
+		local orderId = redisproxy:hincrby("autoincrement_set", "order", 1)
 		local uid = orderId * MAX_SVR_ID + serverId
 		local partnerOrderId = string.format("%d", orderId * MAX_SVR_ID + serverId)
 		local orderKey = string.format(R_ORDER, roleId, orderId)
@@ -2200,7 +2241,7 @@ function RolePlugin.bind(Role)
 		})
 		order:create()
 		-- 正在进行中的订单 缓存
-		redisproxy:hset(string.format(R_ORDERS, roleId), rechargeId, orderId)
+		-- redisproxy:hset(string.format(R_ORDERS, roleId), rechargeId, orderId)
 		return partnerOrderId
 	end
@@ -2253,7 +2294,7 @@ function RolePlugin.bind(Role)
 			-- redisproxy:hdel(string.format(R_ORDERS, roleId), rechargeId)
 		elseif status == "finsh" then
 			orderObject:setProperty("finishTime", skynet.time())
-			redisproxy:hdel(string.format(R_ORDERS, roleId), rechargeId)
+			-- redisproxy:hdel(string.format(R_ORDERS, roleId), rechargeId)
 		end
 		orderObject:update()
@@ -2301,7 +2342,7 @@ function RolePlugin.bind(Role)
 		end
 		local rechargeId = back
 		local rechargeData = csvdb["shop_rechargeCsv"][rechargeId]
-		if (params.is_mycard and rechargeData.twd * 100 ~= tonumber(params.amount)) or (not params.is_mycard and rechargeData.rmb * 100 ~= tonumber(params.amount)) then
+		if (params.is_mycard and rechargeData.twd * 100 ~= tonumber(params.amount)) or (not params.is_mycard and ((rechargeData.rmb * 100) / globalCsv.QArecharge) ~= tonumber(params.amount)) then
 			skynet.error(string.format("[recharge] fake order: %s, roleId: %d, order: %s,  rmb %s, get %s", 
 				params.transactionId, roleId, partnerOrderStr, rechargeData.rmb, params.amount
 			))
@@ -2328,7 +2369,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 +2393,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
@@ -487,6 +487,7 @@ function RoleTask.bind(Role)
 				if status[taskId] ~= -1 and data.type == stype and (data.condition2 == 0 or data.condition2 == cond1) then
 					status[taskId] = (status[taskId] or 0) + count
 					isChange[key] = 1
+                    self:mylog("role_action", {desc = "onTask", int1 = taskId, int2 = status[taskId], short1 = key, cint1 = data.condition1})
 				end
 			end
 		end
@@ -612,6 +613,9 @@ function RoleTask.bind(Role)
 			end
 		end
 		if next(change) then
+            for _, info in ipairs(change) do
+                self:mylog("role_action", {desc = "onTask", int1 = info.field, int2 = info.value, short1 = 3, cint1 = 0})
+            end
 			self:changeUpdates(change, notNotify)
 		end
 	end
@@ -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}} buyCount: 购买次数，periods: 剩余期数，
+    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,134 @@ 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 buyLimitFunc = function(buylimit)
+        for k, v in pairs(buylimit) do
+            if k == 1 then
+                if v == 101 then
+                    if self:isMonthCardExpire() then
+                        skynet.error("月卡过期")
+                        return false
+                    end
+                else
+                    if smonthCards[v] == nil then
+                        skynet.error("没有购买增刊里的条件, %d", v)
+                        return false
+                    end
+                end
+            elseif k == 2 then
+                if smonthCards[v] == nil and v ~= 101 then
+                    skynet.error("没有购买增刊里的条件, %d", v)
+                    return false
+                end
+                if SuperMonthCard["isExpired"](self, v) == false and v ~= 101 then
+                    skynet.error("上期特刊奖励没有领取完")
+                    return false
+                end
+            end
+        end
+        return true
+    end
+
+    local BuyMonthCard = {}
+    BuyMonthCard["renewal"]= function()
+        --续刊
+        local card = csvdb["shop_cardCsv"][id] or {}
+        if card["buyLimit"] and card["buyLimit"] ~= "" then
+            if buyLimitFunc(card["buyLimit"]:toNumMap()) == false then
+                skynet.error("不满足购买条件")
+                return false
+            end
+        end
+
+        local smonthCard = smonthCards[id] or {}
+        if next(smonthCard) then
+            smonthCard["buyCount"] = (smonthCard["buyCount"] or 0) + 1
+            local periods = SuperMonthCard["periods"](self, id) + (card["amount"] or 30)
+            smonthCard["periods"] = periods
+
+            self:updateProperty({field = "smonthCards", value = smonthCards})
+            return true
+        end
+    end
+    BuyMonthCard["order"] = function()
+        --增刊条件
+        local card = csvdb["shop_cardCsv"][id] or {}
+        if card["buyLimit"] and card["buyLimit"] ~= "" then
+            if buyLimitFunc(card["buyLimit"]:toNumMap()) == false then
+                skynet.error("不满足增刊条件")
+                return false
+            end
+        end
+        smonthCards[id] = {["periods"] = (card["amount"] or 30), ["buyCount"] = 1}
+
+        self:updateProperty({field= "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
+
+SuperMonthCard["itemFirst"] = function(self, id)
+    local card = csvdb["shop_cardCsv"][id] or {}
+    local reward, _ = self.owner:award(card["itemFirst"], {isRecharge = true, log = {desc = "recharge", int1 = id}})
+    return reward
 end
 -- 删除过期商品
@@ -139,15 +259,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 +341,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_cardCsv"][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.owner:award(card["itemOnce"], {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 = SuperMonthCard["itemFirst"](self, id)
+        if next(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
+            skynet.error("特刊购买成功:"..id)
+            return SuperMonthCard["itemFirst"](self, id)
+        end
+        return 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 +440,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 +489,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 +732,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 +822,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 +832,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
@@ -2,6 +2,8 @@ local ModelBaseMysql = class(&quot;ModelBaseMysql&quot;)
 ModelBaseMysql.key = "key"
 ModelBaseMysql.schema = {}
+local mysqlproxy = require "shared.mysqlproxy"
+
 local string_format = string.format
 local table_insert = table.insert
 local table_unpack = table.unpack