From e102e4a814c25aa42017ac962d88bfbfc8d279de Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 09 一月 2019 15:29:05 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
UI/Core/ImageEx.cs | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/UI/Core/ImageEx.cs b/UI/Core/ImageEx.cs
index 41ef61d..65e202c 100644
--- a/UI/Core/ImageEx.cs
+++ b/UI/Core/ImageEx.cs
@@ -43,6 +43,8 @@
}
}
+ [SerializeField] string m_IconKey = string.Empty;
+
bool inited = false;
protected override void Awake()
{
@@ -54,6 +56,10 @@
this.material = this.canvasAddition == null ? MaterialUtility.GetDefaultSpriteGrayMaterial() : this.canvasAddition.spriteGrayMaterial;
}
+ if (!string.IsNullOrEmpty(m_IconKey))
+ {
+ this.SetSprite(m_IconKey);
+ }
}
}
--
Gitblit v1.8.0