[删除]1. 删除自定义错误事件

Author: AlianBlank

Runtime/EventArgs/NetworkCustomErrorEventArgs.cs

@@ -104,7 +104,6 @@ public void Initialize(INetworkChannel netChannel)
             Event.Subscribe(NetworkClosedEventArgs.EventId, OnNetClosed);
             Event.Subscribe(NetworkMissHeartBeatEventArgs.EventId, OnNetMissHeartBeat);
             Event.Subscribe(NetworkErrorEventArgs.EventId, OnNetError);
-            Event.Subscribe(NetworkCustomErrorEventArgs.EventId, OnNetCustomError);
         }
 
         public void Shutdown()
@@ -113,7 +112,6 @@ public void Shutdown()
             Event.Unsubscribe(NetworkClosedEventArgs.EventId, OnNetClosed);
             Event.Unsubscribe(NetworkMissHeartBeatEventArgs.EventId, OnNetMissHeartBeat);
             Event.Unsubscribe(NetworkErrorEventArgs.EventId, OnNetError);
-            Event.Unsubscribe(NetworkCustomErrorEventArgs.EventId, OnNetCustomError);
             m_NetworkChannel = null;
         }
 
@@ -211,15 +209,5 @@ private void OnNetError(object sender, GameEventArgs e)
             Log.Error(Utility.Text.Format("Network channel '{0}' error, error code is '{1}', error message is '{2}'.", ne.NetworkChannel.Name, ne.ErrorCode, ne.ErrorMessage));
             ne.NetworkChannel.Close();
         }
-
-        private void OnNetCustomError(object sender, GameEventArgs e)
-        {
-            if (!(e is NetworkCustomErrorEventArgs ne) || ne.NetworkChannel != m_NetworkChannel)
-            {
-                return;
-            }
-
-            Log.Error(Utility.Text.Format("Network channel '{0}' error", ne.NetworkChannel.Name));
-        }
     }
 }

Runtime/EventArgs/NetworkCustomErrorEventArgs.cs.meta

@@ -40,11 +40,6 @@ public interface INetworkManager
         /// </summary>
         event EventHandler<NetworkErrorEventArgs> NetworkError;
 
-        /// <summary>
-        /// 用户自定义网络错误事件。
-        /// </summary>
-        event EventHandler<NetworkCustomErrorEventArgs> NetworkCustomError;
-
         /// <summary>
         /// 检查是否存在网络频道。
         /// </summary>

Runtime/Network/Helper/DefaultNetworkChannelHelper.cs

@@ -24,7 +24,6 @@ public sealed partial class NetworkManager : GameFrameworkModule, INetworkManage
         private EventHandler<NetworkClosedEventArgs> m_NetworkClosedEventHandler;
         private EventHandler<NetworkMissHeartBeatEventArgs> m_NetworkMissHeartBeatEventHandler;
         private EventHandler<NetworkErrorEventArgs> m_NetworkErrorEventHandler;
-        private EventHandler<NetworkCustomErrorEventArgs> m_NetworkCustomErrorEventHandler;
 
         /// <summary>
         /// 初始化网络管理器的新实例。
@@ -37,7 +36,6 @@ public NetworkManager()
             m_NetworkClosedEventHandler = null;
             m_NetworkMissHeartBeatEventHandler = null;
             m_NetworkErrorEventHandler = null;
-            m_NetworkCustomErrorEventHandler = null;
         }
 
         /// <summary>
@@ -84,15 +82,6 @@ public event EventHandler<NetworkErrorEventArgs> NetworkError
             remove { m_NetworkErrorEventHandler -= value; }
         }
 
-        /// <summary>
-        /// 用户自定义网络错误事件。
-        /// </summary>
-        public event EventHandler<NetworkCustomErrorEventArgs> NetworkCustomError
-        {
-            add { m_NetworkCustomErrorEventHandler += value; }
-            remove { m_NetworkCustomErrorEventHandler -= value; }
-        }
-
         /// <summary>
         /// 网络管理器轮询。
         /// </summary>
@@ -118,7 +107,6 @@ protected override void Shutdown()
                 networkChannelBase.NetworkChannelClosed -= OnNetworkChannelClosed;
                 networkChannelBase.NetworkChannelMissHeartBeat -= OnNetworkChannelMissHeartBeat;
                 networkChannelBase.NetworkChannelError -= OnNetworkChannelError;
-                networkChannelBase.NetworkChannelCustomError -= OnNetworkChannelCustomError;
                 networkChannelBase.Shutdown();
             }
 
@@ -206,7 +194,6 @@ public INetworkChannel CreateNetworkChannel(string channelName, INetworkChannelH
             networkChannel.NetworkChannelClosed += OnNetworkChannelClosed;
             networkChannel.NetworkChannelMissHeartBeat += OnNetworkChannelMissHeartBeat;
             networkChannel.NetworkChannelError += OnNetworkChannelError;
-            networkChannel.NetworkChannelCustomError += OnNetworkChannelCustomError;
             m_NetworkChannels.Add(channelName, networkChannel);
             return networkChannel;
         }
@@ -225,7 +212,6 @@ public bool DestroyNetworkChannel(string channelName)
                 networkChannel.NetworkChannelClosed -= OnNetworkChannelClosed;
                 networkChannel.NetworkChannelMissHeartBeat -= OnNetworkChannelMissHeartBeat;
                 networkChannel.NetworkChannelError -= OnNetworkChannelError;
-                networkChannel.NetworkChannelCustomError -= OnNetworkChannelCustomError;
                 networkChannel.Shutdown();
                 if (channelName != null)
                 {
@@ -287,18 +273,5 @@ private void OnNetworkChannelError(NetworkChannelBase networkChannel, NetworkErr
                 }
             }
         }
-
-        private void OnNetworkChannelCustomError(NetworkChannelBase networkChannel, object customErrorData)
-        {
-            if (m_NetworkCustomErrorEventHandler != null)
-            {
-                lock (m_NetworkCustomErrorEventHandler)
-                {
-                    NetworkCustomErrorEventArgs networkCustomErrorEventArgs = NetworkCustomErrorEventArgs.Create(networkChannel, customErrorData);
-                    m_NetworkCustomErrorEventHandler(this, networkCustomErrorEventArgs);
-                    // ReferencePool.Release(networkCustomErrorEventArgs);
-                }
-            }
-        }
     }
 }

Runtime/Network/Interface/INetworkManager.cs

@@ -65,7 +65,6 @@ protected override void Awake()
             m_NetworkManager.NetworkClosed += OnNetworkClosed;
             m_NetworkManager.NetworkMissHeartBeat += OnNetworkMissHeartBeat;
             m_NetworkManager.NetworkError += OnNetworkError;
-            m_NetworkManager.NetworkCustomError += OnNetworkCustomError;
         }
 
         private void Start()
@@ -168,10 +167,5 @@ private void OnNetworkError(object sender, NetworkErrorEventArgs eventArgs)
         {
             m_EventComponent.Fire(this, eventArgs);
         }
-
-        private void OnNetworkCustomError(object sender, NetworkCustomErrorEventArgs eventArgs)
-        {
-            m_EventComponent.Fire(this, eventArgs);
-        }
     }
 }