From b4d3b0aabafc000541afb3d41453292f5f7381a8 Mon Sep 17 00:00:00 2001
From: RedAsteroid <123588653+RedAsteroid@users.noreply.github.com>
Date: Mon, 1 Jan 2024 23:02:18 +0800
Subject: [PATCH] =?UTF-8?q?1.5=E9=BA=BB=E5=B0=86=E5=8B=98=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Test/Testtriggers_pure.xml | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/Test/Testtriggers_pure.xml b/Test/Testtriggers_pure.xml
index 8f23dd3..c86b320 100644
--- a/Test/Testtriggers_pure.xml
+++ b/Test/Testtriggers_pure.xml
@@ -101,7 +101,7 @@
       </Folder>
       <Folder Id="12a76ec2-3665-4100-b28d-8d6299065bbe" Name="1. 绝境战" Enabled="true">
         <Folders>
-          <Folder Id="8d5f2375-15cb-4fd0-9ef2-94a365e7e2e3" Name="1. 亚历山大绝境战 2023.12.29" Enabled="true">
+          <Folder Id="8d5f2375-15cb-4fd0-9ef2-94a365e7e2e3" Name="1. 亚历山大绝境战 2024.01.02" Enabled="true">
             <Folders>
               <Folder FFXIVZoneFilterEnabled="True" FfxivZoneFilterRegularExpression="^887$" Id="caa11b00-8f49-45d0-a189-ddd2e1007856" Name="P1" Enabled="true">
                 <Folders>
@@ -2866,6 +2866,10 @@
                       </Trigger>
                     </Triggers>
                   </Folder>
+                  <Folder Id="8466c92f-1a4f-475e-9090-73bab12c9f3c" Name="8. D3 引导超级跳跃" Enabled="true">
+                    <Folders />
+                    <Triggers />
+                  </Folder>
                 </Folders>
                 <Triggers>
                   <Trigger Enabled="true" Name="2.22 雷分摊 销毁" Id="26110a84-febc-4b25-ad01-283e0a5e957e" RegularExpression="^.{14} (?:\w+) (15|16):(?&lt;sid&gt;[^:]*):(?&lt;sname&gt;[^:]*):4841:(?&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;[^:]*)(?:$|:)" PeriodRefire="Deny" RefirePeriodExpression="500">
@@ -7254,7 +7258,7 @@
                   <Folder Id="71d8233e-6b4c-45c7-815a-ba3134f0ef6a" Name="A. 插件配置相关" Enabled="true">
                     <Folders />
                     <Triggers>
-                      <Trigger Enabled="true" Name="Splatoon WebApi端口：47774 (默认)" Id="a132cd34-6788-4bf2-bcd2-c2617b845926" RegularExpression="">
+                      <Trigger Enabled="true" Name="Splatoon WebApi 端口：47774 (默认)" Id="a132cd34-6788-4bf2-bcd2-c2617b845926" RegularExpression="">
                         <Actions />
                         <Condition Enabled="false" Grouping="Or" />
                       </Trigger>
@@ -7274,11 +7278,11 @@
                     <Actions />
                     <Condition Enabled="false" Grouping="Or" />
                   </Trigger>
-                  <Trigger Enabled="true" Name="2. 鲶鱼精邮差(PostNamazu): github.com/Natsukage/PostNamazu/releases/tag/1.3.2.7" Id="80f88ed8-a23f-42f1-b567-8bfea7593dcf" RegularExpression="">
+                  <Trigger Enabled="true" Name="2. 鲶鱼精邮差 (PostNamazu): github.com/Natsukage/PostNamazu/releases/tag/1.3.2.7" Id="80f88ed8-a23f-42f1-b567-8bfea7593dcf" RegularExpression="">
                     <Actions />
                     <Condition Enabled="false" Grouping="Or" />
                   </Trigger>
-                  <Trigger Enabled="true" Name="3. 更多日志CactbotSelf(MoreLogLine)：github.com/tssailzz8/cacbotSelf" Id="256c9d8a-9321-4c91-bb3c-357672b7baeb" RegularExpression="">
+                  <Trigger Enabled="true" Name="3. 更多日志 CactbotSelf(MoreLogLine)：github.com/tssailzz8/cacbotSelf" Id="256c9d8a-9321-4c91-bb3c-357672b7baeb" RegularExpression="">
                     <Actions />
                     <Condition Enabled="false" Grouping="Or" />
                   </Trigger>
@@ -7286,6 +7290,11 @@
                     <Actions />
                     <Condition Enabled="false" Grouping="Or" />
                   </Trigger>
+                  <Trigger Enabled="true" Name="4. SplatoonX(国服特供)插件请访问获取，自备魔法: github.com/gamous/DalamudPluginsCN-Dev" Id="68879b60-d77c-497f-af23-a46af2a79c53" RegularExpression="">
+                    <Actions />
+                    <Condition Enabled="false" Grouping="Or" />
+                    <Conditions />
+                  </Trigger>
                 </Triggers>
               </Folder>
               <Folder Id="a49efb79-c154-4c1f-a5ae-e67cc9091a61" Name="⭐ Github仓库 ⭐" Enabled="true">
@@ -7297,9 +7306,9 @@
                   </Trigger>
                 </Triggers>
               </Folder>
-              <Folder Id="1995989e-6d29-444f-8647-61f7b9f30413" Name="Ex. 1.5麻将指路 【初次使用请务必查看此分组内容，此项指路有可选项】" Enabled="true">
+              <Folder Id="1995989e-6d29-444f-8647-61f7b9f30413" Name="Ex. 1.5麻将指路 【初次使用请务必查看此分组内容，默认开启触发器指路，如果您已经在使用1.5麻将脚本请关闭此分组或调整触发器显示内容】" Enabled="true">
                 <Folders>
-                  <Folder FFXIVZoneFilterEnabled="True" FfxivZoneFilterRegularExpression="^887$" Id="fc763e1d-638f-4c6f-bd3f-ae561a5340e2" Name="B. 1.5麻将触发器指路 - 【脚本与触发器重复，请自选其一使用！】" Enabled="false">
+                  <Folder FFXIVZoneFilterEnabled="True" FfxivZoneFilterRegularExpression="^887$" Id="fc763e1d-638f-4c6f-bd3f-ae561a5340e2" Name="B. 1.5麻将触发器指路 - 【脚本与触发器重复，请自选其一使用！】" Enabled="true">
                     <Folders>
                       <Folder Id="312e4e7c-e4c1-4694-9712-5732eaeb0f00" Name="使用需知：(依赖OverlayPlugin悬浮窗插件日志行)" Enabled="true">
                         <Folders />
@@ -9544,7 +9553,7 @@
                                   <Action OrderNumber="40" JsonEndpointExpression="http://127.0.0.1:47774/?namespace=go&amp;destroyAt=8000,COMBAT_EXIT,TERRITORY_CHANGE" JsonPayloadExpression="{&quot;Name&quot;:&quot;1 0&quot;,&quot;refX&quot;:113.7957,&quot;refY&quot;:99.2838,&quot;refZ&quot;:-3.8146973E-06,&quot;radius&quot;:0.5,&quot;color&quot;:4294911232,&quot;thicc&quot;:6.0}" ActionType="GenericJson">
                                     <Condition Enabled="true" Grouping="And">
                                       <ConditionSingle Enabled="true" ExpressionL="${time}" ExpressionTypeL="String" ExpressionR="9" ExpressionTypeR="String" ConditionType="StringEqualNocase" />
-                                      <ConditionSingle Enabled="true" ExpressionL="${var:绝亚_1.5麻将_序号_Clone}" ExpressionTypeL="String" ExpressionR="7" ExpressionTypeR="String" ConditionType="StringEqualNocase" />
+                                      <ConditionSingle Enabled="true" ExpressionL="${var:绝亚_1.5麻将_序号_Clone}" ExpressionTypeL="String" ExpressionR="8" ExpressionTypeR="String" ConditionType="StringEqualNocase" />
                                     </Condition>
                                   </Action>
                                 </Actions>
@@ -10025,12 +10034,12 @@
                                   <ConditionSingle Enabled="true" ExpressionL="${var:绝亚_1.5麻将_全部显示_Clone}" ExpressionTypeL="String" ExpressionR="0" ExpressionTypeR="String" ConditionType="StringEqualNocase" />
                                 </Condition>
                               </Action>
-                              <Action OrderNumber="7" UseTTSTextExpression="已开启奇数麻将引导点全部显示" ActionType="UseTTS">
+                              <Action OrderNumber="7" UseTTSTextExpression="已开启奇数麻将引导点全部显示" Enabled="False" ActionType="UseTTS">
                                 <Condition Enabled="true" Grouping="Or">
                                   <ConditionSingle Enabled="true" ExpressionL="${var:绝亚_1.5麻将_全部显示_Clone}" ExpressionTypeL="String" ExpressionR="1" ExpressionTypeR="String" ConditionType="StringEqualNocase" />
                                 </Condition>
                               </Action>
-                              <Action OrderNumber="8" UseTTSTextExpression="已关闭奇数麻将引导点全部显示" ActionType="UseTTS">
+                              <Action OrderNumber="8" UseTTSTextExpression="已关闭奇数麻将引导点全部显示" Enabled="False" ActionType="UseTTS">
                                 <Condition Enabled="true" Grouping="Or">
                                   <ConditionSingle Enabled="true" ExpressionL="${var:绝亚_1.5麻将_全部显示_Clone}" ExpressionTypeL="String" ExpressionR="0" ExpressionTypeR="String" ConditionType="StringEqualNocase" />
                                 </Condition>
@@ -10233,7 +10242,7 @@
                 <Actions />
                 <Condition Enabled="false" Grouping="Or" />
               </Trigger>
-              <Trigger Enabled="true" Name="修改日期：2023-12-29 触发器1.5麻将测试，默认禁用如需使用请自行启用，其他一切照常，已修复p3飞轮显示错误" Id="12454dc1-d649-4fe8-aef4-6c8b1178a0fb" RegularExpression="">
+              <Trigger Enabled="true" Name="修改日期：2024-01-02 1.5麻将勘误" Id="12454dc1-d649-4fe8-aef4-6c8b1178a0fb" RegularExpression="">
                 <Actions />
                 <Condition Enabled="false" Grouping="Or" />
               </Trigger>