From ab77a051d67ca66b438956cf42ec91baa882f76d Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sun, 9 Oct 2022 14:16:11 +0800
Subject: [PATCH] 1

---
 server/gameserver/bullet.cc | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc
index a889aa68..1621e363 100644
--- a/server/gameserver/bullet.cc
+++ b/server/gameserver/bullet.cc
@@ -493,9 +493,25 @@ void Bullet::Check(float distance)
                          }
                     }
                 } else if (obstacle->meta->i->thing_type() == kObstacleStrengthenWall) {
-                    if (!strengthened_ && TestCollision(room, collider)) {
-                        strengthened_ = true;
-                        OnStrengthen(obstacle);
+                    if (!strengthened_ && sender.Get() &&
+                        sender.Get()->team_id == obstacle->GetTeamId(room)) {
+                        bool ret = Check2dRotationRectangle
+                            (GetPos().x,
+                             GetPos().y,
+                             gun_meta->i->bullet_rad(),
+                             obstacle->GetPos().x,
+                             obstacle->GetPos().y,
+                             obstacle->meta->i->width(),
+                             obstacle->meta->i->height(),
+                             obstacle->GetRotate() * 180.0f
+                             );
+                        if (ret) {
+                            strengthened_ = true;
+                            OnStrengthen(obstacle);
+#ifdef DEBUG
+                            a8::XPrintf("命中能量墙\n", {});
+#endif
+                        }
                     }
                 }
             }