fixed achievements that were shown more than once (#229)

Author: katyaganina

Assets/Scripts/GameManager/GameManager.cs

@@ -41,6 +41,7 @@ public class GameManager : MonoBehaviour
 
     //Achievements
     [SerializeField] private GameObject achievementNotificationManagerPrefab;
+    private HashSet<AchievementData> unlockedAchievements = new HashSet<AchievementData>();
 
     //Game status
     private bool isPaused = false;
@@ -501,6 +502,11 @@ public async void UpdateAchievement(AchievementTitle title, int newProgress, Lis
             {
                 return;
             }
+            if (!unlockedAchievements.Any(achievementInListUnlockedAchievements => achievementInListUnlockedAchievements.GetTitle() == achievement.GetTitle()))
+            {
+                EarnAchievement(achievement);
+                unlockedAchievements.Add(achievement);
+            }
 
         }
     #endif
@@ -526,7 +532,11 @@ public async void IncreaseAchievementProgress(AchievementTitle title, int increm
                     return;
                 }
 
-                EarnAchievement(achievement);
+                if (!unlockedAchievements.Any(achievementInListUnlockedAchievements => achievementInListUnlockedAchievements.GetTitle() == achievement.GetTitle()))
+                {
+                    EarnAchievement(achievement);
+                    unlockedAchievements.Add(achievement);
+                }
             }
         }
     }

Assets/Scripts/HUD/Leaderboard/OpenLeaderboard.cs

@@ -8,7 +8,7 @@
 /// </summary>
 public class OpenLeaderboard : MonoBehaviour
 {
-    public static bool menuOpen = true;
+    public static bool menuOpen = false;
     public GameObject rewardsPanel;
 
     private AudioSource audioSource;

Assets/Scripts/HUD/ProgressBar.cs

@@ -1,6 +1,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 using TMPro;
+using System;
 
 public class ProgressBar : MonoBehaviour
 {
@@ -68,22 +69,13 @@ public void setUnlockedArea(int worldIndex)
 
         unlockedAreaText.text = worldIndex.ToString();
 
-        if (worldIndex == 1)
+        if (worldIndex == 1 || worldIndex == 2)
         {
-            GameManager.Instance.UpdateAchievement(AchievementTitle.LEVEL_UP, 1, null);
+            GameManager.Instance.UpdateAchievement(AchievementTitle.LEVEL_UP, worldIndex, null);
         }
-        if (worldIndex == 2)
+        if (worldIndex != 1)
         {
-            GameManager.Instance.IncreaseAchievementProgress(AchievementTitle.OPENER_WORLD_2, 1, null);
-            GameManager.Instance.UpdateAchievement(AchievementTitle.LEVEL_UP, 2, null);
-        }
-        if (worldIndex == 3)
-        {
-            GameManager.Instance.IncreaseAchievementProgress(AchievementTitle.OPENER_WORLD_3, 1, null);
-        }
-        if (worldIndex == 4)
-        {
-            GameManager.Instance.IncreaseAchievementProgress(AchievementTitle.OPENER_WORLD_4, 1, null);
+            GameManager.Instance.UpdateAchievement((AchievementTitle)Enum.Parse(typeof(AchievementTitle), $"OPENER_WORLD_{worldIndex}"), 1, null);
         }
     }
 
@@ -95,22 +87,7 @@ public void setUnlockedArea(int worldIndex)
     public void setUnlockedArea(int worldIndex, int dungeonIndex)
     {
         unlockedAreaText.text = worldIndex + "-" + dungeonIndex;
-        if (worldIndex == 1)
-        {
-            GameManager.Instance.UpdateAchievement(AchievementTitle.MINER_WORLD_1, dungeonIndex, null);
-        }
-        if (worldIndex == 2)
-        {
-            GameManager.Instance.UpdateAchievement(AchievementTitle.MINER_WORLD_2, dungeonIndex, null);
-        }
-        if (worldIndex == 3)
-        {
-            GameManager.Instance.UpdateAchievement(AchievementTitle.MINER_WORLD_3, dungeonIndex, null);
-        }
-        if (worldIndex == 4)
-        {
-            GameManager.Instance.UpdateAchievement(AchievementTitle.MINER_WORLD_4, dungeonIndex, null);
-        }
+        GameManager.Instance.UpdateAchievement((AchievementTitle)Enum.Parse(typeof(AchievementTitle), $"MINER_WORLD_{worldIndex}"), 1, null);
     }
 
     #region tutorial

Assets/Scripts/Minigame Loading/Minigame.cs

@@ -199,6 +199,7 @@ private void UpdateStatus()
     /// </summary>
     private void UpdateAchievements()
     {
+        successfullyCompletedMinigames = DataManager.Instance.GetAchievements().Find(achievement => achievement.GetTitle() == "MINIGAME_PROFESSIONAL").GetInteractedObjects();
         var key = (world,dungeon,number);
         if(!successfullyCompletedMinigames.Contains(key))
         {