From f81c78a1d4618f9773a583906db1022291a56151 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Fri, 8 May 2020 10:53:31 +0800 Subject: [PATCH 1/5] fightdata --- protos/FightInfoProto.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/protos/FightInfoProto.proto b/protos/FightInfoProto.proto index 3587921..1bc2e9a 100644 --- a/protos/FightInfoProto.proto +++ b/protos/FightInfoProto.proto @@ -225,6 +225,7 @@ import "CommonProto.proto"; message FastFightChallengeResponse{ optional int32 score = 1; //获取积分信息 optional int32 hurt = 2 ;// 伤害值 + optional FightData fightData = 3; } From 3e660643806169cf3a0463f4e018043d1ffcbfe4 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Fri, 8 May 2020 14:03:30 +0800 Subject: [PATCH 2/5] fix car team info --- protos/Family.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protos/Family.proto b/protos/Family.proto index 4e44daf..15df8a9 100644 --- a/protos/Family.proto +++ b/protos/Family.proto @@ -392,7 +392,7 @@ import "CommonProto.proto"; optional int32 score = 5; optional int32 hadChallenge =6; // 是否已挑战过，1：表示挑战过，2：未挑战过。 optional int32 rank = 7; - optional TeamOneInfo teamInfo = 8; + repeated TeamSimpleInfo teamInfo = 8; } message GetCarChallenegListResponse{ From 5e70446bd297b3e7d734f15ddb64f18deef3bb2b Mon Sep 17 00:00:00 2001 From: wangyuan Date: Fri, 8 May 2020 15:16:03 +0800 Subject: [PATCH 3/5] car record --- protos/CommonProto.proto | 5 +++++ protos/Family.proto | 4 ++++ protos/MessageTypeProto.proto | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 816fe38..b4a4c3e 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -779,4 +779,9 @@ option optimize_for = SPEED; optional int32 state = 3;//1已领取 0未领取 optional int32 totleAmt = 4;//当前累计金额 } + + message CarGrapRecordItem{ + optional int32 time =1; + optional string content = 2; + } \ No newline at end of file diff --git a/protos/Family.proto b/protos/Family.proto index 15df8a9..b48823a 100644 --- a/protos/Family.proto +++ b/protos/Family.proto @@ -443,5 +443,9 @@ import "CommonProto.proto"; optional int32 damage = 2; optional Drop drop = 3; } + + message CarGrapRecordResponse{ + repeated CarGrapRecordItem carChallengeItem =1; + } diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index 202f31c..652585e 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -465,6 +465,10 @@ enum MessageType{ GET_CAR_CHALLENEG_LIST_REQUEST = 16672 ;// 获取车迟匹配信息 GET_CAR_CHALLENEG_LIST_RESPONSE = 16673; + + GET_CAR_GRAP_RECORD_REQUEST = 16674; //获取车迟抢夺记录 + GET_CAR_GRAP_RECORD_RESPONSE = 16675; + // H 10700 HERO_RAND_REQQUEST = 10701; HERO_RAND_RESPONSE = 10702; From 752b0970b5633b043c53ef8da1982b828b3ae8a4 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Sat, 9 May 2020 05:28:26 +0800 Subject: [PATCH 4/5] =?UTF-8?q?Task=E3=80=90ID1006175=E3=80=91=E3=80=90?= =?UTF-8?q?=E6=96=B0=E6=88=98=E6=96=97=E7=89=88=E6=9C=AC=E3=80=91=E5=AE=9D?= =?UTF-8?q?=E7=89=A9=E5=90=88=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/HeroInfoProto.proto | 13 +++++++++++++ protos/MessageTypeProto.proto | 8 ++++++++ 2 files changed, 21 insertions(+) diff --git a/protos/HeroInfoProto.proto b/protos/HeroInfoProto.proto index b8ba634..71abbc6 100644 --- a/protos/HeroInfoProto.proto +++ b/protos/HeroInfoProto.proto @@ -200,3 +200,16 @@ import "CommonProto.proto"; optional Drop drop = 2;//合成的装备 } + + message ComplexJewelEquipRequest{ + optional int32 type = 1;//宝器类型 灵宝、魂宝 + optional int32 rance = 2;//宝器属性 + optional int32 targetleve = 3;//目标品质 0一键合成 + optional int32 num = 4;//合成数量 + } + + message ComplexJewelEquipResponse{ + repeated string equipIds =1;//消耗的装备 + optional Drop drop = 2;//合成的装备 + } + diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index 202f31c..e0cbbfd 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -896,6 +896,7 @@ enum MessageType{ //30000以后 新增协议号使用协议名定义 协议号自动映射 + //30000-3300 公会 FamilyFeteRequest = 30001;//祭祀 FamilyFeteResponse = 30002;//祭祀 @@ -903,4 +904,11 @@ enum MessageType{ FamilyGetFeteRewardResponse = 30004;// FamilyFeteRewardProcessIndication = 30005 ; // 更新公会进度 + + + + //30301-30330 宝物合成 + + ComplexJewelEquipRequest = 30301; // 宝物合成 + ComplexJewelEquipResponse = 30302; } From 22116b42472748b423a02fa4a5c560582f781023 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Fri, 8 May 2020 15:30:31 +0800 Subject: [PATCH 5/5] add uid --- protos/CommonProto.proto | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index b4a4c3e..fd466b8 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -782,6 +782,8 @@ option optimize_for = SPEED; message CarGrapRecordItem{ optional int32 time =1; - optional string content = 2; + optional int32 uid =2; + optional string content = 3; + } \ No newline at end of file