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

# Conflicts: # src/csvdata

Merge branch 'cn/develop' into cn/publish/preview
# Conflicts: # src/csvdata
jiyue
2 parents 4f3fbc5f e66080dd
Showing 13 changed files with 203 additions and 119 deletions Show diff stats
robot/robot.lua
src/GlobalVar.lua
src/actions/ActivityAction.lua
src/actions/GmAction.lua
src/actions/HeroAction.lua
src/actions/RoleAction.lua
src/agent.lua
src/models/Activity.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
@@ -133,7 +133,7 @@ ItemStartId = {
 --常用的物品id的枚举
 ItemId = {
 	Gold = 1,  -- 金币
-	Exp = 2,  -- 经验
+	Exp = 2,  -- 能量饮料
 	Jade = 3,  -- 虹光玉
 	PlayerExp = 4,  -- 突破材料
 	FriendPoint = 5,  -- 友情点
@@ -371,6 +371,8 @@ MailId = {
 	CBBackAward2 = 244,
 	ActivityPoolRet = 280,
 	MyCardBuy = 300,
+
+    RechargeBack = 3001,
 }
 TriggerEventType = {
@@ -389,6 +391,7 @@ TriggerEventType = {
     RuneUp = 12,    -- 循环强化符文
     CostDiamond = 13,   -- 循环消耗钻石
     BuyLimitPack = 14, --购买指定id礼包 触发
+	HeroTalent = 15, --英雄精进 触发礼包
 }
 DrawCardType = {
@@ -431,6 +434,7 @@ SystemBnousType = {
 	ChangeBaseCount = 16, -- 每日奖励关卡挑战卡基础数量增加
 	ChangeBuyCount = 17, -- 每日奖励关卡挑战卡可购买次数增加，
 	ExtraProp = 18, -- 每次探索加速额外获得道具
+	AccountLevel = 19, -- 账号等级提升角色等级上限
 }
 -- 开箱物品类型
@@ -315,7 +315,27 @@ 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
+		for k, v in pairs(taskCfg.reward:toNumMap()) do
+			taskReward[k] = (taskReward[k] or 0) + v + taskCfg.battlepass_reward
+            break
+		end
+	end
+
+	local reward, change = role:award(taskReward, {log = {desc = "battleCommandTask"}})
 	role:log("activity", {
 		activity_id = taskId, -- 活动ID（或活动指定任务的ID）
@@ -729,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
@@ -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})
@@ -1730,6 +1730,11 @@ function _M.itemConvertSpecialRpc(agent, data)
 	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)
@@ -36,7 +36,7 @@ local function handle_timeout()
 end
 local function handle_gc()
-	if agentInfo.open_timer then return end
+	if not agentInfo.open_timer then return end
     collectgarbage("collect")
 	skynet.timeout(6000, handle_gc)
 end
@@ -779,7 +779,7 @@ activityFunc[Activity.ActivityType.Gachakon] = {
 	end,
 	["crossDay"] = function(self, actType, notify)
 		self:updateResetData(actType, 1)
-		self:updateActData(actType, {}, not notify)
+		--self:updateActData(actType, {}, not notify)
 	end,
 	["reset"] = function(self, actType)
 		if self:getResetData(actType) == 0 then return 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
@@ -68,6 +68,8 @@ local ItemReason = {
 	smonthCardReward = 152, --特刊奖励
 	itemConvertSpecial = 153, --兑换月卡/战令/探索指令  特殊道具
 	buyDiamondCardReward  = 154, --购买钻石额外赠送奖励
+	firstMonthCardReward = 155, --首次订阅月卡奖励
+	firstSMonthCardReward = 156, --首次订阅特刊奖励
 	advHang = 301, -- 拾荒挂机
 	hangBattle = 302, -- 挂机战斗
@@ -623,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())
@@ -2433,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
@@ -3028,6 +3030,12 @@ function RolePlugin.bind(Role)
 		return reward
 	end
+	function Role:getAccountLevel()
+		local levelBnous = self:getLevelBnous()
+		dump(levelBnous)
+		return levelBnous[SystemBnousType.AccountLevel] or 0
+	end
+
 	function Role:getLevelBnous()
 		local levelBnous = {}
         local curLevel = self:getProperty("level")
@@ -3056,6 +3064,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
@@ -282,6 +282,7 @@ local StoreListener = {
 		[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 = "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 = "monthCardReward", int1 = id, int2 = 30}})
+        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
@@ -613,7 +628,7 @@ function Store:OnTriggerLimitTimePack(eventType, param)
     if not config then return end
     -- 每日循环弹窗
-    local typeMap = {[TriggerEventType.DrawHero] = 1, [TriggerEventType.FoodSell] = 1, [TriggerEventType.RuneUp] = 1, [TriggerEventType.CostDiamond] = 1}
+    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 {}
@@ -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"),