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-10-19 00:22:50 +08:00
parent 7ca1eccbb0
commit 1daef7c0e4
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/bullet.cc
View File

@ -419,7 +419,7 @@ void Bullet::MapServiceUpdate()
Check(distance); Check(distance);
} }
} while(!later_removed_ && move_length >= 0.0001f); } while(!later_removed_ && move_length >= 0.0001f);
#ifdef DEBUG #ifdef DEBUG1
{ {
if (sender.Get()->IsPlayer()) { if (sender.Get()->IsPlayer()) {
if ((room->GetFrameNo() - create_frameno_) % 2 == 0) { if ((room->GetFrameNo() - create_frameno_) % 2 == 0) {

6
server/gameserver/creature.cc
View File

@ -969,7 +969,7 @@ void Creature::ProcSkillPhase(MetaData::SkillPhase* phase)
CurrentSkill() ? CurrentSkill()->meta : nullptr, CurrentSkill() ? CurrentSkill()->meta : nullptr,
target_distance, target_distance,
0, 0,
target_id); 0);
SetAttackDir(old_attack_dir); SetAttackDir(old_attack_dir);
} }
} }
@ -978,6 +978,10 @@ void Creature::ProcSkillPhase(MetaData::SkillPhase* phase)
if (entity) { if (entity) {
float target_distance = entity->GetPos().Distance(GetPos()); float target_distance = entity->GetPos().Distance(GetPos());
if (bullet_meta && target_distance > 0.00001f) { if (bullet_meta && target_distance > 0.00001f) {
if (CurrentSkill()->meta->GetMagicId() == MAGIC_HJHX) {
TryAddBuff(this, 202013);
TryAddBuff(this, 202014);
}
a8::Vec2 old_attack_dir = GetAttackDir(); a8::Vec2 old_attack_dir = GetAttackDir();
a8::Vec2 attack_dir = entity->GetPos() - GetPos(); a8::Vec2 attack_dir = entity->GetPos() - GetPos();
attack_dir.Normalize(); attack_dir.Normalize();

4
server/gameserver/shot.cc
View File

@ -395,12 +395,8 @@ void InternalShot(Creature* c,
bullet_info.keep_shot_animi_timer_ptr = keep_shot_animi_timer_ptr; bullet_info.keep_shot_animi_timer_ptr = keep_shot_animi_timer_ptr;
bullet_info.shot_animi_time = shot_animi_time; bullet_info.shot_animi_time = shot_animi_time;
if (skill_meta && if (skill_meta &&
#if 1
skill_meta->GetMagicId() == MAGIC_AXXF
#else
(skill_meta->GetMagicId() == MAGIC_AXXF || (skill_meta->GetMagicId() == MAGIC_AXXF ||
skill_meta->GetMagicId() == MAGIC_HJHX) skill_meta->GetMagicId() == MAGIC_HJHX)
#endif
) { ) {
bullet_info.trace_target_uniid = c->GetSkillTargetId(); bullet_info.trace_target_uniid = c->GetSkillTargetId();
} }