From 9805565612dc00da8c1d1b0e0bb0fb65168632b8 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 13 Mar 2023 15:11:17 +0800 Subject: [PATCH] 1 --- server/gameserver/buff.cc | 1 - server/gameserver/creature.cc | 3 +-- server/gameserver/mt/Buff.cc | 10 ---------- server/gameserver/mt/SkillNumber.cc | 10 +++++++++- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/server/gameserver/buff.cc b/server/gameserver/buff.cc index 7e8a6c52..73e2a713 100644 --- a/server/gameserver/buff.cc +++ b/server/gameserver/buff.cc @@ -358,7 +358,6 @@ void Buff::Activate() { const mt::Buff* buff_meta = meta; switch (meta->buff_effect()) { - case kBET_ChgAttr: case kBET_Car: case kBET_CrazyMode: { diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc index 4fcf7cd0..4fffe8e9 100644 --- a/server/gameserver/creature.cc +++ b/server/gameserver/creature.cc @@ -598,8 +598,7 @@ void Creature::RecalcBuffAttr() ability_->Clear(); bool need_refresh_hp = false; for (auto& buff : buff_list_) { - if (buff->meta->buff_effect() == kBET_ChgAttr || - buff->meta->buff_effect() == kBET_Car || + if (buff->meta->buff_effect() == kBET_Car || buff->meta->buff_effect() == kBET_CrazyMode) { int attr_type = (int)buff->meta->_buff_param1; int calc_type = (int)buff->meta->_buff_param2; diff --git a/server/gameserver/mt/Buff.cc b/server/gameserver/mt/Buff.cc index d2efdd4c..7f8c68c7 100644 --- a/server/gameserver/mt/Buff.cc +++ b/server/gameserver/mt/Buff.cc @@ -251,16 +251,6 @@ namespace mt void Buff::Init2() { switch (buff_effect()) { - case kBET_ChgAttr: - { - assert(_int_buff_param2 == 1 || _int_buff_param2 == 2); - if (_int_buff_param2 == 2) { - if (buff_param3().find('.') != std::string::npos) { - A8_ABORT(); - } - } - } - break; case kBET_SummonHero: { for (auto& info : _hero_infos) { diff --git a/server/gameserver/mt/SkillNumber.cc b/server/gameserver/mt/SkillNumber.cc index fbb3aca6..4d238bc2 100644 --- a/server/gameserver/mt/SkillNumber.cc +++ b/server/gameserver/mt/SkillNumber.cc @@ -20,7 +20,8 @@ A8_DECLARE_CLASS_ENUM(SkillNumberLispField_e, int, range2, range3, time, - cd + cd, + number ); namespace mt @@ -181,6 +182,11 @@ namespace mt return _float_cd; } break; + case SkillNumberLispField_e::number: + { + return number(); + } + break; default: { abort(); @@ -217,6 +223,8 @@ namespace mt return (int)SkillNumberLispField_e::time; } else if (name == "${skillNumber.cd}") { return (int)SkillNumberLispField_e::cd; + } else if (name == "${skillNumber.number}") { + return (int)SkillNumberLispField_e::number; } return -1; }