Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[Fix] Исправление Popup (#354)

Browse Source 
* fix: теперь попапы не видно в чате через всю станцию и стены

* fix: use examine system instead of interaction
This commit is contained in:
Remuchi
2024-06-14 18:47:15 +07:00
committed by GitHub
parent 1185c3fd3e
commit a4647cf529
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Content.Client/Popups/PopupSystem.cs
View File

@@ -1,4 +1,5 @@
using System.Linq; using System.Linq;
using Content.Client.UserInterface.Systems.Chat;
using Content.Shared.Examine; using Content.Shared.Examine;
using Content.Shared.Chat; using Content.Shared.Chat;
using Content.Shared.GameTicking; using Content.Shared.GameTicking;
@@ -10,7 +11,6 @@ using Robust.Client.Player;
using Robust.Client.UserInterface; using Robust.Client.UserInterface;
using Robust.Shared.Configuration; using Robust.Shared.Configuration;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Network;
using Robust.Shared.Player; using Robust.Shared.Player;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using Robust.Shared.Replays; using Robust.Shared.Replays;
@@ -31,7 +31,6 @@ namespace Content.Client.Popups
[Dependency] private readonly IReplayRecordingManager _replayRecording = default!; [Dependency] private readonly IReplayRecordingManager _replayRecording = default!;
[Dependency] private readonly ExamineSystemShared _examine = default!; [Dependency] private readonly ExamineSystemShared _examine = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!; [Dependency] private readonly SharedTransformSystem _transform = default!;
[Dependency] private readonly IClientNetManager _clientNet = default!;
public IReadOnlyList<WorldPopupLabel> WorldLabels => _aliveWorldLabels; public IReadOnlyList<WorldPopupLabel> WorldLabels => _aliveWorldLabels;
public IReadOnlyList<CursorPopupLabel> CursorLabels => _aliveCursorLabels; public IReadOnlyList<CursorPopupLabel> CursorLabels => _aliveCursorLabels;
@@ -94,6 +93,13 @@ namespace Content.Client.Popups
_aliveWorldLabels.Add(label); _aliveWorldLabels.Add(label);
// START WhiteDream
if (!_isLogging)
return;
if (!_examine.InRangeUnOccluded(_playerManager.LocalEntity!.Value, coordinates, 10))
return;
var fontSizeDict = new Dictionary<PopupType, string> var fontSizeDict = new Dictionary<PopupType, string>
{ {
{ PopupType.Medium, "12" }, { PopupType.Medium, "12" },
@@ -103,14 +109,16 @@ namespace Content.Client.Popups
}; };
var fontsize = fontSizeDict.GetValueOrDefault(type, "10"); var fontsize = fontSizeDict.GetValueOrDefault(type, "10");
var fontcolor = type is PopupType.LargeCaution or PopupType.MediumCaution or PopupType.SmallCaution ? "c62828" : "aeabc4"; var fontcolor = type is PopupType.LargeCaution or PopupType.MediumCaution or PopupType.SmallCaution
? "c62828"
: "aeabc4";
if (_isLogging) var wrappedMEssage = $"[font size={fontsize}][color=#{fontcolor}]{message}[/color][/font]";
{ var chatMsg = new ChatMessage(ChatChannel.Emotes, message, wrappedMEssage,
var wrappedMEssage = $"[font size={fontsize}][color=#{fontcolor}]{message}[/color][/font]"; GetNetEntity(EntityUid.Invalid), null);
var chatMsg = new ChatMessage(ChatChannel.Emotes, message, wrappedMEssage, GetNetEntity(EntityUid.Invalid), null); _uiManager.GetUIController<ChatUIController>().ProcessChatMessage(chatMsg);
_clientNet.DispatchLocalNetMessage(new MsgChatMessage { Message = chatMsg });
} // END WhiteDream
} }
#region Abstract Method Implementations #region Abstract Method Implementations