边窗：领取主线奖励条件修复

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);
             }