This commit is contained in:
aozhiwei 2023-01-04 19:24:02 +08:00
parent 225f9e6c29
commit 7853aa35ff

View File

@ -883,35 +883,60 @@ void Bullet::ProcNormalBullet(BulletCheckResult& result)
if (need_remove) {
if (IsFlyHook()) {
if (!hited) {
result.flyed_distance = raycast_len_;
sender.Get()->IncDisableMoveTimes();
sender.Get()->IncDisableAttackDirTimes();
auto sender_p = sender;
sender.Get()->room->xtimer.SetTimeoutEx
(
std::ceil((result.flyed_distance / gun_meta->bullet_speed() / 2) * SERVER_FRAME_RATE),
[sender_p] (int event, const a8::Args* args) mutable
{
if (a8::TIMER_EXEC_EVENT == event) {
sender_p.Get()->RemoveBuffById(kKeepShotAnimiBuffId);
}
},
&sender.Get()->xtimer_attacher
);
sender.Get()->room->xtimer.SetTimeoutEx
(
(0.75 + result.flyed_distance / gun_meta->bullet_speed() / 2) * SERVER_FRAME_RATE,
[sender_p] (int event, const a8::Args* args) mutable
{
if (a8::TIMER_EXEC_EVENT == event) {
sender_p.Get()->DecDisableMoveTimes();
sender_p.Get()->DecDisableAttackDirTimes();
sender_p.Get()->GetTrigger()->FlyHookDestory();
}
},
&sender.Get()->xtimer_attacher
);
sender.Get()->TryAddBuff(sender.Get(), gun_meta->_int_param2);
if (raycast_hited) {
if (result.flyed_distance > 0.001f) {
sender.Get()->AutoNavigation(GetPos(), gun_meta->bullet_speed() * 2,
[] (Creature* c)
{
});
sender.Get()->IncDisableMoveTimes();
auto sender_p = sender;
sender.Get()->room->xtimer.SetTimeoutEx
(
(raycast_len_ / gun_meta->bullet_speed() / 2 + 0.75) * SERVER_FRAME_RATE,
[sender_p] (int event, const a8::Args* args) mutable
{
if (a8::TIMER_EXEC_EVENT == event) {
sender_p.Get()->DecDisableMoveTimes();
sender_p.Get()->GetTrigger()->FlyHookDestory();
}
},
&sender.Get()->xtimer_attacher
);
sender.Get()->RemoveBuffById(kKeepShotAnimiBuffId);
sender.Get()->TryAddBuff(sender.Get(), gun_meta->_int_param2);
}
} else {
sender.Get()->IncDisableMoveTimes();
sender.Get()->IncDisableAttackDirTimes();
auto sender_p = sender;
sender.Get()->room->xtimer.SetTimeoutEx
(
std::ceil((result.flyed_distance / gun_meta->bullet_speed() / 2) * SERVER_FRAME_RATE),
[sender_p] (int event, const a8::Args* args) mutable
{
if (a8::TIMER_EXEC_EVENT == event) {
sender_p.Get()->RemoveBuffById(kKeepShotAnimiBuffId);
}
},
&sender.Get()->xtimer_attacher
);
sender.Get()->room->xtimer.SetTimeoutEx
(
(0.75 + result.flyed_distance / gun_meta->bullet_speed() / 2) * SERVER_FRAME_RATE,
[sender_p] (int event, const a8::Args* args) mutable
{
if (a8::TIMER_EXEC_EVENT == event) {
sender_p.Get()->DecDisableMoveTimes();
sender_p.Get()->DecDisableAttackDirTimes();
sender_p.Get()->GetTrigger()->FlyHookDestory();
}
},
&sender.Get()->xtimer_attacher
);
sender.Get()->TryAddBuff(sender.Get(), gun_meta->_int_param2);
}
}
}
ForceRemove();