diff --git a/config/Avatar.xlsx b/config/Avatar.xlsx index e03613d4..cb4581b1 100644 Binary files a/config/Avatar.xlsx and b/config/Avatar.xlsx differ diff --git a/config/Invite.xlsx b/config/Invite.xlsx new file mode 100644 index 00000000..6406732c Binary files /dev/null and b/config/Invite.xlsx differ diff --git a/config/Item.xlsx b/config/Item.xlsx index fe4b2a28..68d4e50e 100644 Binary files a/config/Item.xlsx and b/config/Item.xlsx differ diff --git a/makedown/optimization.md b/makedown/optimization.md index b9d8ecb1..75247da3 100644 --- a/makedown/optimization.md +++ b/makedown/optimization.md @@ -665,7 +665,6 @@ message ReqLimitEvent{} message ResLimitEvent{ map LimitEventList = 1; } -message ResLimitEventProgress{} message ResLimitEventProgress{ int32 Progress = 2; //进度 map ProgressReward = 3; //奖励 可以选择的奖励 Id =》 RewardId @@ -793,6 +792,10 @@ message NotifyFriendCard{ ResFriendCard Info = 1; } +message NotifyFriendLog{ + ResFriendLog info = 1; +} + // 好友卡牌申请 message ResFriendCard{ int32 Uid = 1; diff --git a/proto/Gameapi.proto b/proto/Gameapi.proto index 3aa62092..4e1d27c8 100644 --- a/proto/Gameapi.proto +++ b/proto/Gameapi.proto @@ -1751,14 +1751,7 @@ message ResAutoFBAddFriend{ int32 ResultCode = 1; } -///请求自动添加facebook好友 -message ReqAutoAddInviteFriend{ - repeated string Ids = 1; -} -message ResAutoAddInviteFriend{ - int32 ResultCode = 1; -} message NotifySuccessInviteAddFriend{ @@ -1778,34 +1771,7 @@ message ResRecommendFriendList{ repeated FriendInfo PlayerInfos = 1; } /// -message ReqInviteFriendData{ - int32 dwUin = 1; -} -message ResInviteFriendData{ - repeated int32 IdLists = 1; - int32 GetIndex = 2; -} -message ReqSelfInvited{ - int32 InviterId = 1; -} -message ResSelfInvited{ - int32 ResultCode = 1; - repeated int32 IdLists = 2; -} - -message NotifyInvitedSuccess{ - int32 ResultCode = 1; - repeated int32 IdLists = 2; -} - -message ReqGetInviteReward{ - int32 GetIndex = 1; -} - -message ResGetInviteReward{ - int32 ResultCode = 1; -} /// message ReqFriendTreasureData{ int32 dwUin = 1; @@ -2832,10 +2798,14 @@ message ResPlayerRank{ message ResFriendLog{ ResPlayerSimple Player = 1; - int32 Type =2; + int32 Type = 2; int32 Time = 3; string Param = 4; - string Id = 5; + int32 Id = 5; +} + +message NotifyFriendLog{ + ResFriendLog info = 1; } message NotifyFriendCard{ @@ -2889,14 +2859,17 @@ message ReqFriendList{} message ResFriendList{ 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; @@ -3151,3 +3124,50 @@ message ResNotifyCard{ map Master = 2; // 万能卡牌 int32 ExStar = 3; // 额外星星 } + +message ReqSetFacebookUrl{ + string Url = 1; +} + +message ResSetFacebookUrl{ + RES_CODE Code = 1; + string Msg = 2; +} + +// 邀请facebook好友 +message ReqInviteFriendData{ + int32 dwUin = 1; +} +message ResInviteFriendData{ + repeated int32 IdLists = 1; + int32 GetIndex = 2; +} + +message ReqSelfInvited{ + int32 InviterId = 1; +} +message ResSelfInvited{ + int32 ResultCode = 1; +} + +message NotifyInvitedSuccess{ + int32 ResultCode = 1; + repeated int32 IdLists = 2; +} + +message ReqGetInviteReward{ + int32 GetIndex = 1; +} + +message ResGetInviteReward{ + int32 ResultCode = 1; +} + +///请求自动添加facebook好友 + +message ReqAutoAddInviteFriend{ + int32 id = 1; +} +message ResAutoAddInviteFriend{ + int32 ResultCode = 1; +} \ No newline at end of file diff --git a/tool/cfg/cfg_xlsx.json b/tool/cfg/cfg_xlsx.json index bb596415..d4161961 100644 --- a/tool/cfg/cfg_xlsx.json +++ b/tool/cfg/cfg_xlsx.json @@ -338,6 +338,13 @@ "key": "Id", "sheet_name" :"Group", "fields" :["Min", "Max"] + }, + { + "in_file": "Invite.xlsx", + "out_file": "Invite.json", + "key": "Id", + "sheet_name" :"Reward", + "fields" :["Need", "Items"] } ] } \ No newline at end of file