From 1ad03cc2f91d75e80fc3dc42e2ac1fadc9a2bfec Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 11 二月 2026 16:10:43 +0800
Subject: [PATCH] Merge branch 'master' into h5version
---
Main/Core/NetworkPackage/GameNetSystem.cs | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/Main/Core/NetworkPackage/GameNetSystem.cs b/Main/Core/NetworkPackage/GameNetSystem.cs
index 56744e6..94d9e5e 100644
--- a/Main/Core/NetworkPackage/GameNetSystem.cs
+++ b/Main/Core/NetworkPackage/GameNetSystem.cs
@@ -118,6 +118,12 @@
}
mainSocket = new ClientSocket(ServerType.Main);
+ // websocket鐨勬柇寮�閾炬帴闇�瑕佸鐞嗕竴涓�
+ mainSocket.OnDisconnected = () =>
+ {
+ netState = NetState.DisConnected;
+ LoginManager.Instance.busy = false;
+ };
mainProtocolQueue.Clear();
mainSocket.Connect(ip, port, (bool ok) =>
@@ -141,6 +147,27 @@
waitLoginMap = _wait;
}
+ public bool GetIsWaitLoginMap()
+ {
+ return waitLoginMap;
+ }
+
+ //0403鐧诲綍涔嬪墠鐨勫寘缂撳瓨
+ Queue<GameNetPackBasic> sendQueue = new Queue<GameNetPackBasic>();
+
+ public void SendCachePackage()
+ {
+ int cnt = sendQueue.Count;
+ if (mainSocket != null)
+ {
+ while (sendQueue.Count > 0)
+ {
+ SendInfo(sendQueue.Dequeue());
+ }
+ }
+ Debug.LogError($"閲嶇偣鎻愰啋锛�0403鐧诲綍鍚� 鍙戦�佺紦瀛樺寘鏁伴噺 {cnt} 涓�");
+ }
+
public void SendInfo(GameNetPackBasic protocol)
{
if (waitLogin)
@@ -152,11 +179,13 @@
}
}
+ // 0102鏄粠鍦板浘鍙戦�佺殑 璇存槑宸茬櫥褰曪紝浣嗗彲鑳藉崱椤垮鑷撮�氱煡route鐘舵�佹參浜庡鎴风锛屼緷鐒堕渶瑕侀槻鑼�
if (waitLoginMap)
{
if (protocol is not C0123_tagCClientPackVersion && protocol is not C0101_tagCPlayerLogin)
{
- Debug.LogWarning("绛夊緟0403鍖咃紝涓嶅厑璁稿彂閫佸叾浠栧寘 " + protocol.ToString());
+ Debug.LogError("閲嶇偣鎻愰啋锛氱櫥褰曞畬鎴愬墠鐨勫皝鍖呭厛鍔犲叆闃熷垪 绛�0403鍥炲寘鍚庡啀涓�璧峰彂閫佹湇鍔＄ " + protocol.ToString());
+ sendQueue.Enqueue(protocol);
return;
}
}
@@ -168,6 +197,7 @@
}
}
+#if UNITY_EDITOR
public void SendInfo(byte[] vBytes)
{
if (mainSocket != null)
@@ -175,7 +205,7 @@
mainSocket.SendInfo(vBytes);
}
}
-
+#endif
public void PushPackage(GameNetPackBasic protocol, ServerType type)
{
@@ -286,6 +316,8 @@
void OnUpdate()
{
+ mainSocket?.DispatchMessageQueue();
+
lock (this)
{
while (mainProtocolQueue.Count > 0)
--
Gitblit v1.8.0