Merge branch 'master' into h5version

yyl

2026-05-11 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96

 Main/Core/NetworkPackage/DataToCtl/ConnectedState.cs

@@ -2,6 +2,7 @@
using System.Collections.Generic;
using UnityEngine;
using System;
using Cysharp.Threading.Tasks;

public class ConnectedState : NetState
{
@@ -42,13 +43,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 +76,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 +99,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 +106,7 @@
            {
                case NetworkReachability.NotReachable:
                    GameNetSystem.Instance.Disconnect();
                    // WindowCenter.Instance.Open<DisconnectHintWin>();
                    UIManager.Instance.OpenWindowAsync<DisconnectHintWin>().Forget();
                    break;
                case NetworkReachability.ReachableViaCarrierDataNetwork:
                case NetworkReachability.ReachableViaLocalAreaNetwork: