From d566685ddf6cbb0e24e36dd5a1b621b61c2f7285 Mon Sep 17 00:00:00 2001
From: RedAsteroid <123588653+RedAsteroid@users.noreply.github.com>
Date: Thu, 31 Oct 2024 08:25:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20Lv.99=20=E9=AD=82=E9=AD=84?=
 =?UTF-8?q?=E5=B7=A5=E5=8E=82=E5=88=9B=E7=94=9F=E8=AE=BE=E6=96=BD=20Boss3?=
 =?UTF-8?q?=20=E5=87=BB=E9=80=80=E5=8C=BA=E5=9F=9F=E6=8C=87=E5=BC=95?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=20=E6=95=B4=E7=90=86=E5=88=86=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Test/Testtriggers_pure.xml | 130 +++++++++++++++++++++++++++++--------
 1 file changed, 104 insertions(+), 26 deletions(-)

diff --git a/Test/Testtriggers_pure.xml b/Test/Testtriggers_pure.xml
index 0136a76..320772a 100644
--- a/Test/Testtriggers_pure.xml
+++ b/Test/Testtriggers_pure.xml
@@ -10864,7 +10864,7 @@
               </Folder>
             </Folders>
             <Triggers>
-              <Trigger Enabled="true" Name="如何使用①: 进入副本后，请输入/e 职能，确定您的职能位置(例如输入/e d1，设置您的职能为D1，不区分大小写)" Id="d6b9cf0a-ac2d-4891-8868-6148c2bdc1b7" RegularExpression="">
+              <Trigger Enabled="true" Name="如何使用①: 进入副本后，请输入/e 职能，确定您的职能位置(例如输入/e d1，设置您的职能为D1，不区分大小写)" Id="6cbd394e-0065-4e58-b2de-ccb6cf9f69fe" RegularExpression="">
                 <Actions />
               </Trigger>
               <Trigger Enabled="true" Name="功能: 使用触发器实现的Splatoon第三方绘制，用于画出亚历山大绝境战副本内部分不可见AoE与走位参考" Id="7314c593-b0fa-4e6c-a24a-eb98b21fc680" RegularExpression="">
@@ -10989,14 +10989,11 @@
               <Trigger Enabled="true" Source="None" Name="PS.1 此触发器为补充部分，与莫灵喵神兵轮椅第三方绘制不重复。" Id="26dd995e-a386-436f-8f12-fdb51d2ce0ab" RegularExpression="">
                 <Actions />
               </Trigger>
-              <Trigger Enabled="true" Source="None" Name="因长草期没队打，暂时就这样了……" Id="a3530f8a-f928-4f0a-900b-ebfe835182b5" RegularExpression="">
-                <Actions />
-              </Trigger>
             </Triggers>
           </Folder>
         </Folders>
         <Triggers>
-          <Trigger Enabled="true" Name="※ 请打开 Splatoon 插件设置 - 渲染设置 - 传统ImGui渲染设置 - 选定 Default 以应用旧版渲染" Id="06630c22-59ad-4a28-9557-69c955ae00dc" RegularExpression="">
+          <Trigger Enabled="true" Name="※ 新版本将所有旧格式元素默认填充，即使使用传统ImGui渲染也不行，虽然填充污染在DX11渲染还没有严重到看不见，暂时无能为力" Id="06630c22-59ad-4a28-9557-69c955ae00dc" RegularExpression="">
             <Actions />
           </Trigger>
           <Trigger Enabled="true" Name="※ 此分组下绘制为传统ImGui渲染，7.0后SPL更新提供了DX11渲染并作为默认设置，会显示不正常" Id="4179ffa5-dfb6-4785-a3ec-f2bd11b82c0d" RegularExpression="">
@@ -11005,6 +11002,9 @@
           <Trigger Enabled="true" Name="※ 受限于现实原因，绝本触发器绘制可能需要很久很久才会更新DX11渲染版本" Id="cfb61bbe-322d-4bac-b15a-3b1d47561e75" RegularExpression="">
             <Actions />
           </Trigger>
+          <Trigger Enabled="true" Name="# MoreLogLine 装了没有任何日志信息？请先启动 游戏，再启动 ACT，MoreLogLine 的问题等牙刷修复" Id="d6b9cf0a-ac2d-4891-8868-6148c2bdc1b7" RegularExpression="">
+            <Actions />
+          </Trigger>
         </Triggers>
       </Folder>
       <Folder Id="b0370d0a-452d-4d85-aa41-0b8638d65bd1" Name="2. 讨伐歼灭战-高难度 / 大型任务-高难度" Enabled="true">
@@ -18072,8 +18072,78 @@
             <Triggers />
           </Folder>
           <Folder Id="e88faa66-048c-462f-9f75-799735becae4" Name="5. 佐拉加歼殛战" Enabled="false">
-            <Folders />
-            <Triggers />
+            <Folders>
+              <Folder FFXIVZoneFilterEnabled="True" FfxivZoneFilterRegularExpression="^1201$" Id="cd356e66-b43b-4670-adc0-95b8eab7819f" Name="1. 本体" Enabled="true">
+                <Folders />
+                <Triggers />
+              </Folder>
+              <Folder FFXIVZoneFilterEnabled="True" FfxivZoneFilterRegularExpression="^1201$" Id="c24b6632-702f-4671-857a-f3a1b3c0e460" Name="0. 控制" Enabled="true">
+                <Folders />
+                <Triggers>
+                  <Trigger Enabled="true" Name="初始化" Id="180e83b2-189e-438f-9acf-c7ae07063597" RegularExpression="^.{15}\S+ 104:.:1:.:1">
+                    <Actions />
+                  </Trigger>
+                </Triggers>
+              </Folder>
+              <Folder Id="92290e5e-e19d-4ee0-b0f9-63d42b5e69f6" Name="5. 调试" Enabled="true">
+                <Folders />
+                <Triggers>
+                  <Trigger Enabled="true" Name="启用 - Debug 调试频道" Id="b948974e-298e-4471-9c81-5a407b6e76c5" RegularExpression="">
+                    <Actions />
+                  </Trigger>
+                </Triggers>
+              </Folder>
+              <Folder Id="afed8afa-bec1-4062-ae84-976948919072" Name="2. 播报" Enabled="true">
+                <Folders />
+                <Triggers />
+              </Folder>
+              <Folder Id="c32b994a-2574-4fea-b0b8-0e7c10cf0e13" Name="4. 其他" Enabled="true">
+                <Folders>
+                  <Folder Id="9ec146fb-4d4d-48e2-b09c-17e0ae3d70e3" Name="设置场景标记(手动) - 所有人可见" Enabled="true">
+                    <Folders />
+                    <Triggers>
+                      <Trigger Enabled="true" Name="设置场景标记 - 美服分摊" Id="05f85ecb-a89c-4a62-a27d-f85f00a234fb" RegularExpression="">
+                        <Actions />
+                      </Trigger>
+                      <Trigger Enabled="true" Name="设置场景标记 - Game8" Id="605bea3a-78fe-425f-acd7-4619a377ceb6" RegularExpression="">
+                        <Actions />
+                      </Trigger>
+                      <Trigger Enabled="true" Name="※ 右键 - 执行（强制），应用场景标记" Id="bf47b118-c5fd-478c-aa72-b3ef073a86a5" RegularExpression="">
+                        <Actions />
+                      </Trigger>
+                    </Triggers>
+                  </Folder>
+                </Folders>
+                <Triggers />
+              </Folder>
+              <Folder Id="1ac54ef7-3d51-46b4-bab7-200cdf5fdb0f" Name="3. Splatoon Scripts 脚本" Enabled="true">
+                <Folders />
+                <Triggers />
+              </Folder>
+            </Folders>
+            <Triggers>
+              <Trigger Enabled="false" Name="①. 机制播报 - 小队频道 /p" Id="8ace9584-d0a5-485a-a51a-d5c1e52bce00" RegularExpression="">
+                <Actions />
+              </Trigger>
+              <Trigger Enabled="true" Name="①. 机制播报 - 默语频道 /e" Id="5c22dbee-ec42-4eac-9575-9cfe636e4253" RegularExpression="">
+                <Actions />
+              </Trigger>
+              <Trigger Enabled="true" Name="②. 犯错播报 - 也许有" Id="1e741082-947d-4c0c-8d68-591c944849b1" RegularExpression="">
+                <Actions />
+              </Trigger>
+              <Trigger Enabled="true" Name="③. 启用 - Healer(治疗) 减伤提醒 (预置)" Id="0c0999aa-f7b8-499e-b2d0-33445e81043f" RegularExpression="">
+                <Actions />
+              </Trigger>
+              <Trigger Enabled="true" Name="③. 启用 - Tank(坦克) 减伤提醒 (预置)" Id="6a307ccd-d97d-40ee-a47b-1d98d4ca565c" RegularExpression="">
+                <Actions />
+              </Trigger>
+              <Trigger Enabled="true" Name="③. 启用 - DPS(输出) 减伤提醒 (预置)" Id="503c5553-b7c7-4752-8301-b2a15025c316" RegularExpression="">
+                <Actions />
+              </Trigger>
+              <Trigger Enabled="true" Name="②. 犯错播报 - 也许有" Id="882cd4dd-61be-4b8c-a235-39e9c625b094" RegularExpression="">
+                <Actions />
+              </Trigger>
+            </Triggers>
           </Folder>
         </Folders>
         <Triggers />
@@ -19776,7 +19846,7 @@
                           </Trigger>
                         </Triggers>
                       </Folder>
-                      <Folder Id="889f1b1d-183b-451a-825e-34fe95e3c8b8" Name="寒霜寻影 (指挥)" Enabled="false">
+                      <Folder Id="889f1b1d-183b-451a-825e-34fe95e3c8b8" Name="寒霜寻影 (指挥)" Enabled="true">
                         <Folders />
                         <Triggers>
                           <Trigger Enabled="true" Name="1. 左下" Id="53d46533-44f6-43b8-94d2-8413060e03c9" RegularExpression="^.{14} ChatLog 00:0:103:.{8}:.{8}:01000080:(?&lt;value2&gt;.*?):(?&lt;value3&gt;.*?):">
@@ -24373,7 +24443,12 @@
                     </Triggers>
                   </Folder>
                   <Folder FFXIVZoneFilterEnabled="True" FfxivZoneFilterRegularExpression="^1204$" Id="0e4fe090-bbb3-4310-a76d-e31ee3393ea5" Name="Boss2 - 茶壶里的小丑" Enabled="true">
-                    <Folders />
+                    <Folders>
+                      <Folder Id="30f5c7a1-4d61-4157-91de-26d7e60d0cbc" Name="旋转茶杯 PLUS+" Enabled="true">
+                        <Folders />
+                        <Triggers />
+                      </Folder>
+                    </Folders>
                     <Triggers>
                       <Trigger Enabled="true" Sequential="True" Name="1.2 旋转茶杯" Id="096e1ed9-8b37-41c8-91cf-af29e324bffa" RegularExpression="^.{14} (?:\w+) (15|16):(?&lt;sid&gt;[^:]*):(?&lt;sname&gt;[^:]*):8F6D:(?&lt;ability&gt;(?:[^:]|: )*?):(?&lt;tid&gt;[^:]*):(?&lt;tname&gt;[^:]*):(?&lt;flags&gt;[^:]*):(?&lt;damage&gt;[^:]*)(?::[^:]*){14}:(?&lt;targetCurrentHp&gt;[^:]*):(?&lt;targetMaxHp&gt;[^:]*):(?&lt;targetCurrentMp&gt;[^:]*):(?&lt;targetMaxMp&gt;[^:]*)(?::[^:]*){2}:(?&lt;targetX&gt;[^:]*):(?&lt;targetY&gt;[^:]*):(?&lt;targetZ&gt;[^:]*):(?&lt;targetHeading&gt;[^:]*):(?&lt;currentHp&gt;[^:]*):(?&lt;maxHp&gt;[^:]*):(?&lt;currentMp&gt;[^:]*):(?&lt;maxMp&gt;[^:]*)(?::[^:]*){2}:(?&lt;x&gt;[^:]*):(?&lt;y&gt;[^:]*):(?&lt;z&gt;[^:]*):(?&lt;heading&gt;[^:]*):(?&lt;sequence&gt;[^:]*):(?&lt;targetIndex&gt;[^:]*):(?&lt;targetCount&gt;[^:]*):(?&lt;ownerId&gt;[^:]*):(?&lt;ownerName&gt;[^:]*):(?&lt;effectDisplayType&gt;[^:]*):(?&lt;actionId&gt;[^:]*):(?&lt;actionAnimationId&gt;[^:]*):(?&lt;animationLockTime&gt;[^:]*):(?&lt;rotationHex&gt;[^:]*)(?:$|:)">
                         <Actions>
@@ -27752,43 +27827,46 @@
                           <Trigger Enabled="true" Name="2. 指示区域 (OverlayPlugin)" Id="53337064-7812-45c1-b8d3-c60cc679d76e" RegularExpression="^.{14} 263 107:(?&lt;sid&gt;[^:]*):8E51:(?&lt;x&gt;[^:]*):(?&lt;y&gt;[^:]*):(?&lt;z&gt;[^:]*)(?:$|:)">
                             <Actions>
                               <Action OrderNumber="1" Enabled="False" ActionType="Placeholder" Description="8E51 = 南北, 8E50 = 东西 ，y &lt; 0 = 北，y &gt; 0 = 南" DescriptionOverride="True" />
-                              <Action OrderNumber="2" Enabled="False" ActionType="Placeholder" Description="无念动压制" DescriptionOverride="True" />
-                              <Action OrderNumber="3" JsonEndpointExpression="http://127.0.0.1:47774/?namespace=b1sm1&amp;destroyAt=6500,COMBAT_EXIT,TERRITORY_CHANGE" JsonPayloadExpression="{&quot;Name&quot;:&quot;2&quot;,&quot;type&quot;:1,&quot;radius&quot;:7.5,&quot;color&quot;:255,&quot;fillIntensity&quot;:0.359,&quot;overlayBGColor&quot;:4294962944,&quot;overlayTextColor&quot;:4278190080,&quot;overlayVOffset&quot;:1.0,&quot;overlayText&quot;:&quot;击退区域✓&quot;,&quot;refActorObjectID&quot;:${numeric:hex2dec(${sid})},&quot;refActorComparisonType&quot;:2,&quot;includeRotation&quot;:true,&quot;refActorTetherTimeMin&quot;:0.0,&quot;refActorTetherTimeMax&quot;:0.0}" ActionType="GenericJson" ExecutionDelayExpression="500">
+                              <Action OrderNumber="2" Enabled="False" ActionType="Placeholder" Description="可能会报错，猜测是解析日志提供的位置落后了" DescriptionOverride="True" />
+                              <Action OrderNumber="3" Enabled="False" ActionType="Placeholder" Description="无念动压制" DescriptionOverride="True" />
+                              <Action OrderNumber="4" JsonEndpointExpression="http://127.0.0.1:47774/?namespace=b1sm1&amp;destroyAt=6500,COMBAT_EXIT,TERRITORY_CHANGE" JsonPayloadExpression="{&quot;Name&quot;:&quot;2&quot;,&quot;type&quot;:1,&quot;radius&quot;:7.5,&quot;color&quot;:255,&quot;fillIntensity&quot;:0.359,&quot;overlayBGColor&quot;:4294962944,&quot;overlayTextColor&quot;:4278190080,&quot;overlayVOffset&quot;:1.0,&quot;overlayText&quot;:&quot;击退区域&quot;,&quot;refActorObjectID&quot;:${numeric:hex2dec(${sid})},&quot;refActorComparisonType&quot;:2,&quot;includeRotation&quot;:true,&quot;refActorTetherTimeMin&quot;:0.0,&quot;refActorTetherTimeMax&quot;:0.0}" ActionType="GenericJson" ExecutionDelayExpression="1200">
                                 <Condition Enabled="true" Grouping="And">
                                   <ConditionSingle Enabled="true" ExpressionL="${evar:Neodraw_d05_b3sm1_type_Clone}" ExpressionTypeL="String" ExpressionR="0" ExpressionTypeR="String" ConditionType="StringEqualNocase" />
                                 </Condition>
                               </Action>
-                              <Action OrderNumber="4" Enabled="False" ActionType="Placeholder" Description="念动压制 北" DescriptionOverride="True" />
-                              <Action OrderNumber="5" JsonEndpointExpression="http://127.0.0.1:47774/?namespace=b1sm1&amp;destroyAt=6500,COMBAT_EXIT,TERRITORY_CHANGE" JsonPayloadExpression="{&quot;Name&quot;:&quot;2&quot;,&quot;type&quot;:1,&quot;radius&quot;:7.5,&quot;color&quot;:255,&quot;fillIntensity&quot;:0.359,&quot;overlayBGColor&quot;:4294962944,&quot;overlayTextColor&quot;:4278190080,&quot;overlayVOffset&quot;:1.0,&quot;overlayText&quot;:&quot;击退区域✓&quot;,&quot;refActorObjectID&quot;:${numeric:hex2dec(${sid})},&quot;refActorComparisonType&quot;:2,&quot;includeRotation&quot;:true,&quot;refActorTetherTimeMin&quot;:0.0,&quot;refActorTetherTimeMax&quot;:0.0}" ActionType="GenericJson">
+                              <Action OrderNumber="5" Enabled="False" ActionType="Placeholder" Description="念动压制 北" DescriptionOverride="True" />
+                              <Action OrderNumber="6" JsonEndpointExpression="http://127.0.0.1:47774/?namespace=b1sm1&amp;destroyAt=6500,COMBAT_EXIT,TERRITORY_CHANGE" JsonPayloadExpression="{&quot;Name&quot;:&quot;2&quot;,&quot;type&quot;:1,&quot;radius&quot;:7.5,&quot;color&quot;:255,&quot;fillIntensity&quot;:0.359,&quot;overlayBGColor&quot;:4294962944,&quot;overlayTextColor&quot;:4278190080,&quot;overlayVOffset&quot;:1.0,&quot;overlayText&quot;:&quot;击退区域&quot;,&quot;refActorObjectID&quot;:${numeric:hex2dec(${sid})},&quot;refActorComparisonType&quot;:2,&quot;includeRotation&quot;:true,&quot;refActorTetherTimeMin&quot;:0.0,&quot;refActorTetherTimeMax&quot;:0.0}" ActionType="GenericJson">
                                 <Condition Enabled="true" Grouping="And">
                                   <ConditionSingle Enabled="true" ExpressionL="${var:Neodraw_d05_b3sm1_type_Clone}" ExpressionTypeL="String" ExpressionR="北" ExpressionTypeR="String" ConditionType="StringEqualNocase" />
-                                  <ConditionSingle Enabled="true" ExpressionL="${y}" ExpressionTypeL="Numeric" ExpressionR="0" ExpressionTypeR="Numeric" ConditionType="NumericLess" />
+                                  <ConditionSingle Enabled="true" ExpressionL="${_ffxiventity[${sid}].y}" ExpressionTypeL="Numeric" ExpressionR="0" ExpressionTypeR="Numeric" ConditionType="NumericLess" />
                                 </Condition>
                               </Action>
-                              <Action OrderNumber="6" Enabled="False" ActionType="Placeholder" Description="念动压制 南" DescriptionOverride="True" />
-                              <Action OrderNumber="7" JsonEndpointExpression="http://127.0.0.1:47774/?namespace=b1sm1&amp;destroyAt=6500,COMBAT_EXIT,TERRITORY_CHANGE" JsonPayloadExpression="{&quot;Name&quot;:&quot;2&quot;,&quot;type&quot;:1,&quot;radius&quot;:7.5,&quot;color&quot;:255,&quot;fillIntensity&quot;:0.359,&quot;overlayBGColor&quot;:4294962944,&quot;overlayTextColor&quot;:4278190080,&quot;overlayVOffset&quot;:1.0,&quot;overlayText&quot;:&quot;击退区域✓&quot;,&quot;refActorObjectID&quot;:${numeric:hex2dec(${sid})},&quot;refActorComparisonType&quot;:2,&quot;includeRotation&quot;:true,&quot;refActorTetherTimeMin&quot;:0.0,&quot;refActorTetherTimeMax&quot;:0.0}" ActionType="GenericJson">
+                              <Action OrderNumber="7" Enabled="False" ActionType="Placeholder" Description="念动压制 南" DescriptionOverride="True" />
+                              <Action OrderNumber="8" JsonEndpointExpression="http://127.0.0.1:47774/?namespace=b1sm1&amp;destroyAt=6500,COMBAT_EXIT,TERRITORY_CHANGE" JsonPayloadExpression="{&quot;Name&quot;:&quot;2&quot;,&quot;type&quot;:1,&quot;radius&quot;:7.5,&quot;color&quot;:255,&quot;fillIntensity&quot;:0.359,&quot;overlayBGColor&quot;:4294962944,&quot;overlayTextColor&quot;:4278190080,&quot;overlayVOffset&quot;:1.0,&quot;overlayText&quot;:&quot;击退区域&quot;,&quot;refActorObjectID&quot;:${numeric:hex2dec(${sid})},&quot;refActorComparisonType&quot;:2,&quot;includeRotation&quot;:true,&quot;refActorTetherTimeMin&quot;:0.0,&quot;refActorTetherTimeMax&quot;:0.0}" ActionType="GenericJson">
                                 <Condition Enabled="true" Grouping="And">
                                   <ConditionSingle Enabled="true" ExpressionL="${var:Neodraw_d05_b3sm1_type_Clone}" ExpressionTypeL="String" ExpressionR="南" ExpressionTypeR="String" ConditionType="StringEqualNocase" />
-                                  <ConditionSingle Enabled="true" ExpressionL="${y}" ExpressionTypeL="Numeric" ExpressionR="0" ExpressionTypeR="Numeric" ConditionType="NumericGreater" />
+                                  <ConditionSingle Enabled="true" ExpressionL="${_ffxiventity[${sid}].y}" ExpressionTypeL="Numeric" ExpressionR="0" ExpressionTypeR="Numeric" ConditionType="NumericGreater" />
                                 </Condition>
                               </Action>
                             </Actions>
                           </Trigger>
-                          <Trigger Enabled="true" Name="1. 念动压制半场判断" Id="755fea5d-4e8b-4cc1-b396-9527a97f46b0" RegularExpression="^.{14} StartsCasting 14:(?&lt;sid&gt;[^:]*):(?&lt;sname&gt;[^:]*):98A0:(?&lt;ability&gt;(?:[^:]|: )*?):(?&lt;tid&gt;[^:]*):(?&lt;tname&gt;[^:]*):(?&lt;castTime&gt;[^:]*):(?&lt;x&gt;[^:]*):(?&lt;y&gt;[^:]*):(?&lt;z&gt;[^:]*):(?&lt;heading&gt;[^:]*)(?:$|:)">
+                          <Trigger Enabled="true" Name="1. 念动压制半场判断" Id="755fea5d-4e8b-4cc1-b396-9527a97f46b0" RegularExpression="^.{14} StartsCasting 14:(?&lt;sid&gt;[^:]*):(?&lt;sname&gt;[^:]*):988F:(?&lt;ability&gt;(?:[^:]|: )*?):(?&lt;tid&gt;[^:]*):(?&lt;tname&gt;[^:]*):(?&lt;castTime&gt;[^:]*):(?&lt;x&gt;[^:]*):(?&lt;y&gt;[^:]*):(?&lt;z&gt;[^:]*):(?&lt;heading&gt;[^:]*)(?:$|:)">
                             <Actions>
-                              <Action OrderNumber="1" Enabled="False" ActionType="Placeholder" Description="根据咏唱时面向判断 heading = 0 = 北,heading = -3.14 = 南" DescriptionOverride="True" />
-                              <Action OrderNumber="2" VariableOp="SetString" VariableName="Neodraw_d05_b3sm1_type_Clone" VariableExpression="北" ActionType="Variable">
+                              <Action OrderNumber="1" Enabled="False" ActionType="Placeholder" Description="根据咏唱时Boss实体面向判断，而不是解析日志提供的数据，Boss先开始咏唱后转头，日志提供的信息过时了，添加1秒延迟" DescriptionOverride="True" />
+                              <Action OrderNumber="2" Enabled="False" ActionType="Placeholder" Description="heading ≈ 3.14 北，heading ≈ 0 南" DescriptionOverride="True" />
+                              <Action OrderNumber="3" ActionType="Placeholder" ExecutionDelayExpression="1000" />
+                              <Action OrderNumber="4" VariableOp="SetString" VariableName="Neodraw_d05_b3sm1_type_Clone" VariableExpression="北" ActionType="Variable">
                                 <Condition Enabled="true" Grouping="Or">
-                                  <ConditionSingle Enabled="true" ExpressionL="${heading}" ExpressionTypeL="Numeric" ExpressionR="0" ExpressionTypeR="Numeric" ConditionType="NumericEqual" />
+                                  <ConditionSingle Enabled="true" ExpressionL="abs(${_ffxiventity[${sid}].heading}-3.14)" ExpressionTypeL="Numeric" ExpressionR="0.1" ExpressionTypeR="Numeric" ConditionType="NumericLess" />
                                 </Condition>
                               </Action>
-                              <Action OrderNumber="3" VariableOp="SetString" VariableName="Neodraw_d05_b3sm1_type_Clone" VariableExpression="南" ActionType="Variable">
+                              <Action OrderNumber="5" VariableOp="SetString" VariableName="Neodraw_d05_b3sm1_type_Clone" VariableExpression="南" ActionType="Variable">
                                 <Condition Enabled="true" Grouping="Or">
-                                  <ConditionSingle Enabled="true" ExpressionL="${heading}" ExpressionTypeL="Numeric" ExpressionR="-3.14" ExpressionTypeR="Numeric" ConditionType="NumericEqual" />
+                                  <ConditionSingle Enabled="true" ExpressionL="abs(${_ffxiventity[${sid}].heading})" ExpressionTypeL="Numeric" ExpressionR="0.1" ExpressionTypeR="Numeric" ConditionType="NumericLess" />
                                 </Condition>
                               </Action>
-                              <Action OrderNumber="4" Enabled="False" ActionType="Placeholder" Description="延迟重置" DescriptionOverride="True" />
-                              <Action OrderNumber="5" VariableName="Neodraw_d05_b3sm1_type_Clone" Enabled="False" ActionType="Variable" ExecutionDelayExpression="10500" RefireRequeue="False" />
+                              <Action OrderNumber="6" Enabled="False" ActionType="Placeholder" Description="延迟重置" DescriptionOverride="True" />
+                              <Action OrderNumber="7" VariableName="Neodraw_d05_b3sm1_type_Clone" ActionType="Variable" ExecutionDelayExpression="9500" RefireRequeue="False" />
                             </Actions>
                           </Trigger>
                           <Trigger Enabled="true" Sequential="True" Name="3. 销毁重置" Id="16a47dc3-edbd-4856-b0f3-842758900cd1" RegularExpression="^.{14} (?:\w+) (15|16):(?&lt;sid&gt;[^:]*):(?&lt;sname&gt;[^:]*):98A0:(?&lt;ability&gt;(?:[^:]|: )*?):(?&lt;tid&gt;[^:]*):(?&lt;tname&gt;[^:]*):(?&lt;flags&gt;[^:]*):(?&lt;damage&gt;[^:]*)(?::[^:]*){14}:(?&lt;targetCurrentHp&gt;[^:]*):(?&lt;targetMaxHp&gt;[^:]*):(?&lt;targetCurrentMp&gt;[^:]*):(?&lt;targetMaxMp&gt;[^:]*)(?::[^:]*){2}:(?&lt;targetX&gt;[^:]*):(?&lt;targetY&gt;[^:]*):(?&lt;targetZ&gt;[^:]*):(?&lt;targetHeading&gt;[^:]*):(?&lt;currentHp&gt;[^:]*):(?&lt;maxHp&gt;[^:]*):(?&lt;currentMp&gt;[^:]*):(?&lt;maxMp&gt;[^:]*)(?::[^:]*){2}:(?&lt;x&gt;[^:]*):(?&lt;y&gt;[^:]*):(?&lt;z&gt;[^:]*):(?&lt;heading&gt;[^:]*):(?&lt;sequence&gt;[^:]*):(?&lt;targetIndex&gt;[^:]*):(?&lt;targetCount&gt;[^:]*):(?&lt;ownerId&gt;[^:]*):(?&lt;ownerName&gt;[^:]*):(?&lt;effectDisplayType&gt;[^:]*):(?&lt;actionId&gt;[^:]*):(?&lt;actionAnimationId&gt;[^:]*):(?&lt;animationLockTime&gt;[^:]*):(?&lt;rotationHex&gt;[^:]*)(?:$|:)" PeriodRefire="Deny" RefirePeriodExpression="1000">
@@ -28559,7 +28637,7 @@
       </Folder>
     </Folders>
     <Triggers>
-      <Trigger Enabled="false" Sequential="True" Name="【初次导入提醒】2024/10/24" Id="a3838669-6fc1-418e-bfb1-94288b4904a9" RegularExpression="^." PeriodRefire="Deny" RefirePeriodExpression="2000">
+      <Trigger Enabled="false" Sequential="True" Name="【初次导入提醒】2024/10/31" Id="a3838669-6fc1-418e-bfb1-94288b4904a9" RegularExpression="^." PeriodRefire="Deny" RefirePeriodExpression="2000">
         <Actions>
           <Action OrderNumber="1" TriggerOp="DisableTrigger" TriggerId="a3838669-6fc1-418e-bfb1-94288b4904a9" ActionType="Trigger" />
           <Action OrderNumber="2" UseTTSTextExpression="欢迎使用本触发器，初次使用请阅读提示匡以及使用教程。" ActionType="UseTTS" />