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

client_Zxw

2018-10-13 9c27aa4caaa28ffaf30ce22596ded528e1ea9cf9

 Fight/GameActor/GActorPlayerBase.cs

@@ -1135,6 +1135,7 @@
            m_HorseModel = null;

            if (m_HorseAnimator)

            {

                m_HorseAnimator.runtimeAnimatorController = null;

                m_HorseAnimator.enabled = false;

                m_HorseAnimator = null;

            }

@@ -1225,6 +1226,7 @@
                m_HorseModel = null;

                if (m_HorseAnimator)

                {

                    m_HorseAnimator.runtimeAnimatorController = null;

                    m_HorseAnimator.enabled = false;

                    m_HorseAnimator = null;

                }

@@ -1251,6 +1253,18 @@


            m_HorseModel = GameObjectPoolManager.Instance.RequestGameObject(_prefab);

            m_HorseAnimator = m_HorseModel.GetComponent<Animator>();



            RuntimeAnimatorController _controller = null;

            if (m_LoadDefaultHorse)

            {

                _controller = InstanceResourcesLoader.LoadDefaultMobAnimatorController_Horse();

            }

            else

            {

                _controller = AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix, _modelResConfig.ResourcesName);

            }



            m_HorseAnimator.runtimeAnimatorController = _controller;

            m_HorseAnimator.enabled = true;



            // 先设置根节点