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
2021-02-22 14:33:24 +08:00
parent 9b1fa777cd
commit 0f7b528d67
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
game-server/app/servers/battle/handler/guildHandler.ts
View File

@@ -260,8 +260,8 @@ export class GuildHandler {
return resResult(STATUS.GUILD_NOT_FOUND); return resResult(STATUS.GUILD_NOT_FOUND);
} }
guild.leader = <RoleType>guild.leader; let leader = <RoleType>guild.leader;
let leaderIsOnline = await isRoleOnline(guild.leader.roleId); let leaderIsOnline = await isRoleOnline(leader.roleId);
// 打开公会页面，加入channel // 打开公会页面，加入channel
if(userGuild.guildCode) { if(userGuild.guildCode) {
@@ -272,7 +272,7 @@ export class GuildHandler {
const rank = await getMyRank(REDIS_KEY.GUILD_ACTIVE_RANK, serverId, guild.code); 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); return resResult(STATUS.SUCCESS, result);
} }

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

@@ -49,7 +49,6 @@ export class FriendHandler {
let otherServerList = new Array<FriendRecommendParams>(); let otherServerList = new Array<FriendRecommendParams>();
for(let role of allList) { for(let role of allList) {
let type = getRecommendType(myFriendRelation, roleId, role.roleId); let type = getRecommendType(myFriendRelation, roleId, role.roleId);
console.log('****', type, roleId, role.roleId)
if(type == FRIEND_RELATION_TYPE.NORMAL) { if(type == FRIEND_RELATION_TYPE.NORMAL) {
let param = new FriendRecommendParams(role); let param = new FriendRecommendParams(role);
param.setType(type); param.setType(type);