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-09-06 14:18:18 +08:00
parent 5876b4f823
commit 1069407bc2
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/gameserver/battledatacontext.cc
View File

@ -8,6 +8,7 @@
#include "metamgr.h" #include "metamgr.h"
#include "creature.h" #include "creature.h"
#include "types.h" #include "types.h"
#include "bullet.h"
class HeroAbility class HeroAbility
{ {
@ -23,10 +24,14 @@ class WeaponAbility
{ {
public: public:
long long weapon_uniid = 0; long long weapon_uniid = 0;
MetaData::Equip* weapon1_meta = nullptr; MetaData::Equip* weapon_meta = nullptr;
std::array<float, kHAT_End> attr_abs_ = {}; std::array<float, kHAT_End> attr_abs_ = {};
std::array<float, kHAT_End> attr_rate_ = {}; std::array<float, kHAT_End> attr_rate_ = {};
float GetAtk()
{
return weapon_meta->i->atk();
}
}; };
float* GetAttrAbsPtr(std::array<float, kHAT_End>& attr, int attr_id) float* GetAttrAbsPtr(std::array<float, kHAT_End>& attr, int attr_id)
@ -325,7 +330,11 @@ float BattleDataContext::GetHeroTotalAtk()
float BattleDataContext::GetWeaponAtk(Bullet* bullet) float BattleDataContext::GetWeaponAtk(Bullet* bullet)
{ {
return 0; auto weapon = GetWeaponByUniId(bullet->weapon_uniid);
if (weapon) {
return weapon->GetAtk();
}
return bullet->gun_meta->i->atk();
} }
bool BattleDataContext::IsCrit() bool BattleDataContext::IsCrit()