Fix conflicts

lambdaclass · Jun 11, 2024 · d363462 · d363462
2 parents 9a218ac + 10db0d4
commit d363462
Show file tree

Hide file tree

Showing 8 changed files with 116 additions and 108 deletions.
diff --git a/client/Assets/AddressableAssetsData/OSX.meta b/client/Assets/AddressableAssetsData/OSX.meta
diff --git a/client/Assets/Scripts/AfkRewards/AfkRewardRate.cs b/client/Assets/Scripts/AfkRewards/AfkRewardRate.cs
@@ -2,5 +2,5 @@ public class AfkRewardRate
 {
     public string kalineTreeLevelId;
     public string currency;
-    public float rate;
+    public float daily_rate;
 }
diff --git a/client/Assets/Scripts/AfkRewards/KalineTreeManager.cs b/client/Assets/Scripts/AfkRewards/KalineTreeManager.cs
@@ -16,7 +16,8 @@ public class KalineTreeManager : MonoBehaviour
     [SerializeField] GameObject insufficientCurrencyPopup;
     [SerializeField] GameObject afkRewardDetailUI;
     [SerializeField] GameObject afkRewardsContainer;
-    private const int SECONDS_IN_DAY = 86400;
+
+    private const int MINUTES_IN_DAY = 1440;
 
     void Start()
     {
@@ -37,11 +38,11 @@ public void ShowRewards()
                 Destroy(child.gameObject);
             }
 
-            foreach (var afkReward in afkRewards.Where(reward => user.User.kalineTreeLevel.afkRewardRates.Any(rewardRate => rewardRate.rate > 0 && rewardRate.currency == reward.currency)))
+            foreach (var afkReward in afkRewards.Where(reward => user.User.kalineTreeLevel.afkRewardRates.Any(rewardRate => rewardRate.daily_rate > 0 && rewardRate.currency == reward.currency)))
             {
                 GameObject afkRewardGO = Instantiate(afkRewardDetailUI, afkRewardsContainer.transform);
                 AfkRewardDetail afkRewardDetail = afkRewardGO.GetComponent<AfkRewardDetail>();
-                afkRewardDetail.SetData(GlobalUserData.Instance.AvailableCurrencies.Single(currency => currency.name == afkReward.currency).image, $"{afkReward.amount} ({user.User.kalineTreeLevel.afkRewardRates.Single(arr => arr.currency == afkReward.currency).rate * 60}/m)");
+                afkRewardDetail.SetData(GlobalUserData.Instance.AvailableCurrencies.Single(currency => currency.name == afkReward.currency).image, $"{afkReward.amount} ({user.User.kalineTreeLevel.afkRewardRates.Single(arr => arr.currency == afkReward.currency).daily_rate / (MINUTES_IN_DAY)}/m)");
             }
 
             confirmPopUp.SetActive(true);
@@ -115,23 +116,23 @@ private void SetAfkRewardRatesTexts(User user)
             switch (afkRewardRate.currency)
             {
                 case "Gold":
-                    goldAfkRewardRate.text = GetAfkRewardRateText(afkRewardRate.rate);
+                    goldAfkRewardRate.text = GetAfkRewardRateText(afkRewardRate.daily_rate);
                     break;
                 case "Hero Souls":
-                    heroSoulsAfkRewardRate.text = GetAfkRewardRateText(afkRewardRate.rate);
+                    heroSoulsAfkRewardRate.text = GetAfkRewardRateText(afkRewardRate.daily_rate);
                     break;
                 case "Experience":
-                    experienceAfkRewardRate.text = GetAfkRewardRateText(afkRewardRate.rate);
+                    experienceAfkRewardRate.text = GetAfkRewardRateText(afkRewardRate.daily_rate);
                     break;
                 case "Arcane Crystals":
-                    arcaneCrystalsAfkRewardRate.text = GetAfkRewardRateText(afkRewardRate.rate);
+                    arcaneCrystalsAfkRewardRate.text = GetAfkRewardRateText(afkRewardRate.daily_rate);
                     break;
             }
         }
     }
 
-    private string GetAfkRewardRateText(float rate)
+    private string GetAfkRewardRateText(float daily_rate)
     {
-        return $"{rate * SECONDS_IN_DAY}/day";
+        return $"{daily_rate}/day";
     }
 }
diff --git a/client/Assets/Scripts/BackendConnection/SocketConnection.cs b/client/Assets/Scripts/BackendConnection/SocketConnection.cs
@@ -202,7 +202,7 @@ private AfkRewardRate CreateAfkRewardRateFromData(Protobuf.Messages.AfkRewardRat
         {
             kalineTreeLevelId = afkRewardRateData.KalineTreeLevelId,
             currency = afkRewardRateData.Currency.Name,
-            rate = afkRewardRateData.Rate
+            daily_rate = afkRewardRateData.DailyRate
         };
     }
 

diff --git a/client/Assets/Scripts/Campaign/LevelData.cs b/client/Assets/Scripts/Campaign/LevelData.cs
@@ -12,7 +12,7 @@ public class LevelData
 
     public Dictionary<string, int> rewards = new Dictionary<string, int>();
 
-    // AFK Rewards rate granted
+    // AFK Rewards daily_rate granted
     // These are how many a player makes in the maximum timespan available (12h now)
     public Dictionary<Currency, int> afkCurrencyRate = new Dictionary<Currency, int>();
 

diff --git a/client/Assets/Scripts/Dungeon/DungeonSettlementManager.cs b/client/Assets/Scripts/Dungeon/DungeonSettlementManager.cs
@@ -12,7 +12,6 @@ public class DungeonSettlementManager : MonoBehaviour
     [SerializeField] GameObject confirmPopUp;
     [SerializeField] GameObject insufficientCurrencyPopup;
     [SerializeField] GameObject levelUpButton;
-    private const int SECONDS_IN_DAY = 86400;
 
     void Start()
     {
@@ -76,7 +75,7 @@ private void SetAfkRewardRatesTexts(User user)
         {
             if (afkRewardRate.currency == "Supplies")
             {
-                suppliesAfkRewardRate.text = GetAfkRewardRateText(afkRewardRate.rate);
+                suppliesAfkRewardRate.text = GetAfkRewardRateText(afkRewardRate.daily_rate);
             }
             else
             {
@@ -85,8 +84,8 @@ private void SetAfkRewardRatesTexts(User user)
         }
     }
 
-    private string GetAfkRewardRateText(float rate)
+    private string GetAfkRewardRateText(float daily_rate)
     {
-        return $"{rate * SECONDS_IN_DAY}/day";
+        return $"{daily_rate}/day";
     }
 }