Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
commit
7c81661cb7
|
|
@ -245,6 +245,9 @@ GIFTGOODSINFO = protobuf.Descriptor();
|
|||
local GIFTGOODSINFO_GOODSID_FIELD = protobuf.FieldDescriptor();
|
||||
local GIFTGOODSINFO_BUYTIMES_FIELD = protobuf.FieldDescriptor();
|
||||
local GIFTGOODSINFO_ENDTIME_FIELD = protobuf.FieldDescriptor();
|
||||
TECHNOLOGYINFO = protobuf.Descriptor();
|
||||
local TECHNOLOGYINFO_TECHID_FIELD = protobuf.FieldDescriptor();
|
||||
local TECHNOLOGYINFO_LEVLE_FIELD = protobuf.FieldDescriptor();
|
||||
|
||||
ERRORRESPONSE_ERRCODE_FIELD.name = "errCode"
|
||||
ERRORRESPONSE_ERRCODE_FIELD.full_name = ".com.ljsd.jieling.protocols.ErrorResponse.errCode"
|
||||
|
|
@ -2539,6 +2542,33 @@ GIFTGOODSINFO.enum_types = {}
|
|||
GIFTGOODSINFO.fields = {GIFTGOODSINFO_GOODSID_FIELD, GIFTGOODSINFO_BUYTIMES_FIELD, GIFTGOODSINFO_ENDTIME_FIELD}
|
||||
GIFTGOODSINFO.is_extendable = false
|
||||
GIFTGOODSINFO.extensions = {}
|
||||
TECHNOLOGYINFO_TECHID_FIELD.name = "techId"
|
||||
TECHNOLOGYINFO_TECHID_FIELD.full_name = ".com.ljsd.jieling.protocols.TechnologyInfo.techId"
|
||||
TECHNOLOGYINFO_TECHID_FIELD.number = 1
|
||||
TECHNOLOGYINFO_TECHID_FIELD.index = 0
|
||||
TECHNOLOGYINFO_TECHID_FIELD.label = 1
|
||||
TECHNOLOGYINFO_TECHID_FIELD.has_default_value = false
|
||||
TECHNOLOGYINFO_TECHID_FIELD.default_value = 0
|
||||
TECHNOLOGYINFO_TECHID_FIELD.type = 5
|
||||
TECHNOLOGYINFO_TECHID_FIELD.cpp_type = 1
|
||||
|
||||
TECHNOLOGYINFO_LEVLE_FIELD.name = "levle"
|
||||
TECHNOLOGYINFO_LEVLE_FIELD.full_name = ".com.ljsd.jieling.protocols.TechnologyInfo.levle"
|
||||
TECHNOLOGYINFO_LEVLE_FIELD.number = 2
|
||||
TECHNOLOGYINFO_LEVLE_FIELD.index = 1
|
||||
TECHNOLOGYINFO_LEVLE_FIELD.label = 1
|
||||
TECHNOLOGYINFO_LEVLE_FIELD.has_default_value = false
|
||||
TECHNOLOGYINFO_LEVLE_FIELD.default_value = 0
|
||||
TECHNOLOGYINFO_LEVLE_FIELD.type = 5
|
||||
TECHNOLOGYINFO_LEVLE_FIELD.cpp_type = 1
|
||||
|
||||
TECHNOLOGYINFO.name = "TechnologyInfo"
|
||||
TECHNOLOGYINFO.full_name = ".com.ljsd.jieling.protocols.TechnologyInfo"
|
||||
TECHNOLOGYINFO.nested_types = {}
|
||||
TECHNOLOGYINFO.enum_types = {}
|
||||
TECHNOLOGYINFO.fields = {TECHNOLOGYINFO_TECHID_FIELD, TECHNOLOGYINFO_LEVLE_FIELD}
|
||||
TECHNOLOGYINFO.is_extendable = false
|
||||
TECHNOLOGYINFO.extensions = {}
|
||||
|
||||
ActivityInfo = protobuf.Message(ACTIVITYINFO)
|
||||
ActivityInfo.MissionInfo = protobuf.Message(ACTIVITYINFO_MISSIONINFO)
|
||||
|
|
@ -2586,6 +2616,7 @@ Team = protobuf.Message(TEAM)
|
|||
TeamHeroInfo = protobuf.Message(TEAMHEROINFO)
|
||||
TeamPokemonInfo = protobuf.Message(TEAMPOKEMONINFO)
|
||||
TeamPosInfo = protobuf.Message(TEAMPOSINFO)
|
||||
TechnologyInfo = protobuf.Message(TECHNOLOGYINFO)
|
||||
UserMissionInfo = protobuf.Message(USERMISSIONINFO)
|
||||
VipMissionInfo = protobuf.Message(VIPMISSIONINFO)
|
||||
WorkShopBaseInfo = protobuf.Message(WORKSHOPBASEINFO)
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -58,6 +58,8 @@ local WORKSHOPREBUILDREQUEST_EQUIPID_FIELD = protobuf.FieldDescriptor();
|
|||
local WORKSHOPREBUILDREQUEST_CONSUMEEQUIPIDS_FIELD = protobuf.FieldDescriptor();
|
||||
WORKSHOPREBUILDRESPOONSE = protobuf.Descriptor();
|
||||
local WORKSHOPREBUILDRESPOONSE_EQUIP_FIELD = protobuf.FieldDescriptor();
|
||||
WORKTECHNOLOGYLEVELREQUEST = protobuf.Descriptor();
|
||||
local WORKTECHNOLOGYLEVELREQUEST_ID_FIELD = protobuf.FieldDescriptor();
|
||||
ACTIVITEWORKSHOPREQEUST = protobuf.Descriptor();
|
||||
local ACTIVITEWORKSHOPREQEUST_TYPE_FIELD = protobuf.FieldDescriptor();
|
||||
local ACTIVITEWORKSHOPREQEUST_ACTIVITEID_FIELD = protobuf.FieldDescriptor();
|
||||
|
|
@ -65,6 +67,7 @@ GETWORKSHOPINFORESPONSE = protobuf.Descriptor();
|
|||
local GETWORKSHOPINFORESPONSE_WORKSHOPUNLOCKINFO_FIELD = protobuf.FieldDescriptor();
|
||||
local GETWORKSHOPINFORESPONSE_WORKSHOPBASEINFO_FIELD = protobuf.FieldDescriptor();
|
||||
local GETWORKSHOPINFORESPONSE_UNDETERMINED_FIELD = protobuf.FieldDescriptor();
|
||||
local GETWORKSHOPINFORESPONSE_TECHNOLOGYINFO_FIELD = protobuf.FieldDescriptor();
|
||||
COOKFOODREQUEST = protobuf.Descriptor();
|
||||
local COOKFOODREQUEST_MATERIALID_FIELD = protobuf.FieldDescriptor();
|
||||
local COOKFOODREQUEST_NUMS_FIELD = protobuf.FieldDescriptor();
|
||||
|
|
@ -676,6 +679,23 @@ WORKSHOPREBUILDRESPOONSE.enum_types = {}
|
|||
WORKSHOPREBUILDRESPOONSE.fields = {WORKSHOPREBUILDRESPOONSE_EQUIP_FIELD}
|
||||
WORKSHOPREBUILDRESPOONSE.is_extendable = false
|
||||
WORKSHOPREBUILDRESPOONSE.extensions = {}
|
||||
WORKTECHNOLOGYLEVELREQUEST_ID_FIELD.name = "id"
|
||||
WORKTECHNOLOGYLEVELREQUEST_ID_FIELD.full_name = ".com.ljsd.jieling.protocols.WorkTechnologyLevelRequest.id"
|
||||
WORKTECHNOLOGYLEVELREQUEST_ID_FIELD.number = 1
|
||||
WORKTECHNOLOGYLEVELREQUEST_ID_FIELD.index = 0
|
||||
WORKTECHNOLOGYLEVELREQUEST_ID_FIELD.label = 1
|
||||
WORKTECHNOLOGYLEVELREQUEST_ID_FIELD.has_default_value = false
|
||||
WORKTECHNOLOGYLEVELREQUEST_ID_FIELD.default_value = 0
|
||||
WORKTECHNOLOGYLEVELREQUEST_ID_FIELD.type = 5
|
||||
WORKTECHNOLOGYLEVELREQUEST_ID_FIELD.cpp_type = 1
|
||||
|
||||
WORKTECHNOLOGYLEVELREQUEST.name = "WorkTechnologyLevelRequest"
|
||||
WORKTECHNOLOGYLEVELREQUEST.full_name = ".com.ljsd.jieling.protocols.WorkTechnologyLevelRequest"
|
||||
WORKTECHNOLOGYLEVELREQUEST.nested_types = {}
|
||||
WORKTECHNOLOGYLEVELREQUEST.enum_types = {}
|
||||
WORKTECHNOLOGYLEVELREQUEST.fields = {WORKTECHNOLOGYLEVELREQUEST_ID_FIELD}
|
||||
WORKTECHNOLOGYLEVELREQUEST.is_extendable = false
|
||||
WORKTECHNOLOGYLEVELREQUEST.extensions = {}
|
||||
ACTIVITEWORKSHOPREQEUST_TYPE_FIELD.name = "type"
|
||||
ACTIVITEWORKSHOPREQEUST_TYPE_FIELD.full_name = ".com.ljsd.jieling.protocols.ActiviteWorkShopReqeust.type"
|
||||
ACTIVITEWORKSHOPREQEUST_TYPE_FIELD.number = 1
|
||||
|
|
@ -736,11 +756,22 @@ GETWORKSHOPINFORESPONSE_UNDETERMINED_FIELD.message_type = CommonProto_pb.EQUIP
|
|||
GETWORKSHOPINFORESPONSE_UNDETERMINED_FIELD.type = 11
|
||||
GETWORKSHOPINFORESPONSE_UNDETERMINED_FIELD.cpp_type = 10
|
||||
|
||||
GETWORKSHOPINFORESPONSE_TECHNOLOGYINFO_FIELD.name = "technologyInfo"
|
||||
GETWORKSHOPINFORESPONSE_TECHNOLOGYINFO_FIELD.full_name = ".com.ljsd.jieling.protocols.GetWorkShopInfoResponse.technologyInfo"
|
||||
GETWORKSHOPINFORESPONSE_TECHNOLOGYINFO_FIELD.number = 4
|
||||
GETWORKSHOPINFORESPONSE_TECHNOLOGYINFO_FIELD.index = 3
|
||||
GETWORKSHOPINFORESPONSE_TECHNOLOGYINFO_FIELD.label = 3
|
||||
GETWORKSHOPINFORESPONSE_TECHNOLOGYINFO_FIELD.has_default_value = false
|
||||
GETWORKSHOPINFORESPONSE_TECHNOLOGYINFO_FIELD.default_value = {}
|
||||
GETWORKSHOPINFORESPONSE_TECHNOLOGYINFO_FIELD.message_type = CommonProto_pb.TECHNOLOGYINFO
|
||||
GETWORKSHOPINFORESPONSE_TECHNOLOGYINFO_FIELD.type = 11
|
||||
GETWORKSHOPINFORESPONSE_TECHNOLOGYINFO_FIELD.cpp_type = 10
|
||||
|
||||
GETWORKSHOPINFORESPONSE.name = "GetWorkShopInfoResponse"
|
||||
GETWORKSHOPINFORESPONSE.full_name = ".com.ljsd.jieling.protocols.GetWorkShopInfoResponse"
|
||||
GETWORKSHOPINFORESPONSE.nested_types = {}
|
||||
GETWORKSHOPINFORESPONSE.enum_types = {}
|
||||
GETWORKSHOPINFORESPONSE.fields = {GETWORKSHOPINFORESPONSE_WORKSHOPUNLOCKINFO_FIELD, GETWORKSHOPINFORESPONSE_WORKSHOPBASEINFO_FIELD, GETWORKSHOPINFORESPONSE_UNDETERMINED_FIELD}
|
||||
GETWORKSHOPINFORESPONSE.fields = {GETWORKSHOPINFORESPONSE_WORKSHOPUNLOCKINFO_FIELD, GETWORKSHOPINFORESPONSE_WORKSHOPBASEINFO_FIELD, GETWORKSHOPINFORESPONSE_UNDETERMINED_FIELD, GETWORKSHOPINFORESPONSE_TECHNOLOGYINFO_FIELD}
|
||||
GETWORKSHOPINFORESPONSE.is_extendable = false
|
||||
GETWORKSHOPINFORESPONSE.extensions = {}
|
||||
COOKFOODREQUEST_MATERIALID_FIELD.name = "materialId"
|
||||
|
|
@ -1826,5 +1857,6 @@ WorkShopFoundationRequest = protobuf.Message(WORKSHOPFOUNDATIONREQUEST)
|
|||
WorkShopRebuildConfirmRequest = protobuf.Message(WORKSHOPREBUILDCONFIRMREQUEST)
|
||||
WorkShopRebuildRequest = protobuf.Message(WORKSHOPREBUILDREQUEST)
|
||||
WorkShopRebuildRespoonse = protobuf.Message(WORKSHOPREBUILDRESPOONSE)
|
||||
WorkTechnologyLevelRequest = protobuf.Message(WORKTECHNOLOGYLEVELREQUEST)
|
||||
sendFriendInfoIndication = protobuf.Message(SENDFRIENDINFOINDICATION)
|
||||
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ local AGENTINFO_FOODBUFFERS_FIELD = protobuf.FieldDescriptor();
|
|||
local AGENTINFO_REVIVETIME_FIELD = protobuf.FieldDescriptor();
|
||||
local AGENTINFO_DIELIST_FIELD = protobuf.FieldDescriptor();
|
||||
local AGENTINFO_KILLLIST_FIELD = protobuf.FieldDescriptor();
|
||||
local AGENTINFO_PATH_FIELD = protobuf.FieldDescriptor();
|
||||
ROOMMATCHREQUEST = protobuf.Descriptor();
|
||||
local ROOMMATCHREQUEST_TYPE_FIELD = protobuf.FieldDescriptor();
|
||||
ROOMMATCHRESPONSE = protobuf.Descriptor();
|
||||
|
|
@ -132,11 +133,21 @@ AGENTINFO_KILLLIST_FIELD.default_value = {}
|
|||
AGENTINFO_KILLLIST_FIELD.type = 5
|
||||
AGENTINFO_KILLLIST_FIELD.cpp_type = 1
|
||||
|
||||
AGENTINFO_PATH_FIELD.name = "path"
|
||||
AGENTINFO_PATH_FIELD.full_name = ".com.ljsd.jieling.protocols.AgentInfo.path"
|
||||
AGENTINFO_PATH_FIELD.number = 10
|
||||
AGENTINFO_PATH_FIELD.index = 9
|
||||
AGENTINFO_PATH_FIELD.label = 3
|
||||
AGENTINFO_PATH_FIELD.has_default_value = false
|
||||
AGENTINFO_PATH_FIELD.default_value = {}
|
||||
AGENTINFO_PATH_FIELD.type = 5
|
||||
AGENTINFO_PATH_FIELD.cpp_type = 1
|
||||
|
||||
AGENTINFO.name = "AgentInfo"
|
||||
AGENTINFO.full_name = ".com.ljsd.jieling.protocols.AgentInfo"
|
||||
AGENTINFO.nested_types = {}
|
||||
AGENTINFO.enum_types = {}
|
||||
AGENTINFO.fields = {AGENTINFO_PLAYERUID_FIELD, AGENTINFO_CURHP_FIELD, AGENTINFO_MAXHP_FIELD, AGENTINFO_CAMP_FIELD, AGENTINFO_CURXY_FIELD, AGENTINFO_FOODBUFFERS_FIELD, AGENTINFO_REVIVETIME_FIELD, AGENTINFO_DIELIST_FIELD, AGENTINFO_KILLLIST_FIELD}
|
||||
AGENTINFO.fields = {AGENTINFO_PLAYERUID_FIELD, AGENTINFO_CURHP_FIELD, AGENTINFO_MAXHP_FIELD, AGENTINFO_CAMP_FIELD, AGENTINFO_CURXY_FIELD, AGENTINFO_FOODBUFFERS_FIELD, AGENTINFO_REVIVETIME_FIELD, AGENTINFO_DIELIST_FIELD, AGENTINFO_KILLLIST_FIELD, AGENTINFO_PATH_FIELD}
|
||||
AGENTINFO.is_extendable = false
|
||||
AGENTINFO.extensions = {}
|
||||
ROOMMATCHREQUEST_TYPE_FIELD.name = "type"
|
||||
|
|
|
|||
|
|
@ -386,3 +386,8 @@ option optimize_for = SPEED;
|
|||
optional int32 endTime = 3; //结束时间
|
||||
}
|
||||
|
||||
message TechnologyInfo{
|
||||
optional int32 techId =1; //科技点
|
||||
optional int32 levle =2;//等级
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -371,6 +371,8 @@ enum MessageType{
|
|||
WORKSHOP_LEVELUP_REQUEST =12208;//工坊升级
|
||||
WORKSHOP_LEVELUP_RESPONSE =12209;
|
||||
|
||||
WORKSHOP_TECHNOLOGY_REQUEST = 12210 ;//科技树升级
|
||||
WORKSHOP_TECHNOLOGY_RESPONSE = 12211;
|
||||
// X 12300
|
||||
// Y 12400
|
||||
// Z 12500
|
||||
|
|
|
|||
|
|
@ -96,6 +96,10 @@ import "CommonProto.proto";
|
|||
optional Equip equip = 1;
|
||||
}
|
||||
|
||||
message WorkTechnologyLevelRequest{
|
||||
optional int32 id = 1;//
|
||||
}
|
||||
|
||||
message ActiviteWorkShopReqeust{
|
||||
optional int32 type =1; //功能类型:1: 基础锻造 2:制作装备 或 制作美食
|
||||
optional int32 activiteId =2; //要激活的功能id
|
||||
|
|
@ -105,6 +109,7 @@ import "CommonProto.proto";
|
|||
repeated WorkShopUnLockInfo workShopUnLockInfo =1; //作坊解锁信息
|
||||
repeated WorkShopBaseInfo workShopBaseInfo =2; //作坊基本信息
|
||||
optional Equip unDetermined =3; //待确认重铸装备
|
||||
repeated TechnologyInfo technologyInfo = 4 ; //科技树点
|
||||
}
|
||||
|
||||
message CookFoodRequest{
|
||||
|
|
|
|||
Loading…
Reference in New Issue