Merge branch develop v10.0.10-220110.1120

anoyetta · Jan 10, 2022 · 9f31721 · 9f31721
2 parents 44ad7f7 + ac4c200
commit 9f31721
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 19 deletions.
diff --git a/source/@MasterVersion.txt b/source/@MasterVersion.txt
@@ -1 +1 @@
-v10.0.9
+v10.0.10
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.0.0.9")]
-[assembly: AssemblyFileVersion("10.0.0.9")]
+[assembly: AssemblyVersion("10.0.0.10")]
+[assembly: AssemblyFileVersion("10.0.0.10")]
diff --git a/...cialSpellTimer/ACT.SpecialSpellTimer.Core/RaidTimeline/TimelineExpressionsModel.Global.cs b/...cialSpellTimer/ACT.SpecialSpellTimer.Core/RaidTimeline/TimelineExpressionsModel.Global.cs
@@ -147,6 +147,9 @@ public static void RefreshZone()
                     $"{TimelineConstants.LogSymbol} set VAR['{ZoneID}'] = {zoneID}");
                 TimelineController.RaiseLog(
                     $"{TimelineConstants.LogSymbol} set VAR['{ZoneName}'] = {zoneName}");
+
+                // ゾーンが変わったならば1BOriginをリセットする
+                Reset1BSignOrigin();
             }
         }
 
@@ -228,6 +231,19 @@ public static void TryRefresh1BSignOrigin(
             }
         }
 
+        /// <summary>
+        /// 1B Sign の最小値をリセットする（0xFFFF）
+        /// </summary>
+        public static void Reset1BSignOrigin()
+        {
+            const int SignInitialValue = 0xFFFF;
+
+            TimelineController.RaiseLog(
+                $"{TimelineConstants.LogSymbol} set VAR['{Origin1B}'] = {SignInitialValue} ({SignInitialValue:X4})");
+
+            SetVariable(Origin1B, SignInitialValue, TimelineController.CurrentController?.CurrentZoneName);
+        }
+
         /// <summary>
         /// グローバル変数をセットする
         /// </summary>

diff --git a/source/ACT.XIVLog/Properties/AssemblyInfo.cs b/source/ACT.XIVLog/Properties/AssemblyInfo.cs
@@ -11,5 +11,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("d504e286-56ec-494f-82cd-fd71aefef606")]
-[assembly: AssemblyVersion("2.6.0.1")]
-[assembly: AssemblyFileVersion("2.6.0.1")]
+[assembly: AssemblyVersion("2.6.0.2")]
+[assembly: AssemblyFileVersion("2.6.0.2")]
diff --git a/source/ACT.XIVLog/VideoCapture.cs b/source/ACT.XIVLog/VideoCapture.cs
@@ -415,7 +415,6 @@ public void FinishRecording()
                                 dest);
 
                             XIVLogPlugin.Instance.EnqueueLogLine(
-                                "00",
                                 $"[XIVLog] The video was saved. {Path.GetFileName(dest)}");
                         }
                     }

diff --git a/source/ACT.XIVLog/XIVLogPlugin.cs b/source/ACT.XIVLog/XIVLogPlugin.cs
@@ -311,9 +311,7 @@ private void OnLogLineRead(
         }
 
         public void EnqueueLogLine(
-            string logMessageType,
-            string message,
-            string zone = null)
+            string message)
         {
             if (string.IsNullOrEmpty(Config.Instance.OutputDirectory) &&
                 !Config.Instance.IsEnabledRecording &&
@@ -322,16 +320,7 @@ public void EnqueueLogLine(
                 return;
             }
 
-            zone ??= this.currentZoneName;
-
-            var log = new LogLineEventArgs(
-                $"[{DateTime.Now:HH:mm:ss.fff}] {logMessageType}:{message}",
-                int.Parse(logMessageType),
-                DateTime.Now,
-                zone,
-                true);
-
-            LogQueue.Enqueue(new XIVLog(false, log));
+            LogParser.RaiseLog(DateTime.Now, message);
         }
 
         /*
-Original file line number
+Diff line change
@@ Expand Up / @@ -415,7 +415,6 @@ public void FinishRecording() @@
                                     dest);
                                 XIVLogPlugin.Instance.EnqueueLogLine(
-                                    "00",
                                     $"[XIVLog] The video was saved. {Path.GetFileName(dest)}");
                             }
                         }
@@ Expand Down @@