From 4a3efd312dfbe24ff3af8be37acd2bdb839edcd5 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Fri, 17 Feb 2023 14:35:34 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(gvg):=20=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E5=A4=87=E6=88=98=E6=9C=9F=E6=97=B6=E6=BF=80=E6=88=98=E6=9C=9F?=
 =?UTF-8?q?=E5=86=85=E5=AD=98=E6=B8=85=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/servers/guild/remote/guildRemote.ts | 9 +++++++++
 game-server/app/services/gvg/gvgBattleMemory.ts     | 4 ++++
 game-server/app/services/gvg/gvgService.ts          | 1 +
 3 files changed, 14 insertions(+)

diff --git a/game-server/app/servers/guild/remote/guildRemote.ts b/game-server/app/servers/guild/remote/guildRemote.ts
index b7e698933..232e848f8 100644
--- a/game-server/app/servers/guild/remote/guildRemote.ts
+++ b/game-server/app/servers/guild/remote/guildRemote.ts
@@ -9,6 +9,7 @@ import { setKvToMemory } from '../../../services/pushService';
 import { getGVGConfig, setGVGConfig, setGVGServerGroup } from '../../../services/gvg/gvgService';
 import { GVGConfigType } from '../../../db/GVGConfig';
 import { catapultHurt, gvgBattleEnd, gvgBattleSeconds, gvgBattleStart, initCatapult } from '../../../services/gvg/gvgBattleService';
+import { clearBattleMemory } from '../../../services/gvg/gvgBattleMemory';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -159,4 +160,12 @@ export class GuildRemote {
             errlogger.error(`remote ${__filename} \n ${e.stack}`);
         }
     }
+
+    public async clearBattleMemory() {
+        try {
+            return clearBattleMemory();
+        } catch(e) {
+            errlogger.error(`remote ${__filename} \n ${e.stack}`);
+        }
+    }
 }
\ No newline at end of file
diff --git a/game-server/app/services/gvg/gvgBattleMemory.ts b/game-server/app/services/gvg/gvgBattleMemory.ts
index 5cee6920a..1c556e13c 100644
--- a/game-server/app/services/gvg/gvgBattleMemory.ts
+++ b/game-server/app/services/gvg/gvgBattleMemory.ts
@@ -182,4 +182,8 @@ export async function initTeamToMem() {
             teamObj.enterCity(team);
         }
     }
+}
+
+export function clearBattleMemory() {
+    gvgBattleMap.clear();
 }
\ No newline at end of file
diff --git a/game-server/app/services/gvg/gvgService.ts b/game-server/app/services/gvg/gvgService.ts
index 2cf1b3ea6..2af1d0ca3 100644
--- a/game-server/app/services/gvg/gvgService.ts
+++ b/game-server/app/services/gvg/gvgService.ts
@@ -149,6 +149,7 @@ export async function initLeaguePrepare() {
     for(let { leagueCode, memberCnt } of leagues) {
         await GVGLeaguePrepareModel.initData(config.configId, leagueCode, memberCnt);
     }
+    pinus.app.rpc.guild?.guildRemote?.clearBattleMemory.broadcast();
 }
 
 export async function setGVGServerGroup() {