From 598dcad71d7dbe6c89f4a1f8550737142ac61f1e Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 09 十月 2018 17:56:31 +0800
Subject: [PATCH] 4091【前端】精彩活动选项优化
---
System/OpenServerActivity/OpenServerActivityWin.cs | 37 +++++++++++++++++--------------------
1 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/System/OpenServerActivity/OpenServerActivityWin.cs b/System/OpenServerActivity/OpenServerActivityWin.cs
index ce0de15..e226a71 100644
--- a/System/OpenServerActivity/OpenServerActivityWin.cs
+++ b/System/OpenServerActivity/OpenServerActivityWin.cs
@@ -178,14 +178,8 @@
{
var activityCell = cell as OpenServerActivityCell;
var seconds = fairyLeagueModel.GetBeforeFirstLeagueTime();
- if (seconds > 0)
- {
- activityCell.title.text = UIHelper.ReplaceNewLine(Language.Get("FairyLeagueForcast", TimeUtility.SecondsToHMS(seconds)));
- }
- else
- {
- activityCell.title.text = Language.Get("FamilyMatchName");
- }
+ activityCell.title.text = TimeUtility.SecondsToHMS(seconds);
+ activityCell.title.gameObject.SetActive(seconds > 0);
}
}
@@ -232,6 +226,12 @@
private void RefreshOpenActivityCell(OpenServerActivityCell _cell)
{
+ var customActivity = m_CustomActivitys.Find((x) =>
+ {
+ return (int)x.activityType == _cell.index;
+ });
+ bool customIcon = !string.IsNullOrEmpty(customActivity.titleIcon);
+
OperationBase operationBase;
switch (_cell.index)
{
@@ -240,26 +240,30 @@
{
_cell.title.text = Language.Get("ExpActivity_Text5", (operationBase as OperationMultiExp).GetMultipleCHS());
}
+ _cell.title.gameObject.SetActive(!customIcon);
+ _cell.title.color = UIHelper.GetUIColor(TextColType.NavyBrown);
break;
case 8:
if (OperationTimeHepler.Instance.TryGetOperationTime(Operation.MultipRealmPoint, out operationBase))
{
_cell.title.text = Language.Get("MultipleRealmPoint", Language.Get(StringUtility.Contact("Num_CHS_", (operationBase as OperationMultipleRealmPoint).multiplePractice)));
}
+ _cell.title.gameObject.SetActive(!customIcon);
+ _cell.title.color = UIHelper.GetUIColor(TextColType.NavyBrown);
break;
case 12:
var seconds = fairyLeagueModel.GetBeforeFirstLeagueTime();
+ _cell.title.gameObject.SetActive(seconds > 0);
if (seconds > 0)
{
- _cell.title.text = UIHelper.ReplaceNewLine(Language.Get("FairyLeagueForcast", TimeUtility.SecondsToHMS(seconds)));
- }
- else
- {
- _cell.title.text = Language.Get("FamilyMatchName");
+ _cell.title.text = TimeUtility.SecondsToHMS(seconds);
+ _cell.title.color = UIHelper.GetUIColor(TextColType.Green, true);
}
break;
default:
+ _cell.title.gameObject.SetActive(!customIcon);
_cell.title.text = Language.Get(StringUtility.Contact("OSActivityTitle_", _cell.index));
+ _cell.title.color = UIHelper.GetUIColor(TextColType.NavyBrown);
break;
}
_cell.order = _cell.index;
@@ -268,13 +272,6 @@
_cell.downArrow.gameObject.SetActive(false);
_cell.upArrow.gameObject.SetActive(false);
- var customActivity = m_CustomActivitys.Find((x) =>
- {
- return (int)x.activityType == _cell.index;
- });
-
- bool customIcon = !string.IsNullOrEmpty(customActivity.titleIcon);
- _cell.title.gameObject.SetActive(!customIcon);
_cell.titleImage.gameObject.SetActive(customIcon);
if (customIcon)
{
--
Gitblit v1.8.0