This commit is contained in:
aozhiwei 2023-03-09 12:10:19 +08:00
parent f3dca9c477
commit d6985c1063

View File

@ -543,12 +543,12 @@ float BattleDataContext::CalcDmg(Creature* target, IBullet* bullet)
break; break;
} }
} }
float normal_dmg = total_atk * (1 - target->GetBattleContext()->GetDef() / (target->GetBattleContext()->GetDef() + 400)); float normal_dmg = total_atk * (1 - target->GetBattleContext()->GetDef() / (target->GetBattleContext()->GetDef() + 200));
normal_dmg *= 1 + bullet->GetStrengthenWall(); normal_dmg *= 1 + bullet->GetStrengthenWall();
float crit = g_calc_dmg_context.is_crit ? GetCritRate(bullet) : 0; float crit = g_calc_dmg_context.is_crit ? GetCritRate(bullet) : 0;
float dodge = IsDodge(bullet) ? GetDodgeRuduce(bullet) : 0; float dodge = IsDodge(bullet) ? GetDodgeRuduce(bullet) : 0;
float finaly_dmg = normal_dmg * (1.0f + crit + dodge); float finaly_dmg = normal_dmg * (1.0f + crit + dodge);
finaly_dmg *= (1 + target->GetAbility()->GetDmgAddition()); finaly_dmg *= (1 + owner_->GetAbility()->GetDmgAddition());
finaly_dmg *= (1 - target->GetAbility()->GetDmgRuduce()); finaly_dmg *= (1 - target->GetAbility()->GetDmgRuduce());
#if 1 #if 1
finaly_dmg *= (1 + bullet->GetStrengthenWall()); finaly_dmg *= (1 + bullet->GetStrengthenWall());
@ -629,7 +629,7 @@ float BattleDataContext::CalcDmg(Explosion* e)
float BattleDataContext::GetTotalAtk(IBullet* bullet) float BattleDataContext::GetTotalAtk(IBullet* bullet)
{ {
float total_atk = (GetHeroTotalAtk() / 100 + 1) * GetWeaponAtk(bullet); float total_atk = (GetHeroTotalAtk() / 100 + 0) * GetWeaponAtk(bullet);
return total_atk; return total_atk;
} }