[修改]1. 修改宏定义的切换异常

Author: AlianBlank

Runtime/Implementation/NoWebGL/WebSocket.cs

@@ -1,4 +1,4 @@
-#if !NET_LEGACY && (UNITY_EDITOR || !UNITY_WEBGL)
+#if !UNITY_WEBGL
 using System;
 using System.Text;
 using System.Threading;

Runtime/Implementation/NoWebGL/WebSocketManager.cs

@@ -1,4 +1,4 @@
-#if !NET_LEGACY && (UNITY_EDITOR || !UNITY_WEBGL)
+#if !UNITY_WEBGL
 using System.Collections.Generic;
 using UnityEngine;
 

Runtime/Implementation/WebGL/WebSocket.cs

@@ -1,4 +1,4 @@
-#if !UNITY_EDITOR && UNITY_WEBGL
+#if UNITY_WEBGL
 
 using System;
 
@@ -50,12 +50,21 @@ public WebSocket(string address, string[] subProtocols)
 
         internal void AllocateInstance()
         {
+            Log($"AllocateInstance: {this.Address}");
             instanceId = WebSocketManager.AllocateInstance(this.Address);
             Log($"Allocate socket with instanceId: {instanceId}");
-            if (this.SubProtocols == null) return;
+            if (this.SubProtocols == null)
+            {
+                return;
+            }
+
             foreach (var protocol in this.SubProtocols)
             {
-                if (string.IsNullOrEmpty(protocol)) continue;
+                if (string.IsNullOrEmpty(protocol))
+                {
+                    continue;
+                }
+
                 Log($"Add Sub Protocol {protocol}, with instanceId: {instanceId}");
                 int code = WebSocketManager.WebSocketAddSubProtocol(instanceId, protocol);
                 if (code < 0)
@@ -84,21 +93,30 @@ public void CloseAsync()
         {
             Log($"Close with instanceId: {instanceId}");
             int code = WebSocketManager.WebSocketClose(instanceId, (int)CloseStatusCode.Normal, "Normal Closure");
-            if (code < 0) HandleOnError(GetErrorMessageFromCode(code));
+            if (code < 0)
+            {
+                HandleOnError(GetErrorMessageFromCode(code));
+            }
         }
 
         public void SendAsync(string text)
         {
             Log($"Send, type: {Opcode.Text}, size: {text.Length}");
             int code = WebSocketManager.WebSocketSendStr(instanceId, text);
-            if (code < 0) HandleOnError(GetErrorMessageFromCode(code));
+            if (code < 0)
+            {
+                HandleOnError(GetErrorMessageFromCode(code));
+            }
         }
 
         public void SendAsync(byte[] data)
         {
             Log($"Send, type: {Opcode.Binary}, size: {data.Length}");
             int code = WebSocketManager.WebSocketSend(instanceId, data, data.Length);
-            if (code < 0) HandleOnError(GetErrorMessageFromCode(code));
+            if (code < 0)
+            {
+                HandleOnError(GetErrorMessageFromCode(code));
+            }
         }
 
         internal void HandleOnOpen()

Runtime/Implementation/WebGL/WebSocketManager.cs

@@ -1,4 +1,4 @@
-#if !UNITY_EDITOR && UNITY_WEBGL
+#if UNITY_WEBGL
 using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
@@ -16,9 +16,13 @@ internal static class WebSocketManager
 
         /* Delegates */
         public delegate void OnOpenCallback(int instanceId);
+
         public delegate void OnMessageCallback(int instanceId, IntPtr msgPtr, int msgSize);
+
         public delegate void OnMessageStrCallback(int instanceId, IntPtr msgStrPtr);
+
         public delegate void OnErrorCallback(int instanceId, IntPtr errorPtr);
+
         public delegate void OnCloseCallback(int instanceId, int closeCode, IntPtr reasonPtr);
 
         /* WebSocket JSLIB functions */
@@ -61,7 +65,7 @@ internal static class WebSocketManager
 
         [DllImport("__Internal")]
         public static extern void WebSocketSetOnClose(OnCloseCallback callback);
-        
+
         [DllImport("__Internal")]
         public static extern void WebSocketSetSupport6000();
 
@@ -135,7 +139,11 @@ public static void DelegateOnCloseEvent(int instanceId, int closeCode, IntPtr re
 
         internal static int AllocateInstance(string address)
         {
-            if (!isInitialized) Initialize();
+            if (!isInitialized)
+            {
+                Initialize();
+            }
+
             return WebSocketAllocate(address);
         }