Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 System/Pet/PetAttributeMethods.cs

@@ -612,7 +612,7 @@
                typePetID = PetID;

                timePlay = 0;

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

                UI3DModelExhibition.Instance.BeginShowNPC(PetID, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, _rawImage);

                UI3DModelExhibition.Instance.ShowNPC(PetID, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, _rawImage);

                if (UI3DModelExhibition.Instance.NpcModelPet != null)

                {

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