From e24f12131e89a0d23f5025fe49ff456e7dd28ff8 Mon Sep 17 00:00:00 2001 From: luying Date: Wed, 31 Aug 2022 19:18:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BB=E5=AE=9D=EF=BC=9A=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=83=85=E8=B0=8A=E5=AF=BB=E5=AE=9D=E5=A5=96=E5=8A=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/services/comBattleService.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/game-server/app/services/comBattleService.ts b/game-server/app/services/comBattleService.ts index 5d76dd5fa..880be1a04 100644 --- a/game-server/app/services/comBattleService.ts +++ b/game-server/app/services/comBattleService.ts @@ -161,7 +161,7 @@ export async function getRealReward(blueprtId: number, roleSts: RoleStatus[], ro let dicReward = getRewardByBlueprtId(blueprtId); if(!dicReward) return []; - let fixRewards: RewardInter[] = [], extraRewards: RewardInter[] = []; + let fixRewards: RewardInter[] = [], extraRewards: RewardInter[] = [], hasExtraReward = true; if (roleSt.isCap) { fixRewards.push(...dicReward.captainReward); } else { @@ -173,13 +173,13 @@ export async function getRealReward(blueprtId: number, roleSts: RoleStatus[], ro let count = FRIEND.FRIEND_FRIENDPOINT_MAX - comBattleCnt > TREASURE.REWARD_FRIENDPOINT? TREASURE.REWARD_FRIENDPOINT: FRIEND.FRIEND_FRIENDPOINT_MAX - comBattleCnt; fixRewards.push(getFriendPointObject(count)); await FriendPointModel.updateComBattleCntToday(roleSt.roleId, roleSt.roleName, count, FRIEND.FRIEND_FRIENDPOINT_MAX, FRIEND_DROP_TYPE.COM_BATTLE); - } - + } + hasExtraReward = false; } else { fixRewards.push(...dicReward.teammateReward) } } - if(hasTimeExtraReward) { + if(hasTimeExtraReward && hasExtraReward) { let sameGuildCnt = roleSts.filter(cur => cur.guildCode == roleSt.guildCode && cur.roleId != roleSt.roleId).length; if(sameGuildCnt > 0) { let dicGuildReward = roleSt.isCap? dicReward.captainTimeGuildReward: dicReward.teammateTimeGuildReward;