From 2a7bd5b7bdd4a63fe3b9f132082fc1fd4247bb50 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Tue, 10 Dec 2024 18:33:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/Playroom.xlsx | Bin 15765 -> 15800 bytes makedown/optimization.md | 4 +++- proto/Gameapi.proto | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/config/Playroom.xlsx b/config/Playroom.xlsx index 460ffaf57d95db996304c1f5611f3873ffea2d03..b67dd4d1fba60aa73bd441f420b858f07bf4954d 100644 GIT binary patch delta 5903 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 delta 5857 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 diff --git a/makedown/optimization.md b/makedown/optimization.md index 69658f80..523536f0 100644 --- a/makedown/optimization.md +++ b/makedown/optimization.md @@ -1379,7 +1379,9 @@ message NotifyPlayroomWork{ message NotifyPlayroomLose{ repeated ItemInfo LoseItem = 1; // 损失的道具 } - +message NotifyPlayroomMood{ + map Mood = 1; // 心情 <位置, 心情> +} message FriendRoom{ int32 Uid = 1; string Name = 2; diff --git a/proto/Gameapi.proto b/proto/Gameapi.proto index 287704ea..3ecb8716 100644 --- a/proto/Gameapi.proto +++ b/proto/Gameapi.proto @@ -3380,6 +3380,10 @@ message NotifyPlayroomLose{ repeated ItemInfo LoseItem = 1; // 损失的道具 } +message NotifyPlayroomMood{ + map Mood = 1; // 心情 <位置, 心情> +} + message FriendRoom{ int32 Uid = 1; string Name = 2;