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

client_Zxw

2018-10-13 9c27aa4caaa28ffaf30ce22596ded528e1ea9cf9

 Fight/GameActor/GA_NpcCollect.cs

@@ -109,6 +109,17 @@
                m_Animator = m_Model.GetComponent<Animator>();

                if (m_Animator)

                {

                    RuntimeAnimatorController _controller = null;

                    if (m_LoadDefaultRes)

                    {

                        _controller = InstanceResourcesLoader.LoadDefaultMobAnimatorController_Func();

                    }

                    else

                    {

                        _controller = AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix, NpcConfig.MODE);

                    }

                    m_Animator.runtimeAnimatorController = _controller;



                    m_Animator.enabled = true;

                    m_Animator.SetInteger(GAStaticDefine.Param_ActorInstID, (int)clientInstID);

                }