From 8d354d2ad22e1ca3395b383b4f399510f9145464 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Tue, 26 Mar 2019 16:37:14 +0800
Subject: [PATCH] 1

---
 server/gameserver/metamgr.cc            | 13 ++-----------
 server/tools/protobuild/cs_proto.proto  |  5 -----
 server/tools/protobuild/metatable.proto |  2 +-
 third_party/a8engine                    |  2 +-
 third_party/framework                   |  2 +-
 5 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/server/gameserver/metamgr.cc b/server/gameserver/metamgr.cc
index d0becaf..201a510 100755
--- a/server/gameserver/metamgr.cc
+++ b/server/gameserver/metamgr.cc
@@ -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();
     }
 
diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto
index 00740a7..9a44bc7 100755
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -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;
 }
 
 //建筑物-部分
diff --git a/server/tools/protobuild/metatable.proto b/server/tools/protobuild/metatable.proto
index 0972d4f..4b74419 100755
--- a/server/tools/protobuild/metatable.proto
+++ b/server/tools/protobuild/metatable.proto
@@ -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; //伤害
diff --git a/third_party/a8engine b/third_party/a8engine
index 64b7d5a..ec92ae9 160000
--- a/third_party/a8engine
+++ b/third_party/a8engine
@@ -1 +1 @@
-Subproject commit 64b7d5ad265e7b290b425d154be541bb982762ee
+Subproject commit ec92ae9234f30150e6c73307603511860fe6eb2d
diff --git a/third_party/framework b/third_party/framework
index 1da2c3a..4e612f4 160000
--- a/third_party/framework
+++ b/third_party/framework
@@ -1 +1 @@
-Subproject commit 1da2c3aac5ab8d55d58e0d696b9143956221565b
+Subproject commit 4e612f46cedb1723496662ddeb32c174944041b4