From eac8aeed7cea1f7ac5e08a4e231281a6a77b522d Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期三, 22 十月 2025 20:09:50 +0800
Subject: [PATCH] 143 演武场-客户端 只在“没有战斗”和“主线战斗道中”时弹结算界面
---
Main/Core/NetworkPackage/DataToCtl/ConnectedState.cs | 40 +++++++++++-----------------------------
1 files changed, 11 insertions(+), 29 deletions(-)
diff --git a/Main/Core/NetworkPackage/DataToCtl/ConnectedState.cs b/Main/Core/NetworkPackage/DataToCtl/ConnectedState.cs
index 3ed4d83..599e1ce 100644
--- a/Main/Core/NetworkPackage/DataToCtl/ConnectedState.cs
+++ b/Main/Core/NetworkPackage/DataToCtl/ConnectedState.cs
@@ -42,13 +42,11 @@
return;
}
- if (GameNetSystem.Instance.timeSinceMainSocketLastProtocol > OVERTIME_THRESHOLD
- || (GameNetSystem.Instance.crossServerConnected_Loigc && GameNetSystem.Instance.timeSinceCrossServerSocketLastProtocol > OVERTIME_THRESHOLD))
+ if (GameNetSystem.Instance.timeSinceMainSocketLastProtocol > OVERTIME_THRESHOLD)
{
DetectConnected(3);
}
- else if (!GameNetSystem.Instance.mainSocketConnected
- || (GameNetSystem.Instance.crossServerConnected_Loigc && !GameNetSystem.Instance.crossServerSocketConnected))
+ else if (!GameNetSystem.Instance.mainSocketConnected)
{
DetectConnected(3);
}
@@ -77,22 +75,15 @@
{
connectedDetecting = true;
- // var sendInfo1 = new C0104_tagCOnlineReturn();
- // sendInfo1.Type = 0;
- // GameNetSystem.Instance.SendInfo(sendInfo1);// 鍦ㄧ嚎鍥炲簲
+ var sendInfo1 = new C0104_tagCOnlineReturn();
+ sendInfo1.Type = 0;
+ GameNetSystem.Instance.SendInfo(sendInfo1);// 鍦ㄧ嚎鍥炲簲
- // if (GameNetSystem.Instance.crossServerConnected_Loigc)
- // {
- // var sendInfo2 = new C0104_tagCOnlineReturn();
- // sendInfo2.Type = 0;
- // GameNetSystem.Instance.SendToCrossServer(sendInfo2);// 鍦ㄧ嚎鍥炲簲
- // }
-
- // if (clock != null)
- // {
- // Clock.Stop(clock);
- // }
- // clock = Clock.AlarmAt(DateTime.Now + new TimeSpan(_seconds * TimeSpan.TicksPerSecond), OnDetectEnd);
+ if (clock != null)
+ {
+ Clock.Stop(clock);
+ }
+ clock = Clock.AlarmAt(DateTime.Now + new TimeSpan(_seconds * TimeSpan.TicksPerSecond), OnDetectEnd);
}
private void OnDetectEnd()
@@ -107,15 +98,6 @@
|| GameNetSystem.Instance.timeSinceMainSocketLastProtocol > OVERTIME_THRESHOLD;
#endif
- if (GameNetSystem.Instance.crossServerConnected_Loigc)
- {
-#if UNITY_IOS && !UNITY_EDITOR
- isDisconnected = isDisconnected || GameNetSystem.Instance.timeSinceCrossServerSocketLastProtocol > 3f;
-#else
- isDisconnected = isDisconnected || !GameNetSystem.Instance.crossServerSocketConnected
- || GameNetSystem.Instance.timeSinceCrossServerSocketLastProtocol > OVERTIME_THRESHOLD;
-#endif
- }
if (isDisconnected)
{
@@ -123,7 +105,7 @@
{
case NetworkReachability.NotReachable:
GameNetSystem.Instance.Disconnect();
- // WindowCenter.Instance.Open<DisconnectHintWin>();
+ UIManager.Instance.OpenWindow<DisconnectHintWin>();
break;
case NetworkReachability.ReachableViaCarrierDataNetwork:
case NetworkReachability.ReachableViaLocalAreaNetwork:
--
Gitblit v1.8.0