From ddf8ae3d127b6cd690bd6781e60e89dd1a9af31e Mon Sep 17 00:00:00 2001 From: luying Date: Fri, 29 Oct 2021 16:36:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=9B=E5=9B=A2=E6=B4=BB=E5=8A=A8=EF=BC=9A?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/servers/guild/handler/gateActivityHandler.ts | 2 +- .../app/servers/guild/handler/raceActivityHandler.ts | 4 ++-- game-server/app/services/guildActivityService.ts | 6 +++--- shared/db/GuildActivityRec.ts | 8 ++++---- shared/pubUtils/dicParam.ts | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/game-server/app/servers/guild/handler/gateActivityHandler.ts b/game-server/app/servers/guild/handler/gateActivityHandler.ts index a2a63451b..737492cc3 100644 --- a/game-server/app/servers/guild/handler/gateActivityHandler.ts +++ b/game-server/app/servers/guild/handler/gateActivityHandler.ts @@ -374,7 +374,7 @@ export class GateActivityHandler { let { aid } = msg; await GuildActivityRecordModel.getRecord(guildCode, serverId, aid); let userGuild = await UserGuildModel.getMyGuild(roleId); - let result = await GuildActivityRecordModel.updateInfo(guildCode, { memberCnt: 1, members: [{ roleId, job: userGuild.job }], auctionType: aid + 1 }); + let result = await GuildActivityRecordModel.updateInfo(guildCode, aid, { memberCnt: 1, members: [{ roleId, job: userGuild.job }], auctionType: aid + 1 }); return resResult(STATUS.SUCCESS, { sourceType: result.auctionType, diff --git a/game-server/app/servers/guild/handler/raceActivityHandler.ts b/game-server/app/servers/guild/handler/raceActivityHandler.ts index 9dc1852d8..af73bd93c 100644 --- a/game-server/app/servers/guild/handler/raceActivityHandler.ts +++ b/game-server/app/servers/guild/handler/raceActivityHandler.ts @@ -146,7 +146,7 @@ export class RaceActivityHandler { let event = await obj.useItem(roleId, sid, guildCode, toGuild, id, count); if (!event) return resResult(STATUS.BATTLE_CONSUMES_NOT_ENOUGH); - await GuildActivityRecordModel.pushEvent(guildCode, event); + await GuildActivityRecordModel.pushEvent(guildCode, this.aid, event); return resResult(STATUS.SUCCESS, { timestamp: Date.now(), @@ -172,7 +172,7 @@ export class RaceActivityHandler { let hasShow = !!myGuildActivityRec.hasShow; if(!hasShow) { - await UserGuildActivityRecModel.updateInfo(guildCode, { hasShow: true }); + await UserGuildActivityRecModel.updateInfo(code, { hasShow: true }); } // 返回当前军团总军功 diff --git a/game-server/app/services/guildActivityService.ts b/game-server/app/services/guildActivityService.ts index 7ed3fe132..d06288b6c 100644 --- a/game-server/app/services/guildActivityService.ts +++ b/game-server/app/services/guildActivityService.ts @@ -392,7 +392,7 @@ export async function gateActivitySettleReward(guildCode: string, serverId: numb let rewards = getGuildAuctionRewards(GUILD_ACTIVITY_TYPE.GATE_ACTIVITY, rank); - let rec = await GuildActivityRecordModel.updateInfo(guildCode, { + let rec = await GuildActivityRecordModel.updateInfo(guildCode, GUILD_ACTIVITY_TYPE.GATE_ACTIVITY, { isSuccess: gateHp > 0, isCompleted: true, rank, score: guildScore, remainGateHp: gateHp, @@ -456,7 +456,7 @@ export async function cityActivitySettleReward(cityId: number, serverId: number) let rewards = getGuildAuctionRewards(GUILD_ACTIVITY_TYPE.CITY_ACTIVITY, guildRank); let members = obj.getMembersOfGuild(guildCode); - let rec = await GuildActivityRecordModel.updateInfo(guildCode, { + let rec = await GuildActivityRecordModel.updateInfo(guildCode, GUILD_ACTIVITY_TYPE.CITY_ACTIVITY, { memberCnt: members.length, members, isSuccess, isCompleted: true, rank: guildRank, damage: num, remainGateHp: gateHp, @@ -699,7 +699,7 @@ export async function raceActivitySettleReward(guildCode: string, woodenHorse: W let members = obj.getMembersOfGuild(guildCode); let rewards = getGuildAuctionRewards(GUILD_ACTIVITY_TYPE.RACE_ACTIVITY, myGuildRank); - let rec = await GuildActivityRecordModel.updateInfo(guildCode, { + let rec = await GuildActivityRecordModel.updateInfo(guildCode, GUILD_ACTIVITY_TYPE.RACE_ACTIVITY, { memberCnt: members.length, members, isSuccess, isCompleted: true, rank: myGuildRank, rewards: rewards.map(cur => cur.goods), diff --git a/shared/db/GuildActivityRec.ts b/shared/db/GuildActivityRec.ts index 5a1596f14..05a9aa6c0 100644 --- a/shared/db/GuildActivityRec.ts +++ b/shared/db/GuildActivityRec.ts @@ -77,11 +77,11 @@ export default class GuildActivityRecord extends BaseModel { return rec; } - public static async updateInfo(guildCode: string, update: GuildActivityRecordUpdateParam) { + public static async updateInfo(guildCode: string, aid: number, update: GuildActivityRecordUpdateParam) { let today = getZeroPointD(); let rec: GuildActivityRecordType = await GuildActivityRecordModel.findOneAndUpdate( - { guildCode, createdAt: { $gte: today } }, + { guildCode, aid, createdAt: { $gte: today }, status: 1 }, { $set: update }, { new: true }).lean(); return rec; } @@ -95,11 +95,11 @@ export default class GuildActivityRecord extends BaseModel { return rec; } - public static async pushEvent(guildCode: string, event: Event) { + public static async pushEvent(guildCode: string, aid: number, event: Event) { let today = getZeroPointD(); let rec: GuildActivityRecordType = await GuildActivityRecordModel.findOneAndUpdate( - { guildCode, createdAt: { $gte: today } }, + { guildCode, createdAt: { $gte: today }, aid, status: 1 }, { $push: { events: event } }, { new: true }).lean(); return rec; } diff --git a/shared/pubUtils/dicParam.ts b/shared/pubUtils/dicParam.ts index 8ed387c3e..628483576 100644 --- a/shared/pubUtils/dicParam.ts +++ b/shared/pubUtils/dicParam.ts @@ -110,7 +110,7 @@ export const GUILDACTIVITY = { RACEACTIVITY_NORMAL_ITEMS: '1&8&15|3&5&10|5&0&1', // 粮草先行普通道具 RACEACTIVITY_EVENT_MEMBERCNT: 3, // 粮草先行随机道具获得人数 RACEACTIVITY_EVENT_ITEMS: '2&1|4&1|6&1', // 粮草先行根据事件随机人可获得道具 - RACE_INIT_SPEED: 2, // 粮草先行军团初始速度 + RACE_INIT_SPEED: 20, // 粮草先行军团初始速度 RACE_PER_SPEED: 0.1, // 粮草先行军团每人参加增速 }; export const GUILD_AUCTION = {