Merge pull request #35 from Giraud-Pierre/lastbranc

Lastbranc
Giraud-Pierre · Nov 14, 2022 · cdbb434 · cdbb434
2 parents 5709b2f + d45e936
commit cdbb434
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity
@@ -3975,6 +3975,7 @@ MonoBehaviour:
   unitPokedex: {fileID: 11400000, guid: 8f255f0825c390749bdecc9844eb10f1, type: 2}
   dataForMiniGame: {fileID: 11400000, guid: 64218331838c71e4d8971818b07d4040, type: 2}
   mouseController: {fileID: 676941980}
+  audioController: {fileID: 0}
   worker: {fileID: 171706, guid: 1993ef37b5f480b4a92115ca0117fdce, type: 3}
   allowWrapEastWest: 1
   allowWrapNorthSouth: 0
@@ -5298,6 +5299,7 @@ MonoBehaviour:
   infoResourcesComponent: {fileID: 455939951295703860}
   descriptionLayout: {fileID: 1643647071}
   inBuildLayout: {fileID: 484071484}
+  numberOfTurnBeforeConstruction: {fileID: 1106378231}
 --- !u!1 &1391007417
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Assets/Scripts/Menus/GameMenuController.cs b/Assets/Scripts/Menus/GameMenuController.cs
@@ -17,13 +17,6 @@ public void Awake()
         DontDestroyOnLoad(gameObject);
     }
 
-    // TODO: Remove this debug feature
-    // ! Remove only when all other features on Canvas (and his children) are implement
-    public void MissingAction()
-    {
-        Debug.LogError("Missing Action : Button not assign");
-    }
-
     private void Start()
     {
         if (allTutorials.tutorialsThatHaveBeenSeen[0] == false)

diff --git a/Assets/Scripts/Menus/InfoPanelController.cs b/Assets/Scripts/Menus/InfoPanelController.cs
@@ -8,6 +8,7 @@ public class InfoPanelController : MonoBehaviour
     [SerializeField] private GameObject infoResourcesComponent = default;
     [SerializeField] private GameObject descriptionLayout = default;
     [SerializeField] private GameObject inBuildLayout = default;
+    [SerializeField] private GameObject numberOfTurnBeforeConstruction = default;
 
     private Building build;
 
@@ -56,13 +57,13 @@ private int[] GenerateResourcesArray()
 
     private void GetInBuildInfo()
     {
-        if (build.isBuilt == false)
+        if (build.isBuilt != false)
         {
             inBuildLayout.SetActive(false);
         }
         else
         {
-             nameText.GetComponent<TextMeshProUGUI>().text = build.turnsRemainingUntilBuildIsComplete.ToString();
+            numberOfTurnBeforeConstruction.GetComponent<TextMeshProUGUI>().text = build.turnsRemainingUntilBuildIsComplete.ToString();
 
             inBuildLayout.SetActive(true);
         }