Merge branch 'main' into online

proto/Gameapi.proto

@@ -72,6 +72,8 @@ enum ITEM_POP_LABEL { // item弹窗标签
 	PlayroomTaskReward = 64; // playroom任务奖励 大奖
 	PlayroomUpvote = 65; // 玩家点赞
 	DecorateReward = 66; // 装饰奖励
+	CatnipReward = 67; // 猫草大作战奖励
+	CatnipGrandReward = 68; // 猫草大作战大奖奖励
 }
 enum HANDLE_TYPE {
 	ADD = 0;
@@ -580,6 +582,8 @@ message ResPlayerBriefProfileData{
 	string NickName = 5;
 	string PicURL = 6;
 	int32 ActiveTime = 7;
+	map<int32, int32> SetEmoji = 11; // 已设置的头像
+
 }
 
 //******************NEW VERSION*****************
@@ -2407,6 +2411,99 @@ message ResCollect{
 	RES_CODE Code = 1;
 	string Msg = 2;
 }
+// #region 猫草大作战
+//----------------【猫草大作战】--------------
+// 猫草大作战详细信息
+message ReqCatnip{}
+message ResCatnip{
+	int32 Id = 1; // 活动id
+	int32 Status = 2; // 0 未开始 1 进行中 2 已结束
+	int32 EndTime = 3; // 结束时间
+	int32 Template = 4; // 模板
+	repeated CatnipGame GameList = 5; // 小游戏列表
+}
+
+// 小游戏信息
+message CatnipGame{
+	int32 Id = 1; // 猫草id
+	int32 Status = 2; // 0 未开始 1 进行中 2 已结束
+	int32 Progress = 3; // 进度
+	repeated int32 Reward = 4; // 已领取进度奖励列表 [100,150,200]
+	ResPlayerSimple Partner = 5; // 伙伴
+}
+
+// 邀请好友
+message ReqCatnipInvite{
+	int32 Id = 1; // 猫草id
+	int64 Uid = 2; // 好友id
+}
+
+message ResCatnipInvite{
+	RES_CODE Code = 1;
+	string Msg = 2;
+}
+
+// 同意邀请
+message ReqCatnipAgree{
+	int32 Id = 1; // 游戏id
+	int64 Uid = 2; // 好友id
+}
+
+message ResCatnipAgree{
+	RES_CODE Code = 1;
+	string Msg = 2;
+}
+
+message ReqCatnipRefuse{
+	int32 Id = 1; // 游戏id
+	int64 Uid = 2; // 好友id
+}
+
+message ResCatnipRefuse{
+	RES_CODE Code = 1;
+	string Msg = 2;
+}
+
+// 设置游戏倍数
+message ReqCatnipMultiply{
+	int32 Id = 1; // 猫草id
+	int32 Multiply = 2; // 倍数
+}
+
+message ResCatnipMultiply{
+	RES_CODE Code = 1;
+	string Msg = 2;
+}
+
+// 游戏转盘
+message ReqCatnipPlay{
+	int32 Id = 1; // 猫草id
+}
+
+message ResCatnipPlay{
+	RES_CODE Code = 1;
+	string Msg = 2;
+	int32 Id = 3; // 猫草id
+}
+
+// 领取阶段奖励
+message ReqCatnipReward{
+	int32 Id = 1; // 猫草id
+	int32 Progress = 2; // 进度
+}
+
+message ResCatnipReward{
+	RES_CODE Code = 1;
+	string Msg = 2;
+}
+
+// 领取大奖
+message ReqCatnipGrandReward{
+}
+message ResCatnipGrandReward{
+	RES_CODE Code = 1;
+	string Msg = 2;
+}
 
 
 // -------------------后台管理-------------------

tool/cfg/cfg_xlsx.json

@@ -472,6 +472,34 @@
             "sheet_name" :"RandomNameDataBase",
             "fields" :["EnName", "CnName", "Gender"]
         },
+        {
+            "in_file": "Catnip.xlsx",
+            "out_file": "CatnipTemplate.json",
+            "key": "Id",
+            "sheet_name" :"template",
+            "fields" :["Template", "PassNum", "ItemCost", "ItemId", "Reward"]
+        },
+        {
+            "in_file": "Catnip.xlsx",
+            "out_file": "CatnipJackpot.json",
+            "key": "Id",
+            "sheet_name" :"Jackpot",
+            "fields" :["Items", "Growth"]
+        },
+        {
+            "in_file": "Catnip.xlsx",
+            "out_file": "CatnipMultiplier.json",
+            "key": "Id",
+            "sheet_name" :"Multiplier",
+            "fields" :["Low", "Mid", "High"]
+        },
+        {
+            "in_file": "Catnip.xlsx",
+            "out_file": "CatnipGame.json",
+            "key": "Id",
+            "sheet_name" :"Game",
+            "fields" :["Template", "Need", "Items"]
+        },
         {
             "in_file": "Mining.xlsx",
             "out_file": "MiningTemplate.json",