From be12edceb2c80ec0f4d5992206d9bde35be6ce19 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Tue, 14 Jan 2020 15:48:22 +0800 Subject: [PATCH] =?UTF-8?q?TASK=E3=80=90ID1005460=E3=80=91=E3=80=90?= =?UTF-8?q?=E7=8E=A9=E6=B3=95=E9=9C=80=E6=B1=82=E3=80=91=E7=8C=8E=E5=A6=96?= =?UTF-8?q?=E4=B9=8B=E8=B7=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/CommonProto.proto | 7 ++++++- protos/Expedition.proto | 18 ++++++++++++------ protos/MessageTypeProto.proto | 2 ++ 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 6c96e8d..8101612 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -756,10 +756,15 @@ option optimize_for = SPEED; repeated int32 holyEquipID = 6;//圣物id } - message ExpeditionSimpleHeroInfo{ optional string heroId = 1;//英雄id optional double remainHp =2;//剩余血量 } + + message ExpeditionEquip{ + optional string id = 1; + optional int32 equiptId = 2; + } + \ No newline at end of file diff --git a/protos/Expedition.proto b/protos/Expedition.proto index 90623c9..0be3797 100644 --- a/protos/Expedition.proto +++ b/protos/Expedition.proto @@ -13,6 +13,7 @@ import "CommonProto.proto"; repeated ExpeditionNodeInfo nodeInfo = 1; //节点信息 repeated ExpeditionSimpleHeroInfo heroInfo = 2;//己方英雄信息 repeated int32 lay = 3;//领取过奖励的id + repeated ExpeditionEquip equipIds = 4; } @@ -47,7 +48,6 @@ import "CommonProto.proto"; message StartExpeditionBattleRequest{ optional int32 nodeId = 1; //节点id optional int32 teamId = 2; //队伍id - optional int32 expInfo = 3; //扩展信息 复活节点传英雄id } message StartExpeditionBattleResponse { @@ -64,23 +64,29 @@ import "CommonProto.proto"; message EndExpeditionBattleResponse { //战斗结果 optional int32 result = 1; - repeated ExpeditionNodeInfo nodeInfo = 2; - repeated ExpeditionSimpleHeroInfo heroInfo = 3;//己方英雄信息 - optional Drop drop = 4; + optional Drop drop = 2; } message TakeHolyEquipRequest{ - optional int32 type = 1; //获取类型 + optional int32 nodeId = 1; //节点id + optional int32 type = 2; //获取类型 } //会先推送一下 临时背包信息 message TakeHolyEquipResponse{ optional string equipId = 1; - repeated ExpeditionNodeInfo nodeInfo = 2;//更新节点信息 } + //增量 + message ExpeditionEquipIndication { + repeated ExpeditionEquip equipIds = 1; + } + message ExpeditionNodeInfoIndication { + repeated ExpeditionNodeInfo nodeInfo = 1; + repeated ExpeditionSimpleHeroInfo heroInfo = 2;//己方英雄信息 + } \ No newline at end of file diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index 8c8b2c2..099e84b 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -838,5 +838,7 @@ enum MessageType{ EXPEDITION_RECOVER_HERO_REQUEST = 20014;//恢复英雄 EXPEDITION_RECOVER_HERO_RESONSE = 20015; + EXPEDITION_HOLY_BAG_INDICATION = 20016; //臨時背包推送 + EXPEDITION_NOINFO_INDICATION = 20017; //节点状态推送 }