From 5946da312a2d82d8c01ae05c6b67d321e285468c Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 26 Nov 2020 15:20:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=83=8C=E5=8C=85=E5=B7=B2=E6=BB=A1?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=EF=BC=8C=E7=81=B5=E5=85=BD=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/HeroInfoProto.proto | 4 ++++ protos/PlayerInfoProto.proto | 1 + 2 files changed, 5 insertions(+) diff --git a/protos/HeroInfoProto.proto b/protos/HeroInfoProto.proto index b06bb3b..650665a 100644 --- a/protos/HeroInfoProto.proto +++ b/protos/HeroInfoProto.proto @@ -134,6 +134,10 @@ import "CommonProto.proto"; optional bool isSendFinish =2; //是否发送完成 } + message GetAllPokemonRequest{ + optional int32 start = 1;//从哪开始，每次20个 + } + message GetAllPokemonResponse{ repeated PokemonInfo pokemonInfo =1; repeated TeamPokemonInfo teamPokemonInfos = 2; // 异妖编队 diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index 2bee9ee..f777728 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -405,6 +405,7 @@ import "CommonProto.proto"; message UpdateBagIndication{ optional int32 type =1; //更新背包类型 0： 普通背包 1： 临时背包 repeated Item item =2; + optional int32 isMax = 3;//本次更新是否有物品超过了限制 } message ModifyDecorationRequest{ From 39cc08884d9d65a7ceae9b9b81ee78901033c30a Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Thu, 26 Nov 2020 20:04:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=B8=BF=E8=92=99=E7=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/HeroInfoProto.proto | 32 ++++++++++++++++++++++++++++++-- protos/MessageTypeProto.proto | 13 +++++++++++++ protos/PlayerInfoProto.proto | 16 ++++++++++++++++ 3 files changed, 59 insertions(+), 2 deletions(-) diff --git a/protos/HeroInfoProto.proto b/protos/HeroInfoProto.proto index b06bb3b..fd94537 100644 --- a/protos/HeroInfoProto.proto +++ b/protos/HeroInfoProto.proto @@ -279,6 +279,34 @@ import "CommonProto.proto"; optional SkinInfo skinInfo = 1;//激活皮肤的推送 } - - + // 开启共鸣格子 + message OpenResonanceRequest { + optional int32 gridId = 1; // 格子id + } + message OpenResonanceResponse { + + } + + // 共鸣 + message ResonanceRequest{ + optional string heroId = 1; // 需要共鸣的神将id + optional int32 gridId = 2; // 格子id + optional int32 type = 3; // 1:共鸣 2：卸下共鸣神将 + } + message ResonanceResponse{ + + } + + // 花费妖晶清除共鸣冷却时间 + message CleanResonanceTimeRequest{ + optional int32 gridId = 2; // 格子id + } + message CleanResonanceTimeResponse{ + optional int32 gridId = 2; // 格子id + } + + // 升级鸿蒙碑 + message UpgradeHongmengTabletResponse{ + + } diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index fe2769d..f60787a 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -523,6 +523,19 @@ enum MessageType{ HERO_SKIN_CHANGE_RESPONSE = 10712; HERO_SKIN_USE_INDICATION = 10713;//激活皮肤推送 + + HONGMENG_OPEN_RESONANCE_REQUEST = 10714; // 开启共鸣区域格子 + HONGMENG_OPEN_RESONANCE_RESPONSE = 10715; + + HONGMENG_RESONANCE_REQUEST = 10716; // 共鸣或卸下共鸣神将 + HONGMENG_RESONANCE_RESPONSE = 10717; + + HONGMENG_CLEAN_TIME_RESQUEST = 10718; // 花费妖晶清除共鸣冷却时间 + HONGMENG_CLEAN_TIME_RESPONSE = 10719; + + HONGMENG_UPGRADE_REQUEST = 10720; // 升级鸿蒙碑 + HONGMENG_UPGRADE_RESPONSE = 10721; + // I 10800 // J 10900 diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index 2bee9ee..55a0c65 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -37,6 +37,18 @@ import "CommonProto.proto"; optional string str = 2; } + // 共鸣信息 + message HongmengHeroInfo{ + optional int32 gridId = 1; // 共鸣格子 + optional string heroId = 2; // 共鸣神将id + optional int64 time = 3; // 共鸣神将卸下后的冷却时间 单位 秒 + } + + message HongmengAddition{ + optional int32 additionType = 1; // 加成类型 1：等级 2：装备 3：魂宝 4：灵宝 5：法宝 + optional int32 value = 2; // 加成值 + } + message GetPlayerInfoResponse{ optional Player player = 1; repeated NewPlayerGuidePoint newPlayerGuidePoint =2; @@ -71,6 +83,10 @@ import "CommonProto.proto"; optional int32 expeditionLeve =31 ; //猎妖之路阶段 -1 待选择 optional int32 hadLuckTime = 32;//幸运探宝次数 optional int32 hadAdvanceLuckTime = 33;//高级幸运探宝次数 + repeated string hongmengGuards = 34; // 鸿蒙守卫 + repeated HongmengHeroInfo hongmengHeroInfos = 35; + optional int32 hongmengTablet = 36; // 鸿蒙碑开启后等级 + repeated HongmengAddition hongmengAdditions = 37; // 共鸣加成 } From 2bc2cefacce39d94bfd65df67b38c79ce0fb8079 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Fri, 27 Nov 2020 10:44:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?Revert=20"=E9=B8=BF=E8=92=99=E7=A2=91"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 39cc08884d9d65a7ceae9b9b81ee78901033c30a. --- protos/HeroInfoProto.proto | 32 ++------------------------------ protos/MessageTypeProto.proto | 13 ------------- protos/PlayerInfoProto.proto | 16 ---------------- 3 files changed, 2 insertions(+), 59 deletions(-) diff --git a/protos/HeroInfoProto.proto b/protos/HeroInfoProto.proto index 70998a4..650665a 100644 --- a/protos/HeroInfoProto.proto +++ b/protos/HeroInfoProto.proto @@ -283,34 +283,6 @@ import "CommonProto.proto"; optional SkinInfo skinInfo = 1;//激活皮肤的推送 } - // 开启共鸣格子 - message OpenResonanceRequest { - optional int32 gridId = 1; // 格子id - } - message OpenResonanceResponse { - - } - - // 共鸣 - message ResonanceRequest{ - optional string heroId = 1; // 需要共鸣的神将id - optional int32 gridId = 2; // 格子id - optional int32 type = 3; // 1:共鸣 2：卸下共鸣神将 - } - message ResonanceResponse{ - - } - - // 花费妖晶清除共鸣冷却时间 - message CleanResonanceTimeRequest{ - optional int32 gridId = 2; // 格子id - } - message CleanResonanceTimeResponse{ - optional int32 gridId = 2; // 格子id - } - - // 升级鸿蒙碑 - message UpgradeHongmengTabletResponse{ - - } + + diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index f60787a..fe2769d 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -523,19 +523,6 @@ enum MessageType{ HERO_SKIN_CHANGE_RESPONSE = 10712; HERO_SKIN_USE_INDICATION = 10713;//激活皮肤推送 - - HONGMENG_OPEN_RESONANCE_REQUEST = 10714; // 开启共鸣区域格子 - HONGMENG_OPEN_RESONANCE_RESPONSE = 10715; - - HONGMENG_RESONANCE_REQUEST = 10716; // 共鸣或卸下共鸣神将 - HONGMENG_RESONANCE_RESPONSE = 10717; - - HONGMENG_CLEAN_TIME_RESQUEST = 10718; // 花费妖晶清除共鸣冷却时间 - HONGMENG_CLEAN_TIME_RESPONSE = 10719; - - HONGMENG_UPGRADE_REQUEST = 10720; // 升级鸿蒙碑 - HONGMENG_UPGRADE_RESPONSE = 10721; - // I 10800 // J 10900 diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index c10c9ee..f777728 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -37,18 +37,6 @@ import "CommonProto.proto"; optional string str = 2; } - // 共鸣信息 - message HongmengHeroInfo{ - optional int32 gridId = 1; // 共鸣格子 - optional string heroId = 2; // 共鸣神将id - optional int64 time = 3; // 共鸣神将卸下后的冷却时间 单位 秒 - } - - message HongmengAddition{ - optional int32 additionType = 1; // 加成类型 1：等级 2：装备 3：魂宝 4：灵宝 5：法宝 - optional int32 value = 2; // 加成值 - } - message GetPlayerInfoResponse{ optional Player player = 1; repeated NewPlayerGuidePoint newPlayerGuidePoint =2; @@ -83,10 +71,6 @@ import "CommonProto.proto"; optional int32 expeditionLeve =31 ; //猎妖之路阶段 -1 待选择 optional int32 hadLuckTime = 32;//幸运探宝次数 optional int32 hadAdvanceLuckTime = 33;//高级幸运探宝次数 - repeated string hongmengGuards = 34; // 鸿蒙守卫 - repeated HongmengHeroInfo hongmengHeroInfos = 35; - optional int32 hongmengTablet = 36; // 鸿蒙碑开启后等级 - repeated HongmengAddition hongmengAdditions = 37; // 共鸣加成 }