From 133acebb0b8657b3331972253eff71a0e8c52e26 Mon Sep 17 00:00:00 2001 From: luying Date: Thu, 30 Jun 2022 16:23:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BE=B9=E7=AA=97=EF=BC=9A=E9=A2=86=E5=8F=96?= =?UTF-8?q?=E4=B8=BB=E7=BA=BF=E5=A5=96=E5=8A=B1=E6=9D=A1=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/servers/battle/handler/normalBattleHandler.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/game-server/app/servers/battle/handler/normalBattleHandler.ts b/game-server/app/servers/battle/handler/normalBattleHandler.ts index 8e419cb6d..36a5d1b50 100644 --- a/game-server/app/servers/battle/handler/normalBattleHandler.ts +++ b/game-server/app/servers/battle/handler/normalBattleHandler.ts @@ -488,14 +488,15 @@ export class NormalBattleHandler { let roleName = session.get('roleName'); let sid = session.get('sid'); - let role = await RoleModel.findByRoleId(roleId, 'receivedWarIds'); - let { receivedWarIds = [] } = role; + let role = await RoleModel.findByRoleId(roleId, 'receivedWarIds warStar'); + let { warStar, receivedWarIds = [] } = role; let warIds: number[] = []; let rewards: RewardInter[] = []; let mainWarRewards = gameData.mainWarReward.get(`${warType}_${chapter}`)??[]; for(let { warId, cityReward } of mainWarRewards) { - if(receivedWarIds.indexOf(warId) == -1) { + let index = warStar.findIndex(cur => cur.id == warId); + if(index != -1 && receivedWarIds.indexOf(warId) == -1) { rewards.push(...cityReward); warIds.push(warId); }