From 991a16eebd22512f05ab52c3d4d4d767a2b32259 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Thu, 9 Sep 2021 20:37:46 +0800 Subject: [PATCH 1/2] Revert "Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_protocol into master_test_gn" This reverts commit a6721e2f5c9450d3fcd159a3af3154f69172e712, reversing changes made to c187fb3c49121d410fc0e54bc6d98b2e5763707a. --- protos/CommonProto.proto | 14 -------------- protos/HeroInfoProto.proto | 23 ----------------------- protos/MessageTypeProto.proto | 6 ------ protos/PlayerInfoProto.proto | 3 +-- 4 files changed, 1 insertion(+), 45 deletions(-) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index eaa9271..e766389 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -1025,20 +1025,6 @@ option optimize_for = SPEED; optional string windowLink = 3;//素材链接 } - - //四象心法屬性結果 - message SixiangxinfaPropertyInfo{ - optional int32 propertyId = 1;//屬性id - optional int32 propertyNum=2;//屬性值 - } - - //四象心法信息 - message SixiangxinfaInfo{ - optional int32 professionId = 1;//职业id - optional int32 level = 2;//对应职业进阶等级 - repeated SixiangxinfaPropertyInfo propertyInfoList=3;//属性信息列表 - } - // 四灵试炼信息 message FourChallengeInfo{ optional int32 type = 1;//四灵类型 diff --git a/protos/HeroInfoProto.proto b/protos/HeroInfoProto.proto index e847363..e9816ed 100644 --- a/protos/HeroInfoProto.proto +++ b/protos/HeroInfoProto.proto @@ -413,30 +413,7 @@ import "CommonProto.proto"; repeated beautyBagCardInfo infoList = 1; } - - //四象心法强化协议 - message SixiangUpRequest{ - optional int32 professionId = 1; - } - message SixiangUpResponse{ - repeated SixiangxinfaPropertyInfo infoList = 1; - - } - - //四象心法进阶协议 - message SixiangUpStarRequest{ - optional int32 professionId = 1; - } - - message SixiangUpStarResponse{ - optional int32 starLv = 1; - repeated SixiangxinfaPropertyInfo infoList = 2; - - } - - - diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index c1b894f..5b5bb18 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -1100,12 +1100,6 @@ enum MessageType{ //20111 - 20200 装备、 EQUIP_COMPLEX_REQUEST = 20111;//合成装备 EQUIP_COMPLEX_RESPONSE = 20112; - - SIXIANG_UP_REQUEST = 20201;//四象心法强化 - SIXIANG_UP_RESPONSE = 20202; - - SIXIANG_UP_STAR_REQUEST = 20203;//四象心法进阶 - SIXIANG_UP_STAR_RESPONSE = 20204; diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index d0dbeb3..28eaefb 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -83,8 +83,7 @@ import "CommonProto.proto"; repeated PurpleMansionSeal sealList = 42;//神印列表 optional int32 randomCount = 43;//抽卡剩余必出 repeated randomTypeNum drawTimes = 44;//类型抽卡总次数 - repeated SixiangxinfaInfo sixiangInfos = 45;//四象心法数据 - repeated HelpFightList helpFightList = 46;//已选取的助战信息 + repeated HelpFightList helpFightList = 45;//已选取的助战信息 } From 22a5f15772b72a6bb37da3ec91861bcd2b2b4316 Mon Sep 17 00:00:00 2001 From: duhui Date: Tue, 14 Sep 2021 10:16:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8D=81=E7=BB=9D=E9=98=B5=E4=BC=A4?= =?UTF-8?q?=E5=AE=B3int=E6=94=B9long?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/Family.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/protos/Family.proto b/protos/Family.proto index 50304e0..bdb3725 100644 --- a/protos/Family.proto +++ b/protos/Family.proto @@ -466,9 +466,9 @@ import "CommonProto.proto"; } message ChallengeDeathPathResponse{ optional FightData fightData = 1; - optional int32 damage = 2; + optional int64 damage = 2; optional Drop drop = 3; - optional int32 historyMax = 4;//历史最高伤害 + optional int64 historyMax = 4;//历史最高伤害 } message CarGrapRecordResponse{