diff --git a/lua_out/CommonProto_pb.lua b/lua_out/CommonProto_pb.lua index 0883f56..9208e80 100644 --- a/lua_out/CommonProto_pb.lua +++ b/lua_out/CommonProto_pb.lua @@ -148,6 +148,9 @@ local ACTIVITYINFO_ENDTIME_FIELD = protobuf.FieldDescriptor(); GMRESPONSE = protobuf.Descriptor(); local GMRESPONSE_DROP_FIELD = protobuf.FieldDescriptor(); local GMRESPONSE_INFO_FIELD = protobuf.FieldDescriptor(); +TEAM = protobuf.Descriptor(); +local TEAM_HEROTID_FIELD = protobuf.FieldDescriptor(); +local TEAM_TOTALFORCE_FIELD = protobuf.FieldDescriptor(); ARENAINFO = protobuf.Descriptor(); local ARENAINFO_FAILNUMS_FIELD = protobuf.FieldDescriptor(); local ARENAINFO_SUCCESSNUMS_FIELD = protobuf.FieldDescriptor(); @@ -160,7 +163,7 @@ local ARENAENEMY_LEVEL_FIELD = protobuf.FieldDescriptor(); local ARENAENEMY_NAME_FIELD = protobuf.FieldDescriptor(); local ARENAENEMY_SCORE_FIELD = protobuf.FieldDescriptor(); local ARENAENEMY_RANK_FIELD = protobuf.FieldDescriptor(); -local ARENAENEMY_TEAMPOKEMONINFO_FIELD = protobuf.FieldDescriptor(); +local ARENAENEMY_TEAM_FIELD = protobuf.FieldDescriptor(); ERRORRESPONSE_ERRCODE_FIELD.name = "errCode" ERRORRESPONSE_ERRCODE_FIELD.full_name = ".com.ljsd.jieling.protocols.ErrorResponse.errCode" @@ -1526,6 +1529,33 @@ GMRESPONSE.enum_types = {} GMRESPONSE.fields = {GMRESPONSE_DROP_FIELD, GMRESPONSE_INFO_FIELD} GMRESPONSE.is_extendable = false GMRESPONSE.extensions = {} +TEAM_HEROTID_FIELD.name = "heroTid" +TEAM_HEROTID_FIELD.full_name = ".com.ljsd.jieling.protocols.Team.heroTid" +TEAM_HEROTID_FIELD.number = 1 +TEAM_HEROTID_FIELD.index = 0 +TEAM_HEROTID_FIELD.label = 3 +TEAM_HEROTID_FIELD.has_default_value = false +TEAM_HEROTID_FIELD.default_value = {} +TEAM_HEROTID_FIELD.type = 5 +TEAM_HEROTID_FIELD.cpp_type = 1 + +TEAM_TOTALFORCE_FIELD.name = "totalForce" +TEAM_TOTALFORCE_FIELD.full_name = ".com.ljsd.jieling.protocols.Team.totalForce" +TEAM_TOTALFORCE_FIELD.number = 2 +TEAM_TOTALFORCE_FIELD.index = 1 +TEAM_TOTALFORCE_FIELD.label = 1 +TEAM_TOTALFORCE_FIELD.has_default_value = false +TEAM_TOTALFORCE_FIELD.default_value = 0 +TEAM_TOTALFORCE_FIELD.type = 5 +TEAM_TOTALFORCE_FIELD.cpp_type = 1 + +TEAM.name = "Team" +TEAM.full_name = ".com.ljsd.jieling.protocols.Team" +TEAM.nested_types = {} +TEAM.enum_types = {} +TEAM.fields = {TEAM_HEROTID_FIELD, TEAM_TOTALFORCE_FIELD} +TEAM.is_extendable = false +TEAM.extensions = {} ARENAINFO_FAILNUMS_FIELD.name = "failNums" ARENAINFO_FAILNUMS_FIELD.full_name = ".com.ljsd.jieling.protocols.ArenaInfo.failNums" ARENAINFO_FAILNUMS_FIELD.number = 1 @@ -1634,22 +1664,22 @@ ARENAENEMY_RANK_FIELD.default_value = 0 ARENAENEMY_RANK_FIELD.type = 5 ARENAENEMY_RANK_FIELD.cpp_type = 1 -ARENAENEMY_TEAMPOKEMONINFO_FIELD.name = "teamPokemonInfo" -ARENAENEMY_TEAMPOKEMONINFO_FIELD.full_name = ".com.ljsd.jieling.protocols.ArenaEnemy.teamPokemonInfo" -ARENAENEMY_TEAMPOKEMONINFO_FIELD.number = 6 -ARENAENEMY_TEAMPOKEMONINFO_FIELD.index = 5 -ARENAENEMY_TEAMPOKEMONINFO_FIELD.label = 1 -ARENAENEMY_TEAMPOKEMONINFO_FIELD.has_default_value = false -ARENAENEMY_TEAMPOKEMONINFO_FIELD.default_value = nil -ARENAENEMY_TEAMPOKEMONINFO_FIELD.message_type = TEAMPOSINFO -ARENAENEMY_TEAMPOKEMONINFO_FIELD.type = 11 -ARENAENEMY_TEAMPOKEMONINFO_FIELD.cpp_type = 10 +ARENAENEMY_TEAM_FIELD.name = "team" +ARENAENEMY_TEAM_FIELD.full_name = ".com.ljsd.jieling.protocols.ArenaEnemy.team" +ARENAENEMY_TEAM_FIELD.number = 6 +ARENAENEMY_TEAM_FIELD.index = 5 +ARENAENEMY_TEAM_FIELD.label = 1 +ARENAENEMY_TEAM_FIELD.has_default_value = false +ARENAENEMY_TEAM_FIELD.default_value = nil +ARENAENEMY_TEAM_FIELD.message_type = TEAM +ARENAENEMY_TEAM_FIELD.type = 11 +ARENAENEMY_TEAM_FIELD.cpp_type = 10 ARENAENEMY.name = "ArenaEnemy" ARENAENEMY.full_name = ".com.ljsd.jieling.protocols.ArenaEnemy" ARENAENEMY.nested_types = {} ARENAENEMY.enum_types = {} -ARENAENEMY.fields = {ARENAENEMY_UID_FIELD, ARENAENEMY_LEVEL_FIELD, ARENAENEMY_NAME_FIELD, ARENAENEMY_SCORE_FIELD, ARENAENEMY_RANK_FIELD, ARENAENEMY_TEAMPOKEMONINFO_FIELD} +ARENAENEMY.fields = {ARENAENEMY_UID_FIELD, ARENAENEMY_LEVEL_FIELD, ARENAENEMY_NAME_FIELD, ARENAENEMY_SCORE_FIELD, ARENAENEMY_RANK_FIELD, ARENAENEMY_TEAM_FIELD} ARENAENEMY.is_extendable = false ARENAENEMY.extensions = {} @@ -1684,6 +1714,7 @@ Player = protobuf.Message(PLAYER) PokemonInfo = protobuf.Message(POKEMONINFO) Pokemoncomonpent = protobuf.Message(POKEMONCOMONPENT) SpecialEffects = protobuf.Message(SPECIALEFFECTS) +Team = protobuf.Message(TEAM) TeamHeroInfo = protobuf.Message(TEAMHEROINFO) TeamPokemonInfo = protobuf.Message(TEAMPOKEMONINFO) TeamPosInfo = protobuf.Message(TEAMPOSINFO) diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 3f555a3..f287c5d 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -247,6 +247,12 @@ option optimize_for = SPEED; optional string info =2; } + + message Team{ + repeated int32 heroTid =1; + optional int32 totalForce=2; + } + message ArenaInfo{ optional int32 failNums =1; optional int32 successNums =2; @@ -261,5 +267,5 @@ option optimize_for = SPEED; optional string name =3; optional int32 score = 4; optional int32 rank = 5; // -1 代表未入榜 - optional TeamPosInfo teamPokemonInfo = 6; //队伍信息 + optional Team team =6; //队伍展示信息 }