Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 Fight/Actor/State/SMB/STM_BaseAttack.cs

@@ -934,6 +934,11 @@
            }

        }



        if (owner is GA_Player && !BattleEffectPlayRule.Instance.CanPlay(owner.ServerInstID))

        {

            return;

        }



        SFXController _controller = SFXPlayUtility.Instance.PlayBattleEffect(id, owner);

        if (_controller)

        {