删除过时代码

KumoKyaku · Oct 29, 2022 · 0b22892 · 0b22892
1 parent 92ce62d
commit 0b22892
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 53 deletions.
diff --git a/Megumin.Remote/SendOption.cs b/Megumin.Remote/SendOption.cs
@@ -27,9 +27,8 @@ public interface IForceUdpDataOnKcpRemote
 
     public class SendOption : IRpcTimeoutOption, ICmdOption, IRpcThreadOption, IForceUdpDataOnKcpRemote
     {
-        public static readonly SendOption Never = new SendOption() { MillisecondsDelay = -1, MillisecondsTimeout = -1 };
-        public static readonly SendOption Echo = new SendOption() { MillisecondsDelay = 30000, MillisecondsTimeout = 30000, Cmd = 1 };
-        public int MillisecondsDelay { get; set; } = 30000;
+        public static readonly SendOption Never = new SendOption() { MillisecondsTimeout = -1 };
+        public static readonly SendOption Echo = new SendOption() { MillisecondsTimeout = 30000, Cmd = 1 };
         public int MillisecondsTimeout { get; set; } = 30000;
         public short Cmd { get; set; } = 0;
         public bool? RpcComplatePost2ThreadScheduler { get; set; } = null;

diff --git a/Megumin.Remote/TimeStampSynchronization.cs b/Megumin.Remote/TimeStampSynchronization.cs
@@ -100,17 +100,12 @@ public async ValueTask Sync(ISendAsyncable remote, int count = 20, int interval
 
         protected static readonly SendOption sendOption = new SendOption()
         {
-            MillisecondsDelay = 2000,
+            MillisecondsTimeout = 2000,
             RpcComplatePost2ThreadScheduler = false,
         };
 
         public async Task<OffsetValue> GetOffset(ISendAsyncable remote, int index = 0)
         {
-            SendOption sendOption = new SendOption()
-            {
-                MillisecondsDelay = 2000,
-                RpcComplatePost2ThreadScheduler = false,
-            };
             var sendTime = DateTimeOffset.UtcNow;
             var (remotetime, ex) = await remote.SendAsync<DateTimeOffset>(new GetTime(), options: sendOption).ConfigureAwait(false);
 

diff --git a/MessageStandard/MSGIDAttribute.cs b/MessageStandard/MSGIDAttribute.cs
@@ -93,11 +93,6 @@ public MSGID(int id)
         public const int UdpConnectMessageID = 101;
         public const int Authentication = 150;
         /// <summary>
-        /// 心跳包ID，255好识别，buffer[10-13]=[255,0,0,0]
-        /// </summary>
-        [Obsolete("Use Heartbeat")]
-        public const int Heartbeats = 255;
-        /// <summary>
         /// 心跳包ID，256好识别，buffer[10-13]=[255,1,0,0]
         /// </summary>
         public const int Heartbeat = 256;

diff --git a/MessageStandard/MessageLUT.cs b/MessageStandard/MessageLUT.cs
@@ -560,30 +560,4 @@ public override void Write(byte[] buffer, int offset, int count)
         public override long Length { get; } = long.MaxValue;
         public override long Position { get; set; }
     }
-
-
-    [Obsolete("Use TraceListener instead.", true)]
-    public interface ILogger
-    {
-        void Log(object message, object state = null);
-        void LogError(object message, object state = null);
-        void LogWarning(object message, object state = null);
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    [Obsolete("Use TraceListener instead.", true)]
-    public static class DebugLogger
-    {
-        public static ILogger Logger { get; set; }
-        public static void Log(object message, object state = null)
-            => Logger?.Log(message, state);
-
-        public static void LogError(object message, object state = null)
-            => Logger?.LogError(message, state);
-
-        public static void LogWarning(object message, object state = null)
-            => Logger?.LogWarning(message, state);
-    }
 }
diff --git a/MessageStandard/MessageStandard.csproj b/MessageStandard/MessageStandard.csproj
@@ -5,9 +5,9 @@
     <Authors>云却</Authors>
 
     <!--版本配置-->
-    <Version>1.1.0.0</Version>
-    <AssemblyVersion>1.1.0.0</AssemblyVersion>
-    <FileVersion>1.1.0.0</FileVersion>
+    <Version>1.2.0.0</Version>
+    <AssemblyVersion>1.2.0.0</AssemblyVersion>
+    <FileVersion>1.2.0.0</FileVersion>
 
     <!--包配置-->
     <Product>MeguminNet</Product>

diff --git a/NetRemoteStandard/IRemote.cs b/NetRemoteStandard/IRemote.cs
@@ -221,11 +221,6 @@ public interface ISendAsyncable
     /// <remarks>不要定义OnReceive函数，由于具体业务逻辑不同，这个函数的签名可能有很多中变化，不能标准化。</remarks>
     public interface IReceiveMessage
     {
-        ///// <summary>
-        ///// 最后一次收到消息的时间
-        ///// </summary>
-        //[Obsolete("DateTime 开销太大，使用时间戳代替")]
-        //DateTime LastReceiveTime { get; }
         /// <summary>
         /// 最后一次收到消息的时间戳,因为Unity中时间戳是float
         /// </summary>
@@ -266,11 +261,6 @@ public interface IMultiplexing
     /// </summary>
     public interface IRpcTimeoutOption
     {
-        /// <summary>
-        /// 指定毫秒后超时，-1表示永不超时。
-        /// </summary>
-        [Obsolete("Use MillisecondsTimeout instead.", true)]
-        int MillisecondsDelay { get; }
         /// <summary>
         /// 指定毫秒后超时，-1表示永不超时。
         /// </summary>