This commit is contained in:
aozhiwei 2023-03-06 15:38:22 +08:00
parent ddd9fc18a1
commit e7f18da2ee
4 changed files with 10 additions and 14 deletions

View File

@ -8,12 +8,14 @@
void SelectTargetWithSelfPosBuff::Activate() void SelectTargetWithSelfPosBuff::Activate()
{ {
hold_param3_ = meta->GetBuffParam3(this);
hold_param4_ = meta->GetBuffParam4(this);
std::vector<Creature*> targets; std::vector<Creature*> targets;
owner->TraverseCreatures owner->TraverseCreatures
( (
[this, &targets] (Creature* c, bool& stop) [this, &targets] (Creature* c, bool& stop)
{ {
if (owner->GetPos().Distance2D2(c->GetPos()) < meta->_int_buff_param3) { if (owner->GetPos().Distance2D2(c->GetPos()) < hold_param3_) {
switch (meta->_int_buff_param1) { switch (meta->_int_buff_param1) {
case kBST_All: case kBST_All:
{ {

View File

@ -9,4 +9,8 @@ class SelectTargetWithSelfPosBuff : public Buff
virtual void Activate() override; virtual void Activate() override;
virtual void Deactivate() override; virtual void Deactivate() override;
private:
float hold_param3_ = 0.0f;
float hold_param4_ = 0.0f;
}; };

View File

@ -17,11 +17,6 @@
void SprintBuff::Activate() void SprintBuff::Activate()
{ {
#if 0
if (meta->_int_buff_param5) {
owner->IncDisableMoveDirTimes();
}
#endif
move_distance_limit_ = meta->GetBuffParam2(this); move_distance_limit_ = meta->GetBuffParam2(this);
check_interval_time_ = meta->GetBuffParam5(this); check_interval_time_ = meta->GetBuffParam5(this);
check_distance_ = meta->GetBuffParam4(this); check_distance_ = meta->GetBuffParam4(this);
@ -31,11 +26,6 @@ void SprintBuff::Activate()
void SprintBuff::Deactivate() void SprintBuff::Deactivate()
{ {
#if 0
if (meta->_int_buff_param5) {
owner->DecDisableMoveDirTimes();
}
#endif
} }
void SprintBuff::SprintMove() void SprintBuff::SprintMove()

View File

@ -1673,9 +1673,10 @@ void Player::UpdateThrowBomb()
throw_bomb->dir().y(), throw_bomb->dir().y(),
throw_bomb->dir().z() throw_bomb->dir().z()
); );
int throw_uniid = room->AllocUniid();
room->frame_event.AddBullet room->frame_event.AddBullet
( (
room->AllocUniid(), throw_uniid,
GetWeakPtrRef(), GetWeakPtrRef(),
equip_meta, equip_meta,
1, 1,
@ -1685,8 +1686,7 @@ void Player::UpdateThrowBomb()
0, 0,
1 1
); );
pending_throw_bomb[throw_bomb->throw_uniid()] = throw_bomb; pending_throw_bomb[throw_uniid] = throw_bomb;
int throw_uniid = throw_bomb->throw_uniid();
room->xtimer.SetTimeoutEx room->xtimer.SetTimeoutEx
( (
SERVER_FRAME_RATE * 15, SERVER_FRAME_RATE * 15,