付费签到，抽卡阶段奖励，探索指令

测试
1 parent 74f2395e
Showing 10 changed files with 64 additions and 28 deletions Show diff stats
src/GlobalVar.lua
src/ProtocolCode.lua
src/actions/GmAction.lua
src/actions/HeroAction.lua
src/actions/StoreAction.lua
src/csvdata
src/models/Activity.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
src/models/Store.lua
@@ -275,10 +275,8 @@ CardType = {
 	PrivilegeCard = 3, --特权卡
 	GrowFund = 4,	--成长助力
 	BattleCard = 5,	--赛季卡
-	BattlePassCard_1 = 6, -- 探索指令1
-	BattlePassCard_2 = 7, -- 探索指令2
-	BattlePassCard_3 = 8, -- 探索指令3
-	BattlePassCard_4 = 9, -- 探索指令4
+	PaySignCard = 6, -- 付费签到卡
+	BattlePassCard = 7, -- 探索指令
 }
  
 HeroQuality = {
@@ -93,6 +93,7 @@ actionCodes = {
 	Hero_repayHeroRpc = 221,
 	Hero_unlockPoolRpc = 222,
 	Hero_changeCrown = 223,
+	Hero_drawHeroExtraRewardNtf = 221,
  
 	Hang_startRpc = 251,
 	Hang_checkRpc = 252,
@@ -472,7 +472,7 @@ function _M.test(role, pms)
 	local id = tonum(pms.pm1, 0)
 	--local hero = require ("actions.HeroAction")
 	--hero.unlockPoolRpc({role = role}, MsgPack.pack({type = id}))
-	role.storeData:onBattleCardReset()
+	role.storeData:onBuyPaySignCard(100)
 	return "成功"
 end
  
@@ -830,6 +830,7 @@ function _M.drawHeroRpc(agent, data)
  
 	local ssrCount = 0
 	local reward = {}
+	local logReward = {}
 	for i = 1, drawCount[drawType] do
 		floorHeroCount = floorHeroCount + 1
 		local isFloorBack = draw_floor_back_counts and floorHeroCount >= draw_floor_back_counts
@@ -855,7 +856,6 @@ function _M.drawHeroRpc(agent, data)
 			floorHeroCount = 0
 		end
  
-		local logReward = {}
 		if role:isHaveHero(itemData.id - ItemStartId.Hero) then
 			local fragId = itemData.id - ItemStartId.Hero
 			local heroData = csvdb["unitCsv"][fragId]
@@ -876,12 +876,6 @@ function _M.drawHeroRpc(agent, data)
 		role:setProperty("floorHero", floorHero)
 	end
  
-	if btype == 1 or btype == 2 then
-		local repayHero = role:getProperty("repayHero") or 0
-		repayHero = repayHero + drawCount[drawType]
-		role:updateProperty({field = "repayHero", value = repayHero})
-	end
-
 	role:checkTaskEnter("DrawHero", {pool = btype, count = drawCount[drawType]})
 	if ssrCount > 0 then
 		role:checkTaskEnter("DrawSSR", {count = ssrCount})
@@ -898,6 +892,36 @@ function _M.drawHeroRpc(agent, data)
 		gacha_cnt = floorHeroCount,
 	})
 	SendPacket(actionCodes.Hero_drawHeroRpc, MsgPack.pack({reward = reward})) -- 这个 reward 是数组
+
+	if btype == 1 or btype == 2 then
+		-- 达到一定次数，给响应奖励
+		local oldVal = role:getProperty("repayHero") or 0
+		local newVal = oldVal + drawCount[drawType]
+		local drawCardReward, val = role:getDrawCardExtraReward(oldVal, newVal)
+		print(drawCardReward)
+		-- 空字符穿代表直接给英雄  走以前repayHeroRpc
+		if drawCardReward == "" then
+			local id = math.randWeight(csvdb["build_giftCsv"], "pool_1")
+
+			local r = {}
+			local itemData = csvdb["itemCsv"][id]
+			if itemData.type == ItemType.Hero and role:isHaveHero(itemData.id - ItemStartId.Hero) then
+				local fragId = itemData.id - ItemStartId.Hero
+				local heroData = csvdb["unitCsv"][fragId]
+				local count = globalCsv.draw_unit_tofragment[heroData.rare]
+				role:award({[fragId] = count}, {log = {desc = "drawHeroExtraReward"}})
+				r = {id = fragId, count = count, from = id, fcount = 1}
+			else
+				role:award({[id] = 1}, {log = {desc = "drawHeroExtraReward"}})
+				r = {id = id, count = 1}
+			end
+			SendPacket(actionCodes.Hero_drawHeroExtraRewardNtf, MsgPack.pack({reward = r}))
+		elseif drawCardReward and drawCardReward ~= "" then
+			role:award(drawCardReward, {log = {desc = "drawHeroExtraReward", int1 = oldVal, int2 = newVal}})
+			SendPacket(actionCodes.Hero_drawHeroExtraRewardNtf, MsgPack.pack({reward = drawCardReward:toNumMap()}))
+		end
+		role:updateProperty({field = "repayHero", value = val})
+	end
 	return true
 end
  
@@ -384,7 +384,7 @@ function _M.getExploreCommandRewardRpc(agent, data)
 	local id = msg.id		-- 探索id
 	local subId = msg.subId		-- 领取的阶段id
  
-	local tab_name = "reward_battlepass_" .. id .. "Csv"
+	local tab_name = "reward_levelpass" .. id .. "Csv"
 	local config = csvdb[tab_name][id]
 	if not config then return end
  
@@ -408,7 +408,7 @@ function _M.getExploreCommandRewardRpc(agent, data)
 		return 3
 	end
  
-	if not role:checkHangPass(config.carbonId) then
+	if not role:checkHangPass(config.level) then
 		return 4
 	end
  
-Subproject commit d90070e4a761a53afb25de2f01c51401af9791c1
+Subproject commit 3f22e14af514a3c558f7f04c0e3a99102a4268fc
@@ -404,9 +404,9 @@ function Activity:getPaySignReward()
  
 	local diffDay = diffFromOpen() + 1
  
-	local curData = self.activity:getActData("PaySignIn")
+	local curData = self:getActData("PaySignIn")
 	local reward, change = {}
-	for day, csvData in ipairs(csvdb["pay_signInCsv"]) do
+	for day, csvData in pairs(csvdb["pay_signInCsv"]) do
 		if day <= diffDay then
 			if not curData[day] then
 				curData[day] = 1
@@ -40,6 +40,7 @@ local ItemReason = {
 	towerCount = 126, -- 电波塔次数
 	freeGift = 127, -- 免费礼包
 	exploreCommand = 128, -- 探索指令
+	drawHeroExtraReward = 129, -- 抽卡阶段奖励
  
  
 	advHang = 301, -- 拾荒挂机
@@ -1451,12 +1451,9 @@ function RolePlugin.bind(Role)
 			self:gainDiamond({count = diamondCount, isRecharge = true, 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)
+			self.storeData:onBuyCard(rechargeData.type, rechargeData.time, rechargeData.id)
 		elseif rechargeData.shop == 3 then  -- 礼包商店
 			reward, _ = self:award(rechargeData.itemFirst, {isRecharge = true, log = {desc = "recharge", int1 = id}})
-		elseif rechargeData.shop == 4 then  -- 付费签到
-			reward, _ = self:award(rechargeData.itemFirst, {isRecharge = true, log = {desc = "recharge", int1 = id}})
-			self.storeData:onBuyPaySignCard(rechargeData.time)
 		else
 			skynet.error("invalid recharge shop type " .. id)
 			return 3
@@ -1535,6 +1532,21 @@ function RolePlugin.bind(Role)
 			self:updateProperty({field = "newerGuide", value = "9999=1"})
 		end
 	end
+
+	-- 抽卡阶段奖励
+	function Role:getDrawCardExtraReward(oldVal, newVal)
+		local reward = nil
+		local maxCount = 0
+		for k, v in pairs(csvdb["build_extraRewardCsv"]) do
+			if oldVal < k and newVal >= k then
+				reward = v["reward"] or ""
+			end
+			maxCount = k > maxCount and k or maxCount
+		end
+
+		return reward, (newVal >= maxCount and newVal - maxCount or newVal)
+	end
+
 end
  
 return RolePlugin
 \ No newline at end of file
@@ -163,7 +163,7 @@ function Store:getGearExchangeCoef()
 end
  
 -- 购买通行证
-function Store:onBuyCard(type, duration)
+function Store:onBuyCard(type, duration, id)
     local timeNow = skynet.timex()
     if type == CardType.NormalMonthCard then
         if self:isMonthCardExpire() then
@@ -189,9 +189,10 @@ function Store:onBuyCard(type, duration)
         self:updateProperty({field = "growFund", value = 1})
     elseif type == CardType.BattleCard then
         self:updateProperty({field = "battleCard", value = 1})
-    elseif type == CardType.BattlePassCard_1 or type == CardType.BattlePassCard_2 or 
-         type == CardType.BattlePassCard_3 or type == CardType.BattlePassCard_4 then
-        local index = type - CardType.BattlePassCard_1 + 1
+    elseif type == CardType.PaySignCard then
+        self:onBuyPaySignCard(duration)
+    elseif type == CardType.BattlePassCard then
+        local index = id - 400          -- 401:初级 402:中级 403:高级 404:终极
         local bpInfo = self:getProperty("bpInfo") or {}
         local info = bpInfo[index] or {}
         info["flag"] = 1
@@ -365,6 +366,7 @@ function Store:onBuyPaySignCard(dur)
         return
     end
     actGoodsFlag[goodsIndex] = 1
+    self.owner:updateProperty({field = "actGoodsFlag", value = actGoodsFlag})
     -- 发钱
     local change
     local reward, curData = self.owner.activity:getPaySignReward()
@@ -375,13 +377,11 @@ function Store:onBuyPaySignCard(dur)
  
 	self.owner:log("activity", {
 		activity_id = 0, -- 活动ID（或活动指定任务的ID）
-		activity_type = self.onwer.activity.ActivityType.PaySignIn, -- 活动类型，见活动类型枚举表
+		activity_type = self.owner.activity.ActivityType.PaySignIn, -- 活动类型，见活动类型枚举表
 		activity_reward = reward, -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
 	})
  
 	SendPacket(actionCodes.Activity_actPaySignRewardNtf, MsgPack.pack(self.owner:packReward(reward, change)))
-
-    self.owner:updateProperty({field = "actGoodsFlag", value = actGoodsFlag})
 end
  
 function Store:checkPaySignReward()