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

🐞 fix(辜月集会): 修改菜谱随机，修改游戏次数、购买次数均与菜谱无关

Browse Source
This commit is contained in:
zhangxk
2023-10-20 19:16:06 +08:00
parent 2bb5991770
commit 9644ea69c3
5 changed files with 131 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
shared/db/ActivityNovemberRec.ts
View File

@@ -18,17 +18,16 @@ export class NovemberRecord {
@prop({ required: true })
isSkip: boolean // 是否纯净召唤
@prop({ required: true })
menuId: number //菜单id
hasPass: boolean; // 是否通过
@prop({ required: true })
isPass: boolean // gameEnd后置为true
menuId: number //菜单id
}
export class NovemberBuyRec {
@prop({ required: true })
menuId: number //菜单id
@prop({ required: true })
buyCnt: number //购买次数
}
export default class Activity_November_Rec extends BaseModel {
@prop({ required: true })
@@ -43,8 +42,8 @@ export default class Activity_November_Rec extends BaseModel {
@prop({ required: true })
roleId: string; // 用户Id
@prop({ required: true, type: NovemberBuyRec, default: [], _id: false })
buyRec: NovemberBuyRec[] // 购买
@prop({ required: true })
buyCnt: number //购买次数
@prop({ required: true, type: NovemberRecord, _id: false })
records: NovemberRecord[]; // 记录
@@ -55,20 +54,18 @@ export default class Activity_November_Rec extends BaseModel {
}
public static async records(serverId: number, activityId: number, roundIndex: number, roleId: string, records: NovemberRecord[]) {
let result: ActivityNovemberRecModelType = await ActivityNovemberRecModel.findOneAndUpdate({ serverId, roleId, activityId, roundIndex }, { $push: { records: { $each: records } }, $setOnInsert: { buyRec: [] } }, { new: true, upsert: true }).lean();
let result: ActivityNovemberRecModelType = await ActivityNovemberRecModel.findOneAndUpdate({ serverId, roleId, activityId, roundIndex }, { $push: { records: { $each: records } }, $setOnInsert: { buyCnt: 0 } }, { new: true, upsert: true }).lean();
return result;
}
public static async gameEnd(serverId: number, activityId: number, roundIndex: number, roleId: string, gameCode: string, isSuccess: boolean, time: Date, rewards: string, isPass: boolean) {
public static async gameEnd(serverId: number, activityId: number, roundIndex: number, roleId: string, gameCode: string, isSuccess: boolean, time: Date, rewards: string, hasPass: boolean) {
let result: ActivityNovemberRecModelType = await ActivityNovemberRecModel.findOneAndUpdate({ serverId, roleId, activityId, roundIndex, 'records.gameCode': gameCode },
{ $set: { 'records.$.time': time, 'records.$.isSuccess': isSuccess, 'records.$.rewards': rewards, 'records.$.isPass': isPass } }, { new: true }).lean();
{ $set: { 'records.$.time': time, 'records.$.isSuccess': isSuccess, 'records.$.rewards': rewards, 'records.$.hasPass': hasPass } }, { new: true }).lean();
return result;
}
public static async buyCnt(serverId: number, activityId: number, roundIndex: number, roleId: string, buyRec: NovemberBuyRec, isPushBuyRec: boolean) {
let result: ActivityNovemberRecModelType;
if (isPushBuyRec) result = await ActivityNovemberRecModel.findOneAndUpdate({ serverId, roleId, activityId, roundIndex }, { $push: { buyRec } }, { new: true, upsert: true }).lean();
else result = await ActivityNovemberRecModel.findOneAndUpdate({ serverId, roleId, activityId, roundIndex, 'buyRec.menuId': buyRec.menuId }, { $inc: { 'buyRec.buyCnt': buyRec.buyCnt }, $setOnInsert: { records: [] } }, { new: true, upsert: true }).lean();
public static async buyCnt(serverId: number, activityId: number, roundIndex: number, roleId: string, count: number) {
let result: ActivityNovemberRecModelType = await ActivityNovemberRecModel.findOneAndUpdate({ serverId, roleId, activityId, roundIndex }, { $inc: { buyCnt: count }, $setOnInsert: { record: [] } }, { new: true, upsert: true }).lean();
return result;
}
}