Merge branch 'sdk' into online

proto/Gameapi.proto

@@ -86,6 +86,7 @@ enum ITEM_POP_LABEL { // item弹窗标签
 	ApplyFriendSponsor = 78; // 申请好友赞助
 	PetFurShop = 79; //宠物毛皮商店购买
 	ActTypeAddGift = 80; // 加送礼包
+	CatReturnGiftReward = 81; // 猫咪回归礼包奖励
 }
 enum HANDLE_TYPE {
 	ADD = 0;
@@ -1588,6 +1589,7 @@ message ResPlayerRank{
 	int32 FurSet = 10; // 毛皮设置
 	ActLog Last = 11; //最后一条活动日志
 	string PetName = 12; // 宠物名字
+	int32 Rank = 13; // 排名
 }
 
 message ResFriendLog{
@@ -1608,6 +1610,7 @@ message FriendBubbleInfo{
 	int32 Id = 1; // 气泡id
 	int32 Type = 2; // 气泡类型 1:普通 2:
 	repeated ItemInfo Items = 3; // 奖励
+	int64 Uid = 4; // 相关玩家uid
 }
 
 message NotifyFriendCard{
@@ -2152,8 +2155,36 @@ message ResChampship{
 	int32 Status = 7;
 	int32 TodayActivityId = 8;//今日生效的活动类型
 	int32 YesterdayActivityId = 9;//昨日生效的活动类型
+	ChampionshipCfg Cfg = 10; // 锦标赛配置
+	string Title = 11; // 锦标赛标题
+	int32 StartTime = 12; // 锦标赛开始时间
 }
 
+message ChampionshipCfg{
+	int32 Id = 1; // 锦标赛id
+	int32 Skin = 2; // 锦标赛皮肤
+	repeated ChampionshipCfgJackpot JackpotList = 3; // 锦标赛奖池
+	repeated ChampionshipCfgRank RankList = 4; // 锦标赛排行奖励
+	int32 ClearTime = 5; // 锦标赛清空时间
+	string Title = 6; // 锦标赛标题
+}
+
+message ChampionshipCfgJackpot{
+	int32 Id = 1; // 锦标赛奖池id
+	int32 Score = 2; // 锦标赛积分
+	int32 Total = 3; // 锦标赛总积分
+	repeated ItemInfo Items = 4; // 奖励
+	int32 StarReward = 5; // 星星奖励
+}
+
+message ChampionshipCfgRank{
+	int32 Id = 1; // 锦标赛排行奖励id
+	int32 Min = 2; // 锦标赛排行最小值
+	int32 Max = 3; // 锦标赛排行最大值
+	repeated ItemInfo Items = 4; // 奖励
+}
+
+
 // 获取锦标赛奖励
 message ReqChampshipReward{}
 
@@ -2186,6 +2217,7 @@ message ResChampshipPreRank{
  	map<int32, ResPlayerRank> RankList = 1; // 榜单数据
  	int32 MyRank = 2; // 我的排行
  	float MyScore = 3; //我的积分
+	ChampionshipCfg Cfg = 4; // 锦标赛配置
 }
 
 message ResNotifyCard{
@@ -2254,6 +2286,58 @@ message ReqAutoAddInviteFriend2{
 message ResAutoAddInviteFriend2{
 	int32 ResultCode = 1;
 }
+// 猫猫回礼活动
+message ReqCatReturnGift{}
+
+message CatReturnGiftCfg{
+	int32 Skin = 1; // 皮肤id
+	int32 Prob = 2; // 权重
+	repeated CatReturnGiftCfgReward RewardList = 3; // 奖励列表
+	int32 ClearTime = 4; // 清空分数时间
+}
+
+message CatReturnGiftCfgReward{
+	int32 Id = 1; // 奖励id
+	int32 Score = 2; // 当前档次积分
+	repeated ItemInfo Reward = 3; // 奖励
+	int32 Total = 4; // 总积分
+	int32 StarReward = 5; // 星星奖励
+}
+
+message ResCatReturnGift{
+	int32 Id = 1; // 活动id
+	int64 StartTime = 2; // 活动开始时间
+	int64 EndTime = 3; // 活动结束时间
+	int32 Score = 4; // 分数
+	int32 Reward = 5; // 奖励
+	CatReturnGiftCfg Cfg = 6; // 活动配置
+}
+
+message ReqCatReturnGiftScore{
+	int32 Score = 1; // 本次增加的分数
+}
+
+message ResCatReturnGiftScore{
+	RES_CODE Code = 1;
+	string Msg = 2;
+}
+
+message ReqCatReturnGiftReward{}
+
+message ResCatReturnGiftReward{
+	RES_CODE Code = 1;
+	string Msg = 2;
+}
+
+message ReqCatReturnGiftRewardGift{
+	int32 Id = 1; // 奖励id
+}
+
+message ResCatReturnGiftRewardGift{
+	RES_CODE Code = 1;
+	string Msg = 2;
+}
+
 
 // 挖矿活动
 message ReqMining{}
@@ -2574,8 +2658,8 @@ message ResPlayroomPetAirSet{
 }
 
 // 处理离线打工
-message ReqPlayroomWrokOutline{} 
-message ResPlayroomWrokOutline{
+message ReqPlayroomWorkOutline{} 
+message ResPlayroomWorkOutline{
 	RES_CODE Code = 1;
 	string Msg = 2;
 }
@@ -3105,7 +3189,69 @@ message ResOrderShipping{
 	string Msg = 2;
 }
 
+message UserDetailParam{
+	int64 Uid = 1;
+}
+
+message ResUserDetail{
+	int32 Code = 1;
+	string Msg = 2;
+	ResUserDetailInfo info = 3;
+}
+
+message UserDetailFriendInfo {
+    int64  Uid        = 1;
+    string NickName   = 2;
+    int32  Avatar     = 3;
+    int32  Level      = 4;
+    int64  LogoutTime = 5;
+    int64  LoginTime  = 6;
+	string AvatarUrl = 7;
+	bool OnlineStatus = 8;
+}
+
+message UserDetailOrderInfo {
+    string Id      = 1;
+    int32  Type    = 2;
+    int64  Time    = 3;
+    repeated UserDetailOrderInfoChess Chess = 4;
+    int32  Diff    = 5;
+	repeated UserDetailOrderInfoChess ChessId = 6;
+}
+
+message UserDetailOrderInfoChess {
+	int32 Id = 1;
+	string Icon = 2;
+}
+
+message ResUserDetailInfo {
+    string Name                                    = 1;
+    int64  Uid                                     = 2;
+    int32  AreaId                                  = 3;
+    int32  Face                                    = 4;
+    int32  Charge                                  = 5;
+    int32  MaxCharge                               = 6;
+    int32  Level                                   = 7;
+    int64  Diamond                                 = 8;
+    int32  Star                                    = 9;
+    int32  Energy                                  = 10;
+    string Mac                                     = 11;
+    int64  Login                                   = 12;
+    int64  Cumulative                              = 13;
+    int64  RegisterTime                            = 14;
+    int64  TodayCumulative                         = 15;
+    bool   Ban                                     = 16;
+    int32  Bonus                                   = 17;
+    string Code                                    = 18;
+    map<string, int32>             ChessMap         = 19;
+    repeated ActLog               ActLog           = 20;
+    int32                         AdWatch          = 21;
+    repeated UserDetailFriendInfo FriendList       = 22;
+    repeated UserDetailOrderInfo  Order            = 23;
+}
+
 service Backend {
 	rpc ReloadActivity(ReqActivityCfgReload) returns (ResActivityCfgReload); 
 	rpc OrderShipping(ReqOrderShipping) returns (ResOrderShipping);
+	rpc UserDetail(UserDetailParam) returns (ResUserDetail);
 }

tool/cfg/cfg_txt.json

@@ -130,7 +130,6 @@
             "string"
          ]
       },
-
       {
          "in_file": "Champship.xlsx",
          "out_file": "ChampshipCfg.txt",
@@ -214,7 +213,7 @@
             "int"
          ]
       },
-            {
+      {
          "in_file": "Collect.xlsx",
          "out_file": "CollectionsUnlockLineData.txt",
          "sheet_name": "CollectionsUnlockLine",
@@ -319,6 +318,16 @@
             "string"
          ]
       },
+      {
+         "in_file": "DecorateCost.xlsx",
+         "out_file": "DecorateConst.txt",
+         "sheet_name": "Const",
+         "coloum_type": [
+            "int",
+            "string",
+            "string"
+         ]
+      },
       {
          "in_file": "DialogueData.xlsx",
          "out_file": "DialogData.txt",
@@ -1254,7 +1263,7 @@
             "string"
          ]
       },
-            {
+      {
          "in_file": "LimitedTimeEvent.xlsx",
          "out_file": "LimitedTimeEventConst.txt",
          "sheet_name": "Const",
@@ -1263,6 +1272,19 @@
             "string",
             "string"
          ]
+      },
+      {
+         "in_file": "LimitedTimeEvent.xlsx",
+         "out_file": "BuildingFeverDecorateOff.txt",
+         "sheet_name": "DecorateOff",
+         "coloum_type": [
+            "int",
+            "int",
+            "int",
+            "int",
+            "int",
+            "int"
+         ]
       }
    ]
 }