Tigran 4 年之前
父节点
当前提交
ecefb152ee

+ 2 - 2
CardCollector.sln.DotSettings.user

@@ -1,11 +1,11 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=CardCollector_002FResources_002FCommand/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=CardCollector_002FResources_002FCommand/@EntryIndexedValue">False</s:Boolean>
 	
 	
 	
 	
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=CardCollector_002FResources_002FMessages/@EntryIndexedValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=CardCollector_002FResources_002FMessages/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=CardCollector_002FResources_002FSortingTypes/@EntryIndexedValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=CardCollector_002FResources_002FText/@EntryIndexedValue">False</s:Boolean>
 	

+ 1 - 8
CardCollector/Commands/CallbackQuery/CountQuery.cs

@@ -12,16 +12,9 @@ namespace CardCollector.Commands.CallbackQuery
         public override async Task Execute()
         {
             var buyPositionCount = User.Session.SelectedSticker.Count;
-            var stickerCount = User.Session.State switch
-            {
-                UserState.CollectionMenu => User.Stickers[User.Session.SelectedSticker.Md5Hash].Count,
-                UserState.ShopMenu => await ShopController.GetStickerCount(User.Session.SelectedSticker.Id),
-                UserState.AuctionMenu => User.Session.SelectedSticker.TraderInfo.Quantity,
-                _ => 0
-            };
             if (CallbackData.Contains('+'))
             {
-                if (buyPositionCount < stickerCount || stickerCount == -1)
+                if (buyPositionCount < User.Session.SelectedSticker.MaxCount || User.Session.SelectedSticker.MaxCount == -1)
                 {
                     User.Session.SelectedSticker.Count++;
                     await MessageController.EditReplyMarkup(User, CallbackMessageId, Keyboard.GetStickerKeyboard(User.Session));

+ 1 - 1
CardCollector/Others/StickerInfo.cs

@@ -36,7 +36,7 @@ namespace CardCollector.Others
         
         public int GetGemsPrice()
         {
-            return Count * TraderInfo?.PriceCoins ?? PriceCoins;
+            return Count * TraderInfo?.PriceGems ?? PriceGems;
         }
 
         public override string ToString()

+ 1 - 1
CardCollector/Resources/Messages.Designer.cs

@@ -151,7 +151,7 @@ namespace CardCollector.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Подтверидте покупку.
+        ///   Looks up a localized string similar to Подтвердите покупку:.
         /// </summary>
         internal static string confirm_buying {
             get {

+ 1 - 1
CardCollector/Resources/Messages.resx

@@ -121,7 +121,7 @@
         <value>Недостаточно алмазов!</value>
     </data>
     <data name="confirm_buying" xml:space="preserve">
-        <value>Подтверидте покупку</value>
+        <value>Подтвердите покупку:</value>
     </data>
     <data name="are_you_sure" xml:space="preserve">
         <value>Вы уверены?</value>