From bbfc5ac5a0535a74bef457f5713b1aefb6474c47 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 5 Sep 2019 12:00:29 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=A1=80=E6=88=98=E6=8E=92=E8=A1=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/CommonProto.proto | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 089c886..f850c12 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -643,7 +643,9 @@ option optimize_for = SPEED; optional int32 headFrame = 3; optional string head = 4; optional int32 serverId =5; - optional int32 rank = 6; + optional int32 level = 6; + optional int32 rank = 7; + optional int32 score = 8; } \ No newline at end of file From 486cef699698b11ca5f86fbd07a861f711969979 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Thu, 5 Sep 2019 15:51:07 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E9=AD=82=E5=8D=B0=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/HeroInfoProto.proto | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/protos/HeroInfoProto.proto b/protos/HeroInfoProto.proto index 937537a..ec79ea0 100644 --- a/protos/HeroInfoProto.proto +++ b/protos/HeroInfoProto.proto @@ -59,22 +59,19 @@ import "CommonProto.proto"; } message UpSoulEquipRequest{ - optional string pos = 1; //升级槽位 - optional string equipId = 2; //升级魂印id + optional string equipId = 1; //升级魂印id } message UpQuickSoulEquipRequest{ - optional string pos = 1; //升级槽位 - optional string equipId = 2; //升级魂印id - repeated string soulEquipIds= 3; //消耗信息 + optional string equipId = 1; //升级魂印id + repeated string soulEquipIds= 2; //消耗信息 } message UpSoulEquipResponse{ - optional string pos = 1; //升级槽位、 - optional string equipId = 2; //升级魂印id - optional int32 leve =3;//经验 - optional int32 exp =4;//等级 - repeated string soulEquipIds= 5; //消耗信息 + optional string equipId = 1; //升级魂印id + optional int32 leve =2;//经验 + optional int32 exp =3;//等级 + repeated string soulEquipIds= 4; //消耗信息 } message EquipWearRequest{ From 9a1f3db2d1447fceb1e14f623791ee842ee196ec Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 5 Sep 2019 17:18:54 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=A1=80=E6=88=98=E6=8E=92=E8=A1=8C?= =?UTF-8?q?=E6=A6=9C=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/RoomProto.proto | 2 ++ 1 file changed, 2 insertions(+) diff --git a/protos/RoomProto.proto b/protos/RoomProto.proto index bca4d1e..2413aed 100644 --- a/protos/RoomProto.proto +++ b/protos/RoomProto.proto @@ -65,6 +65,8 @@ import "CommonProto.proto"; //血战排行榜 message BloodRankResponse{ repeated BloodPersonInfo infos = 1; + optional int32 myRank = 2; + optional int32 myScore = 3; } \ No newline at end of file From 411b3ad94c2e4c1fee5a1559fa4574a40152f9e0 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 5 Sep 2019 17:21:49 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/RoomProto.proto | 1 - 1 file changed, 1 deletion(-) diff --git a/protos/RoomProto.proto b/protos/RoomProto.proto index 2413aed..c00e281 100644 --- a/protos/RoomProto.proto +++ b/protos/RoomProto.proto @@ -66,7 +66,6 @@ import "CommonProto.proto"; message BloodRankResponse{ repeated BloodPersonInfo infos = 1; optional int32 myRank = 2; - optional int32 myScore = 3; } \ No newline at end of file From bea0b890dbf70a87dfe4149ecb3bf51842bf8ff7 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 5 Sep 2019 18:27:53 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=97=A0=E5=B0=BD=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=88=98=E6=96=97=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/MapInfoProto.proto | 5 +++++ protos/MessageTypeProto.proto | 3 +++ 2 files changed, 8 insertions(+) diff --git a/protos/MapInfoProto.proto b/protos/MapInfoProto.proto index 76ba8d6..d982bb0 100644 --- a/protos/MapInfoProto.proto +++ b/protos/MapInfoProto.proto @@ -266,6 +266,7 @@ import "CommonProto.proto"; //英雄信息 repeated endlessHero heroInfo =1; repeated int32 openMapId = 2;//已开启的地图Id + optional int32 skipFight = 3;//是否跳过战斗 } //无尽副本标志 @@ -296,3 +297,7 @@ import "CommonProto.proto"; message RefreshMonsterResponse{ repeated Cell cell = 1; } + //无尽副本设置是否跳过战斗 + message EndlessSetSkipRequest{ + optional int32 type = 1; + } diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index 0ecd238..240f63f 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -157,6 +157,9 @@ enum MessageType{ ENDLESS_MIN_MAP_INFO_RESPONSE = 10422; ENDLESS_MONSTER_REFRESH_INDICATION = 10423;//无尽副本空地刷新小怪 + + ENDLESS_SET_SKIPFIGHT_REQUEST = 10424;//无尽副本是否跳过战斗 + ENDLESS_SET_SKIPFIGHT_RESPONSE = 10425; // F 10500 FIGHT_START_REQUEST = 10500; // From 4bb7c9e3d19b764a1cf923dfe6eebfcaa92b5b5e Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Thu, 5 Sep 2019 19:23:51 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E9=AD=82=E5=8D=B0=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/CommonProto.proto | 7 ++++++- protos/HeroInfoProto.proto | 3 --- protos/MessageTypeProto.proto | 4 +--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index f850c12..cb927e5 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -83,7 +83,12 @@ option optimize_for = SPEED; optional int32 starBreakId = 10 ;//升星对应的breakId repeated string especialEquip = 11;//所穿戴法宝 - repeated string soulEquipIdList = 12;//魂印 + repeated SoulPos soulPos = 12;//魂印 + } + + message SoulPos{ + optional string equipId =1 ; //装备id + optional int32 position= 2; //卡槽位置 } message FightUnitInfo { diff --git a/protos/HeroInfoProto.proto b/protos/HeroInfoProto.proto index ec79ea0..7c57edf 100644 --- a/protos/HeroInfoProto.proto +++ b/protos/HeroInfoProto.proto @@ -58,9 +58,6 @@ import "CommonProto.proto"; optional int32 type = 3;//1为英雄进阶 2为法宝进阶 } - message UpSoulEquipRequest{ - optional string equipId = 1; //升级魂印id - } message UpQuickSoulEquipRequest{ optional string equipId = 1; //升级魂印id diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index 0ecd238..9c1f6ed 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -621,10 +621,8 @@ enum MessageType{ UPDATE_QUESTION_REQUEST = 12015; //问卷 UPDATE_QUESTION_RESPONSE = 12016; - - UP_SOUL_EQUIP_REQUEST = 12017; // 升一级 UP_SOUL_EQUIP_QUICK_REQUEST = 12018; - UP_SOUL_UNLOAD_RESPONSE = 12019; //快速升级 + UP_SOUL_EQUIP_RESPONSE = 12019; //魂印升级 // V 12100 From 755b1e9eaca72b34c8e52c8c76337a71381c7fe7 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 5 Sep 2019 20:26:02 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=97=A0=E5=B0=BD=E8=B7=B3=E8=BF=87?= =?UTF-8?q?=E6=88=98=E6=96=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/MapInfoProto.proto | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/protos/MapInfoProto.proto b/protos/MapInfoProto.proto index d982bb0..4313878 100644 --- a/protos/MapInfoProto.proto +++ b/protos/MapInfoProto.proto @@ -58,6 +58,8 @@ import "CommonProto.proto"; repeated endlessSign signs = 13; // 无尽副本地图点刷新信息 repeated EndlessRefreshInfo refreshInfo = 14; + //无尽副本是否跳过战斗 + optional int32 skipFight = 15; } @@ -266,7 +268,6 @@ import "CommonProto.proto"; //英雄信息 repeated endlessHero heroInfo =1; repeated int32 openMapId = 2;//已开启的地图Id - optional int32 skipFight = 3;//是否跳过战斗 } //无尽副本标志