Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 UI/Common/UI3DModelFactory.cs

@@ -100,6 +100,11 @@
            animator.enabled = false;

        }



        if (model)

        {

            model.transform.localScale = Vector3.one;

        }



        var prefab = InstanceResourcesLoader.LoadNpcPrefab(id);

        if (prefab)

        {