活动：新手限定礼包

game-server/app/services/firstGiftService.ts

@@ -15,13 +15,13 @@ import { FirstGiftData, FirstGiftItem } from '../domain/activityField/firstGiftF
 export async function firstGiftActivity(serverId: number, roleId: string) {
     let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(ACTIVITY_TYPE.FIRST_GIFT, true)
     activityArray = activityArray.sort((a, b) => {
-        return a.acvitityId - b.acvitityId
+        return a.activityId - b.activityId
     });
     if (activityArray.length == 0) {
         return null;
     }
     let activityData = activityArray[0];
-    let playerData = await getPlayerFirstGiftData(activityData.acvitityId, serverId, roleId);
+    let playerData = await getPlayerFirstGiftData(activityData.activityId, serverId, roleId);
     return playerData
 }
 

game-server/app/services/growthFundService.ts

@@ -24,11 +24,11 @@ import { GrowthFundData, GrowthFundItem } from '../domain/activityField/growthFu
 export async function growthFundActivity(type: number, serverId: number, roleId: string) {
     let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(type, true)
     activityArray = activityArray.sort((a, b) => {
-        return a.acvitityId - b.acvitityId
+        return a.activityId - b.activityId
     });
     for (let i = 0; i < activityArray.length; i++) {
         let activityData = activityArray[i];
-        let playerData = await getPlayerGrowthFundData(activityData.acvitityId, serverId, roleId);
+        let playerData = await getPlayerGrowthFundData(activityData.activityId, serverId, roleId);
         if (!playerData.isComplete()) {
             return playerData;
         }
@@ -51,7 +51,7 @@ export async function getPlayerGrowthFundData(activityId: number, serverId: numb
     let playerData = new GrowthFundData(activityData);
     playerData.setPlayerRecords(playerRecords);
     if (playerData.isVipActivity()) {//vip高阶需要购买
-        let buyRecords = await ActivityBuyRecordsModel.findRecordsByActivityId(activityData.acvitityId, roleId);
+        let buyRecords = await ActivityBuyRecordsModel.findRecordsByActivityId(activityData.activityId, roleId);
         playerData.initBuyRecords(buyRecords);
     }
 

game-server/app/services/limitPackageService.ts

@@ -0,0 +1,43 @@
+import { ACTIVITY_TYPE, TASK_TYPE } from '../consts';
+import { ActivityModel, ActivityModelType } from '../db/Activity';
+import { ActivityShopModel, ActivityShopModelType } from '../db/ActivityShop';
+import { LimitShopData, ShopItem } from '../domain/activityField/limitShopField';
+
+/**
+   * 获取新手玩家限购礼包活动数据
+   *
+   * @param {number} serverId 区Id
+   * @param {number} type 活动类型 ACTIVITY_TYPE
+   * @param {string} roleId 角色Id
+   *
+   */
+
+export async function newPlayerLimitPackageActivity(serverId: number, roleId: string) {
+    let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(ACTIVITY_TYPE.NEW_PLAYER_LIMIT_PACKAGE, new Date)
+    activityArray = activityArray.sort((a, b) => {
+        return a.activityId - b.activityId
+    });
+    if (activityArray.length == 0) {
+        return null;
+    }
+    let activityData = activityArray[0];
+    let playerData = await getPlayerLimitPackageData(activityData.activityId, serverId, roleId);
+    return playerData
+}
+
+/**
+   * 玩家新手玩家限购礼包活动数据
+   *
+   * @param {number} serverId 区Id
+   * @param {number} activityId 活动Id
+   * @param {string} roleId 角色Id
+   *
+   */
+export async function getPlayerLimitPackageData(activityId: number, serverId: number, roleId: string) {
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
+    let playerData = new LimitShopData(activityData);
+
+    let playerRecord: ActivityShopModelType = await ActivityShopModel.findData(activityId, roleId, playerData.roundIndex);
+    playerData.setPlayerRecords(playerRecord);
+    return playerData;
+}

game-server/app/services/selfServiceShopActivityService.ts

@@ -18,11 +18,11 @@ import { addReward, getSelectedReward } from './giftPackageService';
 export async function getActivityData(serverId: number, roleId: string) {
     let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(ACTIVITY_TYPE.SELF_SERVICE_SHOP, new Date())
     activityArray = activityArray.sort((a, b) => {
-        return b.acvitityId - a.acvitityId
+        return b.activityId - a.activityId
     });
     if (activityArray.length > 0) {
         let activityData = activityArray[0];
-        let playerData = await getPlayerActivityData(activityData.acvitityId, serverId, roleId);
+        let playerData = await getPlayerActivityData(activityData.activityId, serverId, roleId);
         return playerData;
     }
     return null;

game-server/app/services/thirtyDaysService.ts

@@ -20,12 +20,12 @@ import { deltaDays } from '../pubUtils/util';
 export async function thirtyDaysActivity(type: number, serverId: number, roleId: string) {
     let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(type, true)
     activityArray = activityArray.sort((a, b) => {
-        return a.acvitityId - b.acvitityId
+        return a.activityId - b.activityId
     });
     let allPlayerActivity = [];
     for (let i = 0; i < activityArray.length; i++) {
         let activityData = activityArray[i];
-        let playerData = await getPlayerThirtyDaysData(activityData.acvitityId, serverId, roleId);
+        let playerData = await getPlayerThirtyDaysData(activityData.activityId, serverId, roleId);
         allPlayerActivity.push(playerData)
     }