Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 System/RoleParticulars/ViewPetDetailWin.cs

@@ -162,7 +162,7 @@
        {

            m_RawModel.gameObject.SetActive(true);

            var npcConfig = Config.Instance.Get<NPCConfig>(id);

            UI3DModelExhibition.Instance.BeginShowNPC(id, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_RawModel);

            UI3DModelExhibition.Instance.ShowNPC(id, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_RawModel);

            if (UI3DModelExhibition.Instance.NpcModelPet != null)

            {

                var animator = UI3DModelExhibition.Instance.NpcModelPet.GetComponent<Animator>();