diff --git a/LobbyUI.cs b/LobbyUI.cs index a916a8b..4c1beb8 100644 --- a/LobbyUI.cs +++ b/LobbyUI.cs @@ -527,7 +527,8 @@ namespace MSCO { Rect row = GUILayoutUtility.GetRect(10, 32, GUILayout.ExpandWidth(true)); GUI.Box(new Rect(row.x, row.y, row.width, row.height - 4), GUIContent.none, rowBox); - GUI.DrawTexture(new Rect(row.x + 12, row.y + 11, 8, 8), texOnline); + // Eigener Punkt gelb, solange man noch lädt/synchronisiert; grün, wenn man wirklich im Spiel ist + GUI.DrawTexture(new Rect(row.x + 12, row.y + 11, 8, 8), p.IsLocal && !mp.IsFullyConnected ? texPending : texOnline); GUI.Label(new Rect(row.x + 30, row.y, row.width - 150, row.height - 2), p.Name, rowNameStyle); string tag = p.Id == NetSession.HostId ? "HOST" : ""; if (p.IsLocal) tag = tag.Length > 0 ? tag + " · YOU" : "YOU"; @@ -555,7 +556,7 @@ namespace MSCO void DrawStatusBar(MultiplayerManager mp, Rect r) { GUI.Box(r, GUIContent.none, sidebarBox); - Texture2D dot = mp.IsPeerReady ? texOnline : mp.IsInSession ? texPending : texMuted; + Texture2D dot = mp.IsFullyConnected ? texOnline : mp.IsInSession || mp.IsReconnecting ? texPending : texMuted; GUI.DrawTexture(new Rect(r.x + 18, r.y + (r.height - 8) / 2f, 8, 8), dot); GUI.Label(new Rect(r.x + 36, r.y, r.width - 180, r.height), mp.Status, statusStyle); if (GUI.Button(new Rect(r.xMax - 118, r.y + 6, 106, r.height - 12), "MINIMIZE", tabStyle)) @@ -568,7 +569,7 @@ namespace MSCO ScreenRect = r; GUI.Box(r, GUIContent.none, sidebarBox); GUI.Box(new Rect(r.x + 10, r.yMax - 3, r.width - 20, 3), GUIContent.none, accentBox); - Texture2D dot = mp.IsPeerReady ? texOnline : mp.IsInSession ? texPending : texMuted; + Texture2D dot = mp.IsFullyConnected ? texOnline : mp.IsInSession || mp.IsReconnecting ? texPending : texMuted; Texture2D logo = Branding.LogoTexture; if (logo != null) GUI.DrawTexture(new Rect(r.x + 8, r.y + 4, 22, 22), logo); GUI.DrawTexture(new Rect(r.x + 36, r.y + 11, 8, 8), dot); diff --git a/MultiplayerManager.cs b/MultiplayerManager.cs index 07fd853..7149f93 100644 --- a/MultiplayerManager.cs +++ b/MultiplayerManager.cs @@ -860,6 +860,23 @@ namespace MSCO public string DisconnectNotice { get; private set; } public void ClearDisconnectNotice() { DisconnectNotice = null; } public bool IsReconnecting { get { return reconnectMessage != null && session == null; } } + + bool worldSynced; // Server: Weltzustand angewendet + + /// + /// Wirklich verbunden (grüner Punkt): Host sobald die Sitzung läuft; auf einem Server erst, wenn man im Spiel ist + /// und der Weltzustand angewendet wurde; bei P2P als Client, wenn man im Spiel ist. Vorher gelb. + /// + public bool IsFullyConnected + { + get + { + if (session == null) return false; + if (session.IsHost) return true; + if (!handshakeDone || !MenuHelper.InGame) return false; + return !dedicated || worldSynced; + } + } public string ReconnectMessage { get { return reconnectMessage; } } /// Technische Gründe in verständliche Sätze übersetzen. @@ -893,6 +910,7 @@ namespace MSCO if (session != null && session.IsSteam) steam.Leave(); session = null; handshakeDone = false; + worldSynced = false; pingMs = -1f; teleportToHost = false; dedicated = false; @@ -1333,6 +1351,7 @@ namespace MSCO doorSync.Reset(); FsmSync.Reset(); readySent = false; + worldSynced = false; if (session != null) SetStatus(session.IsHost ? "Hosting" : "Connected"); } else if (MenuHelper.InMenu) @@ -1597,6 +1616,7 @@ namespace MSCO if (objects.ApplySnapshotPose(p.Key, p.Value.Position, p.Value.Rotation)) applied++; if (spawned > 0) MscoLog.Info(spawned + " spawned item(s) restored"); + worldSynced = true; MscoLog.Info("[MSCO] World synced: " + applied + "/" + objectCount + " objects, " + eventCount + " part/bolt actions"); SetStatus("Connected"); } @@ -1729,13 +1749,13 @@ namespace MSCO void DrawHud() { // Statuszeile oben in der Mitte (links oben ist die Spielanzeige) - string state = IsPeerReady ? "CONNECTED" : "WAITING"; + string state = IsFullyConnected ? "CONNECTED" : IsPeerReady ? "SYNCING..." : "WAITING"; string text = "MSCO • " + state + " • " + (dedicated ? "Server" : IsHost ? "Host" : "Client") + " • " + players.Count + " player(s) • " + objects.Count + " synced objects"; var rect = new Rect((Screen.width - 520) / 2f, 6, 520, 24); if (hudBox == null) hudBox = UiTheme.Panel9(new Color(0.06f, 0.06f, 0.07f, 0.85f), 8); GUI.Box(rect, GUIContent.none, hudBox); - hudStyle.normal.textColor = IsPeerReady ? new Color(0.24f, 0.84f, 0.55f) : new Color(0.95f, 0.76f, 0.11f); + hudStyle.normal.textColor = IsFullyConnected ? new Color(0.24f, 0.84f, 0.55f) : new Color(0.95f, 0.76f, 0.11f); GUI.Label(rect, text, hudStyle); DrawNameTags();