From e2e59b506aed79ba59b3af65ac3cab66ec9ac158 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 28 Feb 2023 17:22:58 +0800
Subject: [PATCH] 1

---
 server/gameserver/buff/hold_shield.cc | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/server/gameserver/buff/hold_shield.cc b/server/gameserver/buff/hold_shield.cc
index 149f8e41..c68c4d29 100644
--- a/server/gameserver/buff/hold_shield.cc
+++ b/server/gameserver/buff/hold_shield.cc
@@ -101,6 +101,7 @@ void HoldShieldBuff::OnShieldDestory(const a8::Args& params)
              if (sender.Get() && e->IsCreature(sender.Get()->room)) {
                  Creature* c = (Creature*)e;
                  glm::vec3 target_pos = sender.Get()->GetPos().ToGlmVec3();
+                 #if 0
                  target_pos = target_pos + (sender.Get()->GetAttackDir() * (float)SkillHelper::GetCmxdRange(this_skill_meta) / 2.0f);
                  bool ret = Collision::Check2dRotationRectangle
                      (c->GetPos().GetX(),
@@ -115,12 +116,13 @@ void HoldShieldBuff::OnShieldDestory(const a8::Args& params)
                  if (ret) {
                      *is_hit = true;
                  }
+                 #endif
              }
          }
          );
     e->SetHitCb
         (
-         [sender, skill_meta] (const a8::Args& args) mutable
+         [this, sender] (const a8::Args& args) mutable
          {
              if (sender.Get()) {
                  Entity* e = args.Get<Entity*>(0);
@@ -158,24 +160,8 @@ void HoldShieldBuff::OnShieldDestory(const a8::Args& params)
         (
          owner->GetWeakPtrRef(),
          owner->GetPos(),
-         SkillHelper::GetCmxdRange(meta),
-         SkillHelper::GetCmxdExplosion(meta),
+         skill_meta->_number_meta->_float_range2,
+         SkillHelper::GetCmxdExplosion(skill_meta),
          0
          );
-#ifdef DEBUG
-    {
-        std::string dbg_msg = a8::Format
-            (
-             "skill_id:%d 此面向 range:%f range2:%f ratio:%f time:%f",
-             {
-                 meta->skill_id(),
-                     meta->_number_meta->_float_range,
-                     meta->_number_meta->_float_range2,
-                     meta->_number_meta->_float_ratio,
-                     meta->_number_meta->_float_time
-                     });
-        owner->SendDebugMsg(dbg_msg);
-        a8::XPrintf("%s\n", {dbg_msg});
-    }
-#endif
 }