From 710a1dd44efefe9f65680e4c80d1dc59ab538fbf Mon Sep 17 00:00:00 2001 From: cxfm666 <61831881+cxfm666@users.noreply.github.com> Date: Mon, 13 May 2024 18:32:54 +0800 Subject: [PATCH] enable/disable announce --- Common/Configuration/ConfigContainer.cs | 8 +++++++- .../Packet/Recv/Player/HandlerSetClientPausedCsReq.cs | 3 ++- .../Packet/Send/Others/PacketServerAnnounceNotify.cs | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Common/Configuration/ConfigContainer.cs b/Common/Configuration/ConfigContainer.cs index b14b806a..21dba3ff 100644 --- a/Common/Configuration/ConfigContainer.cs +++ b/Common/Configuration/ConfigContainer.cs @@ -67,11 +67,17 @@ namespace EggLink.DanhengServer.Configuration public bool AutoLightSection { get; set; } = true; public string Language { get; set; } = "EN"; public List DefaultPermissions { get; set; } = ["*"]; - public string ServerAnnounce { get; set; } = "Welcome to danhengserver!"; + public ServerAnnounce ServerAnnounce { get; set; } = new ServerAnnounce(); public ServerProfile ServerProfile { get; set; } = new ServerProfile(); public bool AutoCreateUser { get; set; } = true; } + public class ServerAnnounce + { + public bool EnableAnnounce { get; set; } = true; + public string AnnounceContent { get; set; } = "Welcome to danhengserver!"; + } + public class ServerProfile { public string Name { get; set; } = "Server"; diff --git a/GameServer/Server/Packet/Recv/Player/HandlerSetClientPausedCsReq.cs b/GameServer/Server/Packet/Recv/Player/HandlerSetClientPausedCsReq.cs index a41444a1..d0018b11 100644 --- a/GameServer/Server/Packet/Recv/Player/HandlerSetClientPausedCsReq.cs +++ b/GameServer/Server/Packet/Recv/Player/HandlerSetClientPausedCsReq.cs @@ -15,7 +15,8 @@ namespace EggLink.DanhengServer.Server.Packet.Recv.Player var req = SetClientPausedCsReq.Parser.ParseFrom(data); var paused = req.Paused; connection.SendPacket(new PacketSetClientPausedScRsp(paused)); - connection.SendPacket(new PacketServerAnnounceNotify()); + if (ConfigManager.Config.ServerOption.ServerAnnounce.EnableAnnounce) + connection.SendPacket(new PacketServerAnnounceNotify()); } } } diff --git a/GameServer/Server/Packet/Send/Others/PacketServerAnnounceNotify.cs b/GameServer/Server/Packet/Send/Others/PacketServerAnnounceNotify.cs index ce83bff9..ffecd115 100644 --- a/GameServer/Server/Packet/Send/Others/PacketServerAnnounceNotify.cs +++ b/GameServer/Server/Packet/Send/Others/PacketServerAnnounceNotify.cs @@ -19,10 +19,10 @@ namespace EggLink.DanhengServer.Server.Packet.Send.Others BeginTime = Extensions.GetUnixSec(), EndTime = Extensions.GetUnixSec() + 3600, ConfigId = 1, - CHJOJJLOBEI = ConfigManager.Config.ServerOption.ServerAnnounce, + CHJOJJLOBEI = ConfigManager.Config.ServerOption.ServerAnnounce.AnnounceContent, }); - //SetData(proto); + SetData(proto); } } }