From 1acfbb425679dd8af62382ae0dc65fad3fc42b83 Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Mon, 20 Mar 2023 09:49:23 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(=E5=90=8E=E5=8F=B0):=20?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=88=98=E5=8C=BA=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/servers/gm/handler/gmHandler.ts | 1 +
 gm-server/app/service/Game.ts                   | 4 +++-
 shared/db/ServerGroup.ts                        | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/game-server/app/servers/gm/handler/gmHandler.ts b/game-server/app/servers/gm/handler/gmHandler.ts
index 1586b3a9f..c0f1ace49 100644
--- a/game-server/app/servers/gm/handler/gmHandler.ts
+++ b/game-server/app/servers/gm/handler/gmHandler.ts
@@ -311,6 +311,7 @@ export class GmHandler {
             await pinus.app.rpc.connector.connectorRemote.setServerGroup.broadcast();
             await pinus.app.rpc.gm.gmRemote.setServerGroup.broadcast();
             await pinus.app.rpc.systimer.systimerRemote.setServerGroup.broadcast();
+            await pinus.app.rpc.battle.battleRemote.setServerGroup.broadcast();
         } catch(e) {
             console.log('remote未初始完');
         }
diff --git a/gm-server/app/service/Game.ts b/gm-server/app/service/Game.ts
index cc952cee2..0ad501341 100644
--- a/gm-server/app/service/Game.ts
+++ b/gm-server/app/service/Game.ts
@@ -364,9 +364,11 @@ export default class Game extends Service {
             let dic = gameData.serverNames.get(server.serverId);
             let curGVG = currentGVGTypes.find(obj => obj.serverId == server.id)?.groupId||dic.groupId;
             let nextGVG = nextGVGTypes.find(obj => obj.serverId == server.id)?.groupId||curGVG;
+            let gvgTime = nextGVGTypes.find(obj => obj.serverId == server.id)?.time;
             let curPVP = currentPVPTypes.find(obj => obj.serverId == server.id)?.groupId||dic.groupId;
             let nextPVP = nextPVPTypes.find(obj => obj.serverId == server.id)?.groupId||curPVP;
-            return { id: server.id, serverId: server.serverId, name: server.name, curGVG, nextGVG, curPVP, nextPVP, env: this.app.config.realEnv }
+            let pvpTime = nextPVPTypes.find(obj => obj.serverId == server.id)?.time;
+            return { id: server.id, serverId: server.serverId, name: server.name, curGVG, nextGVG, curPVP, nextPVP, gvgTime, pvpTime, env: this.app.config.realEnv }
         });
 
         return ctx.service.utils.resResult(STATUS.SUCCESS, {
diff --git a/shared/db/ServerGroup.ts b/shared/db/ServerGroup.ts
index 00957c3f4..df1c4ac5f 100644
--- a/shared/db/ServerGroup.ts
+++ b/shared/db/ServerGroup.ts
@@ -28,7 +28,7 @@ export default class ServerGroup extends BaseModel {
       let match = {}, sort = {};
       match[key] = { $lte: time, $gt: 0 };
       sort[key] = -1;
-      const serverGroup: { serverId: number, groupId: number }[] = await ServerGroupModel.aggregate([
+      const serverGroup: { serverId: number, groupId: number, time: number }[] = await ServerGroupModel.aggregate([
         { $match: match },
         { $sort: sort },
         { $group: { _id: "$serverId", groupId: { $first: "$groupId" }, time: { $first: `$${key}` }} },