活动：添加节日活动-刷新商店、刷新任务
This commit is contained in:
qiaoxin
@@ -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, // 通用的刷新任务（分页，可刷新，限制领取次数）
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
56
shared/db/ActivityRefreshShop.ts
Normal file
56
shared/db/ActivityRefreshShop.ts
Normal file
@@ -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<DocumentType<Activity_Refresh_Shop>, keyof Activity_Refresh_Shop> { }
|
||||
export type ActivityRefreshShopModelTypeParam = Partial<ActivityRefreshShopModelType>; // 将所有字段变成可选项
|
||||
81
shared/db/ActivityRefreshTask.ts
Normal file
81
shared/db/ActivityRefreshTask.ts
Normal file
@@ -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<DocumentType<Activity_Refresh_Task>, keyof Activity_Refresh_Task> { }
|
||||
export type ActivityRefreshTaskModelTypeParam = Partial<ActivityRefreshTaskModelType>; // 将所有字段变成可选项
|
||||
@@ -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; //名字
|
||||
|
||||
118
shared/domain/activityField/refreshShopField.ts
Normal file
118
shared/domain/activityField/refreshShopField.ts
Normal file
@@ -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<RefreshShopItem> = [];//商品列表
|
||||
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<RefreshShopPage> = [];//商品列表
|
||||
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)
|
||||
}
|
||||
}
|
||||
113
shared/domain/activityField/refreshTaskField.ts
Normal file
113
shared/domain/activityField/refreshTaskField.ts
Normal file
@@ -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<RefreshTaskItem> = [];
|
||||
|
||||
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<RefreshTaskPage> = [];
|
||||
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)
|
||||
}
|
||||
}
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user