From 08906292607b485ac4b6dbf0a477b13e67ea5e07 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Mon, 18 May 2020 21:01:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Task=E3=80=90ID1006213=E3=80=91=E3=80=90?= =?UTF-8?q?=E6=96=B0=E6=88=98=E6=96=97=E7=89=88=E6=9C=AC=E3=80=91=E5=A4=A7?= =?UTF-8?q?=E9=97=B9=E5=A4=A9=E5=AE=AB=EF=BC=88=E7=8C=8E=E5=A6=96=E4=B9=8B?= =?UTF-8?q?=E8=B7=AF=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/Expedition.proto | 27 +++++++++++++++++++++++++-- protos/MessageTypeProto.proto | 11 +++++++++++ protos/PlayerInfoProto.proto | 4 ++-- 3 files changed, 38 insertions(+), 4 deletions(-) diff --git a/protos/Expedition.proto b/protos/Expedition.proto index 6053d9d..ee7d327 100644 --- a/protos/Expedition.proto +++ b/protos/Expedition.proto @@ -25,7 +25,7 @@ import "CommonProto.proto"; message TakeExpeditionBoxRewardResponse{ optional Drop drop = 1; - repeated int32 leve = 2; //阶段id 3层的时候有困难和普通两个 + repeated int32 leve = 2; //阶段id 3层的时候有困难和普通两个 } @@ -70,6 +70,15 @@ import "CommonProto.proto"; } + message EndConfirmExpeditionBattleRequest{ + optional int32 nodeId = 1; //节点id + } + + message EndConfirmExpeditionBattleResponse { + + } + + message TakeHolyEquipRequest{ optional int32 nodeId = 1; //节点id optional int32 type = 2; //获取类型 @@ -108,6 +117,20 @@ import "CommonProto.proto"; optional int32 score =1 ; repeated TreasureRewardState treasureRewardState=2; } - + + message StoreNodeRequest{ + optional int32 nodeId =1;//节点id -1 放弃节点 + } + + message StoreNodeResponse{ + } + + message HeroNodeRequest{ + optional int32 nodeId =1;//招募节点 + optional int32 heroId =2;//招募英雄id + } + + message HeroNodeResponse{ + } \ No newline at end of file diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index 9fe8edd..32c7764 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -958,6 +958,17 @@ enum MessageType{ GuildGetHelpLogResponse = 303315; GuildHelpLogIndication = 303316; //新的援助会推 + + //303400 303500 远征 + EndConfirmExpeditionBattleRequest = 303400;//远征失败节点确认 + EndConfirmExpeditionBattleResponse = 303401; + + StoreNodeRequest = 303402; + StoreNodeResponse = 303403; + + HeroNodeRequest = 303404; + HeroNodeResponse = 303405; + } diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index bbc17ed..4874f04 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -67,7 +67,7 @@ import "CommonProto.proto"; optional int32 missingRefreshCount = 28;//迷宫寻宝妖精刷新次数 repeated MonthCardInfo monthinfos = 29;//月卡 repeated int32 dailyChallengeInfo = 30;//每日挑战信息 - optional int32 expeditionLeve =31 ; //猎妖之路阶段 + optional int32 expeditionLeve =31 ; //猎妖之路阶段 -1 待选择 } @@ -381,7 +381,7 @@ import "CommonProto.proto"; repeated int32 MonthDailyTake=10;//已领取的月卡id optional int32 lastFeteType =11 ; // 上次祭祀类型 //每日清除 5点推送 repeated int32 takeFeteReward =12 ; // 祭祀领取进度 - optional int32 expeditionLeve =13 ; //猎妖之路阶段 + optional int32 expeditionLeve =13 ; //猎妖之路阶段 -1 待选择 } From af76611c2f751076c118170b98cb678cb620434d Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Tue, 19 May 2020 12:02:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?Task=E3=80=90ID1006213=E3=80=91=E3=80=90?= =?UTF-8?q?=E6=96=B0=E6=88=98=E6=96=97=E7=89=88=E6=9C=AC=E3=80=91=E5=A4=A7?= =?UTF-8?q?=E9=97=B9=E5=A4=A9=E5=AE=AB=EF=BC=88=E7=8C=8E=E5=A6=96=E4=B9=8B?= =?UTF-8?q?=E8=B7=AF=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/CommonProto.proto | 1 + protos/Expedition.proto | 8 ++++++++ protos/MessageTypeProto.proto | 1 + 3 files changed, 10 insertions(+) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 8aad9bd..80991c6 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -99,6 +99,7 @@ option optimize_for = SPEED; repeated SoulPos soulPos = 12;//魂印 optional int32 lockState = 13;// 上锁状态 1 ：上锁 0：未上锁 repeated string jewels = 14;//宝器 + optional int32 createtype = 15;//创建类型 1猎妖援助 } diff --git a/protos/Expedition.proto b/protos/Expedition.proto index ee7d327..c03678b 100644 --- a/protos/Expedition.proto +++ b/protos/Expedition.proto @@ -133,4 +133,12 @@ import "CommonProto.proto"; message HeroNodeResponse{ } + message ExpeditionResetIndication { //猎妖重置 + repeated ExpeditionNodeInfo nodeInfo = 1; //节点信息 + repeated ExpeditionSimpleHeroInfo heroInfo = 2;//己方英雄信息 + repeated int32 rewardids = 3;//领取过奖励的id + repeated ExpeditionEquip equipIds = 4;//圣物 + repeated string removesHeroIds = 5;//移除援助的英雄 + } + \ No newline at end of file diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index 32c7764..2366fe5 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -969,6 +969,7 @@ enum MessageType{ HeroNodeRequest = 303404; HeroNodeResponse = 303405; + ExpeditionResetIndication = 303406; }