master_huanxiang
parent
b216e2f59d
commit
24f12c58f3
File diff suppressed because it is too large
Load Diff
|
|
@ -51,7 +51,7 @@ HEROINFO_GETHEROINFORESPONSE_HEROLIST_FIELD.index = 0
|
|||
HEROINFO_GETHEROINFORESPONSE_HEROLIST_FIELD.label = 3
|
||||
HEROINFO_GETHEROINFORESPONSE_HEROLIST_FIELD.has_default_value = false
|
||||
HEROINFO_GETHEROINFORESPONSE_HEROLIST_FIELD.default_value = {}
|
||||
HEROINFO_GETHEROINFORESPONSE_HEROLIST_FIELD.message_type = CommonProto_pb.COMMON_HERO
|
||||
HEROINFO_GETHEROINFORESPONSE_HEROLIST_FIELD.message_type = CommonProto_pb.HERO
|
||||
HEROINFO_GETHEROINFORESPONSE_HEROLIST_FIELD.type = 11
|
||||
HEROINFO_GETHEROINFORESPONSE_HEROLIST_FIELD.cpp_type = 10
|
||||
|
||||
|
|
@ -98,7 +98,7 @@ HEROINFO_DRAWHERORESPONSE_HEROLIST_FIELD.index = 0
|
|||
HEROINFO_DRAWHERORESPONSE_HEROLIST_FIELD.label = 3
|
||||
HEROINFO_DRAWHERORESPONSE_HEROLIST_FIELD.has_default_value = false
|
||||
HEROINFO_DRAWHERORESPONSE_HEROLIST_FIELD.default_value = {}
|
||||
HEROINFO_DRAWHERORESPONSE_HEROLIST_FIELD.message_type = CommonProto_pb.COMMON_HERO
|
||||
HEROINFO_DRAWHERORESPONSE_HEROLIST_FIELD.message_type = CommonProto_pb.HERO
|
||||
HEROINFO_DRAWHERORESPONSE_HEROLIST_FIELD.type = 11
|
||||
HEROINFO_DRAWHERORESPONSE_HEROLIST_FIELD.cpp_type = 10
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ MAPINFO_MAPENTERRESPONSE_MAPLIST_FIELD.index = 0
|
|||
MAPINFO_MAPENTERRESPONSE_MAPLIST_FIELD.label = 3
|
||||
MAPINFO_MAPENTERRESPONSE_MAPLIST_FIELD.has_default_value = false
|
||||
MAPINFO_MAPENTERRESPONSE_MAPLIST_FIELD.default_value = {}
|
||||
MAPINFO_MAPENTERRESPONSE_MAPLIST_FIELD.message_type = CommonProto_pb.COMMON_CELL
|
||||
MAPINFO_MAPENTERRESPONSE_MAPLIST_FIELD.message_type = CommonProto_pb.CELL
|
||||
MAPINFO_MAPENTERRESPONSE_MAPLIST_FIELD.type = 11
|
||||
MAPINFO_MAPENTERRESPONSE_MAPLIST_FIELD.cpp_type = 10
|
||||
|
||||
|
|
|
|||
|
|
@ -12,10 +12,6 @@ local PLAYERINFO_LOGINREQUEST_STR_FIELD = protobuf.FieldDescriptor();
|
|||
PLAYERINFO_LOGINRESPONSE = protobuf.Descriptor();
|
||||
local PLAYERINFO_LOGINRESPONSE_RESULTCODE_FIELD = protobuf.FieldDescriptor();
|
||||
local PLAYERINFO_LOGINRESPONSE_NEWTOKEN_FIELD = protobuf.FieldDescriptor();
|
||||
local PLAYERINFO_LOGINRESPONSE_TEST_FIELD = protobuf.FieldDescriptor();
|
||||
PLAYERINFO_TEST = protobuf.Descriptor();
|
||||
local PLAYERINFO_TEST_RESULTCODE_FIELD = protobuf.FieldDescriptor();
|
||||
local PLAYERINFO_TEST_NEWTOKEN_FIELD = protobuf.FieldDescriptor();
|
||||
PLAYERINFO_GETPLAYERINFOREQUEST = protobuf.Descriptor();
|
||||
local PLAYERINFO_GETPLAYERINFOREQUEST_NUM_FIELD = protobuf.FieldDescriptor();
|
||||
local PLAYERINFO_GETPLAYERINFOREQUEST_STR_FIELD = protobuf.FieldDescriptor();
|
||||
|
|
@ -85,53 +81,14 @@ PLAYERINFO_LOGINRESPONSE_NEWTOKEN_FIELD.default_value = ""
|
|||
PLAYERINFO_LOGINRESPONSE_NEWTOKEN_FIELD.type = 9
|
||||
PLAYERINFO_LOGINRESPONSE_NEWTOKEN_FIELD.cpp_type = 9
|
||||
|
||||
PLAYERINFO_LOGINRESPONSE_TEST_FIELD.name = "test"
|
||||
PLAYERINFO_LOGINRESPONSE_TEST_FIELD.full_name = ".com.ljsd.jieling.protocols.PlayerInfo.LoginResponse.test"
|
||||
PLAYERINFO_LOGINRESPONSE_TEST_FIELD.number = 3
|
||||
PLAYERINFO_LOGINRESPONSE_TEST_FIELD.index = 2
|
||||
PLAYERINFO_LOGINRESPONSE_TEST_FIELD.label = 3
|
||||
PLAYERINFO_LOGINRESPONSE_TEST_FIELD.has_default_value = false
|
||||
PLAYERINFO_LOGINRESPONSE_TEST_FIELD.default_value = {}
|
||||
PLAYERINFO_LOGINRESPONSE_TEST_FIELD.message_type = _PLAYERINFO_TEST
|
||||
PLAYERINFO_LOGINRESPONSE_TEST_FIELD.type = 11
|
||||
PLAYERINFO_LOGINRESPONSE_TEST_FIELD.cpp_type = 10
|
||||
|
||||
PLAYERINFO_LOGINRESPONSE.name = "LoginResponse"
|
||||
PLAYERINFO_LOGINRESPONSE.full_name = ".com.ljsd.jieling.protocols.PlayerInfo.LoginResponse"
|
||||
PLAYERINFO_LOGINRESPONSE.nested_types = {}
|
||||
PLAYERINFO_LOGINRESPONSE.enum_types = {}
|
||||
PLAYERINFO_LOGINRESPONSE.fields = {PLAYERINFO_LOGINRESPONSE_RESULTCODE_FIELD, PLAYERINFO_LOGINRESPONSE_NEWTOKEN_FIELD, PLAYERINFO_LOGINRESPONSE_TEST_FIELD}
|
||||
PLAYERINFO_LOGINRESPONSE.fields = {PLAYERINFO_LOGINRESPONSE_RESULTCODE_FIELD, PLAYERINFO_LOGINRESPONSE_NEWTOKEN_FIELD}
|
||||
PLAYERINFO_LOGINRESPONSE.is_extendable = false
|
||||
PLAYERINFO_LOGINRESPONSE.extensions = {}
|
||||
PLAYERINFO_LOGINRESPONSE.containing_type = PLAYERINFO
|
||||
PLAYERINFO_TEST_RESULTCODE_FIELD.name = "resultCode"
|
||||
PLAYERINFO_TEST_RESULTCODE_FIELD.full_name = ".com.ljsd.jieling.protocols.PlayerInfo.Test.resultCode"
|
||||
PLAYERINFO_TEST_RESULTCODE_FIELD.number = 1
|
||||
PLAYERINFO_TEST_RESULTCODE_FIELD.index = 0
|
||||
PLAYERINFO_TEST_RESULTCODE_FIELD.label = 1
|
||||
PLAYERINFO_TEST_RESULTCODE_FIELD.has_default_value = false
|
||||
PLAYERINFO_TEST_RESULTCODE_FIELD.default_value = 0
|
||||
PLAYERINFO_TEST_RESULTCODE_FIELD.type = 5
|
||||
PLAYERINFO_TEST_RESULTCODE_FIELD.cpp_type = 1
|
||||
|
||||
PLAYERINFO_TEST_NEWTOKEN_FIELD.name = "newToken"
|
||||
PLAYERINFO_TEST_NEWTOKEN_FIELD.full_name = ".com.ljsd.jieling.protocols.PlayerInfo.Test.newToken"
|
||||
PLAYERINFO_TEST_NEWTOKEN_FIELD.number = 2
|
||||
PLAYERINFO_TEST_NEWTOKEN_FIELD.index = 1
|
||||
PLAYERINFO_TEST_NEWTOKEN_FIELD.label = 1
|
||||
PLAYERINFO_TEST_NEWTOKEN_FIELD.has_default_value = false
|
||||
PLAYERINFO_TEST_NEWTOKEN_FIELD.default_value = ""
|
||||
PLAYERINFO_TEST_NEWTOKEN_FIELD.type = 9
|
||||
PLAYERINFO_TEST_NEWTOKEN_FIELD.cpp_type = 9
|
||||
|
||||
PLAYERINFO_TEST.name = "Test"
|
||||
PLAYERINFO_TEST.full_name = ".com.ljsd.jieling.protocols.PlayerInfo.Test"
|
||||
PLAYERINFO_TEST.nested_types = {}
|
||||
PLAYERINFO_TEST.enum_types = {}
|
||||
PLAYERINFO_TEST.fields = {PLAYERINFO_TEST_RESULTCODE_FIELD, PLAYERINFO_TEST_NEWTOKEN_FIELD}
|
||||
PLAYERINFO_TEST.is_extendable = false
|
||||
PLAYERINFO_TEST.extensions = {}
|
||||
PLAYERINFO_TEST.containing_type = PLAYERINFO
|
||||
PLAYERINFO_GETPLAYERINFOREQUEST_NUM_FIELD.name = "num"
|
||||
PLAYERINFO_GETPLAYERINFOREQUEST_NUM_FIELD.full_name = ".com.ljsd.jieling.protocols.PlayerInfo.GetPlayerInfoRequest.num"
|
||||
PLAYERINFO_GETPLAYERINFOREQUEST_NUM_FIELD.number = 1
|
||||
|
|
@ -167,7 +124,7 @@ PLAYERINFO_GETPLAYERINFORESPONSE_PLAYER_FIELD.index = 0
|
|||
PLAYERINFO_GETPLAYERINFORESPONSE_PLAYER_FIELD.label = 1
|
||||
PLAYERINFO_GETPLAYERINFORESPONSE_PLAYER_FIELD.has_default_value = false
|
||||
PLAYERINFO_GETPLAYERINFORESPONSE_PLAYER_FIELD.default_value = nil
|
||||
PLAYERINFO_GETPLAYERINFORESPONSE_PLAYER_FIELD.message_type = CommonProto_pb.COMMON_PLAYER
|
||||
PLAYERINFO_GETPLAYERINFORESPONSE_PLAYER_FIELD.message_type = CommonProto_pb.PLAYER
|
||||
PLAYERINFO_GETPLAYERINFORESPONSE_PLAYER_FIELD.type = 11
|
||||
PLAYERINFO_GETPLAYERINFORESPONSE_PLAYER_FIELD.cpp_type = 10
|
||||
|
||||
|
|
@ -214,7 +171,7 @@ PLAYERINFO_GETITEMINFORESPONSE_ITEMLIST_FIELD.index = 0
|
|||
PLAYERINFO_GETITEMINFORESPONSE_ITEMLIST_FIELD.label = 3
|
||||
PLAYERINFO_GETITEMINFORESPONSE_ITEMLIST_FIELD.has_default_value = false
|
||||
PLAYERINFO_GETITEMINFORESPONSE_ITEMLIST_FIELD.default_value = {}
|
||||
PLAYERINFO_GETITEMINFORESPONSE_ITEMLIST_FIELD.message_type = CommonProto_pb.COMMON_ITEM
|
||||
PLAYERINFO_GETITEMINFORESPONSE_ITEMLIST_FIELD.message_type = CommonProto_pb.ITEM
|
||||
PLAYERINFO_GETITEMINFORESPONSE_ITEMLIST_FIELD.type = 11
|
||||
PLAYERINFO_GETITEMINFORESPONSE_ITEMLIST_FIELD.cpp_type = 10
|
||||
|
||||
|
|
@ -228,7 +185,7 @@ PLAYERINFO_GETITEMINFORESPONSE.extensions = {}
|
|||
PLAYERINFO_GETITEMINFORESPONSE.containing_type = PLAYERINFO
|
||||
PLAYERINFO.name = "PlayerInfo"
|
||||
PLAYERINFO.full_name = ".com.ljsd.jieling.protocols.PlayerInfo"
|
||||
PLAYERINFO.nested_types = {PLAYERINFO_LOGINREQUEST, PLAYERINFO_LOGINRESPONSE, PLAYERINFO_TEST, PLAYERINFO_GETPLAYERINFOREQUEST, PLAYERINFO_GETPLAYERINFORESPONSE, PLAYERINFO_GETITEMINFOREQUEST, PLAYERINFO_GETITEMINFORESPONSE}
|
||||
PLAYERINFO.nested_types = {PLAYERINFO_LOGINREQUEST, PLAYERINFO_LOGINRESPONSE, PLAYERINFO_GETPLAYERINFOREQUEST, PLAYERINFO_GETPLAYERINFORESPONSE, PLAYERINFO_GETITEMINFOREQUEST, PLAYERINFO_GETITEMINFORESPONSE}
|
||||
PLAYERINFO.enum_types = {}
|
||||
PLAYERINFO.fields = {}
|
||||
PLAYERINFO.is_extendable = false
|
||||
|
|
@ -241,5 +198,4 @@ PlayerInfo.GetPlayerInfoRequest = protobuf.Message(PLAYERINFO_GETPLAYERINFOREQUE
|
|||
PlayerInfo.GetPlayerInfoResponse = protobuf.Message(PLAYERINFO_GETPLAYERINFORESPONSE)
|
||||
PlayerInfo.LoginRequest = protobuf.Message(PLAYERINFO_LOGINREQUEST)
|
||||
PlayerInfo.LoginResponse = protobuf.Message(PLAYERINFO_LOGINRESPONSE)
|
||||
PlayerInfo.Test = protobuf.Message(PLAYERINFO_TEST)
|
||||
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@ package com.ljsd.jieling.protocols;
|
|||
|
||||
option optimize_for = SPEED;
|
||||
|
||||
message Common{
|
||||
|
||||
message Player{
|
||||
optional int32 uid = 1;
|
||||
optional string nickName = 2;
|
||||
|
|
@ -23,7 +21,6 @@ message Common{
|
|||
optional int32 itemId = 1;
|
||||
optional int32 itemNum = 2;
|
||||
optional int32 endingTime = 3;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -94,4 +91,3 @@ message Common{
|
|||
optional string id = 1;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ message HeroInfo{
|
|||
}
|
||||
|
||||
message GetHeroInfoResponse{
|
||||
repeated Common.Hero heroList = 1;
|
||||
repeated Hero heroList = 1;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ message HeroInfo{
|
|||
}
|
||||
|
||||
message DrawHeroResponse{
|
||||
repeated Common.Hero heroList = 1;
|
||||
repeated Hero heroList = 1;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ message MapInfo{
|
|||
}
|
||||
message MapEnterResponse{
|
||||
// 地图信息
|
||||
repeated Common.Cell mapList = 1;
|
||||
repeated Cell mapList = 1;
|
||||
// 当前所在坐标
|
||||
optional int32 curXY = 2;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ message PlayerInfo{
|
|||
}
|
||||
|
||||
message GetPlayerInfoResponse{
|
||||
optional Common.Player player = 1;
|
||||
optional Player player = 1;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -37,6 +37,7 @@ message PlayerInfo{
|
|||
}
|
||||
|
||||
message GetItemInfoResponse{
|
||||
repeated Common.Item itemlist = 1;
|
||||
repeated Item itemlist = 1;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ module "containers"
|
|||
|
||||
local _RCFC_meta = {
|
||||
add = function(self)
|
||||
local value = self._(message_descriptor._concrete_class and message_descriptor._concrete_class()) or message_descriptor()
|
||||
local value = self._message_descriptor._concrete_class()
|
||||
local listener = self._listener
|
||||
rawset(self, #self + 1, value)
|
||||
value:_SetListener(listener)
|
||||
|
|
|
|||
|
|
@ -285,7 +285,7 @@ local function _DefaultValueConstructorForField(field)
|
|||
if field.cpp_type == FieldDescriptor.CPPTYPE_MESSAGE then
|
||||
local message_type = field.message_type
|
||||
return function (message)
|
||||
result = (message_type._concrete_class and message_type._concrete_class()) or message_type()
|
||||
result = message_type._concrete_class()
|
||||
result._SetListener(message._listener_for_children)
|
||||
return result
|
||||
end
|
||||
|
|
@ -360,7 +360,7 @@ local function _AddPropertiesForNonRepeatedCompositeField(field, message_meta)
|
|||
message_meta._getter[property_name] = function(self)
|
||||
local field_value = self._fields[field]
|
||||
if field_value == nil then
|
||||
field_value = (message_type._concrete_class and message_type._concrete_class()) or message_type()
|
||||
field_value = message_type._concrete_class()
|
||||
field_value:_SetListener(self._listener_for_children)
|
||||
|
||||
self._fields[field] = field_value
|
||||
|
|
|
|||
Loading…
Reference in New Issue