Merge branch 'master' of 60.1.1.230:backend/jieling_protocol

master_huanxiang
wangyuan 2019-04-19 11:30:11 +08:00
commit 7d08c6f7fb
6 changed files with 77 additions and 16 deletions

View File

@ -131,6 +131,10 @@ local LEVELDIFFICULTY_TYPE_FIELD = protobuf.FieldDescriptor();
LEVELDIFFICULTYINFOS = protobuf.Descriptor(); LEVELDIFFICULTYINFOS = protobuf.Descriptor();
local LEVELDIFFICULTYINFOS_AREAID_FIELD = protobuf.FieldDescriptor(); local LEVELDIFFICULTYINFOS_AREAID_FIELD = protobuf.FieldDescriptor();
local LEVELDIFFICULTYINFOS_LEVELDIFFICULTY_FIELD = protobuf.FieldDescriptor(); local LEVELDIFFICULTYINFOS_LEVELDIFFICULTY_FIELD = protobuf.FieldDescriptor();
MAPINFO = protobuf.Descriptor();
local MAPINFO_MAPID_FIELD = protobuf.FieldDescriptor();
local MAPINFO_LEASTTIME_FIELD = protobuf.FieldDescriptor();
local MAPINFO_STARS_FIELD = protobuf.FieldDescriptor();
ERRORRESPONSE_ERRCODE_FIELD.name = "errCode" ERRORRESPONSE_ERRCODE_FIELD.name = "errCode"
ERRORRESPONSE_ERRCODE_FIELD.full_name = ".com.ljsd.jieling.protocols.ErrorResponse.errCode" ERRORRESPONSE_ERRCODE_FIELD.full_name = ".com.ljsd.jieling.protocols.ErrorResponse.errCode"
@ -1335,6 +1339,43 @@ LEVELDIFFICULTYINFOS.enum_types = {}
LEVELDIFFICULTYINFOS.fields = {LEVELDIFFICULTYINFOS_AREAID_FIELD, LEVELDIFFICULTYINFOS_LEVELDIFFICULTY_FIELD} LEVELDIFFICULTYINFOS.fields = {LEVELDIFFICULTYINFOS_AREAID_FIELD, LEVELDIFFICULTYINFOS_LEVELDIFFICULTY_FIELD}
LEVELDIFFICULTYINFOS.is_extendable = false LEVELDIFFICULTYINFOS.is_extendable = false
LEVELDIFFICULTYINFOS.extensions = {} LEVELDIFFICULTYINFOS.extensions = {}
MAPINFO_MAPID_FIELD.name = "mapId"
MAPINFO_MAPID_FIELD.full_name = ".com.ljsd.jieling.protocols.MapInfo.mapId"
MAPINFO_MAPID_FIELD.number = 1
MAPINFO_MAPID_FIELD.index = 0
MAPINFO_MAPID_FIELD.label = 1
MAPINFO_MAPID_FIELD.has_default_value = false
MAPINFO_MAPID_FIELD.default_value = 0
MAPINFO_MAPID_FIELD.type = 5
MAPINFO_MAPID_FIELD.cpp_type = 1
MAPINFO_LEASTTIME_FIELD.name = "leastTime"
MAPINFO_LEASTTIME_FIELD.full_name = ".com.ljsd.jieling.protocols.MapInfo.leastTime"
MAPINFO_LEASTTIME_FIELD.number = 2
MAPINFO_LEASTTIME_FIELD.index = 1
MAPINFO_LEASTTIME_FIELD.label = 1
MAPINFO_LEASTTIME_FIELD.has_default_value = false
MAPINFO_LEASTTIME_FIELD.default_value = 0
MAPINFO_LEASTTIME_FIELD.type = 5
MAPINFO_LEASTTIME_FIELD.cpp_type = 1
MAPINFO_STARS_FIELD.name = "stars"
MAPINFO_STARS_FIELD.full_name = ".com.ljsd.jieling.protocols.MapInfo.stars"
MAPINFO_STARS_FIELD.number = 3
MAPINFO_STARS_FIELD.index = 2
MAPINFO_STARS_FIELD.label = 3
MAPINFO_STARS_FIELD.has_default_value = false
MAPINFO_STARS_FIELD.default_value = {}
MAPINFO_STARS_FIELD.type = 5
MAPINFO_STARS_FIELD.cpp_type = 1
MAPINFO.name = "MapInfo"
MAPINFO.full_name = ".com.ljsd.jieling.protocols.MapInfo"
MAPINFO.nested_types = {}
MAPINFO.enum_types = {}
MAPINFO.fields = {MAPINFO_MAPID_FIELD, MAPINFO_LEASTTIME_FIELD, MAPINFO_STARS_FIELD}
MAPINFO.is_extendable = false
MAPINFO.extensions = {}
AdventureRecommendHeroInfo = protobuf.Message(ADVENTURERECOMMENDHEROINFO) AdventureRecommendHeroInfo = protobuf.Message(ADVENTURERECOMMENDHEROINFO)
AdventureStateInfo = protobuf.Message(ADVENTURESTATEINFO) AdventureStateInfo = protobuf.Message(ADVENTURESTATEINFO)
@ -1355,6 +1396,7 @@ Item = protobuf.Message(ITEM)
LevelDifficulty = protobuf.Message(LEVELDIFFICULTY) LevelDifficulty = protobuf.Message(LEVELDIFFICULTY)
LevelDifficultyInfos = protobuf.Message(LEVELDIFFICULTYINFOS) LevelDifficultyInfos = protobuf.Message(LEVELDIFFICULTYINFOS)
Mail = protobuf.Message(MAIL) Mail = protobuf.Message(MAIL)
MapInfo = protobuf.Message(MAPINFO)
Mission = protobuf.Message(MISSION) Mission = protobuf.Message(MISSION)
NewPlayerGuidePoint = protobuf.Message(NEWPLAYERGUIDEPOINT) NewPlayerGuidePoint = protobuf.Message(NEWPLAYERGUIDEPOINT)
Player = protobuf.Message(PLAYER) Player = protobuf.Message(PLAYER)

View File

@ -7,7 +7,7 @@ module('FightInfoProto_pb')
GETADVENTURESTATEINFORESPONSE = protobuf.Descriptor(); GETADVENTURESTATEINFORESPONSE = protobuf.Descriptor();
local GETADVENTURESTATEINFORESPONSE_ADVENTURESTATEINFOLIST_FIELD = protobuf.FieldDescriptor(); local GETADVENTURESTATEINFORESPONSE_ADVENTURESTATEINFOLIST_FIELD = protobuf.FieldDescriptor();
local GETADVENTURESTATEINFORESPONSE_DROP_FIELD = protobuf.FieldDescriptor(); local GETADVENTURESTATEINFORESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
local GETADVENTURESTATEINFORESPONSE_LEVETIME_FIELD = protobuf.FieldDescriptor(); local GETADVENTURESTATEINFORESPONSE_OUTTIME_FIELD = protobuf.FieldDescriptor();
AVENTURESTATIONREQUEST = protobuf.Descriptor(); AVENTURESTATIONREQUEST = protobuf.Descriptor();
local AVENTURESTATIONREQUEST_POSITION_FIELD = protobuf.FieldDescriptor(); local AVENTURESTATIONREQUEST_POSITION_FIELD = protobuf.FieldDescriptor();
local AVENTURESTATIONREQUEST_HEROIDLIST_FIELD = protobuf.FieldDescriptor(); local AVENTURESTATIONREQUEST_HEROIDLIST_FIELD = protobuf.FieldDescriptor();
@ -70,21 +70,21 @@ GETADVENTURESTATEINFORESPONSE_DROP_FIELD.message_type = CommonProto_pb.DROP
GETADVENTURESTATEINFORESPONSE_DROP_FIELD.type = 11 GETADVENTURESTATEINFORESPONSE_DROP_FIELD.type = 11
GETADVENTURESTATEINFORESPONSE_DROP_FIELD.cpp_type = 10 GETADVENTURESTATEINFORESPONSE_DROP_FIELD.cpp_type = 10
GETADVENTURESTATEINFORESPONSE_LEVETIME_FIELD.name = "leveTime" GETADVENTURESTATEINFORESPONSE_OUTTIME_FIELD.name = "outTime"
GETADVENTURESTATEINFORESPONSE_LEVETIME_FIELD.full_name = ".com.ljsd.jieling.protocols.GetAdventureStateInfoResponse.leveTime" GETADVENTURESTATEINFORESPONSE_OUTTIME_FIELD.full_name = ".com.ljsd.jieling.protocols.GetAdventureStateInfoResponse.outTime"
GETADVENTURESTATEINFORESPONSE_LEVETIME_FIELD.number = 3 GETADVENTURESTATEINFORESPONSE_OUTTIME_FIELD.number = 3
GETADVENTURESTATEINFORESPONSE_LEVETIME_FIELD.index = 2 GETADVENTURESTATEINFORESPONSE_OUTTIME_FIELD.index = 2
GETADVENTURESTATEINFORESPONSE_LEVETIME_FIELD.label = 1 GETADVENTURESTATEINFORESPONSE_OUTTIME_FIELD.label = 1
GETADVENTURESTATEINFORESPONSE_LEVETIME_FIELD.has_default_value = false GETADVENTURESTATEINFORESPONSE_OUTTIME_FIELD.has_default_value = false
GETADVENTURESTATEINFORESPONSE_LEVETIME_FIELD.default_value = 0 GETADVENTURESTATEINFORESPONSE_OUTTIME_FIELD.default_value = 0
GETADVENTURESTATEINFORESPONSE_LEVETIME_FIELD.type = 5 GETADVENTURESTATEINFORESPONSE_OUTTIME_FIELD.type = 5
GETADVENTURESTATEINFORESPONSE_LEVETIME_FIELD.cpp_type = 1 GETADVENTURESTATEINFORESPONSE_OUTTIME_FIELD.cpp_type = 1
GETADVENTURESTATEINFORESPONSE.name = "GetAdventureStateInfoResponse" GETADVENTURESTATEINFORESPONSE.name = "GetAdventureStateInfoResponse"
GETADVENTURESTATEINFORESPONSE.full_name = ".com.ljsd.jieling.protocols.GetAdventureStateInfoResponse" GETADVENTURESTATEINFORESPONSE.full_name = ".com.ljsd.jieling.protocols.GetAdventureStateInfoResponse"
GETADVENTURESTATEINFORESPONSE.nested_types = {} GETADVENTURESTATEINFORESPONSE.nested_types = {}
GETADVENTURESTATEINFORESPONSE.enum_types = {} GETADVENTURESTATEINFORESPONSE.enum_types = {}
GETADVENTURESTATEINFORESPONSE.fields = {GETADVENTURESTATEINFORESPONSE_ADVENTURESTATEINFOLIST_FIELD, GETADVENTURESTATEINFORESPONSE_DROP_FIELD, GETADVENTURESTATEINFORESPONSE_LEVETIME_FIELD} GETADVENTURESTATEINFORESPONSE.fields = {GETADVENTURESTATEINFORESPONSE_ADVENTURESTATEINFOLIST_FIELD, GETADVENTURESTATEINFORESPONSE_DROP_FIELD, GETADVENTURESTATEINFORESPONSE_OUTTIME_FIELD}
GETADVENTURESTATEINFORESPONSE.is_extendable = false GETADVENTURESTATEINFORESPONSE.is_extendable = false
GETADVENTURESTATEINFORESPONSE.extensions = {} GETADVENTURESTATEINFORESPONSE.extensions = {}
AVENTURESTATIONREQUEST_POSITION_FIELD.name = "position" AVENTURESTATIONREQUEST_POSITION_FIELD.name = "position"

View File

@ -46,6 +46,7 @@ MAPSTARTEXPLORERESPONSE = protobuf.Descriptor();
local MAPSTARTEXPLORERESPONSE_LEFTTIME_FIELD = protobuf.FieldDescriptor(); local MAPSTARTEXPLORERESPONSE_LEFTTIME_FIELD = protobuf.FieldDescriptor();
GETALLLEVELDIFFICULTYINFOSRESPONSE = protobuf.Descriptor(); GETALLLEVELDIFFICULTYINFOSRESPONSE = protobuf.Descriptor();
local GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD = protobuf.FieldDescriptor(); local GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD = protobuf.FieldDescriptor();
local GETALLLEVELDIFFICULTYINFOSRESPONSE_MAPINFOS_FIELD = protobuf.FieldDescriptor();
MAPGETRANKINFOREQUEST = protobuf.Descriptor(); MAPGETRANKINFOREQUEST = protobuf.Descriptor();
local MAPGETRANKINFOREQUEST_MAPID_FIELD = protobuf.FieldDescriptor(); local MAPGETRANKINFOREQUEST_MAPID_FIELD = protobuf.FieldDescriptor();
MAPRANKINFO = protobuf.Descriptor(); MAPRANKINFO = protobuf.Descriptor();
@ -461,11 +462,22 @@ GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD.message_type = Com
GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD.type = 11 GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD.type = 11
GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD.cpp_type = 10 GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD.cpp_type = 10
GETALLLEVELDIFFICULTYINFOSRESPONSE_MAPINFOS_FIELD.name = "mapInfos"
GETALLLEVELDIFFICULTYINFOSRESPONSE_MAPINFOS_FIELD.full_name = ".com.ljsd.jieling.protocols.getAllLevelDifficultyInfosResponse.mapInfos"
GETALLLEVELDIFFICULTYINFOSRESPONSE_MAPINFOS_FIELD.number = 2
GETALLLEVELDIFFICULTYINFOSRESPONSE_MAPINFOS_FIELD.index = 1
GETALLLEVELDIFFICULTYINFOSRESPONSE_MAPINFOS_FIELD.label = 3
GETALLLEVELDIFFICULTYINFOSRESPONSE_MAPINFOS_FIELD.has_default_value = false
GETALLLEVELDIFFICULTYINFOSRESPONSE_MAPINFOS_FIELD.default_value = {}
GETALLLEVELDIFFICULTYINFOSRESPONSE_MAPINFOS_FIELD.message_type = CommonProto_pb.MAPINFO
GETALLLEVELDIFFICULTYINFOSRESPONSE_MAPINFOS_FIELD.type = 11
GETALLLEVELDIFFICULTYINFOSRESPONSE_MAPINFOS_FIELD.cpp_type = 10
GETALLLEVELDIFFICULTYINFOSRESPONSE.name = "getAllLevelDifficultyInfosResponse" GETALLLEVELDIFFICULTYINFOSRESPONSE.name = "getAllLevelDifficultyInfosResponse"
GETALLLEVELDIFFICULTYINFOSRESPONSE.full_name = ".com.ljsd.jieling.protocols.getAllLevelDifficultyInfosResponse" GETALLLEVELDIFFICULTYINFOSRESPONSE.full_name = ".com.ljsd.jieling.protocols.getAllLevelDifficultyInfosResponse"
GETALLLEVELDIFFICULTYINFOSRESPONSE.nested_types = {} GETALLLEVELDIFFICULTYINFOSRESPONSE.nested_types = {}
GETALLLEVELDIFFICULTYINFOSRESPONSE.enum_types = {} GETALLLEVELDIFFICULTYINFOSRESPONSE.enum_types = {}
GETALLLEVELDIFFICULTYINFOSRESPONSE.fields = {GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD} GETALLLEVELDIFFICULTYINFOSRESPONSE.fields = {GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD, GETALLLEVELDIFFICULTYINFOSRESPONSE_MAPINFOS_FIELD}
GETALLLEVELDIFFICULTYINFOSRESPONSE.is_extendable = false GETALLLEVELDIFFICULTYINFOSRESPONSE.is_extendable = false
GETALLLEVELDIFFICULTYINFOSRESPONSE.extensions = {} GETALLLEVELDIFFICULTYINFOSRESPONSE.extensions = {}
MAPGETRANKINFOREQUEST_MAPID_FIELD.name = "mapId" MAPGETRANKINFOREQUEST_MAPID_FIELD.name = "mapId"

View File

@ -219,6 +219,11 @@ option optimize_for = SPEED;
repeated LevelDifficulty LevelDifficulty = 2; repeated LevelDifficulty LevelDifficulty = 2;
} }
//
message MapInfo {
optional int32 mapId = 1;
//
optional int32 leastTime = 2;
// (1: 2: 3:100% )
repeated int32 stars = 3;
}

View File

@ -9,7 +9,7 @@ import "CommonProto.proto";
message GetAdventureStateInfoResponse{ message GetAdventureStateInfoResponse{
repeated AdventureStateInfo adventureStateInfoList = 1; repeated AdventureStateInfo adventureStateInfoList = 1;
optional Drop Drop =2; optional Drop Drop =2;
optional int32 leveTime =3; //线 optional int32 outTime =3; //线
} }
// //

View File

@ -96,6 +96,8 @@ import "CommonProto.proto";
// //
message getAllLevelDifficultyInfosResponse{ message getAllLevelDifficultyInfosResponse{
repeated LevelDifficultyInfos levelDifficultyInfos = 1; repeated LevelDifficultyInfos levelDifficultyInfos = 1;
//
repeated MapInfo mapInfos = 2;
} }
// //