From dd2ec76f8f2fc50aa1cd4a48f4a9ba2865445d3d Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Wed, 28 Apr 2021 12:02:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E5=8D=A1=EF=BC=9A=E7=A9=BA=E6=95=B0?=
 =?UTF-8?q?=E7=BB=84=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/servers/battle/handler/expeditionBattleHandler.ts     | 4 ++--
 game-server/app/servers/battle/handler/normalBattleHandler.ts | 4 ++--
 game-server/app/services/normalBattleService.ts               | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/game-server/app/servers/battle/handler/expeditionBattleHandler.ts b/game-server/app/servers/battle/handler/expeditionBattleHandler.ts
index bc0f43d0a..33ca4060b 100644
--- a/game-server/app/servers/battle/handler/expeditionBattleHandler.ts
+++ b/game-server/app/servers/battle/handler/expeditionBattleHandler.ts
@@ -147,7 +147,7 @@ export class ExpeditionBattleHandler {
      * 记录我军数据，生成战斗唯一表示，记录状态
      */
     async checkBattle(msg: { expeditionCode: string, expeditionId: number, battleId: number, heroes: Array<number>  }, session: BackendSession) {
-        const { expeditionCode, expeditionId, battleId, heroes: seqIds } = msg;
+        const { expeditionCode, expeditionId, battleId, heroes: seqIds = [] } = msg;
         let roleId = session.get('roleId');
         let roleName = session.get('roleName');
         let warInfo = getWarById(battleId);
@@ -208,7 +208,7 @@ export class ExpeditionBattleHandler {
      */
     async battleEnd(msg: { expeditionCode: string, expeditionId: number, battleCode: string, battleId: number, isSuccess: boolean, heroes: Array<{dataId: number, hp: number, ap: number}>, enemies: Array<{dataId: number, hp: number, ap: number}>, star: number }, session: BackendSession) {
 
-        const { expeditionCode, battleCode, battleId, expeditionId, isSuccess, heroes, star, enemies } = msg;
+        const { expeditionCode, battleCode, battleId, expeditionId, isSuccess, heroes = [], star, enemies } = msg;
         let roleId = session.get('roleId');
         let roleName = session.get('roleName');
         let sid = session.get('sid');
diff --git a/game-server/app/servers/battle/handler/normalBattleHandler.ts b/game-server/app/servers/battle/handler/normalBattleHandler.ts
index 248677320..de740f93d 100644
--- a/game-server/app/servers/battle/handler/normalBattleHandler.ts
+++ b/game-server/app/servers/battle/handler/normalBattleHandler.ts
@@ -32,7 +32,7 @@ export class NormalBattleHandler {
 
     // 获取关卡列表
     async checkBattle(msg: {battleId: number, heroes: Array<number> }, session: BackendSession) {
-        const { battleId, heroes: seqIds } = msg;
+        const { battleId, heroes: seqIds = [] } = msg;
         let roleId = session.get('roleId');
         let roleName = session.get('roleName');
         let warInfo = getWarById(battleId);
@@ -156,7 +156,7 @@ export class NormalBattleHandler {
 
     // 关卡结算，记录使用的武将，获得奖励
     async battleEnd(msg: {battleCode: string, battleId: number, isSuccess: boolean, star: number, heroes: Array<any>, }, session: BackendSession) {
-        const { battleCode, battleId, isSuccess, heroes, star } = msg;
+        const { battleCode, battleId, isSuccess, heroes = [], star } = msg;
         let roleId = session.get('roleId');
         let roleName = session.get('roleName');
         let sid = session.get('sid');
diff --git a/game-server/app/services/normalBattleService.ts b/game-server/app/services/normalBattleService.ts
index ba5b559b4..1105f7a11 100644
--- a/game-server/app/services/normalBattleService.ts
+++ b/game-server/app/services/normalBattleService.ts
@@ -60,7 +60,7 @@ export async function roleLevelup(roleId: string, kingExp: number, session: Back
 }
 
 
-export async function checkBattleHeroes(roleId: string, seqIds: Array<number>) {
+export async function checkBattleHeroes(roleId: string, seqIds: Array<number> = []) {
     let heroes: number[] = [];
     let flag = true;
     // if (seqIds.length <= 0) flag = false;
@@ -77,7 +77,7 @@ export async function checkBattleHeroes(roleId: string, seqIds: Array<number>) {
     return { isOK: flag, heroes };
 }
 
-export async function checkBattleHeroesByHid(roleId: string, heroes: Array<number>) {
+export async function checkBattleHeroesByHid(roleId: string, heroes: Array<number> = []) {
     let flag = true;
     // if (heroes.length <= 0) flag = false;