merge code

liuzujun
2 parents e84a1beb 811cddfc
Showing 8 changed files with 343 additions and 54 deletions Show diff stats
src/ProtocolCode.lua
src/actions/HeroAction.lua
src/actions/StoreAction.lua
src/adv/Adv.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
src/models/RoleTimeReset.lua
src/models/Store.lua
@@ -223,6 +223,7 @@ actionCodes = {
 	Store_getBattlePassRewardRpc = 562,	--赛季卡奖励
 	Store_getExploreCommandRewardRpc = 563, --探索指令
 	Store_getTotalRechargeAwardRpc = 564,	-- 累计充值
+	Store_monthCardRewardRpc = 565, --每日月卡+特刊奖励
 	Store_biliCloudRechargeRpc = 596,
 	Store_biliAndroidRechargeRpc = 597,
@@ -1095,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, -- 卡池类型
@@ -548,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
@@ -1713,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}}, {})
@@ -64,6 +64,8 @@ local ItemReason = {
 	activityCrisis = 148, -- 物资危机奖励
     glodConvertRune = 149, -- 金币兑换铭文
     shopBuy = 150,  -- 商店购买
+	monthCardReward = 151, --月卡奖励
+	smonthCardReward = 152, --特刊奖励
 	advHang = 301, -- 拾荒挂机
 	hangBattle = 302, -- 挂机战斗
@@ -393,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	删除好友
@@ -2215,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)
@@ -2241,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
@@ -2294,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()
@@ -2369,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]
@@ -2394,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
@@ -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,98 @@ function Store:updateProperty(params)
 end
 function Store:onCrossDay()
-    self:sendMonthCardEmail()
+    --self:sendMonthCardEmail()
     self:deleteExpireLimitGoods()
     --self:checkPaySignReward()
+
+    --刷新商店
+    self:flushDailyShop()
+
+    --重置月卡、特刊奖励领取记录
+    self:updateProperty({field = "monthCardReceive", value = 0})
+    self:updateProperty({field = "smonthCardReceive", value = 0})
+end
+
+function Store:refreshWeekData(notify)
+    self:flushWeekShop()
+end
+
+local SuperMonthCard = {}
+
+SuperMonthCard["buy"] = function(self, id)
+    local smonthCards = self:getProperty("smonthCards") or {}
+
+    local BuyMonthCard = {}
+    BuyMonthCard["renewal"]= function()
+        --续刊
+        if self:isMonthCardExpire() then return false end
+
+        local smonthCard = smonthCards[id] or {}
+        if next(smonthCard) then
+
+            smonthCard["buyCount"] = (smonthCard["buyCount"] or 0) + 1
+
+            local card = csvdb["shop_cardCsv"][id] or {}
+            local periods = SuperMonthCard["periods"](self, id) + (card["cardPlusPeriods"] or 30)
+            smonthCard["periods"] = periods
+
+            self:updateProperty({filed = "smonthCards", value = smonthCards})
+            return true
+        end
+    end
+    BuyMonthCard["order"] = function()
+        --增刊条件
+        local card = csvdb["shop_cardCsv"][id] or {}
+        --判断是否购买过增刊条件里的特刊
+        local cardId = card["cardPlusCondition"] or 0
+        if self:isMonthCardExpire() or smonthCards[cardId] == nil then return false end
+
+        --如果上期特刊奖励没有领取玩，则不能购买这期特刊。
+        if SuperMonthCard["isExpired"](self, cardId) == false and cardId ~= 101 then return false end
+
+        smonthCards[id] = {["periods"] = (card["cardPlusPeriods"] or 30), ["buyCount"] = 1}
+
+        self:updateProperty({filed = "smonthCards", value = smonthCards})
+        return true
+    end
+
+    if SuperMonthCard["isExpired"](self, id) then
+        local smonthCard = smonthCards[id] or {}
+        if next(smonthCard) then
+            return BuyMonthCard["renewal"]()
+        else
+            return BuyMonthCard["order"]()
+        end
+    else
+        return BuyMonthCard["renewal"]()
+    end
+end
+
+SuperMonthCard["periods"] = function(self, id)
+    local smonthCards = self:getProperty("smonthCards") or {}
+    local smonthCard = smonthCards[id] or {}
+    return smonthCard["periods"] or 0
+end
+
+SuperMonthCard["isExpired"] = function (self, id)
+    local periods = SuperMonthCard["periods"](self, id)
+    return periods == 0
+end
+
+SuperMonthCard["itemDaily"] = function(self, id)
+    local cur_ex = SuperMonthCard["periods"](self, id)
+    if cur_ex == 0 then return nil, nil end
+    cur_ex = cur_ex - 1
+
+    local card = csvdb["shop_cardCsv"][id] or {}
+    local reward, change = self.owner:award(card["itemDaily"], {log = {desc = "smonthCardReward", int1 = id, int2 = cur_ex}})
+
+    local smonthCards = self:getProperty("smonthCards") or {}
+    local smonthCard = smonthCards[id] or {}
+    smonthCard["periods"] = cur_ex
+    self:updateProperty({field = "smonthCards", value = smonthCards})
+
+    return reward, change, cur_ex
 end
 -- 删除过期商品
@@ -139,15 +223,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 +305,97 @@ function Store:getCurMonthCardLvl(isSuper)
     return cfg.level or 0
 end
+--获取月卡每日奖励
+function Store:getMonthCardDailyReward(id)
+    if self:isMonthCardExpire() or self:getProperty("monthCardReceive") == 1 then return nil, nil end
+
+    local before_ex = self:getProperty("monthCardEx")
+    self:updateProperty({field = "monthCardEx", delta = -1})
+    local cur_ex = self:getProperty("monthCardEx")
+
+    local actCfg = csvdb["shop_card"][id] or {}
+    local award = actCfg.itemDaily:toNumMap()
+    local reward, change = self.owner:award(award, {log = {desc = "monthCardReward", int1 = id, int2 = cur_ex}})
+
+    --今日月卡奖励已经领取
+    self:updateProperty({field = "monthCardReceive", value = 1})
+
+    self.owner:log("month_card", {
+        item_type = CardType.NormalMonthCard,
+        item_id = id, --月卡id
+        before_ex = before_ex, --未领取奖励前的期
+        cur_ex = cur_ex, --剩余期数
+        reward_time = skynet.timex(),  --奖励时间
+        month_reward_detail = reward,
+    })
+    return reward, change
+end
+
+--获取特刊每日奖励
+function Store:getSMonthCardDailyReward(id)
+    local before_ex = SuperMonthCard["periods"](self, id)
+    local reward, change, cur_ex= SuperMonthCard["itemDaily"](self, id)
+
+    --今日特刊奖励已经领取
+    self:updateProperty({field = "smonthCardReceive", value = 1})
+
+    self.owner:log("month_card", {
+        item_type = CardType.SuperMonthCard,
+        item_id = id, --月卡id
+        before_ex = before_ex, --未领取奖励前的期
+        cur_ex = cur_ex, --剩余期数
+        reward_time = skynet.timex(),  --奖励时间
+        month_reward_detail = reward,
+    })
+    return reward, change
+end
+
+function Store:firstBuyMonthCard(id)
+    if self:getProperty("firstMonthCard") == 1 then
+        self:updateProperty({field = "firstMonthCard", value = 0})
+        local card = csvdb["shop_cardCsv"][id] or {}
+        return self:award(card["cardFirst"], {log = {desc = "monthCardReward", int1 = id, int2 = 30}})
+    end
+    return nil
+end
+
 -- 购买通行证
 function Store:onBuyCard(type, duration, id, actid)
     local timeNow = skynet.timex()
     if type == CardType.NormalMonthCard then
         if self:isMonthCardExpire() then
             self:updateProperty({field = "monthCardId", value = id})
-            self:updateProperty({field = "monthCardEx", value = timeNow + duration})
-        else
-            self:updateProperty({field = "monthCardEx", value = self:getProperty("monthCardEx") + duration})
         end
-        self:sendMonthCardEmail()
+        self:updateProperty({field = "monthCardEx", value = self:getProperty("monthCardEx") + 30})
+
+        --初回特典  仅首次购买月卡时赠送SSR级角色"拉塔托娅"
+       local reward = {}
+        local tmpreward, _ = self:firstBuyMonthCard(id)
+        if tmpreward then
+            for k, v in pairs(tmpreward) do
+                reward[k] = (reward[k] or 0) + v
+            end
+        end
+
+        --签收奖励
+        tmpreward, _= self:getMonthCardDailyReward(id)
+        if tmpreward then
+            for k, v in pairs(tmpreward) do
+                reward[k] = (reward[k] or 0) + v
+            end
+        end
+        return reward
+    elseif type == CardType.SuperMonthCard then
+        if SuperMonthCard["buy"](self, id) then
+            return self:getSMonthCardDailyReward(id)
+        end
+        return nil, nil
     elseif type == CardType.NormalMonthCardLevelUp then
         if self:isMonthCardExpire() then
             skynet.error(string.format("month card expired, can not level up,%d,%d",self.owner:getProperty("id"), id))
         else
             local cfg = csvdb["shop_cardCsv"][id]
-            if not cfg then return end 
+            if not cfg then return end
             local dif = cfg.level - self:getCurMonthCardLvl(false)
             if dif > 1 and dif < 0 then
                 return
@@ -250,20 +404,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 +453,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 +696,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 +786,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 +796,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