From 1070d7cee2e892900d88445bb047c5058271841d Mon Sep 17 00:00:00 2001
From: liuzujun <307836273@qq.com>
Date: Mon, 26 Oct 2020 14:38:41 +0800
Subject: [PATCH] 定向抽卡活动与ssr up活动统一开放关闭

---
 src/actions/HeroAction.lua | 2 +-
 src/csvdata                | 2 +-
 src/models/Activity.lua    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/actions/HeroAction.lua b/src/actions/HeroAction.lua
index a04533b..fdd3a3d 100644
--- a/src/actions/HeroAction.lua
+++ b/src/actions/HeroAction.lua
@@ -738,7 +738,7 @@ function _M.drawHeroRpc(agent, data)
 
 	if btype == 1 then
 		-- 判断定向卡池活动开启
-		if not role.activity:isOpen("RaceDraw") then
+		if not role.activity:isOpen("SsrUpPoolChange") then
 			return
 		end
 	end
diff --git a/src/csvdata b/src/csvdata
index d2c3dea..e97f773 160000
--- a/src/csvdata
+++ b/src/csvdata
@@ -1 +1 @@
-Subproject commit d2c3deaddd4952cd4b05306144cbcdfa09734cd3
+Subproject commit e97f773db5d87e95086840cf48cd01b17ec8fc27
diff --git a/src/models/Activity.lua b/src/models/Activity.lua
index 708effa..2777b9b 100644
--- a/src/models/Activity.lua
+++ b/src/models/Activity.lua
@@ -18,7 +18,7 @@ Activity.ActivityType = {
 	DrawHero = 12,	--抽卡周 招募
 	AdvDraw = 13,	--拾荒抽周 资助
 	OpenBox = 14,	--拆解周 时钟箱
-	RaceDraw = 15,  -- 定向招募活动
+	--RaceDraw = 15,  -- 定向招募活动
 }
 
 
--
libgit2 0.21.2