From 297f0d6b8f25f53e552955466971657ab1dd5897 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Mon, 8 Nov 2021 15:52:53 +0800
Subject: [PATCH] =?UTF-8?q?pvp=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8roleId=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/services/pvpService.ts | 13 ++++++++-----
 shared/pubUtils/util.ts                |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/game-server/app/services/pvpService.ts b/game-server/app/services/pvpService.ts
index 829a2793e..2ae751b92 100644
--- a/game-server/app/services/pvpService.ts
+++ b/game-server/app/services/pvpService.ts
@@ -559,13 +559,13 @@ export async function sendPVPRewardToUser(pvpDefense: PvpDefenseType, seasonNum:
 
 async function resetPvpScores(pvpDefense: PvpDefenseType, seasonNum: number, pvpSeasonResult: PvpSeasonResultType) {
     let { roleId, attack, defense } = pvpDefense;
-    let { heroScores, score } = pvpSeasonResult;
+    let { newHeroScores, newScore } = pvpSeasonResult;
 
-    let newAttack = <Attack>calLineupScore(attack, heroScores);
-    let newDefense = <Defense>calLineupScore(defense, heroScores);
+    let newAttack = <Attack>calLineupScore(attack, newHeroScores);
+    let newDefense = <Defense>calLineupScore(defense, newHeroScores);
 
     pvpDefense = await PvpDefenseModel.updateInfoAndInclude(roleId, { 
-        heroScores, score, attack: newAttack, defense: newDefense,
+        heroScores: newHeroScores, score: newScore, attack: newAttack, defense: newDefense,
         seasonNum, challengeCnt: PVP.PVP_CHALLENGE_COUNTS, challengeRefTime: 0, winStreakNum: 0 
     });
     return pvpDefense;
@@ -599,8 +599,11 @@ export async function savePvpSeasonResult(pvpDefense: PvpDefenseType, seasonNum:
                     hid: heroScore.hid, id, count
                 });
             }
+            newScore += pvpHeroReward.heroscore;
+        } else {
+            newHeroScores.push(heroScore);
+            newScore += heroScore.score;
         }
-        newScore += heroScore.score;
     }
 
     //pvp锁定的信息存入赛季结算表中
diff --git a/shared/pubUtils/util.ts b/shared/pubUtils/util.ts
index be6a523fd..ead860d41 100644
--- a/shared/pubUtils/util.ts
+++ b/shared/pubUtils/util.ts
@@ -572,7 +572,7 @@ export function getChineseName() {
     return randomName.generate()
 }
 
-export function getRobotInfo(sysType = ROBOT_SYS_TYPE.COM_BTL) {
+export function getRobotInfo(sysType?: ROBOT_SYS_TYPE) {
     return {
         robotRoleName: getChineseName(),
         robotRoleId: makeRobotId(genCode(8), sysType),
@@ -585,7 +585,7 @@ export function checkRoleIsRobot(roleId: string) {
 }
 
 // 将一般的roleId转为带_r的
-export function makeRobotId(roleId: string, sysType = ROBOT_SYS_TYPE.COM_BTL) {
+export function makeRobotId(roleId: string, sysType?: ROBOT_SYS_TYPE) {
     if(sysType) {
         return `${sysType}|${roleId}_r`;
     } else {