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

client_linchunjie

2018-09-06 520a55769c8a533659be0c1d53dcc8548024e496

 Fight/Actor/HeroBehaviour.cs

@@ -324,9 +324,16 @@
            return;

        }



        if (skill == null || GA_Hero.s_MapSwitching)

        if (!PreFightMission.Instance.IsFinished() && skill.id == 190)

        {

            return;



        }

        else

        {

            if (skill == null || GA_Hero.s_MapSwitching)

            {

                return;

            }

        }



        if (m_Hero.ActorInfo.serverDie)