From 79293c5a4a7cbce2410f1c54631e9aa053562156 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Wed, 25 May 2022 10:03:53 +0800
Subject: [PATCH] =?UTF-8?q?pvp=EF=BC=9A=E5=B7=85=E5=B3=B0=E4=B9=8B?=
 =?UTF-8?q?=E8=B7=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/services/connectorService.ts | 10 ++++++----
 game-server/app/services/pvpService.ts       |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/game-server/app/services/connectorService.ts b/game-server/app/services/connectorService.ts
index 4f456cb57..ec1817114 100644
--- a/game-server/app/services/connectorService.ts
+++ b/game-server/app/services/connectorService.ts
@@ -35,7 +35,7 @@ import { getAllOnlineRoles, getAllServers } from './redisService';
 import Item, { ItemModel } from '../db/Item';
 import { PvpDefenseModel } from '../db/PvpDefense';
 import { getDonation } from './donateService';
-import { refChallengeCnt } from './pvpService';
+import { refChallengeCnt, sendLastSeasonRewardIfNotSent } from './pvpService';
 import { HeroModel } from '../db/Hero';
 import { JewelModel } from '../db/Jewel';
 import { SkinModel } from '../db/Skin';
@@ -248,12 +248,14 @@ async function getTowerEntryData(role: RoleType) {
 async function getPvpEntryData(roleId: string) {
     let pvpDefense = await PvpDefenseModel.findByRoleId(roleId);
     if (pvpDefense) {
-        let seasonEndTime = pinus.app.get('pvpSeasonEndTime');
+        pvpDefense = await sendLastSeasonRewardIfNotSent(pvpDefense);
+        let seasonNum: number = pinus.app.get('pvpSeasonNum');
+        let seasonEndTime: number = pinus.app.get('pvpSeasonEndTime');
         let refChallengeObj = await refChallengeCnt(pvpDefense.challengeCnt, pvpDefense.challengeRefTime, seasonEndTime, roleId);
         let { challengeCnt } = refChallengeObj;
-        let { receivedBox, score, hisScore } = pvpDefense;
+        let { receivedBox, score, seasonWinNum } = pvpDefense;
 
-        return { challengeCnt, score, hisScore, receivedBox }
+        return { challengeCnt, score, seasonWinNum, receivedBox, seasonNum, seasonEndTime }
     } else {
         return null
     }
diff --git a/game-server/app/services/pvpService.ts b/game-server/app/services/pvpService.ts
index c72b69ae3..cefab3f5d 100644
--- a/game-server/app/services/pvpService.ts
+++ b/game-server/app/services/pvpService.ts
@@ -387,7 +387,7 @@ export function getRobotAttribute(hid: number, posRatio: number, score: number)
 
 // 获取我方战报记录
 export async function generMyRecInfo(pvpDefense: PvpDefenseType, role: RoleType, isSuccess: boolean, pos: number, myHeroes: pvpEndParamInter[]) {
-    let { attack, defense, heroScores, winStreakNum, hisWinStreakNum = 0, score, hisScore, seasonWinNum } = pvpDefense;
+    let { attack, defense, heroScores, winStreakNum, hisWinStreakNum = 0, score, hisScore, seasonWinNum = 0 } = pvpDefense;
     let { roleId } = role;
     if (isSuccess) {
         winStreakNum ++;