diff --git a/config/Avatar.xlsx b/config/Avatar.xlsx index a7e37142..e03613d4 100644 Binary files a/config/Avatar.xlsx and b/config/Avatar.xlsx differ diff --git a/config/Face.xlsx b/config/Face.xlsx index 9ee8dbf2..4712d3f7 100644 Binary files a/config/Face.xlsx and b/config/Face.xlsx differ diff --git a/config/Item.xlsx b/config/Item.xlsx index 7c0f1cbc..fe4b2a28 100644 Binary files a/config/Item.xlsx and b/config/Item.xlsx differ diff --git a/makedown/optimization.md b/makedown/optimization.md index 095e9f84..fc5aa15e 100644 --- a/makedown/optimization.md +++ b/makedown/optimization.md @@ -339,6 +339,17 @@ message ResNotifyCard{ map Card = 1; // 卡牌 } + +// 万能卡兑换 +message ReqMasterCard{ + int32 Id = 1; // 万能卡id 6 普通 7 金卡 + int32 CardId = 2; // 兑换的卡id +} +message ResMasterCard{ + RES_CODE Code = 1; + string Msg = 2; +} + // 领取卡牌系列收集奖励 message ReqCardCollectReward{ int32 Color = 1; @@ -718,10 +729,9 @@ message ReqSearchPlayer{ } message ResSearchPlayer{ - RES_CODE Code = 1; - string Msg = 2; + int32 Code = 1; // 0 + repeated ResPlayerSimple List = 2; } - // 好友推荐 message ReqFriendRecommend{} diff --git a/proto/Gameapi.proto b/proto/Gameapi.proto index 45b65454..21370679 100644 --- a/proto/Gameapi.proto +++ b/proto/Gameapi.proto @@ -2410,6 +2410,17 @@ message ResCardInfo{ repeated int32 ExUid = 10; // 今日已置换的Uid } +// 万能卡兑换 +message ReqMasterCard{ + int32 Id = 1; // 万能卡id 6 普通 7 金卡 + int32 CardId = 2; // 兑换的卡id +} + +message ResMasterCard{ + RES_CODE Code = 1; + string Msg = 2; +} + // 领取卡牌系列收集奖励 message ReqCardCollectReward{ int32 Color = 1;