From 8b0483f6376147b8b6fe42ad5df1ea3c9ba9e2d1 Mon Sep 17 00:00:00 2001
From: ntr <ntr@mnml.gg>
Date: Thu, 27 Jul 2023 00:08:17 +1000
Subject: [PATCH] fix timing menu bug

---
 .../sr_silverstorage/sr_silverstorage.unity       | 15 +++++++++++++++
 Assets/Src/UI/MenuControls.cs                     |  5 +++++
 Assets/Src/UI/MenuUi.cs                           |  2 +-
 Assets/Src/UI/ShipUi.cs                           | 12 ++++++++----
 4 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/Assets/Scenes/sr_silverstorage/sr_silverstorage.unity b/Assets/Scenes/sr_silverstorage/sr_silverstorage.unity
index e653455..b34422e 100644
--- a/Assets/Scenes/sr_silverstorage/sr_silverstorage.unity
+++ b/Assets/Scenes/sr_silverstorage/sr_silverstorage.unity
@@ -978,6 +978,17 @@ MonoBehaviour:
   m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &1705992922 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5975136821837370545, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3}
+  m_PrefabInstance: {fileID: 766862834}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 14d590d5e541e871cb4b472e9e009128, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1906469784
 GameObject:
   m_ObjectHideFlags: 0
@@ -1402,6 +1413,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: Menu
       objectReference: {fileID: 0}
+    - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
+      propertyPath: shipUi
+      value: 
+      objectReference: {fileID: 1705992922}
     - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
       propertyPath: timingDoc
       value: 
diff --git a/Assets/Src/UI/MenuControls.cs b/Assets/Src/UI/MenuControls.cs
index 54fb8bd..1bef672 100644
--- a/Assets/Src/UI/MenuControls.cs
+++ b/Assets/Src/UI/MenuControls.cs
@@ -13,6 +13,9 @@ public class MenuControls : MonoBehaviour, SpaceRaceInput.IMenuActions {
 
     MenuUi menuUi;
 
+    [SerializeField]
+    ShipUi shipUi;
+
     SpaceRaceInput input;
     bool visible = false;
 
@@ -47,6 +50,7 @@ public class MenuControls : MonoBehaviour, SpaceRaceInput.IMenuActions {
 
         // take control off the ship
         timingDoc.enabled = false;
+        shipUi.enabled = false;
         shipControls.enabled = false;
     }
 
@@ -57,6 +61,7 @@ public class MenuControls : MonoBehaviour, SpaceRaceInput.IMenuActions {
 
         // resume control of the ship
         timingDoc.enabled = true;
+        shipUi.enabled = true;
         shipControls.enabled = true;
     }
 
diff --git a/Assets/Src/UI/MenuUi.cs b/Assets/Src/UI/MenuUi.cs
index 1228e37..ec37bfb 100644
--- a/Assets/Src/UI/MenuUi.cs
+++ b/Assets/Src/UI/MenuUi.cs
@@ -8,7 +8,7 @@ public class MenuUi : MonoBehaviour {
     UIDocument uiDocument;
     VisualElement tracks;
 
-    void Start() {
+    void OnEnable() {
         uiDocument = GetComponent<UIDocument>();
     }
 
diff --git a/Assets/Src/UI/ShipUi.cs b/Assets/Src/UI/ShipUi.cs
index 87ea9a0..97025ac 100644
--- a/Assets/Src/UI/ShipUi.cs
+++ b/Assets/Src/UI/ShipUi.cs
@@ -6,8 +6,7 @@ using UnityEngine;
 using UnityEngine.UIElements;
 
 public class ShipUi : MonoBehaviour {
-    [SerializeField]
-    UIDocument uiDocument = null;
+    UIDocument uiDocument;
 
     [SerializeField]
     ShipControls ship;
@@ -20,7 +19,12 @@ public class ShipUi : MonoBehaviour {
     VisualElement sectors;
     VisualElement timeSheet;
 
-    void Awake() {
+    void OnEnable() {
+        Init();
+    }
+
+    void Init() {
+        uiDocument = GetComponent<UIDocument>();
         speed = uiDocument.rootVisualElement.Q<Label>("speed");
         timer = uiDocument.rootVisualElement.Q<Label>("timer");
         sectors = uiDocument.rootVisualElement.Q<VisualElement>("sectors");
@@ -30,7 +34,7 @@ public class ShipUi : MonoBehaviour {
     void FixedUpdate() {
         if (timer == null || speed == null) {
             Debug.LogWarning("no speed or timer");
-            Awake();
+            Init();
             return;
         }