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

聊天：修改部分接口字段和命名

Browse Source
This commit is contained in:
liangtongchuan
2021-03-11 17:01:15 +08:00
parent 75fb82316d
commit 3bbd8627bd
8 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/services/chatService.ts
+2 -2
View File
@@ -7,7 +7,7 @@ import { PrivateMessageModel, PrivateMessageParam, PrivateMessageType } from './
import { GroupMessageParam, GroupMessageType } from '../db/GroupMessage';
import { genCode, resResult } from '../pubUtils/util';
import { pinus } from 'pinus';
import { CHANNEL_PREFIX, MSG_CODE_LEN, MSG_STATUS, ON_MSG_ROUTE, RECENT_PRIVATE_CHATS_CNT, RECENT_GROUP_MSGS_CNT, MSG_TYPE, MSG_SOURCE } from '../consts';
import { CHANNEL_PREFIX, MSG_CODE_LEN, MSG_STATUS, ON_PRIVATE_MSG_ROUTE, RECENT_PRIVATE_CHATS_CNT, RECENT_GROUP_MSGS_CNT, MSG_TYPE, MSG_SOURCE } from '../consts';
import { getRoleOnlineInfo } from './redisService';
import { ChatInfoModel } from '../db/ChatInfo';
import { channelServer } from './chatChannelService';
@@ -126,7 +126,7 @@ export async function pushMsgToRole(msg: PrivateMessageType | GroupMessageType)
const targetRoleId = msg.targetRoleId!;
const { sid } = await getRoleOnlineInfo(targetRoleId);
if (sid) {
pinus.app.get('channelService').pushMessageByUids(ON_MSG_ROUTE, resResult(STATUS.SUCCESS, msg), [{uid: targetRoleId, sid}]);
pinus.app.get('channelService').pushMessageByUids(ON_PRIVATE_MSG_ROUTE, resResult(STATUS.SUCCESS, msg), [{uid: targetRoleId, sid}]);
}
}
game-server/app/services/sysChatService.ts
+6 -6
View File
@@ -62,7 +62,7 @@ export async function pushGuildUpStructureMsg(roleId: string, roleName: string,
export async function pushGuildTrainSucMsg(roleId: string, roleName: string, guildCode: string, hid: number) {
if (!guildCode) return null;
const content = JSON.stringify({ hid });
const content = JSON.stringify({ roleId, roleName, hid });
const msgData = await createGroupMsg(roleId, roleName, CHANNEL_PREFIX.GUILD, guildCode, MSG_TYPE.RICH_TEXT, MSG_SOURCE.GUILD_TRAIN_SUC, content, null, null);
await pushGroupMsgToRoom(msgData);
return msgData;
@@ -70,7 +70,7 @@ export async function pushGuildTrainSucMsg(roleId: string, roleName: string, gui
export async function pushGuildBossSucMsg(roleId: string, roleName: string, guildCode: string, bossInstance: BossInstanceType) {
const boss = pick(bossInstance, ['warId', 'bossLv']);
const content = JSON.stringify({ boss });
const content = JSON.stringify({ roleId, roleName, boss });
const msgData = await createGroupMsg(roleId, roleName, CHANNEL_PREFIX.GUILD, guildCode, MSG_TYPE.RICH_TEXT, MSG_SOURCE.GUILD_BOSS_SUC, content, null, null);
await pushGroupMsgToRoom(msgData);
return msgData;
@@ -78,14 +78,14 @@ export async function pushGuildBossSucMsg(roleId: string, roleName: string, guil
export async function pushEquipRefineSucMsg(roleId: string, roleName: string, serverId: number, eplace: Partial<EPlace>) {
const data = pick(eplace, ['id', 'lv', 'refineLv']);
const content = JSON.stringify({ eplace: data });
const content = JSON.stringify({ roleId, roleName, eplace: data });
const msgData = await createGroupMsg(roleId, roleName, CHANNEL_PREFIX.SYS, `${serverId}`, MSG_TYPE.RICH_TEXT, MSG_SOURCE.EQUIP_REFINE_SUC, content, null, null);
await pushGroupMsgToRoom(msgData);
return msgData;
}
export async function pushNormalEquipMsg(roleId: string, roleName: string, serverId: number, source: number, id: number, name: string) {
const content = JSON.stringify({ id, name });
const content = JSON.stringify({ roleId, roleName, equip: { id, name } });
const msgData = await createGroupMsg(roleId, roleName, CHANNEL_PREFIX.SYS, `${serverId}`, MSG_TYPE.RICH_TEXT, source, content, null, null);
await pushGroupMsgToRoom(msgData);
return msgData;
@@ -93,14 +93,14 @@ export async function pushNormalEquipMsg(roleId: string, roleName: string, serve
export async function pushTowerMsg(roleId: string, roleName: string, serverId: number, source: number, lv: number) {
if (!shouldPushTowerMsg(lv)) return null;
const content = JSON.stringify({ lv });
const content = JSON.stringify({ roleId, roleName, lv });
const msgData = await createGroupMsg(roleId, roleName, CHANNEL_PREFIX.SYS, `${serverId}`, MSG_TYPE.RICH_TEXT, source, content, null, null);
await pushGroupMsgToRoom(msgData);
return msgData;
}
async function pushGKFirstMsg(roleId: string, roleName: string, serverId: number, source: number, warType: number, warId: number) {
const content = JSON.stringify({ warType, warId });
const content = JSON.stringify({ roleId, roleName, warInfo: { warType, warId } });
const msgData = await createGroupMsg(roleId, roleName, CHANNEL_PREFIX.SYS, `${serverId}`, MSG_TYPE.RICH_TEXT, source, content, null, null);
await pushGroupMsgToRoom(msgData);
return msgData;