Tigran 3 vuotta sitten
vanhempi
commit
5306535d16

+ 1 - 1
CardCollector/Bot.cs

@@ -78,7 +78,7 @@ namespace CardCollector
         {
             var users = await UserDao.GetAllWhere(user => Task.FromResult(!user.IsBlocked));
             foreach (var user in users)
-                await SendMessage(user, Messages.daily_task_alertation);
+                await SendMessage(user, Messages.daily_task_alertation, Keyboard.Menu);
             Utilities.SetUpTimer(Constants.DailyTaskAlert, DailyTaskAlert);
         }
     }

+ 2 - 2
CardCollector/Commands/CallbackQuery/MyPacksQuery.cs

@@ -18,8 +18,8 @@ namespace CardCollector.Commands.CallbackQuery
             var specificCount = await SpecificPackDao.GetCount(User.Id);
             var message = await MessageController.SendMessage(User, 
                 $"{Messages.your_packs}" +
-                $"\n{Messages.random_packs} {userPack.RandomCount}{Text.items}" +
-                $"\n{Messages.author_packs} {userPack.AuthorCount}{Text.items}" +
+                $"\n{Messages.random_packs}: {userPack.RandomCount}{Text.items}" +
+                $"\n{Messages.author_packs}: {userPack.AuthorCount}{Text.items}" +
                 $"\n{Messages.specific_packs} {specificCount}{Text.items}",
                 Keyboard.PackMenu);
             User.Session.Messages.Add(message.MessageId);

+ 2 - 3
CardCollector/Commands/CallbackQuery/OpenPackCallback.cs

@@ -56,14 +56,13 @@ namespace CardCollector.Commands.CallbackQuery
             
             async Task<bool> TryOpen()
             {
-                if (packId == 2)
+                var info = await SpecificPackDao.GetInfo(User.Id, packId);
+                if (info.Count < 1)
                 {
                     if (userPack.AuthorCount < 1) return false;
                     userPack.AuthorCount--;
                     return true;
                 }
-                var info = await SpecificPackDao.GetInfo(User.Id, packId);
-                if (info.Count < 1) return false;
                 info.Count--;
                 return true;
             }

+ 1 - 0
CardCollector/DataBase/EntityDao/UsersPacksDao.cs

@@ -18,6 +18,7 @@ namespace CardCollector.DataBase.EntityDao
         {
             var newPack = new UsersPacksEntity(){UserId = userId};
             var result = await Table.AddAsync(newPack);
+            await Instance.SaveChangesAsync();
             return result.Entity;
         }
     }

+ 1 - 0
CardCollector/Logs.cs

@@ -3,6 +3,7 @@ using System.IO;
 using CardCollector.Resources;
 // ReSharper disable ConditionIsAlwaysTrueOrFalse
 // ReSharper disable LocalizableElement
+#pragma warning disable 162
 
 namespace CardCollector
 {

+ 3 - 3
CardCollector/Resources/Constants.cs

@@ -26,8 +26,8 @@ namespace CardCollector.Resources
         public const int COMBINE_COUNT = 5;
         
         /* Время оповещения и сброса ежедневных заданий */
-        public static readonly TimeSpan DailyTaskAlert = DEBUG ? new TimeSpan(1, 36, 30) : new TimeSpan(12, 0, 0);
-        public static readonly TimeSpan DailyTaskReset = DEBUG ? new TimeSpan(0, 13, 0) : new TimeSpan(0, 0, 0);
-        public static readonly TimeSpan DailyStickerRewardCheck = DEBUG ? new TimeSpan(2, 56, 40) : new TimeSpan(1, 0, 0);
+        public static readonly TimeSpan DailyTaskAlert = DEBUG ? new TimeSpan(20, 30, 00) : new TimeSpan(12, 0, 0);
+        public static readonly TimeSpan DailyTaskReset = DEBUG ? new TimeSpan(20, 30, 0) : new TimeSpan(0, 0, 0);
+        public static readonly TimeSpan DailyStickerRewardCheck = DEBUG ? new TimeSpan(20, 35, 0) : new TimeSpan(1, 0, 0);
     }
 }

+ 1 - 0
CardCollector/StickerEffects/EffectFunctions.cs

@@ -29,6 +29,7 @@ namespace CardCollector.StickerEffects
                 if (packsCount > 0) await MessageController.SendMessage(user, 
                     $"{Messages.effect_Random1Pack5Day} {packsCount}{Text.items}");
             }
+            Utilities.SetUpTimer(Constants.DailyStickerRewardCheck, RunAll);
         }
 
         public static async Task GiveTier2()