From 4f8acaf53559b9bb25a9a3c5e8949bbfb44a2467 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Tue, 30 Apr 2019 15:56:18 +0800 Subject: [PATCH] gm response --- lua_out/CommonProto_pb.lua | 62 ++++++++++++++++++------------------- lua_out/MapInfoProto_pb.lua | 14 ++++++++- protos/CommonProto.proto | 10 +++--- 3 files changed, 49 insertions(+), 37 deletions(-) diff --git a/lua_out/CommonProto_pb.lua b/lua_out/CommonProto_pb.lua index b47d689..df17698 100644 --- a/lua_out/CommonProto_pb.lua +++ b/lua_out/CommonProto_pb.lua @@ -6,9 +6,6 @@ module('CommonProto_pb') ERRORRESPONSE = protobuf.Descriptor(); local ERRORRESPONSE_ERRCODE_FIELD = protobuf.FieldDescriptor(); local ERRORRESPONSE_ERRMSG_FIELD = protobuf.FieldDescriptor(); -GMRESPONSE = protobuf.Descriptor(); -local GMRESPONSE_DROP_FIELD = protobuf.FieldDescriptor(); -local GMRESPONSE_INFO_FIELD = protobuf.FieldDescriptor(); PLAYER = protobuf.Descriptor(); local PLAYER_UID_FIELD = protobuf.FieldDescriptor(); local PLAYER_NICKNAME_FIELD = protobuf.FieldDescriptor(); @@ -147,6 +144,9 @@ local ACTIVITYINFO_ACTIVITYID_FIELD = protobuf.FieldDescriptor(); local ACTIVITYINFO_MISSION_FIELD = protobuf.FieldDescriptor(); local ACTIVITYINFO_STARTTIME_FIELD = protobuf.FieldDescriptor(); local ACTIVITYINFO_ENDTIME_FIELD = protobuf.FieldDescriptor(); +GMRESPONSE = protobuf.Descriptor(); +local GMRESPONSE_DROP_FIELD = protobuf.FieldDescriptor(); +local GMRESPONSE_INFO_FIELD = protobuf.FieldDescriptor(); ERRORRESPONSE_ERRCODE_FIELD.name = "errCode" ERRORRESPONSE_ERRCODE_FIELD.full_name = ".com.ljsd.jieling.protocols.ErrorResponse.errCode" @@ -175,34 +175,6 @@ ERRORRESPONSE.enum_types = {} ERRORRESPONSE.fields = {ERRORRESPONSE_ERRCODE_FIELD, ERRORRESPONSE_ERRMSG_FIELD} ERRORRESPONSE.is_extendable = false ERRORRESPONSE.extensions = {} -GMRESPONSE_DROP_FIELD.name = "drop" -GMRESPONSE_DROP_FIELD.full_name = ".com.ljsd.jieling.protocols.GmResponse.drop" -GMRESPONSE_DROP_FIELD.number = 1 -GMRESPONSE_DROP_FIELD.index = 0 -GMRESPONSE_DROP_FIELD.label = 1 -GMRESPONSE_DROP_FIELD.has_default_value = false -GMRESPONSE_DROP_FIELD.default_value = nil -GMRESPONSE_DROP_FIELD.message_type = _DROP -GMRESPONSE_DROP_FIELD.type = 11 -GMRESPONSE_DROP_FIELD.cpp_type = 10 - -GMRESPONSE_INFO_FIELD.name = "info" -GMRESPONSE_INFO_FIELD.full_name = ".com.ljsd.jieling.protocols.GmResponse.info" -GMRESPONSE_INFO_FIELD.number = 2 -GMRESPONSE_INFO_FIELD.index = 1 -GMRESPONSE_INFO_FIELD.label = 1 -GMRESPONSE_INFO_FIELD.has_default_value = false -GMRESPONSE_INFO_FIELD.default_value = "" -GMRESPONSE_INFO_FIELD.type = 9 -GMRESPONSE_INFO_FIELD.cpp_type = 9 - -GMRESPONSE.name = "GmResponse" -GMRESPONSE.full_name = ".com.ljsd.jieling.protocols.GmResponse" -GMRESPONSE.nested_types = {} -GMRESPONSE.enum_types = {} -GMRESPONSE.fields = {GMRESPONSE_DROP_FIELD, GMRESPONSE_INFO_FIELD} -GMRESPONSE.is_extendable = false -GMRESPONSE.extensions = {} PLAYER_UID_FIELD.name = "uid" PLAYER_UID_FIELD.full_name = ".com.ljsd.jieling.protocols.Player.uid" PLAYER_UID_FIELD.number = 1 @@ -1502,6 +1474,34 @@ ACTIVITYINFO.enum_types = {} ACTIVITYINFO.fields = {ACTIVITYINFO_ACTIVITYID_FIELD, ACTIVITYINFO_MISSION_FIELD, ACTIVITYINFO_STARTTIME_FIELD, ACTIVITYINFO_ENDTIME_FIELD} ACTIVITYINFO.is_extendable = false ACTIVITYINFO.extensions = {} +GMRESPONSE_DROP_FIELD.name = "drop" +GMRESPONSE_DROP_FIELD.full_name = ".com.ljsd.jieling.protocols.GmResponse.drop" +GMRESPONSE_DROP_FIELD.number = 1 +GMRESPONSE_DROP_FIELD.index = 0 +GMRESPONSE_DROP_FIELD.label = 1 +GMRESPONSE_DROP_FIELD.has_default_value = false +GMRESPONSE_DROP_FIELD.default_value = nil +GMRESPONSE_DROP_FIELD.message_type = DROP +GMRESPONSE_DROP_FIELD.type = 11 +GMRESPONSE_DROP_FIELD.cpp_type = 10 + +GMRESPONSE_INFO_FIELD.name = "info" +GMRESPONSE_INFO_FIELD.full_name = ".com.ljsd.jieling.protocols.GmResponse.info" +GMRESPONSE_INFO_FIELD.number = 2 +GMRESPONSE_INFO_FIELD.index = 1 +GMRESPONSE_INFO_FIELD.label = 1 +GMRESPONSE_INFO_FIELD.has_default_value = false +GMRESPONSE_INFO_FIELD.default_value = "" +GMRESPONSE_INFO_FIELD.type = 9 +GMRESPONSE_INFO_FIELD.cpp_type = 9 + +GMRESPONSE.name = "GmResponse" +GMRESPONSE.full_name = ".com.ljsd.jieling.protocols.GmResponse" +GMRESPONSE.nested_types = {} +GMRESPONSE.enum_types = {} +GMRESPONSE.fields = {GMRESPONSE_DROP_FIELD, GMRESPONSE_INFO_FIELD} +GMRESPONSE.is_extendable = false +GMRESPONSE.extensions = {} ActivityInfo = protobuf.Message(ACTIVITYINFO) ActivityInfo.MissionInfo = protobuf.Message(ACTIVITYINFO_MISSIONINFO) diff --git a/lua_out/MapInfoProto_pb.lua b/lua_out/MapInfoProto_pb.lua index 84cf31e..8fa78c3 100644 --- a/lua_out/MapInfoProto_pb.lua +++ b/lua_out/MapInfoProto_pb.lua @@ -32,6 +32,7 @@ local EVENTUPDATERESPONSE_EVENTBEHAVIORCOMMON_FIELD = protobuf.FieldDescriptor() local EVENTUPDATERESPONSE_DROP_FIELD = protobuf.FieldDescriptor(); local EVENTUPDATERESPONSE_MISSION_FIELD = protobuf.FieldDescriptor(); local EVENTUPDATERESPONSE_LEFTTIME_FIELD = protobuf.FieldDescriptor(); +local EVENTUPDATERESPONSE_MISSIONDROP_FIELD = protobuf.FieldDescriptor(); MAPUPDATEREQUEST = protobuf.Descriptor(); local MAPUPDATEREQUEST_CELLS_FIELD = protobuf.FieldDescriptor(); local MAPUPDATEREQUEST_CURXY_FIELD = protobuf.FieldDescriptor(); @@ -337,11 +338,22 @@ EVENTUPDATERESPONSE_LEFTTIME_FIELD.default_value = 0 EVENTUPDATERESPONSE_LEFTTIME_FIELD.type = 5 EVENTUPDATERESPONSE_LEFTTIME_FIELD.cpp_type = 1 +EVENTUPDATERESPONSE_MISSIONDROP_FIELD.name = "missionDrop" +EVENTUPDATERESPONSE_MISSIONDROP_FIELD.full_name = ".com.ljsd.jieling.protocols.EventUpdateResponse.missionDrop" +EVENTUPDATERESPONSE_MISSIONDROP_FIELD.number = 6 +EVENTUPDATERESPONSE_MISSIONDROP_FIELD.index = 5 +EVENTUPDATERESPONSE_MISSIONDROP_FIELD.label = 1 +EVENTUPDATERESPONSE_MISSIONDROP_FIELD.has_default_value = false +EVENTUPDATERESPONSE_MISSIONDROP_FIELD.default_value = nil +EVENTUPDATERESPONSE_MISSIONDROP_FIELD.message_type = CommonProto_pb.DROP +EVENTUPDATERESPONSE_MISSIONDROP_FIELD.type = 11 +EVENTUPDATERESPONSE_MISSIONDROP_FIELD.cpp_type = 10 + EVENTUPDATERESPONSE.name = "EventUpdateResponse" EVENTUPDATERESPONSE.full_name = ".com.ljsd.jieling.protocols.EventUpdateResponse" EVENTUPDATERESPONSE.nested_types = {} EVENTUPDATERESPONSE.enum_types = {} -EVENTUPDATERESPONSE.fields = {EVENTUPDATERESPONSE_EVENTID_FIELD, EVENTUPDATERESPONSE_EVENTBEHAVIORCOMMON_FIELD, EVENTUPDATERESPONSE_DROP_FIELD, EVENTUPDATERESPONSE_MISSION_FIELD, EVENTUPDATERESPONSE_LEFTTIME_FIELD} +EVENTUPDATERESPONSE.fields = {EVENTUPDATERESPONSE_EVENTID_FIELD, EVENTUPDATERESPONSE_EVENTBEHAVIORCOMMON_FIELD, EVENTUPDATERESPONSE_DROP_FIELD, EVENTUPDATERESPONSE_MISSION_FIELD, EVENTUPDATERESPONSE_LEFTTIME_FIELD, EVENTUPDATERESPONSE_MISSIONDROP_FIELD} EVENTUPDATERESPONSE.is_extendable = false EVENTUPDATERESPONSE.extensions = {} MAPUPDATEREQUEST_CELLS_FIELD.name = "cells" diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 88525fa..128c8c5 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -10,11 +10,6 @@ option optimize_for = SPEED; optional string errMsg =2 ; // 错误信息 } - message GmResponse{ - optional Drop drop =1; - optional string info =2; - } - message Player{ optional int32 uid = 1; optional string nickName = 2; @@ -245,3 +240,8 @@ option optimize_for = SPEED; optional int32 startTime = 5; // 任务开始时间 optional int32 endTime = 3; // 活动结束时间 } + + message GmResponse{ + optional Drop drop =1; + optional string info =2; + }