From c6bc396fe264cd53ba594e7430011c623cc26c4a Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 10 十月 2018 14:21:47 +0800
Subject: [PATCH] Merge branch 'master' into 3687天赋功能
---
System/OpenServerActivity/OpenServerActivityWin.cs | 73 +++++++++++++++++++++++++++++-------
1 files changed, 58 insertions(+), 15 deletions(-)
diff --git a/System/OpenServerActivity/OpenServerActivityWin.cs b/System/OpenServerActivity/OpenServerActivityWin.cs
index ce0de15..44aea99 100644
--- a/System/OpenServerActivity/OpenServerActivityWin.cs
+++ b/System/OpenServerActivity/OpenServerActivityWin.cs
@@ -30,6 +30,7 @@
}
}
FairyLeagueModel fairyLeagueModel { get { return ModelCenter.Instance.GetModel<FairyLeagueModel>(); } }
+ FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }
List<int> openActivitys = new List<int>();
List<int> priorityActivitys = new List<int>();
@@ -178,13 +179,24 @@
{
var activityCell = cell as OpenServerActivityCell;
var seconds = fairyLeagueModel.GetBeforeFirstLeagueTime();
+ activityCell.title.text = TimeUtility.SecondsToHMS(seconds);
+ activityCell.title.gameObject.SetActive(seconds > 0);
+ }
+ cell = m_ActivityCtrl.GetActiveCellView((int)OpenServerActivityCenter.OSActivityType.FairyGrabBossNotice);
+ if (cell != null)
+ {
+ var activityCell = cell as OpenServerActivityCell;
+ var seconds = fairyGrabBossModel.GetFirstOpenSeconds();
+ bool isOpen = fairyGrabBossModel.IsOpen;
+ activityCell.title.gameObject.SetActive(seconds > 0 || isOpen);
+ activityCell.title.color = UIHelper.GetUIColor(TextColType.Green, true);
if (seconds > 0)
{
- activityCell.title.text = UIHelper.ReplaceNewLine(Language.Get("FairyLeagueForcast", TimeUtility.SecondsToHMS(seconds)));
+ activityCell.title.text = TimeUtility.SecondsToHMS(seconds);
}
- else
+ else if (isOpen)
{
- activityCell.title.text = Language.Get("FamilyMatchName");
+ activityCell.title.text = Language.Get("FairyGrabBossOpened");
}
}
}
@@ -232,6 +244,14 @@
private void RefreshOpenActivityCell(OpenServerActivityCell _cell)
{
+ var customActivity = m_CustomActivitys.Find((x) =>
+ {
+ return (int)x.activityType == _cell.index;
+ });
+ bool customIcon = !string.IsNullOrEmpty(customActivity.titleIcon);
+
+ _cell.title.color = UIHelper.GetUIColor(TextColType.NavyBrown);
+
OperationBase operationBase;
switch (_cell.index)
{
@@ -240,25 +260,44 @@
{
_cell.title.text = Language.Get("ExpActivity_Text5", (operationBase as OperationMultiExp).GetMultipleCHS());
}
+ _cell.title.gameObject.SetActive(!customIcon);
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);
break;
case 12:
- var seconds = fairyLeagueModel.GetBeforeFirstLeagueTime();
- if (seconds > 0)
{
- _cell.title.text = UIHelper.ReplaceNewLine(Language.Get("FairyLeagueForcast", TimeUtility.SecondsToHMS(seconds)));
+ var seconds = fairyLeagueModel.GetBeforeFirstLeagueTime();
+ _cell.title.gameObject.SetActive(seconds > 0);
+ if (seconds > 0)
+ {
+ _cell.title.text = TimeUtility.SecondsToHMS(seconds);
+ _cell.title.color = UIHelper.GetUIColor(TextColType.Green, true);
+ }
}
- else
+ break;
+ case 13:
{
- _cell.title.text = Language.Get("FamilyMatchName");
+ var seconds = fairyGrabBossModel.GetFirstOpenSeconds();
+ bool isOpen = fairyGrabBossModel.IsOpen;
+ _cell.title.gameObject.SetActive(seconds > 0 || isOpen);
+ _cell.title.color = UIHelper.GetUIColor(TextColType.Green, true);
+ if (seconds > 0)
+ {
+ _cell.title.text = TimeUtility.SecondsToHMS(seconds);
+ }
+ else if (isOpen)
+ {
+ _cell.title.text = Language.Get("FairyGrabBossOpened");
+ }
}
break;
default:
+ _cell.title.gameObject.SetActive(!customIcon);
_cell.title.text = Language.Get(StringUtility.Contact("OSActivityTitle_", _cell.index));
break;
}
@@ -268,13 +307,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)
{
@@ -532,6 +564,16 @@
WindowCenter.Instance.Open<FairyLeagueNoticeWin>(true);
}
break;
+ case 13:
+ if (windowState == WindowState.Opened)
+ {
+ WindowCenter.Instance.OpenWithoutAnimation<FairyGrabBossNoticeWin>();
+ }
+ else
+ {
+ WindowCenter.Instance.Open<FairyGrabBossNoticeWin>(true);
+ }
+ break;
}
}
@@ -566,6 +608,7 @@
WindowCenter.Instance.CloseImmediately<FairyJadeInvestmentWin>();
WindowCenter.Instance.CloseImmediately<VipInvestWin>();
WindowCenter.Instance.CloseImmediately<FairyLeagueNoticeWin>();
+ WindowCenter.Instance.CloseImmediately<FairyGrabBossNoticeWin>();
}
private int Compare(int order_x, int order_y)
--
Gitblit v1.8.0