From b3f1e41e88807ab08a075cf77bd83d05abfb7636 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 15 七月 2019 13:50:51 +0800
Subject: [PATCH] 4478 【开发】【BUG】装备TIPS的绿色字颜色没有统一
---
System/Equip/EquipSuitPropertyWidget.cs | 4 ++--
System/Equip/EquipSuitPropertyBar.cs | 4 ++--
System/RoleParticulars/OtherPlayerSuitWidget.cs | 6 +++---
System/ItemTip/TipSuitPropertyWidget.cs | 8 ++++----
Utility/UIHelper.cs | 2 ++
5 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/System/Equip/EquipSuitPropertyBar.cs b/System/Equip/EquipSuitPropertyBar.cs
index 65ab604..317b406 100644
--- a/System/Equip/EquipSuitPropertyBar.cs
+++ b/System/Equip/EquipSuitPropertyBar.cs
@@ -14,9 +14,9 @@
[SerializeField] Text m_Titile;
[SerializeField] Text[] m_Properties;
- public void Display(EquipSuitPropertyEntry entry)
+ public void Display(EquipSuitPropertyEntry entry, bool isBrightUI)
{
- var color = UIHelper.GetUIColor(entry.actived ? TextColType.Green : TextColType.White, true);
+ var color = entry.actived ? UIHelper.GetUIColor(TextColType.Green, isBrightUI) : UIHelper.GetUIColor(TextColType.White, true);
m_Titile.color = color;
for (var i = 0; i < m_Properties.Length; i++)
diff --git a/System/Equip/EquipSuitPropertyWidget.cs b/System/Equip/EquipSuitPropertyWidget.cs
index 81777be..13783fe 100644
--- a/System/Equip/EquipSuitPropertyWidget.cs
+++ b/System/Equip/EquipSuitPropertyWidget.cs
@@ -78,8 +78,8 @@
public void DisplayProperty(EquipSuitProperty property)
{
- m_TwoSuit.Display(property.twoSuit);
- m_FiveSuit.Display(property.fiveSuit);
+ m_TwoSuit.Display(property.twoSuit, true);
+ m_FiveSuit.Display(property.fiveSuit, true);
m_EightSuitDescription.text = GetEightSuitDescription(property.eightSuitId);
var color = UIHelper.GetUIColor(property.eightActived ? TextColType.Green : TextColType.White, true);
m_EightSuitTitle.color = color;
diff --git a/System/ItemTip/TipSuitPropertyWidget.cs b/System/ItemTip/TipSuitPropertyWidget.cs
index 45a606b..ce2229f 100644
--- a/System/ItemTip/TipSuitPropertyWidget.cs
+++ b/System/ItemTip/TipSuitPropertyWidget.cs
@@ -71,17 +71,17 @@
m_SuitEquipNames[i].text = setName + EquipSuitNameConfig.GetSuitName(suitInfo.level, place, suitInfo.job);
var hasSuit = suitInfo.places.Contains(place)
&& suitInfo.placeStars.ContainsKey(place) && suitInfo.placeStars[place] >= star;
- m_SuitEquipNames[i].color = UIHelper.GetUIColor(hasSuit ? TextColType.Green : TextColType.White);
+ m_SuitEquipNames[i].color = hasSuit ? UIHelper.GetUIColor(TextColType.Green, false) : UIHelper.GetUIColor(TextColType.White, true);
}
}
void DisplaySuitProperty(int star)
{
- m_TwoSuit.Display(suitInfo.twoSuitProperties[star]);
- m_FiveSuit.Display(suitInfo.fiveSuitProperties[star]);
+ m_TwoSuit.Display(suitInfo.twoSuitProperties[star], false);
+ m_FiveSuit.Display(suitInfo.fiveSuitProperties[star], false);
m_EightSuitDescription.text = GetEightSuitDescription(suitInfo.job, suitInfo.level, star);
var eightSuitActive = suitInfo.eightSuits[star];
- var color = UIHelper.GetUIColor(eightSuitActive ? TextColType.Green : TextColType.White);
+ var color = eightSuitActive ? UIHelper.GetUIColor(TextColType.Green, false) : UIHelper.GetUIColor(TextColType.White, true);
m_EightSuitTitle.color = color;
m_EightSuitDescription.color = color;
}
diff --git a/System/RoleParticulars/OtherPlayerSuitWidget.cs b/System/RoleParticulars/OtherPlayerSuitWidget.cs
index 1f0c2e9..a1a13e7 100644
--- a/System/RoleParticulars/OtherPlayerSuitWidget.cs
+++ b/System/RoleParticulars/OtherPlayerSuitWidget.cs
@@ -53,7 +53,7 @@
DisplaySuitInfo(0);
}
- void DisplaySuitInfo( int star)
+ void DisplaySuitInfo(int star)
{
DisplaySuitCollections(star);
DisplayProperty(star);
@@ -95,8 +95,8 @@
config = eightConfigs.Find(x => { return x.star == star; });
- m_TwoSuit.Display(twoSuit);
- m_FiveSuit.Display(fiveSuit);
+ m_TwoSuit.Display(twoSuit, true);
+ m_FiveSuit.Display(fiveSuit, true);
m_EightSuitDescription.text = GetEightSuitDescription(config.id);
var color = UIHelper.GetUIColor(eightSuitLevel >= star ? TextColType.Green : TextColType.White, true);
m_EightSuitTitle.color = color;
diff --git a/Utility/UIHelper.cs b/Utility/UIHelper.cs
index 04fec59..de9457b 100644
--- a/Utility/UIHelper.cs
+++ b/Utility/UIHelper.cs
@@ -611,6 +611,8 @@
return StringUtility.Contact("<color=#", "fff4cd", ">", msg, "</color>");
case TextColType.LightGreen:
return StringUtility.Contact("<color=#", "8ddc11", ">", msg, "</color>");
+ case TextColType.Gray:
+ return StringUtility.Contact("<color=#", "686868", ">", msg, "</color>");
}
return msg;
}
--
Gitblit v1.8.0