From 090204225edecf761fb440499357bd3cdd3b4109 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Thu, 21 Mar 2019 18:33:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=92=E9=99=A9=E6=8E=A8=E8=8D=90=E8=8B=B1?= =?UTF-8?q?=E9=9B=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua_out/CommonProto_pb.lua | 297 +++++++++++++++++----------------- lua_out/FightInfoProto_pb.lua | 45 +++++- lua_out/MapInfoProto_pb.lua | 30 +--- protos/CommonProto.proto | 5 + protos/FightInfoProto.proto | 1 + 5 files changed, 193 insertions(+), 185 deletions(-) diff --git a/lua_out/CommonProto_pb.lua b/lua_out/CommonProto_pb.lua index 942a6a4..833a758 100644 --- a/lua_out/CommonProto_pb.lua +++ b/lua_out/CommonProto_pb.lua @@ -22,8 +22,6 @@ ITEM = protobuf.Descriptor(); local ITEM_ITEMID_FIELD = protobuf.FieldDescriptor(); local ITEM_ITEMNUM_FIELD = protobuf.FieldDescriptor(); local ITEM_ENDINGTIME_FIELD = protobuf.FieldDescriptor(); -BUFF = protobuf.Descriptor(); -local BUFF_BUFFID_FIELD = protobuf.FieldDescriptor(); SPECIALEFFECTS = protobuf.Descriptor(); local SPECIALEFFECTS_PROPERTYID_FIELD = protobuf.FieldDescriptor(); local SPECIALEFFECTS_PROPERTYVALUE_FIELD = protobuf.FieldDescriptor(); @@ -42,17 +40,13 @@ local HERO_SKINID_FIELD = protobuf.FieldDescriptor(); local HERO_SKILLIDLIST_FIELD = protobuf.FieldDescriptor(); local HERO_EQUIPIDLIST_FIELD = protobuf.FieldDescriptor(); local HERO_CREATETIME_FIELD = protobuf.FieldDescriptor(); -HEROFIGHTINFO = protobuf.Descriptor(); -local HEROFIGHTINFO_HERO_FIELD = protobuf.FieldDescriptor(); -local HEROFIGHTINFO_ATTACK_FIELD = protobuf.FieldDescriptor(); -local HEROFIGHTINFO_PHYSICALDEFENCE_FIELD = protobuf.FieldDescriptor(); -local HEROFIGHTINFO_MAGICDEFENCE_FIELD = protobuf.FieldDescriptor(); -local HEROFIGHTINFO_HP_FIELD = protobuf.FieldDescriptor(); -local HEROFIGHTINFO_SPEED_FIELD = protobuf.FieldDescriptor(); -MONSTER = protobuf.Descriptor(); -local MONSTER_MONSTERID_FIELD = protobuf.FieldDescriptor(); -local MONSTER_MONSTERSKILL_FIELD = protobuf.FieldDescriptor(); -local MONSTER_MONSTERPROPERTY_FIELD = protobuf.FieldDescriptor(); +FIGHTUNITINFO = protobuf.Descriptor(); +local FIGHTUNITINFO_UNITID_FIELD = protobuf.FieldDescriptor(); +local FIGHTUNITINFO_UNITSKILLIDS_FIELD = protobuf.FieldDescriptor(); +local FIGHTUNITINFO_PROPERTY_FIELD = protobuf.FieldDescriptor(); +FIGHTTEAMINFO = protobuf.Descriptor(); +local FIGHTTEAMINFO_FIGHTUNITLIST_FIELD = protobuf.FieldDescriptor(); +local FIGHTTEAMINFO_TEAMSKILLLIST_FIELD = protobuf.FieldDescriptor(); EVENTBEHAVIORVALUES = protobuf.Descriptor(); local EVENTBEHAVIORVALUES_BEHAVIORVALUES_FIELD = protobuf.FieldDescriptor(); EVENTBEHAVIORCOMMON = protobuf.Descriptor(); @@ -76,8 +70,6 @@ local MAIL_SENDTIME_FIELD = protobuf.FieldDescriptor(); local MAIL_EFFECTIVETIME_FIELD = protobuf.FieldDescriptor(); local MAIL_SENDNAME_FIELD = protobuf.FieldDescriptor(); local MAIL_MAILTYPE_FIELD = protobuf.FieldDescriptor(); -FAMILY = protobuf.Descriptor(); -local FAMILY_ID_FIELD = protobuf.FieldDescriptor(); DROP = protobuf.Descriptor(); local DROP_ITEMLIST_FIELD = protobuf.FieldDescriptor(); local DROP_EQUIPID_FIELD = protobuf.FieldDescriptor(); @@ -88,6 +80,9 @@ ADVENTURESTATEINFO = protobuf.Descriptor(); local ADVENTURESTATEINFO_POSITIONID_FIELD = protobuf.FieldDescriptor(); local ADVENTURESTATEINFO_HEROIDLIST_FIELD = protobuf.FieldDescriptor(); local ADVENTURESTATEINFO_REMAINTIME_FIELD = protobuf.FieldDescriptor(); +ADVENTURERECOMMENDHEROINFO = protobuf.Descriptor(); +local ADVENTURERECOMMENDHEROINFO_POSITIONID_FIELD = protobuf.FieldDescriptor(); +local ADVENTURERECOMMENDHEROINFO_RECOMMENEDID_FIELD = protobuf.FieldDescriptor(); TEAMHEROINFO = protobuf.Descriptor(); local TEAMHEROINFO_POSITION_FIELD = protobuf.FieldDescriptor(); local TEAMHEROINFO_HEROID_FIELD = protobuf.FieldDescriptor(); @@ -113,6 +108,10 @@ local WORKSHOPBASEINFO_EXP_FIELD = protobuf.FieldDescriptor(); WORKSHOPUNLOCKINFO = protobuf.Descriptor(); local WORKSHOPUNLOCKINFO_TYPE_FIELD = protobuf.FieldDescriptor(); local WORKSHOPUNLOCKINFO_ID_FIELD = protobuf.FieldDescriptor(); +FIGHTDATA = protobuf.Descriptor(); +local FIGHTDATA_HEROFIGHTINFOS_FIELD = protobuf.FieldDescriptor(); +local FIGHTDATA_MONSTERLIST_FIELD = protobuf.FieldDescriptor(); +local FIGHTDATA_FIGHTSEED_FIELD = protobuf.FieldDescriptor(); ERRORRESPONSE_ERRCODE_FIELD.name = "errCode" ERRORRESPONSE_ERRCODE_FIELD.full_name = ".com.ljsd.jieling.protocols.ErrorResponse.errCode" @@ -295,23 +294,6 @@ ITEM.enum_types = {} ITEM.fields = {ITEM_ITEMID_FIELD, ITEM_ITEMNUM_FIELD, ITEM_ENDINGTIME_FIELD} ITEM.is_extendable = false ITEM.extensions = {} -BUFF_BUFFID_FIELD.name = "buffId" -BUFF_BUFFID_FIELD.full_name = ".com.ljsd.jieling.protocols.Buff.buffId" -BUFF_BUFFID_FIELD.number = 1 -BUFF_BUFFID_FIELD.index = 0 -BUFF_BUFFID_FIELD.label = 1 -BUFF_BUFFID_FIELD.has_default_value = false -BUFF_BUFFID_FIELD.default_value = 0 -BUFF_BUFFID_FIELD.type = 5 -BUFF_BUFFID_FIELD.cpp_type = 1 - -BUFF.name = "Buff" -BUFF.full_name = ".com.ljsd.jieling.protocols.Buff" -BUFF.nested_types = {} -BUFF.enum_types = {} -BUFF.fields = {BUFF_BUFFID_FIELD} -BUFF.is_extendable = false -BUFF.extensions = {} SPECIALEFFECTS_PROPERTYID_FIELD.name = "propertyId" SPECIALEFFECTS_PROPERTYID_FIELD.full_name = ".com.ljsd.jieling.protocols.SpecialEffects.propertyId" SPECIALEFFECTS_PROPERTYID_FIELD.number = 1 @@ -485,111 +467,71 @@ HERO.enum_types = {} HERO.fields = {HERO_ID_FIELD, HERO_HEROID_FIELD, HERO_LEVEL_FIELD, HERO_BREAKID_FIELD, HERO_STAR_FIELD, HERO_SKINID_FIELD, HERO_SKILLIDLIST_FIELD, HERO_EQUIPIDLIST_FIELD, HERO_CREATETIME_FIELD} HERO.is_extendable = false HERO.extensions = {} -HEROFIGHTINFO_HERO_FIELD.name = "hero" -HEROFIGHTINFO_HERO_FIELD.full_name = ".com.ljsd.jieling.protocols.HeroFightInfo.hero" -HEROFIGHTINFO_HERO_FIELD.number = 1 -HEROFIGHTINFO_HERO_FIELD.index = 0 -HEROFIGHTINFO_HERO_FIELD.label = 1 -HEROFIGHTINFO_HERO_FIELD.has_default_value = false -HEROFIGHTINFO_HERO_FIELD.default_value = nil -HEROFIGHTINFO_HERO_FIELD.message_type = HERO -HEROFIGHTINFO_HERO_FIELD.type = 11 -HEROFIGHTINFO_HERO_FIELD.cpp_type = 10 +FIGHTUNITINFO_UNITID_FIELD.name = "unitId" +FIGHTUNITINFO_UNITID_FIELD.full_name = ".com.ljsd.jieling.protocols.FightUnitInfo.unitId" +FIGHTUNITINFO_UNITID_FIELD.number = 1 +FIGHTUNITINFO_UNITID_FIELD.index = 0 +FIGHTUNITINFO_UNITID_FIELD.label = 1 +FIGHTUNITINFO_UNITID_FIELD.has_default_value = false +FIGHTUNITINFO_UNITID_FIELD.default_value = "" +FIGHTUNITINFO_UNITID_FIELD.type = 9 +FIGHTUNITINFO_UNITID_FIELD.cpp_type = 9 -HEROFIGHTINFO_ATTACK_FIELD.name = "attack" -HEROFIGHTINFO_ATTACK_FIELD.full_name = ".com.ljsd.jieling.protocols.HeroFightInfo.attack" -HEROFIGHTINFO_ATTACK_FIELD.number = 2 -HEROFIGHTINFO_ATTACK_FIELD.index = 1 -HEROFIGHTINFO_ATTACK_FIELD.label = 1 -HEROFIGHTINFO_ATTACK_FIELD.has_default_value = false -HEROFIGHTINFO_ATTACK_FIELD.default_value = 0.0 -HEROFIGHTINFO_ATTACK_FIELD.type = 2 -HEROFIGHTINFO_ATTACK_FIELD.cpp_type = 6 +FIGHTUNITINFO_UNITSKILLIDS_FIELD.name = "unitSkillIds" +FIGHTUNITINFO_UNITSKILLIDS_FIELD.full_name = ".com.ljsd.jieling.protocols.FightUnitInfo.unitSkillIds" +FIGHTUNITINFO_UNITSKILLIDS_FIELD.number = 2 +FIGHTUNITINFO_UNITSKILLIDS_FIELD.index = 1 +FIGHTUNITINFO_UNITSKILLIDS_FIELD.label = 1 +FIGHTUNITINFO_UNITSKILLIDS_FIELD.has_default_value = false +FIGHTUNITINFO_UNITSKILLIDS_FIELD.default_value = "" +FIGHTUNITINFO_UNITSKILLIDS_FIELD.type = 9 +FIGHTUNITINFO_UNITSKILLIDS_FIELD.cpp_type = 9 -HEROFIGHTINFO_PHYSICALDEFENCE_FIELD.name = "physicalDefence" -HEROFIGHTINFO_PHYSICALDEFENCE_FIELD.full_name = ".com.ljsd.jieling.protocols.HeroFightInfo.physicalDefence" -HEROFIGHTINFO_PHYSICALDEFENCE_FIELD.number = 3 -HEROFIGHTINFO_PHYSICALDEFENCE_FIELD.index = 2 -HEROFIGHTINFO_PHYSICALDEFENCE_FIELD.label = 1 -HEROFIGHTINFO_PHYSICALDEFENCE_FIELD.has_default_value = false -HEROFIGHTINFO_PHYSICALDEFENCE_FIELD.default_value = 0.0 -HEROFIGHTINFO_PHYSICALDEFENCE_FIELD.type = 2 -HEROFIGHTINFO_PHYSICALDEFENCE_FIELD.cpp_type = 6 +FIGHTUNITINFO_PROPERTY_FIELD.name = "property" +FIGHTUNITINFO_PROPERTY_FIELD.full_name = ".com.ljsd.jieling.protocols.FightUnitInfo.property" +FIGHTUNITINFO_PROPERTY_FIELD.number = 3 +FIGHTUNITINFO_PROPERTY_FIELD.index = 2 +FIGHTUNITINFO_PROPERTY_FIELD.label = 1 +FIGHTUNITINFO_PROPERTY_FIELD.has_default_value = false +FIGHTUNITINFO_PROPERTY_FIELD.default_value = "" +FIGHTUNITINFO_PROPERTY_FIELD.type = 9 +FIGHTUNITINFO_PROPERTY_FIELD.cpp_type = 9 -HEROFIGHTINFO_MAGICDEFENCE_FIELD.name = "magicDefence" -HEROFIGHTINFO_MAGICDEFENCE_FIELD.full_name = ".com.ljsd.jieling.protocols.HeroFightInfo.magicDefence" -HEROFIGHTINFO_MAGICDEFENCE_FIELD.number = 4 -HEROFIGHTINFO_MAGICDEFENCE_FIELD.index = 3 -HEROFIGHTINFO_MAGICDEFENCE_FIELD.label = 1 -HEROFIGHTINFO_MAGICDEFENCE_FIELD.has_default_value = false -HEROFIGHTINFO_MAGICDEFENCE_FIELD.default_value = 0.0 -HEROFIGHTINFO_MAGICDEFENCE_FIELD.type = 2 -HEROFIGHTINFO_MAGICDEFENCE_FIELD.cpp_type = 6 +FIGHTUNITINFO.name = "FightUnitInfo" +FIGHTUNITINFO.full_name = ".com.ljsd.jieling.protocols.FightUnitInfo" +FIGHTUNITINFO.nested_types = {} +FIGHTUNITINFO.enum_types = {} +FIGHTUNITINFO.fields = {FIGHTUNITINFO_UNITID_FIELD, FIGHTUNITINFO_UNITSKILLIDS_FIELD, FIGHTUNITINFO_PROPERTY_FIELD} +FIGHTUNITINFO.is_extendable = false +FIGHTUNITINFO.extensions = {} +FIGHTTEAMINFO_FIGHTUNITLIST_FIELD.name = "fightUnitList" +FIGHTTEAMINFO_FIGHTUNITLIST_FIELD.full_name = ".com.ljsd.jieling.protocols.FightTeamInfo.fightUnitList" +FIGHTTEAMINFO_FIGHTUNITLIST_FIELD.number = 1 +FIGHTTEAMINFO_FIGHTUNITLIST_FIELD.index = 0 +FIGHTTEAMINFO_FIGHTUNITLIST_FIELD.label = 3 +FIGHTTEAMINFO_FIGHTUNITLIST_FIELD.has_default_value = false +FIGHTTEAMINFO_FIGHTUNITLIST_FIELD.default_value = {} +FIGHTTEAMINFO_FIGHTUNITLIST_FIELD.message_type = FIGHTUNITINFO +FIGHTTEAMINFO_FIGHTUNITLIST_FIELD.type = 11 +FIGHTTEAMINFO_FIGHTUNITLIST_FIELD.cpp_type = 10 -HEROFIGHTINFO_HP_FIELD.name = "hp" -HEROFIGHTINFO_HP_FIELD.full_name = ".com.ljsd.jieling.protocols.HeroFightInfo.hp" -HEROFIGHTINFO_HP_FIELD.number = 5 -HEROFIGHTINFO_HP_FIELD.index = 4 -HEROFIGHTINFO_HP_FIELD.label = 1 -HEROFIGHTINFO_HP_FIELD.has_default_value = false -HEROFIGHTINFO_HP_FIELD.default_value = 0.0 -HEROFIGHTINFO_HP_FIELD.type = 2 -HEROFIGHTINFO_HP_FIELD.cpp_type = 6 +FIGHTTEAMINFO_TEAMSKILLLIST_FIELD.name = "teamSkillList" +FIGHTTEAMINFO_TEAMSKILLLIST_FIELD.full_name = ".com.ljsd.jieling.protocols.FightTeamInfo.teamSkillList" +FIGHTTEAMINFO_TEAMSKILLLIST_FIELD.number = 2 +FIGHTTEAMINFO_TEAMSKILLLIST_FIELD.index = 1 +FIGHTTEAMINFO_TEAMSKILLLIST_FIELD.label = 1 +FIGHTTEAMINFO_TEAMSKILLLIST_FIELD.has_default_value = false +FIGHTTEAMINFO_TEAMSKILLLIST_FIELD.default_value = "" +FIGHTTEAMINFO_TEAMSKILLLIST_FIELD.type = 9 +FIGHTTEAMINFO_TEAMSKILLLIST_FIELD.cpp_type = 9 -HEROFIGHTINFO_SPEED_FIELD.name = "speed" -HEROFIGHTINFO_SPEED_FIELD.full_name = ".com.ljsd.jieling.protocols.HeroFightInfo.speed" -HEROFIGHTINFO_SPEED_FIELD.number = 6 -HEROFIGHTINFO_SPEED_FIELD.index = 5 -HEROFIGHTINFO_SPEED_FIELD.label = 1 -HEROFIGHTINFO_SPEED_FIELD.has_default_value = false -HEROFIGHTINFO_SPEED_FIELD.default_value = 0.0 -HEROFIGHTINFO_SPEED_FIELD.type = 2 -HEROFIGHTINFO_SPEED_FIELD.cpp_type = 6 - -HEROFIGHTINFO.name = "HeroFightInfo" -HEROFIGHTINFO.full_name = ".com.ljsd.jieling.protocols.HeroFightInfo" -HEROFIGHTINFO.nested_types = {} -HEROFIGHTINFO.enum_types = {} -HEROFIGHTINFO.fields = {HEROFIGHTINFO_HERO_FIELD, HEROFIGHTINFO_ATTACK_FIELD, HEROFIGHTINFO_PHYSICALDEFENCE_FIELD, HEROFIGHTINFO_MAGICDEFENCE_FIELD, HEROFIGHTINFO_HP_FIELD, HEROFIGHTINFO_SPEED_FIELD} -HEROFIGHTINFO.is_extendable = false -HEROFIGHTINFO.extensions = {} -MONSTER_MONSTERID_FIELD.name = "monsterId" -MONSTER_MONSTERID_FIELD.full_name = ".com.ljsd.jieling.protocols.Monster.monsterId" -MONSTER_MONSTERID_FIELD.number = 1 -MONSTER_MONSTERID_FIELD.index = 0 -MONSTER_MONSTERID_FIELD.label = 1 -MONSTER_MONSTERID_FIELD.has_default_value = false -MONSTER_MONSTERID_FIELD.default_value = "" -MONSTER_MONSTERID_FIELD.type = 9 -MONSTER_MONSTERID_FIELD.cpp_type = 9 - -MONSTER_MONSTERSKILL_FIELD.name = "monsterSkill" -MONSTER_MONSTERSKILL_FIELD.full_name = ".com.ljsd.jieling.protocols.Monster.monsterSkill" -MONSTER_MONSTERSKILL_FIELD.number = 2 -MONSTER_MONSTERSKILL_FIELD.index = 1 -MONSTER_MONSTERSKILL_FIELD.label = 3 -MONSTER_MONSTERSKILL_FIELD.has_default_value = false -MONSTER_MONSTERSKILL_FIELD.default_value = {} -MONSTER_MONSTERSKILL_FIELD.type = 5 -MONSTER_MONSTERSKILL_FIELD.cpp_type = 1 - -MONSTER_MONSTERPROPERTY_FIELD.name = "monsterProperty" -MONSTER_MONSTERPROPERTY_FIELD.full_name = ".com.ljsd.jieling.protocols.Monster.monsterProperty" -MONSTER_MONSTERPROPERTY_FIELD.number = 3 -MONSTER_MONSTERPROPERTY_FIELD.index = 2 -MONSTER_MONSTERPROPERTY_FIELD.label = 3 -MONSTER_MONSTERPROPERTY_FIELD.has_default_value = false -MONSTER_MONSTERPROPERTY_FIELD.default_value = {} -MONSTER_MONSTERPROPERTY_FIELD.type = 5 -MONSTER_MONSTERPROPERTY_FIELD.cpp_type = 1 - -MONSTER.name = "Monster" -MONSTER.full_name = ".com.ljsd.jieling.protocols.Monster" -MONSTER.nested_types = {} -MONSTER.enum_types = {} -MONSTER.fields = {MONSTER_MONSTERID_FIELD, MONSTER_MONSTERSKILL_FIELD, MONSTER_MONSTERPROPERTY_FIELD} -MONSTER.is_extendable = false -MONSTER.extensions = {} +FIGHTTEAMINFO.name = "FightTeamInfo" +FIGHTTEAMINFO.full_name = ".com.ljsd.jieling.protocols.FightTeamInfo" +FIGHTTEAMINFO.nested_types = {} +FIGHTTEAMINFO.enum_types = {} +FIGHTTEAMINFO.fields = {FIGHTTEAMINFO_FIGHTUNITLIST_FIELD, FIGHTTEAMINFO_TEAMSKILLLIST_FIELD} +FIGHTTEAMINFO.is_extendable = false +FIGHTTEAMINFO.extensions = {} EVENTBEHAVIORVALUES_BEHAVIORVALUES_FIELD.name = "behaviorValues" EVENTBEHAVIORVALUES_BEHAVIORVALUES_FIELD.full_name = ".com.ljsd.jieling.protocols.EventBehaviorValues.behaviorValues" EVENTBEHAVIORVALUES_BEHAVIORVALUES_FIELD.number = 1 @@ -806,23 +748,6 @@ MAIL.enum_types = {} MAIL.fields = {MAIL_MAILID_FIELD, MAIL_STATE_FIELD, MAIL_HEAD_FIELD, MAIL_CONTENT_FIELD, MAIL_MAILITEM_FIELD, MAIL_SENDTIME_FIELD, MAIL_EFFECTIVETIME_FIELD, MAIL_SENDNAME_FIELD, MAIL_MAILTYPE_FIELD} MAIL.is_extendable = false MAIL.extensions = {} -FAMILY_ID_FIELD.name = "id" -FAMILY_ID_FIELD.full_name = ".com.ljsd.jieling.protocols.Family.id" -FAMILY_ID_FIELD.number = 1 -FAMILY_ID_FIELD.index = 0 -FAMILY_ID_FIELD.label = 1 -FAMILY_ID_FIELD.has_default_value = false -FAMILY_ID_FIELD.default_value = "" -FAMILY_ID_FIELD.type = 9 -FAMILY_ID_FIELD.cpp_type = 9 - -FAMILY.name = "Family" -FAMILY.full_name = ".com.ljsd.jieling.protocols.Family" -FAMILY.nested_types = {} -FAMILY.enum_types = {} -FAMILY.fields = {FAMILY_ID_FIELD} -FAMILY.is_extendable = false -FAMILY.extensions = {} DROP_ITEMLIST_FIELD.name = "itemlist" DROP_ITEMLIST_FIELD.full_name = ".com.ljsd.jieling.protocols.Drop.itemlist" DROP_ITEMLIST_FIELD.number = 1 @@ -917,6 +842,33 @@ ADVENTURESTATEINFO.enum_types = {} ADVENTURESTATEINFO.fields = {ADVENTURESTATEINFO_POSITIONID_FIELD, ADVENTURESTATEINFO_HEROIDLIST_FIELD, ADVENTURESTATEINFO_REMAINTIME_FIELD} ADVENTURESTATEINFO.is_extendable = false ADVENTURESTATEINFO.extensions = {} +ADVENTURERECOMMENDHEROINFO_POSITIONID_FIELD.name = "positionId" +ADVENTURERECOMMENDHEROINFO_POSITIONID_FIELD.full_name = ".com.ljsd.jieling.protocols.AdventureRecommendHeroInfo.positionId" +ADVENTURERECOMMENDHEROINFO_POSITIONID_FIELD.number = 1 +ADVENTURERECOMMENDHEROINFO_POSITIONID_FIELD.index = 0 +ADVENTURERECOMMENDHEROINFO_POSITIONID_FIELD.label = 1 +ADVENTURERECOMMENDHEROINFO_POSITIONID_FIELD.has_default_value = false +ADVENTURERECOMMENDHEROINFO_POSITIONID_FIELD.default_value = 0 +ADVENTURERECOMMENDHEROINFO_POSITIONID_FIELD.type = 5 +ADVENTURERECOMMENDHEROINFO_POSITIONID_FIELD.cpp_type = 1 + +ADVENTURERECOMMENDHEROINFO_RECOMMENEDID_FIELD.name = "recommenedId" +ADVENTURERECOMMENDHEROINFO_RECOMMENEDID_FIELD.full_name = ".com.ljsd.jieling.protocols.AdventureRecommendHeroInfo.recommenedId" +ADVENTURERECOMMENDHEROINFO_RECOMMENEDID_FIELD.number = 2 +ADVENTURERECOMMENDHEROINFO_RECOMMENEDID_FIELD.index = 1 +ADVENTURERECOMMENDHEROINFO_RECOMMENEDID_FIELD.label = 3 +ADVENTURERECOMMENDHEROINFO_RECOMMENEDID_FIELD.has_default_value = false +ADVENTURERECOMMENDHEROINFO_RECOMMENEDID_FIELD.default_value = {} +ADVENTURERECOMMENDHEROINFO_RECOMMENEDID_FIELD.type = 5 +ADVENTURERECOMMENDHEROINFO_RECOMMENEDID_FIELD.cpp_type = 1 + +ADVENTURERECOMMENDHEROINFO.name = "AdventureRecommendHeroInfo" +ADVENTURERECOMMENDHEROINFO.full_name = ".com.ljsd.jieling.protocols.AdventureRecommendHeroInfo" +ADVENTURERECOMMENDHEROINFO.nested_types = {} +ADVENTURERECOMMENDHEROINFO.enum_types = {} +ADVENTURERECOMMENDHEROINFO.fields = {ADVENTURERECOMMENDHEROINFO_POSITIONID_FIELD, ADVENTURERECOMMENDHEROINFO_RECOMMENEDID_FIELD} +ADVENTURERECOMMENDHEROINFO.is_extendable = false +ADVENTURERECOMMENDHEROINFO.extensions = {} TEAMHEROINFO_POSITION_FIELD.name = "position" TEAMHEROINFO_POSITION_FIELD.full_name = ".com.ljsd.jieling.protocols.TeamHeroInfo.position" TEAMHEROINFO_POSITION_FIELD.number = 1 @@ -1149,23 +1101,62 @@ WORKSHOPUNLOCKINFO.enum_types = {} WORKSHOPUNLOCKINFO.fields = {WORKSHOPUNLOCKINFO_TYPE_FIELD, WORKSHOPUNLOCKINFO_ID_FIELD} WORKSHOPUNLOCKINFO.is_extendable = false WORKSHOPUNLOCKINFO.extensions = {} +FIGHTDATA_HEROFIGHTINFOS_FIELD.name = "heroFightInfos" +FIGHTDATA_HEROFIGHTINFOS_FIELD.full_name = ".com.ljsd.jieling.protocols.FightData.heroFightInfos" +FIGHTDATA_HEROFIGHTINFOS_FIELD.number = 1 +FIGHTDATA_HEROFIGHTINFOS_FIELD.index = 0 +FIGHTDATA_HEROFIGHTINFOS_FIELD.label = 1 +FIGHTDATA_HEROFIGHTINFOS_FIELD.has_default_value = false +FIGHTDATA_HEROFIGHTINFOS_FIELD.default_value = nil +FIGHTDATA_HEROFIGHTINFOS_FIELD.message_type = FIGHTTEAMINFO +FIGHTDATA_HEROFIGHTINFOS_FIELD.type = 11 +FIGHTDATA_HEROFIGHTINFOS_FIELD.cpp_type = 10 +FIGHTDATA_MONSTERLIST_FIELD.name = "monsterList" +FIGHTDATA_MONSTERLIST_FIELD.full_name = ".com.ljsd.jieling.protocols.FightData.monsterList" +FIGHTDATA_MONSTERLIST_FIELD.number = 2 +FIGHTDATA_MONSTERLIST_FIELD.index = 1 +FIGHTDATA_MONSTERLIST_FIELD.label = 3 +FIGHTDATA_MONSTERLIST_FIELD.has_default_value = false +FIGHTDATA_MONSTERLIST_FIELD.default_value = {} +FIGHTDATA_MONSTERLIST_FIELD.message_type = FIGHTTEAMINFO +FIGHTDATA_MONSTERLIST_FIELD.type = 11 +FIGHTDATA_MONSTERLIST_FIELD.cpp_type = 10 + +FIGHTDATA_FIGHTSEED_FIELD.name = "fightSeed" +FIGHTDATA_FIGHTSEED_FIELD.full_name = ".com.ljsd.jieling.protocols.FightData.fightSeed" +FIGHTDATA_FIGHTSEED_FIELD.number = 3 +FIGHTDATA_FIGHTSEED_FIELD.index = 2 +FIGHTDATA_FIGHTSEED_FIELD.label = 1 +FIGHTDATA_FIGHTSEED_FIELD.has_default_value = false +FIGHTDATA_FIGHTSEED_FIELD.default_value = 0 +FIGHTDATA_FIGHTSEED_FIELD.type = 5 +FIGHTDATA_FIGHTSEED_FIELD.cpp_type = 1 + +FIGHTDATA.name = "FightData" +FIGHTDATA.full_name = ".com.ljsd.jieling.protocols.FightData" +FIGHTDATA.nested_types = {} +FIGHTDATA.enum_types = {} +FIGHTDATA.fields = {FIGHTDATA_HEROFIGHTINFOS_FIELD, FIGHTDATA_MONSTERLIST_FIELD, FIGHTDATA_FIGHTSEED_FIELD} +FIGHTDATA.is_extendable = false +FIGHTDATA.extensions = {} + +AdventureRecommendHeroInfo = protobuf.Message(ADVENTURERECOMMENDHEROINFO) AdventureStateInfo = protobuf.Message(ADVENTURESTATEINFO) -Buff = protobuf.Message(BUFF) Cell = protobuf.Message(CELL) Drop = protobuf.Message(DROP) Equip = protobuf.Message(EQUIP) ErrorResponse = protobuf.Message(ERRORRESPONSE) EventBehaviorCommon = protobuf.Message(EVENTBEHAVIORCOMMON) EventBehaviorValues = protobuf.Message(EVENTBEHAVIORVALUES) -Family = protobuf.Message(FAMILY) +FightData = protobuf.Message(FIGHTDATA) +FightTeamInfo = protobuf.Message(FIGHTTEAMINFO) +FightUnitInfo = protobuf.Message(FIGHTUNITINFO) GMCommand = protobuf.Message(GMCOMMAND) Hero = protobuf.Message(HERO) -HeroFightInfo = protobuf.Message(HEROFIGHTINFO) Item = protobuf.Message(ITEM) Mail = protobuf.Message(MAIL) Mission = protobuf.Message(MISSION) -Monster = protobuf.Message(MONSTER) Player = protobuf.Message(PLAYER) PokemonInfo = protobuf.Message(POKEMONINFO) Pokemoncomonpent = protobuf.Message(POKEMONCOMONPENT) diff --git a/lua_out/FightInfoProto_pb.lua b/lua_out/FightInfoProto_pb.lua index 52ae1ff..e0a7b3a 100644 --- a/lua_out/FightInfoProto_pb.lua +++ b/lua_out/FightInfoProto_pb.lua @@ -6,6 +6,7 @@ module('FightInfoProto_pb') GETADVENTURESTATEINFORESPONSE = protobuf.Descriptor(); local GETADVENTURESTATEINFORESPONSE_ADVENTURESTATEINFOLIST_FIELD = protobuf.FieldDescriptor(); +local GETADVENTURESTATEINFORESPONSE_ADVENTURERECOMMENDHEROINFO_FIELD = protobuf.FieldDescriptor(); AVENTURESTATIONREQUEST = protobuf.Descriptor(); local AVENTURESTATIONREQUEST_POSITION_FIELD = protobuf.FieldDescriptor(); local AVENTURESTATIONREQUEST_HOURDURATION_FIELD = protobuf.FieldDescriptor(); @@ -17,11 +18,13 @@ local TAKEAVENTUREREWARDRESPONSE_DROP_FIELD = protobuf.FieldDescriptor(); FIGHTSTARTREQUEST = protobuf.Descriptor(); local FIGHTSTARTREQUEST_FIGHTTYPE_FIELD = protobuf.FieldDescriptor(); FIGHTSTARTRESPONSE = protobuf.Descriptor(); +local FIGHTSTARTRESPONSE_FIGHTDATA_FIELD = protobuf.FieldDescriptor(); FIGHTENDREQUEST = protobuf.Descriptor(); local FIGHTENDREQUEST_MONSTERGROUPID_FIELD = protobuf.FieldDescriptor(); local FIGHTENDREQUEST_FRAMES_FIELD = protobuf.FieldDescriptor(); FIGHTENDRESPONSE = protobuf.Descriptor(); local FIGHTENDRESPONSE_DROP_FIELD = protobuf.FieldDescriptor(); +local FIGHTENDRESPONSE_REMAINHPLIST_FIELD = protobuf.FieldDescriptor(); GETADVENTURESTATEINFORESPONSE_ADVENTURESTATEINFOLIST_FIELD.name = "adventureStateInfoList" GETADVENTURESTATEINFORESPONSE_ADVENTURESTATEINFOLIST_FIELD.full_name = ".com.ljsd.jieling.protocols.GetAdventureStateInfoResponse.adventureStateInfoList" @@ -34,11 +37,22 @@ GETADVENTURESTATEINFORESPONSE_ADVENTURESTATEINFOLIST_FIELD.message_type = Common GETADVENTURESTATEINFORESPONSE_ADVENTURESTATEINFOLIST_FIELD.type = 11 GETADVENTURESTATEINFORESPONSE_ADVENTURESTATEINFOLIST_FIELD.cpp_type = 10 +GETADVENTURESTATEINFORESPONSE_ADVENTURERECOMMENDHEROINFO_FIELD.name = "adventureRecommendHeroInfo" +GETADVENTURESTATEINFORESPONSE_ADVENTURERECOMMENDHEROINFO_FIELD.full_name = ".com.ljsd.jieling.protocols.GetAdventureStateInfoResponse.adventureRecommendHeroInfo" +GETADVENTURESTATEINFORESPONSE_ADVENTURERECOMMENDHEROINFO_FIELD.number = 2 +GETADVENTURESTATEINFORESPONSE_ADVENTURERECOMMENDHEROINFO_FIELD.index = 1 +GETADVENTURESTATEINFORESPONSE_ADVENTURERECOMMENDHEROINFO_FIELD.label = 3 +GETADVENTURESTATEINFORESPONSE_ADVENTURERECOMMENDHEROINFO_FIELD.has_default_value = false +GETADVENTURESTATEINFORESPONSE_ADVENTURERECOMMENDHEROINFO_FIELD.default_value = {} +GETADVENTURESTATEINFORESPONSE_ADVENTURERECOMMENDHEROINFO_FIELD.message_type = CommonProto_pb.ADVENTURERECOMMENDHEROINFO +GETADVENTURESTATEINFORESPONSE_ADVENTURERECOMMENDHEROINFO_FIELD.type = 11 +GETADVENTURESTATEINFORESPONSE_ADVENTURERECOMMENDHEROINFO_FIELD.cpp_type = 10 + GETADVENTURESTATEINFORESPONSE.name = "GetAdventureStateInfoResponse" GETADVENTURESTATEINFORESPONSE.full_name = ".com.ljsd.jieling.protocols.GetAdventureStateInfoResponse" GETADVENTURESTATEINFORESPONSE.nested_types = {} GETADVENTURESTATEINFORESPONSE.enum_types = {} -GETADVENTURESTATEINFORESPONSE.fields = {GETADVENTURESTATEINFORESPONSE_ADVENTURESTATEINFOLIST_FIELD} +GETADVENTURESTATEINFORESPONSE.fields = {GETADVENTURESTATEINFORESPONSE_ADVENTURESTATEINFOLIST_FIELD, GETADVENTURESTATEINFORESPONSE_ADVENTURERECOMMENDHEROINFO_FIELD} GETADVENTURESTATEINFORESPONSE.is_extendable = false GETADVENTURESTATEINFORESPONSE.extensions = {} AVENTURESTATIONREQUEST_POSITION_FIELD.name = "position" @@ -130,11 +144,22 @@ FIGHTSTARTREQUEST.enum_types = {} FIGHTSTARTREQUEST.fields = {FIGHTSTARTREQUEST_FIGHTTYPE_FIELD} FIGHTSTARTREQUEST.is_extendable = false FIGHTSTARTREQUEST.extensions = {} +FIGHTSTARTRESPONSE_FIGHTDATA_FIELD.name = "fightData" +FIGHTSTARTRESPONSE_FIGHTDATA_FIELD.full_name = ".com.ljsd.jieling.protocols.FightStartResponse.fightData" +FIGHTSTARTRESPONSE_FIGHTDATA_FIELD.number = 1 +FIGHTSTARTRESPONSE_FIGHTDATA_FIELD.index = 0 +FIGHTSTARTRESPONSE_FIGHTDATA_FIELD.label = 1 +FIGHTSTARTRESPONSE_FIGHTDATA_FIELD.has_default_value = false +FIGHTSTARTRESPONSE_FIGHTDATA_FIELD.default_value = nil +FIGHTSTARTRESPONSE_FIGHTDATA_FIELD.message_type = CommonProto_pb.FIGHTDATA +FIGHTSTARTRESPONSE_FIGHTDATA_FIELD.type = 11 +FIGHTSTARTRESPONSE_FIGHTDATA_FIELD.cpp_type = 10 + FIGHTSTARTRESPONSE.name = "FightStartResponse" FIGHTSTARTRESPONSE.full_name = ".com.ljsd.jieling.protocols.FightStartResponse" FIGHTSTARTRESPONSE.nested_types = {} FIGHTSTARTRESPONSE.enum_types = {} -FIGHTSTARTRESPONSE.fields = {} +FIGHTSTARTRESPONSE.fields = {FIGHTSTARTRESPONSE_FIGHTDATA_FIELD} FIGHTSTARTRESPONSE.is_extendable = false FIGHTSTARTRESPONSE.extensions = {} FIGHTENDREQUEST_MONSTERGROUPID_FIELD.name = "monsterGroupId" @@ -151,9 +176,9 @@ FIGHTENDREQUEST_FRAMES_FIELD.name = "frames" FIGHTENDREQUEST_FRAMES_FIELD.full_name = ".com.ljsd.jieling.protocols.FightEndRequest.frames" FIGHTENDREQUEST_FRAMES_FIELD.number = 2 FIGHTENDREQUEST_FRAMES_FIELD.index = 1 -FIGHTENDREQUEST_FRAMES_FIELD.label = 3 +FIGHTENDREQUEST_FRAMES_FIELD.label = 1 FIGHTENDREQUEST_FRAMES_FIELD.has_default_value = false -FIGHTENDREQUEST_FRAMES_FIELD.default_value = {} +FIGHTENDREQUEST_FRAMES_FIELD.default_value = "" FIGHTENDREQUEST_FRAMES_FIELD.type = 9 FIGHTENDREQUEST_FRAMES_FIELD.cpp_type = 9 @@ -175,11 +200,21 @@ FIGHTENDRESPONSE_DROP_FIELD.message_type = CommonProto_pb.DROP FIGHTENDRESPONSE_DROP_FIELD.type = 11 FIGHTENDRESPONSE_DROP_FIELD.cpp_type = 10 +FIGHTENDRESPONSE_REMAINHPLIST_FIELD.name = "remainHpList" +FIGHTENDRESPONSE_REMAINHPLIST_FIELD.full_name = ".com.ljsd.jieling.protocols.FightEndResponse.remainHpList" +FIGHTENDRESPONSE_REMAINHPLIST_FIELD.number = 2 +FIGHTENDRESPONSE_REMAINHPLIST_FIELD.index = 1 +FIGHTENDRESPONSE_REMAINHPLIST_FIELD.label = 3 +FIGHTENDRESPONSE_REMAINHPLIST_FIELD.has_default_value = false +FIGHTENDRESPONSE_REMAINHPLIST_FIELD.default_value = {} +FIGHTENDRESPONSE_REMAINHPLIST_FIELD.type = 5 +FIGHTENDRESPONSE_REMAINHPLIST_FIELD.cpp_type = 1 + FIGHTENDRESPONSE.name = "FightEndResponse" FIGHTENDRESPONSE.full_name = ".com.ljsd.jieling.protocols.FightEndResponse" FIGHTENDRESPONSE.nested_types = {} FIGHTENDRESPONSE.enum_types = {} -FIGHTENDRESPONSE.fields = {FIGHTENDRESPONSE_DROP_FIELD} +FIGHTENDRESPONSE.fields = {FIGHTENDRESPONSE_DROP_FIELD, FIGHTENDRESPONSE_REMAINHPLIST_FIELD} FIGHTENDRESPONSE.is_extendable = false FIGHTENDRESPONSE.extensions = {} diff --git a/lua_out/MapInfoProto_pb.lua b/lua_out/MapInfoProto_pb.lua index dbf15f5..451ce8d 100644 --- a/lua_out/MapInfoProto_pb.lua +++ b/lua_out/MapInfoProto_pb.lua @@ -24,8 +24,6 @@ local EVENTUPDATERESPONSE_EVENTID_FIELD = protobuf.FieldDescriptor(); local EVENTUPDATERESPONSE_EVENTBEHAVIORCOMMON_FIELD = protobuf.FieldDescriptor(); local EVENTUPDATERESPONSE_DROP_FIELD = protobuf.FieldDescriptor(); local EVENTUPDATERESPONSE_MISSION_FIELD = protobuf.FieldDescriptor(); -local EVENTUPDATERESPONSE_HEROFIGHTINFOS_FIELD = protobuf.FieldDescriptor(); -local EVENTUPDATERESPONSE_MONSTERLIST_FIELD = protobuf.FieldDescriptor(); local EVENTUPDATERESPONSE_LEFTSTEP_FIELD = protobuf.FieldDescriptor(); MAPUPDATEREQUEST = protobuf.Descriptor(); local MAPUPDATEREQUEST_CELLS_FIELD = protobuf.FieldDescriptor(); @@ -222,32 +220,10 @@ EVENTUPDATERESPONSE_MISSION_FIELD.message_type = CommonProto_pb.MISSION EVENTUPDATERESPONSE_MISSION_FIELD.type = 11 EVENTUPDATERESPONSE_MISSION_FIELD.cpp_type = 10 -EVENTUPDATERESPONSE_HEROFIGHTINFOS_FIELD.name = "heroFightInfos" -EVENTUPDATERESPONSE_HEROFIGHTINFOS_FIELD.full_name = ".com.ljsd.jieling.protocols.EventUpdateResponse.heroFightInfos" -EVENTUPDATERESPONSE_HEROFIGHTINFOS_FIELD.number = 5 -EVENTUPDATERESPONSE_HEROFIGHTINFOS_FIELD.index = 4 -EVENTUPDATERESPONSE_HEROFIGHTINFOS_FIELD.label = 3 -EVENTUPDATERESPONSE_HEROFIGHTINFOS_FIELD.has_default_value = false -EVENTUPDATERESPONSE_HEROFIGHTINFOS_FIELD.default_value = {} -EVENTUPDATERESPONSE_HEROFIGHTINFOS_FIELD.message_type = CommonProto_pb.HEROFIGHTINFO -EVENTUPDATERESPONSE_HEROFIGHTINFOS_FIELD.type = 11 -EVENTUPDATERESPONSE_HEROFIGHTINFOS_FIELD.cpp_type = 10 - -EVENTUPDATERESPONSE_MONSTERLIST_FIELD.name = "monsterList" -EVENTUPDATERESPONSE_MONSTERLIST_FIELD.full_name = ".com.ljsd.jieling.protocols.EventUpdateResponse.monsterList" -EVENTUPDATERESPONSE_MONSTERLIST_FIELD.number = 6 -EVENTUPDATERESPONSE_MONSTERLIST_FIELD.index = 5 -EVENTUPDATERESPONSE_MONSTERLIST_FIELD.label = 3 -EVENTUPDATERESPONSE_MONSTERLIST_FIELD.has_default_value = false -EVENTUPDATERESPONSE_MONSTERLIST_FIELD.default_value = {} -EVENTUPDATERESPONSE_MONSTERLIST_FIELD.message_type = CommonProto_pb.MONSTER -EVENTUPDATERESPONSE_MONSTERLIST_FIELD.type = 11 -EVENTUPDATERESPONSE_MONSTERLIST_FIELD.cpp_type = 10 - EVENTUPDATERESPONSE_LEFTSTEP_FIELD.name = "leftStep" EVENTUPDATERESPONSE_LEFTSTEP_FIELD.full_name = ".com.ljsd.jieling.protocols.EventUpdateResponse.leftStep" -EVENTUPDATERESPONSE_LEFTSTEP_FIELD.number = 7 -EVENTUPDATERESPONSE_LEFTSTEP_FIELD.index = 6 +EVENTUPDATERESPONSE_LEFTSTEP_FIELD.number = 5 +EVENTUPDATERESPONSE_LEFTSTEP_FIELD.index = 4 EVENTUPDATERESPONSE_LEFTSTEP_FIELD.label = 1 EVENTUPDATERESPONSE_LEFTSTEP_FIELD.has_default_value = false EVENTUPDATERESPONSE_LEFTSTEP_FIELD.default_value = 0 @@ -258,7 +234,7 @@ 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_HEROFIGHTINFOS_FIELD, EVENTUPDATERESPONSE_MONSTERLIST_FIELD, EVENTUPDATERESPONSE_LEFTSTEP_FIELD} +EVENTUPDATERESPONSE.fields = {EVENTUPDATERESPONSE_EVENTID_FIELD, EVENTUPDATERESPONSE_EVENTBEHAVIORCOMMON_FIELD, EVENTUPDATERESPONSE_DROP_FIELD, EVENTUPDATERESPONSE_MISSION_FIELD, EVENTUPDATERESPONSE_LEFTSTEP_FIELD} EVENTUPDATERESPONSE.is_extendable = false EVENTUPDATERESPONSE.extensions = {} MAPUPDATEREQUEST_CELLS_FIELD.name = "cells" diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index f9af980..0d868b0 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -137,6 +137,11 @@ option optimize_for = SPEED; optional int32 remainTime = 3; // 剩余时间 } + message AdventureRecommendHeroInfo{ + optional int32 positionId = 1; // 区域编号 + repeated int32 recommenedId =2 ; // 推荐英雄 + } + message TeamHeroInfo{ optional int32 position =1; optional string heroId = 2; diff --git a/protos/FightInfoProto.proto b/protos/FightInfoProto.proto index fbee7ab..6c62e1b 100644 --- a/protos/FightInfoProto.proto +++ b/protos/FightInfoProto.proto @@ -8,6 +8,7 @@ import "CommonProto.proto"; message GetAdventureStateInfoResponse{ repeated AdventureStateInfo adventureStateInfoList = 1; + repeated AdventureRecommendHeroInfo adventureRecommendHeroInfo = 2; //推荐英雄 } // 冒险驻扎