Merge branch 'master' of https://github.com/devedse/LD54

devedse · Oct 2, 2023 · f6bad21 · f6bad21
2 parents bfb1b6f + 0fd355a
commit f6bad21
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 18 deletions.
diff --git a/UnityGame/Assets/Scenes/MainMenu.unity b/UnityGame/Assets/Scenes/MainMenu.unity
@@ -386,7 +386,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -807,7 +807,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -1512,7 +1512,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: -30.400024}
-  m_SizeDelta: {x: -20, y: 0}
+  m_SizeDelta: {x: -20, y: 551.15564}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &446916055
 MonoBehaviour:
@@ -1584,7 +1584,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &508132939
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1981,7 +1981,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -2082,7 +2082,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!114 &720387300
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -4133,6 +4133,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   PlayerPrefab: {fileID: 4491846919178520200, guid: 8016a5acbdf84b24797810e2e3252466,
     type: 3}
+  MinigameManagerInstance: {fileID: 1595624816}
   MainMenu: {fileID: 343717098}
   HostScreen: {fileID: 720387303}
 --- !u!4 &1595624815

diff --git a/UnityGame/Assets/Scripts/MinigameManager.cs b/UnityGame/Assets/Scripts/MinigameManager.cs
@@ -127,18 +127,21 @@ public void Start()
 
     public void CompletelyRestartGameAndShit(string error)
     {
-        MainMenu.ErrorToShow = error;
-        _desireCompleteAndUtterlyDestroyEverythingAndRestart = true;
+        if (_desireCompleteAndUtterlyDestroyEverythingAndRestart == false)
+        {
+            MainMenu.ErrorToShow = error;
+            _desireCompleteAndUtterlyDestroyEverythingAndRestart = true;
+        }
 
-        Debug.Log($"CompletelyRestartGameAndShit with error: {error}");
+        Debug.Log($"Received request to completely restart: {error}");
     }
 
     private void Update()
     {
         if (_desireCompleteAndUtterlyDestroyEverythingAndRestart)
         {
-            Debug.Log("Utterly loading main scene again now");
-            _instance.SignalR.SignalR.Stop();
+            Debug.Log("Update: Loading main scene again now");
+            _instance.SignalR.SignalR?.Stop();
             GameObject.Destroy(_instance.gameObject);
 
             SceneManager.LoadScene("MainMenu");

diff --git a/UnityGame/Assets/Scripts/SignalRTest.cs b/UnityGame/Assets/Scripts/SignalRTest.cs
@@ -11,6 +11,7 @@ public class SignalRTest : MonoBehaviour
 
     public List<PC> PlayersOrderedByScore => Players.Values.OrderByDescending(t => t.Score).ToList();
 
+    public MinigameManager MinigameManagerInstance;
     public SignalR SignalR;
     public MainMenu MainMenu;
     public HostScreen HostScreen;
@@ -41,7 +42,7 @@ public void OnHostLobby()
             var message = "Hallo Devedse ik ben een scherm :)))";
             SignalR.Invoke("Server_CreateRoom", message);
         };
-        SignalR.Connect(error => MinigameManager.Instance.CompletelyRestartGameAndShit(error));
+        SignalR.Connect(error => MinigameManagerInstance.CompletelyRestartGameAndShit(error));
     }
 
     public void SetupSignalR()
@@ -97,30 +98,30 @@ public void SetupSignalR()
                 //TODO show error popup
                 Debug.Log("ClientNameAlreadyInUse");
 
-                MinigameManager.Instance.CompletelyRestartGameAndShit("Client name already in use");
+                MinigameManagerInstance.CompletelyRestartGameAndShit("Client name already in use");
             }
             else if (payload == "false_RoomDoesNotExist")
             {
                 //TODO show error popup
                 Debug.Log("RoomDoesNotExist");
 
-                MinigameManager.Instance.CompletelyRestartGameAndShit("Room does not exist");
+                MinigameManagerInstance.CompletelyRestartGameAndShit("Room does not exist");
             }
         });
         SignalR.On("Client_ReceiveServerDisconnected", (string roomName) =>
         {
             // Log the disconnected ID
             Debug.Log($"Client_ReceiveServerDisconnected from RoomName: {roomName}");
 
-            MinigameManager.Instance.CompletelyRestartGameAndShit("Host Lobby disconnected");
+            MinigameManagerInstance.CompletelyRestartGameAndShit("Host Lobby disconnected");
         });
 
         SignalR.ConnectionClosed += (object sender, ConnectionEventArgs e) =>
         {
             // Log the disconnected ID
             Debug.Log($"Disconnected: {e.ConnectionId}");
 
-            MinigameManager.Instance.CompletelyRestartGameAndShit($"Connection Disconnected: {e.ConnectionId}");
+            MinigameManagerInstance.CompletelyRestartGameAndShit($"Connection Disconnected: {e.ConnectionId}");
         };
     }
 
@@ -145,7 +146,7 @@ public PC AddOrConnectClient(string name)
             var pc = player.GetComponent<PC>();
             pc.PlayerName = name;
             pc.PlayerIndex = Players.Count;
-            pc.PlayerColor = MinigameManager.Instance.GetPlayerColor(pc.PlayerIndex);
+            pc.PlayerColor = MinigameManagerInstance.GetPlayerColor(pc.PlayerIndex);
             Players.Add(name, pc);
 
             HostScreen.AddPlayer(pc);
@@ -181,7 +182,7 @@ public void OnJoinLobby(string playerName, string lobbyCode)
             JoinRoom(lobbyCode, playerName);
         };
         Debug.Log("Connecting");
-        SignalR.Connect(error => MinigameManager.Instance.CompletelyRestartGameAndShit(error));
+        SignalR.Connect(error => MinigameManagerInstance.CompletelyRestartGameAndShit(error));
     }
 
     void Start()