From a78e2f06f4fde07608940c0b2fa4557b09642658 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 21 五月 2019 11:47:25 +0800
Subject: [PATCH] Merge branch 'master' into HazyRegion_1

---
 Fight/MapTransferUtility.cs |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/Fight/MapTransferUtility.cs b/Fight/MapTransferUtility.cs
index 3444059..c942ba2 100644
--- a/Fight/MapTransferUtility.cs
+++ b/Fight/MapTransferUtility.cs
@@ -327,7 +327,6 @@
                         yield return null;
                     }
                 }
-
                 _hero.MoveToPosition(_destPostion, 1);
                 yield break;
             }
@@ -1299,7 +1298,7 @@
         {
             float _fightConfigDist = _findLocation ? _npcLocation.scope : 4;
 
-            if (_chkDistSqrt < Mathf.Pow(_fightConfigDist, 2) || _npc != null)// 杩欓噷鐨�2M鏄殏瀹氬��
+            if (_chkDistSqrt < Mathf.Pow(_fightConfigDist, 2) || (_npc != null && PathFinder.WalkAble(_hero.Pos, _npc.Pos)))// 杩欓噷鐨�2M鏄殏瀹氬��
             {
                 _hero.Behaviour.StartHandupAI();
                 Clear();

--
Gitblit v1.8.0