From 100cb536f974c21d338181a4251ff804dcce4cc4 Mon Sep 17 00:00:00 2001
From: hahwu <31872165+hahwu@users.noreply.github.com>
Date: Mon, 24 Feb 2025 15:08:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=83=85=E5=8A=9F=E8=83=BD=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 proto/Gameapi.proto | 37 +++++++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/proto/Gameapi.proto b/proto/Gameapi.proto
index 21d676f9..0236333a 100644
--- a/proto/Gameapi.proto
+++ b/proto/Gameapi.proto
@@ -469,6 +469,7 @@ message UserInfo {
 	repeated FaceInfo FaceList = 7;
 	int32 Login = 8; // 登录
 	string PetName = 9; //宠物名字
+	repeated EmojiInfo EmojiList = 10; // 表情
 }
 
 // 设置昵称
@@ -899,8 +900,9 @@ message ResFaceInfo{
 	int32 SetId = 2;
 }
 message FaceInfo{
-	int32 Id = 1;
-	int64 EndTime = 2;
+	int32 Id = 1; // 头像id
+	int64 EndTime = 2; // 结束时间
+	int64 AddTime = 3; // 添加时间
 }
 
 message ReqSetFace{
@@ -920,8 +922,9 @@ message ResAvatarInfo{
 }
 
 message AvatarInfo{
-	int32 Id = 1;
-	int64 EndTime = 2;
+	int32 Id = 1; // 头像框id
+	int64 EndTime = 2; // 结束时间
+	int64 AddTime = 3; // 添加时间
 }
 message ReqSetAvatar{
 	int32 Avatar = 1;
@@ -932,6 +935,30 @@ message ResSetAvatar{
 	string Msg = 2;
 }
 
+// 表情 Emoji
+message ReqEmojiInfo{} // 请求表情信息
+message ResEmojiInfo{
+	repeated EmojiInfo EmojiList = 1; //  表情列表
+	map<int32, int32> SetId = 2; // 已设置的表情 类型 =》 id
+}
+
+message EmojiInfo{
+	int32 Id = 1; // 表情id
+	int64 EndTime = 2; // 结束时间
+	int64 AddTime = 3; // 添加时间
+}
+
+// 设置表情
+message ReqSetEmoji{
+	int32 Id = 1; // 表情Id
+	int32 Type = 2; // 表情类型 Greeting = 0, Happy = 1, Taunt = 2, Fail = 3
+}
+
+message ResSetEmoji{
+	RES_CODE Code = 1;
+	string Msg = 2;
+}
+
 // 七日签到
 message ResSevenLogin{
 	repeated SevenLoginReward WeekReward = 1; //周奖励
@@ -1072,6 +1099,7 @@ message ResPlayerSimple{
 	int32 login = 7; 
 	int32 loginout = 8;
 	string Facebook = 9;
+	map<int32, int32> Emoji = 10; // 表情
 }
 
 message ResPlayerRank{
@@ -1686,6 +1714,7 @@ message ResPlayroomInfo{
 	map<int32, int32> flip = 10; // 翻牌 <位置, 牌>
 	int32 Chip = 11; // 碎片
 	string PetName = 12; // 宠物名
+	map<int32, int32> Emoji = 13; // 表情
 
 }