From 947077dbb4dd636cf386e2e977a68ea6c8722820 Mon Sep 17 00:00:00 2001
From: mamengke01 <794347210@qq.com>
Date: Fri, 15 Jan 2021 16:31:50 +0800
Subject: [PATCH] =?UTF-8?q?pvp=E6=88=98=E6=8A=A5=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/servers/battle/handler/pvpHandler.ts | 4 ++--
 shared/db/PvpRecord.ts                               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/game-server/app/servers/battle/handler/pvpHandler.ts b/game-server/app/servers/battle/handler/pvpHandler.ts
index dabd8b012..ee51dbdb0 100644
--- a/game-server/app/servers/battle/handler/pvpHandler.ts
+++ b/game-server/app/servers/battle/handler/pvpHandler.ts
@@ -122,9 +122,9 @@ export class PvpHandler {
             let {actorId, dataId, order} = cur;
             return { actorId, dataId, order }
         }), score, pLv, winStreakNum, refOppCnt, challengeCnt, challengeRefTime, receivedBox, hisScore, heroScores, isFirstEntry, isDefaultHero }
-        // if (show) {//是否弹出结算奖励
+        if (show) {//是否弹出结算奖励
             data.resultRecord = { oldSeasonData, heroGoods, rankGoods } 
-        // }
+        }
         return resResult(STATUS.SUCCESS, data);
     }
 
diff --git a/shared/db/PvpRecord.ts b/shared/db/PvpRecord.ts
index 2c03f4b21..b511cb505 100644
--- a/shared/db/PvpRecord.ts
+++ b/shared/db/PvpRecord.ts
@@ -88,7 +88,7 @@ export default class PvpRecord extends BaseModel {
 
     public static async getRecByRoleId( roleId: string, limit = 15, lean = true) {
         await this.delPvpRecords();
-        const result: PvpRecord[] = await PvpRecordModel.find({ $or:[{roleId1: roleId}, {roleId2: roleId}] }).limit(limit).sort({lt: -1}).lean(lean);
+        const result: PvpRecord[] = await PvpRecordModel.find({ $or:[{roleId1: roleId}, {roleId2: roleId}] }).limit(limit).sort({createTime: -1}).lean(lean);
         return result;
     }