Tigran 4 anos atrás
pai
commit
6c1e850d51

+ 5 - 5
CardCollector/Commands/CallbackQuery/CombineCallback.cs

@@ -1,5 +1,4 @@
-using System.Linq;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using CardCollector.Controllers;
 using CardCollector.DataBase.Entity;
 using CardCollector.Resources;
@@ -24,9 +23,10 @@ namespace CardCollector.Commands.CallbackQuery
                         $"{User.Session.SelectedSticker.Count}{Text.items}", true);
                 }
 
-                if (User.Session.CombineList.ContainsKey(User.Session.SelectedSticker.Md5Hash))
-                    User.Session.CombineList[User.Session.SelectedSticker.Md5Hash].Count += User.Session.SelectedSticker.Count;
-                else User.Session.CombineList.Add(User.Session.SelectedSticker.Md5Hash, User.Session.SelectedSticker);
+                if (!User.Session.CombineList.ContainsKey(User.Session.SelectedSticker.Md5Hash))
+                    User.Session.CombineList.Add(User.Session.SelectedSticker.Md5Hash, User.Session.SelectedSticker);
+                else
+                    User.Session.CombineList[User.Session.SelectedSticker.Md5Hash].Count = User.Session.SelectedSticker.Count;
             }
             await new BackToCombine(User, Update).Execute();
         }

+ 4 - 4
CardCollector/Others/Session.cs

@@ -68,13 +68,13 @@ namespace CardCollector.Others
             Messages.Clear();
         }
 
-        public int CombineCoinsPrice = 0;
-        public int CombineGemsPrice = 0;
+        public int CombineCoinsPrice;
+        public int CombineGemsPrice;
 
         public void CalculateCombinePrice()
         {
-            var coinsSum = CombineList.Values.Sum(i => 1440 / i.IncomeTime * i.IncomeCoins);
-            var gemsSum = CombineList.Values.Sum(i => 1440 / i.IncomeTime * i.IncomeGems);
+            var coinsSum = CombineList.Values.Sum(i => 1440 / i.IncomeTime * i.IncomeCoins * i.Count);
+            var gemsSum = CombineList.Values.Sum(i => 1440 / i.IncomeTime * i.IncomeGems * i.Count);
             var multiplier = SelectedSticker.Tier * 0.25 + 1;
             CombineCoinsPrice = (int)(coinsSum * multiplier);
             CombineGemsPrice = (int)(gemsSum * multiplier);