From ca61dbca3d6f76964c08a9cb98bdd239bc00d6cc Mon Sep 17 00:00:00 2001 From: wangyuan Date: Mon, 22 Apr 2019 18:00:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=BF=94=E5=9B=9Elist?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua_out/CommonProto_pb.lua | 13 +------------ lua_out/PlayerInfoProto_pb.lua | 4 ++-- protos/CommonProto.proto | 1 - protos/PlayerInfoProto.proto | 2 +- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/lua_out/CommonProto_pb.lua b/lua_out/CommonProto_pb.lua index f77e101..48aff85 100644 --- a/lua_out/CommonProto_pb.lua +++ b/lua_out/CommonProto_pb.lua @@ -144,7 +144,6 @@ local ACTIVITYINFO_ACTIVITYID_FIELD = protobuf.FieldDescriptor(); local ACTIVITYINFO_MISSION_FIELD = protobuf.FieldDescriptor(); local ACTIVITYINFO_STARTTIME_FIELD = protobuf.FieldDescriptor(); local ACTIVITYINFO_ENDTIME_FIELD = protobuf.FieldDescriptor(); -local ACTIVITYINFO_TODAYMISSION_FIELD = protobuf.FieldDescriptor(); ERRORRESPONSE_ERRCODE_FIELD.name = "errCode" ERRORRESPONSE_ERRCODE_FIELD.full_name = ".com.ljsd.jieling.protocols.ErrorResponse.errCode" @@ -1465,21 +1464,11 @@ ACTIVITYINFO_ENDTIME_FIELD.default_value = 0 ACTIVITYINFO_ENDTIME_FIELD.type = 5 ACTIVITYINFO_ENDTIME_FIELD.cpp_type = 1 -ACTIVITYINFO_TODAYMISSION_FIELD.name = "todayMission" -ACTIVITYINFO_TODAYMISSION_FIELD.full_name = ".com.ljsd.jieling.protocols.ActivityInfo.todayMission" -ACTIVITYINFO_TODAYMISSION_FIELD.number = 4 -ACTIVITYINFO_TODAYMISSION_FIELD.index = 4 -ACTIVITYINFO_TODAYMISSION_FIELD.label = 1 -ACTIVITYINFO_TODAYMISSION_FIELD.has_default_value = false -ACTIVITYINFO_TODAYMISSION_FIELD.default_value = 0 -ACTIVITYINFO_TODAYMISSION_FIELD.type = 5 -ACTIVITYINFO_TODAYMISSION_FIELD.cpp_type = 1 - ACTIVITYINFO.name = "ActivityInfo" ACTIVITYINFO.full_name = ".com.ljsd.jieling.protocols.ActivityInfo" ACTIVITYINFO.nested_types = {ACTIVITYINFO_MISSIONINFO} ACTIVITYINFO.enum_types = {} -ACTIVITYINFO.fields = {ACTIVITYINFO_ACTIVITYID_FIELD, ACTIVITYINFO_MISSION_FIELD, ACTIVITYINFO_STARTTIME_FIELD, ACTIVITYINFO_ENDTIME_FIELD, ACTIVITYINFO_TODAYMISSION_FIELD} +ACTIVITYINFO.fields = {ACTIVITYINFO_ACTIVITYID_FIELD, ACTIVITYINFO_MISSION_FIELD, ACTIVITYINFO_STARTTIME_FIELD, ACTIVITYINFO_ENDTIME_FIELD} ACTIVITYINFO.is_extendable = false ACTIVITYINFO.extensions = {} diff --git a/lua_out/PlayerInfoProto_pb.lua b/lua_out/PlayerInfoProto_pb.lua index 60f3910..b180205 100644 --- a/lua_out/PlayerInfoProto_pb.lua +++ b/lua_out/PlayerInfoProto_pb.lua @@ -707,9 +707,9 @@ GETALLACTIVITYRESPONSE_ACTIVITYINFO_FIELD.name = "activityInfo" GETALLACTIVITYRESPONSE_ACTIVITYINFO_FIELD.full_name = ".com.ljsd.jieling.protocols.GetAllActivityResponse.activityInfo" GETALLACTIVITYRESPONSE_ACTIVITYINFO_FIELD.number = 1 GETALLACTIVITYRESPONSE_ACTIVITYINFO_FIELD.index = 0 -GETALLACTIVITYRESPONSE_ACTIVITYINFO_FIELD.label = 1 +GETALLACTIVITYRESPONSE_ACTIVITYINFO_FIELD.label = 3 GETALLACTIVITYRESPONSE_ACTIVITYINFO_FIELD.has_default_value = false -GETALLACTIVITYRESPONSE_ACTIVITYINFO_FIELD.default_value = nil +GETALLACTIVITYRESPONSE_ACTIVITYINFO_FIELD.default_value = {} GETALLACTIVITYRESPONSE_ACTIVITYINFO_FIELD.message_type = CommonProto_pb.ACTIVITYINFO GETALLACTIVITYRESPONSE_ACTIVITYINFO_FIELD.type = 11 GETALLACTIVITYRESPONSE_ACTIVITYINFO_FIELD.cpp_type = 10 diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 65b12d6..18c6ab3 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -239,5 +239,4 @@ option optimize_for = SPEED; repeated MissionInfo mission = 2; // 任务信息 optional int32 startTime = 5; // 任务开始时间 optional int32 endTime = 3; // 活动结束时间 - optional int32 todayMission = 4; // 小额充值今日任务ID } diff --git a/protos/PlayerInfoProto.proto b/protos/PlayerInfoProto.proto index 7baa683..813799f 100644 --- a/protos/PlayerInfoProto.proto +++ b/protos/PlayerInfoProto.proto @@ -128,6 +128,6 @@ import "CommonProto.proto"; } message GetAllActivityResponse{ - optional ActivityInfo activityInfo =1; + repeated ActivityInfo activityInfo =1; }