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 2022-12-13 10:25:15 +08:00
parent 826e7b871d
commit ff06c88be0
2 changed files with 71 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/gameserver/android_agent.cc
View File

@ -30,15 +30,14 @@ behaviac::EBTStatus AndroidAgent::DoIdle(int min_time, int max_time)
} }
int idle_time = a8::RandEx(min_time, max_time); int idle_time = a8::RandEx(min_time, max_time);
xtimer_list* timer = GetOwner()->room->xtimer.AddDeadLineTimerAndAttach std::weak_ptr<a8::XTimerPtr> timer_ptr = GetOwner()->room->xtimer.AddDeadLineTimerEx
( (
idle_time / FRAME_RATE_MS, idle_time / FRAME_RATE_MS,
a8::XParams(), a8::Args({}),
[] (const a8::XParams& param) [] (int event, const a8::Args& args, const a8::Args* user_args)
{ {
}, },
&GetOwner()->xtimer_attacher.timer_list_); &GetOwner()->xtimer_attacher);
std::weak_ptr<a8::XTimerPtr> timer_ptr = GetOwner()->room->xtimer.GetTimerPtr(timer);
std::shared_ptr<CreatureWeakPtr> last_attacker = std::make_shared<CreatureWeakPtr>(); std::shared_ptr<CreatureWeakPtr> last_attacker = std::make_shared<CreatureWeakPtr>();
std::shared_ptr<long long> last_attacked_frameno = std::make_shared<long long>(0); std::shared_ptr<long long> last_attacked_frameno = std::make_shared<long long>(0);

153
server/gameserver/buff.cc
View File

@ -129,73 +129,63 @@ void Buff::InternalTimerAddBuff()
if (!caster_.Get()) { if (!caster_.Get()) {
return; return;
} }
std::shared_ptr<SkillCasterState> caster_state = std::make_shared<SkillCasterState>();
caster_.Get()->FillSkillCasterState(caster_state.get());
MetaData::Skill* skill = caster_.Get()->CurrentSkill() ? caster_.Get()->CurrentSkill()->meta : nullptr;
auto timer_func = auto timer_func =
[] (const a8::XParams& param) [this, caster_state, skill] (int event, const a8::Args& args, const a8::Args* user_args)
{ {
Creature* receiver = (Creature*)param.sender.GetUserData(); if (a8::TIMER_EXEC_EVENT == event) {
SkillCasterState* caster_state = (SkillCasterState*)param.param1.GetUserData(); Creature* receiver = owner;
if (caster_state->caster.Get()) { if (caster_state->caster.Get()) {
CreatureWeakPtr caster = caster_state->caster; CreatureWeakPtr caster = caster_state->caster;
std::shared_ptr<Ability> old_context_ability = receiver->context_ability; std::shared_ptr<Ability> old_context_ability = receiver->context_ability;
a8::Vec2 old_context_dir = receiver->context_dir; a8::Vec2 old_context_dir = receiver->context_dir;
Position old_context_pos = receiver->context_pos; Position old_context_pos = receiver->context_pos;
receiver->context_dir = receiver->GetAttackDir(); receiver->context_dir = receiver->GetAttackDir();
receiver->context_pos = receiver->GetPos(); receiver->context_pos = receiver->GetPos();
int buff_id = param.param2; int buff_id = meta->int_param2;
MetaData::Skill* skill = (MetaData::Skill*)param.param3.GetUserData(); MetaData::Buff* buff_meta = MetaMgr::Instance()->GetBuff(buff_id);
MetaData::Buff* buff_meta = MetaMgr::Instance()->GetBuff(buff_id); if (buff_meta) {
if (buff_meta) { SkillCasterState old_caster_state;
SkillCasterState old_caster_state; caster.Get()->FillSkillCasterState(&old_caster_state);
caster.Get()->FillSkillCasterState(&old_caster_state); caster.Get()->RecoverSkillCasterState(caster_state.get());
caster.Get()->RecoverSkillCasterState(caster_state); //!!!在AddBuff的过程可能删除buff导致caster_state野指针
//!!!在AddBuff的过程可能删除buff导致caster_state野指针 receiver->AddBuff(caster.Get(), buff_meta, skill);
receiver->AddBuff(caster.Get(), buff_meta, skill); caster.Get()->RecoverSkillCasterState(&old_caster_state);
caster.Get()->RecoverSkillCasterState(&old_caster_state); }
receiver->context_dir = old_context_dir;
receiver->context_pos = old_context_pos;
receiver->context_ability = old_context_ability;
} }
receiver->context_dir = old_context_dir;
receiver->context_pos = old_context_pos;
receiver->context_ability = old_context_ability;
} }
}; };
auto timer_after_func =
[] (const a8::XParams& param, bool is_destory)
{
SkillCasterState* caster_state = (SkillCasterState*)param.param1.GetUserData();
delete caster_state;
};
SkillCasterState* caster_state = new SkillCasterState;
caster_.Get()->FillSkillCasterState(caster_state);
a8::XParams param;
param.SetSender(owner);
param.SetParam1(caster_state);
param.SetParam2(meta->i->buff_param2());
param.SetParam3(caster_.Get()->CurrentSkill() ? caster_.Get()->CurrentSkill()->meta : nullptr);
switch (meta->i->buff_effect() ) { switch (meta->i->buff_effect() ) {
case kBET_DelayAddBuff: case kBET_DelayAddBuff:
{ {
owner->room->xtimer.AddDeadLineTimerAndAttach owner->room->xtimer.AddDeadLineTimer
( (
meta->param1 * SERVER_FRAME_RATE, meta->param1 * SERVER_FRAME_RATE,
param, a8::Args({}),
timer_func, timer_func,
&xtimer_attacher.timer_list_, &xtimer_attacher
timer_after_func); );
} }
break; break;
case kBET_IntervalAddBuff: case kBET_IntervalAddBuff:
{ {
owner->room->xtimer.AddRepeatTimerAndAttach owner->room->xtimer.AddRepeatTimer
( (
meta->param1 / FRAME_RATE_MS, meta->param1 / FRAME_RATE_MS,
param, a8::Args({}),
timer_func, timer_func,
&xtimer_attacher.timer_list_, &xtimer_attacher
timer_after_func); );
} }
break; break;
default: default:
@ -214,19 +204,19 @@ void Buff::ProcSummonHero()
void Buff::ProcBeRecycle() void Buff::ProcBeRecycle()
{ {
owner->room->xtimer.AddRepeatTimerAndAttach owner->room->xtimer.AddRepeatTimer
( (
SERVER_FRAME_RATE * 2, SERVER_FRAME_RATE * 2,
a8::XParams() a8::Args({}),
.SetSender(this), [this] (int event, const a8::Args& args, const a8::Args* user_args)
[] (const a8::XParams& param)
{ {
Buff* buff = (Buff*)param.sender.GetUserData(); if (a8::TIMER_EXEC_EVENT == event) {
if (buff->owner->IsHuman()) { if (owner->IsHuman()) {
buff->owner->room->GetIncubator()->RecycleAndroid((Human*)buff->owner); owner->room->GetIncubator()->RecycleAndroid(owner->AsHuman());
}
} }
}, },
&xtimer_attacher.timer_list_ &xtimer_attacher
); );
} }
@ -388,40 +378,39 @@ void Buff::ProcSprint()
owner->GetAttackDir().y, owner->GetAttackDir().y,
owner->GetSpeed() owner->GetSpeed()
})); }));
owner->room->xtimer.AddRepeatTimerAndAttach owner->room->xtimer.AddRepeatTimer
( (
2, 2,
a8::XParams() a8::Args({}),
.SetSender(owner), [this] (int event, const a8::Args& args, const a8::Args* user_args)
[] (const a8::XParams& param)
{ {
Human* hum = (Human*)param.sender.GetUserData(); if (a8::TIMER_EXEC_EVENT == event) {
hum->SendDebugMsg(a8::Format("xxxxxxxx move_dir:%d,%d attack_dir:%d,%d speed:%d", Human* hum = owner->AsHuman();
{ hum->SendDebugMsg(a8::Format("xxxxxxxx move_dir:%d,%d attack_dir:%d,%d speed:%d",
hum->GetMoveDir().x, {
hum->GetMoveDir().y, hum->GetMoveDir().x,
hum->GetAttackDir().x, hum->GetMoveDir().y,
hum->GetAttackDir().y, hum->GetAttackDir().x,
hum->GetSpeed() hum->GetAttackDir().y,
})); hum->GetSpeed()
}));
}
}, },
&xtimer_attacher.timer_list_ &xtimer_attacher
); );
} }
#endif #endif
} }
Player* hum = (Player*)caster_.Get(); Player* hum = (Player*)caster_.Get();
std::map<int, long long>* hited_objects = new std::map<int, long long>; auto hited_objects = std::make_shared<std::map<int, long long>>();
Position* pre_pos = new Position; auto pre_pos = std::make_shared<Position>();
*pre_pos = owner->GetPos(); *pre_pos = owner->GetPos();
owner->room->xtimer.AddRepeatTimerAndAttach owner->room->xtimer.AddRepeatTimer
( (
1, 1,
a8::XParams() a8::Args({}),
.SetSender(this) [this, hited_objects, pre_pos]
.SetParam1(hited_objects) (int event, const a8::Args& args, const a8::Args* user_args)
.SetParam2(pre_pos),
[] (const a8::XParams& param)
{ {
Buff* buff = (Buff*)param.sender.GetUserData(); Buff* buff = (Buff*)param.sender.GetUserData();
if (!buff->meta->param3_int_list.empty() || buff->skill_meta) { if (!buff->meta->param3_int_list.empty() || buff->skill_meta) {
@ -490,15 +479,7 @@ void Buff::ProcSprint()
*pre_pos = buff->owner->GetPos(); *pre_pos = buff->owner->GetPos();
} }
}, },
&xtimer_attacher.timer_list_, &xtimer_attacher);
[] (const a8::XParams& param, bool is_destory)
{
std::map<int, long long>* hited_objects = (std::map<int, long long>*)
param.param1.GetUserData();
a8::Vec2* pre_pos = (a8::Vec2*)param.param2.GetUserData();
delete pre_pos;
delete hited_objects;
});
} }
if (skill_meta) { if (skill_meta) {
switch (skill_meta->GetMagicId()) { switch (skill_meta->GetMagicId()) {