From 58a28ac44ca8b95d7d2ca74e3b46ab913cec2da5 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 18 May 2023 16:28:00 +0800
Subject: [PATCH] 1

---
 server/gameserver/mt/MergeItem.cc | 6 ++++++
 server/gameserver/mt/MergeItem.h  | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/server/gameserver/mt/MergeItem.cc b/server/gameserver/mt/MergeItem.cc
index 9b58fbc8..2d9a65d2 100644
--- a/server/gameserver/mt/MergeItem.cc
+++ b/server/gameserver/mt/MergeItem.cc
@@ -3,6 +3,7 @@
 #include "mt/MergeItem.h"
 
 IMPL_TABLE(mt::MergeItem)
+std::map<int, std::set<int>> mt::MergeItem::gun_num_buff_hash_;
 
 namespace mt
 {
@@ -11,4 +12,9 @@ namespace mt
     {
     }
 
+    std::set<int>* GetBuffs(int gun_id, int num)
+    {
+        return nullptr;
+    }
+
 }
diff --git a/server/gameserver/mt/MergeItem.h b/server/gameserver/mt/MergeItem.h
index 9eea4895..dccec10f 100644
--- a/server/gameserver/mt/MergeItem.h
+++ b/server/gameserver/mt/MergeItem.h
@@ -13,7 +13,14 @@ namespace mt
 
         void Init1();
 
+        static std::set<int>* GetBuffs(int gun_id, int num);
+
     private:
+        static std::map<int, std::set<int>> gun_num_buff_hash_;
+
+        std::set<int> _add_buff_list;
+        std::set<int> _remove_buff_list;
+
      };
 
 }