From 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 26 十月 2018 20:05:36 +0800
Subject: [PATCH] Merge branch 'master' into leonard

---
 UI/Common/UI3DTreasureExhibition.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/UI/Common/UI3DTreasureExhibition.cs b/UI/Common/UI3DTreasureExhibition.cs
index 30ba46d..839a437 100644
--- a/UI/Common/UI3DTreasureExhibition.cs
+++ b/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";

--
Gitblit v1.8.0