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/UI3DModelExhibition.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/UI/Common/UI3DModelExhibition.cs b/UI/Common/UI3DModelExhibition.cs
index 824622d..2883b55 100644
--- a/UI/Common/UI3DModelExhibition.cs
+++ b/UI/Common/UI3DModelExhibition.cs
@@ -78,7 +78,7 @@
public static void CreateStage()
{
- var prefab = Resources.Load<GameObject>("UI/Prefabs/UI3DModelExhibitionStage");
+ var prefab = BuiltInLoader.LoadPrefab("UI3DModelExhibitionStage");
var gameObject = GameObject.Instantiate(prefab);
Instance = gameObject.GetComponent<UI3DModelExhibition>();
Instance.transform.position = new Vector3(1000, 2000, 3000);
@@ -90,7 +90,7 @@
static void CreateCloneStage()
{
- var prefab = Resources.Load<GameObject>("UI/Prefabs/UI3DModelExhibitionStage");
+ var prefab = BuiltInLoader.LoadPrefab("UI3DModelExhibitionStage");
var gameObject = GameObject.Instantiate(prefab);
m_InstanceClone1 = gameObject.GetComponent<UI3DModelExhibition>();
m_InstanceClone1.transform.position = new Vector3(2000, 4000, 5000);
--
Gitblit v1.8.0