Merge branch 'master' into HazyRegion_1

client_linchunjie

2019-05-20 24bbaa41b8b5ce88cd567863703189ee5ab78c39

Merge branch 'master' into HazyRegion_1

 Core/SFX/SFXController.cs

@@ -174,7 +174,10 @@
                }

            }

        }

    }



    public void SetPaticleSystemSpeed(float speed)

    {

        if (m_CacheParticleSystem != null)

        {

            ParticleSystem.MainModule _mainModule;


 Core/SFX/SFXPlayUtility.cs

@@ -278,6 +278,7 @@
        }



        sfx.SetAnimatorSpeed(1);

        sfx.SetPaticleSystemSpeed(1);

        _pool.Release(sfx);

    }




 Fight/Actor/State/SMB/STM_BaseAttack.cs

@@ -332,6 +332,7 @@
        for (int i = 0; i < m_CastedEffect.Count; ++i)

        {

            m_CastedEffect[i].SetAnimatorSpeed(speed);

            m_CastedEffect[i].SetPaticleSystemSpeed(speed);

        }

    }



@@ -1016,6 +1017,7 @@
        if (_controller)

        {

            _controller.SetAnimatorSpeed(m_EffectAnimatorSpeed);

            _controller.SetPaticleSystemSpeed(m_EffectAnimatorSpeed);

            m_CastedEffect.Add(_controller);

        }

    }


 Fight/MapTransferUtility.cs

@@ -299,6 +299,35 @@
                NpcID = NpcID;

                MapTransferDoType = E_MapTransferDoType.Npc;



                while (true)

                {

                    if (PathFinder.WalkAble(_hero.Pos, _destPostion))

                    {

                        break;

                    }

                    Vector3 _nextPos;

                    if (!ClientSceneManager.Instance.AAA(_hero.Pos, _destPostion, out _nextPos))

                    {

                        Debug.LogErrorFormat("移动至NPC: {0} 时找不到任何跳跃点, NextPos: {1}", NpcID, _nextPos);

                        break;

                    }

                    float _dis = MathUtility.DistanceSqrtXZ(_hero.Pos, _nextPos);

                    while (_dis > 0.01f)

                    {

                        _dis = MathUtility.DistanceSqrtXZ(_hero.Pos, _nextPos);

                        _hero.MoveToPosition(_nextPos);

                        yield return null;

                    }

                    while (!GA_Hero.s_Flying)

                    {

                        yield return null;

                    }

                    while (GA_Hero.s_Flying)

                    {

                        yield return null;

                    }

                }



                _hero.MoveToPosition(_destPostion, 1);

                yield break;

            }

@@ -787,6 +816,7 @@
    private void MoveToExistNpc(int npcID, GActor npc)

    {

        GA_Hero _hero = PlayerDatas.Instance.hero;

        Debug.Log("11111111111111");



        NPCConfig _config = NPCConfig.Get(npcID);




 Fight/Stage/MapEditor/Game/TransferGroup.cs

@@ -124,6 +124,17 @@
                        _pkg.MoveType = 0;
                        GameNetSystem.Instance.SendInfo(_pkg);
                        m_FlyingEffect = SFXPlayUtility.Instance.PlayBattleEffect(1180, _hero);
                        var _scaleTime = 1f;
                        if (isPositive)
                        {
                            _scaleTime = m_Data.transferPoints[targetPoint - 1].flyTimeFront / 2;
                        }
                        else
                        {
                            _scaleTime = m_Data.transferPoints[targetPoint + 1].flyTimeBack / 2;
                        }
                        m_FlyingEffect.SetAnimatorSpeed(1 / _scaleTime);
                        m_FlyingEffect.SetPaticleSystemSpeed(_scaleTime);
                        GA_Hero.s_MapSwitching = true;
                        m_Step = 2;
                        if (isPositive)
@@ -134,6 +145,7 @@
                        {
                            _hero.Play(Animator.StringToHash(m_Data.transferPoints[targetPoint + 1].stateNameBack));
                        }
                        _hero.SetAnimatorSpeed(1 / _scaleTime);
                        _hero.Idle();
                        CameraController.Instance.LookAtTarget = _hero.Root.GetChildTransformDeeply("Bip001");
                    }
@@ -194,6 +206,7 @@
                    {
                        m_Step = 3;
                        GA_Hero.s_MapSwitching = false;
                        _hero.SetAnimatorSpeed(1);
                        if (m_FlyingEffect)
                        {
                            SFXPlayUtility.Instance.Release(m_FlyingEffect);