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-05-26 15:17:24 +08:00
parent 5350b1312d
commit 27c42cf76b
4 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/gameserver/bullet.cc
View File

@ -29,6 +29,7 @@
#include "stats.h" #include "stats.h"
#include "movement.h" #include "movement.h"
#include "hero.h" #include "hero.h"
#include "skill.h"
#include "mt/Param.h" #include "mt/Param.h"
#include "mt/Equip.h" #include "mt/Equip.h"
@ -1090,3 +1091,14 @@ void Bullet::ProcRequestBulletDmg(int shield_hit, int strength_wall_uniid, int t
} }
} }
} }
const mt::Skill* Bullet::GetSkillMeta()
{
if (sender.Get() && skill_meta) {
Skill* skill = sender.Get()->GetSkill(skill_meta->skill_id());
if (skill) {
return skill->GetCurrSkillMeta();
}
}
return skill_meta;
}

2
server/gameserver/bullet.h
View File

@ -48,7 +48,7 @@ class Bullet : public MoveableEntity, public IBullet
virtual const glm::vec3& GetDir() override { return dir; }; virtual const glm::vec3& GetDir() override { return dir; };
virtual float GetStrengthenWall() override { return strengthen_wall; }; virtual float GetStrengthenWall() override { return strengthen_wall; };
virtual long long GetWeaponUniId() override { return weapon_uniid; }; virtual long long GetWeaponUniId() override { return weapon_uniid; };
virtual const mt::Skill* GetSkillMeta() override {return skill_meta; }; virtual const mt::Skill* GetSkillMeta() override;
virtual const mt::Equip* GetGunMeta() override { return gun_meta; }; virtual const mt::Equip* GetGunMeta() override { return gun_meta; };
virtual const mt::Equip* GetBulletMeta() override { return meta; }; virtual const mt::Equip* GetBulletMeta() override { return meta; };
virtual CreatureWeakPtr GetSender() override { return sender; }; virtual CreatureWeakPtr GetSender() override { return sender; };

12
server/gameserver/lispenv.cc
View File

@ -6,6 +6,7 @@
#include "creature.h" #include "creature.h"
#include "glmhelper.h" #include "glmhelper.h"
#include "room.h" #include "room.h"
#include "skill.h"
#include "mt/Skill.h" #include "mt/Skill.h"
#include "mt/SkillNumber.h" #include "mt/SkillNumber.h"
@ -27,7 +28,16 @@ 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;
result = context_.buff->skill_meta->_number_meta->GetAttrByIdx(idx); if (context_.buff->GetCaster().Get()) {
Skill* skill = context_.buff->GetCaster().Get()->GetSkill(context_.buff->skill_meta->skill_id());
if (skill) {
result = skill->GetCurrSkillMeta()->_number_meta->GetAttrByIdx(idx);
} else {
result = context_.buff->skill_meta->_number_meta->GetAttrByIdx(idx);
}
} else {
result = context_.buff->skill_meta->_number_meta->GetAttrByIdx(idx);
}
return std::make_shared<a8::lisp::Value>(a8::lisp::Atom(result)); return std::make_shared<a8::lisp::Value>(a8::lisp::Atom(result));
}); });
RegisterCProc RegisterCProc

7
server/gameserver/virtualbullet.cc
View File

@ -10,6 +10,7 @@
#include "human.h" #include "human.h"
#include "stats.h" #include "stats.h"
#include "hero.h" #include "hero.h"
#include "skill.h"
#include "mt/Param.h" #include "mt/Param.h"
#include "mt/Buff.h" #include "mt/Buff.h"
@ -30,6 +31,12 @@ long long VirtualBullet::GetWeaponUniId()
const mt::Skill* VirtualBullet::GetSkillMeta() const mt::Skill* VirtualBullet::GetSkillMeta()
{ {
if (sender.Get() && skill_meta) {
Skill* skill = sender.Get()->GetSkill(skill_meta->skill_id());
if (skill) {
return skill->GetCurrSkillMeta();
}
}
return skill_meta; return skill_meta;
} }