From 66992973351796657700c20327a5d9cd7f00008f Mon Sep 17 00:00:00 2001 From: lvxinran Date: Wed, 6 May 2020 16:19:06 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=8D=81=E7=BB=9D=E9=98=B5=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/Family.proto | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/protos/Family.proto b/protos/Family.proto index 6d92b04..fb82a86 100644 --- a/protos/Family.proto +++ b/protos/Family.proto @@ -370,4 +370,33 @@ import "CommonProto.proto"; message ResetGuildSkillResponse{ optional Drop drop = 1; - } \ No newline at end of file + } + + message DeathPathInfo{ + optional int32 pathId = 1; + optional int32 guildId = 2; + } + + message GetDeathPathStatusResponse{ + optional int32 status = 1;//0未开启；1开启 + } + message GetDeathPathInfoResponse{ + optional int32 overTime = 1;//剩余时间 + optional int32 challengeCount = 2;//已挑战次数 + repeated DeathPathInfo infos = 3; + } + message ChallengeDeathPathRequest{ + optional int32 pathId = 1; + } + message ChallengeDeathPathResponse{ + optional FightData fightData = 1; + optional int32 damage = 2; + } + + + + + + + + \ No newline at end of file From 6d032dc6eb281c196c1ceeaff8121f8b7b78020d Mon Sep 17 00:00:00 2001 From: lvxinran Date: Wed, 6 May 2020 16:20:09 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=8D=81=E7=BB=9D=E9=98=B5=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E6=8E=89=E8=90=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/Family.proto | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/protos/Family.proto b/protos/Family.proto index fb82a86..9b927f8 100644 --- a/protos/Family.proto +++ b/protos/Family.proto @@ -391,12 +391,5 @@ import "CommonProto.proto"; message ChallengeDeathPathResponse{ optional FightData fightData = 1; optional int32 damage = 2; + optional Drop drop = 3; } - - - - - - - - \ No newline at end of file From 548ddeeeec3f84e381f9fa69826f1e8fa4ab2914 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Wed, 6 May 2020 16:25:38 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=A5=AD=E7=A5=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/Family.proto | 28 ++++++++++++++++++++++++++-- protos/MessageTypeProto.proto | 12 ++++++++++++ protos/PlayerInfoProto.proto | 2 ++ 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/protos/Family.proto b/protos/Family.proto index 6d92b04..4cf361b 100644 --- a/protos/Family.proto +++ b/protos/Family.proto @@ -17,7 +17,9 @@ import "CommonProto.proto"; optional int32 frame = 10; // 头像框 optional int32 maxBossHurt = 11; // 历史最高伤害 optional int32 lastHurt = 12 ;// 上次伤害 - + repeated int32 takeFeteReward =13 ; // 祭祀领取进度 + optional int32 lastFeteGuildId =14 ; // 上次祭祀公会id + optional int32 lastFeteType =15 ; // 上次祭祀类型 //每日清除 5点推送 } @@ -370,4 +372,26 @@ import "CommonProto.proto"; message ResetGuildSkillResponse{ optional Drop drop = 1; - } \ No newline at end of file + } + + message FamilyFeteRequest{ + optional int32 type = 1; //献祭类型 + } + + message FamilyFeteResponse{ + optional int32 type = 1; //献祭类型 + optional int32 contribute = 2; //贡献 + optional int32 curExp = 3; //经验 + optional int32 score = 4; //进度 + } + + message FamilyGetFeteRewardRequest{ + optional int32 id = 1; //进度id + } + message FamilyGetFeteRewardResponse{ + } + + message FamilyFeteRewardProcessIndication{ + optional int32 score = 1; //公会祭祀进度 + } + \ No newline at end of file diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index effc868..75b3090 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -872,4 +872,16 @@ enum MessageType{ //20111 - 20200 装备、 EQUIP_COMPLEX_REQUEST = 20111;//合成装备 EQUIP_COMPLEX_RESPONSE = 20112; + + + + //30000以后 新增协议号使用协议名定义 协议号自动映射 + + FamilyFeteRequest = 30001;//祭祀 + FamilyFeteResponse = 30002;//祭祀 + + FamilyGetFeteRewardRequest = 30003;//领取公会祭祀 + FamilyGetFeteRewardResponse = 30004;// + + FamilyFeteRewardProcessIndication = 30005 ; // 更新公会进度 } diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index f592c56..dfd4b60 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -378,6 +378,8 @@ import "CommonProto.proto"; repeated LuckWheelRewardPosInfo posInfos = 8;//转盘信息 repeated LuckWheelRewardPosInfo posInfosAdvance = 9;//高级转盘信息 repeated int32 MonthDailyTake=10;//已领取的月卡id + optional int32 lastFeteType =11 ; // 上次祭祀类型 //每日清除 5点推送 + repeated int32 takeFeteReward =12 ; // 祭祀领取进度 } From ba7ebe043515a0c640b252288c69e41f312993e7 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 7 May 2020 14:01:23 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=8D=81=E7=BB=9D=E9=98=B5=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/MessageTypeProto.proto | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index effc868..29960ba 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -168,6 +168,16 @@ enum MessageType{ DAILY_CHALLENGE_REQUEST = 10307;//日常挑战 DAILY_CHALLENGE_RESPONSE = 10308; + + DEATH_PATH_GET_STATUS_REQUEST = 10309;//获取十绝阵状态信息 + DEATH_PATH_GET_STATUS_RESPONSE = 10310; + + + DEATH_PATH_INFO_REQUEST = 10311;//十绝阵内信息 + DEATH_PATH_INFO_RESPONSE = 10312; + + DEATH_PATH_CHALLENGE_REQUEST = 10313;//挑战十绝阵 + DEATH_PATH_CHALLENGE_RESPONSE = 10314; // E 10400 From 6fc05450d36b3d5e7515790f44228c3fe0a7ea13 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Thu, 7 May 2020 14:09:10 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=A5=AD=E7=A5=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/Family.proto | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/protos/Family.proto b/protos/Family.proto index 0c68139..e3a71a0 100644 --- a/protos/Family.proto +++ b/protos/Family.proto @@ -379,10 +379,8 @@ import "CommonProto.proto"; } message FamilyFeteResponse{ - optional int32 type = 1; //献祭类型 - optional int32 contribute = 2; //贡献 - optional int32 curExp = 3; //经验 - optional int32 score = 4; //进度 + optional int32 curExp = 1; //经验 + } message FamilyGetFeteRewardRequest{