Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-10-23 10d72d55cb32bbc2a323d4529fadc2ded2f0f19f

 Fight/Actor/Skill/FlyObject/FoTransmit.cs

@@ -31,6 +31,8 @@
        return _result;
    }

    protected sealed override void PlayEffect() { }

    protected sealed override void OnUpdate()
    {
        if (IsOver())
@@ -121,9 +123,22 @@
                                _controller.enabled = true;
                                _sfx.m_OnFinished += OnSFXDisable;

                                if (_start)
                                {
                                    _sfx.transform.position = _start.position;
                                }
                                if (_end)
                                {
                                    _sfx.transform.LookAt(_end.position);
                                }
                                if (_start && _end)
                                {
                                    _sfx.transform.localScale = new Vector3(1, 1, Vector3.Distance(_end.position, _start.position));
                                }

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

@@ -158,7 +173,8 @@
    public sealed override bool IsOver()
    {
        return m_HurtClientList == null
            || m_Index > m_HurtClientList.Count - 1;
            || m_Index > m_HurtClientList.Count - 1
            || GA_Hero.s_MapSwitching;
    }

    private void RecycleAllEffect()