server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2023-05-25 19:47:13 +08:00
parent 352121bda8
commit 0f31e94d48
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/incubator.cc
View File

@ -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

5
server/gameserver/mtb/Hero.h
View File

@ -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__;
};
};

3
server/gameserver/mtb/mtb.all.cc
View File

@ -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;
}

2
server/tools/protobuild/mt.proto
View File

@ -265,6 +265,8 @@ message Hero
optional float defence_ratio = 65;
optional string bt = 70;
optional string drop = 71;
}
message Robot