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

🐞 fix(gvg): 修复战区分配错误

Browse Source
This commit is contained in:
luying
2023-03-04 16:19:46 +08:00
parent 00263cc249
commit e183c780ee
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -302,6 +302,15 @@ export class GmHandler {
for(let serverId of serverIds) { for(let serverId of serverIds) {
await GVGServerGroupModel.updateByServerId(serverId, groupId, scheduleTime); await GVGServerGroupModel.updateByServerId(serverId, groupId, scheduleTime);
} }
try {
await pinus.app.rpc.guild.guildRemote.setGVGServerGroup.broadcast();
await pinus.app.rpc.chat.chatRemote.setGVGServerGroup.broadcast();
await pinus.app.rpc.connector.connectorRemote.setGVGServerGroup.broadcast();
await pinus.app.rpc.gm.gmRemote.setGVGServerGroup.broadcast();
await pinus.app.rpc.systimer.systimerRemote.setGVGServerGroup.broadcast();
} catch(e) {
console.log('remote未初始完');
}
return resResult(STATUS.SUCCESS); return resResult(STATUS.SUCCESS);
} }

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

@@ -359,7 +359,7 @@ export default class Game extends Service {
const servers = serverlists.map(server => { const servers = serverlists.map(server => {
let current = currentTypes.find(obj => obj.serverId == server.id); let current = currentTypes.find(obj => obj.serverId == server.id);
let next = nextTypes.find(obj => obj.serverId == server.id); let next = nextTypes.find(obj => obj.serverId == server.id);
let dic = gameData.serverNames.get(server.id); let dic = gameData.serverNames.get(server.serverId);
return { id: server.id, serverId: server.serverId, name: server.name, current: current?.groupId|| dic.groupId, next: next?.groupId|| current?.groupId || dic.groupId, env: this.app.config.realEnv } return { id: server.id, serverId: server.serverId, name: server.name, current: current?.groupId|| dic.groupId, next: next?.groupId|| current?.groupId || dic.groupId, env: this.app.config.realEnv }
}); });

4
shared/db/GVGServerGroup.ts
View File

@@ -20,9 +20,9 @@ export default class GVGServerGroup extends BaseModel {
const serverGroup: { serverId: number, groupId: number }[] = await GVGServerGroupModel.aggregate([ const serverGroup: { serverId: number, groupId: number }[] = await GVGServerGroupModel.aggregate([
{ $match: { time: { $lte: time } } }, { $match: { time: { $lte: time } } },
{ $sort: { time: -1 } }, { $sort: { time: -1 } },
{ $group: { _id: "$id", serverId: { $first: "$serverId" }, groupId: { $first: "$groupId" }, time: { $first: "$time" }} }, { $group: { _id: "$serverId", serverId: { $first: "$serverId" }, groupId: { $first: "$groupId" }, time: { $first: "$time" }} },
{ $sort: { _id: -1 } }, { $sort: { _id: -1 } },
{ $project: { _id: 0, id: "$_id", serverId: "$serverId", groupId: "$groupId", time: "$time" } } { $project: { _id: 0, serverId: "$serverId", groupId: "$groupId", time: "$time" } }
]); ]);
return serverGroup; return serverGroup;
} }