Tigran 3 年 前
コミット
4f4a7ceb2b

+ 1 - 0
CardCollector/Commands/CallbackQuery/BuyShopItem.cs

@@ -51,6 +51,7 @@ namespace CardCollector.Commands.CallbackQuery
                 userPack.Count += module.SelectedPosition?.Count ?? module.Count;
                 if (module.SelectedPosition?.AdditionalPrize != "") await GivePrize(module.SelectedPosition?.AdditionalPrize);
                 var message = await MessageController.SendMessage(User, Messages.thanks_for_buying);
+                User.Session.ResetModule<ShopModule>();
                 User.Session.Messages.Add(message.MessageId);
             }
         }

+ 6 - 2
CardCollector/Commands/InlineQueryCommand.cs

@@ -43,8 +43,12 @@ namespace CardCollector.Commands
             new ShowStickersInBotChat(),
             new ShowStickersInPrivate(),
         };
-        
-        
+
+        public override async Task PrepareAndExecute()
+        {
+            await Execute();
+        }
+
         /* Метод, создающий объекты команд исходя из полученного обновления */
         public static async Task<UpdateModel> Factory(Update update)
         {

+ 4 - 1
CardCollector/Logs.cs

@@ -25,8 +25,11 @@ namespace CardCollector
             if (Constants.DEBUG) Console.WriteLine(message);
             else
             {
-                using(var sw = File.AppendText($@"{path}\{today.Day}-{today.Month}-{today.Year}.log"))
+                using(var sw = File.AppendText($"{path}/{today.Day}-{today.Month}-{today.Year}.log"))
+                {
                     await sw.WriteLineAsync(message);
+                    sw.Close();
+                }
             }
         }
         

+ 1 - 1
CardCollector/Resources/Constants.cs

@@ -7,7 +7,7 @@ namespace CardCollector.Resources
     public static class Constants
     {
         /* Переключить данный флаг при сборке на сервер */
-        public const bool DEBUG = true;
+        public const bool DEBUG = false;
 
         /* Интервал сохранения изменений */
         public const double SAVING_CHANGES_INTERVAL = DEBUG ? 10 * 1000 : 5 * 60 * 1000;

+ 7 - 0
CardCollector/Session/MenuInformation.cs

@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using CardCollector.Commands;
 using CardCollector.Resources;
+using CardCollector.Session.Modules;
 
 namespace CardCollector.Session
 {
@@ -13,6 +14,12 @@ namespace CardCollector.Session
         public async Task BackToThis(UserSession session)
         {
             session.State = State;
+            switch (State)
+            {
+                case UserState.ShopMenu:
+                    session.ResetModule<ShopModule>();
+                    break;
+            }
             await Parent.PrepareAndExecute();
         }
 

+ 3 - 0
CardCollector/Session/Modules/ShopModule.cs

@@ -11,6 +11,9 @@ namespace CardCollector.Session.Modules
         public void Reset()
         {
             SelectedPosition = null;
+            SelectedPack = null;
+            Count = 1;
+            EnteredExchangeSum = 1;
         }
     }
 }