From 0f31e94d48c18635228a66a2070d423f4dffa75b Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 25 May 2023 19:47:13 +0800
Subject: [PATCH] 1

---
 server/gameserver/incubator.cc   | 4 ++++
 server/gameserver/mtb/Hero.h     | 5 ++++-
 server/gameserver/mtb/mtb.all.cc | 3 ++-
 server/tools/protobuild/mt.proto | 2 ++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/server/gameserver/incubator.cc b/server/gameserver/incubator.cc
index 422263c5..172eb482 100644
--- a/server/gameserver/incubator.cc
+++ b/server/gameserver/incubator.cc
@@ -20,7 +20,11 @@
 
 void Incubator::Init()
 {
+    #if 1
+    wait_alloc_time_ = room->GetGasInactiveTime() + 0 + mt::Param::s().wait_cloud_time;
+    #else
     wait_alloc_time_ = room->GetGasInactiveTime() + 50 + mt::Param::s().wait_cloud_time;
+    #endif
     xtimer_attacher_.SetOwner(&room->xtimer);
     if (!room->IsPveRoom()) {
         room->xtimer.SetTimeoutEx
diff --git a/server/gameserver/mtb/Hero.h b/server/gameserver/mtb/Hero.h
index 72c2dde9..8581fa91 100644
--- a/server/gameserver/mtb/Hero.h
+++ b/server/gameserver/mtb/Hero.h
@@ -31,6 +31,7 @@ namespace mtb
     const std::string init_buffs() const { return init_buffs_; };
     int default_weapon() const { return default_weapon_; };
     const std::string dead_drop() const { return dead_drop_; };
+    const std::string drop() const { return drop_; };
     int delay_delete() const { return delay_delete_; };
     int ai() const { return ai_; };
     int delay_remove() const { return delay_remove_; };
@@ -93,6 +94,7 @@ namespace mtb
     bool has_damage_ratio() const { return __flags__.test(38);};
     bool has_defence_ratio() const { return __flags__.test(39);};
     bool has_bt() const { return __flags__.test(40);};
+    bool has_drop() const { return __flags__.test(41);};
 
   protected:
 
@@ -137,9 +139,10 @@ namespace mtb
     float damage_ratio_ = 0.0f;
     float defence_ratio_ = 0.0f;
     std::string bt_;
+    std::string drop_;
 
 public:
-    std::bitset<41> __flags__;
+    std::bitset<42> __flags__;
   };
 
 };
diff --git a/server/gameserver/mtb/mtb.all.cc b/server/gameserver/mtb/mtb.all.cc
index c0510403..aae39616 100644
--- a/server/gameserver/mtb/mtb.all.cc
+++ b/server/gameserver/mtb/mtb.all.cc
@@ -302,7 +302,7 @@ namespace mtb
     {
       a8::reflect::Class* meta_class = nullptr;
       if (!meta_class) {
-        meta_class = new a8::reflect::Class("Hero", 41, 0);
+        meta_class = new a8::reflect::Class("Hero", 42, 0);
         meta_class->SetSimpleField(0, "id", a8::reflect::ET_INT32, my_offsetof2(Hero, id_));
         meta_class->SetSimpleField(1, "radius", a8::reflect::ET_FLOAT, my_offsetof2(Hero, radius_));
         meta_class->SetSimpleField(2, "move_speed", a8::reflect::ET_FLOAT, my_offsetof2(Hero, move_speed_));
@@ -344,6 +344,7 @@ namespace mtb
         meta_class->SetSimpleField(38, "damage_ratio", a8::reflect::ET_FLOAT, my_offsetof2(Hero, damage_ratio_));
         meta_class->SetSimpleField(39, "defence_ratio", a8::reflect::ET_FLOAT, my_offsetof2(Hero, defence_ratio_));
         meta_class->SetSimpleField(40, "bt", a8::reflect::ET_STRING, my_offsetof2(Hero, bt_));
+        meta_class->SetSimpleField(41, "drop", a8::reflect::ET_STRING, my_offsetof2(Hero, drop_));
       }
       return meta_class;
     }
diff --git a/server/tools/protobuild/mt.proto b/server/tools/protobuild/mt.proto
index caa79032..592c3d5e 100755
--- a/server/tools/protobuild/mt.proto
+++ b/server/tools/protobuild/mt.proto
@@ -265,6 +265,8 @@ message Hero
     optional float defence_ratio = 65;
 
     optional string bt = 70;
+
+    optional string drop = 71;
 }
 
 message Robot