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;