From a5db73ab7cf53acc04c59f4a1ab81fb0db31e083 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 23 Jan 2024 14:31:11 +0800
Subject: [PATCH] 1

---
 server/gameserver/constant.h           | 3 ++-
 server/gameserver/mt/Map.cc            | 9 +++++++++
 server/gameserver/room.cc              | 1 +
 server/tools/protobuild/cs_proto.proto | 1 +
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/server/gameserver/constant.h b/server/gameserver/constant.h
index d5506ed9..ea9c87a5 100644
--- a/server/gameserver/constant.h
+++ b/server/gameserver/constant.h
@@ -498,7 +498,8 @@ A8_DECLARE_ENUM(WorldObjectType_e,
                 kLootType = 1,
                 kBoxType = 2,
                 kCarType = 3,
-                kBornPointType = 4
+                kBornPointType = 4,
+                kMonsterType = 5,
                 );
 
 enum SwitchTimesType_e
diff --git a/server/gameserver/mt/Map.cc b/server/gameserver/mt/Map.cc
index a13b6900..2e30ff6f 100644
--- a/server/gameserver/mt/Map.cc
+++ b/server/gameserver/mt/Map.cc
@@ -66,6 +66,15 @@ static void LoadWorldObjects(const std::string& world_object_file,
                 world_objects.push_back(obj);
             }
         }
+        {
+            auto thing = root.At("monster");
+            for (int i = 0; i < thing->Size(); ++i) {
+                auto obj = std::make_shared<mt::WorldObject>();
+                obj->object_type = WorldObjectType_e::kMonsterType;
+                parse_func(thing->At(i), obj);
+                world_objects.push_back(obj);
+            }
+        }
         {
             auto thing = root.At("human");
             for (int i = 0; i < thing->Size(); ++i) {
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index eabf95fd..5701c0ac 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -3220,6 +3220,7 @@ void Room::CreateWorldObjects()
             break;
         default:
             {
+                abort();
             }
             break;
         }
diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto
index e774dde9..f4430f1e 100755
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -1306,6 +1306,7 @@ message MFSettlementNew
     optional string battle_uuid = 11; //本次战斗唯一id
     optional int32 settlement_status = 12; //0: 结算中(读取个人结算数据) 1：已结算(请求小胡接口)
     optional int32 custom_battle = 13; //是否自定义房间
+    optional string box_payload = 14; //请求宝箱透传数据(空则不需要请求,客户端需做容错判断改字段是否存在(小胡那边不会传这个字段))
 
     optional int32 pvp_settlement_type = 101; //結算類型0:個人 1:組隊（保留）
     optional int32 pvp_settlement_color = 102; // 0：灰 1：黃