Merge branch 'master' into HazyRegion

client_linchunjie

2019-04-10 8a345b8ee784063d94575c8df5e42f7f04090aab

 Fight/Stage/MapEditor/Game/ClientSceneManager.cs

@@ -276,6 +276,7 @@

    public Vector3 GetNext1(Vector3 start, Vector3 dest)
    {
        count = 0;
        m_ChkedList1.Clear();

        if (PathFinder.WalkAble(start, dest))
@@ -464,6 +465,7 @@
                var _tp = _t.transferPoints[i];
                if (PathFinder.WalkAble(next, _tp.position))
                {
                    //Debug.Log("_tp.position : " + _tp.position);
                    if (i == 0)
                    {
                        _targetPos = _t.transferPoints[_t.transferPoints.Length - 1].position;
@@ -474,19 +476,25 @@
                    }

                    m_ChkedList.Add(_t);

                    if (PathFinder.WalkAble(start, _targetPos))
                    {
                        return _targetPos;
                    }
                    else
                    {
                        _targetPos = GetNext(start, _targetPos);
                    }
                    break;
                }
            }
            if (_targetPos != Vector3.zero)
            {
                break;
            }
        }

        if (PathFinder.WalkAble(start, _targetPos))
        {
            return _targetPos;
        }
        else
        {
            _targetPos = GetNext(start, _targetPos);
        }
        //Debug.Log("_targetPos: " + _targetPos);

        return _targetPos;
    }