From 31463848256bb0ea493bbd0d5d4f506e849fdaf9 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期一, 24 十二月 2018 21:21:46 +0800
Subject: [PATCH] Merge branch 'Cross_Server' of http://192.168.0.87:10010/r/snxxz_scripts into Cross_Server
---
System/CrossServerOneVsOne/CrossServerOneVsOneRoundWin.cs | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOneRoundWin.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneRoundWin.cs
index 7d13ed9..1f37dc7 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOneRoundWin.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOneRoundWin.cs
@@ -1,4 +1,5 @@
-锘縰sing UnityEngine;
+锘縰sing System;
+using UnityEngine;
using UnityEngine.UI;
namespace Snxxz.UI
@@ -27,7 +28,6 @@
protected override void OnPreOpen()
{
- GlobalTimeEvent.Instance.secondEvent += UpdateCoolTime;
SetDisplay();
}
protected override void OnAfterOpen()
@@ -35,9 +35,15 @@
}
+ protected override void LateUpdate()
+ {
+ base.LateUpdate();
+ UpdateCoolTime();
+
+ }
protected override void OnPreClose()
{
- GlobalTimeEvent.Instance.secondEvent -= UpdateCoolTime;
+
}
protected override void OnAfterClose()
{
@@ -48,7 +54,7 @@
private void SetDisplay()
{
int roundNum = dungeonModel.mission.roundNum;
- coolTime = dungeonModel.mission.prepareTime / 1000;
+ coolTime = -1;
bool isWin = IsWin();
victoryObj.SetActive(isWin);
failureObj.SetActive(!isWin);
@@ -69,12 +75,18 @@
private void UpdateCoolTime()
{
- coolTimeText.text = coolTime.ToString();
- coolTime -= 1;
- if(coolTime <= 0)
+ if (crossServerModel.roundEndTime > DateTime.Now)
+ {
+ var surplusTime = Mathf.Clamp((int)(crossServerModel.roundEndTime - DateTime.Now).TotalSeconds, 0, int.MaxValue);
+ if (coolTime != surplusTime)
+ {
+ coolTime = surplusTime;
+ coolTimeText.text = coolTime.ToString();
+ }
+ }
+ else
{
CloseImmediately();
- coolTime = 0;
}
}
--
Gitblit v1.8.0