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 2024-01-15 17:14:17 +08:00
parent e897acee6f
commit dd569315b2
6 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/buff.cc
View File

@ -94,11 +94,7 @@ void Buff::InternalTimerAddBuff()
auto caster_state = std::make_shared<SkillCasterState>(); auto caster_state = std::make_shared<SkillCasterState>();
caster_.Get()->FillSkillCasterState(caster_state.get()); caster_.Get()->FillSkillCasterState(caster_state.get());
#if 1
const mt::Skill* skill = skill_meta; const mt::Skill* skill = skill_meta;
#else
const mt::Skill* skill = caster_.Get()->CurrentSkillMeta();
#endif
auto timer_func = auto timer_func =
[this, caster_state, skill] (int event, const a8::Args* args) [this, caster_state, skill] (int event, const a8::Args* args)
{ {

3
server/gameserver/bullet.cc
View File

@ -1121,9 +1121,6 @@ void Bullet::ProcRequestBulletDmg(int shield_hit, int strength_wall_uniid, int t
const mt::Skill* Bullet::GetSkillMeta() const mt::Skill* Bullet::GetSkillMeta()
{ {
if (sender.Get() && skill_meta) {
return sender.Get()->GetAdjustSkillMeta(skill_meta);
}
return skill_meta; return skill_meta;
} }

15
server/gameserver/creature.cc
View File

@ -1096,12 +1096,6 @@ Skill* Creature::CurrentSkill()
return curr_skill_; return curr_skill_;
} }
const mt::Skill* Creature::CurrentSkillMeta()
{
const mt::Skill* skill_meta = CurrentSkill() ? CurrentSkill()->GetCurrSkillMeta() : nullptr;
return skill_meta;
}
void Creature::ActiveAllSkill() void Creature::ActiveAllSkill()
{ {
for (auto& pair : skill_hash_) { for (auto& pair : skill_hash_) {
@ -3565,15 +3559,6 @@ void Creature::ClearGemStoneBuffs()
gemstone_hold_buffs.clear(); gemstone_hold_buffs.clear();
} }
const mt::Skill* Creature::GetAdjustSkillMeta(const mt::Skill* skill_meta)
{
Skill* skill = GetSkill(skill_meta->_base_skill_meta->skill_id());
if (skill) {
return skill->GetCurrSkillMeta();
}
return skill_meta;
}
void Creature::AddIgnoreTarget(int target_uniid, int time) void Creature::AddIgnoreTarget(int target_uniid, int time)
{ {
DelIgnoreTarget(target_uniid); DelIgnoreTarget(target_uniid);

2
server/gameserver/creature.h
View File

@ -212,7 +212,6 @@ class Creature : public MoveableEntity
void TriggerBuff(Skill* skill, std::set<Creature*>& target_list, BuffTriggerType_e trigger_type); void TriggerBuff(Skill* skill, std::set<Creature*>& target_list, BuffTriggerType_e trigger_type);
Skill* GetSkill(int skill_id); Skill* GetSkill(int skill_id);
Skill* GetMainSkill(); Skill* GetMainSkill();
const mt::Skill* GetAdjustSkillMeta(const mt::Skill* skill_meta);
int GetSkillTargetId() { return skill_target_id_; }; int GetSkillTargetId() { return skill_target_id_; };
void AddSkill(int skill_id); void AddSkill(int skill_id);
void ClearSkill(); void ClearSkill();
@ -242,7 +241,6 @@ class Creature : public MoveableEntity
); );
void ResetSkill(); void ResetSkill();
Skill* CurrentSkill(); Skill* CurrentSkill();
const mt::Skill* CurrentSkillMeta();
void ActiveAllSkill(); void ActiveAllSkill();
const mt::SkillPhase* GetCurrSkillPhase(); const mt::SkillPhase* GetCurrSkillPhase();
bool CanSee(const Creature* c) const; bool CanSee(const Creature* c) const;

2
server/gameserver/lispenv.cc
View File

@ -29,7 +29,7 @@ public:
a8::lisp::Atom atom = std::any_cast<a8::lisp::Atom>(params->at(0)->value); a8::lisp::Atom atom = std::any_cast<a8::lisp::Atom>(params->at(0)->value);
int idx = atom.val; int idx = atom.val;
if (context_.buff->GetCaster().Get()) { if (context_.buff->GetCaster().Get()) {
result = context_.buff->GetCaster().Get()->GetAdjustSkillMeta(context_.buff->skill_meta)->_number_meta->GetAttrByIdx(idx); result = context_.buff->skill_meta->_number_meta->GetAttrByIdx(idx);
} else { } else {
result = context_.buff->skill_meta->_number_meta->GetAttrByIdx(idx); result = context_.buff->skill_meta->_number_meta->GetAttrByIdx(idx);
} }

3
server/gameserver/virtualbullet.cc
View File

@ -31,9 +31,6 @@ long long VirtualBullet::GetWeaponUniId()
const mt::Skill* VirtualBullet::GetSkillMeta() const mt::Skill* VirtualBullet::GetSkillMeta()
{ {
if (sender.Get() && skill_meta) {
return sender.Get()->GetAdjustSkillMeta(skill_meta);
}
return skill_meta; return skill_meta;
} }