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-10-09 10:53:18 +08:00
parent f13fe5ec82
commit 4515648841
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/battledatacontext.h
View File

@ -69,11 +69,11 @@ struct BattleDataContext
int GetClipVolume(Creature* c, Weapon* weapon); int GetClipVolume(Creature* c, Weapon* weapon);
int GetFireRate(Creature* c, Weapon* weapon); int GetFireRate(Creature* c, Weapon* weapon);
int GetReloadTime(Creature* c, Weapon* weapon); int GetReloadTime(Creature* c, Weapon* weapon);
float GetHeroTotalAtk();
private: private:
void Clear(); void Clear();
float GetTotalAtk(Bullet* bullet); float GetTotalAtk(Bullet* bullet);
float GetHeroTotalAtk();
float GetWeaponAtk(Bullet* bullet); float GetWeaponAtk(Bullet* bullet);
bool IsCrit(Bullet* bullet); bool IsCrit(Bullet* bullet);
float GetCrit(Bullet* bullet); float GetCrit(Bullet* bullet);

7
server/gameserver/skillhelper.cc
View File

@ -251,12 +251,17 @@ bool SkillHelper::ProcBulletDmg(Bullet* bullet, Creature* target, float& finaly_
{ {
finaly_dmg = 0.0f; finaly_dmg = 0.0f;
MetaData::Skill* skill_meta = bullet->skill_meta; MetaData::Skill* skill_meta = bullet->skill_meta;
if (!skill_meta) { if (!skill_meta || skill_meta->number_meta) {
return false; return false;
} }
switch (skill_meta->GetMagicId()) { switch (skill_meta->GetMagicId()) {
case MAGIC_AXXF: case MAGIC_AXXF:
{ {
finaly_dmg =
(skill_meta->number_meta->float_ratio +
skill_meta->number_meta->float_ratio * target->GetBattleContext()->GetHeroTotalAtk()) *
(1 - target->GetBattleContext()->GetDef() / 1000);
return true;
} }
break; break;
default: default: