活动：活动开关添加成长基金的数据

game-server/app/services/firstGiftService.ts

@@ -20,7 +20,7 @@ export async function firstGiftActivity(serverId: number, roleId: string) {
     }
     let activityData = activityArray[0];
     let playerRecord: ActivityFirstGiftModelType = await ActivityFirstGiftModel.findData(activityData.activityId, roleId);
-    if (playerRecord.isOver) {
+    if (!playerRecord || playerRecord.isOver) {
         return null;
     }
 

game-server/app/services/growthFundService.ts

@@ -22,16 +22,16 @@ import { GrowthFundData, GrowthFundItem } from '../domain/activityField/growthFu
   GROWTH_FUND_MAIN_ELITE_VIP = 11, // 精英成长基金（高阶）
 */
 export async function growthFundActivity(type: number, serverId: number, roleId: string) {
-    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, type, 1)
-
-    for (let i = 0; i < activityArray.length; i++) {
-        let activityData = activityArray[i];
-        let playerData = await getPlayerGrowthFundData(activityData.activityId, serverId, roleId);
-        if (!playerData.isComplete()) {
-            return playerData;
-        }
+    let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, type, new Date())
+    if (activityArray.length == 0) {
+        return null;
     }
-    return null
+    let activityData = activityArray[0]
+    let playerData = await getPlayerGrowthFundData(activityData.activityId, serverId, roleId);
+    if (playerData.isComplete()) {
+        return null;
+    }
+    return playerData;
 }
 
 /**

game-server/app/services/signInService.ts

@@ -20,14 +20,40 @@ export async function signInActivity(serverId: number, roleId: string) {
     }
 
     let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.SIGN_IN, new Date());
-    if (activityArray.length > 0) {
-        let activityData = activityArray[0];
-        let playerData = new SignInData(activityData);
-        let playerRecords: ActivitySignInModelType[] = await ActivitySignInModel.findData(activityData.activityId, roleId, playerData.roundIndex);
-        playerData.setPlayerRecords(playerRecords);
-        return playerData;
+    if (activityArray.length == 0) {
+        return null;
     }
-    return null
+    let activityData = activityArray[0];
+    let playerData = new SignInData(activityData);
+    let playerRecords: ActivitySignInModelType[] = await ActivitySignInModel.findData(activityData.activityId, roleId, playerData.roundIndex);
+    playerData.setPlayerRecords(playerRecords);
+    return playerData;
+}
+
+/**
+   * 获取活动数据
+   *
+   * @param {number} type 普通、高级 ACTIVITY_TYPE
+   * @param {number} serverId 区Id
+   * @param {number} activityId 活动Id
+   * @param {string} roleId 角色Id
+   *
+   */
+export async function signInVIPActivity(serverId: number, roleId: string) {
+    let todayIndex = moment(new Date()).date();
+    if (todayIndex < SIGNIN_OPEN || todayIndex > SIGNIN_CLOSE) {//未开启
+        return null;
+    }
+
+    let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.SIGN_IN_VIP, new Date());
+    if (activityArray.length == 0) {
+        return null;
+    }
+    let activityData = activityArray[0];
+    let playerData = new SignInData(activityData);
+    let playerRecords: ActivitySignInModelType[] = await ActivitySignInModel.findData(activityData.activityId, roleId, playerData.roundIndex);
+    playerData.setPlayerRecords(playerRecords);
+    return playerData;
 }
 
 /**