From a24e7d1680b744298cc41d102ea69fb452b7a60f Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 29 Jul 2024 16:28:37 +0800
Subject: [PATCH] 1

---
 server/gameserver/constant.h           |  2 ++
 server/gameserver/creature.h           |  1 +
 server/gameserver/room.cc              | 12 ++++++++++++
 server/gameserver/room.h               |  4 ++++
 server/tools/protobuild/cs_proto.proto |  4 ++++
 5 files changed, 23 insertions(+)

diff --git a/server/gameserver/constant.h b/server/gameserver/constant.h
index c0615f03..b9d942e0 100644
--- a/server/gameserver/constant.h
+++ b/server/gameserver/constant.h
@@ -281,6 +281,8 @@ enum PropertyType_e
 
     kPropLevelExp = 55,
     kPropLevelUp = 56,
+
+    kPropBoxNum = 57,
 };
 
 enum SkinSlot_e
diff --git a/server/gameserver/creature.h b/server/gameserver/creature.h
index 1a23176a..370c71fe 100644
--- a/server/gameserver/creature.h
+++ b/server/gameserver/creature.h
@@ -99,6 +99,7 @@ class Creature : public MoveableEntity
     int max_armor_shield = 0;
     int revive_count = 0;
     CreatureWeakPtr master;
+    int box_num;
 
     Weapon second_weapon;
     glm::vec3 skill_pos;
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 66d46b4e..08c527f1 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -4270,3 +4270,15 @@ void Room::MobaOver()
         OnGameOver();
     }
 }
+
+int Room::GetMaxBoxNum()
+{
+    return max_box_num_;
+}
+
+void Room::SetMaxBoxNum(int box_num)
+{
+    if (box_num > 0) {
+        max_box_num_ = box_num;
+    }
+}
diff --git a/server/gameserver/room.h b/server/gameserver/room.h
index 6d7d4b6d..6dff8203 100644
--- a/server/gameserver/room.h
+++ b/server/gameserver/room.h
@@ -305,6 +305,8 @@ public:
     void CalcMvp();
     long long GetMobaOvertimeRaceFrameNo () { return moba_overtime_race_frameno_; }
     void MobaOver();
+    int GetMaxBoxNum();
+    void SetMaxBoxNum(int box_num);
 
     std::shared_ptr<InGameVoice> GetInGameVoice() { return ingame_voice_; }
 
@@ -473,6 +475,8 @@ private:
 
     std::shared_ptr<InGameVoice> ingame_voice_;
 
+    int max_box_num_ = 0;
+
     friend class Incubator;
     friend class Team;
 };
diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto
index 1ac6f624..981539ee 100755
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -250,6 +250,9 @@ message MFVec3
      property_subtype: 对象uniid
      value: 老等级
      value2: 新等级
+  property_type: 57 宝箱数量
+     property_subtype: 对象uniid
+     value: 宝箱数量
 */
 message MFPropertyChg
 {
@@ -411,6 +414,7 @@ message MFPlayerFull
     optional int32 armor_shield = 73; //护甲
     optional int32 max_armor_shield = 74; //最大护甲
 
+    optional int32 box_num = 75; //宝箱数量
 }
 
 //阻挡物-部分