xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/backend

Browse Source 
# Conflicts:
#	game-server/app/servers/connector/filter/global.ts
This commit is contained in:
luying
2021-12-03 18:36:39 +08:00
parent 11bba498ce 5bd6eb573c
commit b505381fa9
25 changed files with 3682 additions and 1674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
shared/db/ActivityDailyCoin.ts
View File

@@ -13,8 +13,8 @@ export default class Activity_Daily_Coin extends BaseModel {
activityId: number; // 活动Id
@prop({ required: true })
roleId: string; // 用户Id
@prop({ required: true })
beginTime: number; // 开始统计的时间
// @prop({ required: true })
// beginTime: number; // 开始统计的时间
@prop({ required: true })
exchangeCount: number; // 兑换次数
@prop({ required: true })
@@ -22,26 +22,28 @@ export default class Activity_Daily_Coin extends BaseModel {
@prop({ required: true })
recordMsg: string[]; // 兑换记录 exchangeCount&cointCount
@prop({ required: true })
roundIndex: number; // 周期数
//兑换记录
public static async addExchangeRecord(serverId: number, activityId: number, roleId: string, beginTime: number, count: number, coinCount: number, msg: string) {
let result = await ActivityDailyCoinModel.findOneAndUpdate({ serverId, activityId, roleId, beginTime },
public static async addExchangeRecord(serverId: number, activityId: number, roleId: string, roundIndex: number, count: number, coinCount: number, msg: string) {
let result = await ActivityDailyCoinModel.findOneAndUpdate({ serverId, activityId, roleId, roundIndex },
{ $inc: { exchangeCount: count, coinCount: coinCount }, $push: { recordMsg: msg } }, { upsert: true, new: true }).lean(true)
return result;
}
//根据活动时间查询活动数据
public static async findData(serverId: number, activityId: number, roleId: string, beginTime: number) {
public static async findData(serverId: number, activityId: number, roleId: string, roundIndex: number) {
let result: ActivityDailyCoinModelType = await ActivityDailyCoinModel.findOne({
serverId, roleId, activityId, beginTime,
serverId, roleId, activityId, roundIndex,
}).lean(true);
return result;
}
//删除活动兑换记录
public static async deleteActivity(serverId: number, activityId: number, roleId: string, beginTime: number) {
await ActivityDailyCoinModel.deleteMany({ serverId, roleId, activityId, beginTime });
public static async deleteActivity(serverId: number, activityId: number, roleId: string, roundIndex: number) {
await ActivityDailyCoinModel.deleteMany({ serverId, roleId, activityId, roundIndex });
}
}

13
shared/db/ActivityDailyMeal.ts
View File

@@ -17,26 +17,31 @@ export default class Activity_Daily_Meal extends BaseModel {
receiveTime: number; // 领取时间
@prop({ required: true })
type: number; // 1午餐、2晚餐类型
@prop({ required: true })
roundIndex: number; // 周期数
//领取记录
public static async addReceiveRecord(serverId: number, activityId: number, roleId: string, type: number, receiveTime: number) {
public static async addReceiveRecord(serverId: number, activityId: number, roleId: string, type: number, receiveTime: number, roundIndex: number) {
await ActivityDailyMealModel.insertMany([
{
serverId,
activityId,
roleId,
receiveTime,
type
type,
roundIndex,
}
])
}
//根据活动时间查询活动数据
public static async findData(serverId: number, activityId: number, roleId: string, type: number, beginTime: number, endTime: number) {
public static async findData(serverId: number, activityId: number, roleId: string, type: number, roundIndex: number) {
let result: ActivityDailyMealModelType[] = await ActivityDailyMealModel.find({
serverId, roleId, activityId, type,
receiveTime: { $gt: beginTime, $lt: endTime }
roundIndex: roundIndex,
}).lean(true);
return result;
}