From fc633f6a7b16dd1fc10131d2954e899f1afd5055 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Mon, 29 May 2023 19:12:54 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(gvg):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=8F=AF=E8=83=BD=E4=BC=9A=E4=B8=80=E7=9B=B4=E7=BB=A7=E6=89=BF?=
 =?UTF-8?q?=E5=9F=8E=E6=B1=A0=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/gvg/gvgBattleService.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/game-server/app/services/gvg/gvgBattleService.ts b/game-server/app/services/gvg/gvgBattleService.ts
index 0bb379f0c..751466060 100644
--- a/game-server/app/services/gvg/gvgBattleService.ts
+++ b/game-server/app/services/gvg/gvgBattleService.ts
@@ -3,14 +3,14 @@ import { GVGLeagueModel, GVGLeagueType } from "../../db/GVGLeague";
 import { GVGTeamModel, GVGTeamType, GVGTeamUpdate } from "../../db/GVGTeam";
 import { GVGCityModel, GVGCityType } from "../../db/GVGCity";
 import { gameData, getGVGBattleRankReward } from "../../pubUtils/data";
-import { COUNTER, GVG_AREA_TYPE, GVG_ATTACK_TYPE, GVG_BATTLE_RANK_TYPE, GVG_PERIOD, GVG_POINT_TYPE, GVG_TECH_TYPE, MAIL_TYPE, PUSH_ROUTE, REDIS_KEY, STATUS } from "../../consts";
+import { COUNTER, GVG_AREA_TYPE, GVG_ATTACK_TYPE, GVG_BATTLE_RANK_TYPE, GVG_PERIOD, GVG_POINT_TYPE, GVG_SERVER_TYPE, GVG_TECH_TYPE, MAIL_TYPE, PUSH_ROUTE, REDIS_KEY, STATUS } from "../../consts";
 import { getTimeFun, nowSeconds } from "../../pubUtils/timeUtil";
 import { DicGVGAreaPoint } from "../../pubUtils/dictionary/DicGVGAreaPoint";
 import { getGVGBattleData, getGVGBattleMap } from "../memoryCache/gvgBattleData";
 import { GVGAttackSpine, GVGCityMapInfo, GVGTeamInList, GVGTeamInListOnPoint, GVGTeamSpineInMap } from "../../domain/gvgField/returnData";
 import { GVG } from "../../pubUtils/dicParam";
 import { GVGHeroInfo, PvpEnemies, PvpHeroInfo } from "../../domain/dbGeneral";
-import { getGroupKey, getGVGConfig, getGVGConfigFromRemote, getGVGPeriodData } from "./gvgService";
+import { getGroupKey, getGVGConfig, getGVGConfigFromRemote, getGVGPeriodData, getGVGServerType } from "./gvgService";
 import { GVGLeaguePrepareModel } from "../../db/GVGLeaguePrepare";
 import { pinus } from "pinus";
 import { dispatch } from "../../pubUtils/dispatcher";
@@ -679,6 +679,11 @@ async function addGuardCity(configId: number, groupKey: string, cityId: number,
     let dicCityAdd = gameData.gvgCityAdd.get(dicCity.cityType);
     let league = await GVGLeagueModel.findByCodeWithoutPopulate(leagueCode);
     if(!league) return;
+    let leagueGroupKey = await getGroupKey(league.serverId);
+    if(groupKey != leagueGroupKey) {
+        console.log('addGuardCity groupKey err', cityId, groupKey, leagueCode, league.serverId);
+        return;
+    }
     await GVGCityModel.guardCity(configId, groupKey, cityId, league);
     await sendMailToLeagueByContent(MAIL_TYPE.GVG_GUARD_CITY_REWARD, leagueCode, { params: [dicCity.cityName], goods: dicCityAdd.occupyReward }, league, canSendReward);
     await addCityGuardMessage(league, cityId);