From 64b6ee86bf6897bd1ccff7be5358c306c2507e7e Mon Sep 17 00:00:00 2001 From: wangyuan Date: Mon, 18 Feb 2019 14:08:42 +0800 Subject: [PATCH] =?UTF-8?q?=E9=98=B5=E5=AE=B9=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua_out/CommonProto_pb.lua | 106 +++++++++++++++++++++++++++++-------- protos/CommonProto.proto | 16 +++++- 2 files changed, 99 insertions(+), 23 deletions(-) diff --git a/lua_out/CommonProto_pb.lua b/lua_out/CommonProto_pb.lua index 1d273e0..feb13ad 100644 --- a/lua_out/CommonProto_pb.lua +++ b/lua_out/CommonProto_pb.lua @@ -84,11 +84,17 @@ ADVENTURESTATEINFO = protobuf.Descriptor(); local ADVENTURESTATEINFO_POSITIONID_FIELD = protobuf.FieldDescriptor(); local ADVENTURESTATEINFO_HEROIDLIST_FIELD = protobuf.FieldDescriptor(); local ADVENTURESTATEINFO_REMAINTIME_FIELD = protobuf.FieldDescriptor(); +TEAMHEROINFO = protobuf.Descriptor(); +local TEAMHEROINFO_POSITION_FIELD = protobuf.FieldDescriptor(); +local TEAMHEROINFO_HEROID_FIELD = protobuf.FieldDescriptor(); +TEAMPOKEMONINFO = protobuf.Descriptor(); +local TEAMPOKEMONINFO_POSITION_FIELD = protobuf.FieldDescriptor(); +local TEAMPOKEMONINFO_POKEMONID_FIELD = protobuf.FieldDescriptor(); TEAMPOSINFO = protobuf.Descriptor(); local TEAMPOSINFO_TEAMID_FIELD = protobuf.FieldDescriptor(); local TEAMPOSINFO_TEAMNAME_FIELD = protobuf.FieldDescriptor(); -local TEAMPOSINFO_HEROIDS_FIELD = protobuf.FieldDescriptor(); -local TEAMPOSINFO_POKEMONIDS_FIELD = protobuf.FieldDescriptor(); +local TEAMPOSINFO_TEAMHEROINFOS_FIELD = protobuf.FieldDescriptor(); +local TEAMPOSINFO_TEAMPOKEMONINFOS_FIELD = protobuf.FieldDescriptor(); ERRORRESPONSE_ERRCODE_FIELD.name = "errCode" ERRORRESPONSE_ERRCODE_FIELD.full_name = ".com.ljsd.jieling.protocols.ErrorResponse.errCode" @@ -855,6 +861,60 @@ ADVENTURESTATEINFO.enum_types = {} ADVENTURESTATEINFO.fields = {ADVENTURESTATEINFO_POSITIONID_FIELD, ADVENTURESTATEINFO_HEROIDLIST_FIELD, ADVENTURESTATEINFO_REMAINTIME_FIELD} ADVENTURESTATEINFO.is_extendable = false ADVENTURESTATEINFO.extensions = {} +TEAMHEROINFO_POSITION_FIELD.name = "position" +TEAMHEROINFO_POSITION_FIELD.full_name = ".com.ljsd.jieling.protocols.TeamHeroInfo.position" +TEAMHEROINFO_POSITION_FIELD.number = 1 +TEAMHEROINFO_POSITION_FIELD.index = 0 +TEAMHEROINFO_POSITION_FIELD.label = 1 +TEAMHEROINFO_POSITION_FIELD.has_default_value = false +TEAMHEROINFO_POSITION_FIELD.default_value = 0 +TEAMHEROINFO_POSITION_FIELD.type = 5 +TEAMHEROINFO_POSITION_FIELD.cpp_type = 1 + +TEAMHEROINFO_HEROID_FIELD.name = "heroId" +TEAMHEROINFO_HEROID_FIELD.full_name = ".com.ljsd.jieling.protocols.TeamHeroInfo.heroId" +TEAMHEROINFO_HEROID_FIELD.number = 2 +TEAMHEROINFO_HEROID_FIELD.index = 1 +TEAMHEROINFO_HEROID_FIELD.label = 1 +TEAMHEROINFO_HEROID_FIELD.has_default_value = false +TEAMHEROINFO_HEROID_FIELD.default_value = "" +TEAMHEROINFO_HEROID_FIELD.type = 9 +TEAMHEROINFO_HEROID_FIELD.cpp_type = 9 + +TEAMHEROINFO.name = "TeamHeroInfo" +TEAMHEROINFO.full_name = ".com.ljsd.jieling.protocols.TeamHeroInfo" +TEAMHEROINFO.nested_types = {} +TEAMHEROINFO.enum_types = {} +TEAMHEROINFO.fields = {TEAMHEROINFO_POSITION_FIELD, TEAMHEROINFO_HEROID_FIELD} +TEAMHEROINFO.is_extendable = false +TEAMHEROINFO.extensions = {} +TEAMPOKEMONINFO_POSITION_FIELD.name = "position" +TEAMPOKEMONINFO_POSITION_FIELD.full_name = ".com.ljsd.jieling.protocols.TeamPokemonInfo.position" +TEAMPOKEMONINFO_POSITION_FIELD.number = 1 +TEAMPOKEMONINFO_POSITION_FIELD.index = 0 +TEAMPOKEMONINFO_POSITION_FIELD.label = 1 +TEAMPOKEMONINFO_POSITION_FIELD.has_default_value = false +TEAMPOKEMONINFO_POSITION_FIELD.default_value = 0 +TEAMPOKEMONINFO_POSITION_FIELD.type = 5 +TEAMPOKEMONINFO_POSITION_FIELD.cpp_type = 1 + +TEAMPOKEMONINFO_POKEMONID_FIELD.name = "pokemonId" +TEAMPOKEMONINFO_POKEMONID_FIELD.full_name = ".com.ljsd.jieling.protocols.TeamPokemonInfo.pokemonId" +TEAMPOKEMONINFO_POKEMONID_FIELD.number = 2 +TEAMPOKEMONINFO_POKEMONID_FIELD.index = 1 +TEAMPOKEMONINFO_POKEMONID_FIELD.label = 1 +TEAMPOKEMONINFO_POKEMONID_FIELD.has_default_value = false +TEAMPOKEMONINFO_POKEMONID_FIELD.default_value = 0 +TEAMPOKEMONINFO_POKEMONID_FIELD.type = 5 +TEAMPOKEMONINFO_POKEMONID_FIELD.cpp_type = 1 + +TEAMPOKEMONINFO.name = "TeamPokemonInfo" +TEAMPOKEMONINFO.full_name = ".com.ljsd.jieling.protocols.TeamPokemonInfo" +TEAMPOKEMONINFO.nested_types = {} +TEAMPOKEMONINFO.enum_types = {} +TEAMPOKEMONINFO.fields = {TEAMPOKEMONINFO_POSITION_FIELD, TEAMPOKEMONINFO_POKEMONID_FIELD} +TEAMPOKEMONINFO.is_extendable = false +TEAMPOKEMONINFO.extensions = {} TEAMPOSINFO_TEAMID_FIELD.name = "teamId" TEAMPOSINFO_TEAMID_FIELD.full_name = ".com.ljsd.jieling.protocols.TeamPosInfo.teamId" TEAMPOSINFO_TEAMID_FIELD.number = 1 @@ -875,31 +935,33 @@ TEAMPOSINFO_TEAMNAME_FIELD.default_value = "" TEAMPOSINFO_TEAMNAME_FIELD.type = 9 TEAMPOSINFO_TEAMNAME_FIELD.cpp_type = 9 -TEAMPOSINFO_HEROIDS_FIELD.name = "heroIds" -TEAMPOSINFO_HEROIDS_FIELD.full_name = ".com.ljsd.jieling.protocols.TeamPosInfo.heroIds" -TEAMPOSINFO_HEROIDS_FIELD.number = 3 -TEAMPOSINFO_HEROIDS_FIELD.index = 2 -TEAMPOSINFO_HEROIDS_FIELD.label = 3 -TEAMPOSINFO_HEROIDS_FIELD.has_default_value = false -TEAMPOSINFO_HEROIDS_FIELD.default_value = {} -TEAMPOSINFO_HEROIDS_FIELD.type = 9 -TEAMPOSINFO_HEROIDS_FIELD.cpp_type = 9 +TEAMPOSINFO_TEAMHEROINFOS_FIELD.name = "teamHeroInfos" +TEAMPOSINFO_TEAMHEROINFOS_FIELD.full_name = ".com.ljsd.jieling.protocols.TeamPosInfo.teamHeroInfos" +TEAMPOSINFO_TEAMHEROINFOS_FIELD.number = 3 +TEAMPOSINFO_TEAMHEROINFOS_FIELD.index = 2 +TEAMPOSINFO_TEAMHEROINFOS_FIELD.label = 3 +TEAMPOSINFO_TEAMHEROINFOS_FIELD.has_default_value = false +TEAMPOSINFO_TEAMHEROINFOS_FIELD.default_value = {} +TEAMPOSINFO_TEAMHEROINFOS_FIELD.message_type = TEAMHEROINFO +TEAMPOSINFO_TEAMHEROINFOS_FIELD.type = 11 +TEAMPOSINFO_TEAMHEROINFOS_FIELD.cpp_type = 10 -TEAMPOSINFO_POKEMONIDS_FIELD.name = "pokemonIds" -TEAMPOSINFO_POKEMONIDS_FIELD.full_name = ".com.ljsd.jieling.protocols.TeamPosInfo.pokemonIds" -TEAMPOSINFO_POKEMONIDS_FIELD.number = 4 -TEAMPOSINFO_POKEMONIDS_FIELD.index = 3 -TEAMPOSINFO_POKEMONIDS_FIELD.label = 3 -TEAMPOSINFO_POKEMONIDS_FIELD.has_default_value = false -TEAMPOSINFO_POKEMONIDS_FIELD.default_value = {} -TEAMPOSINFO_POKEMONIDS_FIELD.type = 5 -TEAMPOSINFO_POKEMONIDS_FIELD.cpp_type = 1 +TEAMPOSINFO_TEAMPOKEMONINFOS_FIELD.name = "teamPokemonInfos" +TEAMPOSINFO_TEAMPOKEMONINFOS_FIELD.full_name = ".com.ljsd.jieling.protocols.TeamPosInfo.teamPokemonInfos" +TEAMPOSINFO_TEAMPOKEMONINFOS_FIELD.number = 4 +TEAMPOSINFO_TEAMPOKEMONINFOS_FIELD.index = 3 +TEAMPOSINFO_TEAMPOKEMONINFOS_FIELD.label = 3 +TEAMPOSINFO_TEAMPOKEMONINFOS_FIELD.has_default_value = false +TEAMPOSINFO_TEAMPOKEMONINFOS_FIELD.default_value = {} +TEAMPOSINFO_TEAMPOKEMONINFOS_FIELD.message_type = TEAMPOKEMONINFO +TEAMPOSINFO_TEAMPOKEMONINFOS_FIELD.type = 11 +TEAMPOSINFO_TEAMPOKEMONINFOS_FIELD.cpp_type = 10 TEAMPOSINFO.name = "TeamPosInfo" TEAMPOSINFO.full_name = ".com.ljsd.jieling.protocols.TeamPosInfo" TEAMPOSINFO.nested_types = {} TEAMPOSINFO.enum_types = {} -TEAMPOSINFO.fields = {TEAMPOSINFO_TEAMID_FIELD, TEAMPOSINFO_TEAMNAME_FIELD, TEAMPOSINFO_HEROIDS_FIELD, TEAMPOSINFO_POKEMONIDS_FIELD} +TEAMPOSINFO.fields = {TEAMPOSINFO_TEAMID_FIELD, TEAMPOSINFO_TEAMNAME_FIELD, TEAMPOSINFO_TEAMHEROINFOS_FIELD, TEAMPOSINFO_TEAMPOKEMONINFOS_FIELD} TEAMPOSINFO.is_extendable = false TEAMPOSINFO.extensions = {} @@ -920,5 +982,7 @@ Mail = protobuf.Message(MAIL) Mission = protobuf.Message(MISSION) Player = protobuf.Message(PLAYER) SpecialEffects = protobuf.Message(SPECIALEFFECTS) +TeamHeroInfo = protobuf.Message(TEAMHEROINFO) +TeamPokemonInfo = protobuf.Message(TEAMPOKEMONINFO) TeamPosInfo = protobuf.Message(TEAMPOSINFO) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index bb4cd17..69bc6cb 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -136,9 +136,21 @@ option optimize_for = SPEED; optional int32 remainTime = 3; // 剩余时间 } + message TeamHeroInfo{ + optional int32 position =1; + optional string heroId = 2; + } + + message TeamPokemonInfo{ + optional int32 position =1; + optional int32 pokemonId = 2; + } + message TeamPosInfo{ optional int32 teamId = 1; //第几编队 optional string teamName =2; //编码名称 - repeated string heroIds = 3; //队伍英雄id - repeated int32 pokemonIds = 4; // 异妖id + repeated TeamHeroInfo teamHeroInfos = 3; //队伍英雄id + repeated TeamPokemonInfo teamPokemonInfos = 4; // 异妖id } + +