Refactor CurrencyRewards, fix experience, add amount to rewards

client/Assets/Scripts/BackendConnection/SocketConnection.cs

@@ -270,21 +270,27 @@ private List<Campaign> ParseCampaignsFromResponse(Protobuf.Messages.Campaigns ca
                     levelNumber = (int)level.LevelNumber,
                     campaignId = level.CampaignId,
                     units = levelUnits,
-                    currencyRewards = GetLevelCurrencyRewards(level),
-                    itemRewards = level.ItemRewards.Select(itemReward => new ItemReward
+                    currencyRewards = level.CurrencyRewards.Select(currencyReward => new CurrencyReward
+                    {
+                        currency = GlobalUserData.Instance.AvailableCurrencies.Find(currency => currency.name == currencyReward.Currency.Name),
+                        amount = (int)currencyReward.Amount
+                    }).ToList(),
+                    itemRewards = level.ItemRewards.Select(itemReward =>
+                    new ItemReward
                     {
                         itemTemplate = GlobalUserData.Instance.AvailableItemTemplates.Find(itemTemplate => itemTemplate.name.ToLower() == itemReward.ItemTemplateName.ToLower()),
-                        level = (int)itemReward.Level
+                        amount = (int)itemReward.Amount
                     }).ToList(),
                     unitRewards = level.UnitRewards.Select(unitReward => new UnitReward
                     {
                         character = availableCharacters.Find(character => character.name.ToLower() == unitReward.CharacterName.ToLower()),
-                        rank = (int)unitReward.Rank
+                        rank = (int)unitReward.Rank,
+                        amount = (int)unitReward.Amount
                     }).ToList(),
+                    experienceReward = (int)level.ExperienceReward,
                     status = levelStatus
                 });
 
-
                 if (levelStatus == LevelProgress.Status.Unlocked)
                 {
                     levelStatus = LevelProgress.Status.Locked;
@@ -843,13 +849,6 @@ private void AwaitFuseUnitsResponse(byte[] data, Action<Unit> onSuccess, Action<
         }
     }
 
-    private Dictionary<string, int> GetLevelCurrencyRewards(Level level)
-    {
-        Dictionary<string, int> rewards = level.CurrencyRewards.ToDictionary(currencyReward => currencyReward.Currency.Name, currencyReward => (int)currencyReward.Amount);
-        rewards.Add("Experience", (int)level.ExperienceReward);
-        return rewards;
-    }
-
     public void GetAfkRewards(string userId, Action<List<AfkReward>> onAfkRewardsReceived)
     {
         GetAfkRewards getAfkRewardsRequest = new GetAfkRewards

client/Assets/Scripts/Battle/BattleManager.cs

@@ -211,7 +211,7 @@ private void HandleBattleResult(bool result)
                 Debug.LogError(ex.Message);
             }
             GlobalUserData user = GlobalUserData.Instance;
-            user.AddCurrencies(GetLevelRewards());
+            user.AddCurrencies(GetLevelCurrencyRewards());
             victorySplash.GetComponentInChildren<RewardsUIContainer>().Populate(CreateRewardsList());
             victorySplash.SetActive(true);
             victorySplash.GetComponent<AudioSource>().Play();
@@ -303,9 +303,14 @@ private void ProcessExecutionsReceived(IEnumerable<Protobuf.Messages.Action> act
         }
     }
 
-    private Dictionary<string, int> GetLevelRewards()
+    private Dictionary<string, int> GetLevelCurrencyRewards()
     {
-        Dictionary<string, int> rewards = LevelProgress.selectedLevelData.currencyRewards;
+        Dictionary<string, int> rewards = new();
+        foreach (var currencyReward in LevelProgress.selectedLevelData.currencyRewards)
+        {
+            rewards.Add(currencyReward.currency.name, currencyReward.amount);
+        }
+
         if (LevelProgress.selectedLevelData.experienceReward > 0)
         {
             rewards.Add("Experience", LevelProgress.selectedLevelData.experienceReward);
@@ -337,10 +342,7 @@ private List<UIReward> CreateRewardsList()
 
         foreach (var currencyReward in LevelProgress.selectedLevelData.currencyRewards)
         {
-            if (currencyReward.Value > 0)
-            {
-                rewards.Add(new CurrencyUIReward(currencyReward.Key, currencyReward.Value));
-            }
+            rewards.Add(new CurrencyUIReward(currencyReward));
         }
 
         foreach (var unitReward in LevelProgress.selectedLevelData.unitRewards)
@@ -353,6 +355,11 @@ private List<UIReward> CreateRewardsList()
             rewards.Add(new ItemUIReward(itemReward));
         }
 
+        if (LevelProgress.selectedLevelData.experienceReward > 0)
+        {
+            rewards.Add(new ExperienceUIReward(LevelProgress.selectedLevelData.experienceReward));
+        }
+
         return rewards;
     }
 

client/Assets/Scripts/Campaign/CurrencyReward.cs

@@ -0,0 +1,6 @@
+public class CurrencyReward
+{
+
+    public Currency currency;
+    public int amount;
+}

client/Assets/Scripts/Campaign/ItemReward.cs

@@ -1,5 +1,5 @@
 public class ItemReward
 {
     public ItemTemplate itemTemplate;
-    public int level;
+    public int amount;
 }

client/Assets/Scripts/Campaign/LevelData.cs

@@ -9,8 +9,7 @@ public class LevelData
     public string campaignId;
     public List<Unit> units;
 
-    public Dictionary<string, int> currencyRewards = new Dictionary<string, int>();
-
+    public List<CurrencyReward> currencyRewards = new();
     public List<ItemReward> itemRewards = new();
     public List<UnitReward> unitRewards = new();
 

client/Assets/Scripts/Campaign/UnitReward.cs

@@ -2,4 +2,5 @@ public class UnitReward
 {
     public Character character;
     public int rank;
+    public int amount;
 }