diff --git a/config/LimitedTimeEvent.xlsx b/config/LimitedTimeEvent.xlsx index e9434fc4..eb0a5a1b 100644 Binary files a/config/LimitedTimeEvent.xlsx and b/config/LimitedTimeEvent.xlsx differ diff --git a/makedown/optimization.md b/makedown/optimization.md index 2db489ed..a0134228 100644 --- a/makedown/optimization.md +++ b/makedown/optimization.md @@ -675,7 +675,7 @@ const ( // 搜索好友 message ReqSearchPlayer{ - int32 Uid = 1; + string Uid = 1; } message ResSearchPlayer{ @@ -733,15 +733,28 @@ message ResFriendCard{ int32 CardId = 8; } +message ReqFriendList{} + // 好友基础信息 message ResFriendList{ repeated ResPlayerSimple FriendList = 1; - repeated ResPlayerSimple ApplyList = 2; - repeated ResFriendCard MsgList = 3; +} +message ReqFriendApply{} +message ResFriendApply{ + repeated ResPlayerSimple ApplyList = 1; +} +message ReqFriendCardMsg{} +message ReqFriendCardMsg{ + repeated ResFriendCard MsgList = 1; +} +message ReqFriendTimeLine{} +message ResFriendTimeLine{ + repeated ResFriendLog Log = 1; } -message ResFriendLogList{ - repeated ResFriendLog Log = 1; +message ResFriendApplyNotify{ + ResPlayerSimple Player = 1; + int32 Type = 2; // 1:申请 2:同意 3:拒绝 4:删除 } // 申请好友 @@ -952,6 +965,12 @@ message ResChampshipReward{ ``` +## 排行榜 + +```protobuf + +``` + ## 活动类 ## 玩家日志 diff --git a/proto/Gameapi.proto b/proto/Gameapi.proto index 73c8680b..470a0aa5 100644 --- a/proto/Gameapi.proto +++ b/proto/Gameapi.proto @@ -2733,12 +2733,13 @@ message ResFastProduceReward{ // 搜索好友 message ReqSearchPlayer{ - int32 Uid = 1; + string Uid = 1; } + message ResSearchPlayer{ - RES_CODE Code = 1; - string Msg = 2; + int32 Code = 1; + repeated ResPlayerSimple List = 2; } message ResPlayerSimple{ @@ -2765,9 +2766,9 @@ message ResFriendCard{ int32 Face = 3; int32 Avatar = 4; int32 Level = 5; - int32 Type = 6; - int32 Time = 7; - int32 CardId = 8; + int32 Time = 6; + int32 CardId = 7; + int32 ExCardId = 8; } message ReqKv{ @@ -2797,14 +2798,24 @@ message ResFriendIgnore{ message ResFriendList{ - repeated ResPlayerSimple FriendList = 1; - repeated ResPlayerSimple ApplyList = 2; - repeated ResFriendCard MsgList = 3; - repeated ResFriendLog LogList = 4; +repeated ResPlayerSimple FriendList = 1; +} +message ReqFriendApply{} +message ResFriendApply{ + repeated ResPlayerSimple ApplyList = 1; +} +message ReqFriendCardMsg{} +message ResFriendCardMsg{ + repeated ResFriendCard MsgList = 1; +} +message ReqFriendTimeLine{} +message ResFriendTimeLine{ + repeated ResFriendLog Log = 1; } -message ResFriendLogList{ - repeated ResFriendLog Log = 1; +message ResFriendApplyNotify{ + ResPlayerSimple Player = 1; + int32 Type = 2; // 1:申请 2:同意 3:拒绝 4:删除 } // 申请好友