From 84e0a70a07993f630d5921af69bd46bac78289f4 Mon Sep 17 00:00:00 2001
From: qiaoxin <qiaoxin@bantus.cn>
Date: Wed, 23 Jun 2021 20:58:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=EF=BC=9A=E6=80=BB=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=B7=BB=E5=8A=A0=E6=96=B0=E6=AD=A6=E5=B0=86=E6=8A=BD?=
 =?UTF-8?q?=E5=8D=A1=E6=B4=BB=E5=8A=A8=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/services/activity/activityService.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/game-server/app/services/activity/activityService.ts b/game-server/app/services/activity/activityService.ts
index 7da5cce1d..03fc764b9 100644
--- a/game-server/app/services/activity/activityService.ts
+++ b/game-server/app/services/activity/activityService.ts
@@ -24,6 +24,8 @@ import { getPlayerRefreshShopData } from './refreshShopService';
 import { getPlayerRefreshTaskData } from './refreshTaskService';
 import { getMonopolyActivity, getPlayerMonopolyData } from './monopolyService';
 import { getPlayerNewHeroGiftsData } from './newHeroGiftsService';
+import { getPlayerNewHeroGKData } from './newHeroGKService';
+import { getPlayerNewHeroGachaData } from './newHeroGachaService';
 
 /**
    * 获取活动数据
@@ -172,6 +174,16 @@ export async function getActivity(serverId: number, roleId: string, activityId:
                 activityData = await getPlayerNewHeroGiftsData(activityId, serverId, roleId);
                 break;
             }
+        case ACTIVITY_TYPE.NEW_HERO_GK://新将演绎 (配置N个武将，每个武将有X个关卡；活动期间，*天(时间自定义)开启每个武将对应的一个关卡，只有第一次通关会获得奖励)
+            {
+                activityData = await getPlayerNewHeroGKData(activityId, serverId, roleId);
+                break;
+            }
+        case ACTIVITY_TYPE.NEW_HERO_GACHA://新将擢迁（新武将抽取）
+            {
+                activityData = await getPlayerNewHeroGachaData(activityId, serverId, roleId);
+                break;
+            }
         default: {
             console.log('未知活动类型.........', activityType)
             break;