фикс OOC чата для админов
This commit is contained in:
parent
9a0324c2b7
commit
0e043b2a67
5 changed files with 9 additions and 8 deletions
|
|
@ -22,7 +22,7 @@ public sealed partial class MainMenuControl : Control
|
|||
LayoutContainer.SetMarginTop(VBox, 30);
|
||||
LayoutContainer.SetGrowHorizontal(VBox, LayoutContainer.GrowDirection.Begin);
|
||||
|
||||
var logoTexture = resCache.GetResource<TextureResource>("/Textures/_Sunrise/Logo/logo-sunrise.png"); // Sunrise-Edit
|
||||
var logoTexture = resCache.GetResource<TextureResource>("/Textures/_Sunrise/Logo/logo-sunrise-slim.png"); // Sunrise-Edit
|
||||
Logo.Texture = logoTexture;
|
||||
|
||||
var currentUserName = configMan.GetCVar(CVars.PlayerName);
|
||||
|
|
|
|||
|
|
@ -238,17 +238,18 @@ internal sealed partial class ChatManager : IChatManager
|
|||
|
||||
private void SendOOC(ICommonSession player, string message)
|
||||
{
|
||||
if (_adminManager.IsAdmin(player))
|
||||
if (!_oocEnabled)
|
||||
{
|
||||
if (!_adminOocEnabled)
|
||||
if (_adminManager.IsAdmin(player))
|
||||
{
|
||||
if (!_adminOocEnabled)
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
return;
|
||||
}
|
||||
}
|
||||
else if (!_oocEnabled)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
Color? colorOverride = null;
|
||||
var wrappedMessage = Loc.GetString("chat-manager-send-ooc-wrap-message", ("playerName",player.Name), ("message", FormattedMessage.EscapeText(message)));
|
||||
|
|
|
|||
BIN
Resources/Textures/_Sunrise/Logo/logo-sunrise-slim.png
Normal file
BIN
Resources/Textures/_Sunrise/Logo/logo-sunrise-slim.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 34 KiB |
|
|
@ -1,5 +1,5 @@
|
|||
defaultWindowTitle: Sunrise Station
|
||||
windowIconSet: /Textures/Logo/icon
|
||||
splashLogo: /Textures/_Sunrise/Logo/logo-sunrise.png # Sunrise-Edit
|
||||
splashLogo: /Textures/_Sunrise/Logo/logo-sunrise-splash.png # Sunrise-Edit
|
||||
|
||||
# PJB PLEASE
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue