From 2afc250fd686df0b77c3e5200a462ecb06270fb3 Mon Sep 17 00:00:00 2001 From: liangtongchuan Date: Sat, 27 Mar 2021 17:20:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=8A=E5=A4=A9=EF=BC=9A=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E5=92=8C=E9=80=80=E5=87=BA=E5=86=9B=E5=9B=A2=E6=97=B6=E5=A4=84?= =?UTF-8?q?=E7=90=86=E9=A2=91=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/servers/battle/handler/guildHandler.ts | 5 ++--- game-server/app/services/guildService.ts | 7 ++++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/game-server/app/servers/battle/handler/guildHandler.ts b/game-server/app/servers/battle/handler/guildHandler.ts index 49a295eee..355e4d4e6 100644 --- a/game-server/app/servers/battle/handler/guildHandler.ts +++ b/game-server/app/servers/battle/handler/guildHandler.ts @@ -327,13 +327,11 @@ export class GuildHandler { this.app.rpc.chat.guildRemote.updateInfo.toServer(chatSid, code, { memberCnt: joinResult.memberCnt, guildCe: joinResult.guildCe }); this.app.rpc.chat.guildRemote.addRec.toServer(chatSid,rec); - hasGuild = true; } else { // 不自动加入，插入申请表 await UserGuildApplyModel.createUserGuildApply(role, guild, GUILD_APPLY_TYPE.APPLY); } - await addRoleToGuildChannel(roleId, sid, code); // 返回 return resResult(STATUS.SUCCESS, { code, hasGuild }); } @@ -671,7 +669,8 @@ export class GuildHandler { await removeTrainRank(code, roleId, guild.trainId); let chatSid = await getGuildChannelSid(code); - this.app.rpc.chat.guildRemote.memberQuit.toServer(chatSid,code, roleId, guild); + const { sid } = await getRoleOnlineInfo(roleId); + this.app.rpc.chat.guildRemote.memberQuit.toServer(chatSid,code, roleId, guild, sid); // 添加动态 const rec = await GuildRecModel.createGuildRec(roleId, code, GUILD_REC_TYPE.QUIT_GUILD, [role.roleName]); diff --git a/game-server/app/services/guildService.ts b/game-server/app/services/guildService.ts index 747b9432e..130846d3b 100644 --- a/game-server/app/services/guildService.ts +++ b/game-server/app/services/guildService.ts @@ -10,7 +10,7 @@ import { nowSeconds } from "../pubUtils/timeUtil"; import { pinus } from "pinus"; import { ARMY } from "../pubUtils/dicParam"; import { sendMail } from "./mailService"; -import { setRank, getMyRank, initSingleRank } from "./redisService"; +import { setRank, getMyRank, initSingleRank, getRoleOnlineInfo } from "./redisService"; import { GuildRankParam, GuildLeader } from "../domain/rank"; import { lockData, lockDataNoRetry } from '../services/redLockService'; import { ErrLogModel } from '../db/ErrLog'; @@ -18,6 +18,7 @@ import { MailType, MailModel } from '../db/Mail'; import { pushMail } from '../pubUtils/interface'; import { getMailContent } from '../services/mailService'; import { DATA_NAME } from '../consts/dataName'; +import { addRoleToGuildChannel } from "./chatService"; /** * @description 检查该玩家是否有权限做操作 @@ -81,6 +82,10 @@ export async function joinGuild(code: string, guildName: string, lv: number, rol await UserGuildApplyModel.deleteApply(roleId); // 删除玩家所有对其他公会的申请 res.releaseCallback();//解锁 + const { sid } = await getRoleOnlineInfo(roleId); + if (sid) { + await addRoleToGuildChannel(roleId, sid, code); + } return { status: 0, guild, userGuild, roleName: role.roleName, memberCnt: guild.memberCnt, guildCe: guild.guildCe } }