✨ 优化API 添加移除等基础函数

Author: xinansky

Runtime/Executor/TimerExecutor.cs

@@ -118,18 +118,6 @@ public virtual bool UpdateLoop()
                 return true;
             }
 
-            if (Loop == 1 || Loop == 0)
-            {
-                Number      = Number + 1; //次数增加
-                CurrentTime = Watch.ElapsedMilliseconds;
-                Interval    = CurrentTime - Number * Duration;
-                Watch.Stop();
-                Watch = null;
-                if (TID != 0 && TimerSystem.TimerExecutors.ContainsKey(TID))
-                    TimerSystem.TimerExecutors.Remove(TID);
-                return false; //达到次数
-            }
-
             if (Loop == -1) //无限循环
             {
                 Number      = Number + 1; //次数增加
@@ -140,13 +128,16 @@ public virtual bool UpdateLoop()
                 return true;
             }
 
-            if (Loop == -2) //不执行回调结束
+            if (Loop == 1 || Loop == 0)
             {
-                Watch.Stop();
-                Watch = null;
-                return false;
+                Number      = Number + 1; //次数增加
+                CurrentTime = Watch.ElapsedMilliseconds;
+                Interval    = CurrentTime - Number * Duration;
             }
 
+            Watch.Stop();
+            Watch = null;
+            if (TID != 0 && TimerSystem.Exist(TID)) TimerSystem.Pop(TID);
             return false;
         }
 
@@ -157,10 +148,7 @@ public int CompareTo(ITimerExecutor other)
             return 0;
         }
 
-        public void Dispose()
-        {
-            Delegates = null;
-        }
+        public void Dispose() { Delegates = null; }
 
         public sealed override string ToString()
         {
@@ -192,4 +180,4 @@ public void Execute()
 
         protected abstract void xExecute();
     }
-}
+}

Runtime/Operator/TimerOperator.Loop.cs

@@ -103,4 +103,4 @@ public override void OtherUpdate(long nowTime)
             }
         }
     }
-}
+}

Runtime/System/TimerSystem.Exist.cs

@@ -1,6 +1,7 @@
 #region
 
 using System;
+using System.Collections.Generic;
 
 #endregion
 
@@ -21,6 +22,14 @@ partial class TimerSystem
         /// <summary>
         /// 判断任务是否存在
         /// </summary>
-        public static bool Exist<E>(E key) where E : Enum { return TimerExecutors.ContainsKey(key.GetHashCode()); }
+        public static bool Exist<E>(E key)
+        where E : Enum => TimerExecutors.ContainsKey(key.GetHashCode());
+
+        public static ITimerExecutor Get(long key) { return TimerExecutors.GetValueOrDefault(key, null); }
+
+        public static ITimerExecutor Get(string key) { return TimerExecutors.GetValueOrDefault(key.GetHashCode(), null); }
+
+        public static ITimerExecutor Get<E>(E key)
+        where E : Enum => TimerExecutors.GetValueOrDefault(key.GetHashCode(), null);
     }
-}
+}

Runtime/System/TimerSystem.Pop.cs

@@ -15,9 +15,8 @@ partial class TimerSystem
         /// <param name="key"> 任务ID </param>
         public static void Pop(long key)
         {
-            if (!TimerExecutors.TryGetValue(key, out var executor)) return;
+            if (!TimerExecutors.Remove(key, out var executor)) return;
             executor.Loop = -2;
-            TimerExecutors.Remove(key);
         }
 
         /// <summary>
@@ -34,6 +33,7 @@ public static void Pop(string key)
         /// 取出循环任务
         /// </summary>
         /// <param name="key"> 任务ID </param>
-        public static void Pop<E>(E key) where E : Enum { Pop(key.GetHashCode()); }
+        public static void Pop<E>(E key)
+        where E : Enum => Pop(key.GetHashCode());
     }
-}
+}