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/FairyAu/FairyGrabBossWin.cs | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/System/FairyAu/FairyGrabBossWin.cs b/System/FairyAu/FairyGrabBossWin.cs
index 7bbeee6..e82125d 100644
--- a/System/FairyAu/FairyGrabBossWin.cs
+++ b/System/FairyAu/FairyGrabBossWin.cs
@@ -23,11 +23,13 @@
[SerializeField] RectTransform m_ContainerUnOpen;
[SerializeField] RectTransform m_ContainerOpen;
[SerializeField] Text m_SurplusTime;
+ [SerializeField] Text m_OpenDate;
FairyGrabBossModel model { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }
DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
BossHomeModel bossHomeModel { get { return ModelCenter.Instance.GetModel<BossHomeModel>(); } }
FindPreciousModel findPreciousModel { get { return ModelCenter.Instance.GetModel<FindPreciousModel>(); } }
+ DailyQuestModel dailyQuestModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }
float m_Timer = 0f;
const float Interval = 10f;
@@ -51,11 +53,13 @@
DisplaySurplusTime();
DisplayBossInfo();
DisplayHighestFairy();
+ DisplayOpenDate();
GlobalTimeEvent.Instance.secondEvent += SecondEvent;
model.bossSelectedEvent += BossSelectedEvent;
model.bossProgressUpdate += BossProgressUpdate;
model.bossAllProgressUpdate += BossAllProgressUpdate;
model.stateUpdate += StateUpdate;
+ TimeUtility.OnServerOpenDayRefresh += OnServerOpenDayRefresh;
m_Timer = 0;
}
@@ -79,6 +83,7 @@
model.bossProgressUpdate -= BossProgressUpdate;
model.bossAllProgressUpdate -= BossAllProgressUpdate;
model.stateUpdate -= StateUpdate;
+ TimeUtility.OnServerOpenDayRefresh -= OnServerOpenDayRefresh;
}
protected override void OnAfterClose()
@@ -97,6 +102,11 @@
}
#endregion
+ private void OnServerOpenDayRefresh()
+ {
+ DisplayOpenDate();
+ }
+
void DisplayBosses()
{
var bosses = new List<int>();
@@ -106,6 +116,19 @@
m_Bosses.MoveToCenter(bosses.IndexOf(model.selectBoss));
}
+ void DisplayOpenDate()
+ {
+ DailyQuestOpenTime dailyQuestOpenTime;
+ if (dailyQuestModel.TryGetOpenTime((int)DailyQuestType.FairyGrabBoss, out dailyQuestOpenTime))
+ {
+ m_OpenDate.text = Language.Get("FairyGrabBossOpenDate", dailyQuestOpenTime.ToOpenTimeString());
+ }
+ else
+ {
+ m_OpenDate.text = string.Empty;
+ }
+ }
+
void DisplayBossInfo()
{
List<Item> dropItems;
--
Gitblit v1.8.0