server/game2001
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2019-03-26 16:37:14 +08:00
parent c5cdc0a954
commit 8d354d2ad2
5 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/gameserver/metamgr.cc
View File

@ -24,6 +24,7 @@ public:
std::list<MetaData::Player> player_list;
std::list<metatable::MapThing> mapthing_meta_list;
std::list<MetaData::MapThing> mapthing_list;
std::list<metatable::BuildingJson> building_meta_list;
std::map<std::string, MetaData::Parameter*> parameter_hash;
std::map<int, MetaData::Map*> gamemap_hash;
@ -50,17 +51,7 @@ public:
f8::ReadCsvMetaFile(res_path + "player@player.csv", player_meta_list);
f8::ReadCsvMetaFile(res_path + "player@player.csv", player_meta_list);
f8::ReadCsvMetaFile(res_path + "mapThing@mapThing.csv", mapthing_meta_list);
#if 1
{
metatable::BuildingJson building_json;
f8::ReadJsonMetaFile(res_path + "maps.json", &building_json,
[&building_json] (google::protobuf::Message* msg)
{
building_json.CopyFrom(*msg);
});
int i = 0;
}
#endif
f8::ReadJsonMetaFile(res_path + "maps.json", building_meta_list);
BindToMetaData();
}

5
server/tools/protobuild/cs_proto.proto
View File

@ -172,11 +172,6 @@ message MFObstacleFull
optional int32 door_relative_ori = 10; //
optional bool door_can_use = 11; //
optional int32 door_seq = 12;
optional bool is_button = 15;
optional bool button_onoff = 16;
optional bool button_can_use = 17;
optional int32 button_seq = 18;
}
//建筑物-部分

2
server/tools/protobuild/metatable.proto
View File

@ -17,7 +17,7 @@ message MapThing
{
optional int32 thing_id = 1; //物件id
optional int32 type = 2; //类型
optional int32 hight = 3; //高度
optional int32 height = 3; //高度
optional int32 width = 4; //宽度
optional int32 hp = 5; //生命
optional float damage = 6; //伤害

2
third_party/a8engine vendored

@ -1 +1 @@
Subproject commit 64b7d5ad265e7b290b425d154be541bb982762ee
Subproject commit ec92ae9234f30150e6c73307603511860fe6eb2d

2
third_party/framework vendored

@ -1 +1 @@
Subproject commit 1da2c3aac5ab8d55d58e0d696b9143956221565b
Subproject commit 4e612f46cedb1723496662ddeb32c174944041b4