From 0f7b528d679b0312aaf4832c37b778a739178742 Mon Sep 17 00:00:00 2001 From: luying Date: Mon, 22 Feb 2021 14:33:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=9B=E5=9B=A2=EF=BC=9Afix=20=E5=9B=A2?= =?UTF-8?q?=E9=95=BF=E6=98=AF=E5=90=A6=E5=9C=A8=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/servers/battle/handler/guildHandler.ts | 6 +++--- game-server/app/servers/role/handler/friendHandler.ts | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/game-server/app/servers/battle/handler/guildHandler.ts b/game-server/app/servers/battle/handler/guildHandler.ts index 9ca5931dc..2fec06c5e 100644 --- a/game-server/app/servers/battle/handler/guildHandler.ts +++ b/game-server/app/servers/battle/handler/guildHandler.ts @@ -260,8 +260,8 @@ export class GuildHandler { return resResult(STATUS.GUILD_NOT_FOUND); } - guild.leader = guild.leader; - let leaderIsOnline = await isRoleOnline(guild.leader.roleId); + let leader = guild.leader; + let leaderIsOnline = await isRoleOnline(leader.roleId); // 打开公会页面，加入channel if(userGuild.guildCode) { @@ -272,7 +272,7 @@ export class GuildHandler { const rank = await getMyRank(REDIS_KEY.GUILD_ACTIVE_RANK, serverId, guild.code); // 返回 - const result = { hasGuild: true, ...guild, rank, myInfo: {...userGuild, isOnline: leaderIsOnline}}; + const result = { hasGuild: true, ...guild, leader: { ...leader, isOnline: leaderIsOnline }, rank, myInfo: {...userGuild }}; return resResult(STATUS.SUCCESS, result); } diff --git a/game-server/app/servers/role/handler/friendHandler.ts b/game-server/app/servers/role/handler/friendHandler.ts index 888786d28..dd2b6bda4 100644 --- a/game-server/app/servers/role/handler/friendHandler.ts +++ b/game-server/app/servers/role/handler/friendHandler.ts @@ -49,7 +49,6 @@ export class FriendHandler { let otherServerList = new Array(); for(let role of allList) { let type = getRecommendType(myFriendRelation, roleId, role.roleId); - console.log('****', type, roleId, role.roleId) if(type == FRIEND_RELATION_TYPE.NORMAL) { let param = new FriendRecommendParams(role); param.setType(type);