Merge branch 'master' into 3687天赋功能

client_linchunjie

2018-10-09 c5a1b1eb5f845f72b0b3e48fc8c7ccf75cee5831

 Fight/MapTransferUtility.cs

@@ -180,8 +180,15 @@
        }

    }



    public bool forceMove = false;



    public void MoveToNPC(int npcID, int sid = 0)

    {

        if (npcID != NpcID)

        {

            forceMove = false;

        }



        if (sid != 0)

        {

            GActor _actor = GAMgr.Instance.GetBySID((uint)sid);

@@ -352,6 +359,8 @@
                    var mapId = _npcLocation.mapId;

                    var position = new Vector3(_mapConfig.BornPoints[0].x, 0, _mapConfig.BornPoints[0].y);

                    Send_WorldTransfer(mapId, position, MapTransferType.WorldTransport, (byte)_lineID, npcID);

                    
                    forceMove = true;



                    if (BossFakeLineUtility.Instance.IsShuntBoss(npcID))

                    {

@@ -376,14 +385,17 @@
                    if (((lastMoveToWorldBossNpcID == npcID

                        && Time.realtimeSinceStartup - lastMoveToWorldBossTime < 60)

                        && PlayerDatas.Instance.baseData.FBID == 0)

                        || BossFakeLineUtility.Instance.showFakeLine

                        || (BossFakeLineUtility.Instance.showFakeLine && ModelCenter.Instance.GetModel<FindPreciousModel>().IsBossAlive(npcID))

                        || (_fairyBossModel.bosses != null

                        && _fairyBossModel.bosses.Contains(npcID)))

                        && _fairyBossModel.bosses.Contains(npcID))

                        || forceMove)

                    {

                        //Debug.LogFormat(" |-- 非想去的boss为60秒内行为产生且为同一只boss, {0}, {1}", BossFakeLineUtility.Instance.showFakeLine,

                        //PlayerDatas.Instance.baseData.FBID);

                        Vector3 _destPos = new Vector3(_npcLocation.position.x, _hero.Pos.y, _npcLocation.position.y);

                        _hero.MoveToPosition(_destPos, _npcLocation.scope);



                        forceMove = false;

                    }

                    else

                    {

@@ -398,6 +410,7 @@


                            //Debug.LogFormat(" |-- 非想去的boss记录,或则见到boss时差超过60秒");

                            Send_WorldTransfer(_npcLocation.mapId, new Vector3(_hero.Pos.x * 2, 0, _hero.Pos.z * 2), MapTransferType.WorldTransport, 0, npcID);

                            forceMove = true;

                        }

                        else

                        {