From 8c1184fced045f133de6cc7fe55deb38e1884812 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期六, 13 四月 2019 11:30:50 +0800
Subject: [PATCH] Merge branch 'master' into HazyRegion
---
Core/GameEngine/DataToCtl/CreateOrSelectRoleState.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Core/GameEngine/DataToCtl/CreateOrSelectRoleState.cs b/Core/GameEngine/DataToCtl/CreateOrSelectRoleState.cs
index 761a9c2..97dfbfa 100644
--- a/Core/GameEngine/DataToCtl/CreateOrSelectRoleState.cs
+++ b/Core/GameEngine/DataToCtl/CreateOrSelectRoleState.cs
@@ -60,7 +60,7 @@
{
if (clock != null)
{
- clock.Stop();
+ Clock.Stop(clock);
}
clock = null;
base.OnExit();
@@ -77,9 +77,9 @@
if (clock != null)
{
- clock.Stop();
+ Clock.Stop(clock);
}
- clock = Clock.Create(DateTime.Now + new TimeSpan(_seconds * TimeSpan.TicksPerSecond), OnDetectEnd);
+ clock = Clock.AlarmAt(DateTime.Now + new TimeSpan(_seconds * TimeSpan.TicksPerSecond), OnDetectEnd);
}
private void OnDetectEnd()
--
Gitblit v1.8.0