From b8f35857b4e64a78e44e8433f37fb3e8a8ed3f82 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 30 Apr 2020 10:53:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/gameserver/human.cc | 55 -------------------------------------- 1 file changed, 55 deletions(-) diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 577895f..0fe03b5 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -572,61 +572,6 @@ void Human::FindPathInMapService() } } SetPos(old_pos); - if (entity_subtype == EST_Player && last_collider && last_collider->type == CT_Aabb) { - #if 0 - AabbCollider* aabb_collider = (AabbCollider*)last_collider; - #endif - if (GetPos().x > last_collider->owner->GetPos().x) { - //在右边 - if (GetPos().y > last_collider->owner->GetPos().y) { - //右上 - #ifdef DEBUG - a8::XPrintf("右上\n", {}); - #endif - if (move_dir.Dot(a8::Vec2(1, -1)) > 0.000002f) { - SetPos(old_pos + a8::Vec2(2, 0)); - } else { - SetPos(old_pos + a8::Vec2(0, 2)); - } - } else { - //右下 - #ifdef DEBUG - a8::XPrintf("右下\n", {}); - #endif - if (move_dir.Dot(a8::Vec2(-1, 1)) > 0.000002f) { - SetPos(old_pos + a8::Vec2(2, 0)); - } else { - SetPos(old_pos + a8::Vec2(0, -2)); - } - } - } else { - //左边 - if (GetPos().y > last_collider->owner->GetPos().y) { - //左上 - #ifdef DEBUG - a8::XPrintf("左上\n", {}); - #endif - if (move_dir.Dot(a8::Vec2(-1, -1)) > 0.000001f) { - SetPos(old_pos + a8::Vec2(-2, 0)); - } else { - SetPos(old_pos + a8::Vec2(0, 2)); - } - } else { - //左下 - #ifdef DEBUG - a8::XPrintf("左下\n", {}); - #endif - if (move_dir.Dot(a8::Vec2(1, -1)) > 0.000001f) { - SetPos(old_pos + a8::Vec2(-2, 0)); - } else { - SetPos(old_pos + a8::Vec2(0, -2)); - } - } - } - } - if (IsCollisionInMapService()) { - SetPos(old_pos); - } } float Human::GetRadius()