From e7ad1756bf01873ef318f4d55fdc7e2469c0d09c Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 25 Sep 2023 15:50:39 +0800
Subject: [PATCH] 1

---
 server/gameserver/roommgr.cc           | 2 +-
 server/tools/protobuild/cs_proto.proto | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc
index 036fcd17..5a41fb0a 100644
--- a/server/gameserver/roommgr.cc
+++ b/server/gameserver/roommgr.cc
@@ -827,7 +827,7 @@ void RoomMgr::AdjustCMJoin(cs::CMJoin* msg)
 {
     msg->set_force_enter_newbie_room(false);
     msg->set_pve_instance_id(0);
-#ifdef DEBUG
+#ifdef DEBUG1
     {
         auto data = a8::MutableXObject::CreateObject();
         data->SetVal("zone_id", 1);
diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto
index f68f3031..7ad95b91 100755
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -1591,6 +1591,11 @@ message CMSetRevivePosition
     optional MFVec3 pos = 1; //子弹当前位置
 }
 
+//获取队伍列表
+message CMGetTeamList
+{
+}
+
 //endcmmsg
 
 //观战error_code == 0 时关闭结算界面,回到战斗界面