Merge branch 'master' of 60.1.1.230:backend/jieling_protocol

master_huanxiang
wangyuan 2019-05-16 16:54:21 +08:00
commit 900a0bf81d
2 changed files with 34 additions and 23 deletions

View File

@ -81,6 +81,7 @@ GMCOMMAND = protobuf.Descriptor();
local GMCOMMAND_COMMAND_FIELD = protobuf.FieldDescriptor();
ADVENTUREBOSSSIMPLEINFO = protobuf.Descriptor();
local ADVENTUREBOSSSIMPLEINFO_ARENAID_FIELD = protobuf.FieldDescriptor();
local ADVENTUREBOSSSIMPLEINFO_BOSSID_FIELD = protobuf.FieldDescriptor();
local ADVENTUREBOSSSIMPLEINFO_BOSSGROUPID_FIELD = protobuf.FieldDescriptor();
local ADVENTUREBOSSSIMPLEINFO_REMAINTIME_FIELD = protobuf.FieldDescriptor();
ADVENTURESTATEINFO = protobuf.Descriptor();
@ -88,7 +89,6 @@ local ADVENTURESTATEINFO_POSITIONID_FIELD = protobuf.FieldDescriptor();
local ADVENTURESTATEINFO_LEVEL_FIELD = protobuf.FieldDescriptor();
local ADVENTURESTATEINFO_STATETIME_FIELD = protobuf.FieldDescriptor();
local ADVENTURESTATEINFO_ADVENTUREBOSSSIMPLEINFO_FIELD = protobuf.FieldDescriptor();
local ADVENTURESTATEINFO_BOSSFINDNEXTTIME_FIELD = protobuf.FieldDescriptor();
TEAMHEROINFO = protobuf.Descriptor();
local TEAMHEROINFO_POSITION_FIELD = protobuf.FieldDescriptor();
local TEAMHEROINFO_HEROID_FIELD = protobuf.FieldDescriptor();
@ -931,10 +931,20 @@ ADVENTUREBOSSSIMPLEINFO_ARENAID_FIELD.default_value = 0
ADVENTUREBOSSSIMPLEINFO_ARENAID_FIELD.type = 5
ADVENTUREBOSSSIMPLEINFO_ARENAID_FIELD.cpp_type = 1
ADVENTUREBOSSSIMPLEINFO_BOSSID_FIELD.name = "bossId"
ADVENTUREBOSSSIMPLEINFO_BOSSID_FIELD.full_name = ".com.ljsd.jieling.protocols.AdventureBossSimpleInfo.bossId"
ADVENTUREBOSSSIMPLEINFO_BOSSID_FIELD.number = 2
ADVENTUREBOSSSIMPLEINFO_BOSSID_FIELD.index = 1
ADVENTUREBOSSSIMPLEINFO_BOSSID_FIELD.label = 1
ADVENTUREBOSSSIMPLEINFO_BOSSID_FIELD.has_default_value = false
ADVENTUREBOSSSIMPLEINFO_BOSSID_FIELD.default_value = ""
ADVENTUREBOSSSIMPLEINFO_BOSSID_FIELD.type = 9
ADVENTUREBOSSSIMPLEINFO_BOSSID_FIELD.cpp_type = 9
ADVENTUREBOSSSIMPLEINFO_BOSSGROUPID_FIELD.name = "bossGroupId"
ADVENTUREBOSSSIMPLEINFO_BOSSGROUPID_FIELD.full_name = ".com.ljsd.jieling.protocols.AdventureBossSimpleInfo.bossGroupId"
ADVENTUREBOSSSIMPLEINFO_BOSSGROUPID_FIELD.number = 2
ADVENTUREBOSSSIMPLEINFO_BOSSGROUPID_FIELD.index = 1
ADVENTUREBOSSSIMPLEINFO_BOSSGROUPID_FIELD.number = 3
ADVENTUREBOSSSIMPLEINFO_BOSSGROUPID_FIELD.index = 2
ADVENTUREBOSSSIMPLEINFO_BOSSGROUPID_FIELD.label = 1
ADVENTUREBOSSSIMPLEINFO_BOSSGROUPID_FIELD.has_default_value = false
ADVENTUREBOSSSIMPLEINFO_BOSSGROUPID_FIELD.default_value = 0
@ -943,8 +953,8 @@ ADVENTUREBOSSSIMPLEINFO_BOSSGROUPID_FIELD.cpp_type = 1
ADVENTUREBOSSSIMPLEINFO_REMAINTIME_FIELD.name = "remainTime"
ADVENTUREBOSSSIMPLEINFO_REMAINTIME_FIELD.full_name = ".com.ljsd.jieling.protocols.AdventureBossSimpleInfo.remainTime"
ADVENTUREBOSSSIMPLEINFO_REMAINTIME_FIELD.number = 3
ADVENTUREBOSSSIMPLEINFO_REMAINTIME_FIELD.index = 2
ADVENTUREBOSSSIMPLEINFO_REMAINTIME_FIELD.number = 4
ADVENTUREBOSSSIMPLEINFO_REMAINTIME_FIELD.index = 3
ADVENTUREBOSSSIMPLEINFO_REMAINTIME_FIELD.label = 1
ADVENTUREBOSSSIMPLEINFO_REMAINTIME_FIELD.has_default_value = false
ADVENTUREBOSSSIMPLEINFO_REMAINTIME_FIELD.default_value = 0
@ -955,7 +965,7 @@ ADVENTUREBOSSSIMPLEINFO.name = "AdventureBossSimpleInfo"
ADVENTUREBOSSSIMPLEINFO.full_name = ".com.ljsd.jieling.protocols.AdventureBossSimpleInfo"
ADVENTUREBOSSSIMPLEINFO.nested_types = {}
ADVENTUREBOSSSIMPLEINFO.enum_types = {}
ADVENTUREBOSSSIMPLEINFO.fields = {ADVENTUREBOSSSIMPLEINFO_ARENAID_FIELD, ADVENTUREBOSSSIMPLEINFO_BOSSGROUPID_FIELD, ADVENTUREBOSSSIMPLEINFO_REMAINTIME_FIELD}
ADVENTUREBOSSSIMPLEINFO.fields = {ADVENTUREBOSSSIMPLEINFO_ARENAID_FIELD, ADVENTUREBOSSSIMPLEINFO_BOSSID_FIELD, ADVENTUREBOSSSIMPLEINFO_BOSSGROUPID_FIELD, ADVENTUREBOSSSIMPLEINFO_REMAINTIME_FIELD}
ADVENTUREBOSSSIMPLEINFO.is_extendable = false
ADVENTUREBOSSSIMPLEINFO.extensions = {}
ADVENTURESTATEINFO_POSITIONID_FIELD.name = "positionId"
@ -990,7 +1000,7 @@ ADVENTURESTATEINFO_STATETIME_FIELD.cpp_type = 1
ADVENTURESTATEINFO_ADVENTUREBOSSSIMPLEINFO_FIELD.name = "adventureBossSimpleInfo"
ADVENTURESTATEINFO_ADVENTUREBOSSSIMPLEINFO_FIELD.full_name = ".com.ljsd.jieling.protocols.AdventureStateInfo.adventureBossSimpleInfo"
ADVENTURESTATEINFO_ADVENTUREBOSSSIMPLEINFO_FIELD.number = 5
ADVENTURESTATEINFO_ADVENTUREBOSSSIMPLEINFO_FIELD.number = 4
ADVENTURESTATEINFO_ADVENTUREBOSSSIMPLEINFO_FIELD.index = 3
ADVENTURESTATEINFO_ADVENTUREBOSSSIMPLEINFO_FIELD.label = 1
ADVENTURESTATEINFO_ADVENTUREBOSSSIMPLEINFO_FIELD.has_default_value = false
@ -999,21 +1009,11 @@ ADVENTURESTATEINFO_ADVENTUREBOSSSIMPLEINFO_FIELD.message_type = ADVENTUREBOSSSIM
ADVENTURESTATEINFO_ADVENTUREBOSSSIMPLEINFO_FIELD.type = 11
ADVENTURESTATEINFO_ADVENTUREBOSSSIMPLEINFO_FIELD.cpp_type = 10
ADVENTURESTATEINFO_BOSSFINDNEXTTIME_FIELD.name = "bossFindNextTime"
ADVENTURESTATEINFO_BOSSFINDNEXTTIME_FIELD.full_name = ".com.ljsd.jieling.protocols.AdventureStateInfo.bossFindNextTime"
ADVENTURESTATEINFO_BOSSFINDNEXTTIME_FIELD.number = 6
ADVENTURESTATEINFO_BOSSFINDNEXTTIME_FIELD.index = 4
ADVENTURESTATEINFO_BOSSFINDNEXTTIME_FIELD.label = 1
ADVENTURESTATEINFO_BOSSFINDNEXTTIME_FIELD.has_default_value = false
ADVENTURESTATEINFO_BOSSFINDNEXTTIME_FIELD.default_value = 0
ADVENTURESTATEINFO_BOSSFINDNEXTTIME_FIELD.type = 5
ADVENTURESTATEINFO_BOSSFINDNEXTTIME_FIELD.cpp_type = 1
ADVENTURESTATEINFO.name = "AdventureStateInfo"
ADVENTURESTATEINFO.full_name = ".com.ljsd.jieling.protocols.AdventureStateInfo"
ADVENTURESTATEINFO.nested_types = {}
ADVENTURESTATEINFO.enum_types = {}
ADVENTURESTATEINFO.fields = {ADVENTURESTATEINFO_POSITIONID_FIELD, ADVENTURESTATEINFO_LEVEL_FIELD, ADVENTURESTATEINFO_STATETIME_FIELD, ADVENTURESTATEINFO_ADVENTUREBOSSSIMPLEINFO_FIELD, ADVENTURESTATEINFO_BOSSFINDNEXTTIME_FIELD}
ADVENTURESTATEINFO.fields = {ADVENTURESTATEINFO_POSITIONID_FIELD, ADVENTURESTATEINFO_LEVEL_FIELD, ADVENTURESTATEINFO_STATETIME_FIELD, ADVENTURESTATEINFO_ADVENTUREBOSSSIMPLEINFO_FIELD}
ADVENTURESTATEINFO.is_extendable = false
ADVENTURESTATEINFO.extensions = {}
TEAMHEROINFO_POSITION_FIELD.name = "position"

View File

@ -44,6 +44,7 @@ FIGHTREPLAYRESPONSE = protobuf.Descriptor();
local FIGHTREPLAYRESPONSE_FIGHTDATA_FIELD = protobuf.FieldDescriptor();
GETADVENTURESTATEINFORESPONSE = protobuf.Descriptor();
local GETADVENTURESTATEINFORESPONSE_ADVENTURESTATEINFOLIST_FIELD = protobuf.FieldDescriptor();
local GETADVENTURESTATEINFORESPONSE_BOSSFINDNEXTTIME_FIELD = protobuf.FieldDescriptor();
local GETADVENTURESTATEINFORESPONSE_BUYTIMSPERDAY_FIELD = protobuf.FieldDescriptor();
local GETADVENTURESTATEINFORESPONSE_DAYCHALLENGETIMES_FIELD = protobuf.FieldDescriptor();
TAKEAVENTUREREWARDREQUEST = protobuf.Descriptor();
@ -461,10 +462,20 @@ GETADVENTURESTATEINFORESPONSE_ADVENTURESTATEINFOLIST_FIELD.message_type = Common
GETADVENTURESTATEINFORESPONSE_ADVENTURESTATEINFOLIST_FIELD.type = 11
GETADVENTURESTATEINFORESPONSE_ADVENTURESTATEINFOLIST_FIELD.cpp_type = 10
GETADVENTURESTATEINFORESPONSE_BOSSFINDNEXTTIME_FIELD.name = "bossFindNextTime"
GETADVENTURESTATEINFORESPONSE_BOSSFINDNEXTTIME_FIELD.full_name = ".com.ljsd.jieling.protocols.GetAdventureStateInfoResponse.bossFindNextTime"
GETADVENTURESTATEINFORESPONSE_BOSSFINDNEXTTIME_FIELD.number = 2
GETADVENTURESTATEINFORESPONSE_BOSSFINDNEXTTIME_FIELD.index = 1
GETADVENTURESTATEINFORESPONSE_BOSSFINDNEXTTIME_FIELD.label = 1
GETADVENTURESTATEINFORESPONSE_BOSSFINDNEXTTIME_FIELD.has_default_value = false
GETADVENTURESTATEINFORESPONSE_BOSSFINDNEXTTIME_FIELD.default_value = 0
GETADVENTURESTATEINFORESPONSE_BOSSFINDNEXTTIME_FIELD.type = 5
GETADVENTURESTATEINFORESPONSE_BOSSFINDNEXTTIME_FIELD.cpp_type = 1
GETADVENTURESTATEINFORESPONSE_BUYTIMSPERDAY_FIELD.name = "buyTimsPerDay"
GETADVENTURESTATEINFORESPONSE_BUYTIMSPERDAY_FIELD.full_name = ".com.ljsd.jieling.protocols.GetAdventureStateInfoResponse.buyTimsPerDay"
GETADVENTURESTATEINFORESPONSE_BUYTIMSPERDAY_FIELD.number = 2
GETADVENTURESTATEINFORESPONSE_BUYTIMSPERDAY_FIELD.index = 1
GETADVENTURESTATEINFORESPONSE_BUYTIMSPERDAY_FIELD.number = 3
GETADVENTURESTATEINFORESPONSE_BUYTIMSPERDAY_FIELD.index = 2
GETADVENTURESTATEINFORESPONSE_BUYTIMSPERDAY_FIELD.label = 1
GETADVENTURESTATEINFORESPONSE_BUYTIMSPERDAY_FIELD.has_default_value = false
GETADVENTURESTATEINFORESPONSE_BUYTIMSPERDAY_FIELD.default_value = 0
@ -473,8 +484,8 @@ GETADVENTURESTATEINFORESPONSE_BUYTIMSPERDAY_FIELD.cpp_type = 1
GETADVENTURESTATEINFORESPONSE_DAYCHALLENGETIMES_FIELD.name = "dayChallengeTimes"
GETADVENTURESTATEINFORESPONSE_DAYCHALLENGETIMES_FIELD.full_name = ".com.ljsd.jieling.protocols.GetAdventureStateInfoResponse.dayChallengeTimes"
GETADVENTURESTATEINFORESPONSE_DAYCHALLENGETIMES_FIELD.number = 3
GETADVENTURESTATEINFORESPONSE_DAYCHALLENGETIMES_FIELD.index = 2
GETADVENTURESTATEINFORESPONSE_DAYCHALLENGETIMES_FIELD.number = 4
GETADVENTURESTATEINFORESPONSE_DAYCHALLENGETIMES_FIELD.index = 3
GETADVENTURESTATEINFORESPONSE_DAYCHALLENGETIMES_FIELD.label = 1
GETADVENTURESTATEINFORESPONSE_DAYCHALLENGETIMES_FIELD.has_default_value = false
GETADVENTURESTATEINFORESPONSE_DAYCHALLENGETIMES_FIELD.default_value = 0
@ -485,7 +496,7 @@ GETADVENTURESTATEINFORESPONSE.name = "GetAdventureStateInfoResponse"
GETADVENTURESTATEINFORESPONSE.full_name = ".com.ljsd.jieling.protocols.GetAdventureStateInfoResponse"
GETADVENTURESTATEINFORESPONSE.nested_types = {}
GETADVENTURESTATEINFORESPONSE.enum_types = {}
GETADVENTURESTATEINFORESPONSE.fields = {GETADVENTURESTATEINFORESPONSE_ADVENTURESTATEINFOLIST_FIELD, GETADVENTURESTATEINFORESPONSE_BUYTIMSPERDAY_FIELD, GETADVENTURESTATEINFORESPONSE_DAYCHALLENGETIMES_FIELD}
GETADVENTURESTATEINFORESPONSE.fields = {GETADVENTURESTATEINFORESPONSE_ADVENTURESTATEINFOLIST_FIELD, GETADVENTURESTATEINFORESPONSE_BOSSFINDNEXTTIME_FIELD, GETADVENTURESTATEINFORESPONSE_BUYTIMSPERDAY_FIELD, GETADVENTURESTATEINFORESPONSE_DAYCHALLENGETIMES_FIELD}
GETADVENTURESTATEINFORESPONSE.is_extendable = false
GETADVENTURESTATEINFORESPONSE.extensions = {}
TAKEAVENTUREREWARDREQUEST_TYPE_FIELD.name = "type"