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/Actor/Status/Status_Base.cs | 45 ++++++++++++++++++++++++---------------------
1 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/Fight/Actor/Status/Status_Base.cs b/Fight/Actor/Status/Status_Base.cs
index 5050ed0..3351646 100644
--- a/Fight/Actor/Status/Status_Base.cs
+++ b/Fight/Actor/Status/Status_Base.cs
@@ -32,32 +32,35 @@
GActorFight _target = GAMgr.Instance.GetBySID(data.ObjID) as GActorFight;
- if (_target != null)
+ if (!(_target is GA_Player) || BattleEffectPlayRule.Instance.CanPlay(data.ObjID))
{
- if (m_SkillConfig.BuffEffectID > 0)
+ if (_target != null)
{
- if (m_Effect)
+ if (m_SkillConfig.BuffEffectID > 0)
{
- SFXPlayUtility.Instance.Release(m_Effect);
- }
-
- bool _playEffect = true;
-
- if (h0605.ObjID != PlayerDatas.Instance.PlayerId)
- {
- if (!_target.ShowOrHide
- || SystemSetting.Instance.GetCurrentQualityLevel() == GameQuality.Low)
- {
- _playEffect = false;
- }
- }
-
- if (_playEffect)
- {
- m_Effect = SFXPlayUtility.Instance.PlayBattleEffect(m_SkillConfig.BuffEffectID, _target);
if (m_Effect)
{
- m_Effect.m_OnFinished += OnEffectOver;
+ SFXPlayUtility.Instance.Release(m_Effect);
+ }
+
+ bool _playEffect = true;
+
+ if (h0605.ObjID != PlayerDatas.Instance.PlayerId)
+ {
+ if (!_target.ShowOrHide
+ || SystemSetting.Instance.GetCurrentQualityLevel() == GameQuality.Low)
+ {
+ _playEffect = false;
+ }
+ }
+
+ if (_playEffect)
+ {
+ m_Effect = SFXPlayUtility.Instance.PlayBattleEffect(m_SkillConfig.BuffEffectID, _target);
+ if (m_Effect)
+ {
+ m_Effect.m_OnFinished += OnEffectOver;
+ }
}
}
}
--
Gitblit v1.8.0