diff --git a/config/Item.xlsx b/config/Item.xlsx
index 9e4f62a4..68f76af2 100644
Binary files a/config/Item.xlsx and b/config/Item.xlsx differ
diff --git a/config/MergeData.xlsx b/config/MergeData.xlsx
index acb26895..e222de11 100644
Binary files a/config/MergeData.xlsx and b/config/MergeData.xlsx differ
diff --git a/config/Playroom.xlsx b/config/Playroom.xlsx
new file mode 100644
index 00000000..6aa3a701
Binary files /dev/null and b/config/Playroom.xlsx differ
diff --git a/makedown/optimization.md b/makedown/optimization.md
index 03bff7cd..c24d7d94 100644
--- a/makedown/optimization.md
+++ b/makedown/optimization.md
@@ -1031,6 +1031,7 @@ message ResBuyChessShop{
  RES_CODE Code = 1;
  string Msg = 2;
 }
+
 // 商店购买棋子
 message ReqBuyChessShop2{
     int32 Id = 1;
@@ -1348,6 +1349,81 @@ message ItemNotify{
     map<int32, int32> Item = 1;  // 道具id =》 变化的数量
 }
 
+```
+
+## playroom
+
+```protobuf
+
+message ReqPlayroom{} // 请求我的空间信息
+
+message ResPlayroom{
+    int32 status = 1; // 状态
+    repeated ItemInfo Items = 2; // 触发式订单奖励
+    repeated RoomOpponent Opponent = 3; // 对手
+    repeated FriendRoom Friend = 4; // 好友
+    map<int32, int32> Playroom = 5; // 空间装饰 位置 =》 装饰id
+    repeated int32 collect = 6; // 已解锁的装饰
+    map<int32, int32> Mood = 7; // 心情 <位置, 心情>
+}
+
+message FriendRoom{
+    int32 Uid = 1;
+    string Name = 2;
+    int32 Face = 3;
+    int32 Avatar = 4;
+    int32 Times = 5; // 以你为目标的次数
+}
+
+message RoomOpponent{
+    int32 Uid = 1;
+    string Name = 2;
+    int32 Face = 3;
+    int32 Avatar = 4;
+    int32 LastTime = 5; // 上次被攻击时间
+}
+
+// 请求拜访空间信息
+message ReqPlayroomInfo{
+    int32 Uid = 1;
+} 
+
+message ResPlayroomInfo{
+    int32 Uid = 1;
+    string name = 2;
+    int32 Face = 3;
+    int32 Avatar = 4;
+    map<int32, int32> Playroom = 5; // 空间装饰 位置 =》 装饰id
+    int32 GameId = 6; // 游戏id
+    map<int32, ItemInfo> Items = 7; // 游戏奖励
+    int32  Status = 8; // 状态
+}
+
+message ReqPlayroomGame{
+    int32 Type = 1; // 1:绿色 2：黄色 3：红色
+}
+
+message ReqPlayroomInteract{
+    int32 Id = 1; // 互动类型
+    int32 Type = 2; // 1 消耗道具1 2 消耗道具2
+}
+
+message ResPlayroomInteract{
+    RES_CODE Code = 1;
+    string Msg = 2;
+}
+
+message ReqPlayroomSetRoom{
+    int32 Id = 1; // 装饰id
+    int32 Pos = 2; // 位置
+}
+
+message ReqPlayroomSetRoom{
+    RES_CODE Code = 1;
+    string Msg = 2;
+}
+
+
 ```
 
 ## 后台
diff --git a/proto/Gameapi.proto b/proto/Gameapi.proto
index df4bae9d..2189915f 100644
--- a/proto/Gameapi.proto
+++ b/proto/Gameapi.proto
@@ -3350,4 +3350,74 @@ message ReqRaceReward{}
 message ResRaceReward{
 	RES_CODE Code = 1;
 	string Msg = 2;
-}
\ No newline at end of file
+}
+
+message ReqPlayroom{} // 请求我的空间信息
+
+message ResPlayroom{
+	int32 status = 1; // 状态
+	repeated ItemInfo Items = 2; // 触发式订单奖励
+	repeated RoomOpponent Opponent = 3; // 对手
+	repeated FriendRoom Friend = 4; // 好友
+	map<int32, int32> Playroom = 5; // 空间装饰 位置 =》 装饰id
+	repeated int32 collect = 6; // 已解锁的装饰
+	map<int32, int32> Mood = 7; // 心情 <位置, 心情>
+}
+
+message FriendRoom{
+	int32 Uid = 1;
+	string Name = 2;
+	int32 Face = 3;
+	int32 Avatar = 4;
+	int32 Times = 5; // 以你为目标的次数
+}
+
+message RoomOpponent{
+	int32 Uid = 1;
+	string Name = 2;
+	int32 Face = 3;
+	int32 Avatar = 4;
+	int32 LastTime = 5; // 上次被攻击时间
+}
+
+// 请求拜访空间信息
+message ReqPlayroomInfo{
+	int32 Uid = 1;
+} 
+
+message ResPlayroomInfo{
+	int32 Uid = 1;
+	string name = 2;
+	int32 Face = 3;
+	int32 Avatar = 4;
+	map<int32, int32> Playroom = 5; // 空间装饰 位置 =》 装饰id
+	int32 GameId = 6; // 游戏id
+	map<int32, ItemInfo> Items = 7; // 游戏奖励
+	int32  Status = 8; // 状态
+}
+
+message ReqPlayroomGame{
+	int32 Type = 1; // 1:绿色 2：黄色 3：红色
+}
+
+message ReqPlayroomInteract{
+	int32 Id = 1; // 互动类型
+	int32 Type = 2; // 1 消耗道具1 2 消耗道具2
+}
+
+message ResPlayroomInteract{
+	RES_CODE Code = 1;
+	string Msg = 2;
+}
+
+message ReqPlayroomSetRoom{
+	int32 Id = 1; // 装饰id
+	int32 Pos = 2; // 位置
+}
+
+message ReqPlayroomSetRoom{
+	RES_CODE Code = 1;
+	string Msg = 2;
+}
+
+
diff --git a/tool/cfg/cfg_xlsx.json b/tool/cfg/cfg_xlsx.json
index 9eaa693a..9fc6232e 100644
--- a/tool/cfg/cfg_xlsx.json
+++ b/tool/cfg/cfg_xlsx.json
@@ -8,7 +8,7 @@
             "out_file": "MergeData.json",
             "key": "Id",
             "sheet_name" :"MergeData",
-            "fields" :["Id", "Icon", "Lv", "MaxLv", "MergeId", "SellType", "SellNum", "SellDiamond", "CoolTime", "Star", "Type", "Emit_Product", "Product_Type", "Color", "Emit_ID", "PType"]
+            "fields" :["Id", "Icon", "Lv", "MaxLv", "MergeId", "SellType", "SellNum", "SellDiamond", "CoolTime", "Star", "Type", "Emit_Product", "Product_Type", "Color", "Emit_ID", "PType", "Emit_Min_Lv"]
         },
         {
             "in_file": "MergeData.xlsx",
@@ -422,6 +422,27 @@
             "key": "Id",
             "sheet_name" :"Pass",
             "fields" :["Num", "Need"]
+        },
+        {
+            "in_file": "Playroom.xlsx",
+            "out_file": "PlayroomConst.json",
+            "key": "Key",
+            "sheet_name" :"Const",
+            "fields" :["Value"]
+        },
+        {
+            "in_file": "Playroom.xlsx",
+            "out_file": "PlayroomDecorate.json",
+            "key": "Id",
+            "sheet_name" :"Decorate",
+            "fields" :["TypeEnum"]
+        },
+        {
+            "in_file": "Playroom.xlsx",
+            "out_file": "PlayroomMood.json",
+            "key": "Id",
+            "sheet_name" :"Mood",
+            "fields" :["Type", "Cost", "Cost2", "Effect"]
         }
         ]
 }
\ No newline at end of file