diff --git a/config/Activity.xlsx b/config/Activity.xlsx index ee9288ea..29e7b6db 100644 Binary files a/config/Activity.xlsx and b/config/Activity.xlsx differ diff --git a/config/AllLanguage.xlsx b/config/AllLanguage.xlsx index 57c311c3..0799f8ec 100644 Binary files a/config/AllLanguage.xlsx and b/config/AllLanguage.xlsx differ diff --git a/config/Card.xlsx b/config/Card.xlsx index aa2aad88..5924635d 100644 Binary files a/config/Card.xlsx and b/config/Card.xlsx differ diff --git a/config/FurShop.xlsx b/config/FurShop.xlsx new file mode 100644 index 00000000..53b120cc Binary files /dev/null and b/config/FurShop.xlsx differ diff --git a/config/Item.xlsx b/config/Item.xlsx index 58b57ebd..9f7f5570 100644 Binary files a/config/Item.xlsx and b/config/Item.xlsx differ diff --git a/proto/Gameapi.proto b/proto/Gameapi.proto index 43a6452c..89a71f98 100644 --- a/proto/Gameapi.proto +++ b/proto/Gameapi.proto @@ -1463,6 +1463,7 @@ message ResFriendPlayerSimple{ ActLog Last = 16; // 最后一次动态 map Physiology = 17; // 生理状态 位置 =》 状态 string PetName = 18; //宠物名字; + int32 PetFur = 19; //宠物毛皮 } message ResPlayerSimple{ @@ -2278,6 +2279,22 @@ message ResRaceReward{ RES_CODE Code = 1; string Msg = 2; } +//--------------------------[pet fur]------------------------- +//宠物毛皮数据 +message ReqPetFur{} +message ResPetFur{ + repeated int32 FurId = 1; // 拥有毛皮列表 + int32 FurSet = 2; // 设置的毛皮id + int32 FreeCount = 3; //剩余免费次数 +} +//宠物毛皮购买 +message ReqPetFurBuy{ + int32 FurId = 1; // 毛皮商店id +} +message ResPetFurBuy{ + RES_CODE Code = 1; + string Msg = 2; +} //--------------------------【playroom】-------------------------- @@ -2489,6 +2506,7 @@ message ResPlayroomInfo{ int32 UpvoteCount = 15; // 点赞次数 map DressSet = 16; // 服装装饰 位置 =》 服装id int32 Kiss = 17; // 亲吻次数 + int32 Fur = 18; //宠物毛皮 } // 请求翻牌 message ReqPlayroomFlip{