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

🐞 fix(聊天): 战区发言无推送

Browse Source
This commit is contained in:
luying
2023-05-05 15:55:26 +08:00
parent ddc05d58b9
commit 0982a9b9e0
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/services/chatService.ts
+5 -2
View File
@@ -14,8 +14,9 @@ import { AccuseRecModel, AccueseParam } from '../db/AccuseRec';
import { getSimpleRoleInfo, getSimpleRoleInfos } from './roleService'; import { getSimpleRoleInfo, getSimpleRoleInfos } from './roleService';
import { sendMessageToAllWithSuc, sendMessageToCityWithSuc, sendMessageToGuildWithSuc, sendMessageToServerWithSuc, sendMessageToTeam, sendMessageToUserWithSuc } from './pushService'; import { sendMessageToAllWithSuc, sendMessageToCityWithSuc, sendMessageToGuildWithSuc, sendMessageToServerWithSuc, sendMessageToTeam, sendMessageToUserWithSuc } from './pushService';
import { RegionModel } from '../db/Region'; import { RegionModel } from '../db/Region';
import { getAllGroupOfServer, getGVGGroupIdOfServer, getGVGServersByGroupId } from './serverService'; import { getAllGroupOfServer, getGVGGroupIdOfServer, getGVGServersByGroupId, getPvpServersByGroupId } from './serverService';
import { GVGLeagueModel } from '../db/GVGLeague'; import { GVGLeagueModel } from '../db/GVGLeague';
import { uniq } from 'underscore';
export * from './chatChannelService'; export * from './chatChannelService';
export * from './sysChatService'; export * from './sysChatService';
@@ -164,7 +165,9 @@ export async function pushGroupMsgToRoom(msg: GroupMessageType) {
await sendMessageToCityWithSuc(parseInt(arr[0]), parseInt(arr[1]), PUSH_ROUTE.GROUP_MSG, { ...msg, roleInfo }); await sendMessageToCityWithSuc(parseInt(arr[0]), parseInt(arr[1]), PUSH_ROUTE.GROUP_MSG, { ...msg, roleInfo });
} else if (msg.channel == CHANNEL_PREFIX.GVG) { } else if (msg.channel == CHANNEL_PREFIX.GVG) {
let groupId = parseInt(msg.channelId); let groupId = parseInt(msg.channelId);
let serverIds = await getGVGServersByGroupId(groupId); let gvgServerIds = await getGVGServersByGroupId(groupId);
let pvpServerIds = await getPvpServersByGroupId(groupId);
let serverIds = uniq([...gvgServerIds, ...pvpServerIds]);
for(let serverId of serverIds) { for(let serverId of serverIds) {
await sendMessageToServerWithSuc(serverId, PUSH_ROUTE.GROUP_MSG, { ...msg, roleInfo }); await sendMessageToServerWithSuc(serverId, PUSH_ROUTE.GROUP_MSG, { ...msg, roleInfo });
} }
game-server/app/services/serverService.ts
+5 -2
View File
@@ -84,8 +84,11 @@ export async function getServersByGroupId(groupId: number, fun: SERVER_GROUP_FUN
let serverCreateTimes = await getAllServerCreateTime(); let serverCreateTimes = await getAllServerCreateTime();
return arr.filter(obj => { return arr.filter(obj => {
let openTime = parseInt(serverCreateTimes[obj[0]]); if(fun == SERVER_GROUP_FUN_TYPE.GVG) {
return obj[1] == groupId && getServerTypeByTime(openTime) == GVG_SERVER_TYPE.MULTI; let openTime = parseInt(serverCreateTimes[obj[0]]);
return obj[1] == groupId && getServerTypeByTime(openTime) == GVG_SERVER_TYPE.MULTI;
}
return true
}).map(obj => obj[0]); }).map(obj => obj[0]);
} }