xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✨ feat(后台): 后台战区配置

Browse Source
This commit is contained in:
luying
2023-03-20 09:49:23 +08:00
parent 17047dd049
commit 1acfbb4256
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
game-server/app/servers/gm/handler/gmHandler.ts
View File

@@ -311,6 +311,7 @@ export class GmHandler {
await pinus.app.rpc.connector.connectorRemote.setServerGroup.broadcast(); await pinus.app.rpc.connector.connectorRemote.setServerGroup.broadcast();
await pinus.app.rpc.gm.gmRemote.setServerGroup.broadcast(); await pinus.app.rpc.gm.gmRemote.setServerGroup.broadcast();
await pinus.app.rpc.systimer.systimerRemote.setServerGroup.broadcast(); await pinus.app.rpc.systimer.systimerRemote.setServerGroup.broadcast();
await pinus.app.rpc.battle.battleRemote.setServerGroup.broadcast();
} catch(e) { } catch(e) {
console.log('remote未初始完'); console.log('remote未初始完');
} }

4
gm-server/app/service/Game.ts
View File

@@ -364,9 +364,11 @@ export default class Game extends Service {
let dic = gameData.serverNames.get(server.serverId); let dic = gameData.serverNames.get(server.serverId);
let curGVG = currentGVGTypes.find(obj => obj.serverId == server.id)?.groupId||dic.groupId; let curGVG = currentGVGTypes.find(obj => obj.serverId == server.id)?.groupId||dic.groupId;
let nextGVG = nextGVGTypes.find(obj => obj.serverId == server.id)?.groupId||curGVG; 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 curPVP = currentPVPTypes.find(obj => obj.serverId == server.id)?.groupId||dic.groupId;
let nextPVP = nextPVPTypes.find(obj => obj.serverId == server.id)?.groupId||curPVP; 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, { return ctx.service.utils.resResult(STATUS.SUCCESS, {

2
shared/db/ServerGroup.ts
View File

@@ -28,7 +28,7 @@ export default class ServerGroup extends BaseModel {
let match = {}, sort = {}; let match = {}, sort = {};
match[key] = { $lte: time, $gt: 0 }; match[key] = { $lte: time, $gt: 0 };
sort[key] = -1; 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 }, { $match: match },
{ $sort: sort }, { $sort: sort },
{ $group: { _id: "$serverId", groupId: { $first: "$groupId" }, time: { $first: `$${key}` }} }, { $group: { _id: "$serverId", groupId: { $first: "$groupId" }, time: { $first: `$${key}` }} },