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 2022-11-21 15:17:16 +08:00
parent 85fa3e272c
commit 887454e786
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/bullet.cc
View File

@ -258,6 +258,7 @@ void Bullet::ProcBomb()
} }
#if 1 #if 1
AddGunBuff(); AddGunBuff();
ProcSmokeBomb();
#else #else
a8::Vec2 bomb_pos = GetPos(); a8::Vec2 bomb_pos = GetPos();
float time_addition = 0; float time_addition = 0;
@ -265,7 +266,6 @@ void Bullet::ProcBomb()
time_addition += sender.Get()->GetAbility()->GetAttrAbs(kHAT_WeaponExplosionContinueTime); time_addition += sender.Get()->GetAbility()->GetAttrAbs(kHAT_WeaponExplosionContinueTime);
} }
room->frame_event.AddSmoke(this, meta->i->id(), bomb_pos, time_addition); room->frame_event.AddSmoke(this, meta->i->id(), bomb_pos, time_addition);
ProcSmokeBomb();
#endif #endif
} }
break; break;

4
server/gameserver/smoke_mitask.cc
View File

@ -10,7 +10,7 @@ void SmokeMiTask::Check()
{ {
std::list<Player*> deleted_hums; std::list<Player*> deleted_hums;
for (auto& hum : player_set) { for (auto& hum : player_set) {
if (bomb_pos.Distance(hum->GetPos()) > gun_meta->i->bullet_rad() + hum->meta->i->radius()) { if (bomb_pos.Distance(hum->GetPos()) > gun_meta->float_param1 + hum->meta->i->radius()) {
hum->RemoveBuffByEffectId(kBET_HunLuan); hum->RemoveBuffByEffectId(kBET_HunLuan);
deleted_hums.push_back(hum); deleted_hums.push_back(hum);
} }
@ -23,7 +23,7 @@ void SmokeMiTask::Check()
(a8::XParams(), (a8::XParams(),
[this] (Player* hum, a8::XParams&) -> bool [this] (Player* hum, a8::XParams&) -> bool
{ {
if (bomb_pos.Distance(hum->GetPos()) < gun_meta->i->bullet_rad() + hum->meta->i->radius()) { if (bomb_pos.Distance(hum->GetPos()) < gun_meta->float_param1 + hum->meta->i->radius()) {
if (!hum->HasBuffEffect(kBET_HunLuan)) { if (!hum->HasBuffEffect(kBET_HunLuan)) {
hum->AddBuff(nullptr, buff_meta, nullptr); hum->AddBuff(nullptr, buff_meta, nullptr);
player_set.insert(hum); player_set.insert(hum);