From 944e8a37f4b5d2a8fc557f176db99c3a6d93e82d Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期一, 24 十二月 2018 21:21:33 +0800
Subject: [PATCH] 5398 子 【开发】【1.4】跨服竞技场 / 【前端】【1.4】跨服竞技场开发
---
System/CrossServerOneVsOne/FightingPKWin.cs | 16 ++++++++++++++--
System/MainInterfacePanel/MainInterfaceWin.cs | 6 ++++++
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/System/CrossServerOneVsOne/FightingPKWin.cs b/System/CrossServerOneVsOne/FightingPKWin.cs
index 6452f73..fa6e36f 100644
--- a/System/CrossServerOneVsOne/FightingPKWin.cs
+++ b/System/CrossServerOneVsOne/FightingPKWin.cs
@@ -90,8 +90,20 @@
{
m_AutoImg.SetActive(false);
}
- var surplus = dungeonEndTime - DateTime.Now;
- m_CountdownText.text = TimeUtility.SecondsToHMSCHSRetain((int)surplus.TotalSeconds, false, false);
+ if (WindowCenter.Instance.IsOpen("CrossServerSettlementWin"))
+ {
+ return;
+ }
+ if (DateTime.Now >= dungeonEndTime)
+ {
+ m_CountdownText.text = "0";
+ }
+ else
+ {
+ var surplus = dungeonEndTime - DateTime.Now;
+ m_CountdownText.text = TimeUtility.SecondsToHMSCHSRetain((int)surplus.TotalSeconds, false, false);
+ }
+
}
#endregion
private void DungeonCoolDownEvent(DungeonCoolDownType type)
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index d23dd1f..a01915a 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -1281,6 +1281,9 @@
m_ChatTip.gameObject.SetActive(false);
m_FunctionForecastTip.gameObject.SetActive(false);
m_TaskSwithButton.gameObject.SetActive(false);
+ m_InGamePusher.gameObject.SetActive(false);
+ m_RedBag.gameObject.SetActive(false);
+ m_MailObj.SetActive(false);
if (Vector3.Distance(m_CastSkillTip.localPosition, m_position2_S.localPosition) <= 1)//鎶�鑳介潰鏉挎敹璧风姸鎬�
{
ShowCastSkill();//鏄剧ず鎶�鑳界粍,闅愯棌鎸夐挳缁�(寮哄埗鍒囨崲)
@@ -1294,6 +1297,9 @@
m_ChatTip.gameObject.SetActive(true);
m_FunctionForecastTip.gameObject.SetActive(true);
m_TaskSwithButton.gameObject.SetActive(true);
+ m_InGamePusher.gameObject.SetActive(true);
+ m_RedBag.gameObject.SetActive(true);
+ m_MailObj.SetActive(true);
}
}
--
Gitblit v1.8.0