From 83d13847945488d36249417b0cae584a65f7a95e Mon Sep 17 00:00:00 2001 From: luying Date: Wed, 19 Oct 2022 14:27:15 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(=E5=B7=85=E5=B3=B0=E6=BC=94?= =?UTF-8?q?=E6=AD=A6):=20=E5=BD=93=E6=B2=A1=E6=9C=89pvp=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E7=99=BB=E5=BD=95=E4=B9=9F=E8=BF=98=E6=98=AF?= =?UTF-8?q?=E4=B8=8B=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/services/connectorService.ts | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/game-server/app/services/connectorService.ts b/game-server/app/services/connectorService.ts index 0d3f8ecdd..a313a8fdb 100644 --- a/game-server/app/services/connectorService.ts +++ b/game-server/app/services/connectorService.ts @@ -256,13 +256,14 @@ async function getTowerEntryData(role: RoleType) { * @param roleId */ async function getPvpEntryData(roleId: string) { + let seasonNum: number = pinus.app.get('pvpSeasonNum'); + let seasonEndTime: number = pinus.app.get('pvpSeasonEndTime'); + let seasonStartTime: number = pinus.app.get('pvpSeasonStartTime'); + let seasonRewardTime: number = pinus.app.get('pvpSeasonRewardTime'); + let pvpDefense = await PvpDefenseModel.findByRoleId(roleId); if (pvpDefense) { pvpDefense = await sendLastSeasonRewardIfNotSent(pvpDefense); - let seasonNum: number = pinus.app.get('pvpSeasonNum'); - let seasonEndTime: number = pinus.app.get('pvpSeasonEndTime'); - let seasonStartTime: number = pinus.app.get('pvpSeasonStartTime'); - let seasonRewardTime: number = pinus.app.get('pvpSeasonRewardTime'); let result = new PvpDataReturn(); // 返回对象 result.setPvpConfig(seasonNum, seasonStartTime, seasonEndTime, seasonRewardTime); @@ -273,7 +274,9 @@ async function getPvpEntryData(roleId: string) { result.setChallengeCnt(challengeCnt); return pick(result, ['challengeCnt', 'score', 'seasonWinNum', 'receivedBox', 'hasSaveDefense', 'seasonNum', 'seasonEndTime', 'seasonStartTime', 'seasonRewardTime']) } else { - return null + let result = new PvpDataReturn(); // 返回对象 + result.setPvpConfig(seasonNum, seasonStartTime, seasonEndTime, seasonRewardTime); + return pick(result, ['seasonNum', 'seasonEndTime', 'seasonStartTime', 'seasonRewardTime']) } }