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-01-05 14:02:28 +08:00
parent 6a29a0f724
commit 19899d7fec
2 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/gameserver/bullet.cc
View File

@ -55,9 +55,6 @@ void Bullet::Initialize()
sender.Get()->room->xtimer.ModifyTime(buff->remover_timer, SERVER_FRAME_RATE * 10); sender.Get()->room->xtimer.ModifyTime(buff->remover_timer, SERVER_FRAME_RATE * 10);
} }
} }
#ifdef DEBUG
a8::XPrintf("buff_uniid:%d\n", {buff_uniid});
#endif
if (sender.Get()) { if (sender.Get()) {
sender.Get()->GetTrigger()->FlyHookCreate(this); sender.Get()->GetTrigger()->FlyHookCreate(this);
} }
@ -890,7 +887,6 @@ void Bullet::ProcNormalBullet(BulletCheckResult& result)
if (raycast_hited) { if (raycast_hited) {
if (result.flyed_distance > 0.001f) { if (result.flyed_distance > 0.001f) {
ClearBuffList(); ClearBuffList();
a8::XPrintf("ClearBuffList\n", {});
auto sender_p = sender; auto sender_p = sender;
sender.Get()->AutoNavigation sender.Get()->AutoNavigation
(raycast_hit_point_, gun_meta->bullet_speed() * 2, (raycast_hit_point_, gun_meta->bullet_speed() * 2,
@ -898,21 +894,6 @@ void Bullet::ProcNormalBullet(BulletCheckResult& result)
{ {
sender_p.Get()->GetTrigger()->FlyHookDestory(); sender_p.Get()->GetTrigger()->FlyHookDestory();
}); });
#if 0
sender.Get()->IncDisableMoveTimes();
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
);
#endif
sender.Get()->RemoveBuffById(kKeepShotAnimiBuffId); sender.Get()->RemoveBuffById(kKeepShotAnimiBuffId);
sender.Get()->TryAddBuff(sender.Get(), gun_meta->_int_param2); sender.Get()->TryAddBuff(sender.Get(), gun_meta->_int_param2);
} }

6
server/gameserver/creature.cc
View File

@ -2561,7 +2561,11 @@ void Creature::AutoNavigation(const glm::vec3& target_pos, float speed,
GlmHelper::Normalize(context->dir); GlmHelper::Normalize(context->dir);
context->speed = speed; context->speed = speed;
context->cb = cb; context->cb = cb;
SetAttackDir(context->dir);
SetMoveDir(context->dir);
IncDisableAttackDirTimes();
IncDisableMoveDirTimes();
IncDisableMoveTimes(); IncDisableMoveTimes();
room->xtimer.SetIntervalEx room->xtimer.SetIntervalEx
(1, (1,
@ -2609,6 +2613,8 @@ void Creature::AutoNavigation(const glm::vec3& target_pos, float speed,
if (ok || c->dead) { if (ok || c->dead) {
context->cb(c); context->cb(c);
c->DecDisableMoveTimes(); c->DecDisableMoveTimes();
c->DecDisableMoveDirTimes();
c->DecDisableAttackDirTimes();
room->xtimer.DeleteCurrentTimer(); room->xtimer.DeleteCurrentTimer();
} }
} }