From 2fad3c176d598a7695614a5dfcf48023710c8026 Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 20 Nov 2020 16:56:16 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E7=AB=9E=E6=8A=80=E5=9C=BA=E8=83=9C?= =?UTF-8?q?=E5=88=A9=E5=A4=B1=E8=B4=A5=E6=8E=89=E8=90=BD=E7=89=A9=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/ArenaInfoProto.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/protos/ArenaInfoProto.proto b/protos/ArenaInfoProto.proto index 8182ecb..dd06661 100644 --- a/protos/ArenaInfoProto.proto +++ b/protos/ArenaInfoProto.proto @@ -27,6 +27,7 @@ import "CommonProto.proto"; repeated ArenaEnemy arenaEnemys = 3; //新的一批对手信息 optional FightData fightData =4; // 战斗数据 optional int32 fightResult = 5 ;// 战斗结果 + optional Drop drop = 6; } message GetArenaRankInfoResponse{ From 5946da312a2d82d8c01ae05c6b67d321e285468c Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 26 Nov 2020 15:20:58 +0800 Subject: [PATCH 2/9] =?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 3/9] =?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 4/9] =?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; // 共鸣加成 } From bbe362ad8dbf733c2ed3ae12a2f8fa3e87f7c90b Mon Sep 17 00:00:00 2001 From: duhui Date: Wed, 2 Dec 2020 10:08:19 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E6=96=B0=E5=B0=86=E6=9D=A5=E8=A2=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/ActivityProto.proto | 15 +++++++++++++++ protos/MessageTypeProto.proto | 4 ++++ 2 files changed, 19 insertions(+) diff --git a/protos/ActivityProto.proto b/protos/ActivityProto.proto index 3ded1b5..72202ce 100644 --- a/protos/ActivityProto.proto +++ b/protos/ActivityProto.proto @@ -34,4 +34,19 @@ import "CommonProto.proto"; message SpecicalMonsterChooseRequest{ optional int32 activityId = 1; optional int32 selectId = 2; + } + + // 新将来袭 + message NewGeneralAttackRequest{ + // 活动id + optional int32 activityId = 1; + // 使用次数类型id + optional int32 privilageTypeId = 2; + } + + message NewGeneralAttackResponse{ + // 战斗属性 + optional FightData fightData = 1; + // 道具 + optional Drop drop = 2; } \ No newline at end of file diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index fe2769d..5d55e19 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -1099,6 +1099,10 @@ enum MessageType{ SeletSubRewardPoolRequest = 303671;//易经宝库 SeletSubRewardPoolResponse = 303672; + //303691 - 30390 新将来袭 + NewGeneralAttackRequest = 303691; + NewGeneralAttackResponse = 303692; + } From 8ee13742ed91a3946eaaf8fcd352a2df3e9a02ac Mon Sep 17 00:00:00 2001 From: duhui Date: Thu, 10 Dec 2020 14:47:50 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E7=A5=9E=E6=A0=91=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE=EF=BC=8Cchat=E5=8A=A0=E4=BA=86=E4=B8=AA?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=EF=BC=8C=E4=B8=8D=E5=BD=B1=E5=93=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/ActivityProto.proto | 6 ++++++ protos/ChatProto.proto | 1 + protos/CommonProto.proto | 1 + protos/MessageTypeProto.proto | 6 +++++- 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/protos/ActivityProto.proto b/protos/ActivityProto.proto index 72202ce..4284511 100644 --- a/protos/ActivityProto.proto +++ b/protos/ActivityProto.proto @@ -49,4 +49,10 @@ import "CommonProto.proto"; optional FightData fightData = 1; // 道具 optional Drop drop = 2; + } + + // 建木神树 + message UpgradeGodTreeRequest{ + } + message UpgradeGodTreeResponse{ } \ No newline at end of file diff --git a/protos/ChatProto.proto b/protos/ChatProto.proto index 4498010..246cbca 100644 --- a/protos/ChatProto.proto +++ b/protos/ChatProto.proto @@ -17,6 +17,7 @@ message ChatInfo{ //跑马灯用 optional int32 messageType = 13; // 消息类型 1:吉运,2:勤勉 optional int32 itemId =14; // 查看道具id + //optional string item = 14; // 物品信息，用#分割 optional int32 type = 15; //0:系统 1:其他 optional int32 startTime = 16 ; // 开始时间 optional int32 endTime = 17; //结束时间 diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index ddc644f..aaf8f43 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -40,6 +40,7 @@ option optimize_for = SPEED; optional int32 ride = 22;//坐骑 optional int32 rideLevel = 23;//坐骑等级 optional int32 sex = 24;//玩家性别 0男1女 + optional int32 treeLevel = 25;// 神树等级 } message Privilege{ diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index 5d55e19..cc4bebf 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -1099,10 +1099,14 @@ enum MessageType{ SeletSubRewardPoolRequest = 303671;//易经宝库 SeletSubRewardPoolResponse = 303672; - //303691 - 30390 新将来袭 + //303691 - 303692 新将来袭 NewGeneralAttackRequest = 303691; NewGeneralAttackResponse = 303692; + // 303701 - 303702 建木神树 + UpgradeGodTreeRequest = 303701; + UpgradeGodTreeResponse = 303702; + } From a8506cb603c51692476ad14c3c974ac1ac87c801 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sat, 12 Dec 2020 11:13:21 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E8=B7=A8=E6=9C=8D=E5=8D=81=E7=BB=9D?= =?UTF-8?q?=E9=98=B5=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/CommonProto.proto | 1 + protos/Family.proto | 1 + protos/MessageTypeProto.proto | 5 +++++ protos/gtwprotos/WorldProto.proto | 34 +++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 7458a46..37e1d4b 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -866,4 +866,5 @@ option optimize_for = SPEED; optional int32 overTime = 2; } + \ No newline at end of file diff --git a/protos/Family.proto b/protos/Family.proto index 4ceef9d..e5d9354 100644 --- a/protos/Family.proto +++ b/protos/Family.proto @@ -431,6 +431,7 @@ import "CommonProto.proto"; optional int32 pathId = 1; optional string guildName = 2; optional int32 gid = 3; + optional string serverName = 4; } message GetDeathPathStatusResponse{ diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index a0d3391..ad12caa 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -1125,6 +1125,11 @@ enum MessageType{ GetGSUserArenaInfoRequest = 900009; GetGSUserArenaInfoResponse = 900010; + GetRankRequest = 900011; + + AddDeathPathRankRequest = 900012; + + GetDeathPathFirstRequest = 900013; } diff --git a/protos/gtwprotos/WorldProto.proto b/protos/gtwprotos/WorldProto.proto index 82d2659..4aabdca 100644 --- a/protos/gtwprotos/WorldProto.proto +++ b/protos/gtwprotos/WorldProto.proto @@ -91,9 +91,43 @@ import "CommonProto.proto"; optional int32 type = 1;//种类id optional int32 acitvityId = 2;//活动id optional int32 crossId =3;//大区id + optional int32 uid = 4;//用户id } message GetRankResponse{ repeated rpc.protocols.UserRank ranks = 1; optional rpc.protocols.RankInfo myRankInfo = 2; } + message CrossUser{ + optional int32 uid = 1; + optional string username = 2; + } + message AddDeathPathRankRequest{ + optional int32 uid = 1; + optional CrossUser crossUserInfo = 2; + optional int32 guildId = 3; + optional int32 damage = 4; + optional int32 pathId = 5; + optional int32 groupId = 6; + } + message AddDeathPathRankResponse{ + + } + message EvertDeathPath{ + optional int32 gid = 1; + optional string guildName = 2; + optional int32 pathId = 3; + optional string serverName =4; + } + message GetDeathPathFirstRequest{ + optional int32 groupId = 1; + } + message GetDeathPathFirstResponse{ + repeated EvertDeathPath deathPathInfo = 1; + } + + + + + + \ No newline at end of file From e63792bf7b9cbcdf2cf0e29a9bee68a3cfc10fef Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sat, 12 Dec 2020 13:51:31 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E5=8C=BA?= =?UTF-8?q?=E6=9C=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/CommonProto.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 8fbca12..91e3ce2 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -457,6 +457,7 @@ option optimize_for = SPEED; optional int32 force = 8;//战力 optional int32 guildSign = 9 ;//公会图腾 optional int32 sex = 10;//性别 + optional string serverName = 11;//所在区服 } From 5fdaade433f299f5f11a191181aab147ac27b4a2 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Tue, 15 Dec 2020 16:34:31 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E5=8D=81=E7=BB=9D=E9=98=B5=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/MessageTypeProto.proto | 2 ++ protos/gtwprotos/WorldProto.proto | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index d51c462..f8b3e13 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -1136,6 +1136,8 @@ enum MessageType{ AddDeathPathRankRequest = 900012; GetDeathPathFirstRequest = 900013; + + GetDeathPathRewardRequest = 900014; } diff --git a/protos/gtwprotos/WorldProto.proto b/protos/gtwprotos/WorldProto.proto index 6fa7115..5f7ae8e 100644 --- a/protos/gtwprotos/WorldProto.proto +++ b/protos/gtwprotos/WorldProto.proto @@ -125,6 +125,25 @@ import "CommonProto.proto"; message GetDeathPathFirstResponse{ repeated EvertDeathPath deathPathInfo = 1; } + message GetDeathPathRewardRequest{ + optional int32 groupId =1; + optional int32 guildId = 2; + } + message GetDeathPathRewardResponse{ + optional int32 rankTotal = 1; + } + + message GuildRank{ + optional int32 guildId = 1; + optional int32 rank = 2; + } + //服务器整个结算 + message DeathPathWorldRewardRequest{ + optional int32 groupId =1; + } + message DeathPathWorldRewardResponse{ + repeated GuildRank ranks = 1;//所有需要发奖的公会id + }