From c3e6c72af49371bb8023ce1a08b3938c67a8e9ba Mon Sep 17 00:00:00 2001 From: wangyuan Date: Tue, 24 Sep 2019 14:00:15 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=96=B0=E5=85=B3=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/FightInfoProto.proto | 9 ++++++++- protos/MessageTypeProto.proto | 8 ++++++++ protos/PlayerInfoProto.proto | 7 +++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/protos/FightInfoProto.proto b/protos/FightInfoProto.proto index 7222bc6..a019b71 100644 --- a/protos/FightInfoProto.proto +++ b/protos/FightInfoProto.proto @@ -4,6 +4,8 @@ option optimize_for = SPEED; import "CommonProto.proto"; +import "PlayerInfoProto.proto"; + // request 编号需要小于 response 编号 // 战斗开始 @@ -27,7 +29,7 @@ import "CommonProto.proto"; // 战斗序列帧 14#1#0|14#1#0|14#1#0|...|14#1#0 optional string frames = 2; optional int32 fightId = 3; - optional int32 type = 4; // 类型 1: 关卡 2：地图 3：精英怪 4:爬塔副本 5：妖兽 + optional int32 type = 4; // 类型 1: 关卡 2：地图 3：精英怪 4:爬塔副本 5：妖兽 6： 新关卡 optional int32 dropout = 5 ;// 是否退出 1 ：退出 } message FightEndResponse { @@ -50,6 +52,7 @@ import "CommonProto.proto"; // 试炼精气 optional int32 essenceValue = 9; optional int32 lastXY =10; //失败回退到上一步的位置坐标 + optional UpdateUserExpIndicaiton UpdateUserExpIndicaiton = 11;//经验 } // 快速战斗 @@ -189,5 +192,9 @@ import "CommonProto.proto"; optional AdventureBossSimpleInfo adventureBossInfo =1; // 召唤bosss信息 } + message MainLevelTakeStateRewardResponse{ + optional Drop drop = 1 ;// 挂机奖励 + } + diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index d16a91d..f4bcdba 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -457,6 +457,14 @@ enum MessageType{ //出图indication MAP_OUT_INDICATION = 11235; + MAIN_LEVEL_GET_INFO_REQUEST = 11236;// 获取关卡信息 + MAIN_LEVEL_GET_INFO_RESPONSE = 11237; + + MAIN_LEVEL_TAKE_STATE_REWARD_REQUEST = 11238; //领取关卡挂机奖励 + MAIN_LEVEL_TAKE_STATE_REWARD_RESPONSE = 11239; + + + // N 11300 NOTIFY_PAY_SUCCESS_INDICATION = 11300 ; // 通知前端充值成功 // O 11400 diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index cf8688c..d18ec17 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -551,4 +551,11 @@ import "CommonProto.proto"; optional int32 goodsId = 1; // 索购买的商品id optional Drop drop = 2; // } + + + message GetMainLevelInfoResponse{ + optional int32 fightId = 1 ; //当前关卡id + optional int32 state = 2 ;// 1 已开启但未通过 2 ：已通过 -1：代表等级卡 + optional int32 duration = 3;//挂机时长 + } \ No newline at end of file From 651078ad2af97952bf42956245a9ac71259b49db Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sat, 12 Oct 2019 11:14:32 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=97=A0=E5=B0=BD=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/MapInfoProto.proto | 3 +++ protos/MessageTypeProto.proto | 2 ++ 2 files changed, 5 insertions(+) diff --git a/protos/MapInfoProto.proto b/protos/MapInfoProto.proto index 692f33e..403491a 100644 --- a/protos/MapInfoProto.proto +++ b/protos/MapInfoProto.proto @@ -306,3 +306,6 @@ import "CommonProto.proto"; message EndlessSetTeamIndication{ repeated HeroInfo info = 1; } + message EndlessMapChange{ + optional int32 mapId = 1; + } diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index d16a91d..a7aa791 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -178,6 +178,8 @@ enum MessageType{ EXCHANGE_CDK_REQUEST = 10427;//兑换cdkey EXCHANGE_CDK_RESPONSE = 10428;//兑换cdkey + + ENDLESS_MAP_CHANGE_INDICATION = 10429;//无尽地图修改推送 // F 10500 FIGHT_START_REQUEST = 10500; // From 95a8518037adfdbb54d49642fe0901243d0b70e8 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sat, 12 Oct 2019 11:17:07 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=97=A0=E5=B0=BDindication?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/MapInfoProto.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/protos/MapInfoProto.proto b/protos/MapInfoProto.proto index 403491a..3c61d42 100644 --- a/protos/MapInfoProto.proto +++ b/protos/MapInfoProto.proto @@ -308,4 +308,5 @@ import "CommonProto.proto"; } message EndlessMapChange{ optional int32 mapId = 1; + optional int32 worldLevel = 2; } From 54b4e8a5774e3b79bc3852f355cf6a3db953ad30 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Tue, 24 Sep 2019 15:08:44 +0800 Subject: [PATCH 4/6] fix --- protos/FightInfoProto.proto | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/protos/FightInfoProto.proto b/protos/FightInfoProto.proto index a019b71..5712464 100644 --- a/protos/FightInfoProto.proto +++ b/protos/FightInfoProto.proto @@ -4,8 +4,6 @@ option optimize_for = SPEED; import "CommonProto.proto"; -import "PlayerInfoProto.proto"; - // request 编号需要小于 response 编号 // 战斗开始 @@ -32,6 +30,13 @@ import "PlayerInfoProto.proto"; optional int32 type = 4; // 类型 1: 关卡 2：地图 3：精英怪 4:爬塔副本 5：妖兽 6： 新关卡 optional int32 dropout = 5 ;// 是否退出 1 ：退出 } + + message UpdateUserExpIndicaiton{ + optional int32 level = 1 ;// 玩家等级 + optional int32 exp =2 ; // 玩家经验 + } + + message FightEndResponse { //战斗结果 optional int32 result = 1; @@ -192,9 +197,5 @@ import "PlayerInfoProto.proto"; optional AdventureBossSimpleInfo adventureBossInfo =1; // 召唤bosss信息 } - message MainLevelTakeStateRewardResponse{ - optional Drop drop = 1 ;// 挂机奖励 - } - From e4b240ea5c2e54d9023c249d7357a8d4edf8b59c Mon Sep 17 00:00:00 2001 From: wangyuan Date: Tue, 24 Sep 2019 17:21:35 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=8C=82=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/PlayerInfoProto.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index d18ec17..cdbfd8a 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -557,5 +557,6 @@ import "CommonProto.proto"; optional int32 fightId = 1 ; //当前关卡id optional int32 state = 2 ;// 1 已开启但未通过 2 ：已通过 -1：代表等级卡 optional int32 duration = 3;//挂机时长 + repeated AdventureBossSimpleInfo adventureBossSimpleInfo =4; } \ No newline at end of file From 937fb0002e53d0c6b2b261755b949883baa60e86 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Wed, 25 Sep 2019 13:43:13 +0800 Subject: [PATCH 6/6] hero level --- protos/HeroInfoProto.proto | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/protos/HeroInfoProto.proto b/protos/HeroInfoProto.proto index a57e189..c8acc01 100644 --- a/protos/HeroInfoProto.proto +++ b/protos/HeroInfoProto.proto @@ -44,6 +44,12 @@ import "CommonProto.proto"; message UpHeroLevelRequest{ optional string heroId = 1; //升级或突破的英雄id + optional int32 targetLevel = 2 ;// 目标等级 + } + + message UpHeroLevelResponse{ + optional string heroId = 1; //升级或突破的英雄id + optional int32 targetLevel = 2 ;// 目标等级 }