Browse Source

edit alert message

Tigran 4 years ago
parent
commit
a2fd09ffe8

+ 2 - 2
CardCollector.sln.DotSettings.user

@@ -1,12 +1,12 @@
 <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">True</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=CardCollector_002FResources_002FSortingTypes/@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>
 	
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/Initialized/@EntryValue">True</s:Boolean></wpf:ResourceDictionary>

+ 4 - 1
CardCollector/Commands/CallbackQuery/CollectIncomeQuery.cs

@@ -17,7 +17,10 @@ namespace CardCollector.Commands.CallbackQuery
             await Bot.Client.AnswerCallbackQueryAsync(Update.CallbackQuery.Id, 
                 $"{Messages.you_collected}: " +
                 $"{User.Session.IncomeCoins}{Text.coin} " +
-                $"{User.Session.IncomeGems}{Text.gem}", true);
+                $"{User.Session.IncomeGems}{Text.gem}" +
+                $"\n\n{Messages.your_cash}: " +
+                $"{User.Cash.Coins}{Text.coin} " +
+                $"{User.Cash.Gems}{Text.gem}", true);
         }
 
         public CollectIncomeQuery() { }

+ 9 - 0
CardCollector/Resources/Messages.Designer.cs

@@ -311,5 +311,14 @@ namespace CardCollector.Resources {
                 return ResourceManager.GetString("you_collected", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Ваш баланс.
+        /// </summary>
+        internal static string your_cash {
+            get {
+                return ResourceManager.GetString("your_cash", resourceCulture);
+            }
+        }
     }
 }

+ 3 - 0
CardCollector/Resources/Messages.resx

@@ -102,4 +102,7 @@
     <data name="menu_message" xml:space="preserve">
         <value>Вы можете выбрать одну из опций ниже</value>
     </data>
+    <data name="your_cash" xml:space="preserve">
+        <value>Ваш баланс</value>
+    </data>
 </root>