From 3ec95bb5c32a59979f3cccd6faf781190da6bdd8 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Wed, 27 Nov 2024 16:25:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/LimitedTimeEvent.xlsx | Bin 23039 -> 23035 bytes makedown/optimization.md | 10 ++++++++-- proto/Gameapi.proto | 8 +++++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/config/LimitedTimeEvent.xlsx b/config/LimitedTimeEvent.xlsx index eb0a5a1bf54c1afc6803a311da56c52910511b47..fb072b6f0e2b9e1c5ffab9a94a3b07cc587f45c4 100644 GIT binary patch delta 4128 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 W(wYYIGw}aOv0p4zNS%%UZT=TvPwTt@ delta 4092 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 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{}