Merge branch 'main' of gitea.bywaystudios.com:wuminzhe/docs

# Conflicts:
#	config/Playroom.xlsx

proto/Gameapi.proto

@@ -59,6 +59,10 @@ enum ITEM_POP_LABEL { // item弹窗标签
 	CardSeasonFirstReward = 52; // 卡牌赛季初奖励
 	AllCollectRewardHB = 53; // 图鉴全收集奖励 图鉴体力补发
 	PlayroomShop = 54; // playroom商店
+	HandbookAllReward = 55; // 图鉴收集奖励
+	TLUpvote = 56; // 时间线点赞
+	Collect = 57; // 收集
+	ActivityGift = 58; // 活动礼包
 }
 enum HANDLE_TYPE {
 	ADD = 0;
@@ -300,6 +304,7 @@ message ResUpdatePlayerChessData{
     string msg = 2;
 }
 
+// 分离器
 message ReqSeparateChess{
 	int32 ChessId = 1;
 	map<string, int32> mChessData = 2;
@@ -310,6 +315,17 @@ message ResSeparateChess{
 	string msg = 2;
 }
 
+// 神奇魔术棒（升级器）
+message ReqUpgradeChess{
+	int32 ChessId = 1;
+	map<string, int32> mChessData = 2;
+}
+
+message ResUpgradeChess{
+	RES_CODE code = 1;
+	string msg = 2;
+}
+
 // 从缓存中获取棋子
 message ReqGetChessFromBuff{
 	int32 ChessId = 1;
@@ -469,6 +485,8 @@ message UserInfo {
 	repeated FaceInfo FaceList = 7;
 	int32 Login = 8; // 登录
 	string PetName = 9; //宠物名字
+	repeated EmojiInfo EmojiList = 10; // 表情列表
+	map<int32, int32> SetEmoji = 11; // 已设置的头像
 }
 
 // 设置昵称
@@ -512,6 +530,11 @@ message ReqGetHandbookReward {
 	int32 ChessId = 1;
 }
 
+message ResGetHandbookReward{
+	RES_CODE Code = 1;
+	string Msg = 2;
+}
+
 message HandbookInfo {
 	int32 ChessId = 1;
 	int32 Status = 2;
@@ -521,11 +544,16 @@ message Handbook {
 	repeated HandbookInfo Handbooks = 1;
 }
 
-message ResGetHandbookReward{
+message RegHandbookAllReward{
+	string Type = 1; // "棋子系列 A B C"
+}
+
+message ResHandbookAllReward{
 	RES_CODE Code = 1;
 	string Msg = 2;
 }
 
+
 message ReqRewardOrder{
 	int32 OrderId = 1;
 	map<string, int32> mChessData = 2;
@@ -546,6 +574,15 @@ message ResDelOrder{
 	string Msg = 2;
 }
 
+// 获取出售棋子获得的星星数量
+message ReqSellChessNum{
+	int32 ChessId = 1;
+}
+
+message ResSellChessNum{
+	int32 Num = 1;
+}
+
 message Order{
 	int32 Id = 1;
 	repeated int32 ChessId = 2;
@@ -899,8 +936,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 +958,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 +971,24 @@ message ResSetAvatar{
 	string Msg = 2;
 }
 
+// 表情 Emoji
+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; //周奖励
@@ -1037,7 +1094,12 @@ message ResChessRainReward{
 	int32 Id = 2; // 转盘id
 }
 
-
+message ReqFastProduceInfo{}
+message ResFastProduceInfo{
+	int32 Energy = 1; // 快手能量
+	int32 Num = 2; // 快手次数
+	int64 EndTime = 3; // 结束时间
+}
 
 // 连技快手奖励
 message ReqFastProduceReward{
@@ -1047,6 +1109,8 @@ message ReqFastProduceReward{
 message ResFastProduceReward{
 	RES_CODE Code = 1;
 	string Msg = 2;
+	int64 EndTime = 3;
+	int32 Num = 4;
 }
 
 // 好友
@@ -1072,6 +1136,7 @@ message ResPlayerSimple{
 	int32 login = 7; 
 	int32 loginout = 8;
 	string Facebook = 9;
+	map<int32, int32> Emoji = 10; // 表情
 }
 
 message ResPlayerRank{
@@ -1089,6 +1154,7 @@ message ResFriendLog{
 	int32 Time = 3;
 	string Param = 4;
 	int32 Id = 5;
+	bool Upvote = 6; // 是否点赞
 }
 
 message NotifyFriendLog{
@@ -1166,6 +1232,17 @@ message ResFriendTimeLine{
 	repeated ResFriendLog Log = 1;
 }
 
+// 时间线点赞
+message ReqFriendTLUpvote{
+	int32 Id = 1;
+}
+
+message ResFriendTLUpvote{
+	RES_CODE Code = 1;
+	string Msg = 2;
+	int32 Id = 3;
+}
+
 message ResFriendApplyNotify{
 	ResPlayerSimple Player = 1;
 	int32 Type = 2; // 1:申请 2:同意 3:拒绝 4:删除
@@ -1686,6 +1763,7 @@ message ResPlayroomInfo{
 	map<int32, int32> flip = 10; // 翻牌 <位置, 牌>
 	int32 Chip = 11; // 碎片
 	string PetName = 12; // 宠物名
+	map<int32, int32> Emoji = 13; // 表情
 
 }
 
@@ -1865,6 +1943,28 @@ message ReqKafkaLog{
 	string Data = 2; 
 }
 
+message ReqCollectInfo{}
+
+message ResCollectInfo{
+	repeated int32 Id = 1; //  [1,10,19]
+	repeated CollectItem Items = 2; // 领奖道具
+}
+
+message CollectItem{
+	int32 Id = 1; // 索引
+	repeated ItemInfo Items = 2; // 领奖道具
+}
+
+message ReqCollect{
+	int32 Id = 1; // 领奖id
+}
+
+message ResCollect{
+	RES_CODE Code = 1;
+	string Msg = 2;
+}
+
+
 // -------------------后台管理-------------------
 message AdminReq{
 	string Func = 1;

tool/cfg/cfg_txt.json

@@ -19,6 +19,37 @@
           "out_file":"SensitiveWords.txt",
           "sheet_name":"SensitiveWords",
           "coloum_type":["int","string"]
+         },
+         {
+          "in_file":"Avatar.xlsx",
+          "out_file":"FrameData.txt",
+          "sheet_name":"Avatar",
+          "coloum_type":["int","string","string","int","string"]
+         },
+         {
+          "in_file":"Emoji.xlsx",
+          "out_file":"EmojiData.txt",
+          "sheet_name":"Emoji",
+          "coloum_type":["int","string","string","int","string","string"]
+         },
+         {
+          "in_file":"Face.xlsx",
+          "out_file":"HeadData.txt",
+          "sheet_name":"Face",
+          "coloum_type":["int","string","string","int","string"]
+         },
+         {
+          "in_file":"Collect.xlsx",
+          "out_file":"CollectionsRewardsData.txt",
+          "sheet_name":"Collect",
+          "coloum_type":["int","int","int","int"]
+         },
+         {
+          "in_file":"Item.xlsx",
+          "out_file":"NetworkItemData.txt",
+          "sheet_name":"Item",
+          "coloum_type":["int","String","int","string"]
          }
+
       ]
 }

tool/cfg/cfg_xlsx.json

@@ -192,6 +192,13 @@
             "sheet_name" :"Avatar",
             "fields" :["Init"]
         },
+        {
+            "in_file": "Emoji.xlsx",
+            "out_file": "Emoji.json",
+            "key": "Id",
+            "sheet_name" :"Emoji",
+            "fields" :["Type", "Init"]
+        },
         {
             "in_file": "SevenLoginCfg.xlsx",
             "out_file": "SevenLogin.json",
@@ -232,7 +239,14 @@
             "out_file": "Activity.json",
             "key": "Id",
             "sheet_name" :"Activity",
-            "fields" :["Type", "StartTime", "EndTime", "Name", "Title", "Mail", "Reward"]
+            "fields" :["Type", "AType", "StartTime", "EndTime", "Name", "Title", "Mail", "Reward"]
+        },
+        {
+            "in_file": "Activity.xlsx",
+            "out_file": "ActivityGift.json",
+            "key": "Id",
+            "sheet_name" :"Gift",
+            "fields" :["AId", "ChargeId", "Items"]
         },
         {
             "in_file": "LimitedTimeEvent.xlsx",
@@ -535,6 +549,34 @@
             "sheet_name" :"LoginBack",
             "fields" :["Num1", "Num2"]
         },
+        {
+            "in_file": "Handbook.xlsx",
+            "out_file": "Handbook.json",
+            "key": "Type",
+            "sheet_name" :"Handbook",
+            "fields" :["Items"]
+        },
+        {
+            "in_file": "Collect.xlsx",
+            "out_file": "Collect.json",
+            "key": "Id",
+            "sheet_name" :"Collect",
+            "fields" :["Type", "Need"]
+        },
+        {
+            "in_file": "Collect.xlsx",
+            "out_file": "CollectJackpot.json",
+            "key": "Id",
+            "sheet_name" :"Jackpot",
+            "fields" :["Items"]
+        },
+        {
+            "in_file": "Handbook.xlsx",
+            "out_file": "HandbookConst.json",
+            "key": "Key",
+            "sheet_name" :"Const",
+            "fields" :["Value"]
+        },
         {
             "in_file": "FriendTreasure.xlsx",
             "out_file": "FriendTreasureProb.json",
@@ -548,6 +590,13 @@
             "key": "Id",
             "sheet_name" :"Chest",
             "fields" :["Items", "Prob"]
+        },
+        {
+            "in_file": "FriendTreasure.xlsx",
+            "out_file": "FriendTreasureConst.json",
+            "key": "Key",
+            "sheet_name" :"Const",
+            "fields" :["Value"]
         }
-        ]
+    ]
 }