From 8a7fe19d4b6378e49fbd5d3bbf3545eda25d1347 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Tue, 6 Sep 2022 17:28:59 +0800
Subject: [PATCH] 1

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

diff --git a/server/gameserver/battledatacontext.cc b/server/gameserver/battledatacontext.cc
index 37d18610..b829ef3d 100644
--- a/server/gameserver/battledatacontext.cc
+++ b/server/gameserver/battledatacontext.cc
@@ -348,6 +348,11 @@ float BattleDataContext::CalcDmg(Creature* target, Bullet* bullet)
     return finaly_dmg;
 }
 
+float BattleDataContext::CalcDmg(Obstacle* target, Bullet* bullet)
+{
+
+}
+
 float BattleDataContext::GetTotalAtk(Bullet* bullet)
 {
     float total_atk = (GetHeroTotalAtk() / 100 + 1) * GetWeaponAtk(bullet);
diff --git a/server/gameserver/battledatacontext.h b/server/gameserver/battledatacontext.h
index 1899d195..0748b95c 100644
--- a/server/gameserver/battledatacontext.h
+++ b/server/gameserver/battledatacontext.h
@@ -22,6 +22,7 @@ namespace MetaData
 
 class Creature;
 class Bullet;
+class Obstacle;
 struct PlayerStats;
 class HeroAbility;
 class WeaponAbility;
@@ -53,6 +54,7 @@ struct BattleDataContext
     void CalcBattleStat(struct PlayerStats* stats);
 
     float CalcDmg(Creature* target, Bullet* bullet);
+    float CalcDmg(Obstacle* target, Bullet* bullet);
 
     float GetDef();
 
diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index 50f2c3a0..cc2c868c 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -1819,9 +1819,11 @@ void Human::FollowTarget(Human* target)
 
 void Human::SendDebugMsg(const std::string& debug_msg)
 {
+#ifdef DEBUG
     cs::SMDebugMsg notify_msg;
     notify_msg.set_debug_msg(a8::TimestampToDateTime(time(nullptr)) + " " + debug_msg);
     SendNotifyMsg(notify_msg);
+#endif
 }
 
 void Human::UpdateAction()
diff --git a/server/gameserver/obstacle.cc b/server/gameserver/obstacle.cc
index 48cf4a7c..4138b954 100644
--- a/server/gameserver/obstacle.cc
+++ b/server/gameserver/obstacle.cc
@@ -509,10 +509,6 @@ void Obstacle::OnBulletHit(Bullet* bullet)
         float atk_rate = 0;
         float def_rate = 0;
         bullet->CalcDmg(this, finaly_dmg, atk_rate, def_rate);
-#else
-        float dmg = bullet->GetAtk();
-        float def = 0;
-        float finaly_dmg = dmg * (1 - def/MetaMgr::Instance()->K);
 #endif
         SetHealth(bullet->room, std::max(0.0f, GetHealth(bullet->room) - finaly_dmg));
         if (GetHealth(bullet->room) <= 0.01f) {