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/CrossServerOneVsOneModel.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
index 2054976..621765d 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
@@ -20,7 +20,7 @@
public bool IsMatching { get; set;}
public DateTime matchStartTime { get; set; }
-
+ public DateTime roundEndTime { get; private set; }
public override void Init()
{
IsMatching = false;
@@ -105,7 +105,8 @@
var mission = dungeonModel.mission;
if(mission.prepareTime > 0)
{
- if(!WindowCenter.Instance.IsOpen<CrossServerOneVsOneRoundWin>())
+ roundEndTime = DateTime.Now + new TimeSpan(mission.prepareTime * TimeSpan.TicksPerMillisecond);
+ if (!WindowCenter.Instance.IsOpen<CrossServerOneVsOneRoundWin>())
{
WindowCenter.Instance.Open<CrossServerOneVsOneRoundWin>();
}
--
Gitblit v1.8.0