From b97e312785dd927e30656a73ebef6bfa522e812c Mon Sep 17 00:00:00 2001 From: lvxinran Date: Wed, 16 Dec 2020 11:26:23 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E5=9B=9B=E7=81=B5=E8=AF=95=E7=82=BC?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/CommonProto.proto | 6 ++++++ protos/MessageTypeProto.proto | 8 +++++++- protos/PlayerInfoProto.proto | 14 ++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index aaf8f43..d75c166 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -864,5 +864,11 @@ option optimize_for = SPEED; optional int32 skinId = 1; optional int32 overTime = 2; } + message FourChallengeInfo{ + optional int32 type = 1; + optional int32 overTime = 2; + optional int32 currentFloor = 3; + optional int32 remainTimes = 4;//剩余次数 + } \ No newline at end of file diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index cc4bebf..5610a3f 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -381,7 +381,13 @@ enum MessageType{ FAST_FIGHT_CHALLENGE_REQUEST = 10586; // 快速战斗 FAST_FIGHT_CHALLENGE_RESPONSE = 10587; - + + FOUR_CHALLENGE_GET_INFO_REQUEST = 10588;//获取四灵试炼状态 + FOUR_CHALLENGE_GET_INFO_RESPONSE = 10589; + + FOUR_CHALLENGE_DO_REQUEST = 10590;//挑战四灵试炼 + FOUR_CHALLENGE_DO_RESPONSE = 10591; + // G 10600 GET_PLAYERINFO_REQUEST = 10600; // GET_PLAYERINFO_RESPONSE = 10601; diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index f777728..5d3c3d5 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -761,6 +761,20 @@ import "CommonProto.proto"; optional int32 weekTime = 2; } + message FourChallengeGetInfoResponse{ + //获取四灵试炼信息 + repeated FourChallengeInfo info = 1; + } + + message FourChallengeDoRequest{//挑战 扫荡协议 + optional int32 challengeId = 1; + optional int32 type = 2;//0为挑战，1为扫荡 + } + + message FourChallengeDoResponse{//挑战 扫荡协议 + optional Drop drop = 1; + optional FightData fightData = 2;//0为挑战，1为扫荡 + } \ No newline at end of file From 8bc2e1421c310f0935d5b76dcd6f7d18e2046148 Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 18 Dec 2020 16:14:11 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E7=A5=9E=E6=A0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/CommonProto.proto | 1 + protos/PlayerInfoProto.proto | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 440644e..55f7cc1 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -75,6 +75,7 @@ option optimize_for = SPEED; optional int32 skillId = 7;//装备附带技能 optional int32 isLocked = 8; //是否被锁定 1：被锁定 0:未锁定 optional int32 exp = 9; //字段可选 魂印传入经验（对应宝器强化等级） + optional int32 treeLv = 10;// 神树等级 } message SoulPos{ diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index 1a23459..18988c1 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -647,7 +647,7 @@ import "CommonProto.proto"; message ViewHeroInfoResponse{ optional Hero hero =1; - repeated Equip equip =2; // 英雄所穿装备、魂印（法宝不在内，放在Hero中） + repeated Equip equip =2; // 英雄所穿装备、魂印、法宝 repeated SpecialEffects SpecialEffects = 3;//属性信息 optional int32 force = 4 ; //战力 optional int32 guildSkill = 5;//公会技能 From db42a5f6d9832a5dc234a4b97da8af233ce264c2 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 12 Jan 2021 17:48:49 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E5=9B=9B=E7=81=B5=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/CommonProto.proto | 8 ++++++++ protos/PlayerInfoProto.proto | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index d75c166..49c4840 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -103,6 +103,7 @@ option optimize_for = SPEED; optional int32 createtype = 15;//创建类型 1猎妖援助 optional int32 changeId = 16;//置换模板id 默认0 } + message PokemonInfo{ optional int32 tempId = 1; //异妖id optional string id = 2; @@ -871,4 +872,11 @@ option optimize_for = SPEED; optional int32 remainTimes = 4;//剩余次数 } + message HelpFightList{ + optional int32 uid = 1; + optional string userName = 2; + optional int32 guildName = 3;//0好友 1公会 + optional int32 trailType = 4;//试炼类型 + repeated Hero hero = 5; //助战英雄 + } \ No newline at end of file diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index 5d3c3d5..c5b7668 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -776,5 +776,14 @@ import "CommonProto.proto"; optional FightData fightData = 2;//0为挑战，1为扫荡 } + message HelpFightListRequest{//四灵试炼 + optional int32 type = 1; //0 获取所有好友的助战信息 1获取我选取的好友的助战信息 2获取我的助战信息 + } + + message HelpFightListResponse{//四灵试炼 助战协议 + repeated HelpFight helpHeros = 1; //好友的 + } + + \ No newline at end of file From 8e30d2ed51c543209003efbaa31431d22ea137a5 Mon Sep 17 00:00:00 2001 From: duhui Date: Thu, 21 Jan 2021 16:27:35 +0800 Subject: [PATCH 04/18] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/PlayerInfoProto.proto | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index c5b7668..f701154 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -771,17 +771,20 @@ import "CommonProto.proto"; optional int32 type = 2;//0为挑战，1为扫荡 } - message FourChallengeDoResponse{//挑战 扫荡协议 + //挑战 扫荡协议 + message FourChallengeDoResponse{ optional Drop drop = 1; optional FightData fightData = 2;//0为挑战，1为扫荡 } - message HelpFightListRequest{//四灵试炼 + //四灵试炼 + message HelpFightListRequest{ optional int32 type = 1; //0 获取所有好友的助战信息 1获取我选取的好友的助战信息 2获取我的助战信息 } - message HelpFightListResponse{//四灵试炼 助战协议 - repeated HelpFight helpHeros = 1; //好友的 + //四灵试炼 助战协议 + message HelpFightListResponse{ + repeated HelpFightList helpHeros = 1; //好友的 } From 8fe2a8d43fa2c61568634014e9954655d232f9c5 Mon Sep 17 00:00:00 2001 From: duhui Date: Wed, 3 Feb 2021 10:37:27 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E5=9B=9B=E7=81=B5=E8=AF=95=E7=82=BC?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/CommonProto.proto | 8 +++++--- protos/MessageTypeProto.proto | 13 ++++++++++++ protos/PlayerInfoProto.proto | 37 +++++++++++++++++++++++++---------- 3 files changed, 45 insertions(+), 13 deletions(-) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index dc3471a..8883c15 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -876,18 +876,20 @@ option optimize_for = SPEED; optional int32 skinId = 1; optional int32 overTime = 2; } + + // 四灵试炼信息 message FourChallengeInfo{ optional int32 type = 1; optional int32 overTime = 2; - optional int32 currentFloor = 3; + optional int32 currentFloor = 3;//层数 optional int32 remainTimes = 4;//剩余次数 } - + // 助战信息 message HelpFightList{ optional int32 uid = 1; optional string userName = 2; optional int32 guildName = 3;//0好友 1公会 optional int32 trailType = 4;//试炼类型 - repeated Hero hero = 5; //助战英雄 + optional Hero hero = 5; //助战英雄 } \ No newline at end of file diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index 085ccb2..f0c044b 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -1122,6 +1122,19 @@ enum MessageType{ ZeroPlayerUpdateIndication = 303703; + // 303704 - 303709 助战 + // 获取助战列表 + HelpFightListRequest = 303704; + HelpFightListResponse = 303705; + + // 设置自己的助战 + SetHelpFightRequest = 303706; + SetHelpFightResponse = 303707; + + // 选择使用助战英雄 + useHelpHeroRequest = 303708; + useHelpHeroResponse = 303709; + // 心魔试炼 DemonsTrialRewardRequest = 303801; DemonsTrialRewardResponse = 303802; diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index 94623b6..45fc41d 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -74,6 +74,8 @@ import "CommonProto.proto"; optional int32 worldLeve = 34;//世界等级 repeated int32 DemonsTrialRewardInfo = 35;//心魔试炼已领取奖励信息 repeated HeadFrameList headFrameBag = 36;//头像框背包 + repeated HelpFightList helpFightList = 37;//已选取的助战信息 + repeated int32 isUseHelpHero = 38;// 是否使用了助战英雄，0:未选中，1：已选未使用，2：已使用 } @@ -781,26 +783,41 @@ import "CommonProto.proto"; repeated FourChallengeInfo info = 1; } - message FourChallengeDoRequest{//挑战 扫荡协议 + // 四灵，挑战 扫荡协议 + message FourChallengeDoRequest{ optional int32 challengeId = 1; optional int32 type = 2;//0为挑战，1为扫荡 } - - //挑战 扫荡协议 message FourChallengeDoResponse{ optional Drop drop = 1; optional FightData fightData = 2;//0为挑战，1为扫荡 } - //四灵试炼 - message HelpFightListRequest{ - optional int32 type = 1; //0 获取所有好友的助战信息 1获取我选取的好友的助战信息 2获取我的助战信息 - } - //四灵试炼 助战协议 - message HelpFightListResponse{ - repeated HelpFightList helpHeros = 1; //好友的 + message HelpFightListRequest{ + optional int32 type = 1; //0:获取我的助战信息 } + message HelpFightListResponse{ + repeated HelpFightList helpHeros = 1;//助战英雄列表 + } + + // 四灵，设置我的助战 + message SetHelpFightRequest{ + optional string heroId = 1;//英雄id + } + message SetHelpFightResponse{ + optional Drop drop = 1;//设置助战奖励 + } + + // 四灵，选择使用助战 + message useHelpHeroRequest{ + optional string heroId = 1;//英雄id + optional int32 type = 2;//英雄类型 + optional int32 status = 3;//0：取消，1：选择 + } + message useHelpHeroResponse{ + } + message WorldLevelIndication{ optional int32 worldLeve = 1;//世界等级推送 From ffd0816f9615a7fe200135ee90426fd3da1d3177 Mon Sep 17 00:00:00 2001 From: duhui Date: Wed, 3 Feb 2021 16:15:22 +0800 Subject: [PATCH 06/18] =?UTF-8?q?=E5=9B=9B=E7=81=B5=E8=AF=95=E7=82=BC?= =?UTF-8?q?=E5=8D=8F=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/FightInfoProto.proto | 2 +- protos/MessageTypeProto.proto | 12 ++++++------ protos/PlayerInfoProto.proto | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/protos/FightInfoProto.proto b/protos/FightInfoProto.proto index f69816d..c4c7509 100644 --- a/protos/FightInfoProto.proto +++ b/protos/FightInfoProto.proto @@ -105,7 +105,7 @@ import "CommonProto.proto"; } message FightRePlayRequest{ - optional int32 type =1; // 类型 1： 竞技场 + optional int32 type =1; // 类型 1：竞技场防守记录，2：竞技场冠军纪录，3：boss记录，4：四灵试炼战斗记录 optional string fightId =2; // fight 动态Id } diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index f0c044b..9c2e29a 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -1124,16 +1124,16 @@ enum MessageType{ // 303704 - 303709 助战 // 获取助战列表 - HelpFightListRequest = 303704; - HelpFightListResponse = 303705; + GetHelpHeroListRequest = 303704; + GetHelpHeroListResponse = 303705; // 设置自己的助战 - SetHelpFightRequest = 303706; - SetHelpFightResponse = 303707; + SetHelpHeroRequest = 303706; + SetHelpHeroResponse = 303707; // 选择使用助战英雄 - useHelpHeroRequest = 303708; - useHelpHeroResponse = 303709; + UseHelpHeroRequest = 303708; + UseHelpHeroResponse = 303709; // 心魔试炼 DemonsTrialRewardRequest = 303801; diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index 45fc41d..c85ea06 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -794,28 +794,28 @@ import "CommonProto.proto"; } //四灵试炼 助战协议 - message HelpFightListRequest{ + message GetHelpHeroListRequest{ optional int32 type = 1; //0:获取我的助战信息 } - message HelpFightListResponse{ + message GetHelpHeroListResponse{ repeated HelpFightList helpHeros = 1;//助战英雄列表 } // 四灵，设置我的助战 - message SetHelpFightRequest{ + message SetHelpHeroRequest{ optional string heroId = 1;//英雄id } - message SetHelpFightResponse{ + message SetHelpHeroResponse{ optional Drop drop = 1;//设置助战奖励 } // 四灵，选择使用助战 - message useHelpHeroRequest{ + message UseHelpHeroRequest{ optional string heroId = 1;//英雄id optional int32 type = 2;//英雄类型 optional int32 status = 3;//0：取消，1：选择 } - message useHelpHeroResponse{ + message UseHelpHeroResponse{ } From 1b5235ea6a4e823c3d15f22c1682aeeda98c7bd7 Mon Sep 17 00:00:00 2001 From: duhui Date: Wed, 3 Feb 2021 16:35:23 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E5=9B=9B=E7=81=B5=EF=BC=8C=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=88=98=E6=96=97=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/CommonProto.proto | 1 + protos/MessageTypeProto.proto | 4 ++++ protos/PlayerInfoProto.proto | 13 ++++++++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 8883c15..fdee4e2 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -467,6 +467,7 @@ option optimize_for = SPEED; optional int32 guildSign = 9 ;//公会图腾 optional int32 sex = 10;//性别 optional string serverName = 11;//所在区服 + optional int32 firstOrMini = 12;//四灵试炼，0：首通，1：最低战力 } diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index 9c2e29a..e17c1e6 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -1135,6 +1135,10 @@ enum MessageType{ UseHelpHeroRequest = 303708; UseHelpHeroResponse = 303709; + // 四灵，获取回放信息 + GetFourChallengeRecordRequest = 303710; + GetFourChallengeRecordResponse = 303711; + // 心魔试炼 DemonsTrialRewardRequest = 303801; DemonsTrialRewardResponse = 303802; diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index c85ea06..fad34a8 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -818,9 +818,20 @@ import "CommonProto.proto"; message UseHelpHeroResponse{ } + // 四灵，获取战斗记录 + message GetFourChallengeRecordRequest{ + optional int32 type = 1;//类型，人佛妖道 + optional int32 tier = 2;//层数 + } + message GetFourChallengeRecordResponse{ + optional UserRank userRank = 1;//玩家信息 + } + + + //世界等级推送 message WorldLevelIndication{ - optional int32 worldLeve = 1;//世界等级推送 + optional int32 worldLeve = 1; } // 使用头像框 From ccf082da152495f4c08715bc3c5d969f74fd9958 Mon Sep 17 00:00:00 2001 From: duhui Date: Wed, 3 Feb 2021 16:54:42 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=E5=9B=9B=E7=81=B5=EF=BC=8C=E5=9B=9E?= =?UTF-8?q?=E6=94=BE=E8=AE=B0=E5=BD=95=EF=BC=8C=E7=8E=A9=E5=AE=B6=E5=A4=8D?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/PlayerInfoProto.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index fad34a8..0815b41 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -825,7 +825,7 @@ import "CommonProto.proto"; } message GetFourChallengeRecordResponse{ - optional UserRank userRank = 1;//玩家信息 + repeated UserRank userRank = 1;//玩家信息 } From ebed66d6828d5e36b5b3dcf01e30419fa36cfd89 Mon Sep 17 00:00:00 2001 From: duhui Date: Thu, 4 Feb 2021 16:35:23 +0800 Subject: [PATCH 09/18] =?UTF-8?q?=E5=9B=9B=E7=81=B5=E5=8D=8F=E8=AE=AE?= =?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 | 1 + protos/PlayerInfoProto.proto | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index fdee4e2..08e4128 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -892,5 +892,6 @@ option optimize_for = SPEED; optional int32 guildName = 3;//0好友 1公会 optional int32 trailType = 4;//试炼类型 optional Hero hero = 5; //助战英雄 + optional int32 state = 6;//状态，0:未使用，1：已使用 } \ No newline at end of file diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index 0815b41..e73bfec 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -75,7 +75,6 @@ import "CommonProto.proto"; repeated int32 DemonsTrialRewardInfo = 35;//心魔试炼已领取奖励信息 repeated HeadFrameList headFrameBag = 36;//头像框背包 repeated HelpFightList helpFightList = 37;//已选取的助战信息 - repeated int32 isUseHelpHero = 38;// 是否使用了助战英雄，0:未选中，1：已选未使用，2：已使用 } @@ -815,8 +814,6 @@ import "CommonProto.proto"; optional int32 type = 2;//英雄类型 optional int32 status = 3;//0：取消，1：选择 } - message UseHelpHeroResponse{ - } // 四灵，获取战斗记录 message GetFourChallengeRecordRequest{ From 2d0a316d3be4296a47c023390a07e2d82c3b0784 Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 5 Feb 2021 16:52:06 +0800 Subject: [PATCH 10/18] =?UTF-8?q?=E5=9B=9B=E7=81=B5=E8=AF=95=E7=82=BC?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/CommonProto.proto | 4 ++-- protos/PlayerInfoProto.proto | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 08e4128..e45c1df 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -880,8 +880,8 @@ option optimize_for = SPEED; // 四灵试炼信息 message FourChallengeInfo{ - optional int32 type = 1; - optional int32 overTime = 2; + optional int32 type = 1;//四灵类型 + optional int32 overTime = 2;//四灵活动开启状态 optional int32 currentFloor = 3;//层数 optional int32 remainTimes = 4;//剩余次数 } diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index e73bfec..f3029f1 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -782,6 +782,11 @@ import "CommonProto.proto"; repeated FourChallengeInfo info = 1; } + //推送四灵试炼信息 + message FourChallengeInfoIndication{ + repeated FourChallengeInfo info = 1; + } + // 四灵，挑战 扫荡协议 message FourChallengeDoRequest{ optional int32 challengeId = 1; From 83f3fa43cde720724114c8cdb5ce8616889a7d4b Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 5 Feb 2021 16:56:23 +0800 Subject: [PATCH 11/18] =?UTF-8?q?=E5=9B=9B=E7=81=B5=E5=8D=8F=E8=AE=AE?= =?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/MessageTypeProto.proto | 3 +++ protos/PlayerInfoProto.proto | 7 +------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index e17c1e6..fd07b85 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -1139,6 +1139,9 @@ enum MessageType{ GetFourChallengeRecordRequest = 303710; GetFourChallengeRecordResponse = 303711; + // 推送四灵试炼信息 + SendFourChallengeInfoIndication = 303712; + // 心魔试炼 DemonsTrialRewardRequest = 303801; DemonsTrialRewardResponse = 303802; diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index f3029f1..30af901 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -777,13 +777,8 @@ import "CommonProto.proto"; optional int32 weekTime = 2; } + //获取四灵试炼信息 message FourChallengeGetInfoResponse{ - //获取四灵试炼信息 - repeated FourChallengeInfo info = 1; - } - - //推送四灵试炼信息 - message FourChallengeInfoIndication{ repeated FourChallengeInfo info = 1; } From 372782bdc7c8f534cf9481302bed585675f08217 Mon Sep 17 00:00:00 2001 From: duhui Date: Sun, 7 Feb 2021 11:55:33 +0800 Subject: [PATCH 12/18] =?UTF-8?q?=E5=9B=9B=E7=81=B5=E5=8A=A9=E6=88=98?= =?UTF-8?q?=EF=BC=8C=E8=8B=B1=E9=9B=84=E7=9A=84=E9=AD=82=E5=AE=9D=E7=81=B5?= =?UTF-8?q?=E5=AE=9D?= 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 e45c1df..dab2388 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -893,5 +893,6 @@ option optimize_for = SPEED; optional int32 trailType = 4;//试炼类型 optional Hero hero = 5; //助战英雄 optional int32 state = 6;//状态，0:未使用，1：已使用 + repeated Equip jewels = 7;//英雄的魂宝灵宝 } \ No newline at end of file From 3b9cdfb75f21a66ef7e26b615ffe09969f9366e0 Mon Sep 17 00:00:00 2001 From: duhui Date: Mon, 15 Mar 2021 16:10:29 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E5=9B=9B=E7=81=B5=E8=AF=95=E7=82=BC,?= =?UTF-8?q?=E7=A5=9E=E6=A0=91=E5=85=B1=E9=B8=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/CommonProto.proto | 2 ++ 1 file changed, 2 insertions(+) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index dab2388..49b15fd 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -894,5 +894,7 @@ option optimize_for = SPEED; optional Hero hero = 5; //助战英雄 optional int32 state = 6;//状态，0:未使用，1：已使用 repeated Equip jewels = 7;//英雄的魂宝灵宝 + optional int32 treeLevel = 8;//神树等级 + optional int32 fourTotal = 9;//四灵总层数 } \ No newline at end of file From e0d5058c0415c0fdc07d6fc3fc0df9e5d873992a Mon Sep 17 00:00:00 2001 From: duhui Date: Tue, 31 Aug 2021 11:38:36 +0800 Subject: [PATCH 14/18] =?UTF-8?q?=E5=9B=9B=E7=81=B5=E8=AF=95=E7=82=BC?= =?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/MessageTypeProto.proto | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index 4d0cd2e..5b5bb18 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -1224,6 +1224,13 @@ enum MessageType{ // 推送四灵试炼信息 SendFourChallengeInfoIndication = 303712; + + // 四灵试炼 + FOUR_CHALLENGE_GET_INFO_REQUEST = 303713;//获取四灵试炼状态 + FOUR_CHALLENGE_GET_INFO_RESPONSE = 303714; + + FOUR_CHALLENGE_DO_REQUEST = 303715;//挑战四灵试炼 + FOUR_CHALLENGE_DO_RESPONSE = 303716; // 心魔试炼 DemonsTrialRewardRequest = 303801; From 3d96082be3eb4603aaced301dd3dc25577d7aee6 Mon Sep 17 00:00:00 2001 From: duhui Date: Tue, 31 Aug 2021 11:40:06 +0800 Subject: [PATCH 15/18] =?UTF-8?q?=E5=9B=9B=E7=81=B5=E8=AF=95=E7=82=BC?= =?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/PlayerInfoProto.proto | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index 97eb38e..fa0a9df 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -75,7 +75,6 @@ import "CommonProto.proto"; optional int32 worldLeve = 34;//世界等级 repeated int32 DemonsTrialRewardInfo = 35;//心魔试炼已领取奖励信息 repeated HeadFrameList headFrameBag = 36;//头像框背包 -<<<<<<< HEAD repeated UserSkinInfo userSkinList = 37;//玩家皮肤信息 repeated UserTitleInfo userTitleList = 38;//玩家称号信息 repeated UserMountInfo userMountList = 39;//玩家坐骑信息 @@ -84,9 +83,7 @@ import "CommonProto.proto"; repeated PurpleMansionSeal sealList = 42;//神印列表 optional int32 randomCount = 43;//抽卡剩余必出 repeated randomTypeNum drawTimes = 44;//类型抽卡总次数 -======= - repeated HelpFightList helpFightList = 37;//已选取的助战信息 ->>>>>>> master_test_hw_four_challenge + repeated HelpFightList helpFightList = 45;//已选取的助战信息 } From 51b2228ad74df00f49d6532438e14cfd9bf84e1a Mon Sep 17 00:00:00 2001 From: duhui Date: Tue, 31 Aug 2021 14:11:06 +0800 Subject: [PATCH 16/18] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=9B=E7=81=B5?= =?UTF-8?q?=E8=AF=95=E7=82=BC=E5=B1=82=E6=95=B0?= 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 b9a1792..5dac430 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -79,6 +79,7 @@ option optimize_for = SPEED; optional int32 isLocked = 8; //是否被锁定 1：被锁定 0:未锁定 optional int32 exp = 9; //字段可选 魂印传入经验（对应宝器强化等级） optional int32 treeLv = 10;// 神树等级 + optional int32 fourSpirit = 11;//四灵试炼层数 } message SoulPos{ From ab0a2bce91d70474315ab002d6ff29f219d0d203 Mon Sep 17 00:00:00 2001 From: duhui Date: Wed, 1 Sep 2021 10:13:31 +0800 Subject: [PATCH 17/18] =?UTF-8?q?=E5=BB=BA=E6=9C=A8=E7=A5=9E=E6=A0=91?= =?UTF-8?q?=EF=BC=8C=E5=BF=AB=E9=80=9F=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/ActivityProto.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/protos/ActivityProto.proto b/protos/ActivityProto.proto index 4264670..07b65d9 100644 --- a/protos/ActivityProto.proto +++ b/protos/ActivityProto.proto @@ -53,6 +53,7 @@ import "CommonProto.proto"; // 建木神树 message UpgradeGodTreeRequest{ + optional int32 level = 1; } message UpgradeGodTreeResponse{ } From 6701577249bd68a5675a7cfa59ccc82e2aebd5ef Mon Sep 17 00:00:00 2001 From: duhui Date: Wed, 1 Sep 2021 10:34:22 +0800 Subject: [PATCH 18/18] =?UTF-8?q?=E5=BB=BA=E6=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/ActivityProto.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protos/ActivityProto.proto b/protos/ActivityProto.proto index 07b65d9..da3f944 100644 --- a/protos/ActivityProto.proto +++ b/protos/ActivityProto.proto @@ -53,7 +53,7 @@ import "CommonProto.proto"; // 建木神树 message UpgradeGodTreeRequest{ - optional int32 level = 1; + optional int32 count = 1; } message UpgradeGodTreeResponse{ }