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

好友：服务器名

Browse Source
This commit is contained in:
luying
2021-09-13 14:05:36 +08:00
parent 735dbc438a
commit 8b0ed11e01
3 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
game-server/app/servers/role/handler/friendHandler.ts
View File

@@ -63,11 +63,11 @@ export class FriendHandler {
let param = new FriendRecommendParams(role);
param.setType(type);
let { serverId, userInfo: { serverType } } = role;
let serverName = await getServerName(serverType, serverId);
let { serverId } = role;
let serverName = await getServerName(serverId);
param.setServerName(serverId, serverName);
if (myServerId == serverId && myServerType == serverType) {
if (myServerId == serverId) {
myServerList.push(param);
} else {
otherServerList.push(param);
@@ -112,8 +112,8 @@ export class FriendHandler {
let param = new FriendRecommendParams(role);
param.setType(type);
let { serverId, userInfo: { serverType } } = role;
let serverName = await getServerName(serverType, serverId);
let { serverId } = role;
let serverName = await getServerName(serverId);
param.setServerName(serverId, serverName);
list.push(param);
@@ -227,8 +227,8 @@ export class FriendHandler {
let hisOnlineInfo = await getRoleOnlineInfo(friend.roleId);
param.setOnline(hisOnlineInfo.isOnline);
let { serverId, userInfo: { serverType } } = friend;
let serverName = await getServerName(serverType, serverId);
let { serverId } = friend;
let serverName = await getServerName( serverId);
param.setServerName(serverId, serverName);
param.setType(FRIEND_RELATION_TYPE.HAS_FRIEND);
@@ -287,8 +287,8 @@ export class FriendHandler {
let isOnline = await isRoleOnline(friendRole.roleId);
param.setOnline(isOnline);
let { serverId, userInfo: { serverType } } = friendRole;
let serverName = await getServerName(serverType, serverId);
let { serverId } = friendRole;
let serverName = await getServerName(serverId);
param.setServerName(serverId, serverName);
param.setType(FRIEND_RELATION_TYPE.HAS_BLOCKED);
@@ -349,8 +349,8 @@ export class FriendHandler {
let isOnline = await isRoleOnline(friend.roleId);
param.setOnline(isOnline);
let { serverId, userInfo: { serverType } } = friend;
let serverName = await getServerName(serverType, serverId);
let { serverId } = friend;
let serverName = await getServerName(serverId);
param.setServerName(serverId, serverName);
param.setType(FRIEND_RELATION_TYPE.HAS_BLOCKED);
@@ -625,8 +625,8 @@ export class FriendHandler {
}
}
let param = new FriendRecommendParams({...role, ...addObj});
let { serverId, userInfo: { serverType } } = role;
let serverName = await getServerName(serverType, serverId);
let { serverId } = role;
let serverName = await getServerName(serverId);
param.setServerName(serverId, serverName);
return resResult(STATUS.SUCCESS, {...param, isRobot });
@@ -639,8 +639,8 @@ export class FriendHandler {
let param = new FriendRecommendParams(role);
param.setType(type);
let { serverId, userInfo: { serverType } } = role;
let serverName = await getServerName(serverType, serverId);
let { serverId } = role;
let serverName = await getServerName(serverId);
param.setServerName(serverId, serverName);
return resResult(STATUS.SUCCESS, {...param, isRobot });
}

16
game-server/app/services/friendService.ts
View File

@@ -28,8 +28,8 @@ export async function getFriendList(role: RoleType) {
}
let param = new FriendListParam(friendRole, roleId, friendShip);
let { serverId, userInfo: { serverType } } = friendRole;
let serverName = await getServerName(serverType, serverId);
let { serverId } = friendRole;
let serverName = await getServerName(serverId);
param.setServerName(serverId, serverName);
let isOnline = await isRoleOnline(friendRole.roleId);
@@ -77,8 +77,8 @@ export async function getApplyList(roleId: string) {
let param = new FriendApplyParams(apply.applyCode, friend);
let { serverId, userInfo: { serverType } } = friend;
let serverName = await getServerName(serverType, serverId);
let { serverId } = friend;
let serverName = await getServerName(serverId);
param.setServerName(serverId, serverName);
param.setType(type);
@@ -97,8 +97,8 @@ export async function getApplyList(roleId: string) {
export async function getMyApplyParam(applyCode: string, role: RoleType) {
let param = new FriendApplyParams(applyCode, role);
let { serverId, userInfo: { serverType } } = role;
let serverName = await getServerName(serverType, serverId);
let { serverId } = role;
let serverName = await getServerName(serverId);
param.setServerName(serverId, serverName);
param.setType(FRIEND_RELATION_TYPE.NORMAL);
return param;
@@ -110,8 +110,8 @@ export async function getMyParamAsFriend(friendShip: FriendShipType, role: RoleT
let hisOnlineInfo = await getRoleOnlineInfo(role.roleId);
param.setOnline(hisOnlineInfo.isOnline);
let { serverId, userInfo: { serverType } } = role;
let serverName = await getServerName(serverType, serverId);
let { serverId } = role;
let serverName = await getServerName(serverId);
param.setServerName(serverId, serverName);
param.setType(FRIEND_RELATION_TYPE.HAS_FRIEND);

11
game-server/app/services/redisService.ts
View File

@@ -414,9 +414,9 @@ async function setServerList() {
const serverList = await ServerlistModel.getAllServerList();
await redisClient().delAsync(REDIS_KEY.DB_GAME);
for(let { id, serverType, name } of serverList) {
for(let { id, name } of serverList) {
// console.log(roleId);
await redisClient().hsetAsync(REDIS_KEY.DB_GAME, `${serverType}_${id}`, name);
await redisClient().hsetAsync(REDIS_KEY.DB_GAME, `${id}`, name);
}
}
@@ -424,8 +424,7 @@ export async function getAllServers() {
let servers = await redisClient().hgetallAsync(REDIS_KEY.DB_GAME);
let serverlist = new Array<number>();
for(let serverStr in servers) {
let arr = serverStr.split('_');
let serverId = parseInt(arr[1]);
let serverId = parseInt(serverStr);
if(!isNaN(serverId) && !serverlist.includes(serverId)) {
serverlist.push(serverId);
@@ -434,8 +433,8 @@ export async function getAllServers() {
return serverlist;
}
export async function getServerName(serverType: string, serverId: number) {
let name = await redisClient().hgetAsync(REDIS_KEY.DB_GAME, `${serverType}_${serverId}`);
export async function getServerName(serverId: number) {
let name = await redisClient().hgetAsync(REDIS_KEY.DB_GAME, `${serverId}`);
return name||'常山少年'
}