[修改]1. 修改防裁剪

AlianBlank · AlianBlank · commit a2559c635c51 · 2024-09-09T11:32:06.000+08:00
diff --git a/Runtime/EventArgs/NetworkClosedEventArgs.cs b/Runtime/EventArgs/NetworkClosedEventArgs.cs
@@ -12,6 +12,7 @@ namespace GameFrameX.Network.Runtime
     /// <summary>
     /// 网络连接关闭事件。
     /// </summary>
+    [UnityEngine.Scripting.Preserve]
     public sealed class NetworkClosedEventArgs : GameEventArgs
     {
         /// <summary>
diff --git a/Runtime/EventArgs/NetworkConnectedEventArgs.cs b/Runtime/EventArgs/NetworkConnectedEventArgs.cs
@@ -12,6 +12,7 @@ namespace GameFrameX.Network.Runtime
     /// <summary>
     /// 网络连接成功事件。
     /// </summary>
+    [UnityEngine.Scripting.Preserve]
     public sealed class NetworkConnectedEventArgs : GameEventArgs
     {
         /// <summary>
diff --git a/Runtime/EventArgs/NetworkCustomErrorEventArgs.cs b/Runtime/EventArgs/NetworkCustomErrorEventArgs.cs
@@ -12,6 +12,7 @@ namespace GameFrameX.Network.Runtime
     /// <summary>
     /// 用户自定义网络错误事件。
     /// </summary>
+    [UnityEngine.Scripting.Preserve]
     public sealed class NetworkCustomErrorEventArgs : GameEventArgs
     {
         /// <summary>
diff --git a/Runtime/EventArgs/NetworkErrorEventArgs.cs b/Runtime/EventArgs/NetworkErrorEventArgs.cs
@@ -13,6 +13,7 @@ namespace GameFrameX.Network.Runtime
     /// <summary>
     /// 网络错误事件。
     /// </summary>
+    [UnityEngine.Scripting.Preserve]
     public sealed class NetworkErrorEventArgs : GameEventArgs
     {
         /// <summary>
diff --git a/Runtime/EventArgs/NetworkMissHeartBeatEventArgs.cs b/Runtime/EventArgs/NetworkMissHeartBeatEventArgs.cs
@@ -12,6 +12,7 @@ namespace GameFrameX.Network.Runtime
     /// <summary>
     /// 网络心跳包丢失事件。
     /// </summary>
+    [UnityEngine.Scripting.Preserve]
     public sealed class NetworkMissHeartBeatEventArgs : GameEventArgs
     {
         /// <summary>
diff --git a/Runtime/Network/Base/MessageHandlerAttribute.cs b/Runtime/Network/Base/MessageHandlerAttribute.cs
@@ -9,6 +9,7 @@ namespace GameFrameX.Network.Runtime
     /// 网络非RPC返回消息处理器
     /// </summary>
     [AttributeUsage(AttributeTargets.Method)]
+    [UnityEngine.Scripting.Preserve]
     public class MessageHandlerAttribute : Attribute
     {
         public const BindingFlags Flags = BindingFlags.Default | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static;
diff --git a/Runtime/Network/Base/MessageObject.cs b/Runtime/Network/Base/MessageObject.cs
@@ -39,5 +39,10 @@ public void SetUpdateUniqueId(int uniqueId)
         {
             UniqueId = uniqueId;
         }
+
+        public override string ToString()
+        {
+            return Utility.Json.ToJson(this);
+        }
     }
 }
diff --git a/Runtime/Network/Helper/DefaultMessageCompressHandler.cs b/Runtime/Network/Helper/DefaultMessageCompressHandler.cs
@@ -6,6 +6,7 @@ namespace GameFrameX.Network.Runtime
     /// <summary>
     /// 默认消息压缩处理
     /// </summary>
+    [UnityEngine.Scripting.Preserve]
     public sealed class DefaultMessageCompressHandler : IMessageCompressHandler, IPacketHandler
     {
         /// <summary>
diff --git a/Runtime/Network/Helper/DefaultMessageDecompressHandler.cs b/Runtime/Network/Helper/DefaultMessageDecompressHandler.cs
@@ -6,6 +6,7 @@ namespace GameFrameX.Network.Runtime
     /// <summary>
     /// 默认消息解压处理
     /// </summary>
+    [UnityEngine.Scripting.Preserve]
     public sealed class DefaultMessageDecompressHandler : IMessageDecompressHandler, IPacketHandler
     {
         /// <summary>
diff --git a/Runtime/Network/Helper/DefaultNetworkChannelHelper.cs b/Runtime/Network/Helper/DefaultNetworkChannelHelper.cs
@@ -1,12 +1,15 @@
 using System;
 using System.IO;
-using System.Reflection;
 using GameFrameX.Event.Runtime;
 using GameFrameX.Runtime;
 
 
 namespace GameFrameX.Network.Runtime
 {
+    /// <summary>
+    /// 默认网络通道帮助
+    /// </summary>
+    [UnityEngine.Scripting.Preserve]
     public class DefaultNetworkChannelHelper : INetworkChannelHelper, IReference
     {
         private INetworkChannel m_NetworkChannel;
diff --git a/Runtime/Network/Helper/DefaultPacketHeartBeatHandler.cs b/Runtime/Network/Helper/DefaultPacketHeartBeatHandler.cs
@@ -3,6 +3,7 @@ namespace GameFrameX.Network.Runtime
     /// <summary>
     /// 默认心跳包处理
     /// </summary>
+    [UnityEngine.Scripting.Preserve]
     public class BasePacketHeartBeatHandler : IPacketHeartBeatHandler, IPacketHandler
     {
         /// <summary>
diff --git a/Runtime/Network/Helper/DefaultPacketReceiveBodyHandler.cs b/Runtime/Network/Helper/DefaultPacketReceiveBodyHandler.cs
@@ -2,6 +2,10 @@
 
 namespace GameFrameX.Network.Runtime
 {
+    /// <summary>
+    /// 默认消息接收内容处理器
+    /// </summary>
+    [UnityEngine.Scripting.Preserve]
     public sealed class DefaultPacketReceiveBodyHandler : IPacketReceiveBodyHandler, IPacketHandler
     {
         public bool Handler<T>(byte[] source, int messageId, out T messageObject) where T : MessageObject
diff --git a/Runtime/Network/Helper/DefaultPacketReceiveHeaderHandler.cs b/Runtime/Network/Helper/DefaultPacketReceiveHeaderHandler.cs
@@ -1,5 +1,9 @@
 namespace GameFrameX.Network.Runtime
 {
+    /// <summary>
+    /// 默认消息接收头处理器
+    /// </summary>
+    [UnityEngine.Scripting.Preserve]
     public sealed class DefaultPacketReceiveHeaderHandler : IPacketReceiveHeaderHandler, IPacketHandler
     {
         /// <summary>
diff --git a/Runtime/Network/Helper/DefaultPacketSendBodyHandler.cs b/Runtime/Network/Helper/DefaultPacketSendBodyHandler.cs
@@ -2,6 +2,10 @@
 
 namespace GameFrameX.Network.Runtime
 {
+    /// <summary>
+    /// 默认消息发送内容处理器
+    /// </summary>
+    [UnityEngine.Scripting.Preserve]
     public sealed class DefaultPacketSendBodyHandler : IPacketSendBodyHandler, IPacketHandler
     {
         public bool Handler(byte[] messageBodyBuffer, MemoryStream destination)
diff --git a/Runtime/Network/Helper/DefaultPacketSendHeaderHandler.cs b/Runtime/Network/Helper/DefaultPacketSendHeaderHandler.cs
@@ -3,6 +3,10 @@
 
 namespace GameFrameX.Network.Runtime
 {
+    /// <summary>
+    /// 默认消息发送头部处理器
+    /// </summary>
+    [UnityEngine.Scripting.Preserve]
     public class DefaultPacketSendHeaderHandler : IPacketSendHeaderHandler, IPacketHandler
     {
         /// <summary>
diff --git a/Runtime/Network/Network/NetworkManager.cs b/Runtime/Network/Network/NetworkManager.cs
@@ -14,6 +14,7 @@ namespace GameFrameX.Network.Runtime
     /// <summary>
     /// 网络管理器。
     /// </summary>
+    [UnityEngine.Scripting.Preserve]
     public sealed partial class NetworkManager : GameFrameworkModule, INetworkManager
     {
         private readonly Dictionary<string, NetworkChannelBase> m_NetworkChannels;
diff --git a/Runtime/Network/Network/ProtoMessageHandler.cs b/Runtime/Network/Network/ProtoMessageHandler.cs
@@ -10,6 +10,7 @@ namespace GameFrameX.Network.Runtime
     /// <summary>
     /// 协议消息处理帮助类
     /// </summary>
+    [UnityEngine.Scripting.Preserve]
     public static class ProtoMessageHandler
     {
         private static readonly ConcurrentDictionary<Type, List<MessageHandlerAttribute>> MessageHandlerDictionary = new ConcurrentDictionary<Type, List<MessageHandlerAttribute>>();
diff --git a/Runtime/Network/Network/ProtoMessageIdHandler.cs b/Runtime/Network/Network/ProtoMessageIdHandler.cs
@@ -9,6 +9,7 @@ namespace GameFrameX.Network.Runtime
     /// <summary>
     /// 协议消息处理器
     /// </summary>
+    [UnityEngine.Scripting.Preserve]
     public static class ProtoMessageIdHandler
     {
         private static readonly BidirectionalDictionary<int, Type> ReqDictionary = new BidirectionalDictionary<int, Type>();
diff --git a/Runtime/Network/Network/SystemSocket/NetworkManager.SystemNetSocket.cs b/Runtime/Network/Network/SystemSocket/NetworkManager.SystemNetSocket.cs
@@ -6,6 +6,7 @@ namespace GameFrameX.Network.Runtime
 {
     public partial class NetworkManager
     {
+        [UnityEngine.Scripting.Preserve]
         private sealed class SystemNetSocket : INetworkSocket
         {
             private readonly Socket m_Socket;
diff --git a/Runtime/Network/Network/SystemSocket/NetworkManager.SystemTcpNetworkChannel.cs b/Runtime/Network/Network/SystemSocket/NetworkManager.SystemTcpNetworkChannel.cs
@@ -17,6 +17,7 @@ public sealed partial class NetworkManager
         /// <summary>
         /// TCP 网络频道。
         /// </summary>
+        [UnityEngine.Scripting.Preserve]
         private sealed class SystemTcpNetworkChannel : NetworkChannelBase
         {
             private ConnectState m_ConnectState = null;
diff --git a/Runtime/Network/Network/WebSocket/NetworkManager.WebSocketNetSocket.cs b/Runtime/Network/Network/WebSocket/NetworkManager.WebSocketNetSocket.cs
@@ -9,6 +9,7 @@ namespace GameFrameX.Network.Runtime
 {
     public partial class NetworkManager
     {
+        [UnityEngine.Scripting.Preserve]
         private sealed class WebSocketNetSocket : INetworkSocket
         {
             private readonly IWebSocket _client;
diff --git a/Runtime/Network/Network/WebSocket/NetworkManager.WebSocketNetworkChannel.cs b/Runtime/Network/Network/WebSocket/NetworkManager.WebSocketNetworkChannel.cs
@@ -20,6 +20,7 @@ public sealed partial class NetworkManager
         /// <summary>
         /// Web Socket 网络频道。
         /// </summary>
+        [UnityEngine.Scripting.Preserve]
         private sealed class WebSocketNetworkChannel : NetworkChannelBase
         {
             private readonly CancellationTokenSource m_CancellationTokenSource = new CancellationTokenSource();
diff --git a/Runtime/Network/NetworkComponent.cs b/Runtime/Network/NetworkComponent.cs
@@ -18,6 +18,7 @@ namespace GameFrameX.Network.Runtime
     /// </summary>
     [DisallowMultipleComponent]
     [AddComponentMenu("Game Framework/Network")]
+    [UnityEngine.Scripting.Preserve]
     public sealed class NetworkComponent : GameFrameworkComponent
     {
         private INetworkManager m_NetworkManager = null;

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ namespace GameFrameX.Network.Runtime`
`12`	`12`	`/// <summary>`
`13`	`13`	`/// 网络连接关闭事件。`
`14`	`14`	`/// </summary>`
	`15`	`+ [UnityEngine.Scripting.Preserve]`
`15`	`16`	`public sealed class NetworkClosedEventArgs : GameEventArgs`
`16`	`17`	`{`
`17`	`18`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ namespace GameFrameX.Network.Runtime`
`13`	`13`	`/// <summary>`
`14`	`14`	`/// 网络错误事件。`
`15`	`15`	`/// </summary>`
	`16`	`+ [UnityEngine.Scripting.Preserve]`
`16`	`17`	`public sealed class NetworkErrorEventArgs : GameEventArgs`
`17`	`18`	`{`
`18`	`19`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ namespace GameFrameX.Network.Runtime`
`9`	`9`	`/// 网络非RPC返回消息处理器`
`10`	`10`	`/// </summary>`
`11`	`11`	`[AttributeUsage(AttributeTargets.Method)]`
	`12`	`+ [UnityEngine.Scripting.Preserve]`
`12`	`13`	`public class MessageHandlerAttribute : Attribute`
`13`	`14`	`{`
`14`	`15`	`public const BindingFlags Flags = BindingFlags.Default \| BindingFlags.Public \| BindingFlags.NonPublic \| BindingFlags.Instance \| BindingFlags.Static;`
Original file line number	Diff line number	Diff line change
`@@ -39,5 +39,10 @@ public void SetUpdateUniqueId(int uniqueId)`
`39`	`39`	`{`
`40`	`40`	`UniqueId = uniqueId;`
`41`	`41`	`}`
	`42`	`+`
	`43`	`+ public override string ToString()`
	`44`	`+ {`
	`45`	`+ return Utility.Json.ToJson(this);`
	`46`	`+ }`
`42`	`47`	`}`
`43`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ namespace GameFrameX.Network.Runtime`
`6`	`6`	`/// <summary>`
`7`	`7`	`/// 默认消息压缩处理`
`8`	`8`	`/// </summary>`
	`9`	`+ [UnityEngine.Scripting.Preserve]`
`9`	`10`	`public sealed class DefaultMessageCompressHandler : IMessageCompressHandler, IPacketHandler`
`10`	`11`	`{`
`11`	`12`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ namespace GameFrameX.Network.Runtime`
`6`	`6`	`/// <summary>`
`7`	`7`	`/// 默认消息解压处理`
`8`	`8`	`/// </summary>`
	`9`	`+ [UnityEngine.Scripting.Preserve]`
`9`	`10`	`public sealed class DefaultMessageDecompressHandler : IMessageDecompressHandler, IPacketHandler`
`10`	`11`	`{`
`11`	`12`	`/// <summary>`