From 7113ad0c39acbae6d565b225f1c8eded257256e3 Mon Sep 17 00:00:00 2001
From: liuzujun <307836273@qq.com>
Date: Sun, 7 Feb 2021 17:12:52 +0800
Subject: [PATCH] 每日抽卡次数触发礼包

---
 src/actions/HeroAction.lua | 13 +++++++------
 src/models/Daily.lua       |  2 +-
 src/models/RoleTask.lua    |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/actions/HeroAction.lua b/src/actions/HeroAction.lua
index 8e015e4..0685c14 100644
--- a/src/actions/HeroAction.lua
+++ b/src/actions/HeroAction.lua
@@ -915,6 +915,8 @@ function _M.drawHeroRpc(agent, data)
 	local ssrCount = 0
 	local reward = {}
 	local logReward = {}
+	-- 限时礼包
+	local dailyDrawCnt = role.dailyData:getProperty("drawHeroCnt") or 0
 	for i = 1, drawCount[drawType] do
 		floorHeroCount = floorHeroCount + 1
 		local isFloorBack = draw_floor_back_counts and floorHeroCount >= draw_floor_back_counts
@@ -963,8 +965,13 @@ function _M.drawHeroRpc(agent, data)
 			logReward[itemId] = (logReward[itemId] or 0) + 1
 			table.insert(reward, {id = itemId, count = 1})
 		end
+
+		dailyDrawCnt = dailyDrawCnt + 1
+		role:checkTaskEnter("DrawHeroLimitPack", {count = dailyDrawCnt})
 	end
 
+	role.dailyData:setProperty("drawHeroCnt", dailyDrawCnt)
+
 	if draw_floor_back_counts then
 		local floorHero = role:getProperty("floorHero")
 		floorHero[btype] = floorHeroCount
@@ -976,12 +983,6 @@ function _M.drawHeroRpc(agent, data)
 		role:updateProperty({field="newerDraw", value = newCount + drawCount[drawType]})
 	end
 
-	-- 限时礼包
-	local dailyDrawCnt = role.dailyData:getProperty("drawHeroCnt") or 0
-	dailyDrawCnt = dailyDrawCnt + drawCount[drawType]
-	role.dailyData:setProperty("drawHeroCnt", dailyDrawCnt)
-	role:checkTaskEnter("DrawHeroLimitPack", {count = dailyDrawCnt})
-
 	role:checkTaskEnter("DrawHero", {pool = btype, count = drawCount[drawType]})
 	if btype ~= 3 then
 		role:checkTaskEnter("DrawHeroNotFriend", {pool = btype, count = drawCount[drawType]})
diff --git a/src/models/Daily.lua b/src/models/Daily.lua
index 9a1a71e..eebe782 100644
--- a/src/models/Daily.lua
+++ b/src/models/Daily.lua
@@ -28,7 +28,7 @@ Daily.schema = {
 
 	unlockPool		= {"table", {}},		-- 解锁的属性卡池
 	curPool 		= {"number", 0},		-- 属性卡池当前索引
-	drawCardCnt		= {"number", 0},		-- 每日抽卡次数
+	drawHeroCnt		= {"number", 0},		-- 每日抽卡次数
 }
 
 function Daily:updateProperty(params)
diff --git a/src/models/RoleTask.lua b/src/models/RoleTask.lua
index 122a153..78a82d2 100644
--- a/src/models/RoleTask.lua
+++ b/src/models/RoleTask.lua
@@ -262,7 +262,7 @@ local StoreListener = {
 		[TaskType.TowerPass] = {{TriggerEventType.TowerPass, f("level")}},
 		[TaskType.AdvPassFirst] = {{TriggerEventType.AdvPass, f("id")}},
 		[TaskType.AddHero] = {{TriggerEventType.AddNewHero, f("heroType")}, {TriggerEventType.SSRCount, f("ssrCount")}},
-		[TaskType.DrawHeroLimitPack] = {{TriggerEventType.DrawHeroLimitPack, f("count")}},
+		[TaskType.DrawHeroLimitPack] = {{TriggerEventType.DrawHeroCnt, f("count")}},
 	}
 }
 
--
libgit2 0.21.2