From d4e96a43d30468dac53a26defc7b43d6d7295c68 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Thu, 9 Sep 2021 16:54:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9B=9B=E8=B1=A1=E5=BF=83=E6=B3=95?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/CommonProto.proto | 14 ++++++++++++++ protos/HeroInfoProto.proto | 23 +++++++++++++++++++++++ protos/MessageTypeProto.proto | 6 ++++++ protos/PlayerInfoProto.proto | 1 + 4 files changed, 44 insertions(+) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 2f96c99..5882adf 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -1019,4 +1019,18 @@ option optimize_for = SPEED; optional string strategyLink = 2;//使用链接 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;//属性信息列表 + } \ No newline at end of file diff --git a/protos/HeroInfoProto.proto b/protos/HeroInfoProto.proto index e9816ed..e847363 100644 --- a/protos/HeroInfoProto.proto +++ b/protos/HeroInfoProto.proto @@ -413,7 +413,30 @@ 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 341ebe4..b976119 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -1099,6 +1099,12 @@ 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 1b5ff1f..c0ce39a 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -83,6 +83,7 @@ import "CommonProto.proto"; repeated PurpleMansionSeal sealList = 42;//神印列表 optional int32 randomCount = 43;//抽卡剩余必出 repeated randomTypeNum drawTimes = 44;//类型抽卡总次数 + repeated SixiangxinfaInfo sixiangInfos = 45;//四象心法数据 } 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 2/3] 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 49b59587c7bace801598c865755a7792087075e1 Mon Sep 17 00:00:00 2001 From: duhui Date: Sun, 19 Sep 2021 01:25:52 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=B8=BF=E8=92=99=E9=98=B5=E6=8E=A8?= =?UTF-8?q?=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/HeroInfoProto.proto | 25 ++++++++++++++++--------- protos/MessageTypeProto.proto | 18 +++++++++--------- 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/protos/HeroInfoProto.proto b/protos/HeroInfoProto.proto index e9816ed..fe60fe5 100644 --- a/protos/HeroInfoProto.proto +++ b/protos/HeroInfoProto.proto @@ -343,21 +343,28 @@ import "CommonProto.proto"; } // 获取鸿蒙阵信息 - message GetHongmengInfoResponse{ - } - - // 鸿蒙阵信息推送 - message HongmengInfoIndication{ - repeated HongmengHeroInfo hongmengGuards = 1; // 鸿蒙守卫、鸿蒙使者 + message GetHongmengInfoRequest{ + + } + message GetHongmengInfoResponse{ + repeated HongmengHeroInfo hongmengGuards = 1; // 鸿蒙守卫、鸿蒙使者 repeated HongmengAddition hongmengAdditions = 2; // 共鸣加成 repeated HongmengHeroInfo hongmengResonacnes = 3; // 共鸣使者 optional int32 hongmengTabletMax = 4; // 鸿蒙碑等级上限,0:未开启,其他为鸿蒙碑等级 - } + } + + // 鸿蒙阵信息推送 + message HongmengInfoIndication{ + repeated HongmengHeroInfo hongmengGuards = 1; // 鸿蒙守卫、鸿蒙使者 + repeated HongmengAddition hongmengAdditions = 2; // 共鸣加成 + repeated HongmengHeroInfo hongmengResonacnes = 3; // 共鸣使者 + optional int32 hongmengTabletMax = 4; // 鸿蒙碑等级上限,0:未开启,其他为鸿蒙碑等级 + } // 鸿蒙碑新手引导推送 message HongmengSteleNewHandIndication{ - optional int32 state = 1;// 开启鸿蒙碑 - } + optional int32 state = 1;// 开启鸿蒙碑 + } // 修行玩法 升级 message UpPracticeLevelRequest{} diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index 5b5bb18..ef4388c 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -533,18 +533,18 @@ enum MessageType{ GET_ENDLESS_HERO_LIST_INFO_REQUEST = 16691;//获取无尽副本可以使用的英雄 GET_ENDLESS_HERO_LIST_INFO_RESPONSE = 16692; -// H 10700 - HERO_RAND_REQQUEST = 10701; - HERO_RAND_RESPONSE = 10702; + // H 10700 + HERO_RAND_REQQUEST = 10701; + HERO_RAND_RESPONSE = 10702; - HERO_COMPOSE_REQUEST = 10703; // 合成英雄 - HERO_COMPOSE_RESPONSE = 10704; + HERO_COMPOSE_REQUEST = 10703; // 合成英雄 + HERO_COMPOSE_RESPONSE = 10704; - HERO_RETURN_REQUEST = 10705; //英雄回溯 - HERO_RETURN_RESPONSE = 10706; + HERO_RETURN_REQUEST = 10705; //英雄回溯 + HERO_RETURN_RESPONSE = 10706; - HERO_LOCK_CHANGE_REQUEST = 10707 ;// 英雄上锁操作 - HERO_LOCK_CHANGE_RESPONSE = 10708; + HERO_LOCK_CHANGE_REQUEST = 10707 ;// 英雄上锁操作 + HERO_LOCK_CHANGE_RESPONSE = 10708; HERO_SKIN_GET_ALL_REQUEST = 10709;//获取所有皮肤 HERO_SKIN_GET_ALL_RESPONSE = 10710;