Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 Fight/Actor/Skill/FlyObject/FoTransmit.cs

@@ -108,6 +108,8 @@

                    if (m_FoTransMit.ammoEffectId > 0)
                    {
                        if (BattleEffectPlayRule.Instance.CanPlay(m_InitInfo.casterServerObjID))
                        {
                        SFXController _sfx = SFXPlayUtility.Instance.PlayBattleEffect(m_FoTransMit.ammoEffectId, _fight);
                        if (_sfx)
                        {
@@ -121,9 +123,9 @@

                            m_CacheAllEffect.Add(_sfx);
                        }

                        //Debug.LogFormat("播放特效: 开始: {0}, 结束: {1}", _start, _end);
                    }
                    }

                    if (_target2 != null)
                    {