new UIs integrate started

Assets/Game/Scenes/Minigame/Minigame.unity

@@ -5847,7 +5847,7 @@ MonoBehaviour:
   moon: {fileID: 5339383961425506408, guid: ad54ea1b437d2b344add56c18d1efb3e, type: 3}
   star: {fileID: 8298505072154104440, guid: 8cfd89c315493e64782e167885b4b498, type: 3}
   loadingScreen: {fileID: 908570975}
-  metalTxt: {fileID: 0}
+  metalTxt: {fileID: 1251195779}
 --- !u!114 &332697611
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Game/Scripts/DBmanager.cs

@@ -166,7 +166,7 @@ public class DBmanager : MonoBehaviour
             level -= 0.1f;
         }
         Debug.Log("Level : " + (float)xp / 100f + " : " + level + " : " + LevelInt);
-        GameManagerInstance.gameManager.RefreshData();
+        GameManager.Refresh();
         OnStateChanged.Invoke();
     }
 
@@ -201,7 +201,7 @@ public class DBmanager : MonoBehaviour
             }
         }
 
-        GameManagerInstance.gameManager.RefreshData();
+        GameManager.Refresh();
         OnStateChanged.Invoke();
     }
 
@@ -230,7 +230,7 @@ public class DBmanager : MonoBehaviour
             }
         }
 
-        GameManagerInstance.gameManager.RefreshData();
+        GameManager.Refresh();
         OnStateChanged.Invoke();
     }
 
@@ -260,7 +260,7 @@ public class DBmanager : MonoBehaviour
             }
         }
 
-        GameManagerInstance.gameManager.RefreshData();
+        GameManager.Refresh();
         OnStateChanged.Invoke();
     }
 
@@ -289,7 +289,7 @@ public class DBmanager : MonoBehaviour
             }
         }
 
-        GameManagerInstance.gameManager.RefreshData();
+        GameManager.Refresh();
         OnStateChanged.Invoke();
     }
 
@@ -312,7 +312,7 @@ public class DBmanager : MonoBehaviour
                 }
             }
 
-            GameManagerInstance.gameManager.RefreshData();
+            GameManager.Refresh();
             OnStateChanged.Invoke();
         }
         catch
@@ -368,7 +368,7 @@ public class DBmanager : MonoBehaviour
             }
         }
 
-        GameManagerInstance.gameManager.RefreshData();
+        GameManager.Refresh();
         OnStateChanged.Invoke();
     }
 
@@ -407,7 +407,7 @@ public class DBmanager : MonoBehaviour
             }
         }
 
-        GameManagerInstance.gameManager.RefreshData();
+        GameManager.Refresh();
         OnStateChanged.Invoke();
     }
 

Assets/Game/Scripts/GameManager.cs

@@ -9,26 +9,40 @@ using System.Threading.Tasks;
 
 public class GameManager : MonoBehaviour
 {
-    public TMP_Text usernameTxt;
+    private static GameManager _instance;
+    public static GameManager instance => _instance;
+    public TMP_Text[] usernameTxts;
     public TMP_Text[] coinsTxt;
     public TMP_Text[] gemsTxt;
     public TMP_Text metalTxt;
     public TMP_Text oxygenTxt;
-    public TMP_Text levelTxt;
-    public Slider levelSlider;
-    public TMP_Text levelProgressTxt;
+    public TMP_Text[] levelTxts;
+    public Slider[] levelSliders;
+    public TMP_Text[] levelProgressTxts;
 
     public GameObject loadingScreen;
+
+    [Header("Profile")]
+    public GameObject profilePopup;
+    public GameObject networkErrorPopup;
+    public float NetworkCheckInterval = 3;
+
     void Start()
     {
-        GameManagerInstance.gameManager = this;
-        
+        _instance = this;
+
 
         //Go back to login if not logged
-        if(!DBmanager.LoggedIn){
+        if (!DBmanager.LoggedIn)
+        {
             SceneManager.LoadScene(0);
-        }else{
-            usernameTxt.text = DBmanager.username;
+        }
+        else
+        {
+            foreach (TMP_Text usernameTxt in usernameTxts)
+            {
+                usernameTxt.text = DBmanager.username;
+            }
             RefreshData();
         }
 
@@ -36,37 +50,64 @@ public class GameManager : MonoBehaviour
 
     }
 
-    // Update is called once per frame
+    float networkCheckTimer = 0;
     void Update()
     {
-        
+        networkCheckTimer += Time.deltaTime;
+        if (networkCheckTimer > NetworkCheckInterval)
+        {
+            Debug.Log(Application.internetReachability);
+            if (Application.internetReachability == NetworkReachability.NotReachable)
+            {
+                networkErrorPopup.SetActive(true);
+            }else{
+                networkErrorPopup.SetActive(false);
+            }
+            networkCheckTimer=0;
+        }
     }
 
-    public void RefreshData(){
-        foreach(TMP_Text txt in coinsTxt){
+    public static void Refresh(){
+        if(_instance != null){
+            _instance.RefreshData();
+        }
+    }
+
+    private void RefreshData()
+    {
+        foreach (TMP_Text txt in coinsTxt)
+        {
             txt.text = DBmanager.Coins.ToString();
         }
-        foreach(TMP_Text txt in gemsTxt){
-        txt.text = DBmanager.Gems.ToString();
+        foreach (TMP_Text txt in gemsTxt)
+        {
+            txt.text = DBmanager.Gems.ToString();
         }
         metalTxt.text = DBmanager.Metal.ToString();
         oxygenTxt.text = DBmanager.Oxygen.ToString();
-        levelTxt.text = Mathf.CeilToInt(DBmanager.Level).ToString();
+        foreach (TMP_Text levelTxt in levelTxts)
+        {
+            levelTxt.text = Mathf.CeilToInt(DBmanager.Level).ToString();
+        }
 
         float levelExcess = DBmanager.Level - Mathf.FloorToInt(DBmanager.Level);
         Debug.Log("Level : " + DBmanager.Level);
-        levelSlider.value = Mathf.Clamp(levelExcess, 0.1f,1);
-        // levelSlider.value = Mathf.Clamp(DBmanager.Xp /, 0.1f,1);
-        levelProgressTxt.text = $"{DBmanager.Xp}/{DBmanager.XpForNextLevel()}";
+        foreach (Slider levelSlider in levelSliders)
+        {
+            levelSlider.value = Mathf.Clamp(levelExcess, 0.1f, 1);
+        }
+
+        foreach (TMP_Text levelProgressTxt in levelProgressTxts)
+        {
+            levelProgressTxt.text = $"{DBmanager.Xp}/{DBmanager.XpForNextLevel()}";
+        }
     }
 
-    public async void LoadMinigame(){
+    public async void LoadMinigame()
+    {
         loadingScreen.SetActive(true);
-        await Task.Delay(1000); 
+        await Task.Delay(1000);
         SceneManager.LoadScene("MinigameMenu");
     }
 }
 
-public static class GameManagerInstance{
-    public static GameManager gameManager;
-}

Assets/Game/Scripts/XpPass.cs

@@ -0,0 +1,30 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using TMPro;
+using UnityEngine.UI;
+public class XpPass : MonoBehaviour
+{
+    public TMP_Text nextLevelTxt;
+    public Slider levelSlider;
+
+    public int maxLevels;
+    void Start()
+    {
+        Refresh();
+    }
+    
+    public void Show(){
+        Refresh();
+        gameObject.SetActive(true);
+    }
+
+    public void Hide(){
+        gameObject.SetActive(false);
+    }
+
+    void Refresh(){
+        nextLevelTxt.text = (DBmanager.LevelInt +1).ToString();
+        levelSlider.value = DBmanager.Level / (float)maxLevels;
+    }
+}

Assets/Game/Scripts/XpPass.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c6295816bbcd1d95e81632e3d1388b78
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: