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-02-15 19:38:20 +08:00
parent d0519e8a4d
commit 1d137dabcd
1 changed files with 71 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
server/gameserver/skill.cc
View File

@ -633,27 +633,28 @@ void Skill::Proc30601DJS()
const mt::Skill* active_skill_meta = nullptr; const mt::Skill* active_skill_meta = nullptr;
std::set<Human*> in_range_humans; std::set<Human*> in_range_humans;
auto on_enter = auto on_enter =
[] (Human* num) [this] (Human* num, const mt::Skill* active_skill_meta)
{ {
if (active_skill_meta) {
owner->GetAbility()->AddSpeedRuduce(active_skill_meta->_number_meta->_float_speed);
}
}; };
auto on_stay = auto on_stay =
[] (Human* hum) [this] (Human* hum, const mt::Skill* active_skill_meta)
{ {
}; };
auto on_leave = auto on_leave =
[] (Human* hum) [this] (Human* hum, const mt::Skill* active_skill_meta)
{ {
if (active_skill_meta) {
owner->GetAbility()->DelSpeedRuduce(active_skill_meta->_number_meta->_float_speed);
}
}; };
passive_skill_timer = owner->room->xtimer.SetIntervalWpEx auto check_cb =
( [this, on_enter, on_stay, on_leave]
SERVER_FRAME_RATE, (std::set<Human*>& in_range_humans, const mt::Skill* active_skill_meta)
[this, in_range_humans, active_skill_meta, on_enter, on_stay, on_leave]
(int event, const a8::Args* args) mutable
{ {
if (a8::TIMER_EXEC_EVENT == event) {
if (!owner->dead) { if (!owner->dead) {
float range = meta->_number_meta->_float_range2; float range = meta->_number_meta->_float_range2;
float resume_hp = meta->_number_meta->resume(); float resume_hp = meta->_number_meta->resume();
@ -682,7 +683,7 @@ void Skill::Proc30601DJS()
} }
} }
if (!found) { if (!found) {
on_leave(hum); on_leave(hum, active_skill_meta);
leave_humans.push_back(hum); leave_humans.push_back(hum);
} }
} }
@ -691,19 +692,37 @@ void Skill::Proc30601DJS()
} }
for (int i = 0; i < size; ++i){ for (int i = 0; i < size; ++i){
if (in_range_humans.find(hit_humans[i]) == in_range_humans.end()) { if (in_range_humans.find(hit_humans[i]) == in_range_humans.end()) {
on_enter(hit_humans[i]); on_enter(hit_humans[i], active_skill_meta);
on_stay(hit_humans[i], active_skill_meta);
in_range_humans.insert(hit_humans[i]); in_range_humans.insert(hit_humans[i]);
} else { } else {
on_stay(hit_humans[i]); on_stay(hit_humans[i], active_skill_meta);
} }
} }
} }
};
passive_skill_timer = owner->room->xtimer.SetIntervalWpEx
(
SERVER_FRAME_RATE,
[this, in_range_humans, active_skill_meta, on_enter, on_stay, on_leave, check_cb]
(int event, const a8::Args* args) mutable
{
if (a8::TIMER_EXEC_EVENT == event) {
check_cb(in_range_humans, active_skill_meta);
} else if (kActiveDjsSkillTimerEvent == event) { } else if (kActiveDjsSkillTimerEvent == event) {
for (Human* hum : in_range_humans) {
on_leave(hum, active_skill_meta);
}
in_range_humans.clear();
active_skill_meta = args->Get<const mt::Skill*>(0); active_skill_meta = args->Get<const mt::Skill*>(0);
//owner->GetAbility()->AddSpeedRuduce(active_skill_meta->_number_meta->speed()); check_cb(in_range_humans, active_skill_meta);
} else if (kDeactiveDjsSkillTimerEvent == event) { } else if (kDeactiveDjsSkillTimerEvent == event) {
//owner->GetAbility()->DecSpeedRuduce(active_skill_meta->_number_meta->speed()); for (Human* hum : in_range_humans) {
on_leave(hum, active_skill_meta);
}
in_range_humans.clear();
active_skill_meta = nullptr; active_skill_meta = nullptr;
check_cb(in_range_humans, active_skill_meta);
} }
}, },
&xtimer_attacher); &xtimer_attacher);