Merge remote-tracking branch 'origin/master' into Cross_Server

client_Wu Xijin

2018-12-24 769eca1d9e5d4c7a0d1875a71ddb63d0aebc404f

 UI/Common/UI3DModelFactory.cs

@@ -206,7 +206,7 @@


    public static void ReleaseUIHourse(int id, GameObject model)

    {

        var prefab = InstanceResourcesLoader.LoadModelRes(id, true);

        var prefab = InstanceResourcesLoader.LoadModelRes(id, false);

        var pool = GameObjectPoolManager.Instance.RequestPool(prefab);



        var animator = model.GetComponent<Animator>();