1

2023-01-03 19:28:39 +08:00 · 2023-01-03 19:28:39 +08:00 · 9e2ca60298
commit 9e2ca60298
parent 60cfa50cc4
1 changed files with 26 additions and 1 deletions
--- a/server/gameserver/bullet.cc
+++ b/server/gameserver/bullet.cc
@ -723,8 +723,33 @@ void Bullet::GetHitThings(BulletCheckResult& result)
    #if 1
    room->TraverseEntityList
        (
-         [] (Entity* e)
+         [this] (Entity* e)
         {
+             if (e->IsEntityType(ET_Obstacle)) {
+                 Obstacle* ob = (Obstacle*)e;
+                 if (ob->meta->thing_type() == kObstacleStrengthenWall) {
+                     if (!strengthened_ && sender.Get() &&
+                         sender.Get()->team_id == ob->GetTeamId(room)) {
+                         bool ret = Collision::Check2dRotationRectangle
+                             (GetPos().x,
+                              GetPos().y,
+                              gun_meta->bullet_rad(),
+                              ob->GetPos().x,
+                              ob->GetPos().y,
+                              ob->meta->width(),
+                              ob->meta->height(),
+                              ob->GetRotate() * 180.0f
+                              );
+                         if (ret) {
+                             strengthened_ = true;
+                             OnStrengthen(ob);
+#ifdef DEBUG
+                             a8::XPrintf("命中能量墙\n", {});
+#endif
+                         }
+                     }
+                 }
+             }
             return true;
         });
    #else