Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 Fight/PreFightMission.cs

@@ -631,7 +631,8 @@


        if (GA_Hero.s_MapSwitching)

        {

            if (PlayerDatas.Instance.hero.IsRun())

            if (PlayerDatas.Instance.hero != null

             && PlayerDatas.Instance.hero.IsRun())

            {

                PlayerDatas.Instance.hero.IdleImmediate();

            }

@@ -1555,7 +1556,9 @@
        {

            yield break;

        }



        
        CameraController.Instance.MaskCamera.gameObject.SetActive(false);

        
        if (m_MoveToEffect)

        {

            SFXPlayUtility.Instance.Release(m_MoveToEffect);