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

🐞 fix(军团活动): 粮草先行加入时可能会多出数据

Browse Source
This commit is contained in:
luying
2023-05-30 17:24:19 +08:00
parent 38cfa5c5b5
commit 3fa6074365
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
game-server/app/servers/guild/handler/raceActivityHandler.ts
View File

@@ -116,7 +116,7 @@ export class RaceActivityHandler {
let myGuild = await UserGuildModel.getMyGuild(roleId, 'job');
let woodenHorse = await obj.joinWoodenHorse(guildCode, roleId, roleName, serverId, sid, myGuild.job, myGuildActivityRec.code);
if (!woodenHorse) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
await GuildActivityRecordModel.join(guildCode, serverId, this.aid, joinIndex, { roleId, roleName, job: myGuild.job, code: myGuildActivityRec.code });
await GuildActivityRecordModel.join(guildCode, this.aid, joinIndex, { roleId, roleName, job: myGuild.job, code: myGuildActivityRec.code });
let events = obj.getEvents(guildCode, woodenHorse.distance);
await sendMessageToGuildWithSuc(guildCode, PUSH_ROUTE.GUILD_RACE_JOIN, { timestamp: Date.now(), woodenHorse });

8
shared/db/GuildActivityRec.ts
View File

@@ -97,7 +97,7 @@ export default class GuildActivityRecord extends BaseModel {
public static async pushEvent(guildCode: string, aid: number, index: number, event: Event) {
let rec: GuildActivityRecordType = await GuildActivityRecordModel.findOneAndUpdate(
{ guildCode, index, aid, status: 1 },
{ $push: { events: event }, $setOnInsert: { code: genCode(10) } }, { new: true, upsert: true }).lean();
{ $push: { events: event }, $setOnInsert: { code: genCode(10), auctionType: aid + 1 } }, { new: true, upsert: true }).lean();
return rec;
}
@@ -106,10 +106,10 @@ export default class GuildActivityRecord extends BaseModel {
return rec;
}
public static async join(guildCode: string, serverId: number, aid: number, index: number, member: JoinMember) {
public static async join(guildCode: string, aid: number, index: number, member: JoinMember) {
let rec: GuildActivityRecordType = await GuildActivityRecordModel.findOneAndUpdate(
{ guildCode, serverId, index, aid, status: 1 },
{ $push: { joinMember: member }, $setOnInsert: { code: genCode(10) } }, { new: true, upsert: true }).lean();
{ guildCode, index, aid, status: 1 },
{ $push: { joinMember: member }, $setOnInsert: { code: genCode(10), auctionType: aid + 1 } }, { new: true, upsert: true }).lean();
return rec;
}