From 61a53afec3f9a812a881152242b05e79d659a1e0 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 28 Mar 2023 16:48:39 +0800 Subject: [PATCH] 1 --- server/gameserver/ability.cc | 40 ------------------------------ server/gameserver/ability.h | 8 ------ server/gameserver/buff/callfunc.cc | 11 -------- server/gameserver/buff/callfunc.h | 1 - server/gameserver/mt/Buff.cc | 3 +++ 5 files changed, 3 insertions(+), 60 deletions(-) diff --git a/server/gameserver/ability.cc b/server/gameserver/ability.cc index a3fffa99..74ca502e 100644 --- a/server/gameserver/ability.cc +++ b/server/gameserver/ability.cc @@ -377,46 +377,6 @@ bool Ability::CanImmune(const std::set& tags) return false; } -void Ability::AddSpeedRuduce(float rate) -{ - speed_ruduce_rate_ += rate; - ++speed_ruduce_times_; -} - -void Ability::DelSpeedRuduce(float rate) -{ - speed_ruduce_rate_ -= rate; - speed_ruduce_rate_ = std::max(0.0f, speed_ruduce_rate_); - --speed_ruduce_times_; - if (speed_ruduce_times_ <= 0) { - speed_ruduce_rate_ = 0; - } -#ifdef DEBUG - if (speed_ruduce_times_ < 0) { - abort(); - } -#endif -} - -float Ability::GetSpeedRuduce() -{ -#ifdef DEBUG1 - if (std::abs(speed_ruduce_rate_) > 0.001f && owner_.Get() && owner_.Get()->IsPlayer()) { - a8::XPrintf("speed_ruduce_rate:%f speed_ruduce_times_:%d\n", - { - speed_ruduce_rate_, - speed_ruduce_times_ - }); - } -#endif - return speed_ruduce_rate_; -} - -int Ability::GetSpeedRuduceTimes() -{ - return speed_ruduce_times_; -} - void Ability::IncDisableShotTimes() { ++disable_shot_times_; diff --git a/server/gameserver/ability.h b/server/gameserver/ability.h index aef6c0c5..80a3c493 100644 --- a/server/gameserver/ability.h +++ b/server/gameserver/ability.h @@ -21,11 +21,6 @@ class Ability float GetSpeedAddition(); int GetSpeedAdditionTimes(); - void AddSpeedRuduce(float rate); - void DelSpeedRuduce(float rate); - float GetSpeedRuduce(); - int GetSpeedRuduceTimes(); - void AddDmgRuduce(float rate); void DelDmgRuduce(float rate); float GetDmgRuduce(); @@ -97,9 +92,6 @@ private: int speed_addition_times_ = 0; float speed_addition_rate_ = 0; - int speed_ruduce_times_ = 0; - float speed_ruduce_rate_ = 0; - int dmg_ruduce_times_ = 0; float dmg_ruduce_rate_ = 0; diff --git a/server/gameserver/buff/callfunc.cc b/server/gameserver/buff/callfunc.cc index 90b619ed..9c824a89 100644 --- a/server/gameserver/buff/callfunc.cc +++ b/server/gameserver/buff/callfunc.cc @@ -25,12 +25,6 @@ void CallFuncBuff::Activate() ProcAddMinorMode(); } break; - case BuffCallFunc_e::kSpeedReduce: - { - hold_param2_ = meta->GetBuffParam2(this); - owner->GetAbility()->AddSpeedRuduce(hold_param2_); - } - break; case BuffCallFunc_e::kInternalRangeAddBuff: { ProcIntervalRangeAddBuffFunc(); @@ -134,11 +128,6 @@ void CallFuncBuff::Deactivate() } } break; - case BuffCallFunc_e::kSpeedReduce: - { - owner->GetAbility()->DelSpeedRuduce(hold_param2_); - } - break; case BuffCallFunc_e::kSpeedAddition: { owner->GetAbility()->DelSpeedAddition(hold_param2_); diff --git a/server/gameserver/buff/callfunc.h b/server/gameserver/buff/callfunc.h index 39e89bb7..436e37c1 100644 --- a/server/gameserver/buff/callfunc.h +++ b/server/gameserver/buff/callfunc.h @@ -4,7 +4,6 @@ A8_DECLARE_CLASS_ENUM(BuffCallFunc_e, int, kAddMinorMode = 1, - kSpeedReduce = 2, kInternalRangeAddBuff = 3, kDecHp = 4, kMarkTag = 5, diff --git a/server/gameserver/mt/Buff.cc b/server/gameserver/mt/Buff.cc index 25b1e5ad..a6fceedf 100644 --- a/server/gameserver/mt/Buff.cc +++ b/server/gameserver/mt/Buff.cc @@ -277,6 +277,9 @@ namespace mt void Buff::Init2() { + if (buff_effect() == 7 && _int_buff_param1 == 1) { + abort(); + } switch (buff_effect()) { case kBET_SummonHero: {