From 356534153c80ea4c394d88a5cf62fdd65775b0c2 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 4 Mar 2021 14:45:27 +0800
Subject: [PATCH] 1

---
 server/gameserver/car.h                 | 6 ++++++
 server/gameserver/metadata.cc           | 4 ++++
 server/gameserver/metadata.h            | 2 ++
 server/tools/protobuild/metatable.proto | 1 +
 4 files changed, 13 insertions(+)

diff --git a/server/gameserver/car.h b/server/gameserver/car.h
index 05b199f..8c9a7c8 100644
--- a/server/gameserver/car.h
+++ b/server/gameserver/car.h
@@ -4,11 +4,17 @@
 
 #include "cs_proto.pb.h"
 
+namespace MetaData
+{
+    struct Equip;
+}
+
 class Human;
 class Room;
 class Car : public MoveableEntity
 {
  public:
+    MetaData::Equip* meta = nullptr;
 
     Car();
     virtual ~Car() override;
diff --git a/server/gameserver/metadata.cc b/server/gameserver/metadata.cc
index d935c7a..3afbc53 100644
--- a/server/gameserver/metadata.cc
+++ b/server/gameserver/metadata.cc
@@ -136,6 +136,10 @@ namespace MetaData
             int_param1 = a8::XValue(i->param1());
             float_param1 = a8::XValue(i->param1()).GetDouble();
         }
+        {
+            int_param2 = a8::XValue(i->param2());
+            float_param2 = a8::XValue(i->param2()).GetDouble();
+        }
     }
 
     void EquipUpgrade::Init()
diff --git a/server/gameserver/metadata.h b/server/gameserver/metadata.h
index 3f3a020..a865b6d 100755
--- a/server/gameserver/metadata.h
+++ b/server/gameserver/metadata.h
@@ -61,6 +61,8 @@ namespace MetaData
         std::array<int, IS_END> volume = {};
         int int_param1 = 0;
 	float float_param1 = 0;
+        int int_param2 = 0;
+	float float_param2 = 0;
 
         void Init();
     };
diff --git a/server/tools/protobuild/metatable.proto b/server/tools/protobuild/metatable.proto
index 90e5c59..aec1e56 100755
--- a/server/tools/protobuild/metatable.proto
+++ b/server/tools/protobuild/metatable.proto
@@ -100,6 +100,7 @@ message Equip
     optional int32 drop_id = 40;
     optional int32 explosion_effect = 42;
     optional string param1 = 43;
+    optional string param2 = 44;
     optional int32 reloadtype = 46;
 
     optional string inventory_slot = 31; //库存槽位