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 2024-03-04 19:03:30 +08:00
parent e7c141ae3e
commit 73d7d819ab
3 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/gameserver/buff/beatback.cc
View File

@ -11,6 +11,17 @@
void BeatBackBuff::Activate() void BeatBackBuff::Activate()
{ {
if (caster_.Get()) { if (caster_.Get()) {
#if 1
if (std::abs(caster_.Get()->GetAttackDir().x) > FLT_EPSILON ||
std::abs(caster_.Get()->GetAttackDir().y) > FLT_EPSILON) {
if (std::abs(meta->_int_buff_param1) > 0) {
glm::vec3 old_move_dir = owner->GetMoveDir();
owner->SetMoveDir(caster_.Get()->GetAttackDir());
owner->ForwardMove(meta->_buff_param1);
owner->SetMoveDir(old_move_dir);
}
}
#else
if (std::abs(caster_.Get()->context_dir.x) > FLT_EPSILON || if (std::abs(caster_.Get()->context_dir.x) > FLT_EPSILON ||
std::abs(caster_.Get()->context_dir.x) > FLT_EPSILON) { std::abs(caster_.Get()->context_dir.x) > FLT_EPSILON) {
if (std::abs(meta->_int_buff_param1) > 0) { if (std::abs(meta->_int_buff_param1) > 0) {
@ -20,6 +31,7 @@ void BeatBackBuff::Activate()
owner->SetMoveDir(old_move_dir); owner->SetMoveDir(old_move_dir);
} }
} }
#endif
} }
} }

5
server/gameserver/creature.cc
View File

@ -548,6 +548,11 @@ void Creature::RemoveBuffByUniId(int buff_uniid)
} }
if (buff) { if (buff) {
buff_id = buff->meta->buff_id(); buff_id = buff->meta->buff_id();
#ifdef MYDEBUG
if (buff_id == 210011) {
int i = 0;
}
#endif
removed_buffs.push_back(std::make_tuple(buff->meta, buff->GetCaster().Get())); removed_buffs.push_back(std::make_tuple(buff->meta, buff->GetCaster().Get()));
OnBuffRemove(*buff.get()); OnBuffRemove(*buff.get());
buff->UnInit(); buff->UnInit();

10
server/gameserver/shot.cc
View File

@ -564,6 +564,16 @@ void InternalShot(Creature* c,
if (c->skill_hold_skill_id != 0) { if (c->skill_hold_skill_id != 0) {
c->ClearSkillHoldState(); c->ClearSkillHoldState();
} }
#if 0
if (weapon_meta->id() == 20914) {
c->TryAddBuff(c,
30708,
nullptr,
nullptr,
nullptr
);
}
#endif
if (weapon_meta->id() == 20611) { if (weapon_meta->id() == 20611) {
float angle = GlmHelper::CalcAngle(c->GetAttackDir(), GlmHelper::UP); float angle = GlmHelper::CalcAngle(c->GetAttackDir(), GlmHelper::UP);
std::shared_ptr<std::vector<float>> buff_vars = std::make_shared<std::vector<float>> std::shared_ptr<std::vector<float>> buff_vars = std::make_shared<std::vector<float>>