Merge branch 'master' into Cross_Server

client_Wu Xijin

2018-12-12 458f4c831623966402f78d1ec00b24aebf674e66

 Fight/GameActor/GActorPlayerBase.cs

@@ -230,6 +230,8 @@


        GameObject _prefab = null;



        HideHorseEffect();



        if (m_HorseModel)

        {

            HorseConfig _horseConfig = Config.Instance.Get<HorseConfig>((int)HorseID);

@@ -1142,6 +1144,8 @@


        if (_newHorseID <= 0)

        {

            HideHorseEffect();



            if (MovingState != E_MovingState.Ride)

            {

                return;

@@ -1378,6 +1382,43 @@
        }



        HorseID = _newHorseID;



        if (ShowOrHide)

        {

            ShowHorseEffect();

        }

    }



    private List<SFXController> m_HorseEffectList = new List<SFXController>();



    public void HideHorseEffect()

    {

        foreach (var _ctrl in m_HorseEffectList)

        {

            SFXPlayUtility.Instance.Release(_ctrl);

        }

        m_HorseEffectList.Clear();

    }



    public void ShowHorseEffect()

    {

        HideHorseEffect();

        var _horseConfig = Config.Instance.Get<HorseConfig>((int)HorseID);

        var _config = Config.Instance.Get<ModelResConfig>(_horseConfig.Model);

        if (_config == null)

        {

            Debug.LogError("找不到配置: " + HorseID);

            return;

        }

        var _dict = ModelResConfig.GetEffectDict(_config.ResourcesName);

        if (_dict != null)

        {

            foreach (var _bone in _dict.Keys)

            {

                var _ctrl = SFXPlayUtility.Instance.PlayBattleEffect(_dict[_bone], m_HorseModel.transform.GetChildTransformDeeply(_bone));

                m_HorseEffectList.Add(_ctrl);

            }

        }

    }



    public abstract void ChangeEquip(EquipInfo equipInfo);

@@ -2250,7 +2291,7 @@
                        return 12600 + index;

                }

            }

            else if(this is GA_NpcFightSgzcZZ)

            else if (this is GA_NpcFightSgzcZZ)

            {

                switch (JobSetup.Job)

                {