diff --git a/config/LimitedTimeEvent.xlsx b/config/LimitedTimeEvent.xlsx index eb0a5a1b..fb072b6f 100644 Binary files a/config/LimitedTimeEvent.xlsx and b/config/LimitedTimeEvent.xlsx differ diff --git a/makedown/optimization.md b/makedown/optimization.md index 75247da3..3aaf597d 100644 --- a/makedown/optimization.md +++ b/makedown/optimization.md @@ -820,7 +820,11 @@ message ResFriendList{ // 好友申请列表 message ReqFriendApply{} message ResFriendApply{ - repeated ResPlayerSimple ApplyList = 1; + repeated ResFriendApplyInfo ApplyList = 1; +} +message ResFriendApplyInfo{ + ResPlayerSimple Player = 1; + int32 Time = 2; } // 好友卡牌交换信息 message ReqFriendCardMsg{} @@ -836,6 +840,7 @@ message ResFriendTimeLine{ message ResFriendApplyNotify{ ResPlayerSimple Player = 1; int32 Type = 2; // 1:申请 2:同意 3:拒绝 4:删除 + int32 Time = 3; } // 申请好友 @@ -1040,7 +1045,8 @@ message ResChampship{ int32 EndTime = 3; // 结束时间 int32 Period = 4; //周期 int32 Rank = 5;// 自身排行 - bool RankReward = 6; // 是否已领排行奖励 + int32 RankReward = 6; // 0 不能领 1 可以领 2 已领取 + int32 Status = 7; // 0 关闭 1 开放 0.00 0.30 全服推送 } message ReqChampshipReward{} diff --git a/proto/Gameapi.proto b/proto/Gameapi.proto index 4e1d27c8..8c469947 100644 --- a/proto/Gameapi.proto +++ b/proto/Gameapi.proto @@ -2862,7 +2862,11 @@ repeated ResPlayerSimple FriendList = 1; // 好友申请列表 message ReqFriendApply{} message ResFriendApply{ - repeated ResPlayerSimple ApplyList = 1; + repeated ResFriendApplyInfo ApplyList = 1; +} +message ResFriendApplyInfo{ + ResPlayerSimple Player = 1; + int32 Time = 2; } // 好友卡牌交换列表 message ReqFriendCardMsg{} @@ -2878,6 +2882,7 @@ message ResFriendTimeLine{ message ResFriendApplyNotify{ ResPlayerSimple Player = 1; int32 Type = 2; // 1:申请 2:同意 3:拒绝 4:删除 + int32 Time = 3; } // 申请好友 @@ -3091,6 +3096,7 @@ message ResChampship{ int32 Period = 4; int32 Rank = 5; int32 RankReward = 6; + int32 Status = 7; } message ReqChampshipReward{}