From 9dde37a4b3c0f01d0ca0792ce5e94fc59c99eef5 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Wed, 8 Feb 2023 10:49:43 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(gvg):=20=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=88=96=E9=81=97=E6=BC=8F=E7=9A=84=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/services/gvg/gvgItemService.ts | 2 +-
 shared/domain/gvgField/gvgDb.ts                | 2 ++
 shared/domain/gvgField/returnData.ts           | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/game-server/app/services/gvg/gvgItemService.ts b/game-server/app/services/gvg/gvgItemService.ts
index 8f779356a..8de0acc6e 100644
--- a/game-server/app/services/gvg/gvgItemService.ts
+++ b/game-server/app/services/gvg/gvgItemService.ts
@@ -35,7 +35,7 @@ export async function addGVGReward(roleId: string, roleName: string, leagueCode:
         pushGoods.push({ id, count: item.count, expireTime: item.expireTime });
     }
     if(pushGoods.length > 0) {
-        await sendMessageToUserWithSuc(roleId, PUSH_ROUTE.LEAGUE_ITEM_UPDATE, { goods: pushGoods }, sid);
+        await sendMessageToUserWithSuc(roleId, PUSH_ROUTE.LEAGUE_ITEM_UPDATE, { items: pushGoods }, sid);
     }
     return returnGoods;
 }
diff --git a/shared/domain/gvgField/gvgDb.ts b/shared/domain/gvgField/gvgDb.ts
index 79a83eab7..1d0d7a59f 100644
--- a/shared/domain/gvgField/gvgDb.ts
+++ b/shared/domain/gvgField/gvgDb.ts
@@ -215,6 +215,7 @@ export class OppDetailData{
     isRobot: boolean;
     vestigeId: number;
     battleCode: string;
+    warId: number;
     status: number;
     time: number;
     heroes: OppDetailHeroData[] = [];
@@ -223,6 +224,7 @@ export class OppDetailData{
     constructor(rec: GVGVestigeRecType, obj: {status: number, time: number}) {
         this.vestigeId = rec.vestigeId;
         this.battleCode = rec.battleCode;
+        this.warId = rec.warId;
         this.roleId = rec.defenseRoleId;
         this.isRobot = rec.defenseInfo.isRobot;
         this.status = obj.status;
diff --git a/shared/domain/gvgField/returnData.ts b/shared/domain/gvgField/returnData.ts
index 39e84a0fa..8cfad112a 100644
--- a/shared/domain/gvgField/returnData.ts
+++ b/shared/domain/gvgField/returnData.ts
@@ -272,6 +272,7 @@ export class LeagueMemberListInfo {
 }
 
 export class LeagueMemberDistributeInfo extends LeagueMemberListInfo{
+    rank: number = 0;
     food: number = 0;
     mineral: number = 0;
     wood: number = 0;
@@ -286,6 +287,10 @@ export class LeagueMemberDistributeInfo extends LeagueMemberListInfo{
         this.wood = data.distribute?.wood||0;
         this.score = data.distribute?.score||0
     }
+
+    setRank(rank: number) {
+        this.rank = rank;
+    }
 }
 
 export class LeagueDistributeInfo {