From 4284ca0193f6e558004eaa6d4d6fac6f9e2e281e Mon Sep 17 00:00:00 2001 From: luying Date: Wed, 15 Dec 2021 11:05:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=95=B0=EF=BC=9A=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=9F=8B=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/servers/guild/handler/guildHandler.ts | 9 ++++++--- shared/consts/constModules/sysConst.ts | 6 ++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/game-server/app/servers/guild/handler/guildHandler.ts b/game-server/app/servers/guild/handler/guildHandler.ts index d922e5f74..e4ed3580f 100644 --- a/game-server/app/servers/guild/handler/guildHandler.ts +++ b/game-server/app/servers/guild/handler/guildHandler.ts @@ -1,6 +1,6 @@ import { Application, BackendSession, ChannelService, HandlerService, } from 'pinus'; import { resResult, getRandEelm, shouldRefresh, sortArrRandom } from '../../../pubUtils/util'; -import { STATUS, GUILD_OPERATE, GUILD_AUTH, GUILD_JOB, GUILD_APPLY_TYPE, GUILD_STRUCTURE, GUILD_REC_TYPE, GUILD_STRUCTURE_NAME, MAIL_TYPE, REDIS_KEY, GUILD_SELECT, USER_GUILD_SELECT, TASK_TYPE, DEBUG_MAGIC_WORD, CHANNEL_PREFIX, MSG_TYPE, MSG_SOURCE, ITEM_CHANGE_REASON, TA_EVENT, GUILD_DISMISS_WAY, GUILD_MASTER_CHANGE_WAY } from '../../../consts'; +import { STATUS, GUILD_OPERATE, GUILD_AUTH, GUILD_JOB, GUILD_APPLY_TYPE, GUILD_STRUCTURE, GUILD_REC_TYPE, GUILD_STRUCTURE_NAME, MAIL_TYPE, REDIS_KEY, GUILD_SELECT, USER_GUILD_SELECT, TASK_TYPE, DEBUG_MAGIC_WORD, CHANNEL_PREFIX, MSG_TYPE, MSG_SOURCE, ITEM_CHANGE_REASON, TA_EVENT, GUILD_DISMISS_WAY, GUILD_MASTER_CHANGE_WAY, GUILD_QUIT_WAY } from '../../../consts'; import { UserGuildModel, UserGuildType } from '../../../db/UserGuild'; import { checkAuth, joinGuild, getGuildWithRefActive, getUserGuildWithRefActive, addActive, settleGuildWeekly, getMyGuildInfo, refreshUserGuild, setUserGuildSession } from '../../../services/guildService'; import { GuildModel, GuildType, GuildUpdateParam } from '../../../db/Guild'; @@ -576,6 +576,9 @@ export class GuildHandler { let r2 = new Rank(REDIS_KEY.GUILD_LV_RANK, { serverId }); await r2.removeFromRank({ guildCode: code }); reportTAEvent(roleId, TA_EVENT.GUILD_DISMISS, { name: guild.name, way: GUILD_DISMISS_WAY.GAME }, ip); + for(let roleId of members) { + reportTAEvent(roleId, TA_EVENT.GUILD_QUIT, { name: guild.name, way: GUILD_QUIT_WAY.DISMISS }, ip); + } return resResult(STATUS.SUCCESS, { code, status: guild.status }); } @@ -610,7 +613,7 @@ export class GuildHandler { this.app.rpc.chat.guildRemote.memberQuit.toServer(chatSid, code, roleId, guild, sid); setUserGuildSession(session, null); - reportTAEvent(roleId, TA_EVENT.GUILD_QUIT, { name: guild.name }, ip); + reportTAEvent(roleId, TA_EVENT.GUILD_QUIT, { name: guild.name, way: GUILD_QUIT_WAY.QUIT }, ip); return resResult(STATUS.SUCCESS, { hasGuild: role.hasGuild }); } @@ -647,7 +650,7 @@ export class GuildHandler { await this.app.rpc.connector.connectorRemote.setOtherUserGuildSession.toServer(sid,[{ roleId: memberRoleId, userGuild }]); await sendMailByContent(MAIL_TYPE.GUILD_BE_KICK, memberRoleId, { sendName: roleName, params: [guild.name] }); - reportTAEvent(memberRoleId, TA_EVENT.GUILD_QUIT, { name: guild.name }); + reportTAEvent(memberRoleId, TA_EVENT.GUILD_QUIT, { name: guild.name, way: GUILD_QUIT_WAY.KICK }); return resResult(STATUS.SUCCESS, { memberCnt: guild.memberCnt }); } diff --git a/shared/consts/constModules/sysConst.ts b/shared/consts/constModules/sysConst.ts index 18a0605b9..5b89ff9a4 100644 --- a/shared/consts/constModules/sysConst.ts +++ b/shared/consts/constModules/sysConst.ts @@ -917,6 +917,12 @@ export enum GUILD_MASTER_CHANGE_WAY { BACKEND = "后台", } +export enum GUILD_QUIT_WAY { + QUIT = '主动退出', + KICK = '踢出', + DISMISS = '解散', +} + export function getAuctionSourceTypeName(sourceType: number) { switch(sourceType) { case 1: return '军团演武';