From 04f4958ab338aaefa0872ca69beb6c8f76b10c3c Mon Sep 17 00:00:00 2001 From: wangyuan Date: Fri, 10 May 2019 10:11:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8E=92=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua_out/CommonProto_pb.lua | 39 ++++++++++++++------------------------ protos/CommonProto.proto | 5 ++--- 2 files changed, 16 insertions(+), 28 deletions(-) diff --git a/lua_out/CommonProto_pb.lua b/lua_out/CommonProto_pb.lua index 9a0e057..011d566 100644 --- a/lua_out/CommonProto_pb.lua +++ b/lua_out/CommonProto_pb.lua @@ -156,14 +156,13 @@ ARENAINFO = protobuf.Descriptor(); local ARENAINFO_FAILNUMS_FIELD = protobuf.FieldDescriptor(); local ARENAINFO_SUCCESSNUMS_FIELD = protobuf.FieldDescriptor(); local ARENAINFO_SCORE_FIELD = protobuf.FieldDescriptor(); -local ARENAINFO_RANK_FIELD = protobuf.FieldDescriptor(); +local ARENAINFO_USEFREETIMES_FIELD = protobuf.FieldDescriptor(); local ARENAINFO_ARENAENEMYS_FIELD = protobuf.FieldDescriptor(); ARENAENEMY = protobuf.Descriptor(); local ARENAENEMY_UID_FIELD = protobuf.FieldDescriptor(); 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_TEAM_FIELD = protobuf.FieldDescriptor(); ERRORRESPONSE_ERRCODE_FIELD.name = "errCode" @@ -1597,15 +1596,15 @@ ARENAINFO_SCORE_FIELD.default_value = 0 ARENAINFO_SCORE_FIELD.type = 5 ARENAINFO_SCORE_FIELD.cpp_type = 1 -ARENAINFO_RANK_FIELD.name = "rank" -ARENAINFO_RANK_FIELD.full_name = ".com.ljsd.jieling.protocols.ArenaInfo.rank" -ARENAINFO_RANK_FIELD.number = 4 -ARENAINFO_RANK_FIELD.index = 3 -ARENAINFO_RANK_FIELD.label = 1 -ARENAINFO_RANK_FIELD.has_default_value = false -ARENAINFO_RANK_FIELD.default_value = 0 -ARENAINFO_RANK_FIELD.type = 5 -ARENAINFO_RANK_FIELD.cpp_type = 1 +ARENAINFO_USEFREETIMES_FIELD.name = "useFreeTimes" +ARENAINFO_USEFREETIMES_FIELD.full_name = ".com.ljsd.jieling.protocols.ArenaInfo.useFreeTimes" +ARENAINFO_USEFREETIMES_FIELD.number = 4 +ARENAINFO_USEFREETIMES_FIELD.index = 3 +ARENAINFO_USEFREETIMES_FIELD.label = 1 +ARENAINFO_USEFREETIMES_FIELD.has_default_value = false +ARENAINFO_USEFREETIMES_FIELD.default_value = 0 +ARENAINFO_USEFREETIMES_FIELD.type = 5 +ARENAINFO_USEFREETIMES_FIELD.cpp_type = 1 ARENAINFO_ARENAENEMYS_FIELD.name = "arenaEnemys" ARENAINFO_ARENAENEMYS_FIELD.full_name = ".com.ljsd.jieling.protocols.ArenaInfo.arenaEnemys" @@ -1622,7 +1621,7 @@ ARENAINFO.name = "ArenaInfo" ARENAINFO.full_name = ".com.ljsd.jieling.protocols.ArenaInfo" ARENAINFO.nested_types = {} ARENAINFO.enum_types = {} -ARENAINFO.fields = {ARENAINFO_FAILNUMS_FIELD, ARENAINFO_SUCCESSNUMS_FIELD, ARENAINFO_SCORE_FIELD, ARENAINFO_RANK_FIELD, ARENAINFO_ARENAENEMYS_FIELD} +ARENAINFO.fields = {ARENAINFO_FAILNUMS_FIELD, ARENAINFO_SUCCESSNUMS_FIELD, ARENAINFO_SCORE_FIELD, ARENAINFO_USEFREETIMES_FIELD, ARENAINFO_ARENAENEMYS_FIELD} ARENAINFO.is_extendable = false ARENAINFO.extensions = {} ARENAENEMY_UID_FIELD.name = "uid" @@ -1665,20 +1664,10 @@ ARENAENEMY_SCORE_FIELD.default_value = 0 ARENAENEMY_SCORE_FIELD.type = 5 ARENAENEMY_SCORE_FIELD.cpp_type = 1 -ARENAENEMY_RANK_FIELD.name = "rank" -ARENAENEMY_RANK_FIELD.full_name = ".com.ljsd.jieling.protocols.ArenaEnemy.rank" -ARENAENEMY_RANK_FIELD.number = 5 -ARENAENEMY_RANK_FIELD.index = 4 -ARENAENEMY_RANK_FIELD.label = 1 -ARENAENEMY_RANK_FIELD.has_default_value = false -ARENAENEMY_RANK_FIELD.default_value = 0 -ARENAENEMY_RANK_FIELD.type = 5 -ARENAENEMY_RANK_FIELD.cpp_type = 1 - 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.number = 5 +ARENAENEMY_TEAM_FIELD.index = 4 ARENAENEMY_TEAM_FIELD.label = 1 ARENAENEMY_TEAM_FIELD.has_default_value = false ARENAENEMY_TEAM_FIELD.default_value = nil @@ -1690,7 +1679,7 @@ 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_TEAM_FIELD} +ARENAENEMY.fields = {ARENAENEMY_UID_FIELD, ARENAENEMY_LEVEL_FIELD, ARENAENEMY_NAME_FIELD, ARENAENEMY_SCORE_FIELD, ARENAENEMY_TEAM_FIELD} ARENAENEMY.is_extendable = false ARENAENEMY.extensions = {} diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 4a6411e..17ccd16 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -258,7 +258,7 @@ option optimize_for = SPEED; optional int32 failNums =1; optional int32 successNums =2; optional int32 score = 3; - optional int32 rank = 4; // -1 代表未入榜 + optional int32 useFreeTimes = 4;// 使用免费机会次数 repeated ArenaEnemy arenaEnemys = 5; //对手信息 } @@ -267,6 +267,5 @@ option optimize_for = SPEED; optional int32 level =2; optional string name =3; optional int32 score = 4; - optional int32 rank = 5; // -1 代表未入榜 - optional Team team =6; //队伍展示信息 + optional Team team =5; //队伍展示信息 }