Merge branch 'master' into leonard

client_Wu Xijin

2018-10-26 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3

 UI/Common/UI3DTreasureExhibition.cs

@@ -29,7 +29,7 @@
            get {

                if (m_Instance == null)

                {

               var gameObject = Instantiate(Resources.Load<GameObject>("UI/Prefabs/UI3DTreasureExhibitionStage"));

               var gameObject = Instantiate(BuiltInLoader.LoadPrefab("UI3DTreasureExhibitionStage"));

                    m_Instance = gameObject.GetComponent<UI3DTreasureExhibition>();

                    Instance.transform.position = new Vector3(0, 2000, 3000);

                    m_Instance.name = "UI3DTreasureExhibitionStage";