diff --git a/game-server/app/servers/guild/handler/raceActivityHandler.ts b/game-server/app/servers/guild/handler/raceActivityHandler.ts index b633f952b..8c05c7576 100644 --- a/game-server/app/servers/guild/handler/raceActivityHandler.ts +++ b/game-server/app/servers/guild/handler/raceActivityHandler.ts @@ -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 }); diff --git a/shared/db/GuildActivityRec.ts b/shared/db/GuildActivityRec.ts index 15585609a..0dbd21d32 100644 --- a/shared/db/GuildActivityRec.ts +++ b/shared/db/GuildActivityRec.ts @@ -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; }