diff --git a/game-server/app/services/guildActivityObjService.ts b/game-server/app/services/guildActivityObjService.ts index 7d38951f2..5480007fe 100644 --- a/game-server/app/services/guildActivityObjService.ts +++ b/game-server/app/services/guildActivityObjService.ts @@ -273,7 +273,7 @@ export class RaceActivityObject { await r.setExpire(tomorrow); if (needSendEnd) { // 抵达后发送奖励,发送消息,结算 - await sendSingleRaceActEndMsg(guildCode, this.woodenHorses); + await sendSingleRaceActEndMsg(guildCode, woodenHorse); } } this.handleItemsByWoodenHorse(woodenHorse); diff --git a/game-server/app/services/guildActivityService.ts b/game-server/app/services/guildActivityService.ts index b792eef0c..cce73ac6b 100644 --- a/game-server/app/services/guildActivityService.ts +++ b/game-server/app/services/guildActivityService.ts @@ -367,10 +367,10 @@ export async function sendSingleCityActEndMsg(cityId: number, serverId: number) * 单个军团抵达赛道之后给他发奖励 * @param guildCode 军团code */ -export async function sendSingleRaceActEndMsg(guildCode: string, woodenHorses: Map) { +export async function sendSingleRaceActEndMsg(guildCode: string, woodenHorse: WoodenHorse) { let chatSid = await getGuildChannelSid(guildCode); pinus.app.rpc.chat.guildRemote.sendGuildActivityEnd.toServer(chatSid, guildCode); - // await raceActivitySettleReward(guildCode, woodenHorse); + await raceActivitySettleReward(guildCode, woodenHorse); } diff --git a/shared/domain/battleField/guildActivity.ts b/shared/domain/battleField/guildActivity.ts index 0d2638186..549a8e0d0 100644 --- a/shared/domain/battleField/guildActivity.ts +++ b/shared/domain/battleField/guildActivity.ts @@ -119,16 +119,10 @@ export class WoodenHorse { if(this.durability <= 0) { this.status = RACE_ACTIVITY_STATUS.END; this.speed = 0; - return true } return false; } - public isOver() { - if(this.status == RACE_ACTIVITY_STATUS.END) return true; - return false - } - private calEvent(id: number, count: number = 1, endTime?: number) { let { effect } = gameData.raceActivityEvents.get(id);