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

jiyue
2 parents 64aca5be 2fdb4d55
Showing 22 changed files with 602 additions and 242 deletions Show diff stats
robot/robot.lua
src/GlobalVar.lua
src/ProtocolCode.lua
src/actions/ActivityAction.lua
src/actions/AdvAction.lua
src/actions/GmAction.lua
src/actions/HangAction.lua
src/actions/HeroAction.lua
src/actions/RoleAction.lua
src/actions/StoreAction.lua
src/agent.lua
src/csvdata
src/models/Activity.lua
src/models/Email.lua
src/models/Role.lua
src/models/RoleCross.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
src/models/RoleTask.lua
src/models/Store.lua
@@ -136,6 +136,18 @@ function CMD.task()
 	startUnit()
 end
+function randomName()
+    local str = "1234567890abcdefghijklmnopqrstuvwxyz"
+    local len = #str
+    local result = ""
+    for i=1,10 do
+        local idx = math.random(1, len)
+        result = result .. string.sub(str, idx, idx)
+    end
+
+    return result
+end
+
 -- 开始登录
 function CMD.start(fd, id)
 	client.fd = fd
@@ -95,6 +95,7 @@ ItemType = {
 	CommonPaster				= 18, 	-- 万能贴纸
 	BossTicket					= 20, 	-- boss挑战门票
 	Spark						= 21, 	-- 火花
+	Stick 						= 23, 	-- 贴纸
 }
 --在这个里面的会记录的是功能开放 对应类型open 而不是 ID
@@ -133,7 +134,7 @@ ItemStartId = {
 --常用的物品id的枚举
 ItemId = {
 	Gold = 1,  -- 金币
-	Exp = 2,  -- 经验
+	Exp = 2,  -- 能量饮料
 	Jade = 3,  -- 虹光玉
 	PlayerExp = 4,  -- 突破材料
 	FriendPoint = 5,  -- 友情点
@@ -371,6 +372,8 @@ MailId = {
 	CBBackAward2 = 244,
 	ActivityPoolRet = 280,
 	MyCardBuy = 300,
+
+    RechargeBack = 3001,
 }
 TriggerEventType = {
@@ -388,6 +391,8 @@ TriggerEventType = {
     FoodSell = 11,  -- 循环卖菜
     RuneUp = 12,    -- 循环强化符文
     CostDiamond = 13,   -- 循环消耗钻石
+    BuyLimitPack = 14, --购买指定id礼包 触发
+	HeroTalent = 15, --英雄精进 触发礼包
 }
 DrawCardType = {
@@ -429,6 +434,8 @@ SystemBnousType = {
 	UpSpeedNum = 15, -- 加速次数上限增加 15=1探索加速or 2齿轮加速or 3餐厅加速=增加次数
 	ChangeBaseCount = 16, -- 每日奖励关卡挑战卡基础数量增加
 	ChangeBuyCount = 17, -- 每日奖励关卡挑战卡可购买次数增加，
+	ExtraProps= 18, -- 每次探索加速额外获得道具
+	AccountLevel = 19, -- 账号等级提升角色等级上限
 }
 -- 开箱物品类型
@@ -440,4 +447,12 @@ ItemOccupy = {
 	Spark = 5, --火花
     Other = 6,
 	CanUsed = 7, --可使用
+}
+
+-- 世界变动积分
+ItemWorldLine = {
+	RouletteCount = 1, --抽轮盘次数
+	Points = 2, --积分
+	CostDiamond = 3, --消耗钻石
+    CostJade = 4, --消耗红光玉
 }
 \ No newline at end of file
@@ -13,6 +13,8 @@ actionCodes = {
 	Gm_clientRequest = 20,
 	Gm_receiveResponse = 21,
 	Gm_helpRpc = 22,
+    Gm_clientLuaCommandNtf = 23,
+    Gm_clientUploadLuaResult = 24,
 	Role_notifyNewEvent = 100,
 	Role_queryLoginRpc = 101,
@@ -59,7 +61,9 @@ actionCodes = {
     Role_runeBuyRpc = 142,   	-- 铭文购买
     Role_setFriendTeamRpc = 143,   	-- 设置好友切磋队伍
     Role_setBgRpc = 144,   	-- 设置看板娘
-	Role_itemConvertMonthCardRpc = 145, -- 兑换月卡道具
+	Role_itemConvertSpecialRpc = 145, -- 兑换月卡/战令探索指令等 特殊道具
+	Role_worldLineRouletteRpc = 146, --世界线抽轮盘
+	Role_worldLineRewardRpc = 147, -- 世界线一键领取奖励
 	Adv_startAdvRpc = 151,
 	Adv_startHangRpc = 152,
@@ -113,6 +117,7 @@ actionCodes = {
 	Hero_setWishPoolRpc = 226,
 	Hero_changeSparkRpc = 227,
 	Hero_saveGeniusTreeRpc = 228,
+	Hero_stickersConvertRpc = 229, --兑换英雄贴纸
 	Hang_startRpc = 251,
 	Hang_checkRpc = 252,
@@ -225,6 +230,7 @@ actionCodes = {
 	Store_getExploreCommandRewardRpc = 563, --探索指令
 	Store_getTotalRechargeAwardRpc = 564,	-- 累计充值
 	Store_monthCardRewardRpc = 565, --每日月卡+特刊奖励
+    Store_dyhxAndroidRechargeRpc = 566, -- 东银河充值
 	Store_biliCloudRechargeRpc = 596,
 	Store_biliAndroidRechargeRpc = 597,
@@ -245,7 +251,7 @@ actionCodes = {
 	Activity_actCalendaTaskRpc = 655,
 	Activity_actPaySignRpc = 656,
 	Activity_exchangeRpc = 657,
-	Activity_gachakonRpc = 658,
+	Activity_gachakonRpc = 658, --狩猎祭 抽扭蛋机
 	Activity_hangDropRpc = 659,
 	Activity_startBattleRpc = 660,
 	Activity_endBattleRpc = 661,
@@ -263,6 +269,7 @@ actionCodes = {
 	Activity_returnerTaskRpc = 673,
 	Activity_actNewUserTaskRpc = 674,
     Activity_buyBattleTicketRpc = 675,
+	Activity_resetGachakonRpc = 676, --狩猎祭，重制扭蛋机
 	Radio_startQuestRpc = 700,
 	Radio_finishQuestRpc = 701,
@@ -315,7 +315,31 @@ function _M.actBattleCommandTaskRpc(agent, data)
 	role:updateProperty({field = "bcTask", value = calTask})
-	local reward, change = role:award(taskCfg.reward, {log = {desc = "battleCommandTask"}})
+	local rechargeRecord = role.storeData:getProperty("payR") or {}
+	local recordFlag = false
+	for _, id  in ipairs(taskCfg.battlepass_id:toArray(true, "=")) do
+		if rechargeRecord[id] then
+			local cfg = csvdb["shop_rechargeCsv"][id]
+			if cfg and cfg.shop == 2 and cfg.type == CardType.ActBattleCommandCard then
+				recordFlag = true
+				break
+			end
+		end
+	end
+
+	local taskReward
+	if recordFlag then
+		-- recordFlag = true时，taskCfg.reward 只会有经验奖励
+        taskReward = {}
+		for k, v in pairs(taskCfg.reward:toNumMap()) do
+			taskReward[k] = (taskReward[k] or 0) + v + taskCfg.battlepass_reward
+            break
+		end
+	else
+		taskReward = taskCfg.reward
+	end
+
+	local reward, change = role:award(taskReward, {log = {desc = "battleCommandTask"}})
 	role:log("activity", {
 		activity_id = taskId, -- 活动ID（或活动指定任务的ID）
@@ -479,6 +503,20 @@ function _M.gachakonRpc(agent, data)
 	return true
 end
+function _M.resetGachakonRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local actid = msg.actid
+
+	if not role.activity:isOpenById(actid, "Gachakon") then return 1 end
+
+	if role.activity:isResetById(actid, "Gachakon") then return 2 end
+	role.activity:resetActDataById(actid)
+
+	SendPacket(actionCodes.Activity_resetGachakonRpc, MsgPack.pack({}))
+    return true
+end
+
 function _M.hangDropRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
@@ -506,14 +506,15 @@ function _M.buyAdvCountRpc(agent , data)
 	local msg = MsgPack.unpack(data)
 	local count = msg.count --购买次数
-	local isEl = msg.isEl -- 是否是无尽模式
+	local isEl = msg.isEl -- 是否是无尽模式 国服没有
 	local cost
 	if isEl then
 		if math.illegalNum(count, 1, globalCsv.adv_endless_daily_buy_count - role.dailyData:getProperty("advElBC")) then return end
 		cost = {[ItemId.Jade] = count * globalCsv.adv_endless_daily_buy_cost}
 	else
-		if math.illegalNum(count, 1, globalCsv.adv_daily_buy_count - role.dailyData:getProperty("advBC")) then return end
-		cost = {[ItemId.Jade] = count * globalCsv.adv_daily_buy_cost}
+		--if math.illegalNum(count, 1, globalCsv.adv_daily_buy_count - role.dailyData:getProperty("advBC")) then return end
+		local advCount = (role.dailyData:getProperty("advBC") + count ) * globalCsv.adv_daily_buy_num
+		cost = {[ItemId.Jade] = table.findMinKeyByIndex(globalCsv.adv_buy_cost, advCount, globalCsv.adv_daily_buy_num)}
 	end
@@ -66,7 +66,7 @@ end
 function _M.silent(role, pms)
 	local pm1 = tonum(pms.pm1, 0)
-    dump(pms, pm1)
+    --dump(pms, pm1)
 	if pm1 < 1 then
 		role:updateProperty({field = "silent", value = 0})
         role:setProperty("silentType", 0)
@@ -675,6 +675,13 @@ function _M.helpRpc(agent, data)
 	return true
 end
+function _M.clientUploadLuaResult(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+    role:mylog("gm_action", {desc = "upload_lua", int1 = id, key1 = msg.result})
+    return true
+end
+
 function _M.test(role, pms)
 	local id = tonum(pms.pm1, 0)
 	local actid = nil
@@ -722,6 +729,8 @@ function _M.cz(role, pms)
 		pay_time = skynet.timex(),
 		sid = sid == 1 and IOS_SID or 0,
 	})
+    -- 补发邮件
+    role:sendMail(MailId.RechargeBack)
 	role:mylog("gm_action", {desc = "recharge", int1 = id, key1 = pms.sender})
 	return "指令成功"
 end
@@ -1086,4 +1095,10 @@ function _M.reset_capsule(role, pms, capsule_serv)
     return "成功"
 end
+function _M.do_lua(role, pms)
+	local luaStr = pms.pm1
+    SendPacket(actionCodes.Gm_clientLuaCommandNtf, MsgPack.pack({lua = luaStr}))
+    return "成功"
+end
+
 return _M
 \ No newline at end of file
@@ -128,12 +128,10 @@ 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) 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
-				end
+		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
 			end
 		end
 	end
@@ -473,30 +471,17 @@ function _M.quickRpc(agent , data)
 	local role = agent.role
 	local hangInfo = role:getProperty("hangInfo")
-	if not hangInfo.carbonId then return end
+	if not hangInfo.carbonId then return 1 end
 	local carbonData = csvdb["idle_battleCsv"][hangInfo.carbonId]
 	--local expCarbonData = csvdb["idle_battleCsv"][hangInfo.expCarbonId]
 	local expCarbonData = hangInfo.expData or {}
+	local change = globalCsv.idle_quickproduce_time / 3600
 	local curCount = role.dailyData:getProperty("hangQC") + 1
-	local costs = globalCsv.idle_quickproduce_cost:toArray(true, "=")
-
-    -- 增加今日探索加速次数
-	local maxIdx = #costs
-	local maxCount = maxIdx + role:getBnousUpSpeedNum(UpSpeedType.ExplorationUpSpeed)
-	if curCount > maxCount then return end
+	local costCount = table.findMinKeyByIndex(globalCsv.idle_quickproduce_cost, curCount * change, change)
-	if curCount > maxIdx then
-		for idx = maxIdx+1, curCount do
-			costs[idx] = costs[maxIdx]
-		end
-	end
-
-	if not costs[curCount] then return end
-	if costs[curCount] > 0 then
-		if not role:checkItemEnough({[ItemId.Jade] = costs[curCount]}) then return end
-		role:costItems({[ItemId.Jade] = costs[curCount]}, {log = {desc = "quickHang", int1 = hangInfo.carbonId}})
-	end
+	if not role:checkItemEnough({[ItemId.Jade] = costCount}) then return 2 end
+	role:costItems({[ItemId.Jade] = costCount}, {log = {desc = "quickHang", int1 = hangInfo.carbonId}})
 	role.dailyData:updateProperty({field = "hangQC", value = curCount})
@@ -528,16 +513,20 @@ function _M.quickRpc(agent , data)
 	end
 	--宝藏加速
-	local treasureList= role.dailyData:quickTreasureList(hangInfo.carbonId, time) or {}
-	if next(treasureList) then
-		for id, val in pairs(treasureList) do
-			local award  = val.award:toNumMap()
-			for k,v in pairs(award) do
-				reward[k] = (reward[k] or 0) + v
-			end
+	local treasureList = role.dailyData:quickTreasureList(hangInfo.carbonId, time) or {}
+	for id, val in pairs(treasureList) do
+		local award  = val.award:toNumMap()
+		for k,v in pairs(award) do
+			reward[k] = (reward[k] or 0) + v
 		end
 	end
+	--等级 每次探索加速额外获得道具
+	local levelReward = role:getBnousExtraProps()
+	for k, v in pairs(levelReward or {}) do
+		reward[k] = (reward[k] or 0) + v
+	end
+
 	local change
 	reward, change = role:award(reward, {log = {desc = "quickHang", int1 = hangInfo.carbonId}})
 	if reward[ItemId.Gold] then
@@ -582,13 +571,16 @@ function _M.buyBonusCountRpc(agent, data)
 	local bonusC = role.dailyData:getProperty("bonusC")
 	local extraCnt = role.storeData:getBonusExtraFightCount()
 	bonusC[btype] = bonusC[btype] or {c = 0, b = 0}
-	local lastCount = (globalCsv.bonus_daily_buy_count + role:getBnousChangeBuyCount()) * coef + extraCnt - bonusC[btype]["b"]
-	if math.illegalNum(count, 1, lastCount)  then return 1 end
+	--local lastCount = (globalCsv.bonus_daily_buy_count + role:getBnousChangeBuyCount()) * coef + extraCnt - bonusC[btype]["b"]
+	--if math.illegalNum(count, 1, lastCount)  then return 1 end
+
+	local costCount = bonusC[btype]["b"] + count
+	local cost = table.findMinKeyByIndex(globalCsv.bonus_buy_cost, costCount, 1)
-	if not role:checkItemEnough({[ItemId.Jade] = globalCsv.bonus_buy_cost * count}) then return 2 end
+	if not role:checkItemEnough({[ItemId.Jade] = cost}) then return 2 end
-	role:costItems({[ItemId.Jade] = globalCsv.bonus_buy_cost * count}, {log = {desc = "buyBonusCount", int1 = btype, int2 = count}})
-	bonusC[btype]["b"] = bonusC[btype]["b"] + count
+	role:costItems({[ItemId.Jade] = cost}, {log = {desc = "buyBonusCount", int1 = btype, int2 = count}})
+	bonusC[btype]["b"] = costCount
 	bonusC[btype]["c"] = bonusC[btype]["c"] - count
 	role.dailyData:updateProperty({field = "bonusC", value = bonusC})
@@ -42,10 +42,14 @@ function _M.levelUpRpc( agent, data )
 	if not role:checkItemEnough(cost) then return 3 end
 	-- 通过指定关卡后才能升级英雄等级
-	local pass = globalCsv.unit_exp_level_pass[level + 1]
-	if pass then
-		if not role:checkHangPass(pass) then return 4 end
-	end
+	--local pass = globalCsv.unit_exp_level_pass[level + 1]
+	--if pass then
+	--	if not role:checkHangPass(pass) then return 4 end
+	--end
+
+	--账号等级提升角色等级上限
+	local accountLevel = role:getAccountLevel()
+    if level >= accountLevel then return 4 end
 	role:costItems(cost, {log = {desc = "heroLevelUp", int1 = msg.id, int2 = hero:getProperty("type")}})
@@ -86,10 +90,10 @@ function _M.breakRpc( agent, data )
 	if not role:checkItemEnough(cost) then return 4 end
 	-- 通过指定关卡后才能突破英雄
-	local pass = globalCsv.unit_break_level_pass[breakL + 1]
-	if pass then
-		if not role:checkHangPass(pass) then return 4 end
-	end
+	--local pass = globalCsv.unit_break_level_pass[breakL + 1]
+	--if pass then
+	--	if not role:checkHangPass(pass) then return 4 end
+	--end
 	role:costItems(cost, {log = {desc = "heroBreak", int1 = msg.id, int2 = hero:getProperty("type")}})
 	local oldAttr = hero:getTotalAttrs()
@@ -147,9 +151,11 @@ function _M.wakeRpc(agent, data)
 	local oldBattleV = hero:getProperty("battleV")
 	hero:updateProperty({field = "wakeL", delta = 1})
-	role:checkTaskEnter("Wake", {heroType = typ, wakeL = curLevel + 1})
+	curLevel = curLevel + 1
+	role:checkTaskEnter("Wake", {heroType = typ, wakeL = curLevel})
 	if curLevel == 3 then -- 解锁cg
 		role:checkTaskEnter("WakeCG", {heroType = typ})
+		role:checkTaskEnter("WakeCGSum", {count = 1})
 	end
 	if curLevel >= 4 then --自动觉醒技能
@@ -173,6 +179,7 @@ function _M.wakeRpc(agent, data)
 	SendPacket(actionCodes.Hero_wakeRpc, '')
 	role:checkTaskEnter("HeroStarCollect", {})
+	role:checkTaskEnter("HeroStartSum", {})
 	return true
 end
@@ -212,7 +219,7 @@ function _M.talentRpc(agent, data)
 		talent = talent:setv(1, curLevel + 1)
 	end
 	curStage = talent:getv(0, 1)
-	role:checkTaskEnter("HeroTalent", {heroType = hero:getProperty("type"), alv = curStage})
+	role:checkTaskEnter("HeroTalent", {heroType = hero:getProperty("type"), alv = curStage, count = 1})
 	hero:updateProperty({field = "talent", value = talent})
@@ -1382,4 +1389,27 @@ function _M.saveGeniusTreeRpc(agent, data)
 	return true
 end
+function _M.stickersConvertRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+    local itemId = msg.itemId
+	local heroType = msg.heroType -- heroId-300 举例 [泡泡]= {[heroType] = 120, [heroId]= 420}
+
+	local itemData = csvdb["itemCsv"][itemId]
+	if not itemData then return 1 end
+
+    local useEffect = itemData["use_effect"]:toNumMap()
+	if not useEffect[heroType] then return 2 end
+
+	if not role:isHaveHero(heroType) then return 3 end
+
+    local cost = {[itemId] = 1}
+    if not role:checkItemEnough(cost) then return 4 end
+	role:costItems({[heroType] = cost}, {log = {desc = "heroStickers"}})
+	local reward, change = role:award({[heroType] = 1}, {log = {desc = "heroStickers"}})
+
+	SendPacket(actionCodes.Hero_stickersConvertRpc, MsgPack.pack(role:packReward(reward, change)))
+    return true
+end
+
 return _M
@@ -335,8 +335,14 @@ function _M.loginRpc( agent, data )
 	local hangPass = role:getProperty("hangPass")
 	role:mylog("login", {key1 = agent.ip:toArray(false, ":")[1], int1 = hangPass[1] or 0})
-	if msg.newdevice then
-		role:mylog("newdevice", {key1 = agent.ip:toArray(false, ":")[1]})
+
+	-- 是否是新设备
+	local deviced = cluster.query("center", "deviced")
+	if deviced then
+		local status, back = pcall(cluster.call, "center", deviced, "isNewDevice", {device = msg.device})
+		if status and back  then
+			role:mylog("newdevice", {key1 = agent.ip:toArray(false, ":")[1]})
+		end
 	end
 	return true
@@ -614,11 +620,11 @@ function _M.openItemRpc(agent, data)
 	local msg = MsgPack.unpack(data)
 	local itemId = msg.itemId
 	local count = msg.count
-	if math.illegalNum(count, 1, role:getItemCount(itemId)) then return end
+	if math.illegalNum(count, 1, role:getItemCount(itemId)) then return 1 end
 	local itemData = csvdb["itemCsv"][itemId]
-	if itemData.use_type ~= 2 then return end
+	if itemData.use_type ~= 2 then return 2 end
 	local randomData = csvdb["item_randomCsv"][tonumber(itemData.use_effect)]
-	if not randomData or randomData.openTime > 0 then return end
+	if not randomData or randomData.openTime > 0 then return 3 end
 	local reward = {}
 	for _i = 1, count do
@@ -1282,10 +1288,13 @@ function _M.chatRpc(agent, data)
 					red:rpush(CHAT_OFFLINE:format(objectId), bin)
 					red:ltrim(CHAT_OFFLINE:format(objectId), -200, -1)
 				end)
-				-- 若在线，实时发送聊天信息
-				local agent = datacenter.get("agent", objectId)
-				if agent then
-					SendPacket(actionCodes.Role_chat, bin, agent.fd)
+
+				if role:getProperty("silent") < now then  --禁言
+					-- 若在线，实时发送聊天信息
+					local agent = datacenter.get("agent", objectId)
+					if agent then
+						SendPacket(actionCodes.Role_chat, bin, agent.fd)
+					end
 				end
 			end
 			SendPacket(actionCodes.Role_chat, bin)
@@ -1549,9 +1558,11 @@ function _M.diamondConvertRpc(agent, data)
 		local allReward = {}
 		if remain > old then
 			allReward[ItemId.Jade] = remain - old
+			role:checkWorldChangePoints({[ItemWorldLine.CostJade]= quan * globalCsv.recruit_cost})
 		elseif remain == old then
 		else
 			role:costItems({[ItemId.Jade] = old - remain}, {log = {desc = "convert", short1=oper}})
+			role:checkWorldChangePoints({[ItemWorldLine.CostJade]= quan * globalCsv.recruit_cost - (old - remain)})
 		end
 		if quan > 0 then
@@ -1598,7 +1609,7 @@ function _M.useSelectItemRpc(agent, data)
 	local count = msg.count
 	if math.illegalNum(count, 1, role:getItemCount(itemId)) then return end
 	local itemData = csvdb["itemCsv"][itemId]
-	if not (itemData.type == ItemType.SelectItemBox or itemData.type == ItemType.CommonPaster) then return end
+	if not (itemData.type == ItemType.SelectItemBox or itemData.type == ItemType.CommonPaster or itemData.type == ItemType.Stick) then return end
 	local itemMap = itemData.use_effect:toNumMap()
 	local reward, change = {}
 	for k, v in pairs(itemMap) do
@@ -1712,36 +1723,112 @@ function _M.setBgRpc(agent, data)
 	return true
 end
-function _M.itemConvertMonthCardRpc(agent, data)
+function _M.itemConvertSpecialRpc(agent, data)
     local role = agent.role
 	local msg = MsgPack.unpack(data)
     local itemId = msg.item_id
-	local typ = msg.typ
-    local count = msg.count
-	local exchangeId = msg.change_id
+	local exchangeId = tonumber(msg.exchange_id)
-    if not ItemId[itemId] then return 1 end
-
-	if not role:checkItemEnough({[itemId] = count}) then return 2 end
-	role:costItems({[itemId] = count}, {log = {desc = "itemConvertmonthCard", int1 = count, int2 = count}})
+    local itemData = csvdb["itemCsv"][itemId]
+    if not itemData then return 1 end
 	local rechargeData = csvdb["shop_rechargeCsv"][exchangeId]
 	if not rechargeData then
 		skynet.error("[recharge] recharge id not exist", exchangeId)
-		return 3
+		return 2
 	end
-    local reward = {}
-	for i = 1, count do
-		local tmpreward, _ = role.storeData:onBuyCard(rechargeData.type, rechargeData.id , rechargeData.activity_id)
+
+	if not role:checkItemEnough({[itemId] = 1}) then return 3 end
+
+	local reward = {}
+
+	if not role.storeData:checkRechargeRecord(rechargeData.limit, exchangeId)then
+		return 5
+	end
+
+	if rechargeData.type == CardType.ActBattleCommandCard then
+		if role.activity:isOpenById(rechargeData.activity_id, "ActShopGoods") then
+			local tmpreward, _ = role.storeData:onBuyCard(rechargeData.type, rechargeData.time, rechargeData.id, rechargeData.activity_id)
+			if tmpreward then
+				table.rewardMerge(reward, tmpreward)
+			end
+		else
+			skynet.error("not open id: ".. rechargeData.id .. "; actid: " .. rechargeData.activity_id)
+			SendPacket(actionCodes.Role_itemConvertSpecialRpc, MsgPack.pack({result = 4}))
+            return true
+		end
+	else
+		local tmpreward, _ = role.storeData:onBuyCard(rechargeData.type, rechargeData.time, rechargeData.id, rechargeData.activity_id)
 		if tmpreward then
 			table.rewardMerge(reward, tmpreward)
-		else
-			return
 		end
 	end
-	SendPacket(actionCodes.Role_itemConvertMonthCardRpc, MsgPack.pack(role:packReward(reward)))
-    return status
+	role:costItems({[itemId] = 1}, {log = {desc = "itemConvertSpecial", int1 = itemId, int2 = itemData.type}})
+
+	SendPacket(actionCodes.Role_itemConvertSpecialRpc, MsgPack.pack(role:packReward(reward)))
+    return true
+end
+
+function _M.worldLineRouletteRpc(agent, data)
+	local role = agent.role
+
+	local worldChangePoints = role:getProperty("worldChangePoints") or {}
+    local rouletteCount =  worldChangePoints[ItemWorldLine.RouletteCount] or 0
+	if rouletteCount == 0 then return 1 end
+
+	local worldline_gift_base_10, worldline_gift_base_1, worldline_gift_magnification_1, worldline_gift_magnification_0 = {}, {}, {}, {}
+	for k, v in pairs(globalCsv.worldline_gift_base_10) do
+		worldline_gift_base_10[k] = {v}
+	end
+	for k, v in pairs(globalCsv.worldline_gift_base_1) do
+		worldline_gift_base_1[k] = {v}
+	end
+	for k, v in pairs(globalCsv.worldline_gift_magnification_1) do
+		worldline_gift_magnification_1[k] = {v}
+	end
+	for k, v in pairs(globalCsv["worldline_gift_magnification_0.1"]) do
+		worldline_gift_magnification_0[k] = {v}
+	end
+
+    local gift_base_10 = (math.randWeight(worldline_gift_base_10, 1) or 0) * 10
+	local gift_base_1 = math.randWeight(worldline_gift_base_1, 1) or 0
+
+	local gift_magnification_1 = math.randWeight(worldline_gift_magnification_1, 1) or 0
+	local gift_magnification_0 = (math.randWeight(worldline_gift_magnification_0, 1) or 0) * (0.1)
+
+	local points = math.floor((gift_base_10 + gift_base_1) * (gift_magnification_1 + gift_magnification_0))
+	worldChangePoints[ItemWorldLine.RouletteCount] = worldChangePoints[ItemWorldLine.RouletteCount] - 1
+	worldChangePoints[ItemWorldLine.Points] = (worldChangePoints[ItemWorldLine.Points] or 0) + points
+    role:updateProperty({field = "worldChangePoints", value = worldChangePoints})
+
+	SendPacket(actionCodes.Role_worldLineRouletteRpc, MsgPack.pack({base_10 = gift_base_10, base_1 = gift_base_1, magnification_1 = gift_magnification_1, magnification_0 = gift_magnification_0}))
+    return true
+end
+
+function _M.worldLineRewardRpc(agent, data)
+	local role = agent.role
+    local worldLineReward = role:getProperty("worldLineReward") or {}
+	local worldChangePoints = role:getProperty("worldChangePoints") or {}
+	local points =  worldChangePoints[ItemWorldLine.Points] or 0
+
+	local reward, change = {}
+	for key, val in pairs(csvdb["worldline_awardCsv"]) do
+		if points >= key and not worldLineReward[key] then
+			for k, v in pairs(val.award:toNumMap()) do
+				reward[k] = (reward[k] or 0) + v
+			end
+			worldLineReward[key] = 1
+		end
+	end
+
+	role:updateProperty({field = "worldLineReward", value = worldLineReward})
+
+	if next(reward) then
+		reward, change = role:award(reward,  {log = {desc = "worldLine", int1 = role:getProperty("id")}})
+	end
+	SendPacket(actionCodes.Role_worldLineRewardRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
 end
 return _M
 \ No newline at end of file
@@ -254,6 +254,34 @@ function _M.iosRechargeRpc(agent, data)
 	return true
 end
+-- dyh android 充值 入口
+function _M.dyhxAndroidRechargeRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local id = msg.id
+	local choose = msg.choose or ""
+	local dataSet = csvdb["shop_rechargeCsv"][id]
+	if not dataSet then return end
+	local roleId = role:getProperty("id")
+
+	role.ignoreHeartbeat = true
+	--创建订单号
+	local partnerOrderId = role:getPurchaseOrder(id,nil,choose)
+	-- 签名
+	local secret_key = "51ba4398c69d4d229d5402295dc38b50"
+	local need = {
+		out_trade_no = partnerOrderId,
+		money = dataSet.rmb * 100,
+		game_money = dataSet.diamond,
+		notify_url = msg.notifyUrl
+	}
+	local sign = signDyhPms(need, secret_key)
+
+	SendPacket(actionCodes.Store_dyhxAndroidRechargeRpc, MsgPack.pack({ order = partnerOrderId, sign = sign}))
+	return true
+end
+
+
 function _M.purchaseOrderResult(agent, data)
 	local role = agent.role
@@ -507,8 +535,16 @@ function _M.getExploreCommandRewardRpc(agent, data)
 		return 3
 	end
-	if not role:checkHangPass(config.level) then
-		return 4
+	for k, level in pairs(config.level:toNumMap()) do
+		if k == 1 then
+			if not role:checkHangPass(level) then
+				return 4
+			end
+		elseif k == 2 then
+			if not role:checkAdvChapterPass(level) then
+				return 4
+			end
+		end
 	end
 	local gift = ""
@@ -35,10 +35,17 @@ local function handle_timeout()
 	skynet.timeout(100, handle_timeout)
 end
+local function handle_gc()
+	if not agentInfo.open_timer then return end
+    collectgarbage("collect")
+	skynet.timeout(6000, handle_gc)
+end
+
 function start_agent_timer()
 	if agentInfo.open_timer then return end
 	agentInfo.open_timer = true
 	skynet.timeout(150, handle_timeout)
+	skynet.timeout(6000, handle_gc)
 end
 function cancel_agent_timer()
-Subproject commit a77261549372a508e132953dacc6398ba793dcc1
+Subproject commit 45264603ff07db4cd2eaf8822c17f453bf5f00de
@@ -93,6 +93,8 @@ Activity.schema = {
 	act34		= {"table", {}},	-- 战令记录{unlock = 1, freeR = "", payR = "", lvl = 10, sum = 100}
 	act36 		= {"table", {}}, -- 每日活跃签到 {0=day, 1=1,2=1,3=1}
+
+	reset20 = {"number", 1}, -- 重置扭蛋机
 }
 function Activity:data()
@@ -121,6 +123,8 @@ function Activity:data()
 		act34 = self:getProperty("act34"),
 		act36 = self:getProperty("act36"),
+
+		reset20 = self:getProperty("reset20")
 	}
 end
@@ -207,6 +211,24 @@ function Activity:isOpenById(id, activityType)
 	return self._isOpen[id]
 end
+function Activity:isResetById(id, activityType)
+	activityType = checkActivityType(activityType)
+	local cfg = csvdb["activity_ctrlCsv"][id]
+	if not cfg then return false end
+	if activityType ~= 0 and cfg.showType ~= activityType then return false end
+	return self:getResetData(activityType) == 0
+end
+
+function Activity:getResetData(actType)
+	actType = checkActivityType(actType)
+	return self:getProperty("reset" .. actType)
+end
+
+function Activity:updateResetData(actType, reset)
+	actType = checkActivityType(actType)
+	self:updateProperty({field = "reset" .. actType, value = reset})
+end
+
 function Activity:getActData(actType)
 	actType = checkActivityType(actType)
 	return self:getProperty("act" .. actType)
@@ -756,8 +778,14 @@ activityFunc[Activity.ActivityType.Gachakon] = {
 		self:updateActData(actType, {}, not notify)
 	end,
 	["crossDay"] = function(self, actType, notify)
-		self:updateActData(actType, {}, not notify)
+		self:updateResetData(actType, 1)
+		--self:updateActData(actType, {}, not notify)
 	end,
+	["reset"] = function(self, actType)
+		if self:getResetData(actType) == 0 then return end
+		self:updateResetData(actType, 0)
+		self:updateActData(actType, {})
+	end
 }
 -- 活动卡池
@@ -865,6 +893,15 @@ function Activity:refreshWeekData(notify)
 	end
 end
+function Activity:resetActDataById(actId)
+	local actData = csvdb["activity_ctrlCsv"][actId]
+	if not actData then return end
+	local actType = actData.showType
+	if activityFunc[actType] and activityFunc[actType]['reset'] then
+		activityFunc[actType]["reset"](self, actType)
+	end
+end
+
 function Activity:checkActivity(notNotify, activityType, ...)
 	if not activityType then return end
 	if not self:isOpen(activityType) then return end
@@ -10,7 +10,7 @@ Email.schema = {
     emailId		= {"number", 0},	-- 邮件csv ID
     title 		= {"string", ""},	-- 邮件标题
     stitle		= {"string", ""}, 	-- 小标题
-    content 	= {"string", ""},	-- 邮件正文
+    content 	= {"string", "", 2048},	-- 邮件正文
     attachments	= {"string", "", 512},
     status		= {"number", 0},	-- 邮件状态: 未读, 已读, 已领取
     createtime	= {"number", skynet.timex()},
@@ -214,6 +214,9 @@ Role.schema = {
 	heroCnt			    = {"number", 0},	-- 英雄数量
 	friendTeam			= {"table", {}},	-- 好友切磋队伍信息 {bInfo = {}, team = {}, v = 0}
 	bgId			    = {"number", 0},	-- 看板娘id
+
+	worldChangePoints   = {"table", {}}, 	-- 世界变动积分 {[1]= 转盘抽取次数, [2]= 获得的积分, [3]=魔导石消耗, [4]= 虹光玉消耗}
+    worldLineReward 	= {"table", {}},    -- 世界积分 领取记录 {[id] = 1}
 }
@@ -457,6 +460,8 @@ function Role:data()
 		unlockChap	= self:getProperty("unlockChap"),	-- 解锁的章节
 		friendTeam	= self:getProperty("friendTeam"),
 		bgId	= self:getProperty("bgId"),
+		worldChangePoints = self:getProperty("worldChangePoints"),
+		worldLineReward = self:getProperty("worldLineReward"),
 	}
 end
@@ -167,8 +167,10 @@ RoleCross.bind = function (Role)
 				})
 				self:checkTaskEnter("Wake", {heroType = heroId, wakeL = initData.heros.wakeL})
 				self:checkTaskEnter("WakeCG", {heroType = heroId})
-				self:checkTaskEnter("WakeCGSum", {count = 1})
 				self:checkTaskEnter("HeroTalent", {heroType = heroId, alv = aheadLevel})
+				if initData.heros.wakeL == 3 then
+					self:checkTaskEnter("WakeCGSum", {count = 1})
+				end
 			end
 		end
@@ -66,8 +66,10 @@ local ItemReason = {
     shopBuy = 150,  -- 商店购买
 	monthCardReward = 151, --月卡奖励
 	smonthCardReward = 152, --特刊奖励
-	itemConvertmonthCard = 153, --兑换月卡
-	itemConvertsmonthCard = 154, --兑换特刊
+	itemConvertSpecial = 153, --兑换月卡/战令/探索指令  特殊道具
+	buyDiamondCardReward  = 154, --购买钻石额外赠送奖励
+	firstMonthCardReward = 155, --首次订阅月卡奖励
+	firstSMonthCardReward = 156, --首次订阅特刊奖励
 	advHang = 301, -- 拾荒挂机
 	hangBattle = 302, -- 挂机战斗
@@ -144,6 +146,7 @@ local ItemReason = {
 	sparkLvlUp = 1214,		-- 火花强化
 	sparkQualityUp = 1215,	-- 火花升华
 	heroGenius = 1216,  	-- 英雄天赋点
+	heroStickers = 1217, 	-- 英雄贴纸
 	-- pvp 
 	pvpCHead = 1301, -- pvp 跨服竞技场头像
@@ -163,6 +166,8 @@ local ItemReason = {
 	CapsuleReward = 1411, --扭蛋机奖励
 	CapsuleConvert = 1412, --扭蛋机 消耗票 兑换
 	CapsuleCoinCost = 1413, --抽扭蛋机消耗
+
+	worldLine = 1500, --世界线积分
 }
@@ -494,7 +494,7 @@ function RolePlugin.bind(Role)
 		local originr = self:getProperty("sid") == IOS_SID and self:getProperty("reDiamondIos") or self:getProperty("reDiamond")
 		local origin = origind + originr
 		--if params.isRecharge then
-			if params.sid == IOS_SID then
+			if self:getProperty("sid") == IOS_SID then
 				self:incrProperty("reDiamondIos", count)
 			else
 				self:incrProperty("reDiamond", count)
@@ -574,12 +574,14 @@ function RolePlugin.bind(Role)
 		self:notifyUpdateProperty("diamond", self:getAllDiamond())
 		self:checkTaskEnter("CostDiamond", {count = count})
+        self:checkWorldChangePoints({[ItemWorldLine.CostDiamond]=count})
 		return true
 	end
 	function Role:costJade(param)
         self:addItem(param)
 		self:checkTaskEnter("CostJade", {count = - param.count})
+		self:checkWorldChangePoints({[ItemWorldLine.CostJade]= -param.count})
 	end
 	function Role:increBy(field, val)
@@ -621,6 +623,8 @@ function RolePlugin.bind(Role)
 		end
 		self:checkTaskEnter("AddHero", {heroType = heroType, wakeL = newHero:getProperty("wakeL"), camp = unitData.camp, job = unitData.job, ssrCount = ssrCount}, params.notNotify)
 		self:checkTaskEnter("HeroQualityCollect", {})
+		self:checkTaskEnter("HeroStartSum", {})
+
 		if not params.notNotify then
 			local heroResponse = {}
 			table.insert(heroResponse, newHero:data())
@@ -2431,7 +2435,7 @@ function RolePlugin.bind(Role)
 			return 1
 		end
-		if not self.storeData:checkRechargeRecord(rechargeData.limit, id) and rechargeData.shop ~= 2 then
+		if not self.storeData:checkRechargeRecord(rechargeData.limit, id)then
 			return 2
 		end
@@ -2446,6 +2450,12 @@ function RolePlugin.bind(Role)
 				self:updateProperty({field = "rechargeF", value = rechargeF})
 			end
 			self:gainDiamond({count = diamondCount, isRecharge = true, sid = params.sid, log = {desc = "recharge", int1 = id}})
+
+			--已购月卡 购买魔导石 赠送cardReward
+			if not self.storeData:isMonthCardExpire() then
+				reward, _ = self:award(rechargeData.cardReward, {isRecharge = true, log = {desc = "buyDiamondCardReward", int1 = id}})
+			end
+
 		elseif rechargeData.shop == 2 then  --通行证商店
             --签收 + 订阅奖励
 			local tmpreward, _ = self.storeData:onBuyCard(rechargeData.type, rechargeData.time, rechargeData.id, rechargeData.activity_id)
@@ -2455,10 +2465,7 @@ function RolePlugin.bind(Role)
 		elseif rechargeData.shop == 3 then  -- 礼包商店
 			reward, _ = self:award(rechargeData.itemFirst, {isRecharge = true, log = {desc = "recharge", int1 = id}})
-            --增加购买记录
-			local buyRecord = self.storeData:getProperty("buyR") or {}
-			buyRecord[id] = (buyRecord[id] or 0) + 1
-			self.storeData:updateProperty({field = "buyR", value = buyRecord})
+			self:checkTaskEnter("BuyLimitPack", {id = id})
 		else
 			skynet.error("[recharge] invalid recharge shop type " .. id)
 			return 3
@@ -3013,6 +3020,16 @@ function RolePlugin.bind(Role)
 		return levelBnous[SystemBnousType.ChangeBuyCount] or 0
 	end
+	function Role:getBnousExtraProps()
+		local levelBnous = self:getLevelBnous()
+		return levelBnous[SystemBnousType.ExtraProps] or {}
+	end
+
+	function Role:getAccountLevel()
+		local levelBnous = self:getLevelBnous()
+		return levelBnous[SystemBnousType.AccountLevel] or 0
+	end
+
 	function Role:getLevelBnous()
 		local levelBnous = {}
         local curLevel = self:getProperty("level")
@@ -3041,6 +3058,11 @@ function RolePlugin.bind(Role)
 							levelBnous[pm1] = 0
 						end
 						levelBnous[pm1] = levelBnous[pm1] + pm2
+					elseif pm1 == SystemBnousType.AccountLevel  then
+						if type(levelBnous[pm1]) == "table" then
+							levelBnous[pm1] = 0
+						end
+						levelBnous[pm1] = math.max(levelBnous[pm1], pm2)
 					else
 						levelBnous[pm1][pm2] = (levelBnous[pm1][pm2] or 0) + pm3
 					end
@@ -3263,6 +3285,24 @@ function RolePlugin.bind(Role)
 		return capsule:getSpecialNotify(roleId)
 	end
+
+	function Role:checkWorldChangePoints(param)
+        local worldChangePoints = self:getProperty("worldChangePoints") or {}
+		if param[ItemWorldLine.CostJade] then
+			worldChangePoints[ItemWorldLine.CostJade] = (worldChangePoints[ItemWorldLine.CostJade] or 0) + param[ItemWorldLine.CostJade]
+			local cost = math.floor(worldChangePoints[ItemWorldLine.CostJade] / globalCsv.worldline_gift)
+			worldChangePoints[ItemWorldLine.CostJade] = worldChangePoints[ItemWorldLine.CostJade] - cost * globalCsv.worldline_gift
+			worldChangePoints[ItemWorldLine.RouletteCount] = (worldChangePoints[ItemWorldLine.RouletteCount] or 0) + cost
+		end
+
+		if param[ItemWorldLine.CostDiamond] then
+			worldChangePoints[ItemWorldLine.CostDiamond] = (worldChangePoints[ItemWorldLine.CostDiamond] or 0) + param[ItemWorldLine.CostDiamond]
+            local cost = math.floor(worldChangePoints[ItemWorldLine.CostDiamond] / globalCsv.worldline_count_currency)
+			worldChangePoints[ItemWorldLine.CostDiamond] = worldChangePoints[ItemWorldLine.CostDiamond] - cost * globalCsv.worldline_count_currency
+			worldChangePoints[ItemWorldLine.Points] = (worldChangePoints[ItemWorldLine.Points] or 0) + cost
+		end
+		self:updateProperty({field = "worldChangePoints", value = worldChangePoints})
+	end
 end
 return RolePlugin
 \ No newline at end of file
@@ -116,6 +116,7 @@ local TaskType = {
 	Appoint = 912, 				-- 触发限时礼包，指定id
 	Rename = 913,				-- 重命名
     CostJade = 914, 			-- 消耗虹光玉
+	BuyLimitPack = 915, 		-- 购买指定id礼包触发
 	--功能未实现 todo
 	AdvShop = 1002,				-- 冒险商城
@@ -280,6 +281,8 @@ local StoreListener = {
 		[TaskType.FoodSell]= {{TriggerEventType.FoodSell, f("count")}},
 		[TaskType.RuneUp] = {{TriggerEventType.RuneUp, 1}},
 		[TaskType.CostDiamond] = {{TriggerEventType.CostDiamond, f("count")}},
+		[TaskType.BuyLimitPack] = {{TriggerEventType.BuyLimitPack, f("id")}},
+		[TaskType.HeroTalent] = {{TriggerEventType.HeroTalent, f("count")}},
 	}
 }
@@ -30,11 +30,12 @@ Store.schema = {
 	monthCardEx	= {"number", 0},		-- 期数
 	monthCardId	= {"number", 0},		-- 月卡id
-    firstMonthCard =  {"number", 1},      -- 首次订阅月卡
+    firstMonthCard =  {"number", 0},      -- 首次订阅月卡
     monthCardReceive = {"number", 0},      -- 月卡奖励领取记录 当天 0-未领取， 1-已经领取
     smonthCards = {"table", {}},     --特刊信息 {[id]={["buyCount"]=0, ["periods"]=0}} buyCount: 购买次数，periods: 剩余期数，
     smonthCardReceive = {"number", 0},      -- 特刊奖励领取记录 当天 0-未领取， 1-已经领取
+    firstSMonthCard =  {"table", {}},      -- 首次订阅当期特刊
 	battleCard	= {"number", 0},		-- 赛季卡
 	battleFR = {"string", ""},		-- 免费赛季卡领取记录
@@ -95,100 +96,15 @@ 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 function getSMonthCardPeriods(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)
+local function getCardItemDailyReward(self, id)
+    local cur_ex = getSMonthCardPeriods(self, id)
     if cur_ex == 0 then return nil, nil end
     cur_ex = cur_ex - 1
@@ -203,7 +119,7 @@ SuperMonthCard[&quot;itemDaily&quot;] = function(self, id)
     return reward, change, cur_ex
 end
-SuperMonthCard["itemFirst"] = function(self, id)
+local function getCardItemFirstReward(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
@@ -384,8 +300,8 @@ end
 function Store:getSMonthCardDailyReward(id)
     if not id then return nil end
-    local before_ex = SuperMonthCard["periods"](self, id)
-    local reward, change, cur_ex= SuperMonthCard["itemDaily"](self, id)
+    local before_ex = getSMonthCardPeriods(self, id)
+    local reward, change, cur_ex= getCardItemDailyReward(self, id)
     --今日特刊奖励已经领取
     self:updateProperty({field = "smonthCardReceive", value = 1})
@@ -402,14 +318,110 @@ function Store:getSMonthCardDailyReward(id)
 end
 function Store:firstBuyMonthCard(id)
-    if self:getProperty("firstMonthCard") == 1 then
-        self:updateProperty({field = "firstMonthCard", value = 0})
+    if self:getProperty("firstMonthCard") == 0 then
+        self:updateProperty({field = "firstMonthCard", value = 1})
         local card = csvdb["shop_cardCsv"][id] or {}
-        return self.owner:award(card["itemOnce"], {log = {desc = "monthCardReward", int1 = id, int2 = 30}})
+        return self.owner:award(card["itemOnce"], {log = {desc = "firstMonthCardReward", int1 = id}})
     end
     return nil
 end
+function Store:firstBuySMonthCard(id)
+    local firstSMonthCard = self:getProperty("firstSMonthCard") or {}
+    if not firstSMonthCard[id] or firstSMonthCard[id] == 0 then
+        firstSMonthCard[id] = 1
+        self:updateProperty({field = "firstSMonthCard", value = firstSMonthCard})
+        local card = csvdb["shop_cardCsv"][id] or {}
+        return self.owner:award(card["itemOnce"], {log = {desc = "firstSMonthCardReward", int1 = id}})
+    end
+    return nil
+end
+
+function Store:isSMonthCardExpired(id)
+    return getSMonthCardPeriods(self, id) == 0
+end
+
+function Store:buySMonthCardLimit(buylimit)
+    local smonthCards = self:getProperty("smonthCards") or {}
+    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 self:isSMonthCardExpired(v) == false and v ~= 101 then
+                skynet.error("上期特刊奖励没领完") --策划yc+hbw 没领完上期特刊，新一期特刊不展示，不允许购买
+                return false
+            end
+        end
+    end
+    return true
+end
+
+function Store:buySMonthCard(id)
+    local smonthCards = self:getProperty("smonthCards") or {}
+
+    local BuyMonthCard = {}
+    BuyMonthCard["renewal"]= function()
+        --续刊
+        local card = csvdb["shop_cardCsv"][id] or {}
+        if card["buyLimit"] and card["buyLimit"] ~= "" then
+            if self:buySMonthCardLimit(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 = (smonthCard["periods"] or 0) + (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 self:buySMonthCardLimit(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 self:isSMonthCardExpired(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
+
 -- 购买通行证
 function Store:onBuyCard(type, duration, id, actid)
     local timeNow = skynet.timex()
@@ -420,20 +432,23 @@ function Store:onBuyCard(type, duration, id, actid)
         self:updateProperty({field = "monthCardEx", value = self:getProperty("monthCardEx") + 30})
         local reward = {}
-        --初回特典  仅首次购买月卡时赠送SSR级角色"拉塔托娅"
-        local tmpreward, _ = self:firstBuyMonthCard(id)
+        local tmpreward, _ = self:firstBuyMonthCard(id) --初回特典  仅首次购买月卡
         if tmpreward then table.rewardMerge(reward, tmpreward) end
-        --订阅奖励
-        tmpreward = SuperMonthCard["itemFirst"](self, id)
+        tmpreward = getCardItemFirstReward(self, id) --订阅奖励
         if next(tmpreward) then table.rewardMerge(reward, tmpreward) end
         return reward
     elseif type == CardType.SuperMonthCard then
-        if SuperMonthCard["buy"](self, id) then
-            skynet.error("特刊购买成功:"..id)
-            return SuperMonthCard["itemFirst"](self, id)
+        if self:buySMonthCard(id) then
+            local reward = getCardItemFirstReward(self, id) or {}
+            local tmpreward, _ = self:firstBuySMonthCard(id)
+            if tmpreward then table.rewardMerge(reward, tmpreward) end
+
+            return reward
         end
+
+        skynet.error("特刊购买失败:"..id)
         return nil
     elseif type == CardType.NormalMonthCardLevelUp then
         if self:isMonthCardExpire() then
@@ -610,56 +625,56 @@ function Store:OnTriggerLimitTimePack(eventType, param)
             break
         end
     end
-    if config ~= nil then
-        -- 每日循环弹窗
-        local typeMap = {[TriggerEventType.DrawHero] = 1, [TriggerEventType.FoodSell] = 1, [TriggerEventType.RuneUp] = 1, [TriggerEventType.CostDiamond] = 1}
-        if typeMap[eventType] then
-            local dayInfo = self:getProperty("dayLimitInfo")
-            local info = dayInfo[eventType] or {} 
-            local count = (info["count"] or 0) + param
-            local triggerCount = info["trigger"] or 0
-            local flag = nil
-            if count >= config.condition then
-                if triggerCount < config.triggerLimit then
-                    info["trigger"] = triggerCount + 1
-                    info["count"] = 0
-                    flag = true
-                else
-                    info["count"] = config.condition - 1
-                end
+    if not config then return end
+
+    -- 每日循环弹窗
+    local typeMap = {[TriggerEventType.DrawHero] = 1, [TriggerEventType.FoodSell] = 1, [TriggerEventType.RuneUp] = 1, [TriggerEventType.CostDiamond] = 1, [TriggerEventType.HeroTalent] = 1}
+    if typeMap[eventType] then
+        local dayInfo = self:getProperty("dayLimitInfo")
+        local info = dayInfo[eventType] or {}
+        local count = (info["count"] or 0) + param
+        local triggerCount = info["trigger"] or 0
+        local flag = nil
+        if count >= config.condition then
+            if triggerCount < config.triggerLimit then
+                info["trigger"] = triggerCount + 1
+                info["count"] = 0
+                flag = true
             else
-                info["count"] = count
-            end
-            dayInfo[eventType] = info
-            self:updateProperty({field = "dayLimitInfo", value = dayInfo})
-            if not flag then
-                return
+                info["count"] = config.condition - 1
             end
+        else
+            info["count"] = count
         end
-        local rechargeCfg = csvdb["shop_normalCsv"][config.packId]
-        if rechargeCfg then
-            limitPack[rechargeCfg.id] = {timeNow + rechargeCfg.time, config.id}
-            self.owner:log("push_gift", {
-                gift_id = rechargeCfg.id, --礼包ID
-                gift_name = rechargeCfg.descId,   --礼包名称
-            })
-            if config.isLoop ~= 0 then
-                local payR = self:getProperty("payR")
-                if payR[rechargeCfg.id] then
-                    payR[rechargeCfg.id] = nil
-                    self:updateProperty({field = "payR", value = payR})
-                end
+        dayInfo[eventType] = info
+        self:updateProperty({field = "dayLimitInfo", value = dayInfo})
+        if not flag then
+            return
+        end
+    end
+    local rechargeCfg = csvdb["shop_rechargeCsv"][config.packId]
+    if rechargeCfg then
+        limitPack[rechargeCfg.id] = {timeNow + rechargeCfg.time, config.id}
+        self.owner:log("push_gift", {
+            gift_id = rechargeCfg.id, --礼包ID
+            gift_name = rechargeCfg.descId,   --礼包名称
+        })
+        if config.isLoop ~= 0 then
+            local payR = self:getProperty("payR")
+            if payR[rechargeCfg.id] then
+                payR[rechargeCfg.id] = nil
+                self:updateProperty({field = "payR", value = payR})
             end
-            -- 每日抽卡限时礼包 触发重置
-            --if eventType == TriggerEventType.DrawHeroCnt then
-            --    local payR = self:getProperty("buyR")
-            --    if payR[rechargeCfg.id] then
-            --        payR[rechargeCfg.id] = nil
-            --        self:updateProperty({field = "buyR", value = payR})
-            --    end
-            --end
-            self:updateProperty({field = "limitTPack", value = limitPack})
         end
+        -- 每日抽卡限时礼包 触发重置
+        --if eventType == TriggerEventType.DrawHeroCnt then
+        --    local payR = self:getProperty("buyR")
+        --    if payR[rechargeCfg.id] then
+        --        payR[rechargeCfg.id] = nil
+        --        self:updateProperty({field = "buyR", value = payR})
+        --    end
+        --end
+        self:updateProperty({field = "limitTPack", value = limitPack})
     end
     --if next(result) then
     --    self:updateProperty({field = "packTrigger", value = triggerRecord})
@@ -852,6 +867,7 @@ function Store:data()
         totalRR = self:getProperty("totalRR"),
         monthCardId  = self:getProperty("monthCardId"),
         firstMonthCard = self:getProperty("firstMonthCard"),
+        firstsMonthCard = self:getProperty("firstsMonthCard"),
         monthCardReceive = self:getProperty("monthCardReceive"),
         smonthCards  = self:getProperty("smonthCards"),
         smonthCardReceive  = self:getProperty("smonthCardReceive"),
@@ -266,7 +266,10 @@ local function doUpdateSql()
         },
         [2] = {
             "ALTER TABLE `Rune` MODIFY COLUMN `refer` bigint;"
-        }
+        },
+        [3] = {
+            "ALTER TABLE `Email` MODIFY COLUMN `refer` VARCHAR(2048);"
+        },
     }
 	-- 更新记录表
     local res = mysqlproxy:query("SELECT `value` FROM `autoincrement_set` WHERE `key` = 'db_ver';")
@@ -865,6 +865,15 @@ function table.array2Table(arr)
     return ret
 end
+function table.findMinKeyByIndex(t, index, change)
+    if not next(t or {}) then return nil end
+    if not t[index] then
+            index = index - change
+            return table.findMinKeyByIndex(t, index, change)
+    else
+        return t[index]
+    end
+end
 function table.rewardMerge(dest, src)
     for k, v in pairs(src) do