巅峰演武：赛季优化修改

game-server/app/services/connectorService.ts

@@ -48,6 +48,7 @@ import { ComBattleTeamModel } from '../db/ComBattleTeam';
 import { INFO_WINDOW } from '../pubUtils/dicParam';
 import { getLadderData } from './ladderService';
 import { dispatch } from '../pubUtils/dispatcher';
+import { PvpDataReturn } from '../domain/battleField/pvp';
 
 /**
  * init: 初始的时候是否推送 true-推 false-不推
@@ -260,11 +261,17 @@ async function getPvpEntryData(roleId: string) {
         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);
+        result.setPvpDefense(pvpDefense);
+        result.calHasSaveDefense();
         let refChallengeObj = await refChallengeCnt(pvpDefense.challengeCnt, pvpDefense.challengeRefTime, seasonEndTime, roleId);
         let { challengeCnt } = refChallengeObj;
-        let { receivedBox, score, seasonWinNum } = pvpDefense;
-
-        return { challengeCnt, score, seasonWinNum, receivedBox, seasonNum, seasonEndTime }
+        result.setChallengeCnt(challengeCnt);
+        return pick(result, ['challengeCnt', 'score', 'seasonWinNum', 'receivedBox', 'hasSaveDefense', 'seasonNum', 'seasonEndTime', 'seasonStartTime', 'seasonRewardTime'])
     } else {
         return null
     }