活动：新手限定礼包

game-server/app/servers/activity/handler/limitPackageHandler.ts

@@ -0,0 +1,83 @@
+import { Application, BackendSession } from 'pinus';
+import { resResult } from '../../../pubUtils/util';
+import { ACTIVITY_TYPE, FIRST_GIFT_STATE, STATUS } from '../../../consts';
+import { newPlayerLimitPackageActivity, getPlayerLimitPackageData } from '../../../services/limitPackageService';
+import { addReward, stringToRewardParam, useGiftPackage } from '../../../services/giftPackageService';
+import { ActivityShopModel } from '../../../db/ActivityShop';
+
+export default function (app: Application) {
+    return new limitPackageHandler(app);
+}
+
+export class limitPackageHandler {
+    constructor(private app: Application) {
+    }
+
+    /************************新手限定礼包****************************/
+
+    /**
+    * @description 获取新手限定活动数据
+    * @param {{ }} msg
+    * @param {BackendSession} session
+    * @memberof limitPackageHandler
+    */
+    async getNewPlayerLimitPackageActivity(msg: {}, session: BackendSession) {
+        const { } = msg;
+        const roleId = session.get('roleId');
+        const serverId = session.get('serverId');
+
+        let playerData = await newPlayerLimitPackageActivity(serverId, roleId);
+        if (!playerData) {
+            return resResult(STATUS.ACTIVITY_MISSING);
+        }
+        return resResult(STATUS.SUCCESS, { playerData });
+    }
+
+    /**
+        * @description 购买礼包
+        * @param {{ activityId: number, roundIndex: number, id: number}} msg
+        * @param {BackendSession} session
+        * @memberof limitPackageHandler
+        */
+    async buyGood(msg: { activityId: number, roundIndex: number, id: number }, session: BackendSession) {
+        const { activityId, roundIndex, id, } = msg;
+        const roleId = session.get('roleId');
+        const serverId = session.get('serverId');
+        const sid = session.get('sid');
+        const roleName = session.get('roleName');
+        const funcs: number[] = session.get('funcs');
+
+        let playerData = await getPlayerLimitPackageData(activityId, serverId, roleId);
+        if (!playerData) {
+            return resResult(STATUS.ACTIVITY_MISSING);
+        }
+
+        if (playerData.roundIndex != roundIndex) {
+            return resResult(STATUS.ACTIVITY_EXPIRE);
+        }
+
+        switch (playerData.type) {
+            case ACTIVITY_TYPE.NEW_PLAYER_LIMIT_PACKAGE:
+                {
+                    if (playerData.endTime < new Date) {
+                        return resResult(STATUS.ACTIVITY_NEW_PLAYER_LIMIT_PACKAGE_END);
+                    }
+                    break;
+                }
+            default:
+                break;
+        }
+
+        let item = playerData.findItem(id);
+        if (item.countMax > 0 && item.buyCount >= item.countMax) {
+            return resResult(STATUS.ACTIVITY_MAX_COUNT);
+        }
+
+        let rewardArray = stringToRewardParam(item.reward)
+        let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardArray);
+
+        await ActivityShopModel.addRecord(activityId, roleId, roundIndex, id);
+        return resResult(STATUS.SUCCESS, Object.assign(result, {}));
+    }
+
+}

game-server/app/servers/activity/handler/signInHandler.ts

@@ -38,8 +38,8 @@ export class SignInHandler {
             return resResult(STATUS.ACTIVITY_MISSING);
         }
 
-        let acvitityId = activityData.acvitityId;//活动ID
-        let playerData = await getPlayerSignInData(acvitityId, serverId, roleId)
+        let activityId = activityData.activityId;//活动ID
+        let playerData = await getPlayerSignInData(activityId, serverId, roleId)
 
         if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
 
@@ -72,7 +72,7 @@ export class SignInHandler {
         if (!activityData) {//未配置活动数据
             return resResult(STATUS.ACTIVITY_MISSING);
         }
-        if (activityData.acvitityId != activityId) {
+        if (activityData.activityId != activityId) {
             return resResult(STATUS.ACTIVITY_EXPIRE);
         }
 

game-server/app/servers/activity/handler/thirtyDaysHandler.ts

@@ -57,7 +57,7 @@ export class thirtyDaysHandler {
 
         let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(ACTIVITY_TYPE.THIRTY_DAYS, true)
         activityArray = activityArray.sort((a, b) => {
-            return a.acvitityId - b.acvitityId
+            return a.activityId - b.activityId
         });
 
         let activityDays = 0;

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)
     }