Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2019-04-18 1f5ac3a686ecb0c7771b85ef84757cd4f440f5b3

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 Fight/GameActor/GA_Player.cs

@@ -574,28 +574,31 @@
        }

        else if ((E_AttackMode)PlayerDatas.Instance.baseData.AttackMode == E_AttackMode.Family)

        {

            // 判断队伍

            if (ActorInfo.teamID != 0

             && ActorInfo.teamID != 0

             && ActorInfo.teamID == ActorInfo.teamID)

            if (_hero != null)

            {

                return false;

            }

                // 判断队伍

                if (ActorInfo.teamID != 0

                 && _hero.ActorInfo.teamID != 0

                 && ActorInfo.teamID == _hero.ActorInfo.teamID)

                {

                    return false;

                }



            // 判断阵营

            if (ActorInfo.faction != 0

             && ActorInfo.faction != 0

             && ActorInfo.faction == ActorInfo.faction)

            {

                return false;

            }

                // 判断阵营

                if (ActorInfo.faction != 0

                 && _hero.ActorInfo.faction != 0

                 && ActorInfo.faction == _hero.ActorInfo.faction)

                {

                    return false;

                }



            // 判断仙盟

            if (ActorInfo.familyID != 0

             && ActorInfo.familyID != 0

             && ActorInfo.familyID == ActorInfo.familyID)

            {

                return false;

                // 判断仙盟

                if (ActorInfo.familyID != 0

                 && _hero.ActorInfo.familyID != 0

                 && ActorInfo.familyID == _hero.ActorInfo.familyID)

                {

                    return false;

                }

            }



            if (StatusMgr.Instance.IsExist(ServerInstID, StatusMgr.Instance.redNameBuffID))


 Fight/Stage/MapEditor/Game/ClientSceneManager.cs

@@ -276,6 +276,11 @@

    public Vector3 GetNext1(Vector3 start, Vector3 dest)
    {
        if (m_MapData == null)
        {
            return Vector3.zero;
        }

        count = 0;
        m_ChkedList1.Clear();

@@ -447,7 +452,7 @@
    private Vector3 GetNext(Vector3 start, Vector3 next)
    {
        count += 1;
        if (count > 20 || next == Vector3.zero)
        if (count > 20 || next == Vector3.zero || m_MapData == null)
        {
            return Vector3.zero;
        }