From a94e8aa0eaf1ac0722d74f2901b342af2c8d2df3 Mon Sep 17 00:00:00 2001 From: luying Date: Mon, 15 May 2023 17:29:59 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(=E5=86=9B=E5=9B=A2):=20?= =?UTF-8?q?=E7=BB=83=E5=85=B5=E5=9C=BA=E7=99=BB=E5=BD=95=E6=97=B6=E6=9C=89?= =?UTF-8?q?=E5=B9=B6=E5=8F=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/services/connectorService.ts | 1 + game-server/app/services/guildTrainService.ts | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/game-server/app/services/connectorService.ts b/game-server/app/services/connectorService.ts index f41967b5a..13463801c 100644 --- a/game-server/app/services/connectorService.ts +++ b/game-server/app/services/connectorService.ts @@ -182,6 +182,7 @@ export async function getModuleData(type: string, data: { role: RoleType, sessio case 'train': if (hasGuild) { let trainInstance = await getGuildTrainInstance(roleId, guild, userGuild); + if(!trainInstance) return null; let trainBoxRewards = await getTrainBoxRewardsResult(guildCode); return { trainInstance, trainBoxRewards } } diff --git a/game-server/app/services/guildTrainService.ts b/game-server/app/services/guildTrainService.ts index 14c60b061..ad3ed356d 100644 --- a/game-server/app/services/guildTrainService.ts +++ b/game-server/app/services/guildTrainService.ts @@ -283,9 +283,7 @@ export async function removeTrainRank(guildCode: string, roleId: string, trainId export async function getGuildTrainInstance(roleId: string, guild: GuildType, userGuild: UserGuildType) { let { trainId, trainLv, code } = guild; let guildTrain = await GuildTrainModel.findTrainByTrainIdNotLock(code, trainId); - if (!guildTrain) { - guildTrain = await unlockTrain(code, trainId); - } + if (!guildTrain) return null let { trainCount, trainRewards, buyTrainCount } = userGuild; let result: any = getGuildTrainInfo(guildTrain, roleId, trainCount, trainRewards); result.buyTrainCount = buyTrainCount || 0;