Merge pull request #443 from wbonbon/master

Improvements and New Features
anoyetta · Dec 29, 2024 · 195074a · 195074a
2 parents d3bd3bb + 88039a3
commit 195074a
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 10 deletions.
diff --git a/source/@MasterVersion.txt b/source/@MasterVersion.txt
@@ -1 +1 @@
-v10.4.6
+v10.4.8
diff --git a/source/ACT.Hojoring.Common/Version.cs b/source/ACT.Hojoring.Common/Version.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("10.4.0.6")]
-[assembly: AssemblyFileVersion("10.4.0.6")]
+[assembly: AssemblyVersion("10.4.0.8")]
+[assembly: AssemblyFileVersion("10.4.0.8")]
diff --git a/source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/Models/TableCompiler.cs b/source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/Models/TableCompiler.cs
@@ -147,9 +147,13 @@ private void TryCompile()
         {
             lock (this)
             {
-                if ((DateTime.UtcNow - this.lastQueueTimestamp).TotalMilliseconds <= CompileHandlerInterval)
+                // ゾーンチェンジが発生していない場合はインターバルをもうける
+                if (!this.isQueueZoneChange)
                 {
-                    return;
+                    if ((DateTime.UtcNow - this.lastQueueTimestamp).TotalMilliseconds <= CompileHandlerInterval)
+                    {
+                        return;
+                    }
                 }
 
                 this.lastQueueTimestamp = DateTime.MaxValue;

diff --git a/source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/RaidTimeline/TimelineManager.cs b/source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/RaidTimeline/TimelineManager.cs
@@ -7,6 +7,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Threading;
@@ -120,6 +121,8 @@ public void LoadCurrentTimeline()
         {
             lock (this)
             {
+                var sw = Stopwatch.StartNew();
+                this.AppLogger.Trace("LoadCurrentTimeline start"); LogManager.Flush();
                 WPFHelper.Invoke(() =>
                 {
                     TimelineNoticeOverlay.CloseNotice();
@@ -132,18 +135,22 @@ public void LoadCurrentTimeline()
                 var toReloads = timelines.Where(x =>
                     x.IsGlobalZone ||
                     x.IsReference);
+                /*
                 foreach (var tl in toReloads)
                 {
                     tl.Reload();
                     WPFHelper.DelayTask();
                 }
-
+                */
                 // すでにコントローラがロードされていたらアンロードする
                 foreach (var tl in timelines)
                 {
-                    tl.Controller.Unload();
-                    tl.IsActive = false;
-                    WPFHelper.DelayTask();
+                    if (tl.Controller.Status != TimelineStatus.Unloaded)
+                    {
+                        tl.Controller.Unload();
+                        tl.IsActive = false;
+                        WPFHelper.DelayTask();
+                    }
                 }
 
                 // 現在のゾーンで有効なタイムラインを取得する
@@ -180,6 +187,7 @@ public void LoadCurrentTimeline()
 
                 // ゾーングローバルオブジェクトを初期化する
                 TimelineScriptGlobalModel.Instance.DynamicObject.ClearZoneGlobal();
+                this.AppLogger.Trace("LoadCurrentTimeline end " + sw.Elapsed.TotalMilliseconds.ToString() + "ms"); LogManager.Flush();
             }
         }
 

diff --git a/source/ACT.TTSYukkuri/ACT.TTSYukkuri.Core/PluginCore.cs b/source/ACT.TTSYukkuri/ACT.TTSYukkuri.Core/PluginCore.cs
@@ -330,7 +330,7 @@ private void SpeakTTS(
         /// コマンドの発行から5.5秒後に「こんにちは」という
         /// </example>
         private static readonly Regex WaitCommandRegex = new Regex(
-            @"/wait\s+(?<due>[\d\.]+)[,\s]+(?<tts>.+)$",
+            @"/wait\s+(?<due>[\d\.]+)(?<operator>[+-]|)(?<offset>\d|)[,\s]+(?<tts>.+)$",
             RegexOptions.Compiled);
 
         private void SpeakTTS(
@@ -356,6 +356,8 @@ private void SpeakTTS(
                 }
 
                 var delayAsText = match.Groups["due"].Value;
+                var operatorAsText = match.Groups["operator"].Value;
+                var offsetAsText = match.Groups["offset"].Value;
                 var message = match.Groups["tts"].Value?.Trim();
 
                 if (!double.TryParse(delayAsText, out double delay))
@@ -370,6 +372,23 @@ private void SpeakTTS(
                     return;
                 }
 
+                // 必要ならdurationに対して簡易な足し算と引き算を行う
+                if (operatorAsText != string.Empty && offsetAsText != string.Empty)
+                {
+                    double offset;
+                    if (double.TryParse(offsetAsText, out offset))
+                    {
+                        if (operatorAsText == "+")
+                        {
+                            delay += offset;
+                        }
+                        else if (operatorAsText == "-")
+                        {
+                            delay -= offset;
+                        }
+                    }
+                }
+
                 // ディレイをかけて読上げる
                 SpeechController.Default.SpeakWithDelay(
                     message,