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 }, 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 }, 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, }, 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) { +export async function checkBattleHeroes(roleId: string, seqIds: Array = []) { let heroes: number[] = []; let flag = true; // if (seqIds.length <= 0) flag = false; @@ -77,7 +77,7 @@ export async function checkBattleHeroes(roleId: string, seqIds: Array) { return { isOK: flag, heroes }; } -export async function checkBattleHeroesByHid(roleId: string, heroes: Array) { +export async function checkBattleHeroesByHid(roleId: string, heroes: Array = []) { let flag = true; // if (heroes.length <= 0) flag = false;