Merge branch 'sdk' into online

proto/Gameapi.proto

@@ -76,6 +76,9 @@ enum ITEM_POP_LABEL { // item弹窗标签
 	CatnipGrandReward = 68; // 猫草大作战大奖奖励
 	CatnipPlay = 69; // 猫草大作战玩法奖励
 	FriendTReward = 70; // 好友时间线奖励
+	PetTheif = 71; // 宠物小偷奖励
+	GuideTaskReward = 72; // 新手任务奖励
+	GuideActiveReward = 73; // 新手任务活跃度奖励
 }
 enum HANDLE_TYPE {
 	ADD = 0;
@@ -127,7 +130,10 @@ enum ORDER_TYPE {
 	Clean_type2      = 8;  // 棋盘空格不足清理棋子的订单
 	COMFORT_TYPE     = 9;  // 安慰订单
 	Guide_type       = 10; // 引导订单
-	Pet_type        = 11; // 宠物订单
+	Pet_type         = 11; // 宠物订单
+	Preview_type     = 12; // 预览订单
+	Fixed_type 	     = 13; // 修复订单
+	Playroom_type   = 14; // playroom订单
 }
 
 enum LOGIN_TYPE {
@@ -402,6 +408,26 @@ message ResPlayerChessInfo{
 	ChessBag ChessBag = 3;
 	repeated string RetireEmit = 4;
 	repeated int32 Honor = 5;
+	PartBag PartBag = 6; // 满级零件
+}
+
+message PartBag{
+	repeated PartBagGrid PartBagGrids = 1; //已解锁零件背包格子
+}
+
+message PartBagGrid{
+	int32 PartId = 1; //零件ID
+	int32 Count = 2; //数量
+}
+
+message ReqPutPartInBag{
+	int32 ChessId = 1; //零件ID
+	map<string, int32> mChessData = 2;
+}
+
+message ResPutPartInBag{
+	RES_CODE code = 1;
+	string msg = 2;
 }
 
 
@@ -753,6 +779,12 @@ message ResDecorateInfo {
 	int32 AreaId = 1;
 	repeated int32 mFinishList = 2;
 	repeated int32 RewardArea = 3; // 已领取区域奖励
+	repeated DecoratePart Parts = 4; // 零件
+}
+
+message DecoratePart{
+	int32 Id = 1;
+	repeated ItemInfo Items = 2; // 零件
 }
 
 // 请求装饰基础信息
@@ -1055,8 +1087,40 @@ message CardPack{
 	repeated int32 Card = 2;
 }
 
-//日常任务
+// 新手任务
+message ResGuideTask{
+	repeated int32 ActiveReward = 1; //已领取活跃度奖励
+	map<int32, GuideTask> Task = 2; //任务进度
+	int32 Active = 3; //活跃度
+	int32 UnlockTime = 4; // 功能解锁时间
+}
+message GuideTask{
+	int32 Status = 1;	//状态 0:未完成， 1已完成 2已领取
+	QuestProgress Progress = 2; //任务进度
+	int32 Id = 3; //任务id
+}
 
+message ReqGetGuideTaskReward{
+	int32 Id = 1;// 任务id
+}
+
+message ResGetGuideTaskReward{
+	RES_CODE Code = 1;
+	string Msg = 2;
+	int32 Id = 3;// 任务id
+}
+
+message ReqGetGuideActiveReward{
+	int32 Id = 1;// 进度奖励id
+}
+
+message ResGetGuideActiveReward{
+	RES_CODE Code = 1;
+	string Msg = 2;
+	int32 Id = 3;// 进度奖励id
+}
+
+//日常任务
 message ResDailyTask{
 	map<int32, DailyWeek> WeekReward = 1; //周奖励
 	map<int32, DailyTask> DailyTask = 2; //任务进度
@@ -1065,6 +1129,8 @@ message ResDailyTask{
 	int32 WeekEnd = 5; //周结束时间戳
 }
 
+
+
 message DailyWeek{
 	repeated ItemInfo Items = 1; //奖励
 	bool Status = 2; //状态 0:未领取 1:已领取
@@ -2047,7 +2113,7 @@ message ResPlayroom{
 	repeated RoomOpponent Opponent = 3; // 对手
 	repeated FriendRoom Friend = 4; // 好友
 	map<int32, int32> Playroom = 5; // 空间装饰 位置 =》 装饰id
-	repeated int32 collect = 6; // 已解锁的装饰
+	repeated PlayroomCollectInfo collect = 6; // 已解锁的装饰
 	map<int32, int32> Mood = 7; // 心情 <位置, 心情>
 	repeated ItemInfo LoseItem = 8; // 损失的道具
 	int32 StartTime = 9; // 开始时间
@@ -2059,7 +2125,7 @@ message ResPlayroom{
 	map<int32, int32> Physiology = 15;
 	map<int32, PlayroomDress> Dress = 16; // 服装仓库 位置 =》 服装id 位置ID： 1 帽子 2 眼镜 3 上衣 4 裤子 5 鞋子 6 连体 7 胡子 8 脸 9 美瞳
 	map<int32, int32> DressSet = 17; // 服装装饰 位置 =》 服装id
-	repeated int32 PetAir = 18; // 宠物背包
+	repeated PlayroomAirInfo PetAir = 18; // 宠物背包
 	int32 PetAirSet = 19; // 宠物背包设置
 	int32 Upvote = 20; // 点赞次数
 	int32 RoomPoint = 21; // 房间积分
@@ -2070,6 +2136,7 @@ message ResPlayroom{
 	int32 Kiss = 26; // 亲吻次数
 	int64 Revenge = 27; // 复仇Uid
 	repeated AdItem AdItem = 28; // 广告奖励信息
+	FriendRoom Target = 29; // 目标房间
 }
 
 message NotifyPlayroomTask{
@@ -2120,7 +2187,29 @@ message ResPlayroomUpvote{
 }
 
 message PlayroomDress{
-	repeated int32 List = 1; // 服装仓库 位置 =》 服装id
+	repeated PlayroomDressInfo List = 1; // 服装仓库 位置 =》 服装id
+}
+
+message PlayroomDressInfo{
+	int32 Id = 1; // 服装id
+	int64 EndTime = 2; // 结束时间
+	int64 AddTime = 3; // 添加时间
+	string Label = 4; // 标签
+}
+
+
+message PlayroomAirInfo{
+	int32 Id = 1; // 服装id
+	int64 EndTime = 2; // 结束时间
+	int64 AddTime = 3; // 添加时间
+	string Label = 4; // 标签
+}
+
+message PlayroomCollectInfo{
+	int32 Id = 1; // 服装id
+	int64 EndTime = 2; // 结束时间
+	int64 AddTime = 3; // 添加时间
+	string Label = 4; // 标签
 }
 
 message ReqPlayroomDressSet{

tool/cfg/cfg_xlsx.json

@@ -36,7 +36,7 @@
             "out_file": "MergeDataEmit.json",
             "key": "Type",
             "sheet_name" :"Emit",
-            "fields" :["Emit_Min_Lv","Ratio", "Product_Type", "Order_Type"]
+            "fields" :["Emit_Min_Lv","Ratio", "Product_Type", "Order_Type", "Retire"]
         },
         {
             "in_file": "StartMerge.xlsx",
@@ -71,7 +71,21 @@
             "out_file": "StartOrder.json",
             "key": "Id",
             "sheet_name" :"StartOrder",
-            "fields" :["Id", "merge_id_list", "step"]
+            "fields" :["Id", "merge_id_list", "appear", "reward","preview", "type"]
+        },
+        {
+            "in_file": "OrderData.xlsx",
+            "out_file": "OrderConst.json",
+            "key": "Key",
+            "sheet_name" :"Const",
+            "fields" :["Key", "Value"]
+        },
+        {
+            "in_file": "OrderData.xlsx",
+            "out_file": "OrderScene.json",
+            "key": "Sence",
+            "sheet_name" :"OrderScene",
+            "fields" :["Factor"]
         },
         {
             "in_file": "UserData.xlsx",
@@ -92,7 +106,7 @@
             "out_file": "IndoorProgress.json",
             "key": "Id",
             "sheet_name" :"IndoorProgress",
-            "fields" :["Id", "Scene", "Lv", "Item", "AreaReward"]
+            "fields" :["Id", "Scene", "Lv", "Item", "AreaReward", "Part"]
         },
         {
             "in_file": "DecorateCost.xlsx",
@@ -435,7 +449,7 @@
             "out_file": "EndlessJackpot.json",
             "key": "Id",
             "sheet_name" :"Jackpot",
-            "fields" :["ItemId", "Type", "Diamond"]
+            "fields" :["ItemId", "Type", "Diamond","Lv"]
         },
         {
             "in_file": "Champship.xlsx",
@@ -723,6 +737,27 @@
             "key": "Key",
             "sheet_name" :"Const",
             "fields" :["Value"]
+        },
+        {
+            "in_file": "GuideTask.xlsx",
+            "out_file": "GuideTaskConst.json",
+            "key": "Key",
+            "sheet_name" :"Const",
+            "fields" :["Value"]
+        },
+        {
+            "in_file": "GuideTask.xlsx",
+            "out_file": "GuideTaskTask.json",
+            "key": "Id",
+            "sheet_name" :"Task",
+            "fields" :["Task","Unlock","Items","Active"]
+        },
+        {
+            "in_file": "GuideTask.xlsx",
+            "out_file": "GuideTaskActive.json",
+            "key": "Id",
+            "sheet_name" :"Active",
+            "fields" :["Active","Items"]
         }
     ]
 }