From b37bac620944e4c2d7c30612fb5d97989aeab7a8 Mon Sep 17 00:00:00 2001 From: milimoe Date: Mon, 1 Apr 2024 23:17:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Did=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ListeningTask/GroupMessageTask.cs | 13 ++++++++----- src/Settings/Music.cs | 1 + src/Settings/OSMCore.cs | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/ListeningTask/GroupMessageTask.cs b/src/ListeningTask/GroupMessageTask.cs index 6735da7..b6b5fd6 100644 --- a/src/ListeningTask/GroupMessageTask.cs +++ b/src/ListeningTask/GroupMessageTask.cs @@ -536,11 +536,14 @@ namespace Milimoe.RainBOT.ListeningTask Bot.ColorfulCheckPass(sender, "随机叫哥", dice, GeneralSettings.PCallBrother, delay); string name = (sender.card != "" ? sender.card : sender.nickname).Trim(); int pos = new Random().Next(name.Length - 1); - GroupMessageContent content = new(e.group_id); - content.message.Add(new AtMessage(e.user_id)); - content.message.Add(new TextMessage(string.Concat(name.AsSpan(pos, 2), "哥"))); - _ = Bot.SendGroupMessage(e.group_id, "随机叫哥", content, delay * 1000); - return; + if (pos != -1) + { + GroupMessageContent content = new(e.group_id); + content.message.Add(new AtMessage(e.user_id)); + content.message.Add(new TextMessage(string.Concat(name.AsSpan(pos, name.Length > 1 ? 2 : name.Length), "哥"))); + _ = Bot.SendGroupMessage(e.group_id, "随机叫哥", content, delay * 1000); + return; + } } } catch (Exception ex) diff --git a/src/Settings/Music.cs b/src/Settings/Music.cs index 4bb44c8..c52ca73 100644 --- a/src/Settings/Music.cs +++ b/src/Settings/Music.cs @@ -53,6 +53,7 @@ MusicList.Add("igs", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\igotsmoke.mp3"); MusicList.Add("劝导", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\丁真劝导.mp3"); MusicList.Add("丁真", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\丁真劝导.mp3"); + MusicList.Add("change", "file:///" + AppDomain.CurrentDomain.BaseDirectory.ToString() + @"music\change.mp3"); } } } diff --git a/src/Settings/OSMCore.cs b/src/Settings/OSMCore.cs index a128935..eba2049 100644 --- a/src/Settings/OSMCore.cs +++ b/src/Settings/OSMCore.cs @@ -3,8 +3,8 @@ public class OSMCore { public const string version = "v1.0"; - public const string version2 = "Patch2 Test"; - public const string time = "Mar. 25th, 2024"; + public const string version2 = "Patch2 Test2"; + public const string time = "Apr. 1st, 2024"; public static string Info => $"OSM Core {version} {version2}\r\nAuthor: Milimoe\r\nBuilt on {time}\r\nSee: https://github.com/milimoe"; }