Merge branch 'master' of 60.1.1.230:backend/jieling_protocol

master_huanxiang
wangyuan 2020-01-15 14:57:58 +08:00
commit 6ad8105209
4 changed files with 22 additions and 7 deletions

View File

@ -758,10 +758,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;
}

View File

@ -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;//己方英雄信息
}

View File

@ -326,6 +326,8 @@ import "CommonProto.proto";
message RobRedPackageResponse{
optional int32 isSuccess = 1;
optional int32 itemId = 2;
optional int32 count = 3;
}
//查看红包详情

View File

@ -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; //节点状态推送
}