From 78bfe524ea4776c47f6314e56e97f39970b00fce Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 25 九月 2018 15:07:07 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能

---
 Fight/GameActor/GActorPlayerBase.cs |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Fight/GameActor/GActorPlayerBase.cs b/Fight/GameActor/GActorPlayerBase.cs
index 2a1a3ec..c74caee 100644
--- a/Fight/GameActor/GActorPlayerBase.cs
+++ b/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;
+            }
         }
     }
 

--
Gitblit v1.8.0