From 5c5fb4c827d5794f2b03e10a42f1d8292e15b8ad Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sat, 16 Sep 2023 11:08:05 +0800
Subject: [PATCH] 1

---
 server/hallserver/proto/cs_msgid.proto |  2 ++
 server/hallserver/proto/cs_proto.proto | 10 ++++++++++
 server/hallserver/room/room.go         |  4 +++-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/server/hallserver/proto/cs_msgid.proto b/server/hallserver/proto/cs_msgid.proto
index 0f9fe859..5819233b 100644
--- a/server/hallserver/proto/cs_msgid.proto
+++ b/server/hallserver/proto/cs_msgid.proto
@@ -20,6 +20,7 @@ enum CMMessageId_e
     _CMKickoutMember = 114;
     _CMCloseNotify = 115;
     _CMReportPingValue = 116;
+    _CMGetCurrentRoom = 117;
 }
 
 enum SMMessageId_e
@@ -39,6 +40,7 @@ enum SMMessageId_e
     _SMSetPrepare = 112;
     _SMKickoutTeam = 113;
     _SMKickoutMember = 114;
+    _SMGetCurrentRoom = 117;
 
     _SMRoomMemberChangeNotify = 1001;
     _SMRoomKickoutNotify = 1002;
diff --git a/server/hallserver/proto/cs_proto.proto b/server/hallserver/proto/cs_proto.proto
index 97ce2e1f..d23f7860 100644
--- a/server/hallserver/proto/cs_proto.proto
+++ b/server/hallserver/proto/cs_proto.proto
@@ -302,6 +302,16 @@ message CMReportPingValue
     optional int32 ping = 1;
 }
 
+//请求当前房间
+message CMGetCurrentRoom
+{
+}
+
+message SMGetCurrentRoom
+{
+    optional MFCurrentRoom room = 1; //自己所在房间信息
+}
+
 //房间成员信息变更通知
 message SMRoomMemberChangeNotify
 {
diff --git a/server/hallserver/room/room.go b/server/hallserver/room/room.go
index 7f0510ee..96004f62 100644
--- a/server/hallserver/room/room.go
+++ b/server/hallserver/room/room.go
@@ -262,7 +262,9 @@ func (this *room) CMCloseNotify(hdr *f5.MsgHdr, msg *cs.CMCloseNotify) {
 
 func (this *room) broadcastMsg(msg proto.Message) {
 	for _, m := range(this.members) {
-		m.hum.SendMsg(msg)
+		if m.hum.GetRoom() == this {
+			m.hum.SendMsg(msg)
+		}
 	}
 }