From 66c4e348d754e44bf23d4ff7cf28f3a6fa9afd48 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 26 Mar 2019 15:29:46 +0800
Subject: [PATCH] 1

---
 server/gameserver/metamgr.cc            | 11 +++++++
 server/tools/protobuild/metatable.proto | 43 +++++++++++++++++++++++++
 third_party/a8engine                    |  2 +-
 third_party/framework                   |  2 +-
 4 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/server/gameserver/metamgr.cc b/server/gameserver/metamgr.cc
index 5728168..d0becaf 100755
--- a/server/gameserver/metamgr.cc
+++ b/server/gameserver/metamgr.cc
@@ -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();
     }
 
diff --git a/server/tools/protobuild/metatable.proto b/server/tools/protobuild/metatable.proto
index add71a3..0972d4f 100755
--- a/server/tools/protobuild/metatable.proto
+++ b/server/tools/protobuild/metatable.proto
@@ -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;
+}
diff --git a/third_party/a8engine b/third_party/a8engine
index 923b076..64b7d5a 160000
--- a/third_party/a8engine
+++ b/third_party/a8engine
@@ -1 +1 @@
-Subproject commit 923b076d57a0ee4bdf0e15624e7f4595c8b2fb42
+Subproject commit 64b7d5ad265e7b290b425d154be541bb982762ee
diff --git a/third_party/framework b/third_party/framework
index fad58e9..1da2c3a 160000
--- a/third_party/framework
+++ b/third_party/framework
@@ -1 +1 @@
-Subproject commit fad58e97072e988e9e0209a1adbaf1e3810c0b7f
+Subproject commit 1da2c3aac5ab8d55d58e0d696b9143956221565b