From 25bb439c34f811feceb5dd05b56c1c7e3e8ea00a Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期一, 06 五月 2019 20:07:12 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/ItemTip/TipItemBaseInfoWidget.cs | 49 +++++++++++++++++++++++++++++--------------------
1 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/System/ItemTip/TipItemBaseInfoWidget.cs b/System/ItemTip/TipItemBaseInfoWidget.cs
index f835bd5..655fe46 100644
--- a/System/ItemTip/TipItemBaseInfoWidget.cs
+++ b/System/ItemTip/TipItemBaseInfoWidget.cs
@@ -16,6 +16,7 @@
[SerializeField] ItemBehaviour m_Item;
[SerializeField] Text m_Type;
+ [SerializeField] RectTransform m_ConditionContainer;
[SerializeField] Text m_Condition;
[SerializeField] RectTransform m_SurplusTimeContainer;
@@ -40,26 +41,6 @@
m_Item.SetItem(baseInfo.itemId, 1);
m_Type.text = itemConfig.ItemTypeName;
-
- if (baseInfo.moneyLimit > 0)
- {
- var myMoney = UIHelper.GetMoneyCnt(1);
- m_Condition.text = Language.Get("OpenBoxCostMoney", baseInfo.moneyLimit);
- m_Condition.color = UIHelper.GetUIColor(myMoney < (ulong)baseInfo.moneyLimit ? TextColType.Red : TextColType.Green);
- }
- else if (baseInfo.realmLimit > 0)
- {
- var realmConfig = RealmConfig.Get(baseInfo.realmLimit);
- m_Condition.text = StringUtility.Contact(Language.Get("RealmLimit1"), " ", realmConfig.Name);
- var realmLevel = PlayerDatas.Instance.baseData.realmLevel;
- m_Condition.color = UIHelper.GetUIColor(realmLevel < itemConfig.UseLV ? TextColType.Red : TextColType.Green);
- }
- else
- {
- m_Condition.text = StringUtility.Contact(Language.Get("KnapS110"), " ", baseInfo.levelLimit);
- var playerLevel = PlayerDatas.Instance.baseData.LV;
- m_Condition.color = UIHelper.GetUIColor(playerLevel < itemConfig.UseLV ? TextColType.Red : TextColType.Green);
- }
if (baseInfo.isPreview)
{
@@ -97,6 +78,34 @@
}
}
+ if (!baseInfo.isAuction)
+ {
+ m_ConditionContainer.gameObject.SetActive(true);
+ if (baseInfo.moneyLimit > 0)
+ {
+ var myMoney = UIHelper.GetMoneyCnt(1);
+ m_Condition.text = Language.Get("OpenBoxCostMoney", baseInfo.moneyLimit);
+ m_Condition.color = UIHelper.GetUIColor(myMoney < (ulong)baseInfo.moneyLimit ? TextColType.Red : TextColType.Green);
+ }
+ else if (baseInfo.realmLimit > 0)
+ {
+ var realmConfig = RealmConfig.Get(baseInfo.realmLimit);
+ m_Condition.text = StringUtility.Contact(Language.Get("RealmLimit1"), " ", realmConfig.Name);
+ var realmLevel = PlayerDatas.Instance.baseData.realmLevel;
+ m_Condition.color = UIHelper.GetUIColor(realmLevel < itemConfig.UseLV ? TextColType.Red : TextColType.Green);
+ }
+ else
+ {
+ m_Condition.text = StringUtility.Contact(Language.Get("KnapS110"), " ", baseInfo.levelLimit);
+ var playerLevel = PlayerDatas.Instance.baseData.LV;
+ m_Condition.color = UIHelper.GetUIColor(playerLevel < itemConfig.UseLV ? TextColType.Red : TextColType.Green);
+ }
+ }
+ else
+ {
+ m_ConditionContainer.gameObject.SetActive(false);
+ }
+
}
}
--
Gitblit v1.8.0