From 6fc05450d36b3d5e7515790f44228c3fe0a7ea13 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Thu, 7 May 2020 14:09:10 +0800 Subject: [PATCH 1/8] =?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{ From e72a9aa3051feeae5b28a0aa29cc13110876ad3d Mon Sep 17 00:00:00 2001 From: wangyuan Date: Thu, 7 May 2020 14:38:07 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E8=BD=A6=E8=BF=9F=E7=8E=A9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/Family.proto | 13 +++++++++++++ protos/FightInfoProto.proto | 10 ++++++++++ protos/MessageTypeProto.proto | 9 +++++++++ 3 files changed, 32 insertions(+) diff --git a/protos/Family.proto b/protos/Family.proto index 6d92b04..f936fbd 100644 --- a/protos/Family.proto +++ b/protos/Family.proto @@ -90,6 +90,7 @@ import "CommonProto.proto"; optional FamilyUserInfo familyUserInfo =2; // 个人信息 repeated FamilyWalkIndicaiton familyWalkIndicaiton =3;// 玩家走路信息 optional int32 guildBossId = 4; // 当前工会bossId 0表示功能暂时关闭 + optional CarDelayProgressIndication carDelayProgressIndication = 5 ;// 车迟玩法时间信息 } @@ -370,4 +371,16 @@ import "CommonProto.proto"; message ResetGuildSkillResponse{ optional Drop drop = 1; + } + + message CarDelayProgressIndication{ + optional int32 progress = 1; //阶段 -1：未开 1 ： 挑战 2：抢夺 + optional int32 endTime = 2; //结束时间 + optional int32 bossIndexId = 3; //boss索引id + } + + message getCarChallenegListResponse{ + repeated RankInfo rankInfo = 1; + optional int32 myRank = 2; //我的排名 + optional int32 myScore = 3 ;//我的积分 } \ No newline at end of file diff --git a/protos/FightInfoProto.proto b/protos/FightInfoProto.proto index 7195042..3587921 100644 --- a/protos/FightInfoProto.proto +++ b/protos/FightInfoProto.proto @@ -216,6 +216,16 @@ import "CommonProto.proto"; optional int32 fightId = 1;//关卡id optional int32 state =2;// 状态 } + + message FastFightChallengeRequest{ + optional int32 type = 1 ; //类型 1：车迟斗法挑战boss 2：车迟斗法抢夺 + optional int32 challeageId = 2 ; //挑战id + } + + message FastFightChallengeResponse{ + optional int32 score = 1; //获取积分信息 + optional int32 hurt = 2 ;// 伤害值 + } diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index effc868..d88740a 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -150,6 +150,9 @@ enum MessageType{ CHAMPION_VIEW_FINAL_RESPONSE = 10219; CHAMPION_GUESS_SUCCESS_INDICATION = 10220; // 竞猜成功通知 + + + CAR_DELAY_PROGRESS_INDICATION = 10221; //车迟进度变更 @@ -349,6 +352,9 @@ enum MessageType{ FRIEND_BLACK_OPT_REQUEST = 10584; // 黑名单操作 FRIEND_BLACK_OPT_RESPONSE = 10585; + + FAST_FIGHT_CHALLENGE_REQUEST = 10586; // 快速战斗 + FAST_FIGHT_CHALLENGE_RESPONSE = 10587; // G 10600 GET_PLAYERINFO_REQUEST = 10600; // @@ -446,6 +452,9 @@ enum MessageType{ GET_ALL_GUILD_SKILL_REQUEST = 16670;//获取所有公会技能 GET_ALL_GUILD_SKILL_RESPONSE = 16671; + + GET_CAR_CHALLENEG_LIST_REQUEST = 16672 ;// 获取车迟匹配信息 + GET_CAR_CHALLENEG_LIST_RESPONSE = 16673; // H 10700 HERO_RAND_REQQUEST = 10701; HERO_RAND_RESPONSE = 10702; From 284cfa6fab96bfb3ad502452bb51ceda138ea020 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Thu, 7 May 2020 15:14:07 +0800 Subject: [PATCH 3/8] fix --- protos/Family.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protos/Family.proto b/protos/Family.proto index 9061c2d..87e5720 100644 --- a/protos/Family.proto +++ b/protos/Family.proto @@ -382,7 +382,7 @@ import "CommonProto.proto"; optional int32 bossIndexId = 3; //boss索引id } - message getCarChallenegListResponse{ + message GetCarChallenegListResponse{ repeated RankInfo rankInfo = 1; optional int32 myRank = 2; //我的排名 optional int32 myScore = 3 ;//我的积分 From 7ea1b9478cb8266efb1d4352d7dcffe20dca2d65 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Thu, 7 May 2020 15:36:55 +0800 Subject: [PATCH 4/8] fix --- protos/Family.proto | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/protos/Family.proto b/protos/Family.proto index 87e5720..d771616 100644 --- a/protos/Family.proto +++ b/protos/Family.proto @@ -21,6 +21,13 @@ import "CommonProto.proto"; optional int32 lastFeteGuildId =14 ; // 上次祭祀公会id optional int32 lastFeteType =15 ; // 上次祭祀类型 //每日清除 5点推送 } + + + message CarDelayProgressIndication{ + optional int32 progress = 1; //阶段 -1：未开 1 ： 挑战 2：抢夺 + optional int32 endTime = 2; //结束时间 + optional int32 bossIndexId = 3; //boss索引id + } message FamilyLogInfo{ @@ -375,13 +382,6 @@ import "CommonProto.proto"; optional Drop drop = 1; } - - message CarDelayProgressIndication{ - optional int32 progress = 1; //阶段 -1：未开 1 ： 挑战 2：抢夺 - optional int32 endTime = 2; //结束时间 - optional int32 bossIndexId = 3; //boss索引id - } - message GetCarChallenegListResponse{ repeated RankInfo rankInfo = 1; optional int32 myRank = 2; //我的排名 From e247a91d6dfc58b0f8a3b6ba0eb7da8216d4a594 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Thu, 7 May 2020 16:13:22 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E8=BD=A6=E8=BD=AE=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/Family.proto | 2 ++ 1 file changed, 2 insertions(+) diff --git a/protos/Family.proto b/protos/Family.proto index d771616..dab8cbf 100644 --- a/protos/Family.proto +++ b/protos/Family.proto @@ -27,6 +27,8 @@ import "CommonProto.proto"; optional int32 progress = 1; //阶段 -1：未开 1 ： 挑战 2：抢夺 optional int32 endTime = 2; //结束时间 optional int32 bossIndexId = 3; //boss索引id + optional int32 battleStartTime = 4 ;// 挑战boss开启时间 + optional int32 grabStartTime = 5 ;// 抢夺开启时间 } From 494ba6acbb72ec43b2b7a05a02cd3455bee4aeca Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Thu, 7 May 2020 16:42:33 +0800 Subject: [PATCH 6/8] =?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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/protos/Family.proto b/protos/Family.proto index e3a71a0..bd4e2b5 100644 --- a/protos/Family.proto +++ b/protos/Family.proto @@ -379,7 +379,8 @@ import "CommonProto.proto"; } message FamilyFeteResponse{ - optional int32 curExp = 1; //经验 + optional Drop drop = 1; + optional int32 curExp = 2; //经验 } @@ -387,6 +388,7 @@ import "CommonProto.proto"; optional int32 id = 1; //进度id } message FamilyGetFeteRewardResponse{ + optional Drop drop = 1; } message FamilyFeteRewardProcessIndication{ From 5bb1ca6b9e8b2a04968d3dc130af3aaf6eb37af7 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Thu, 7 May 2020 17:14:16 +0800 Subject: [PATCH 7/8] =?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/CommonProto.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 144b365..816fe38 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -546,6 +546,7 @@ option optimize_for = SPEED; optional int32 levelTime=10; //解散公会开始时间 optional FamilyContribute fightResult = 11;//公会战战绩 optional int32 playerIntoLevel = 12;//加入等級限制 + optional int32 fete = 13; //祭祀进度 } //无尽副本英雄信息 From 96fd9f5f438528dde8425ed80125777bc3d93df5 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Thu, 7 May 2020 18:02:15 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E8=BD=A6=E8=BF=9F=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/Family.proto | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/protos/Family.proto b/protos/Family.proto index dab8cbf..824bd9d 100644 --- a/protos/Family.proto +++ b/protos/Family.proto @@ -384,8 +384,19 @@ import "CommonProto.proto"; optional Drop drop = 1; } + message CarChallengeItem{ + optional int32 uid = 1; + optional string userName =2; + optional int32 force =3; + optional string guildName = 4; + optional int32 score = 5; + optional int32 hadChallenge =6; // 是否已挑战过，1：表示挑战过，2：未挑战过。 + optional int32 rank = 7; + optional TeamOneInfo teamInfo = 8; + } + message GetCarChallenegListResponse{ - repeated RankInfo rankInfo = 1; + repeated CarChallengeItem carChallengeItem = 1; optional int32 myRank = 2; //我的排名 optional int32 myScore = 3 ;//我的积分 }