From ec03d591a58be4c7451a86e89674bba1c0f7f7dc Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 06 十二月 2018 19:25:21 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
UI/HUD/HeadUpName.cs | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/UI/HUD/HeadUpName.cs b/UI/HUD/HeadUpName.cs
index 738d971..9333d91 100644
--- a/UI/HUD/HeadUpName.cs
+++ b/UI/HUD/HeadUpName.cs
@@ -35,6 +35,7 @@
[SerializeField] TimerBehaviour m_TimeBehaviour;
[SerializeField] Text m_RebornTime;
[SerializeField] Text m_NpcAppearTxt;
+ [SerializeField] RebornRightNowBossInfoQuery m_BossInfoQuery;
[SerializeField] Text m_FuncTxt;
bool secondTextInited = false;
@@ -298,20 +299,23 @@
{
return;
}
+
+ m_BossInfoQuery.bossId = npcId;
FindPreciousModel.BossInfo _bossInfo;
if (findPreciousModel.TryGetBossInfo(npcId, out _bossInfo))
{
m_RebornTime.gameObject.SetActive(true);
(m_TimeBehaviour as TimerToChsBehaviour).addtionInfo = Language.Get("BossReborn_RefreshTime");
- m_TimeBehaviour.Begin( (int)(_bossInfo.refreshTime - TimeUtility.ServerNow).TotalSeconds, () =>
- {
- m_NpcAppearTxt.gameObject.SetActive(true);
- });
+ m_TimeBehaviour.Begin((int)(_bossInfo.refreshTime - TimeUtility.ServerNow).TotalSeconds, () =>
+ {
+ m_NpcAppearTxt.gameObject.SetActive(true);
+ });
}
else
{
m_RebornTime.gameObject.SetActive(false);
}
+
m_NpcAppearTxt.gameObject.SetActive(!m_RebornTime.gameObject.activeSelf);
}
--
Gitblit v1.8.0