From 78bfe524ea4776c47f6314e56e97f39970b00fce Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 25 九月 2018 15:07:07 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能
---
System/OpenServerActivity/OpenServerActivityWin.cs | 48 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/System/OpenServerActivity/OpenServerActivityWin.cs b/System/OpenServerActivity/OpenServerActivityWin.cs
index ee7fa88..31d45e1 100644
--- a/System/OpenServerActivity/OpenServerActivityWin.cs
+++ b/System/OpenServerActivity/OpenServerActivityWin.cs
@@ -29,6 +29,7 @@
return m_OSRedEnvelopeModel ?? (m_OSRedEnvelopeModel = ModelCenter.Instance.GetModel<OSRedEnvelopeModel>());
}
}
+ FairyLeagueModel fairyLeagueModel { get { return ModelCenter.Instance.GetModel<FairyLeagueModel>(); } }
List<int> openActivitys = new List<int>();
List<int> priorityActivitys = new List<int>();
@@ -64,6 +65,7 @@
impactRankModel.presentSelectType = impactDefaultType;
impactRankModel.gotoImpactRankType = 0;
envelopeModel.selectType = 1;
+ GlobalTimeEvent.Instance.secondEvent += SecondEvent;
CheckAlreadyOpen();
UpdateFunctionBtns();
}
@@ -121,6 +123,7 @@
TimeUtility.OnServerOpenDayRefresh -= OnStepServerDayEvent;
OperationTimeHepler.Instance.operationTimeUpdateEvent -= OperationTimeUpdateEvent;
OpenServerActivityCenter.Instance.openServerActivityStateChange -= OpenServerActivityStateChange;
+ GlobalTimeEvent.Instance.secondEvent -= SecondEvent;
CloseOtherWin();
impactRankModel.gotoImpactRankType = 0;
}
@@ -165,6 +168,24 @@
{
openActivitys.Sort(Compare);
return openActivitys[0];
+ }
+ }
+
+ private void SecondEvent()
+ {
+ var cell = m_ActivityCtrl.GetActiveCellView((int)OpenServerActivityCenter.OSActivityType.FairyLeagueNotice);
+ if (cell != null)
+ {
+ 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");
+ }
}
}
@@ -224,6 +245,17 @@
if (OperationTimeHepler.Instance.TryGetOperationTime(Operation.MultipRealmPoint, out operationBase))
{
_cell.title.text = Language.Get("MultipleRealmPoint", Language.Get(StringUtility.Contact("Num_CHS_", (operationBase as OperationMultipleRealmPoint).multiplePractice)));
+ }
+ break;
+ case 12:
+ var seconds = fairyLeagueModel.GetBeforeFirstLeagueTime();
+ if (seconds > 0)
+ {
+ _cell.title.text = UIHelper.ReplaceNewLine(Language.Get("FairyLeagueForcast", TimeUtility.SecondsToHMS(seconds)));
+ }
+ else
+ {
+ _cell.title.text = Language.Get("FamilyMatchName");
}
break;
default:
@@ -471,7 +503,7 @@
}
else
{
- WindowCenter.Instance.Open<FairyJadeInvestmentWin>();
+ WindowCenter.Instance.Open<FairyJadeInvestmentWin>(true);
}
break;
case 11:
@@ -481,10 +513,19 @@
}
else
{
- WindowCenter.Instance.Open<VipInvestWin>();
+ WindowCenter.Instance.Open<VipInvestWin>(true);
}
break;
-
+ case 12:
+ if (windowState == WindowState.Opened)
+ {
+ WindowCenter.Instance.OpenWithoutAnimation<FairyLeagueNoticeWin>();
+ }
+ else
+ {
+ WindowCenter.Instance.Open<FairyLeagueNoticeWin>(true);
+ }
+ break;
}
}
@@ -518,6 +559,7 @@
WindowCenter.Instance.CloseImmediately<LimitedTimePackageWin>();
WindowCenter.Instance.CloseImmediately<FairyJadeInvestmentWin>();
WindowCenter.Instance.CloseImmediately<VipInvestWin>();
+ WindowCenter.Instance.CloseImmediately<FairyLeagueNoticeWin>();
}
private int Compare(int order_x, int order_y)
--
Gitblit v1.8.0