From 16e2a18838c5ea8c5f494f3c3d151f4142500b18 Mon Sep 17 00:00:00 2001 From: luying Date: Thu, 10 Jun 2021 10:54:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=A2=E7=82=B9=EF=BC=9A=E4=BF=AE=E5=A4=8Dpv?= =?UTF-8?q?p=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/services/connectorService.ts | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/game-server/app/services/connectorService.ts b/game-server/app/services/connectorService.ts index d03d54182..429959b89 100644 --- a/game-server/app/services/connectorService.ts +++ b/game-server/app/services/connectorService.ts @@ -57,7 +57,9 @@ export async function pushData(role: RoleType, session: FrontendOrBackendSession for(let type of modules) { if(notIncludeModule.indexOf(type) == -1) { let data = await getModuleData(type, { role, session }, guildData); - pushEntryData(type, roleId, sid, data); + if(data) { + pushEntryData(type, roleId, sid, data); + } } } pushEntryEnd(roleId, sid); @@ -171,18 +173,14 @@ async function getTowerEntryData(role: RoleType) { * @param roleId */ async function getPvpEntryData(roleId: string) { - let pvpSeasonResult = await PvpSeasonResultModel.getPvpSeasonResult(roleId); - if(!pvpSeasonResult) return false; - - let { oldSeasonData, show} = pvpSeasonResult; - // 旧赛季结算的时候，会在pvpSeasonResult表中存上一赛季的时间，并更新show字段 - let hasSeasonReward = oldSeasonData.seasonEndTime <= nowSeconds() && show; let pvpDefense = await PvpDefenseModel.findByRoleIdIncludeAll(roleId); if(pvpDefense) { let { pvpDefense, } = await findPvpDefAllByRoleId(roleId); - let { challengeCnt, receivedBox, score } = pvpDefense; + let { challengeCnt, receivedBox, score, hisScore } = pvpDefense; - return { hasSeasonReward, challengeCnt, score, receivedBox } + return { challengeCnt, score, hisScore, receivedBox } + } else { + return null } }