diff --git a/game-server/app/servers/activity/handler/activityHandler.ts b/game-server/app/servers/activity/handler/activityHandler.ts index acbba2b71..fb86f0175 100644 --- a/game-server/app/servers/activity/handler/activityHandler.ts +++ b/game-server/app/servers/activity/handler/activityHandler.ts @@ -510,7 +510,8 @@ export class ActivityHandler { // await checkActivityTask(serverId, sid, funcs, roleId, TASK_TYPE.ROLE_LV, 100) // await checkActivityTask(serverId, sid, funcs, roleId, TASK_TYPE.PVP, 1) - await checkActivityTask(serverId, sid, funcs, roleId, TASK_TYPE.BATTLE_TOWER_LV, 1, { towerLv: lv }) + // await checkActivityTask(serverId, sid, funcs, roleId, TASK_TYPE.BATTLE_TOWER_LV, 1, { towerLv: lv }) + await checkActivityTask(serverId, sid, funcs, roleId, TASK_TYPE.GASHA, 1) diff --git a/game-server/app/servers/activity/handler/dailyCoinHandler.ts b/game-server/app/servers/activity/handler/dailyCoinHandler.ts index d632c43d4..8339cae5e 100644 --- a/game-server/app/servers/activity/handler/dailyCoinHandler.ts +++ b/game-server/app/servers/activity/handler/dailyCoinHandler.ts @@ -123,13 +123,14 @@ export class DailyCoinHandler { } //免费期间 + let time = moment(new Date()).valueOf(); let result = await addReward(roleId, roleName, sid, serverId, funcs, newReward) - await ActivityDailyCoinModel.addExchangeRecord(serverId, activityId, roleId, playerData.beginTime, count, addCoin, `${count}&${consumeGold}&${addCoin}&${moment(new Date().valueOf())}`); + await ActivityDailyCoinModel.addExchangeRecord(serverId, activityId, roleId, playerData.beginTime, count, addCoin, `${count}&${consumeGold}&${addCoin}&${time}`); let exchangeCount = playerData.exchangeCount + count; return resResult(STATUS.SUCCESS, Object.assign(result, { param: { activityId, count }, - item: { exchangeCount, recordMsg: `${count}&${consumeGold}&${addCoin}`, rateArray }, + item: { exchangeCount, recordMsg: `${count}&${consumeGold}&${addCoin}&${time}`, rateArray }, })); } diff --git a/game-server/app/servers/activity/handler/refreshShopHandler.ts b/game-server/app/servers/activity/handler/refreshShopHandler.ts new file mode 100644 index 000000000..b30f3ac09 --- /dev/null +++ b/game-server/app/servers/activity/handler/refreshShopHandler.ts @@ -0,0 +1,91 @@ +import { Application, BackendSession } from 'pinus'; +import { deltaDays, resResult } from '../../../pubUtils/util'; +import { ACTIVITY_TYPE, STATUS } from '../../../consts'; +import { getRefreshShopActivity, getPlayerRefreshShopData } from '../../../services/refreshShopService'; +import { addReward, stringToConsumeParam, stringToRewardParam } from '../../../services/giftPackageService'; +import { ActivityRefreshShopModel } from '../../../db/ActivityRefreshShop'; +import { RoleModel } from '../../../db/Role'; +import { handleCost } from '../../../services/rewardService'; +import moment = require('moment'); + +export default function (app: Application) { + return new RefreshShopHandler(app); +} + +export class RefreshShopHandler { + constructor(private app: Application) { + } + + /************************通用的刷新商店（分页，可刷新，限制购买次数，支持rmb与资源兑换）****************************/ + + /** + * @description 获取商店数据 + * @param {{ activityId:number}} msg + * @param {BackendSession} session + * @memberof RefreshShopHandler + */ + async getRefreshShopActivity(msg: { activityId: number }, session: BackendSession) { + const { activityId } = msg; + const roleId = session.get('roleId'); + const serverId = session.get('serverId'); + + let playerData = await getRefreshShopActivity(serverId, roleId); + if (!playerData) { + return resResult(STATUS.ACTIVITY_MISSING); + } + return resResult(STATUS.SUCCESS, { playerData }); + } + + + /** + * @description 购买 + * @param {{ activityId: number, roundIndex: number, id: number, pageIndex: number}} msg + * @param {BackendSession} session + * @memberof RefreshShopHandler + */ + async buyGood(msg: { activityId: number, roundIndex: number, id: number, pageIndex: number }, session: BackendSession) { + const { activityId, roundIndex, id, pageIndex } = 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 getPlayerRefreshShopData(activityId, serverId, roleId); + if (!playerData) { + return resResult(STATUS.ACTIVITY_MISSING); + } + + if (playerData.roundIndex != roundIndex) { + return resResult(STATUS.ACTIVITY_EXPIRE); + } + + let item = playerData.findItem(id, pageIndex); + if (!item) { + return resResult(STATUS.ACTIVITY_ID_ERROR); + } + if (item.countMax > 0 && item.buyCount >= item.countMax) { + return resResult(STATUS.ACTIVITY_MAX_COUNT); + } + if (item.price > 0) { + return resResult(STATUS.ACTIVITY_NEED_PAY); + } + + //检查资源 + let consume = stringToConsumeParam(item.consume) + let consumeResult = await handleCost(roleId, sid, consume); + if (!consumeResult) return resResult(STATUS.ROLE_MATERIAL_NOT_ENOUGH); + + let rewardArray = stringToRewardParam(item.reward) + let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardArray); + + await ActivityRefreshShopModel.addRecord(activityId, roleId, roundIndex, pageIndex, id); + + item.buyCount += 1; + return resResult(STATUS.SUCCESS, Object.assign(result, { + param: { activityId, roundIndex, id }, + item: item + })); + } + +} diff --git a/game-server/app/servers/activity/handler/refreshTaskHandler.ts b/game-server/app/servers/activity/handler/refreshTaskHandler.ts new file mode 100644 index 000000000..4f92c22c4 --- /dev/null +++ b/game-server/app/servers/activity/handler/refreshTaskHandler.ts @@ -0,0 +1,81 @@ +import { Application, BackendSession } from 'pinus'; +import { resResult } from '../../../pubUtils/util'; +import { STATUS } from '../../../consts'; +import { getPlayerRefreshTaskData } from '../../../services/refreshTaskService'; +import { RefreshTaskItem } from '../../../domain/activityField/refreshTaskField'; +import { addReward, stringToRewardParam } from '../../../services/giftPackageService'; +import { RewardParam } from '../../../domain/activityField/rewardField'; +import { ActivityRefreshTaskModel } from '../../../db/ActivityRefreshTask'; + + +export default function (app: Application) { + return new RefreshTaskHandler(app); +} + +export class RefreshTaskHandler { + constructor(private app: Application) { + } + + /************************通用的刷新任务（分页，可刷新，限制领取次数）****************************/ + + /** + * @description 获取任务活动数据 + * @param {{ activityId: number}} msg + * @param {BackendSession} session + * @memberof RefreshTaskHandler + */ + async getRefreshTaskActivity(msg: { activityId: number }, session: BackendSession) { + const { activityId } = msg; + const roleId = session.get('roleId'); + const serverId = session.get('serverId'); + + let playerData = await getPlayerRefreshTaskData(activityId, serverId, roleId) + + if (!playerData) return resResult(STATUS.ACTIVITY_MISSING); + + return resResult(STATUS.SUCCESS, playerData); + } + + /** + * @description 获取奖励 + * @param {{ activityId: number, roundIndex: number, pageIndex: number,id: number, type: number}} msg + * @param {BackendSession} session + * @memberof RefreshTaskHandler + */ + async getReward(msg: { activityId: number, roundIndex: number, pageIndex: number, id: number, type: number }, session: BackendSession) { + const { activityId, roundIndex, pageIndex, id, type } = msg; + const roleId = session.get('roleId'); + const serverId = session.get('serverId'); + const sid = session.get('sid'); + const roleName = session.get('roleName'); + const funcs = session.get('funcs'); + + let playerData = await getPlayerRefreshTaskData(activityId, serverId, roleId) + if (!playerData) return resResult(STATUS.ACTIVITY_MISSING); + if (playerData.roundIndex != roundIndex) { + return resResult(STATUS.ACTIVITY_EXPIRE); + } + let dailyItemData: RefreshTaskItem = playerData.findItem(pageIndex, id, type); + if (!dailyItemData) { + return resResult(STATUS.ACTIVITY_DATA_ERROR); + } + if (dailyItemData.totalCount < dailyItemData.condition) {//未完成任务 + return resResult(STATUS.ACTIVITY_TASK_UNCOMPLETED); + } + if (dailyItemData.receiveRewardCount) {//已经领取过 + return resResult(STATUS.ACTIVITY_REWARDED); + } + + await ActivityRefreshTaskModel.addReceiveRecord(serverId, activityId, roleId, roundIndex, pageIndex, id, type, 1); + + let rewardParamArr: Array = stringToRewardParam(dailyItemData.reward); + let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr) + + dailyItemData.receiveRewardCount += 1; + return resResult(STATUS.SUCCESS, Object.assign(result, { + param: { activityId, roundIndex, pageIndex, id, type }, + item: dailyItemData, + })); + } + +} diff --git a/game-server/app/services/activityService.ts b/game-server/app/services/activityService.ts index ed7cd12a3..7d655bad8 100644 --- a/game-server/app/services/activityService.ts +++ b/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; diff --git a/game-server/app/services/refreshShopService.ts b/game-server/app/services/refreshShopService.ts new file mode 100644 index 000000000..5fc22beb1 --- /dev/null +++ b/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 }) + } +} diff --git a/game-server/app/services/refreshTaskService.ts b/game-server/app/services/refreshTaskService.ts new file mode 100644 index 000000000..d078d6370 --- /dev/null +++ b/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; +} + + diff --git a/shared/consts/constModules/activityConst.ts b/shared/consts/constModules/activityConst.ts index 8568c2f95..3c3d1ae29 100644 --- a/shared/consts/constModules/activityConst.ts +++ b/shared/consts/constModules/activityConst.ts @@ -16,7 +16,7 @@ export enum ACTIVITY_TYPE { DAILY_DISCOUNT_GIFT = 1, // 七天乐活动,每日特惠礼包 TASK_GROWTH = 2, // 成长任务活动 TASK_DAILY_CHALLENGES = 3, // 今日挑战活动 - SIGN_IN = 4, // 签到活动 （开服立即开启，配置每月*日到*日结束） + SIGN_IN = 4, // 通用的签到活动 （开服立即开启，配置每月*日到*日结束） SIGN_IN_VIP = 5, // 签到活动(高级)RMB购买 （开服立即开启，配置每月*日到*日结束） GROWTH_FUND_MAIN = 6, // 主线成长基金 （注册后可见，永久存在） GROWTH_FUND_MAIN_VIP = 7, // 主线成长基金（高阶）（注册后可见，永久存在） @@ -45,6 +45,8 @@ export enum ACTIVITY_TYPE { DAILY_MEAL = 30, // 每日领取免费午饭、晚饭活动 DAILY_COIN = 31, // 每日兑换铜钱 DAILY_GK = 32, // 每日关卡（每日开启一关） + REFRESH_SHOP = 33, // 通用的刷新商店（分页，可刷新，限制购买次数，支持rmb与资源兑换） + REFRESH_TASK = 34, // 通用的刷新任务（分页，可刷新，限制领取次数） } /** diff --git a/shared/db/ActivityRefreshShop.ts b/shared/db/ActivityRefreshShop.ts new file mode 100644 index 000000000..ea164fbea --- /dev/null +++ b/shared/db/ActivityRefreshShop.ts @@ -0,0 +1,56 @@ +import BaseModel from './BaseModel'; +import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose'; + + +/** + * 购买记录 +*/ + +export class BuyRecord { + @prop({ required: true }) + pageIndex: number; //第几页 + @prop({ required: true }) + id: number; //物品id标识 + @prop({ required: true }) + time: Date; //购买时间 +} + + +/** + * 活动系统 - 新手限定、每日限购、每周限购 +*/ +@index({ roleId: 1 }) + +export default class Activity_Refresh_Shop extends BaseModel { + @prop({ required: true }) + activityId: number; // 活动Id + @prop({ required: true }) + roleId: string; // 用户Id + @prop({ required: true }) + roundIndex: number; // 第几个周期，从1开始 + @prop({ required: true }) + records: BuyRecord[]; // 购买记录 + + //购买领取奖励的记录 + public static async addRecord(activityId: number, roleId: string, roundIndex: number, pageIndex: number, id: number) { + let result: ActivityRefreshShopModelType = await ActivityRefreshShopModel.findOneAndUpdate({ roleId, activityId, roundIndex }, + { $push: { records: { pageIndex, id, time: new Date() } } }, { upsert: true, new: true }).lean(true); + return result; + } + + //根据活动id查询活动数据 + public static async findData(activityId: number, roleId: string, roundIndex: number) { + let result: ActivityRefreshShopModelType = await ActivityRefreshShopModel.findOne({ roleId, activityId, roundIndex }).lean(true); + return result; + } + + //删除活动领取记录 + public static async deleteActivity(activityId: number, roleId: string, roundIndex: number) { + await ActivityRefreshShopModel.deleteMany({ roleId, activityId, roundIndex }); + } +} + +export const ActivityRefreshShopModel = getModelForClass(Activity_Refresh_Shop); + +export interface ActivityRefreshShopModelType extends Pick, keyof Activity_Refresh_Shop> { } +export type ActivityRefreshShopModelTypeParam = Partial; // 将所有字段变成可选项 \ No newline at end of file diff --git a/shared/db/ActivityRefreshTask.ts b/shared/db/ActivityRefreshTask.ts new file mode 100644 index 000000000..8da1f8498 --- /dev/null +++ b/shared/db/ActivityRefreshTask.ts @@ -0,0 +1,81 @@ +import BaseModel from './BaseModel'; +import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose'; + +/** + * 活动系统 - 通用的刷新任务（分页，可刷新，限制领取次数） +*/ +@index({ roleId: 1 }) + +export default class Activity_Refresh_Task extends BaseModel { + @prop({ required: true }) + serverId: number; // 服id + @prop({ required: true }) + activityId: number; // 活动Id + @prop({ required: true }) + roleId: string; // 用户Id + @prop({ required: true }) + roundIndex: number; // 周期数 + @prop({ required: true }) + pageIndex: number; // 第几页 + @prop({ required: true }) + id: number; // id + @prop({ required: true }) + type: number; // 任务类型 + @prop({ required: true }) + totalCount: number; // 累计达成次数 + @prop({ required: true }) + receiveRewardCount: number; // 领取奖励次数 + @prop({ required: true }) + data: string; // 数据信息 + + //任务领取记录 + public static async addReceiveRecord(serverId: number, activityId: number, roleId: string, roundIndex: number, pageIndex: number, id: number, type: number, count: number) { + let result: ActivityRefreshTaskModelType = await ActivityRefreshTaskModel.findOneAndUpdate({ serverId, roleId, activityId, roundIndex, pageIndex, id, type }, + { $inc: { receiveRewardCount: count } }, { upsert: true, new: true }).lean(true); + return result; + } + + //根据活动统计完成任务次数 + public static async setTaskCount(serverId: number, activityId: number, roleId: string, roundIndex: number, pageIndex: number, id: number, type: number, count: number, lean = true) { + let result: ActivityRefreshTaskModelType = await ActivityRefreshTaskModel.findOneAndUpdate({ serverId, roleId, activityId, roundIndex, pageIndex, id, type }, + { $set: { totalCount: count } }, { upsert: true, new: true }).lean(lean); + return result; + } + + //根据活动统计完成任务次数 + public static async addTaskCount(serverId: number, activityId: number, roleId: string, roundIndex: number, pageIndex: number, id: number, type: number, addCount: number, lean = true) { + let result: ActivityRefreshTaskModelType = await ActivityRefreshTaskModel.findOneAndUpdate({ serverId, roleId, activityId, roundIndex, pageIndex, id, type }, + { $inc: { totalCount: addCount } }, { upsert: true, new: true }).lean(lean); + return result; + } + + //根据活动记录统计数据 + public static async addTaskRecord(serverId: number, activityId: number, roleId: string, roundIndex: number, pageIndex: number, id: number, type: number, data: string,) { + let result: ActivityRefreshTaskModelType = await ActivityRefreshTaskModel.findOneAndUpdate({ serverId, roleId, activityId, roundIndex, pageIndex, id, type }, + { $set: { data: data } }, { upsert: true, new: true }).lean(true); + return result; + } + + + //根据活动id查询活动数据 + public static async findData(serverId: number, activityId: number, roleId: string, roundIndex: number,) { + let result: ActivityRefreshTaskModelType[] = await ActivityRefreshTaskModel.find({ serverId, roleId, activityId, roundIndex }).lean(true); + return result; + } + + //查询活动数据 + public static async findDataById(serverId: number, activityId: number, roleId: string, roundIndex: number, pageIndex: number, id: number, type: number) { + let result: ActivityRefreshTaskModelType = await ActivityRefreshTaskModel.findOne({ serverId, roleId, activityId, roundIndex, pageIndex, id, type }).lean(true); + return result; + } + + //删除活动领取记录 + public static async deleteActivity(serverId: number, activityId: number, roleId: string, roundIndex: number) { + await ActivityRefreshTaskModel.deleteMany({ serverId, roleId, activityId, roundIndex }); + } +} + +export const ActivityRefreshTaskModel = getModelForClass(Activity_Refresh_Task); + +export interface ActivityRefreshTaskModelType extends Pick, keyof Activity_Refresh_Task> { } +export type ActivityRefreshTaskModelTypeParam = Partial; // 将所有字段变成可选项 \ No newline at end of file diff --git a/shared/domain/activityField/limitShopField.ts b/shared/domain/activityField/limitShopField.ts index 1a2ab135f..10bf9f7b0 100644 --- a/shared/domain/activityField/limitShopField.ts +++ b/shared/domain/activityField/limitShopField.ts @@ -6,7 +6,7 @@ import { ActivityBase } from './activityField'; // 每个商品的内容 export class ShopItem { - id: number; // 商品id + id: number; // 商品id，不能重复 reward: string; //任务奖励，格式:1&3&1(类型&id&数量) 类型定义:1.英雄，2.物品 countMax: number = 0; //可购买的最大次数，0表示不限制 name: string; //名字 diff --git a/shared/domain/activityField/refreshShopField.ts b/shared/domain/activityField/refreshShopField.ts new file mode 100644 index 000000000..d8b8218ac --- /dev/null +++ b/shared/domain/activityField/refreshShopField.ts @@ -0,0 +1,118 @@ +import moment = require('moment'); +import { REFRESH_TIME } from '../../consts'; +import { ActivityModelType } from '../../db/Activity'; +import { ActivityRefreshShopModelType } from '../../db/ActivityRefreshShop'; +import { ActivityBase } from './activityField'; + +// 每个商品的内容 +export class RefreshShopItem { + id: number; // 商品id + reward: string; //任务奖励，格式:1&3&1(类型&id&数量) 类型定义:1.英雄，2.物品 + countMax: number = 0; //可购买的最大次数，0表示不限制 + name: string; //名字 + price: number; //价格 + productID: string; //商品id + consume: string; //消耗 + imageName: string; + discount: number; //折扣 + pageIndex: number; // 第几页 + + buyCount: number = 0; //购买过的次数 + + constructor(data: any, pageIndex: number) { + this.pageIndex = pageIndex; + this.id = data.id; + this.reward = data.reward; + this.countMax = data.countMax; + this.name = data.name; + this.price = data.price; + this.productID = data.productID; + this.imageName = data.imageName; + this.discount = data.discount ? data.discount : 0; + this.consume = data.consume ? data.consume : ''; + this.buyCount = 0; + } +} + + +// 每个商品的内容 +export class RefreshShopPage { + pageIndex: number; // 第几页 + name: string; //名字 + items: Array = [];//商品列表 + constructor(data: any) { + this.pageIndex = data.pageIndex; + this.name = data.name; + for (let item of data.items) { + this.items.push(new RefreshShopItem(item, data.pageIndex)) + } + } +} + +// 商店数据 +export class RefreshShopData extends ActivityBase { + name: string = '';//活动名称 + interval: number = 0;//周期间隔（秒） + list: Array = [];//商品列表 + nextRefreshTime: number;//下次刷新时间 + roundIndex: number = 1;//周期数从1开始 + + public findItemByProductID(productID: string) { + for (let pageData of this.list) { + let index = pageData.items.findIndex(obj => { return obj && obj.productID === productID }); + if (index != -1) { + this.list[index] + } + } + return null; + } + + public findItem(id: number, pageIndex: number) { + let index = this.list.findIndex(obj => { return obj && obj.pageIndex === pageIndex }); + if (index != -1) { + let itemIndex = this.list[index].items.findIndex(obj => { return obj && obj.id == id }); + if (itemIndex != -1) { + return this.list[index].items[itemIndex]; + } + } + return null + } + + //解析玩家购买记录 + public setPlayerRecords(data: ActivityRefreshShopModelType) { + if (!data) { + return; + } + let records = data.records ? data.records : []; + for (let pageData of this.list) { + for (let item of pageData.items) { + let buyRecords = records.filter(obj => { return obj && obj.id === item.id && obj.pageIndex == pageData.pageIndex }); + item.buyCount = buyRecords.length; + } + } + } + + + public initData(data: string) { + this.nextRefreshTime = this.endTime; + let dataObj = JSON.parse(data); + this.name = dataObj.name; + this.interval = dataObj.interval; + + this.beginTime = moment(this.beginTime).startOf('d').add(REFRESH_TIME, 'hour').valueOf(); + if (this.interval > 0) { + this.roundIndex = Math.ceil((moment(new Date).valueOf() - this.beginTime) / (this.interval * 1000)); + this.nextRefreshTime = moment(this.beginTime).add(this.interval * this.roundIndex, 'second').valueOf(); + } + console.log(moment(new Date).valueOf(), moment(this.beginTime).valueOf(), this.roundIndex,) + let arr = dataObj.data; + for (let obj of arr) { + this.list.push(new RefreshShopPage(obj)) + } + } + + constructor(activityData: ActivityModelType) { + super(activityData) + this.initData(activityData.data) + } +} \ No newline at end of file diff --git a/shared/domain/activityField/refreshTaskField.ts b/shared/domain/activityField/refreshTaskField.ts new file mode 100644 index 000000000..772f08353 --- /dev/null +++ b/shared/domain/activityField/refreshTaskField.ts @@ -0,0 +1,113 @@ +import moment = require('moment'); +import { REFRESH_TIME, TASK_TYPE } from '../../consts'; +import { ActivityModelType } from '../../db/Activity'; +import { ActivityRefreshTaskModelType } from '../../db/ActivityRefreshTask'; +import { ActivityBase } from './activityField'; + + +// 任务配置数据 +export class RefreshTaskItem { + pageIndex: number; // 第几页 + id: number; // id + name: string; // 任务名称 + taskType: number; // 任务类型 dic_zyz_taskType.json + taskParam: string; //任务数据 dic_zyz_taskType.json + condition: number; //任务数据条件 dic_zyz_taskType.jsonT + reward: string; // 任务奖励，格式:1&3&1(类型&id&数量) 类型定义:1.英雄，2.物品 + + totalCount: number = 0; //完成任务累计次数 + receiveRewardCount: number = 0; //领取奖励次数 + + constructor(data: any, pageIndex: number) { + this.pageIndex = pageIndex; + this.id = data.id; + this.name = data.name; + this.taskType = data.taskType; + this.taskParam = data.taskParam; + this.condition = data.condition; + this.reward = data.reward; + this.totalCount = 0; + this.receiveRewardCount = 0; + } +} + +// 任务配置数据 +export class RefreshTaskPage { + pageIndex: number; // 第几页 + name: string; // 任务名称 + items: Array = []; + + constructor(data: any) { + this.pageIndex = data.pageIndex; + this.name = data.name; + this.items = []; + for (let obj of data.items) { + this.items.push(new RefreshTaskItem(obj, data.pageIndex)) + } + } +} + +// 任务活动数据 +export class RefreshTaskData extends ActivityBase { + name: string = '';//活动名称 + interval: number = 0;//周期间隔（秒） + list: Array = []; + nextRefreshTime: number;//下次刷新时间 + roundIndex: number = 1;//周期数从1开始 + + public findItem(pageIndex: number, id: number, type: TASK_TYPE) { + let index = this.list.findIndex(obj => { return obj && obj.pageIndex === pageIndex }); + if (index != -1) { + let itemIndex = this.list[index].items.findIndex(obj => { return obj && obj.id == id && obj.taskType == type }); + if (itemIndex != -1) { + return this.list[index].items[itemIndex]; + } + } + return null + } + + public findTaskByType(type: TASK_TYPE) { + let arr = []; + for (let pageData of this.list) { + let items = pageData.items.filter(item => { return item.taskType == type }); + arr = arr.concat(items) + } + return arr; + } + + //解析玩家领取记录 + public setPlayerRecords(data: ActivityRefreshTaskModelType[]) { + for (let pageData of this.list) { + for (let item of pageData.items) { + let index = data.findIndex(record => { return item.id == record.id && item.pageIndex == record.pageIndex && item.taskType == record.type }) + if (index != -1) { + item.totalCount = data[index].totalCount ? data[index].totalCount : 0; + item.receiveRewardCount = data[index].receiveRewardCount ? data[index].receiveRewardCount : 0; + } + } + } + } + + public initData(data: string) { + this.nextRefreshTime = this.endTime; + let dataObj = JSON.parse(data); + this.name = dataObj.name; + this.interval = dataObj.interval; + + this.beginTime = moment(this.beginTime).startOf('d').add(REFRESH_TIME, 'hour').valueOf(); + if (this.interval > 0) { + this.roundIndex = Math.ceil((moment(new Date).valueOf() - this.beginTime) / (this.interval * 1000)); + this.nextRefreshTime = moment(this.beginTime).add(this.interval * this.roundIndex, 'second').valueOf(); + } + console.log(moment(new Date).valueOf(), moment(this.beginTime).valueOf(), this.roundIndex,) + let arr = dataObj.data; + for (let obj of arr) { + this.list.push(new RefreshTaskPage(obj)) + } + } + + constructor(activityData: ActivityModelType) { + super(activityData) + this.initData(activityData.data) + } +} \ No newline at end of file diff --git a/shared/pubUtils/taskUtil.ts b/shared/pubUtils/taskUtil.ts index 00a1173fc..95895e9a3 100644 --- a/shared/pubUtils/taskUtil.ts +++ b/shared/pubUtils/taskUtil.ts @@ -29,6 +29,8 @@ import { ActivityPopUpShopRecordModel, ActivityPopUpShopRecordModelType } from ' import { SevenDaysData } from '../domain/activityField/sevenDaysField'; import moment = require("moment"); import { GuildModel } from '../db/Guild'; +import { RefreshTaskData } from '../domain/activityField/refreshTaskField'; +import { ActivityRefreshTaskModel } from '../db/ActivityRefreshTask'; @@ -645,6 +647,36 @@ export async function accomplishTask(serverId: number, roleId: string, taskType: } } + //刷新任务统计 + allActivity = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.REFRESH_TASK, new Date()); + for (let activity of allActivity) { + let taskActivity = new RefreshTaskData(activity); + let taskArray = taskActivity.findTaskByType(taskType); + for (let task of taskArray) { + let taskRecord = await ActivityRefreshTaskModel.findDataById(serverId, taskActivity.activityId, roleId, taskActivity.roundIndex, task.pageIndex, task.id, task.taskType) + let recordData = taskRecord && taskRecord.data ? JSON.parse(taskRecord.data) : null + let { addCount, record } = isComplete(roleId, task.taskType, task.taskParam, count, parma, recordData); + if (addCount) { + if (taskType == TASK_TYPE.ROLE_LV || taskType == TASK_TYPE.ROLE_TITLE || taskType == TASK_TYPE.BATTLE_TOWER_LV) { + let playerRecord = await ActivityRefreshTaskModel.setTaskCount(serverId, taskActivity.activityId, roleId, taskActivity.roundIndex, task.pageIndex, task.id, task.taskType, addCount); + //推送 + task.totalCount = playerRecord.totalCount; + task.receiveRewardCount = playerRecord.receiveRewardCount ? playerRecord.receiveRewardCount : 0; + pushMessage = pushMessage.concat(Object.assign(task, { activityId: taskActivity.activityId })); + } else { + let playerRecord = await ActivityRefreshTaskModel.addTaskCount(serverId, taskActivity.activityId, roleId, taskActivity.roundIndex, task.pageIndex, task.id, task.taskType, addCount); + //推送 + task.totalCount = playerRecord.totalCount; + task.receiveRewardCount = playerRecord.receiveRewardCount ? playerRecord.receiveRewardCount : 0; + pushMessage = pushMessage.concat(Object.assign(task, { activityId: taskActivity.activityId })); + } + } + if (record) { + await ActivityRefreshTaskModel.addTaskRecord(serverId, taskActivity.activityId, roleId, taskActivity.roundIndex, task.pageIndex, task.id, task.taskType, JSON.stringify(record)); + } + } + } + //寻宝骑兵活动任务 let tempData: ServerTempModelType = await ServerTempModel.findData(serverId); if (tempData) {