From 48139bfac4a90c71596aa6929b5d3c6e3f9dfe80 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 8 Apr 2024 14:35:21 +0800 Subject: [PATCH] 1 --- server/imserver_new/common/types.go | 2 +- server/imserver_new/guild/guildmgr.go | 2 +- server/imserver_new/player/player.go | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/server/imserver_new/common/types.go b/server/imserver_new/common/types.go index a2715147..0d66fa28 100644 --- a/server/imserver_new/common/types.go +++ b/server/imserver_new/common/types.go @@ -96,7 +96,7 @@ type GuildMgr interface { AsyncLeave(string, func(int32, string)) AsyncKickout(string, string, func(int32, string)) - AsyncDisband(string, string, func(int32, string)) + AsyncDisband(string, func(int32, string, []string)) AsyncSetNotice(string, string, func(int32, string)) AsyncSetAvatar(string, string, func(int32, string)) AsyncSetName(string, string, func(int32, string)) diff --git a/server/imserver_new/guild/guildmgr.go b/server/imserver_new/guild/guildmgr.go index d3112c8c..c2552b63 100644 --- a/server/imserver_new/guild/guildmgr.go +++ b/server/imserver_new/guild/guildmgr.go @@ -468,7 +468,7 @@ func (this *guildMgr) AsyncKickout(accountId string, targetId string, cb func(in } } -func (this *guildMgr) AsyncDisband(string, string, func(int32, string)) { +func (this *guildMgr) AsyncDisband(accountId string, cb func(int32, string, []string)) { } diff --git a/server/imserver_new/player/player.go b/server/imserver_new/player/player.go index a941f536..73e89e65 100644 --- a/server/imserver_new/player/player.go +++ b/server/imserver_new/player/player.go @@ -433,6 +433,16 @@ func (this *player) CMSetMemberLevel(hdr *f5.MsgHdr, msg *cs.CMSetMemberLevel) { } func (this *player) CMDisband(hdr *f5.MsgHdr, msg *cs.CMDisband) { + rspMsg := new(cs.SMDisband) + GetGuildMgr().AsyncDisband( + this.GetAccountId(), + func (errCode int32, errMsg string, members []string) { + if errCode != 0 { + this.SendMsg(rspMsg.Err(errCode, errMsg)) + return + } + this.SendMsg(rspMsg) + }) } func (this *player) CMSetNotice(hdr *f5.MsgHdr, msg *cs.CMSetNotice) {