From 1df3134bed7bf9ecae57de9d06f621df802a9599 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Mon, 18 Feb 2019 18:22:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=A3=85=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua_out/CommonProto_pb.lua | 84 +++++++++++++++------------------ lua_out/HeroInfoProto_pb.lua | 21 +++++++++ lua_out/MessageTypeProto_pb.lua | 82 ++++++++++++++++++-------------- protos/CommonProto.proto | 11 +++-- protos/HeroInfoProto.proto | 4 ++ protos/MessageTypeProto.proto | 3 ++ 6 files changed, 117 insertions(+), 88 deletions(-) diff --git a/lua_out/CommonProto_pb.lua b/lua_out/CommonProto_pb.lua index feb13ad..b782b9e 100644 --- a/lua_out/CommonProto_pb.lua +++ b/lua_out/CommonProto_pb.lua @@ -24,14 +24,13 @@ local ITEM_ENDINGTIME_FIELD = protobuf.FieldDescriptor(); BUFF = protobuf.Descriptor(); local BUFF_BUFFID_FIELD = protobuf.FieldDescriptor(); SPECIALEFFECTS = protobuf.Descriptor(); -local SPECIALEFFECTS_SPECIALID_FIELD = protobuf.FieldDescriptor(); -local SPECIALEFFECTS_EFFECTS_FIELD = protobuf.FieldDescriptor(); +local SPECIALEFFECTS_PROPERTYID_FIELD = protobuf.FieldDescriptor(); +local SPECIALEFFECTS_PROPERTYVALUE_FIELD = protobuf.FieldDescriptor(); EQUIP = protobuf.Descriptor(); local EQUIP_ID_FIELD = protobuf.FieldDescriptor(); local EQUIP_EQUIPID_FIELD = protobuf.FieldDescriptor(); local EQUIP_MAINATTRIBUTE_FIELD = protobuf.FieldDescriptor(); -local EQUIP_ATTRIBUTELIST_FIELD = protobuf.FieldDescriptor(); -local EQUIP_SPECIALEFFECTS_FIELD = protobuf.FieldDescriptor(); +local EQUIP_SECONDATTRIBUTE_FIELD = protobuf.FieldDescriptor(); HERO = protobuf.Descriptor(); local HERO_ID_FIELD = protobuf.FieldDescriptor(); local HERO_HEROID_FIELD = protobuf.FieldDescriptor(); @@ -284,31 +283,31 @@ BUFF.enum_types = {} BUFF.fields = {BUFF_BUFFID_FIELD} BUFF.is_extendable = false BUFF.extensions = {} -SPECIALEFFECTS_SPECIALID_FIELD.name = "specialId" -SPECIALEFFECTS_SPECIALID_FIELD.full_name = ".com.ljsd.jieling.protocols.SpecialEffects.specialId" -SPECIALEFFECTS_SPECIALID_FIELD.number = 1 -SPECIALEFFECTS_SPECIALID_FIELD.index = 0 -SPECIALEFFECTS_SPECIALID_FIELD.label = 1 -SPECIALEFFECTS_SPECIALID_FIELD.has_default_value = false -SPECIALEFFECTS_SPECIALID_FIELD.default_value = 0 -SPECIALEFFECTS_SPECIALID_FIELD.type = 5 -SPECIALEFFECTS_SPECIALID_FIELD.cpp_type = 1 +SPECIALEFFECTS_PROPERTYID_FIELD.name = "propertyId" +SPECIALEFFECTS_PROPERTYID_FIELD.full_name = ".com.ljsd.jieling.protocols.SpecialEffects.propertyId" +SPECIALEFFECTS_PROPERTYID_FIELD.number = 1 +SPECIALEFFECTS_PROPERTYID_FIELD.index = 0 +SPECIALEFFECTS_PROPERTYID_FIELD.label = 1 +SPECIALEFFECTS_PROPERTYID_FIELD.has_default_value = false +SPECIALEFFECTS_PROPERTYID_FIELD.default_value = 0 +SPECIALEFFECTS_PROPERTYID_FIELD.type = 5 +SPECIALEFFECTS_PROPERTYID_FIELD.cpp_type = 1 -SPECIALEFFECTS_EFFECTS_FIELD.name = "effects" -SPECIALEFFECTS_EFFECTS_FIELD.full_name = ".com.ljsd.jieling.protocols.SpecialEffects.effects" -SPECIALEFFECTS_EFFECTS_FIELD.number = 2 -SPECIALEFFECTS_EFFECTS_FIELD.index = 1 -SPECIALEFFECTS_EFFECTS_FIELD.label = 3 -SPECIALEFFECTS_EFFECTS_FIELD.has_default_value = false -SPECIALEFFECTS_EFFECTS_FIELD.default_value = {} -SPECIALEFFECTS_EFFECTS_FIELD.type = 5 -SPECIALEFFECTS_EFFECTS_FIELD.cpp_type = 1 +SPECIALEFFECTS_PROPERTYVALUE_FIELD.name = "propertyValue" +SPECIALEFFECTS_PROPERTYVALUE_FIELD.full_name = ".com.ljsd.jieling.protocols.SpecialEffects.propertyValue" +SPECIALEFFECTS_PROPERTYVALUE_FIELD.number = 2 +SPECIALEFFECTS_PROPERTYVALUE_FIELD.index = 1 +SPECIALEFFECTS_PROPERTYVALUE_FIELD.label = 3 +SPECIALEFFECTS_PROPERTYVALUE_FIELD.has_default_value = false +SPECIALEFFECTS_PROPERTYVALUE_FIELD.default_value = {} +SPECIALEFFECTS_PROPERTYVALUE_FIELD.type = 5 +SPECIALEFFECTS_PROPERTYVALUE_FIELD.cpp_type = 1 SPECIALEFFECTS.name = "SpecialEffects" SPECIALEFFECTS.full_name = ".com.ljsd.jieling.protocols.SpecialEffects" SPECIALEFFECTS.nested_types = {} SPECIALEFFECTS.enum_types = {} -SPECIALEFFECTS.fields = {SPECIALEFFECTS_SPECIALID_FIELD, SPECIALEFFECTS_EFFECTS_FIELD} +SPECIALEFFECTS.fields = {SPECIALEFFECTS_PROPERTYID_FIELD, SPECIALEFFECTS_PROPERTYVALUE_FIELD} SPECIALEFFECTS.is_extendable = false SPECIALEFFECTS.extensions = {} EQUIP_ID_FIELD.name = "id" @@ -337,36 +336,27 @@ EQUIP_MAINATTRIBUTE_FIELD.number = 3 EQUIP_MAINATTRIBUTE_FIELD.index = 2 EQUIP_MAINATTRIBUTE_FIELD.label = 1 EQUIP_MAINATTRIBUTE_FIELD.has_default_value = false -EQUIP_MAINATTRIBUTE_FIELD.default_value = 0 -EQUIP_MAINATTRIBUTE_FIELD.type = 5 -EQUIP_MAINATTRIBUTE_FIELD.cpp_type = 1 +EQUIP_MAINATTRIBUTE_FIELD.default_value = nil +EQUIP_MAINATTRIBUTE_FIELD.message_type = SPECIALEFFECTS +EQUIP_MAINATTRIBUTE_FIELD.type = 11 +EQUIP_MAINATTRIBUTE_FIELD.cpp_type = 10 -EQUIP_ATTRIBUTELIST_FIELD.name = "attributeList" -EQUIP_ATTRIBUTELIST_FIELD.full_name = ".com.ljsd.jieling.protocols.Equip.attributeList" -EQUIP_ATTRIBUTELIST_FIELD.number = 4 -EQUIP_ATTRIBUTELIST_FIELD.index = 3 -EQUIP_ATTRIBUTELIST_FIELD.label = 3 -EQUIP_ATTRIBUTELIST_FIELD.has_default_value = false -EQUIP_ATTRIBUTELIST_FIELD.default_value = {} -EQUIP_ATTRIBUTELIST_FIELD.type = 5 -EQUIP_ATTRIBUTELIST_FIELD.cpp_type = 1 - -EQUIP_SPECIALEFFECTS_FIELD.name = "specialEffects" -EQUIP_SPECIALEFFECTS_FIELD.full_name = ".com.ljsd.jieling.protocols.Equip.specialEffects" -EQUIP_SPECIALEFFECTS_FIELD.number = 5 -EQUIP_SPECIALEFFECTS_FIELD.index = 4 -EQUIP_SPECIALEFFECTS_FIELD.label = 1 -EQUIP_SPECIALEFFECTS_FIELD.has_default_value = false -EQUIP_SPECIALEFFECTS_FIELD.default_value = nil -EQUIP_SPECIALEFFECTS_FIELD.message_type = SPECIALEFFECTS -EQUIP_SPECIALEFFECTS_FIELD.type = 11 -EQUIP_SPECIALEFFECTS_FIELD.cpp_type = 10 +EQUIP_SECONDATTRIBUTE_FIELD.name = "secondAttribute" +EQUIP_SECONDATTRIBUTE_FIELD.full_name = ".com.ljsd.jieling.protocols.Equip.secondAttribute" +EQUIP_SECONDATTRIBUTE_FIELD.number = 4 +EQUIP_SECONDATTRIBUTE_FIELD.index = 3 +EQUIP_SECONDATTRIBUTE_FIELD.label = 3 +EQUIP_SECONDATTRIBUTE_FIELD.has_default_value = false +EQUIP_SECONDATTRIBUTE_FIELD.default_value = {} +EQUIP_SECONDATTRIBUTE_FIELD.message_type = SPECIALEFFECTS +EQUIP_SECONDATTRIBUTE_FIELD.type = 11 +EQUIP_SECONDATTRIBUTE_FIELD.cpp_type = 10 EQUIP.name = "Equip" EQUIP.full_name = ".com.ljsd.jieling.protocols.Equip" EQUIP.nested_types = {} EQUIP.enum_types = {} -EQUIP.fields = {EQUIP_ID_FIELD, EQUIP_EQUIPID_FIELD, EQUIP_MAINATTRIBUTE_FIELD, EQUIP_ATTRIBUTELIST_FIELD, EQUIP_SPECIALEFFECTS_FIELD} +EQUIP.fields = {EQUIP_ID_FIELD, EQUIP_EQUIPID_FIELD, EQUIP_MAINATTRIBUTE_FIELD, EQUIP_SECONDATTRIBUTE_FIELD} EQUIP.is_extendable = false EQUIP.extensions = {} HERO_ID_FIELD.name = "id" diff --git a/lua_out/HeroInfoProto_pb.lua b/lua_out/HeroInfoProto_pb.lua index f041b98..2f79c1c 100644 --- a/lua_out/HeroInfoProto_pb.lua +++ b/lua_out/HeroInfoProto_pb.lua @@ -42,6 +42,8 @@ HEROCOMPOSEREQUEST = protobuf.Descriptor(); local HEROCOMPOSEREQUEST_ITEM_FIELD = protobuf.FieldDescriptor(); HEROCOMPOSERESPONSE = protobuf.Descriptor(); local HEROCOMPOSERESPONSE_DROP_FIELD = protobuf.FieldDescriptor(); +GETALLEQUIPRESPONSE = protobuf.Descriptor(); +local GETALLEQUIPRESPONSE_EQUIP_FIELD = protobuf.FieldDescriptor(); GETHEROLISTINFOREQUEST_NUM_FIELD.name = "num" GETHEROLISTINFOREQUEST_NUM_FIELD.full_name = ".com.ljsd.jieling.protocols.GetHeroListInfoRequest.num" @@ -387,12 +389,31 @@ HEROCOMPOSERESPONSE.enum_types = {} HEROCOMPOSERESPONSE.fields = {HEROCOMPOSERESPONSE_DROP_FIELD} HEROCOMPOSERESPONSE.is_extendable = false HEROCOMPOSERESPONSE.extensions = {} +GETALLEQUIPRESPONSE_EQUIP_FIELD.name = "equip" +GETALLEQUIPRESPONSE_EQUIP_FIELD.full_name = ".com.ljsd.jieling.protocols.GetAllEquipResponse.equip" +GETALLEQUIPRESPONSE_EQUIP_FIELD.number = 1 +GETALLEQUIPRESPONSE_EQUIP_FIELD.index = 0 +GETALLEQUIPRESPONSE_EQUIP_FIELD.label = 3 +GETALLEQUIPRESPONSE_EQUIP_FIELD.has_default_value = false +GETALLEQUIPRESPONSE_EQUIP_FIELD.default_value = {} +GETALLEQUIPRESPONSE_EQUIP_FIELD.message_type = CommonProto_pb.EQUIP +GETALLEQUIPRESPONSE_EQUIP_FIELD.type = 11 +GETALLEQUIPRESPONSE_EQUIP_FIELD.cpp_type = 10 + +GETALLEQUIPRESPONSE.name = "GetAllEquipResponse" +GETALLEQUIPRESPONSE.full_name = ".com.ljsd.jieling.protocols.GetAllEquipResponse" +GETALLEQUIPRESPONSE.nested_types = {} +GETALLEQUIPRESPONSE.enum_types = {} +GETALLEQUIPRESPONSE.fields = {GETALLEQUIPRESPONSE_EQUIP_FIELD} +GETALLEQUIPRESPONSE.is_extendable = false +GETALLEQUIPRESPONSE.extensions = {} ConsumeMaterial = protobuf.Message(CONSUMEMATERIAL) DrawHeroRequest = protobuf.Message(DRAWHEROREQUEST) DrawHeroResponse = protobuf.Message(DRAWHERORESPONSE) EquipUnLoadOptRequest = protobuf.Message(EQUIPUNLOADOPTREQUEST) EquipWearRequest = protobuf.Message(EQUIPWEARREQUEST) +GetAllEquipResponse = protobuf.Message(GETALLEQUIPRESPONSE) GetAllTeamPosResponse = protobuf.Message(GETALLTEAMPOSRESPONSE) GetHeroListInfoRequest = protobuf.Message(GETHEROLISTINFOREQUEST) GetHeroListInfoResponse = protobuf.Message(GETHEROLISTINFORESPONSE) diff --git a/lua_out/MessageTypeProto_pb.lua b/lua_out/MessageTypeProto_pb.lua index 2a99adc..bd04416 100644 --- a/lua_out/MessageTypeProto_pb.lua +++ b/lua_out/MessageTypeProto_pb.lua @@ -37,6 +37,8 @@ local MESSAGETYPE_GET_ADVENTURE_INFO_REQUEST_ENUM = protobuf.EnumValueDescriptor local MESSAGETYPE_GET_ADVENTURE_INFO_RESPONSE_ENUM = protobuf.EnumValueDescriptor(); local MESSAGETYPE_GET_TEAMPOS_INFO_REQUEST_ENUM = protobuf.EnumValueDescriptor(); local MESSAGETYPE_GET_TEAMPOS_INFO_RESPONSE_ENUM = protobuf.EnumValueDescriptor(); +local MESSAGETYPE_GET_ALL_EQUIP_REQUEST_ENUM = protobuf.EnumValueDescriptor(); +local MESSAGETYPE_GET_ALL_EQUIP_RESPONSE_ENUM = protobuf.EnumValueDescriptor(); local MESSAGETYPE_HERO_RAND_REQQUEST_ENUM = protobuf.EnumValueDescriptor(); local MESSAGETYPE_HERO_RAND_RESPONSE_ENUM = protobuf.EnumValueDescriptor(); local MESSAGETYPE_HERO_COMPOSE_REQUEST_ENUM = protobuf.EnumValueDescriptor(); @@ -172,114 +174,120 @@ MESSAGETYPE_GET_TEAMPOS_INFO_REQUEST_ENUM.number = 16612 MESSAGETYPE_GET_TEAMPOS_INFO_RESPONSE_ENUM.name = "GET_TEAMPOS_INFO_RESPONSE" MESSAGETYPE_GET_TEAMPOS_INFO_RESPONSE_ENUM.index = 32 MESSAGETYPE_GET_TEAMPOS_INFO_RESPONSE_ENUM.number = 16613 +MESSAGETYPE_GET_ALL_EQUIP_REQUEST_ENUM.name = "GET_ALL_EQUIP_REQUEST" +MESSAGETYPE_GET_ALL_EQUIP_REQUEST_ENUM.index = 33 +MESSAGETYPE_GET_ALL_EQUIP_REQUEST_ENUM.number = 16614 +MESSAGETYPE_GET_ALL_EQUIP_RESPONSE_ENUM.name = "GET_ALL_EQUIP_RESPONSE" +MESSAGETYPE_GET_ALL_EQUIP_RESPONSE_ENUM.index = 34 +MESSAGETYPE_GET_ALL_EQUIP_RESPONSE_ENUM.number = 16615 MESSAGETYPE_HERO_RAND_REQQUEST_ENUM.name = "HERO_RAND_REQQUEST" -MESSAGETYPE_HERO_RAND_REQQUEST_ENUM.index = 33 +MESSAGETYPE_HERO_RAND_REQQUEST_ENUM.index = 35 MESSAGETYPE_HERO_RAND_REQQUEST_ENUM.number = 10701 MESSAGETYPE_HERO_RAND_RESPONSE_ENUM.name = "HERO_RAND_RESPONSE" -MESSAGETYPE_HERO_RAND_RESPONSE_ENUM.index = 34 +MESSAGETYPE_HERO_RAND_RESPONSE_ENUM.index = 36 MESSAGETYPE_HERO_RAND_RESPONSE_ENUM.number = 10702 MESSAGETYPE_HERO_COMPOSE_REQUEST_ENUM.name = "HERO_COMPOSE_REQUEST" -MESSAGETYPE_HERO_COMPOSE_REQUEST_ENUM.index = 35 +MESSAGETYPE_HERO_COMPOSE_REQUEST_ENUM.index = 37 MESSAGETYPE_HERO_COMPOSE_REQUEST_ENUM.number = 10703 MESSAGETYPE_HERO_COMPOSE_RESPONSE_ENUM.name = "HERO_COMPOSE_RESPONSE" -MESSAGETYPE_HERO_COMPOSE_RESPONSE_ENUM.index = 36 +MESSAGETYPE_HERO_COMPOSE_RESPONSE_ENUM.index = 38 MESSAGETYPE_HERO_COMPOSE_RESPONSE_ENUM.number = 10704 MESSAGETYPE_LOGIN_REQUEST_ENUM.name = "LOGIN_REQUEST" -MESSAGETYPE_LOGIN_REQUEST_ENUM.index = 37 +MESSAGETYPE_LOGIN_REQUEST_ENUM.index = 39 MESSAGETYPE_LOGIN_REQUEST_ENUM.number = 11100 MESSAGETYPE_LOGIN_RESPONSE_ENUM.name = "LOGIN_RESPONSE" -MESSAGETYPE_LOGIN_RESPONSE_ENUM.index = 38 +MESSAGETYPE_LOGIN_RESPONSE_ENUM.index = 40 MESSAGETYPE_LOGIN_RESPONSE_ENUM.number = 11101 MESSAGETYPE_MAP_ENTER_REQUEST_ENUM.name = "MAP_ENTER_REQUEST" -MESSAGETYPE_MAP_ENTER_REQUEST_ENUM.index = 39 +MESSAGETYPE_MAP_ENTER_REQUEST_ENUM.index = 41 MESSAGETYPE_MAP_ENTER_REQUEST_ENUM.number = 11200 MESSAGETYPE_MAP_ENTER_RESPONSE_ENUM.name = "MAP_ENTER_RESPONSE" -MESSAGETYPE_MAP_ENTER_RESPONSE_ENUM.index = 40 +MESSAGETYPE_MAP_ENTER_RESPONSE_ENUM.index = 42 MESSAGETYPE_MAP_ENTER_RESPONSE_ENUM.number = 11201 MESSAGETYPE_MAP_OUT_REQUEST_ENUM.name = "MAP_OUT_REQUEST" -MESSAGETYPE_MAP_OUT_REQUEST_ENUM.index = 41 +MESSAGETYPE_MAP_OUT_REQUEST_ENUM.index = 43 MESSAGETYPE_MAP_OUT_REQUEST_ENUM.number = 11202 MESSAGETYPE_MAP_OUT_RESPONSE_ENUM.name = "MAP_OUT_RESPONSE" -MESSAGETYPE_MAP_OUT_RESPONSE_ENUM.index = 42 +MESSAGETYPE_MAP_OUT_RESPONSE_ENUM.index = 44 MESSAGETYPE_MAP_OUT_RESPONSE_ENUM.number = 11203 MESSAGETYPE_MAP_UDPATE_REQUEST_ENUM.name = "MAP_UDPATE_REQUEST" -MESSAGETYPE_MAP_UDPATE_REQUEST_ENUM.index = 43 +MESSAGETYPE_MAP_UDPATE_REQUEST_ENUM.index = 45 MESSAGETYPE_MAP_UDPATE_REQUEST_ENUM.number = 11204 MESSAGETYPE_MAP_UDPATE_RESPONSE_ENUM.name = "MAP_UDPATE_RESPONSE" -MESSAGETYPE_MAP_UDPATE_RESPONSE_ENUM.index = 44 +MESSAGETYPE_MAP_UDPATE_RESPONSE_ENUM.index = 46 MESSAGETYPE_MAP_UDPATE_RESPONSE_ENUM.number = 11205 MESSAGETYPE_MAIL_READ_REQUEST_ENUM.name = "MAIL_READ_REQUEST" -MESSAGETYPE_MAIL_READ_REQUEST_ENUM.index = 45 +MESSAGETYPE_MAIL_READ_REQUEST_ENUM.index = 47 MESSAGETYPE_MAIL_READ_REQUEST_ENUM.number = 11206 MESSAGETYPE_MAIL_READ_RESPONSE_ENUM.name = "MAIL_READ_RESPONSE" -MESSAGETYPE_MAIL_READ_RESPONSE_ENUM.index = 46 +MESSAGETYPE_MAIL_READ_RESPONSE_ENUM.index = 48 MESSAGETYPE_MAIL_READ_RESPONSE_ENUM.number = 11207 MESSAGETYPE_MAIL_TAKE_MAIL_ITEM_REQUEST_ENUM.name = "MAIL_TAKE_MAIL_ITEM_REQUEST" -MESSAGETYPE_MAIL_TAKE_MAIL_ITEM_REQUEST_ENUM.index = 47 +MESSAGETYPE_MAIL_TAKE_MAIL_ITEM_REQUEST_ENUM.index = 49 MESSAGETYPE_MAIL_TAKE_MAIL_ITEM_REQUEST_ENUM.number = 11208 MESSAGETYPE_MAIL_TAKE_MAIL_ITEM_RESPONESE_ENUM.name = "MAIL_TAKE_MAIL_ITEM_RESPONESE" -MESSAGETYPE_MAIL_TAKE_MAIL_ITEM_RESPONESE_ENUM.index = 48 +MESSAGETYPE_MAIL_TAKE_MAIL_ITEM_RESPONESE_ENUM.index = 50 MESSAGETYPE_MAIL_TAKE_MAIL_ITEM_RESPONESE_ENUM.number = 11209 MESSAGETYPE_RECONNECT_REQUEST_ENUM.name = "RECONNECT_REQUEST" -MESSAGETYPE_RECONNECT_REQUEST_ENUM.index = 49 +MESSAGETYPE_RECONNECT_REQUEST_ENUM.index = 51 MESSAGETYPE_RECONNECT_REQUEST_ENUM.number = 11700 MESSAGETYPE_RECONNECT_RESPONSE_ENUM.name = "RECONNECT_RESPONSE" -MESSAGETYPE_RECONNECT_RESPONSE_ENUM.index = 50 +MESSAGETYPE_RECONNECT_RESPONSE_ENUM.index = 52 MESSAGETYPE_RECONNECT_RESPONSE_ENUM.number = 11701 MESSAGETYPE_SUCCESS_RESPONSE_ENUM.name = "SUCCESS_RESPONSE" -MESSAGETYPE_SUCCESS_RESPONSE_ENUM.index = 51 +MESSAGETYPE_SUCCESS_RESPONSE_ENUM.index = 53 MESSAGETYPE_SUCCESS_RESPONSE_ENUM.number = 11800 MESSAGETYPE_TRIGGER_EVENT_REQUEST_ENUM.name = "TRIGGER_EVENT_REQUEST" -MESSAGETYPE_TRIGGER_EVENT_REQUEST_ENUM.index = 52 +MESSAGETYPE_TRIGGER_EVENT_REQUEST_ENUM.index = 54 MESSAGETYPE_TRIGGER_EVENT_REQUEST_ENUM.number = 11900 MESSAGETYPE_TRIGGER_EVENT_RESPONSE_ENUM.name = "TRIGGER_EVENT_RESPONSE" -MESSAGETYPE_TRIGGER_EVENT_RESPONSE_ENUM.index = 53 +MESSAGETYPE_TRIGGER_EVENT_RESPONSE_ENUM.index = 55 MESSAGETYPE_TRIGGER_EVENT_RESPONSE_ENUM.number = 11901 MESSAGETYPE_TEAM_POS_SAVE_REQUEST_ENUM.name = "TEAM_POS_SAVE_REQUEST" -MESSAGETYPE_TEAM_POS_SAVE_REQUEST_ENUM.index = 54 +MESSAGETYPE_TEAM_POS_SAVE_REQUEST_ENUM.index = 56 MESSAGETYPE_TEAM_POS_SAVE_REQUEST_ENUM.number = 11902 MESSAGETYPE_TEAM_POS_SAVE_RESPONSE_ENUM.name = "TEAM_POS_SAVE_RESPONSE" -MESSAGETYPE_TEAM_POS_SAVE_RESPONSE_ENUM.index = 55 +MESSAGETYPE_TEAM_POS_SAVE_RESPONSE_ENUM.index = 57 MESSAGETYPE_TEAM_POS_SAVE_RESPONSE_ENUM.number = 11903 MESSAGETYPE_UP_HERO_LEVEL_REQUEST_ENUM.name = "UP_HERO_LEVEL_REQUEST" -MESSAGETYPE_UP_HERO_LEVEL_REQUEST_ENUM.index = 56 +MESSAGETYPE_UP_HERO_LEVEL_REQUEST_ENUM.index = 58 MESSAGETYPE_UP_HERO_LEVEL_REQUEST_ENUM.number = 12000 MESSAGETYPE_UP_HERO_LEVEL_RESPONSE_ENUM.name = "UP_HERO_LEVEL_RESPONSE" -MESSAGETYPE_UP_HERO_LEVEL_RESPONSE_ENUM.index = 57 +MESSAGETYPE_UP_HERO_LEVEL_RESPONSE_ENUM.index = 59 MESSAGETYPE_UP_HERO_LEVEL_RESPONSE_ENUM.number = 12001 MESSAGETYPE_UP_HERO_STAR_REQUEST_ENUM.name = "UP_HERO_STAR_REQUEST" -MESSAGETYPE_UP_HERO_STAR_REQUEST_ENUM.index = 58 +MESSAGETYPE_UP_HERO_STAR_REQUEST_ENUM.index = 60 MESSAGETYPE_UP_HERO_STAR_REQUEST_ENUM.number = 12002 MESSAGETYPE_UP_HERO_STAR_RESPONSE_ENUM.name = "UP_HERO_STAR_RESPONSE" -MESSAGETYPE_UP_HERO_STAR_RESPONSE_ENUM.index = 59 +MESSAGETYPE_UP_HERO_STAR_RESPONSE_ENUM.index = 61 MESSAGETYPE_UP_HERO_STAR_RESPONSE_ENUM.number = 12003 MESSAGETYPE_USER_AND_PRICE_ITEM_REQUEST_ENUM.name = "USER_AND_PRICE_ITEM_REQUEST" -MESSAGETYPE_USER_AND_PRICE_ITEM_REQUEST_ENUM.index = 60 +MESSAGETYPE_USER_AND_PRICE_ITEM_REQUEST_ENUM.index = 62 MESSAGETYPE_USER_AND_PRICE_ITEM_REQUEST_ENUM.number = 12004 MESSAGETYPE_USER_AND_PRICE_ITEM_RESPONSE_ENUM.name = "USER_AND_PRICE_ITEM_RESPONSE" -MESSAGETYPE_USER_AND_PRICE_ITEM_RESPONSE_ENUM.index = 61 +MESSAGETYPE_USER_AND_PRICE_ITEM_RESPONSE_ENUM.index = 63 MESSAGETYPE_USER_AND_PRICE_ITEM_RESPONSE_ENUM.number = 12005 MESSAGETYPE_WORKSHOP_FOUNDATION_REQUEST_ENUM.name = "WORKSHOP_FOUNDATION_REQUEST" -MESSAGETYPE_WORKSHOP_FOUNDATION_REQUEST_ENUM.index = 62 +MESSAGETYPE_WORKSHOP_FOUNDATION_REQUEST_ENUM.index = 64 MESSAGETYPE_WORKSHOP_FOUNDATION_REQUEST_ENUM.number = 12200 MESSAGETYPE_WORKSHOP_FOUNDATION_RESPONSE_ENUM.name = "WORKSHOP_FOUNDATION_RESPONSE" -MESSAGETYPE_WORKSHOP_FOUNDATION_RESPONSE_ENUM.index = 63 +MESSAGETYPE_WORKSHOP_FOUNDATION_RESPONSE_ENUM.index = 65 MESSAGETYPE_WORKSHOP_FOUNDATION_RESPONSE_ENUM.number = 12201 MESSAGETYPE_WORKSHOP_EQUIP_CREATE_REQUEST_ENUM.name = "WORKSHOP_EQUIP_CREATE_REQUEST" -MESSAGETYPE_WORKSHOP_EQUIP_CREATE_REQUEST_ENUM.index = 64 +MESSAGETYPE_WORKSHOP_EQUIP_CREATE_REQUEST_ENUM.index = 66 MESSAGETYPE_WORKSHOP_EQUIP_CREATE_REQUEST_ENUM.number = 12202 MESSAGETYPE_WORKSHOP_EQUIP_CREATE_RESPONSE_ENUM.name = "WORKSHOP_EQUIP_CREATE_RESPONSE" -MESSAGETYPE_WORKSHOP_EQUIP_CREATE_RESPONSE_ENUM.index = 65 +MESSAGETYPE_WORKSHOP_EQUIP_CREATE_RESPONSE_ENUM.index = 67 MESSAGETYPE_WORKSHOP_EQUIP_CREATE_RESPONSE_ENUM.number = 12203 MESSAGETYPE_WORKSHOP_REBUILD_REQUEST_ENUM.name = "WORKSHOP_REBUILD_REQUEST" -MESSAGETYPE_WORKSHOP_REBUILD_REQUEST_ENUM.index = 66 +MESSAGETYPE_WORKSHOP_REBUILD_REQUEST_ENUM.index = 68 MESSAGETYPE_WORKSHOP_REBUILD_REQUEST_ENUM.number = 12204 MESSAGETYPE_WORKSHOP_REBUILD_RESPONSE_ENUM.name = "WORKSHOP_REBUILD_RESPONSE" -MESSAGETYPE_WORKSHOP_REBUILD_RESPONSE_ENUM.index = 67 +MESSAGETYPE_WORKSHOP_REBUILD_RESPONSE_ENUM.index = 69 MESSAGETYPE_WORKSHOP_REBUILD_RESPONSE_ENUM.number = 12205 MESSAGETYPE.name = "MessageType" MESSAGETYPE.full_name = ".com.ljsd.jieling.protocols.MessageType" -MESSAGETYPE.values = {MESSAGETYPE_HEART_BEAT_REQUEST_ENUM,MESSAGETYPE_HEART_BEAT_RESPONSE_ENUM,MESSAGETYPE_ADVENTURE_STATION_REQUEST_ENUM,MESSAGETYPE_ADVENTURE_STATION_RESPONSE_ENUM,MESSAGETYPE_ADVENTURE_REWARD_REQUEST_ENUM,MESSAGETYPE_ADVENTURE_REWARD_RESPONSE_ENUM,MESSAGETYPE_DRAW_HERO_REQUEST_ENUM,MESSAGETYPE_DRAW_HERO_RESPONSE_ENUM,MESSAGETYPE_ERROR_CODE_INDICATION_ENUM,MESSAGETYPE_EQUIP_WEAR_REQUEST_ENUM,MESSAGETYPE_EQUIP_WEAR_RESPONSE_ENUM,MESSAGETYPE_EQUIP_UNLOAD_OPT_REQUEST_ENUM,MESSAGETYPE_EQUIP_UNLOAD_OPT_RESPONSE_ENUM,MESSAGETYPE_EVENT_UPDATE_REQUEST_ENUM,MESSAGETYPE_EVENT_UPDATE_RESPONSE_ENUM,MESSAGETYPE_FIGHT_START_REQUEST_ENUM,MESSAGETYPE_FIGHT_START_RESPONSE_ENUM,MESSAGETYPE_FIGHT_END_REQUEST_ENUM,MESSAGETYPE_FIGHT_END_RESPONSE_ENUM,MESSAGETYPE_GET_PLAYERINFO_REQUEST_ENUM,MESSAGETYPE_GET_PLAYERINFO_RESPONSE_ENUM,MESSAGETYPE_GET_HEROINFO_REQUEST_ENUM,MESSAGETYPE_GET_HEROINFO_RESPONSE_ENUM,MESSAGETYPE_GET_ITEMINFO_REQUEST_ENUM,MESSAGETYPE_GET_ITEMINFO_RESPONSE_ENUM,MESSAGETYPE_GM_REQUEST_ENUM,MESSAGETYPE_GM_RESPONSE_ENUM,MESSAGETYPE_GET_ALL_MAIL_INFO_REQUEST_ENUM,MESSAGETYPE_GET_ALL_MAIL_INFO_RESPONSE_ENUM,MESSAGETYPE_GET_ADVENTURE_INFO_REQUEST_ENUM,MESSAGETYPE_GET_ADVENTURE_INFO_RESPONSE_ENUM,MESSAGETYPE_GET_TEAMPOS_INFO_REQUEST_ENUM,MESSAGETYPE_GET_TEAMPOS_INFO_RESPONSE_ENUM,MESSAGETYPE_HERO_RAND_REQQUEST_ENUM,MESSAGETYPE_HERO_RAND_RESPONSE_ENUM,MESSAGETYPE_HERO_COMPOSE_REQUEST_ENUM,MESSAGETYPE_HERO_COMPOSE_RESPONSE_ENUM,MESSAGETYPE_LOGIN_REQUEST_ENUM,MESSAGETYPE_LOGIN_RESPONSE_ENUM,MESSAGETYPE_MAP_ENTER_REQUEST_ENUM,MESSAGETYPE_MAP_ENTER_RESPONSE_ENUM,MESSAGETYPE_MAP_OUT_REQUEST_ENUM,MESSAGETYPE_MAP_OUT_RESPONSE_ENUM,MESSAGETYPE_MAP_UDPATE_REQUEST_ENUM,MESSAGETYPE_MAP_UDPATE_RESPONSE_ENUM,MESSAGETYPE_MAIL_READ_REQUEST_ENUM,MESSAGETYPE_MAIL_READ_RESPONSE_ENUM,MESSAGETYPE_MAIL_TAKE_MAIL_ITEM_REQUEST_ENUM,MESSAGETYPE_MAIL_TAKE_MAIL_ITEM_RESPONESE_ENUM,MESSAGETYPE_RECONNECT_REQUEST_ENUM,MESSAGETYPE_RECONNECT_RESPONSE_ENUM,MESSAGETYPE_SUCCESS_RESPONSE_ENUM,MESSAGETYPE_TRIGGER_EVENT_REQUEST_ENUM,MESSAGETYPE_TRIGGER_EVENT_RESPONSE_ENUM,MESSAGETYPE_TEAM_POS_SAVE_REQUEST_ENUM,MESSAGETYPE_TEAM_POS_SAVE_RESPONSE_ENUM,MESSAGETYPE_UP_HERO_LEVEL_REQUEST_ENUM,MESSAGETYPE_UP_HERO_LEVEL_RESPONSE_ENUM,MESSAGETYPE_UP_HERO_STAR_REQUEST_ENUM,MESSAGETYPE_UP_HERO_STAR_RESPONSE_ENUM,MESSAGETYPE_USER_AND_PRICE_ITEM_REQUEST_ENUM,MESSAGETYPE_USER_AND_PRICE_ITEM_RESPONSE_ENUM,MESSAGETYPE_WORKSHOP_FOUNDATION_REQUEST_ENUM,MESSAGETYPE_WORKSHOP_FOUNDATION_RESPONSE_ENUM,MESSAGETYPE_WORKSHOP_EQUIP_CREATE_REQUEST_ENUM,MESSAGETYPE_WORKSHOP_EQUIP_CREATE_RESPONSE_ENUM,MESSAGETYPE_WORKSHOP_REBUILD_REQUEST_ENUM,MESSAGETYPE_WORKSHOP_REBUILD_RESPONSE_ENUM} +MESSAGETYPE.values = {MESSAGETYPE_HEART_BEAT_REQUEST_ENUM,MESSAGETYPE_HEART_BEAT_RESPONSE_ENUM,MESSAGETYPE_ADVENTURE_STATION_REQUEST_ENUM,MESSAGETYPE_ADVENTURE_STATION_RESPONSE_ENUM,MESSAGETYPE_ADVENTURE_REWARD_REQUEST_ENUM,MESSAGETYPE_ADVENTURE_REWARD_RESPONSE_ENUM,MESSAGETYPE_DRAW_HERO_REQUEST_ENUM,MESSAGETYPE_DRAW_HERO_RESPONSE_ENUM,MESSAGETYPE_ERROR_CODE_INDICATION_ENUM,MESSAGETYPE_EQUIP_WEAR_REQUEST_ENUM,MESSAGETYPE_EQUIP_WEAR_RESPONSE_ENUM,MESSAGETYPE_EQUIP_UNLOAD_OPT_REQUEST_ENUM,MESSAGETYPE_EQUIP_UNLOAD_OPT_RESPONSE_ENUM,MESSAGETYPE_EVENT_UPDATE_REQUEST_ENUM,MESSAGETYPE_EVENT_UPDATE_RESPONSE_ENUM,MESSAGETYPE_FIGHT_START_REQUEST_ENUM,MESSAGETYPE_FIGHT_START_RESPONSE_ENUM,MESSAGETYPE_FIGHT_END_REQUEST_ENUM,MESSAGETYPE_FIGHT_END_RESPONSE_ENUM,MESSAGETYPE_GET_PLAYERINFO_REQUEST_ENUM,MESSAGETYPE_GET_PLAYERINFO_RESPONSE_ENUM,MESSAGETYPE_GET_HEROINFO_REQUEST_ENUM,MESSAGETYPE_GET_HEROINFO_RESPONSE_ENUM,MESSAGETYPE_GET_ITEMINFO_REQUEST_ENUM,MESSAGETYPE_GET_ITEMINFO_RESPONSE_ENUM,MESSAGETYPE_GM_REQUEST_ENUM,MESSAGETYPE_GM_RESPONSE_ENUM,MESSAGETYPE_GET_ALL_MAIL_INFO_REQUEST_ENUM,MESSAGETYPE_GET_ALL_MAIL_INFO_RESPONSE_ENUM,MESSAGETYPE_GET_ADVENTURE_INFO_REQUEST_ENUM,MESSAGETYPE_GET_ADVENTURE_INFO_RESPONSE_ENUM,MESSAGETYPE_GET_TEAMPOS_INFO_REQUEST_ENUM,MESSAGETYPE_GET_TEAMPOS_INFO_RESPONSE_ENUM,MESSAGETYPE_GET_ALL_EQUIP_REQUEST_ENUM,MESSAGETYPE_GET_ALL_EQUIP_RESPONSE_ENUM,MESSAGETYPE_HERO_RAND_REQQUEST_ENUM,MESSAGETYPE_HERO_RAND_RESPONSE_ENUM,MESSAGETYPE_HERO_COMPOSE_REQUEST_ENUM,MESSAGETYPE_HERO_COMPOSE_RESPONSE_ENUM,MESSAGETYPE_LOGIN_REQUEST_ENUM,MESSAGETYPE_LOGIN_RESPONSE_ENUM,MESSAGETYPE_MAP_ENTER_REQUEST_ENUM,MESSAGETYPE_MAP_ENTER_RESPONSE_ENUM,MESSAGETYPE_MAP_OUT_REQUEST_ENUM,MESSAGETYPE_MAP_OUT_RESPONSE_ENUM,MESSAGETYPE_MAP_UDPATE_REQUEST_ENUM,MESSAGETYPE_MAP_UDPATE_RESPONSE_ENUM,MESSAGETYPE_MAIL_READ_REQUEST_ENUM,MESSAGETYPE_MAIL_READ_RESPONSE_ENUM,MESSAGETYPE_MAIL_TAKE_MAIL_ITEM_REQUEST_ENUM,MESSAGETYPE_MAIL_TAKE_MAIL_ITEM_RESPONESE_ENUM,MESSAGETYPE_RECONNECT_REQUEST_ENUM,MESSAGETYPE_RECONNECT_RESPONSE_ENUM,MESSAGETYPE_SUCCESS_RESPONSE_ENUM,MESSAGETYPE_TRIGGER_EVENT_REQUEST_ENUM,MESSAGETYPE_TRIGGER_EVENT_RESPONSE_ENUM,MESSAGETYPE_TEAM_POS_SAVE_REQUEST_ENUM,MESSAGETYPE_TEAM_POS_SAVE_RESPONSE_ENUM,MESSAGETYPE_UP_HERO_LEVEL_REQUEST_ENUM,MESSAGETYPE_UP_HERO_LEVEL_RESPONSE_ENUM,MESSAGETYPE_UP_HERO_STAR_REQUEST_ENUM,MESSAGETYPE_UP_HERO_STAR_RESPONSE_ENUM,MESSAGETYPE_USER_AND_PRICE_ITEM_REQUEST_ENUM,MESSAGETYPE_USER_AND_PRICE_ITEM_RESPONSE_ENUM,MESSAGETYPE_WORKSHOP_FOUNDATION_REQUEST_ENUM,MESSAGETYPE_WORKSHOP_FOUNDATION_RESPONSE_ENUM,MESSAGETYPE_WORKSHOP_EQUIP_CREATE_REQUEST_ENUM,MESSAGETYPE_WORKSHOP_EQUIP_CREATE_RESPONSE_ENUM,MESSAGETYPE_WORKSHOP_REBUILD_REQUEST_ENUM,MESSAGETYPE_WORKSHOP_REBUILD_RESPONSE_ENUM} ADVENTURE_REWARD_REQUEST = 10002 ADVENTURE_REWARD_RESPONSE = 10003 @@ -300,6 +308,8 @@ FIGHT_START_REQUEST = 10500 FIGHT_START_RESPONSE = 10501 GET_ADVENTURE_INFO_REQUEST = 16610 GET_ADVENTURE_INFO_RESPONSE = 16611 +GET_ALL_EQUIP_REQUEST = 16614 +GET_ALL_EQUIP_RESPONSE = 16615 GET_ALL_MAIL_INFO_REQUEST = 10608 GET_ALL_MAIL_INFO_RESPONSE = 10609 GET_HEROINFO_REQUEST = 10602 diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 69bc6cb..cef7d35 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -36,16 +36,17 @@ option optimize_for = SPEED; message SpecialEffects{ - optional int32 specialId = 1; - repeated int32 effects = 2; + optional int32 propertyId = 1; + repeated int32 propertyValue = 2; } + + message Equip{ optional string id = 1; optional int32 equipId = 2; - optional int32 mainAttribute = 3; - repeated int32 attributeList = 4; - optional SpecialEffects specialEffects = 5; + optional SpecialEffects mainAttribute = 3; + repeated SpecialEffects secondAttribute = 4; } diff --git a/protos/HeroInfoProto.proto b/protos/HeroInfoProto.proto index 566797d..5bdd1c4 100644 --- a/protos/HeroInfoProto.proto +++ b/protos/HeroInfoProto.proto @@ -74,3 +74,7 @@ import "CommonProto.proto"; message HeroComposeResponse{ optional Drop drop = 1; } + + message GetAllEquipResponse{ + repeated Equip equip =1; + } diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto index e057838..cceff73 100644 --- a/protos/MessageTypeProto.proto +++ b/protos/MessageTypeProto.proto @@ -64,6 +64,9 @@ enum MessageType{ GET_TEAMPOS_INFO_REQUEST = 16612; //获取编队信息 GET_TEAMPOS_INFO_RESPONSE = 16613; + GET_ALL_EQUIP_REQUEST = 16614; //装备 + GET_ALL_EQUIP_RESPONSE = 16615; + // H 10700 HERO_RAND_REQQUEST = 10701;