diff --git a/server/hallserver/proto/cs_proto.proto b/server/hallserver/proto/cs_proto.proto
index 394c9dab..c4f28de8 100644
--- a/server/hallserver/proto/cs_proto.proto
+++ b/server/hallserver/proto/cs_proto.proto
@@ -81,6 +81,55 @@ message MFTupleString
     repeated string values = 1; //values
 }
 
+//房间信息(房间列表)
+message MFRoom
+{
+    optional string room_id = 1; //房间号
+    optional int32 map_id = 2; //地图id
+    optional int32 zone_id = 3; //区id
+    optional int32 has_passwd = 4; //是否有密码
+    optional int32 team_num = 5; //队伍数
+    optional int32 player_num = 6; //玩家数
+    optional int32 team_max_num = 7; //最大队伍数
+    optional int32 player_max_num = 8; //最大玩家数
+
+    optional string owner_id = 20; //房主账号id
+    optional string owner_name = 11; //房主账号名字
+}
+
+//队伍成员信息
+message MFMember
+{
+    optional string account_id = 1; //账号id
+    optional string name = 2; //mignz
+    optional int32 ping = 20; //ping值(单位毫秒)
+}
+
+//队伍信息
+message MFTeam
+{
+    optional int32 team_id = 1; //队伍id
+    repeated MFMember members = 2; //成员列表
+}
+
+//自己所在房间信息
+message MFCurrentRoom
+{
+    optional string room_id = 1; //房间号
+    optional int32 map_id = 2; //地图id
+    optional int32 zone_id = 3; //区id
+    optional int32 has_passwd = 4; //是否有密码
+    optional int32 team_num = 5; //队伍数
+    optional int32 player_num = 6; //玩家数
+    optional int32 team_max_num = 7; //最大队伍数
+    optional int32 player_max_num = 8; //最大玩家数
+
+    optional string owner_id = 20; //房主账号id
+    optional string owner_name = 21; //房主账号名字
+
+    repeated MFTeam team_list = 30; //队伍列表
+}
+
 //登录
 message CMLogin
 {
@@ -127,7 +176,8 @@ message CMCreateRoom
 
 message SMCreateRoom
 {
-
+    optional int32 errcode = 1; //错误码 0：成功 1:重连失败
+    optional string errmsg = 2; //错误描述
 }
 
 //获取房间列表