From 1562769451e5590c33fe037a597fd8bee4fa56fd Mon Sep 17 00:00:00 2001
From: liangtongchuan <liangtongchuan@bantus.cn>
Date: Wed, 1 Mar 2023 15:22:39 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(battle):=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=AF=BB=E5=AE=9D=E6=88=98=E6=96=97=E4=B8=AD=E5=8A=A9?=
 =?UTF-8?q?=E6=88=98=E6=AC=A1=E6=95=B0=E5=8C=85=E5=90=AB=E6=83=85=E8=B0=8A?=
 =?UTF-8?q?=E5=8A=A9=E6=88=98=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/services/comBattleService.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/game-server/app/services/comBattleService.ts b/game-server/app/services/comBattleService.ts
index f6acc2afe..3b49b3146 100644
--- a/game-server/app/services/comBattleService.ts
+++ b/game-server/app/services/comBattleService.ts
@@ -201,6 +201,12 @@ export async function getRealReward(blueprtId: number, roleSts: RoleStatus[], ro
 
 export async function getAllAssistCnt(roleId: string) {
     let teams = await ComBattleTeamModel.getAssistTeamsByTime(roleId, getZeroPointD(), true);
+    if (teams.length > 0) {
+        // 过滤掉情谊助战次数
+        teams = teams.filter(team => {
+            let roleSt = team.roleStatus.find(st => st.roleId === roleId);
+            return !roleSt.isFrd;
+        });
     return teams.length;
 }