From d597f340f934866e69a460bacb954a1b38057742 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 15 十一月 2018 10:53:44 +0800
Subject: [PATCH] 4792 (只在master)原随包的配置全部支持热更新。
---
Utility/MaterialUtility.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Utility/MaterialUtility.cs b/Utility/MaterialUtility.cs
index d09dfff..0ea221d 100644
--- a/Utility/MaterialUtility.cs
+++ b/Utility/MaterialUtility.cs
@@ -7,7 +7,7 @@
public static Material GetDefaultSpriteGrayMaterial()
{
- return Resources.Load<Material>("Material/SpriteGray");
+ return BuiltInLoader.LoadMaterial("SpriteGray");
}
public static Material GetInstantiatedSpriteGrayMaterial()
@@ -18,12 +18,12 @@
public static Material GetSmoothMaskGrayMaterial()
{
- return Resources.Load<Material>("Material/SmoothMaskGray");
+ return BuiltInLoader.LoadMaterial("SmoothMaskGray");
}
public static Material GetInstantiatedSpriteTwinkleMaterial()
{
- var material = Resources.Load<Material>("Material/Flash");
+ var material = BuiltInLoader.LoadMaterial("Flash");
return new Material(material);
}
@@ -34,12 +34,12 @@
public static Material GetUIBlurMaterial()
{
- return Resources.Load<Material>("Material/GUIBlurMaterial");
+ return BuiltInLoader.LoadMaterial("GUIBlurMaterial");
}
public static Material GetGUIRenderTextureMaterial()
{
- return Resources.Load<Material>("Material/UI_RenderTexture");
+ return BuiltInLoader.LoadMaterial("UI_RenderTexture");
}
public static void SetRenderSortingOrder(this GameObject root, int sortingOrder, bool includeChildren)
@@ -76,7 +76,7 @@
get {
if (m_HudMaterial == null)
{
- m_HudMaterial = Resources.Load<Material>("Material/HUD_HeadupName");
+ m_HudMaterial = BuiltInLoader.LoadMaterial("HUD_HeadupName");
m_HudMaterial.SetTexture("_Tex1", FontUtility.preferred.material.mainTexture);
}
return m_HudMaterial;
--
Gitblit v1.8.0