From 571ee553e9d6dd802794e7d0ef32414941bfd836 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 15 Sep 2023 11:24:45 +0800 Subject: [PATCH] 1 --- server/hallserver/proto/cs_proto.proto | 2 +- server/hallserver/room/room.go | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/server/hallserver/proto/cs_proto.proto b/server/hallserver/proto/cs_proto.proto index a370561c..c9e06ef8 100644 --- a/server/hallserver/proto/cs_proto.proto +++ b/server/hallserver/proto/cs_proto.proto @@ -277,7 +277,7 @@ message CMKickoutTeam //踢成员 message CMKickoutMember { - optional string account_id = 1; //成员account_id + optional string target_id = 1; //目标account_id } //关闭通知 diff --git a/server/hallserver/room/room.go b/server/hallserver/room/room.go index 37438433..0bf624e6 100644 --- a/server/hallserver/room/room.go +++ b/server/hallserver/room/room.go @@ -228,15 +228,18 @@ func (this *room) CMKickoutTeam(hdr *f5.MsgHdr, msg *cs.CMKickoutTeam) { if m == this.owner && t != nil { notifyMsg := &cs.SMRoomKickoutNotify{} this.broadcastMsg(notifyMsg) + t.unInit() } } func (this *room) CMKickoutMember(hdr *f5.MsgHdr, msg *cs.CMKickoutMember) { hum := hdr.Context.(common.Player) m := this.getMember(hum.GetAccountId()) - if m == this.owner { + target := this.getMember(msg.GetTargetId()) + if m == this.owner && target != nil { notifyMsg := &cs.SMRoomKickoutNotify{} this.broadcastMsg(notifyMsg) + this.removeMember(target.hum.GetAccountId()) } }