From d57f0681f2184505e05a2bc1c970fb058b157f50 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Tue, 6 Sep 2022 19:50:35 +0800
Subject: [PATCH] 1

---
 server/gameserver/battledatacontext.cc | 41 ++++++++++++++++++++++++++
 server/gameserver/human.cc             |  4 +++
 2 files changed, 45 insertions(+)

diff --git a/server/gameserver/battledatacontext.cc b/server/gameserver/battledatacontext.cc
index 7c9e0572..3396b827 100644
--- a/server/gameserver/battledatacontext.cc
+++ b/server/gameserver/battledatacontext.cc
@@ -245,6 +245,21 @@ float BattleDataContext::CalcDmg(Creature* target, Bullet* bullet)
     float crit = IsCrit() ? GetCritRate() : 0;
     float dodge = IsDodge() ? GetDodgeRuduce() : 0;
     float finaly_dmg = normal_dmg * (1.0f + crit + dodge);
+#ifdef DEBUG
+    if (owner_.Get()->IsPlayer()) {
+        std::string data = a8::Format
+            ("数值: 子弹攻击怪物 total_atk:%f normal_dmg:%f crit:%f dodge:%f finaly_dmg:%f target_def:%f",
+             {
+              total_atk,
+              normal_dmg,
+              crit,
+              dodge,
+              finaly_dmg,
+              target->GetBattleContext()->GetDef()
+             });
+        owner_.Get()->SendDebugMsg(data);
+    }
+#endif
     return finaly_dmg;
 }
 
@@ -255,12 +270,38 @@ float BattleDataContext::CalcDmg(Obstacle* target, Bullet* bullet)
     float crit = IsCrit() ? GetCritRate() : 0;
     float dodge = IsDodge() ? GetDodgeRuduce() : 0;
     float finaly_dmg = normal_dmg * (1.0f + crit + dodge);
+#ifdef DEBUG
+    if (owner_.Get()->IsPlayer()) {
+        std::string data = a8::Format
+            ("数值: 子弹攻击物件 total_atk:%f normal_dmg:%f crit:%f dodge:%f finaly_dmg:%f target_def:%f",
+             {
+              total_atk,
+              normal_dmg,
+              crit,
+              dodge,
+              finaly_dmg,
+              0
+             });
+        owner_.Get()->SendDebugMsg(data);
+    }
+#endif
     return finaly_dmg;
 }
 
 float BattleDataContext::CalcDmg(Explosion* e)
 {
     float finaly_dmg = (1 - GetDef() / 1000) / 2 * 100;
+#ifdef DEBUG
+    if (owner_.Get()->IsPlayer()) {
+        std::string data = a8::Format
+            ("数值: 爆炸伤害 finaly_dmg:%f def:%f",
+             {
+              finaly_dmg,
+              GetDef()
+             });
+        owner_.Get()->SendDebugMsg(data);
+    }
+#endif
     return finaly_dmg;
 }
 
diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index 525cdcae..6dd3091b 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -1821,7 +1821,11 @@ void Human::SendDebugMsg(const std::string& debug_msg)
 {
 #ifdef DEBUG
     cs::SMDebugMsg notify_msg;
+    #if 1
+    notify_msg.set_debug_msg(debug_msg);
+    #else
     notify_msg.set_debug_msg(a8::TimestampToDateTime(time(nullptr)) + " " + debug_msg);
+    #endif
     SendNotifyMsg(notify_msg);
 #endif
 }