diff --git a/config/Charge.xlsx b/config/Charge.xlsx index de3924c3..c7bd87b8 100644 Binary files a/config/Charge.xlsx and b/config/Charge.xlsx differ diff --git a/config/Item.xlsx b/config/Item.xlsx index 68f76af2..a2257846 100644 Binary files a/config/Item.xlsx and b/config/Item.xlsx differ diff --git a/config/Playroom.xlsx b/config/Playroom.xlsx index 6aa3a701..460ffaf5 100644 Binary files a/config/Playroom.xlsx and b/config/Playroom.xlsx differ diff --git a/makedown/optimization.md b/makedown/optimization.md index 39fe3753..8fb11a31 100644 --- a/makedown/optimization.md +++ b/makedown/optimization.md @@ -1365,6 +1365,18 @@ message ResPlayroom{ repeated int32 collect = 6; // 已解锁的装饰 map Mood = 7; // 心情 <位置, 心情> repeated ItemInfo LoseItem = 8; // 损失的道具 + int32 StartTime = 9; // 开始时间 + int32 WorkStatus = 10; // 1 工作中 2 休息中 + int32 AllMood = 11; // 总心情 +} + +message NotifyPlayroomWork{ + int32 StartTime = 1; // 开始时间 + int32 WorkStatus = 2; // 1 工作中 2 休息中 +} + +message NotifyPlayroomLose{ + repeated ItemInfo LoseItem = 1; // 损失的道具 } message FriendRoom{ @@ -1399,7 +1411,6 @@ message ResPlayroomInfo{ int32 Status = 8; // 状态 0 未开始 1 选择奖励 2 已结束 } -// playroom 游戏结果 message ReqPlayroomGame{ int32 Type = 1; // 1:绿色 2:黄色 3:红色 } @@ -1409,7 +1420,6 @@ message ResPlayroomGame{ string Msg = 2; } -// playroom 交互 message ReqPlayroomInteract{ int32 Id = 1; // 互动类型 int32 Type = 2; // 1 消耗道具1 2 消耗道具2 @@ -1420,7 +1430,6 @@ message ResPlayroomInteract{ string Msg = 2; } -// playroom装饰 message ReqPlayroomSetRoom{ int32 Id = 1; // 装饰id int32 Pos = 2; // 位置 @@ -1431,7 +1440,6 @@ message ResPlayroomSetRoom{ string Msg = 2; } -// 选择游戏奖励 message ReqPlayroomSelectReward{ int32 Id = 1; // 奖励id } @@ -1441,7 +1449,6 @@ message ResPlayroomSelectReward{ string Msg = 2; } -// 处理 被偷的棋子 message ReqPlayroomLose{} message ResPlayroomLose{ @@ -1449,6 +1456,27 @@ message ResPlayroomLose{ string Msg = 2; } +// 打工 +message ReqPlayroomWork{} +message ResPlayroomWork{ + RES_CODE Code = 1; + string Msg = 2; +} + +// 休息 +message ReqPlayroomRest{} +message ResPlayroomRest{ + RES_CODE Code = 1; + string Msg = 2; +} + +message ReqPlayroomDraw{} +message ResPlayroomDraw{ + RES_CODE Code = 1; + string Msg = 2; + int32 Id = 3; // 奖励Id +} + ``` ## 后台 diff --git a/proto/Gameapi.proto b/proto/Gameapi.proto index 56258d5b..ed97f7ee 100644 --- a/proto/Gameapi.proto +++ b/proto/Gameapi.proto @@ -3363,6 +3363,18 @@ message ResPlayroom{ repeated int32 collect = 6; // 已解锁的装饰 map Mood = 7; // 心情 <位置, 心情> repeated ItemInfo LoseItem = 8; // 损失的道具 + int32 StartTime = 9; // 开始时间 + int32 WorkStatus = 10; // 1 工作中 2 休息中 + int32 AllMood = 11; // 总心情 +} + +message NotifyPlayroomWork{ + int32 StartTime = 1; // 开始时间 + int32 WorkStatus = 2; // 1 工作中 2 休息中 +} + +message NotifyPlayroomLose{ + repeated ItemInfo LoseItem = 1; // 损失的道具 } message FriendRoom{ @@ -3440,4 +3452,25 @@ message ReqPlayroomLose{} message ResPlayroomLose{ RES_CODE Code = 1; string Msg = 2; +} + +// 打工 +message ReqPlayroomWork{} +message ResPlayroomWork{ + RES_CODE Code = 1; + string Msg = 2; +} + +// 休息 +message ReqPlayroomRest{} +message ResPlayroomRest{ + RES_CODE Code = 1; + string Msg = 2; +} + +message ReqPlayroomDraw{} +message ResPlayroomDraw{ + RES_CODE Code = 1; + string Msg = 2; + int32 Id = 3; // 奖励Id } \ No newline at end of file diff --git a/tool/cfg/cfg_xlsx.json b/tool/cfg/cfg_xlsx.json index 9fc6232e..4db2b379 100644 --- a/tool/cfg/cfg_xlsx.json +++ b/tool/cfg/cfg_xlsx.json @@ -435,7 +435,7 @@ "out_file": "PlayroomDecorate.json", "key": "Id", "sheet_name" :"Decorate", - "fields" :["TypeEnum"] + "fields" :["TypeEnum", "Init"] }, { "in_file": "Playroom.xlsx",