From 77f28e3bf730bba63c59ab0ec31a877959d2442c Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Tue, 6 Sep 2022 13:27:52 +0800
Subject: [PATCH] 1

---
 server/gameserver/battledatacontext.cc | 9 +++++----
 server/gameserver/battledatacontext.h  | 7 +++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/server/gameserver/battledatacontext.cc b/server/gameserver/battledatacontext.cc
index bc100aac..9a446bea 100644
--- a/server/gameserver/battledatacontext.cc
+++ b/server/gameserver/battledatacontext.cc
@@ -270,7 +270,7 @@ void BattleDataContext::CalcBattleStat(struct PlayerStats* stats)
 
 float BattleDataContext::CalcDmg(Creature* target, Bullet* bullet)
 {
-    float total_atk = (GetTotalAtk() / 100 + 1) * GetWeaponAtk();
+    float total_atk = GetTotalAtk();
     float normal_dmg = total_atk * (1 - target->GetBattleContext()->GetDef() / 1000);
     float crit = IsCrit() ? GetCritRate() : 0;
     float dodge = IsDodge() ? GetDodgeRate() : 0;
@@ -280,17 +280,18 @@ float BattleDataContext::CalcDmg(Creature* target, Bullet* bullet)
 
 float BattleDataContext::GetTotalAtk()
 {
-    return 0;
+    float total_atk = (GetHeroTotalAtk() / 100 + 1) * GetWeaponAtk();
+    return total_atk;
 }
 
 float BattleDataContext::GetDef()
 {
-    return 0;
+    return def_;
 }
 
 float BattleDataContext::GetHeroTotalAtk()
 {
-    return 0;
+    return atk_;
 }
 
 float BattleDataContext::GetWeaponAtk()
diff --git a/server/gameserver/battledatacontext.h b/server/gameserver/battledatacontext.h
index 3711d3fc..22c20134 100644
--- a/server/gameserver/battledatacontext.h
+++ b/server/gameserver/battledatacontext.h
@@ -82,4 +82,11 @@ private:
 
     std::array<float, kHAT_End> weapon2_attr_abs_ = {};
     std::array<float, kHAT_End> weapon2_attr_rate_ = {};
+
+    float atk_ = 0;
+    float def_ = 0;
+    float crit_ = 0;
+    float crit_damage_rate = 0;
+    float dodge_ = 0;
+    float dodge_damage_rate = 0;
 };