Tigran 3 年之前
父节点
当前提交
9e0efd195f

+ 0 - 1
CardCollector/Bot.cs

@@ -36,7 +36,6 @@ namespace CardCollector
         public static void Main(string[] args)
         {
             Logs.LogOut("Bot started");
-            
             _timer.Elapsed += SavingChanges;
             _timer.Elapsed += UserDao.ClearMemory;
             TimerTask.SetupAll();

+ 1 - 1
CardCollector/TimerTasks/DailyTaskAlert.cs

@@ -9,7 +9,7 @@ namespace CardCollector.TimerTasks
 {
     public class DailyTaskAlert : TimerTask
     {
-        protected override TimeSpan RunAt => Constants.DEBUG ? new TimeSpan(12, 14, 20) : new TimeSpan(10, 0, 0);
+        protected override TimeSpan RunAt => Constants.DEBUG ? new TimeSpan(12, 24, 0) : new TimeSpan(10, 0, 0);
         
         protected override async void TimerCallback(object o, ElapsedEventArgs e)
         {

+ 1 - 1
CardCollector/TimerTasks/DailyTaskReset.cs

@@ -8,7 +8,7 @@ namespace CardCollector.TimerTasks
 {
     public class DailyTaskReset : TimerTask
     {
-        protected override TimeSpan RunAt => Constants.DEBUG ? new TimeSpan(12, 14, 20) : new TimeSpan(10, 0, 0);
+        protected override TimeSpan RunAt => Constants.DEBUG ? new TimeSpan(12, 24, 0) : new TimeSpan(10, 0, 0);
 
         protected override async void TimerCallback(object o, ElapsedEventArgs e)
         {

+ 1 - 1
CardCollector/TimerTasks/ExecuteStickerEffects.cs

@@ -11,7 +11,7 @@ namespace CardCollector.TimerTasks
 {
     public class ExecuteStickerEffects : TimerTask
     {
-        protected override TimeSpan RunAt => Constants.DEBUG ? new TimeSpan(12, 14, 20) : new TimeSpan(11, 0, 0);
+        protected override TimeSpan RunAt => Constants.DEBUG ? new TimeSpan(12, 24, 0) : new TimeSpan(11, 0, 0);
         
         protected override async void TimerCallback(object o, ElapsedEventArgs e)
         {

+ 2 - 6
CardCollector/TimerTasks/PiggyBankAlert.cs

@@ -9,13 +9,9 @@ namespace CardCollector.TimerTasks
 {
     public class PiggyBankAlert : TimerTask
     {
-        protected override TimeSpan RunAt => Get();
-        public TimeSpan Get()
-        {
-            return Constants.DEBUG 
-                ? new TimeSpan(12, 14, 20) 
+        protected override TimeSpan RunAt => Constants.DEBUG 
+                ? new TimeSpan(DateTime.Now.TimeOfDay.Hours, DateTime.Now.TimeOfDay.Minutes + 1, 0)
                 : new TimeSpan((DateTime.Now.TimeOfDay.Hours % 4 + 1) * 4, 0, 0);
-        }
         
         protected override async void TimerCallback(object o, ElapsedEventArgs e)
         {

+ 1 - 1
CardCollector/TimerTasks/ResetChatGiveExp.cs

@@ -7,7 +7,7 @@ namespace CardCollector.TimerTasks
 {
     public class ResetChatGiveExp : TimerTask
     {
-        protected override TimeSpan RunAt => Constants.DEBUG ? new TimeSpan(12, 14, 20) : new TimeSpan(10, 0, 0);
+        protected override TimeSpan RunAt => Constants.DEBUG ? new TimeSpan(12, 24, 0) : new TimeSpan(10, 0, 0);
         
         protected override void TimerCallback(object o, ElapsedEventArgs e)
         {

+ 8 - 4
CardCollector/TimerTasks/TimerTask.cs

@@ -24,27 +24,31 @@ namespace CardCollector.TimerTasks
                 task.Setup();
         }
 
-        protected static void SetupTimer(Timer timer, TimeSpan timeToRun, ElapsedEventHandler callback)
+        protected static void SetupTimer(Timer timer, TimeSpan timeToRun)
         {
             var interval = timeToRun - DateTime.Now.TimeOfDay;
             if (interval < TimeSpan.Zero) interval += new TimeSpan(1, 0, 0, 0);
             timer.AutoReset = false;
             timer.Enabled = true;
             timer.Interval = interval.TotalMilliseconds;
-            timer.Elapsed += callback;
         }
 
         protected abstract void TimerCallback(object o, ElapsedEventArgs e);
 
         protected virtual void Setup()
         {
-            SetupTimer(Timer, RunAt, TimerCallback);
-            Timer.Elapsed += Setup;
+            SetupTimer(Timer, RunAt);
         }
 
         protected void Setup(object o, ElapsedEventArgs e)
         {
             Setup();
         }
+
+        protected TimerTask()
+        {
+            Timer.Elapsed += TimerCallback;
+            Timer.Elapsed += Setup;
+        }
     }
 }

+ 1 - 1
CardCollector/TimerTasks/TopExpUsersAlert.cs

@@ -10,7 +10,7 @@ namespace CardCollector.TimerTasks
 {
     public class TopExpUsersAlert : TimerTask
     {
-        protected override TimeSpan RunAt => Constants.DEBUG ? new TimeSpan(12, 14, 20) : new TimeSpan(24, 0, 0);
+        protected override TimeSpan RunAt => Constants.DEBUG ? new TimeSpan(12, 24, 0) : new TimeSpan(24, 0, 0);
         
         protected override async void TimerCallback(object o, ElapsedEventArgs e)
         {