Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 Fight/GameActor/GActorPlayerBase.cs

@@ -2323,10 +2323,13 @@
        SetAnimatorSpeed(JobSetup.RushAnimatorSpeed * Constants.F_DELTA);

        m_LastRushTime = Time.time;



        if (m_RushEffect == null)

        if (this is GA_Hero || BattleEffectPlayRule.Instance.CanPlay(ServerInstID))

        {

            m_RushEffect = SFXPlayUtility.Instance.PlayBattleEffect(50401, this);

            m_RushEffect.duration = 0;

            if (m_RushEffect == null)

            {

                m_RushEffect = SFXPlayUtility.Instance.PlayBattleEffect(50401, this);

                m_RushEffect.duration = 0;

            }

        }

    }