From 7cc84329c52b6e39cd979eb33a126e059b9bf36c Mon Sep 17 00:00:00 2001
From: leonard Wu <364452445@qq.com>
Date: 星期五, 03 八月 2018 21:07:11 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
System/Store/Logic/BuyWingsTip.cs | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/System/Store/Logic/BuyWingsTip.cs b/System/Store/Logic/BuyWingsTip.cs
index a6df774..9996fd6 100644
--- a/System/Store/Logic/BuyWingsTip.cs
+++ b/System/Store/Logic/BuyWingsTip.cs
@@ -23,7 +23,7 @@
[SerializeField]
Text conditionText;
[SerializeField]
- Text conditionValueText;
+ Image conditionValueText;
[SerializeField]
Text dateText;
[SerializeField]
@@ -207,29 +207,27 @@
{
conditionText.gameObject.SetActive(true);
conditionValueText.gameObject.SetActive(true);
- var _realmLv = 1;
- GeneralConfig.Instance.wingEquipLimits.TryGetValue(itemAttrData.itemConfig.ID, out _realmLv);
+ var _realmLv = itemAttrData.itemConfig.RealmLimit;
var _realmCfg = ConfigManager.Instance.GetTemplate<RealmConfig>(_realmLv);
if (PlayerDatas.Instance.baseData.realmLevel < _realmLv)
{
conditionText.text = UIHelper.GetTextColorByItemColor(TextColType.Red, Language.Get("RealmLimit1"));
if (_realmLv != 0)
{
- conditionValueText.text = _realmCfg.Name;
+ conditionValueText.SetSprite(_realmCfg.Img);
}
else
{
conditionText.gameObject.SetActive(false);
conditionValueText.gameObject.SetActive(false);
}
- conditionValueText.color = UIHelper.GetUIColor(TextColType.Red);
}
else
{
if(_realmLv != 0)
{
conditionText.text = StringUtility.Contact("<color=#FFF4CDFF>", Language.Get("RealmLimit1"), "</color>");
- conditionValueText.text = StringUtility.Contact("<color=#FFF4CDFF>", _realmCfg == null ? string.Empty : _realmCfg.Name, "</color>");
+ conditionValueText.SetSprite(_realmCfg.Img);
}
else
{
--
Gitblit v1.8.0