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-06-03 18:40:27 +08:00
parent a50fb5d946
commit 4907b50e2d
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/frameevent.cc
View File

@ -480,6 +480,8 @@ void FrameEvent::AddPropChg(CreatureWeakPtr& sender, int type, int subtype, floa
if (only_self) { if (only_self) {
if (sender.Get()->IsHuman()) { if (sender.Get()->IsHuman()) {
sender.Get()->AsHuman()->GetFrameData().chged_props_.push_back(idx); sender.Get()->AsHuman()->GetFrameData().chged_props_.push_back(idx);
} else if (sender.Get()->IsCar() && sender.Get()->AsCar()->GetDriver()) {
sender.Get()->AsCar()->GetDriver()->GetFrameData().chged_props_.push_back(idx);
} }
} else { } else {
sender.Get()->TraverseAllLayerHumanList sender.Get()->TraverseAllLayerHumanList
@ -509,6 +511,8 @@ void FrameEvent::AddPropChgEx(CreatureWeakPtr& sender, int type, int subtype,
if (only_self) { if (only_self) {
if (sender.Get()->IsHuman()) { if (sender.Get()->IsHuman()) {
sender.Get()->AsHuman()->GetFrameData().chged_props_.push_back(idx); sender.Get()->AsHuman()->GetFrameData().chged_props_.push_back(idx);
} else if (sender.Get()->IsCar() && sender.Get()->AsCar()->GetDriver()) {
sender.Get()->AsCar()->GetDriver()->GetFrameData().chged_props_.push_back(idx);
} }
} else { } else {
sender.Get()->TraverseAllLayerHumanList sender.Get()->TraverseAllLayerHumanList

29
server/gameserver/skill.cc
View File

@ -198,25 +198,21 @@ void Skill::AddMinorMode(
} }
minor_cb_ = nullptr; minor_cb_ = nullptr;
ResetSkillCd(); ResetSkillCd();
if (owner->IsHuman()) { owner->room->frame_event.AddPropChgEx
Human* hum = owner->AsHuman(); (
owner->room->frame_event.AddPropChgEx owner->GetWeakPtrRef(),
( kPropSkillMinor,
owner->GetWeakPtrRef(), minor_type_,
kPropSkillMinor, minor_cd_time_,
minor_type_, minor_cd_time_,
minor_cd_time_, meta->skill_id(),
minor_cd_time_, true
meta->skill_id(), );
true NotifySkillState();
);
NotifySkillState();
}
} }
}, },
&xtimer_attacher); &xtimer_attacher);
if (owner->IsHuman()) { {
Human* hum = owner->AsHuman();
owner->room->frame_event.AddPropChgEx owner->room->frame_event.AddPropChgEx
( (
owner->GetWeakPtrRef(), owner->GetWeakPtrRef(),
@ -563,7 +559,6 @@ const mt::Skill* Skill::GetCurrSkillMeta()
} }
} }
int Skill::GetSkillId() int Skill::GetSkillId()
{ {
return meta->skill_id(); return meta->skill_id();