This commit is contained in:
aozhiwei 2019-03-26 15:29:46 +08:00
parent cc17cbdeca
commit 66c4e348d7
4 changed files with 56 additions and 2 deletions

View File

@ -50,6 +50,17 @@ 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
BindToMetaData();
}

View File

@ -77,3 +77,46 @@ message Skill
{
optional int32 skill_id = 1; //id
}
message DoorObjJson
{
optional float height = 1;
optional float width = 2;
optional float x = 3;
optional float y = 4;
optional int32 type = 5;
optional int32 id = 6;
}
message DropObjJson
{
optional float x = 1;
optional float y = 2;
optional int32 id = 3;
}
message StaticObjJson
{
optional float x = 1;
optional float y = 2;
optional float height = 3;
optional float width = 4;
}
message LootObjJson
{
optional float x = 1;
optional float y = 2;
optional int32 id = 3;
}
message BuildingJson
{
optional int32 id = 1;
optional float tileheight = 2;
optional float tilewidth = 3;
repeated DoorObjJson doorObj = 4;
repeated DropObjJson dropObj = 5;
repeated StaticObjJson staticObj = 6;
repeated LootObjJson lootObj = 7;
}

@ -1 +1 @@
Subproject commit 923b076d57a0ee4bdf0e15624e7f4595c8b2fb42
Subproject commit 64b7d5ad265e7b290b425d154be541bb982762ee

@ -1 +1 @@
Subproject commit fad58e97072e988e9e0209a1adbaf1e3810c0b7f
Subproject commit 1da2c3aac5ab8d55d58e0d696b9143956221565b