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-01-19 10:53:03 +08:00
parent efe8a7c311
commit 9da8eebcb9
3 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
server/gameserver/buff/machine_gun.cc
View File

@ -57,24 +57,4 @@ void MachineGunBuff::SwitchWeapons()
void MachineGunBuff::ProcSkill() void MachineGunBuff::ProcSkill()
{ {
if (skill_meta && skill_meta->_number_meta) {
switch (skill_meta->GetMagicId()) {
case MAGIC_20201_HX:
{
owner->room->xtimer.ModifyTime
(remover_timer,
skill_meta->_number_meta->_float_time * 1000 / FRAME_RATE_MS);
owner->GetTrigger()->DispatchEvent(kStartSwitchWeaponBuffEvent, {this});
}
break;
case MAGIC_20401_MAO:
{
}
break;
default:
{
}
break;
}
}
} }

8
server/gameserver/shot.cc
View File

@ -498,14 +498,6 @@ void InternalShot(Creature* c,
bullet_info.bullet_num = bulletNum; bullet_info.bullet_num = bulletNum;
bullet_info.weapon_lv = weapon_lv; bullet_info.weapon_lv = weapon_lv;
bullet_info.weapon_buff_id = weapon_buff_id; bullet_info.weapon_buff_id = weapon_buff_id;
#if 0
if (skill_meta &&
(skill_meta->GetMagicId() == MAGIC_20101_HL ||
skill_meta->GetMagicId() == MAGIC_20201_HX)
) {
bullet_info.trace_target_uniid = c->GetSkillTargetId();
}
#endif
bullet_info.reporter_list = c->CalcReporterList(trace_target_uniid, weapon_meta, bullet_meta); bullet_info.reporter_list = c->CalcReporterList(trace_target_uniid, weapon_meta, bullet_meta);
if (weapon_meta->double_gun() && if (weapon_meta->double_gun() &&
bulletIdx > (int)(bulletNum / 2)) { bulletIdx > (int)(bulletNum / 2)) {

16
server/gameserver/skill.cc
View File

@ -411,18 +411,6 @@ void Skill::ProcSpecDirShotPhase(const mt::SkillPhase* phase)
target_distance = std::max(0.0001f, target_distance); target_distance = std::max(0.0001f, target_distance);
} }
if (bullet_meta && target_distance > 0.00001f) { if (bullet_meta && target_distance > 0.00001f) {
if (GetBaseSkillMeta()->GetMagicId() == MAGIC_20201_HX) {
#if 1
target_distance = owner->skill_distance_;
#else
target_distance = 0;
#endif
owner->TryAddBuff(owner, 202013);
owner->TryAddBuff(owner, 202014);
#if 0
target_id = GetTraceTargetId(owner);
#endif
}
glm::vec3 old_attack_dir = owner->GetAttackDir(); glm::vec3 old_attack_dir = owner->GetAttackDir();
glm::vec3 attack_dir = owner->skill_dir_; glm::vec3 attack_dir = owner->skill_dir_;
GlmHelper::Normalize(attack_dir); GlmHelper::Normalize(attack_dir);
@ -460,10 +448,6 @@ void Skill::ProcNormalShotPhase(const mt::SkillPhase* phase)
if (entity) { if (entity) {
float target_distance = entity->GetPos().Distance2D2(owner->GetPos()); float target_distance = entity->GetPos().Distance2D2(owner->GetPos());
if (bullet_meta && target_distance > 0.00001f) { if (bullet_meta && target_distance > 0.00001f) {
if (GetBaseSkillMeta()->GetMagicId() == MAGIC_20201_HX) {
owner->TryAddBuff(owner, 202013);
owner->TryAddBuff(owner, 202014);
}
glm::vec3 old_attack_dir = owner->GetAttackDir(); glm::vec3 old_attack_dir = owner->GetAttackDir();
glm::vec3 attack_dir = owner->GetPos().CalcDir(entity->GetPos()); glm::vec3 attack_dir = owner->GetPos().CalcDir(entity->GetPos());
GlmHelper::Normalize(attack_dir); GlmHelper::Normalize(attack_dir);