From 11971eedb6531fa41b33111e917d877e5aed7e1a Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 21 二月 2019 11:18:22 +0800
Subject: [PATCH] Merge branch 'master' into TreasureRevise
---
System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
index 3d307e8..9cc2596 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
@@ -73,6 +73,10 @@
public void OnSwitchAccount()
{
IsMatching = false;
+ if (clientMatchClock!=null )
+ {
+ clientMatchClock.Stop();
+ }
}
public void OnPlayerLoginOk()
@@ -467,12 +471,13 @@
GameNetSystem.Instance.PushPackage(onMatchPackage, ServerType.Main);
var randomWaitSeconds = UnityEngine.Random.Range(3, 8);
clientMatchClock = Clock.Create(DateTime.Now + new TimeSpan(randomWaitSeconds * TimeSpan.TicksPerSecond), () =>
- {
- if (StageLoad.Instance.stageType == Stage.E_StageType.Dungeon)
- {
- ClientCrossServerOneVsOne.FakeMatchOk();
- }
- });
+ {
+ IsMatching = false;
+ if (GameNetSystem.Instance.netState == GameNetSystem.NetState.Connected)
+ {
+ ClientCrossServerOneVsOne.FakeMatchOk();
+ }
+ });
}
else
{
--
Gitblit v1.8.0