diff --git a/server/gameserver/netdata.cc b/server/gameserver/netdata.cc index ae934854..1439db74 100644 --- a/server/gameserver/netdata.cc +++ b/server/gameserver/netdata.cc @@ -877,23 +877,12 @@ float BattleDataContext::GetMaxHP() float BattleDataContext::GetDef() { float def = hero_ability_->GetDef(); - def += owner_.Get()->GetAbility()->GetAttrAbs(kXHAT_Def); - def *= 1.0f + owner_.Get()->GetAbility()->GetAttrRate(kXHAT_Def); - def *= 1.0f + owner_.Get()->GetAbility()->GetAttrAddition(kXHAT_Def) - - owner_.Get()->GetAbility()->GetAttrRuduce(kXHAT_Def); return def; } float BattleDataContext::GetHeroTotalAtk() { float atk = hero_ability_->GetAtk(); - if (owner_.Get() && owner_.Get()->IsAndroid() && owner_.Get()->room->IsNewerMap()) { - atk /= 2.0f; - } - atk += owner_.Get()->GetAbility()->GetAttrAbs(kXHAT_Atk); - atk *= 1.0f + owner_.Get()->GetAbility()->GetAttrRate(kXHAT_Atk); - atk *= 1.0f + owner_.Get()->GetAbility()->GetAttrAddition(kXHAT_Atk) - - owner_.Get()->GetAbility()->GetAttrRuduce(kXHAT_Atk); return atk; }