活动：添加节日活动-刷新商店、刷新任务

game-server/app/services/activityService.ts

@@ -20,6 +20,8 @@ import { getPlayerDailyMealData } from './dailyMealService';
 import { getPlayerDailyCoinData } from './dailyCoinService';
 import { getPlayerDailyRMBGiftsData } from './dailyRMBGiftsService';
 import { getPlayerDailyGKData } from './dailyGKService';
+import { getPlayerRefreshShopData } from './refreshShopService';
+import { getPlayerRefreshTaskData } from './refreshTaskService';
 
 /**
    * 获取活动数据
@@ -143,6 +145,16 @@ export async function getActivity(serverId: number, roleId: string, activityId:
                 activityData = await getPlayerDailyGKData(activityId, serverId, roleId);
                 break;
             }
+        case ACTIVITY_TYPE.REFRESH_SHOP://通用的刷新商店（分页，可刷新，限制购买次数，支持rmb与资源兑换） 33
+            {
+                activityData = await getPlayerRefreshShopData(activityId, serverId, roleId);
+                break;
+            }
+        case ACTIVITY_TYPE.REFRESH_TASK://通用的刷新任务（分页，可刷新，限制领取次数） 34
+            {
+                activityData = await getPlayerRefreshTaskData(activityId, serverId, roleId);
+                break;
+            }
         default: {
             console.log('未知活动类型.........')
             break;

game-server/app/services/refreshShopService.ts

@@ -0,0 +1,110 @@
+import moment = require('moment');
+import { ACTIVITY_TYPE, STATUS, TASK_TYPE } from '../consts';
+import { ActivityModel, ActivityModelType } from '../db/Activity';
+import { ActivityRefreshShopModel, ActivityRefreshShopModelType } from '../db/ActivityRefreshShop';
+import { RoleModel } from '../db/Role';
+import { ServerlistModel } from '../db/Serverlist';
+import { RefreshShopData, RefreshShopItem } from '../domain/activityField/refreshShopField';
+import { deltaDays } from '../pubUtils/util';
+import { addReward, stringToRewardParam } from './giftPackageService';
+
+/**
+   * 
+   *
+   * @param {number} serverId 区Id
+   * @param {number} type 活动类型 ACTIVITY_TYPE
+   * @param {string} roleId 角色Id
+   *
+   */
+
+export async function getRefreshShopActivity(serverId: number, roleId: string) {
+    let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
+    let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.REFRESH_SHOP, new Date)
+    if (activityArray.length == 0) {
+        return null;
+    }
+    let activityData = activityArray[0];
+    let playerData = new RefreshShopData(activityData);
+
+    let playerRecord: ActivityRefreshShopModelType = await ActivityRefreshShopModel.findData(activityData.activityId, roleId, playerData.roundIndex);
+    playerData.setPlayerRecords(playerRecord);
+    return playerData;
+}
+
+/**
+   * 玩家商店数据
+   *
+   * @param {number} serverId 区Id
+   * @param {number} activityId 活动Id
+   * @param {string} roleId 角色Id
+   *
+   */
+export async function getPlayerRefreshShopData(activityId: number, serverId: number, roleId: string) {
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
+    let playerData = new RefreshShopData(activityData);
+
+    let playerRecord: ActivityRefreshShopModelType = await ActivityRefreshShopModel.findData(activityId, roleId, playerData.roundIndex);
+    playerData.setPlayerRecords(playerRecord);
+    return playerData;
+}
+
+/**
+   * 玩家活动第几天
+   *
+   * @param {number} serverId 区Id
+   * @param {number} activityId 活动Id
+   * @param {string} roleId 角色Id
+   *
+   */
+export async function newPlayerActivityDays(roleId: string) {
+    let { createTime } = await RoleModel.findByRoleId(roleId);
+    let createDate = moment(createTime * 1000).toDate();
+    let todayIndex = deltaDays(moment(createDate).startOf('d').toDate(), new Date) + 1;
+    return todayIndex;
+}
+
+
+
+
+/**
+   * 结算购买的奖励
+   *
+   * @param {number} serverId 区Id
+   * @param {number} activityId 活动Id
+   * @param {string} roleId 角色Id
+   * @param {string} productID 商品ID
+   *
+   */
+export async function makeRefreshPackageReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
+    activityId: number, productID: string) {
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
+    if (!activityData) {
+        return STATUS.ACTIVITY_MISSING;
+    }
+    if (activityData.type !== ACTIVITY_TYPE.REFRESH_SHOP) {
+        return STATUS.ACTIVITY_TYPE_ERROR;
+    }
+    let playerData = new RefreshShopData(activityData);
+
+    let playerRecord: ActivityRefreshShopModelType = await ActivityRefreshShopModel.findData(activityData.activityId, roleId, playerData.roundIndex);
+    playerData.setPlayerRecords(playerRecord);
+
+    let item = playerData.findItemByProductID(productID);
+    if (!item) {
+        return STATUS.ACTIVITY_NO_PRODUCT;
+    }
+    if (item.countMax > 0 && item.buyCount >= item.countMax) {
+        return STATUS.ACTIVITY_MAX_COUNT;
+    }
+
+    let rewardArray = stringToRewardParam(item.reward)
+    let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardArray);
+
+    await ActivityRefreshShopModel.addRecord(activityId, roleId, playerData.roundIndex, item.pageIndex, item.id);
+
+    item.buyCount += 1;
+    return {
+        code: 0,
+        data: Object.assign(result, { item: item, activityId: activityId })
+    }
+}

game-server/app/services/refreshTaskService.ts

@@ -0,0 +1,46 @@
+import { ACTIVITY_TYPE } from '../consts';
+import { ActivityModel, ActivityModelType } from '../db/Activity';
+import { ActivityRefreshTaskModel, ActivityRefreshTaskModelType } from '../db/ActivityRefreshTask';
+import { ServerlistModel } from '../db/Serverlist';
+import { RefreshTaskData, RefreshTaskItem } from '../domain/activityField/refreshTaskField';
+
+
+/**
+   * 获取活动数据
+   *
+   * @param {number} serverId 区Id
+   * @param {number} activityId 活动Id
+   * @param {string} roleId 角色Id
+   *
+   */
+export async function getRefreshTaskActivity(serverId: number, roleId: string) {
+    let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
+    let activityDataArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.REFRESH_TASK, new Date());
+    if (activityDataArray.length === 0) {
+        return null;
+    }
+    let activityData: ActivityModelType = activityDataArray[0];
+    let playerData = new RefreshTaskData(activityData);
+    let playerRecords: ActivityRefreshTaskModelType[] = await ActivityRefreshTaskModel.findData(serverId, activityData.activityId, roleId, playerData.roundIndex);
+    playerData.setPlayerRecords(playerRecords);
+    return playerData;
+}
+
+
+/**
+   * 玩家玩家活动数据
+   *
+   * @param {number} serverId 区Id
+   * @param {number} activityId 活动Id
+   * @param {string} roleId 角色Id
+   *
+   */
+export async function getPlayerRefreshTaskData(activityId: number, serverId: number, roleId: string) {
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
+    let playerData = new RefreshTaskData(activityData);
+    let playerRecords: ActivityRefreshTaskModelType[] = await ActivityRefreshTaskModel.findData(serverId, activityId, roleId, playerData.roundIndex);
+    playerData.setPlayerRecords(playerRecords);
+    return playerData;
+}
+
+