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 2023-12-21 11:07:09 +08:00
parent fd52ae7a92
commit 085eded0d2
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/gameserver/buff/callfunc.cc
View File

@ -309,7 +309,7 @@ void CallFuncBuff::ProcAddMinorMode()
[owner_ptr, meta_ptr, skill_meta_ptr] (int action) mutable [owner_ptr, meta_ptr, skill_meta_ptr] (int action) mutable
{ {
if (owner_ptr.Get()) { if (owner_ptr.Get()) {
if (action == 1) { if (action == kSmaClick) {
for (int buff_id : meta_ptr->_buff_param6_int_list) { for (int buff_id : meta_ptr->_buff_param6_int_list) {
owner_ptr.Get()->RemoveBuffById(buff_id); owner_ptr.Get()->RemoveBuffById(buff_id);
} }
@ -321,8 +321,7 @@ void CallFuncBuff::ProcAddMinorMode()
#endif #endif
owner_ptr.Get()->TryAddBuff(owner_ptr.Get(), buff_id, skill_meta_ptr); owner_ptr.Get()->TryAddBuff(owner_ptr.Get(), buff_id, skill_meta_ptr);
} }
} else if (action == 0 || } else if (action == kSmaTimeOut || action == kSmaCancel) {
action == 2) {
for (int buff_id : meta_ptr->_buff_param5_int_list) { for (int buff_id : meta_ptr->_buff_param5_int_list) {
owner_ptr.Get()->TryAddBuff(owner_ptr.Get(), buff_id, skill_meta_ptr); owner_ptr.Get()->TryAddBuff(owner_ptr.Get(), buff_id, skill_meta_ptr);
} }

6
server/gameserver/skill.cc
View File

@ -196,7 +196,7 @@ void Skill::AddMinorMode(
minor_cd_time_ = 0; minor_cd_time_ = 0;
minor_frameno_ = 0; minor_frameno_ = 0;
if (minor_cb_) { if (minor_cb_) {
minor_cb_(0); minor_cb_(kSmaTimeOut);
} }
minor_cb_ = nullptr; minor_cb_ = nullptr;
ResetSkillCd(); ResetSkillCd();
@ -242,7 +242,7 @@ void Skill::DoMinorMode()
if (!minor_mode_timer_.expired()) { if (!minor_mode_timer_.expired()) {
owner->room->xtimer.Delete(minor_mode_timer_); owner->room->xtimer.Delete(minor_mode_timer_);
} }
old_cb(1); old_cb(kSmaClick);
} }
} }
@ -500,7 +500,7 @@ void Skill::ProcJumpToPhase(const mt::SkillPhase* phase)
void Skill::CancelMinorMode() void Skill::CancelMinorMode()
{ {
if (GetMinorType() != SMT_NONE) { if (GetMinorType() != SMT_NONE) {
minor_cb_(2); minor_cb_(kSmaCancel);
minor_cb_ = nullptr; minor_cb_ = nullptr;
if (!minor_mode_timer_.expired()) { if (!minor_mode_timer_.expired()) {
owner->room->xtimer.Delete(minor_mode_timer_); owner->room->xtimer.Delete(minor_mode_timer_);