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-03-30 15:56:13 +08:00
parent eaba681eab
commit 64081e1bc4
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/battledatacontext.cc
View File

@ -635,7 +635,7 @@ float BattleDataContext::CalcDmg(Creature* target, IBullet* bullet)
} }
float finaly_dmg = normal_dmg; float finaly_dmg = normal_dmg;
finaly_dmg *= (1 + owner_.Get()->GetAbility()->GetAttrAddition(kHVAT_Dmg)); //连加 finaly_dmg *= (1 + owner_.Get()->GetAbility()->GetAttrAddition(kHVAT_Dmg)); //连加
finaly_dmg *= target->GetAbility()->GetAttrRuduce(kHVAT_Dmg); //(1-减免) 连乘 finaly_dmg *= (1 - target->GetAbility()->GetAttrRuduce(kHVAT_Dmg)); //(1-减免) 连乘
finaly_dmg = std::max(1.0f, finaly_dmg); finaly_dmg = std::max(1.0f, finaly_dmg);
if (g_calc_dmg_context.is_crit) { if (g_calc_dmg_context.is_crit) {
@ -749,7 +749,7 @@ float BattleDataContext::GetWeaponAtk(IBullet* bullet)
} else { } else {
atk = bullet->GetGunMeta()->_atk; atk = bullet->GetGunMeta()->_atk;
} }
atk *= owner_.Get()->GetAbility()->GetAttrAddition(kHVAT_WeaponAtk); atk *= (1 + owner_.Get()->GetAbility()->GetAttrAddition(kHVAT_WeaponAtk));
return atk; return atk;
} }

3
server/gameserver/buff/callfunc.h
View File

@ -19,7 +19,8 @@ A8_DECLARE_CLASS_ENUM(BuffCallFunc_e, int,
kSummonHeroSpecDistance = 19, kSummonHeroSpecDistance = 19,
kClearSummonHero = 20, kClearSummonHero = 20,
kImmuneAllMove = 21, kImmuneAllMove = 21,
kDmgForward = 22 kDmgForward = 22,
kSetGunBuffId = 23
); );

1
server/gameserver/weapon.h
View File

@ -19,6 +19,7 @@ class Weapon
const mt::Equip* bullet_meta = nullptr; const mt::Equip* bullet_meta = nullptr;
const mt::Skill* skill_meta = nullptr; const mt::Skill* skill_meta = nullptr;
const std::vector<std::tuple<float, float, float, int, int, int>>* bullet_born_offset_ptr = nullptr; const std::vector<std::tuple<float, float, float, int, int, int>>* bullet_born_offset_ptr = nullptr;
int buff_id = 0;
void Clear(); void Clear();
void ToPB(Creature* c, cs::MFWeapon* pb_obj); void ToPB(Creature* c, cs::MFWeapon* pb_obj);