From aba71ffef4bbe93f486c3563173efee6afc6f189 Mon Sep 17 00:00:00 2001
From: RedAsteroid <123588653+RedAsteroid@users.noreply.github.com>
Date: Sun, 14 Jan 2024 00:40:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9D=E4=BA=9A=E6=96=B0=E5=A2=9E=E5=B0=8F?=
 =?UTF-8?q?=E6=80=AA=E7=9B=91=E6=8E=A7-=E4=BF=AE=E5=A4=8D=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E5=86=85=E5=AE=B91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Test/Testtriggers_pure.xml | 72 ++++++++++++++++++++------------------
 1 file changed, 37 insertions(+), 35 deletions(-)

diff --git a/Test/Testtriggers_pure.xml b/Test/Testtriggers_pure.xml
index dfc820d..7744b23 100644
--- a/Test/Testtriggers_pure.xml
+++ b/Test/Testtriggers_pure.xml
@@ -115,7 +115,7 @@
       </Folder>
       <Folder Id="601e2b13-12f1-483b-9d9d-77ff167aea7a" Name="1. 绝境战" Enabled="true">
         <Folders>
-          <Folder Id="11d54204-b1b7-454a-884d-c768ee9d9cb0" Name="1. 亚历山大绝境战 2024.01.13" Enabled="true">
+          <Folder Id="11d54204-b1b7-454a-884d-c768ee9d9cb0" Name="1. 亚历山大绝境战 2024.01.14" Enabled="true">
             <Folders>
               <Folder FFXIVZoneFilterEnabled="True" FfxivZoneFilterRegularExpression="^887$" Id="1b5beb16-1ff0-4230-92cc-3cf8dc051b06" Name="P1" Enabled="true">
                 <Folders>
@@ -219,7 +219,7 @@
                       </Trigger>
                     </Triggers>
                   </Folder>
-                  <Folder Id="c47884b4-c200-45ac-b180-5bf1d8ea79b9" Name="5. 万变水波站位指引" Enabled="true">
+                  <Folder Id="c47884b4-c200-45ac-b180-5bf1d8ea79b9" Name="5. 万变水波 站位指引" Enabled="true">
                     <Folders>
                       <Folder Id="cd971a52-d726-49bd-a937-9910e063a5c4" Name="第2次万变水波" Enabled="true">
                         <Folders />
@@ -2666,7 +2666,7 @@
                           <Action OrderNumber="3" ActionType="Placeholder" Description="还不够" DescriptionOverride="True">
                             <Condition Enabled="false" Grouping="Or" />
                           </Action>
-                          <Action OrderNumber="4" JsonEndpointExpression="http://127.0.0.1:47774/?namespace=xiaoguaib&amp;destroyAt=15000,COMBAT_EXIT,TERRITORY_CHANGE" JsonPayloadExpression="{&quot;Name&quot;:&quot;还不够&quot;,&quot;type&quot;:1,&quot;radius&quot;:0.8,&quot;color&quot;:4294907904,&quot;overlayBGColor&quot;:4278190080,&quot;overlayTextColor&quot;:4278253567,&quot;thicc&quot;:4.0,&quot;overlayText&quot;:&quot;${numeric:round((${currentHp}/43540)*100,2)}% &quot;,&quot;refActorObjectID&quot;:${numeric:hex2dec(${id})},&quot;refActorComparisonType&quot;:2,&quot;includeRotation&quot;:true,&quot;onlyTargetable&quot;:true,&quot;onlyVisible&quot;:true}" ActionType="GenericJson">
+                          <Action OrderNumber="4" JsonEndpointExpression="http://127.0.0.1:47774/?namespace=xiaoguaib&amp;destroyAt=15000,COMBAT_EXIT,TERRITORY_CHANGE" JsonPayloadExpression="{&quot;Name&quot;:&quot;还不够&quot;,&quot;type&quot;:1,&quot;radius&quot;:0.8,&quot;color&quot;:4294907904,&quot;overlayBGColor&quot;:4278190080,&quot;overlayTextColor&quot;:4278253567,&quot;thicc&quot;:4.0,&quot;overlayText&quot;:&quot;${numeric:round((${currentHp}/43540)*100,2)}%  △&quot;,&quot;refActorObjectID&quot;:${numeric:hex2dec(${id})},&quot;refActorComparisonType&quot;:2,&quot;includeRotation&quot;:true,&quot;onlyTargetable&quot;:true,&quot;onlyVisible&quot;:true}" ActionType="GenericJson">
                             <Condition Enabled="true" Grouping="And">
                               <ConditionSingle Enabled="true" ExpressionL="${currentHp}/43540" ExpressionTypeL="Numeric" ExpressionR="0.25" ExpressionTypeR="Numeric" ConditionType="NumericGreaterEqual" />
                             </Condition>
@@ -2674,7 +2674,7 @@
                           <Action OrderNumber="5" ActionType="Placeholder" Description="够了" DescriptionOverride="True">
                             <Condition Enabled="false" Grouping="Or" />
                           </Action>
-                          <Action OrderNumber="6" JsonEndpointExpression="http://127.0.0.1:47774/?namespace=xiaoguaib&amp;destroyAt=15000,COMBAT_EXIT,TERRITORY_CHANGE" JsonPayloadExpression="{&quot;Name&quot;:&quot;够了&quot;,&quot;type&quot;:1,&quot;radius&quot;:0.8,&quot;color&quot;:4294907904,&quot;overlayBGColor&quot;:4294901775,&quot;overlayTextColor&quot;:4294967295,&quot;overlayPlaceholders&quot;:true,&quot;thicc&quot;:4.0,&quot;overlayText&quot;:&quot;${numeric:round((${currentHp}/43540)*100,2)}% 喂掉&quot;,&quot;refActorObjectID&quot;:${numeric:hex2dec(${id})},&quot;refActorComparisonType&quot;:2,&quot;includeRotation&quot;:true,&quot;onlyTargetable&quot;:true,&quot;onlyVisible&quot;:true}" ActionType="GenericJson">
+                          <Action OrderNumber="6" JsonEndpointExpression="http://127.0.0.1:47774/?namespace=xiaoguaib&amp;destroyAt=15000,COMBAT_EXIT,TERRITORY_CHANGE" JsonPayloadExpression="{&quot;Name&quot;:&quot;够了&quot;,&quot;type&quot;:1,&quot;radius&quot;:0.8,&quot;color&quot;:4294907904,&quot;overlayBGColor&quot;:4294901775,&quot;overlayTextColor&quot;:4294967295,&quot;overlayPlaceholders&quot;:true,&quot;thicc&quot;:4.0,&quot;overlayText&quot;:&quot;${numeric:round((${currentHp}/43540)*100,2)}% 喂掉 △&quot;,&quot;refActorObjectID&quot;:${numeric:hex2dec(${id})},&quot;refActorComparisonType&quot;:2,&quot;includeRotation&quot;:true,&quot;onlyTargetable&quot;:true,&quot;onlyVisible&quot;:true}" ActionType="GenericJson">
                             <Condition Enabled="true" Grouping="And">
                               <ConditionSingle Enabled="true" ExpressionL="${currentHp}/43540" ExpressionTypeL="Numeric" ExpressionR="0.25" ExpressionTypeR="Numeric" ConditionType="NumericLess" />
                             </Condition>
@@ -2722,7 +2722,6 @@
                       <Trigger Enabled="true" Name="※ 共用同一组变量，没防呆设计，一起勾选等爆炸吧" Id="8fcc7dff-8305-45f1-8745-c386c5b64924" RegularExpression="">
                         <Actions />
                         <Condition Enabled="false" Grouping="Or" />
-                        <Conditions />
                       </Trigger>
                     </Triggers>
                   </Folder>
@@ -2738,7 +2737,6 @@
                               </Action>
                             </Actions>
                             <Condition Enabled="false" Grouping="Or" />
-                            <Conditions />
                           </Trigger>
                           <Trigger Enabled="true" Sequential="True" Name="4. 重置" Id="9ad5909d-2cba-4c1e-b5d2-b471e435c537" RegularExpression="">
                             <Actions>
@@ -2756,7 +2754,6 @@
                               </Action>
                             </Actions>
                             <Condition Enabled="false" Grouping="Or" />
-                            <Conditions />
                           </Trigger>
                           <Trigger Enabled="true" Name="2.3 血线预览(不够)" Id="acb11e1e-ee62-4b3a-bb01-69d659771951" RegularExpression="">
                             <Actions>
@@ -2766,7 +2763,6 @@
                               <Action OrderNumber="4" LogMessageText="[22:38:54.483] EffectResult 25:4000363D:狩猎人偶:00000209:40154::::::93.53:102.68:0.00:0.00" LogProcess="True" ActionType="LogMessage" ExecutionDelayExpression="0.3 * 1000" />
                             </Actions>
                             <Condition Enabled="false" Grouping="Or" />
-                            <Conditions />
                           </Trigger>
                           <Trigger Enabled="true" Name="2.4 血线预览(够了)" Id="178d4ee4-aa87-4447-8806-30c06c824c85" RegularExpression="">
                             <Actions>
@@ -2775,7 +2771,6 @@
                               <Action OrderNumber="3" LogMessageText="[22:39:03.570] EffectResult 25:4000363F:狩猎人偶:0000025F:6975::::::108.96:101.06:0.00:0.30" LogProcess="True" ActionType="LogMessage" ExecutionDelayExpression="0.2 * 1000" />
                             </Actions>
                             <Condition Enabled="false" Grouping="Or" />
-                            <Conditions />
                           </Trigger>
                           <Trigger Enabled="true" Name="1. 小怪连线喵" Id="769a736f-427f-4963-80e9-2244bd09bf5d" RegularExpression="">
                             <Actions>
@@ -2784,7 +2779,6 @@
                               </Action>
                             </Actions>
                             <Condition Enabled="false" Grouping="Or" />
-                            <Conditions />
                           </Trigger>
                           <Trigger Enabled="true" Name="5. 全程预览" Id="e584ada7-e13b-41cf-8737-a1961eeed3a9" RegularExpression="">
                             <Actions>
@@ -2823,12 +2817,10 @@
                               <Action OrderNumber="33" LogMessageText="[22:39:04.995] EffectResult 25:4000363C:狩猎人偶:00000267:9785::::::101.18:91.72:0.00:0.63" LogProcess="True" ActionType="LogMessage" ExecutionDelayExpression="1.4 * 1000" />
                             </Actions>
                             <Condition Enabled="false" Grouping="Or" />
-                            <Conditions />
                           </Trigger>
                           <Trigger Enabled="true" Name="- 血量低于10885即低于25%可以喂掉了" Id="01bc0a3d-e6b3-429d-9579-6898fe0a7b91" RegularExpression="">
                             <Actions />
                             <Condition Enabled="false" Grouping="Or" />
-                            <Conditions />
                           </Trigger>
                         </Triggers>
                       </Folder>
@@ -2842,7 +2834,6 @@
                               </Action>
                             </Actions>
                             <Condition Enabled="false" Grouping="Or" />
-                            <Conditions />
                           </Trigger>
                           <Trigger Enabled="true" Name="2. 团灭重置" Id="3eeab78f-a7d4-4116-b87a-46db7c990640" RegularExpression="^.{14} (?:\w+ )21:.{8}:400000(03|1[026]|05)">
                             <Actions>
@@ -2860,7 +2851,6 @@
                               </Action>
                             </Actions>
                             <Condition Enabled="false" Grouping="Or" />
-                            <Conditions />
                           </Trigger>
                           <Trigger Enabled="true" Name="3. 倒计时重置" Id="0185c1b1-39f9-498c-97ca-19abf4716b55" RegularExpression="^.{14} (?:\w+ )00:0039::(戦闘開始！|Engage!|战斗开始！|戰鬥開始！)">
                             <Actions>
@@ -2878,7 +2868,6 @@
                               </Action>
                             </Actions>
                             <Condition Enabled="false" Grouping="Or" />
-                            <Conditions />
                           </Trigger>
                         </Triggers>
                       </Folder>
@@ -2943,7 +2932,6 @@
                           </Action>
                         </Actions>
                         <Condition Enabled="false" Grouping="And" />
-                        <Conditions />
                       </Trigger>
                       <Trigger Enabled="true" Sequential="True" Name="1. 建立连线" Id="467d8e4f-afb3-4713-8f7d-767ee47dd08e" RegularExpression="^.{14} Tether 23:(?&lt;sid&gt;[^:]*):(狩猎人偶|ヤークトドール|jagd doll):(?&lt;tid&gt;.*?):(?&lt;tname&gt;[^:]*)(?::[^:]*){2}:0011(?:$|:)">
                         <Actions>
@@ -2969,17 +2957,14 @@
                         <Condition Enabled="true" Grouping="And">
                           <ConditionSingle Enabled="true" ExpressionL="${tid}" ExpressionTypeL="String" ExpressionR="${_ffxivparty[1].id}" ExpressionTypeR="String" ConditionType="StringEqualNocase" />
                         </Condition>
-                        <Conditions />
                       </Trigger>
                       <Trigger Enabled="true" Name="※ 共用同一组变量，没防呆设计，一起勾选等爆炸吧" Id="f4c141bb-3918-4cb4-8c06-06165516ecd0" RegularExpression="">
                         <Actions />
                         <Condition Enabled="false" Grouping="Or" />
-                        <Conditions />
                       </Trigger>
                       <Trigger Enabled="true" Name="※ 连线自己的小怪多个 △" Id="df07a239-bd4f-4114-8e86-8da9ab45469f" RegularExpression="">
                         <Actions />
                         <Condition Enabled="false" Grouping="Or" />
-                        <Conditions />
                       </Trigger>
                     </Triggers>
                   </Folder>
@@ -3152,7 +3137,7 @@
                       </Trigger>
                     </Triggers>
                   </Folder>
-                  <Folder Id="946dad95-5fd7-4ab6-86b1-76e68b535a15" Name="3. 隐形地雷散布(第1个踩雷的人踩2次销毁)" Enabled="true">
+                  <Folder Id="946dad95-5fd7-4ab6-86b1-76e68b535a15" Name="3. 隐形地雷散布 (第1个踩雷的人踩2次销毁)" Enabled="true">
                     <Folders>
                       <Folder Id="2c05ab22-d7a1-4273-a10a-4a2e973180b8" Name="排序解法 随机伤害源……找不到规律，不搞了，消不掉的时间到了自动销毁，踩雷能消但有1/2的概率反向消雷" Enabled="false">
                         <Folders />
@@ -3564,7 +3549,7 @@
                       </Trigger>
                     </Triggers>
                   </Folder>
-                  <Folder Id="55e512db-bbe7-4e98-a2a5-d474da490e59" Name="9. 3传毒/终审指引 废案" Enabled="false">
+                  <Folder Id="55e512db-bbe7-4e98-a2a5-d474da490e59" Name="9. 3传毒/终审指引 废案【请勿启用】" Enabled="false">
                     <Folders>
                       <Folder Id="7621513a-4005-4f58-a13c-8c1ecf12d162" Name="9. 3传毒/终审指引 (晕了)" Enabled="false">
                         <Folders />
@@ -3656,7 +3641,6 @@
                               </Action>
                             </Actions>
                             <Condition Enabled="false" Grouping="Or" />
-                            <Conditions />
                           </Trigger>
                           <Trigger Enabled="true" Name="3. 记录疫苗" Id="b2cb3ee6-501c-433f-b151-1fe69b975982" RegularExpression="^.{14} StatusAdd 1A:(?&lt;eid&gt;[^:]*):终审：判决(?&lt;buff&gt;.+?):(?&lt;duration&gt;[^:]*):(?&lt;sid&gt;[^:]*):(?&lt;sname&gt;[^:]*):(?&lt;tid&gt;[^:]*):(?&lt;tname&gt;[^:]*):(?&lt;count&gt;[^:]*):(?&lt;targetMaxHp&gt;[^:]*):(?&lt;sourceMaxHp&gt;[^:]*)(?:$|:)">
                             <Actions>
@@ -3722,7 +3706,6 @@
                               </Action>
                             </Actions>
                             <Condition Enabled="false" Grouping="Or" />
-                            <Conditions />
                           </Trigger>
                           <Trigger Enabled="true" Sequential="True" Name="4. 打盾传毒指引" Id="a117c700-182c-44aa-a8cc-6e8356380401" RegularExpression="^.{14} (?:\w+) (15|16):(?&lt;sid&gt;[^:]*):(?&lt;sname&gt;[^:]*):4833:(?&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="2000">
                             <Actions>
@@ -4057,7 +4040,6 @@
                               </Action>
                             </Actions>
                             <Condition Enabled="false" Grouping="Or" />
-                            <Conditions />
                           </Trigger>
                           <Trigger Enabled="true" Sequential="True" Name="5. 终审排队指引" Id="109466cd-1157-4096-bf14-dadbd63f7e7c" RegularExpression="^.{14} (?:\w+ )04:(?&lt;sid&gt;40[0-9A-Fa-f]{6}):(等离子护盾|plasma shield|プラズマシールド)" PeriodRefire="Deny" RefirePeriodExpression="2000">
                             <Actions>
@@ -4176,7 +4158,6 @@
                               </Action>
                             </Actions>
                             <Condition Enabled="false" Grouping="Or" />
-                            <Conditions />
                           </Trigger>
                           <Trigger Enabled="true" Sequential="True" Name="6. 3传毒后清理" Id="c08b5ab5-cf68-4f4d-88fc-0899edda1a18" RegularExpression="^.{14} StatusAdd 1A:(?&lt;eid&gt;(8AE|8AF|85A|859)):最终判决(?&lt;buff&gt;.+?):(?&lt;duration&gt;[^:]*):(?&lt;sid&gt;[^:]*):(?&lt;sname&gt;[^:]*):(?&lt;tid&gt;[^:]*):(?&lt;tname&gt;[^:]*):(?&lt;count&gt;[^:]*):(?&lt;targetMaxHp&gt;[^:]*):(?&lt;sourceMaxHp&gt;[^:]*)(?:$|:)">
                             <Actions>
@@ -4409,7 +4390,6 @@
                             <Condition Enabled="true" Grouping="Or">
                               <ConditionSingle Enabled="true" ExpressionL="${var:绝亚_P2_3传毒_Clone}" ExpressionTypeL="String" ExpressionR="1" ExpressionTypeR="String" ConditionType="StringEqualNocase" />
                             </Condition>
-                            <Conditions />
                           </Trigger>
                           <Trigger Enabled="true" Name="8. 终审闭庭清理" Id="03ab3f7b-6038-4e75-9606-22d5038b51b3" RegularExpression="^.{14} (?:\w+) (15|16):(?&lt;sid&gt;[^:]*):(?&lt;sname&gt;[^:]*):483C:(?&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="3000">
                             <Actions>
@@ -4421,7 +4401,6 @@
                               </Action>
                             </Actions>
                             <Condition Enabled="false" Grouping="Or" />
-                            <Conditions />
                           </Trigger>
                           <Trigger Enabled="true" Sequential="True" Name="7. 水雷分摊清理3传毒" Id="c5682cef-e191-43b4-8492-2a6e4e6ae1ff" RegularExpression="^.{14} (?:\w+) (15|16):(?&lt;sid&gt;[^:]*):(?&lt;sname&gt;[^:]*):(4840|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="3000">
                             <Actions>
@@ -4430,7 +4409,6 @@
                               </Action>
                             </Actions>
                             <Condition Enabled="false" Grouping="Or" />
-                            <Conditions />
                           </Trigger>
                         </Triggers>
                       </Folder>
@@ -7477,7 +7455,7 @@
                         <Folders>
                           <Folder Id="b299237d-0113-47a7-8fd3-f580be9c24b2" Name="1.5前半" Enabled="true">
                             <Folders>
-                              <Folder Id="2c78a73b-73cb-42e4-87ed-1b2ef67d8334" Name="错误记录组" Enabled="false">
+                              <Folder Id="2c78a73b-73cb-42e4-87ed-1b2ef67d8334" Name="错误记录组" Enabled="true">
                                 <Folders />
                                 <Triggers>
                                   <Trigger Enabled="true" Name="错误Buff记录" Id="10cc93fd-7257-4954-9392-220492a50fad" RegularExpression="^.{14} StatusAdd 1A:46(?&lt;type&gt;(1|3|4)):(?&lt;effect&gt;(?:[^:]|: )*?):(?&lt;duration&gt;[^:]*):(?&lt;sid&gt;[^:]*):(?&lt;sname&gt;[^:]*):(?&lt;tid&gt;[^:]*):(?&lt;tname&gt;[^:]*):(?&lt;count&gt;[^:]*):(?&lt;targetMaxHp&gt;[^:]*):(?&lt;sourceMaxHp&gt;[^:]*)(?:$|:)">
@@ -7600,7 +7578,7 @@
                                 </Actions>
                                 <Condition Enabled="false" Grouping="Or" />
                               </Trigger>
-                              <Trigger Enabled="false" Sequential="True" Name="自身Buff获取2" Id="78367b0c-cde9-4608-adf5-221c19f832b8" RegularExpression="^.{14} StatusAdd 1A:46(?&lt;type&gt;(1|2|3|4)):(?&lt;effect&gt;(?:[^:]|: )*?):(?&lt;duration&gt;[^:]*):(?&lt;sid&gt;[^:]*):(?&lt;sname&gt;[^:]*):(?&lt;tid&gt;[^:]*):(?&lt;tname&gt;[^:]*):(?&lt;count&gt;[^:]*):(?&lt;targetMaxHp&gt;[^:]*):(?&lt;sourceMaxHp&gt;[^:]*)(?:$|:)" PeriodRefire="Deny" RefirePeriodExpression="30000">
+                              <Trigger Enabled="true" Sequential="True" Name="自身Buff获取2" Id="78367b0c-cde9-4608-adf5-221c19f832b8" RegularExpression="^.{14} StatusAdd 1A:46(?&lt;type&gt;(1|2|3|4)):(?&lt;effect&gt;(?:[^:]|: )*?):(?&lt;duration&gt;[^:]*):(?&lt;sid&gt;[^:]*):(?&lt;sname&gt;[^:]*):(?&lt;tid&gt;[^:]*):(?&lt;tname&gt;[^:]*):(?&lt;count&gt;[^:]*):(?&lt;targetMaxHp&gt;[^:]*):(?&lt;sourceMaxHp&gt;[^:]*)(?:$|:)" PeriodRefire="Deny" RefirePeriodExpression="30000">
                                 <Actions>
                                   <Action OrderNumber="1" ActionType="LogMessage">
                                     <Condition Enabled="false" Grouping="Or" />
@@ -7643,7 +7621,7 @@
                                 </Actions>
                                 <Condition Enabled="false" Grouping="Or" />
                               </Trigger>
-                              <Trigger Enabled="false" Sequential="True" Name="自身Buff获取" Id="b8f14c0e-fcae-4965-abc0-1264dc6b7c56" RegularExpression="^.{14} StatusAdd 1A:46(?&lt;type&gt;(1|2|3|4)):(?&lt;effect&gt;(?:[^:]|: )*?):(?&lt;duration&gt;[^:]*):(?&lt;sid&gt;[^:]*):(?&lt;sname&gt;[^:]*):(?&lt;tid&gt;[^:]*):(?&lt;tname&gt;[^:]*):(?&lt;count&gt;[^:]*):(?&lt;targetMaxHp&gt;[^:]*):(?&lt;sourceMaxHp&gt;[^:]*)(?:$|:)" PeriodRefire="Deny" RefirePeriodExpression="30000">
+                              <Trigger Enabled="true" Sequential="True" Name="自身Buff获取" Id="b8f14c0e-fcae-4965-abc0-1264dc6b7c56" RegularExpression="^.{14} StatusAdd 1A:46(?&lt;type&gt;(1|2|3|4)):(?&lt;effect&gt;(?:[^:]|: )*?):(?&lt;duration&gt;[^:]*):(?&lt;sid&gt;[^:]*):(?&lt;sname&gt;[^:]*):(?&lt;tid&gt;[^:]*):(?&lt;tname&gt;[^:]*):(?&lt;count&gt;[^:]*):(?&lt;targetMaxHp&gt;[^:]*):(?&lt;sourceMaxHp&gt;[^:]*)(?:$|:)" PeriodRefire="Deny" RefirePeriodExpression="30000">
                                 <Actions>
                                   <Action OrderNumber="1" TriggerOp="CancelTrigger" TriggerId="78367b0c-cde9-4608-adf5-221c19f832b8" ActionType="Trigger">
                                     <Condition Enabled="false" Grouping="Or" />
@@ -11537,13 +11515,13 @@
                                   </Action>
                                   <Action OrderNumber="24" JsonEndpointExpression="http://127.0.0.1:47774/?namespace=go&amp;destroyAt=8000,COMBAT_EXIT,TERRITORY_CHANGE" JsonPayloadExpression="{&quot;Name&quot;:&quot;2 0&quot;,&quot;refX&quot;:110.25288,&quot;refY&quot;:109.159454,&quot;refZ&quot;:3.8146973E-06,&quot;radius&quot;:0.5,&quot;color&quot;:4294967295,&quot;overlayBGColor&quot;:4278190080,&quot;overlayTextColor&quot;:4294967295,&quot;thicc&quot;:3.0,&quot;overlayText&quot;:&quot;5&quot;,&quot;tether&quot;:true}" ActionType="GenericJson">
                                     <Condition Enabled="true" Grouping="And">
-                                      <ConditionSingle Enabled="true" ExpressionL="${time}" ExpressionTypeL="String" ExpressionR="3" ExpressionTypeR="String" ConditionType="StringEqualNocase" />
+                                      <ConditionSingle Enabled="true" ExpressionL="${time}" ExpressionTypeL="String" ExpressionR="7" ExpressionTypeR="String" ConditionType="StringEqualNocase" />
                                       <ConditionSingle Enabled="true" ExpressionL="${var:绝亚_1.5麻将_序号_Clone}" ExpressionTypeL="String" ExpressionR="5" ExpressionTypeR="String" ConditionType="StringEqualNocase" />
                                     </Condition>
                                   </Action>
                                   <Action OrderNumber="25" 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;:110.25288,&quot;refY&quot;:109.159454,&quot;refZ&quot;:3.8146973E-06,&quot;radius&quot;:0.5,&quot;color&quot;:4294911232,&quot;thicc&quot;:6.0,&quot;tether&quot;:true}" ActionType="GenericJson">
                                     <Condition Enabled="true" Grouping="And">
-                                      <ConditionSingle Enabled="true" ExpressionL="${time}" ExpressionTypeL="String" ExpressionR="3" ExpressionTypeR="String" ConditionType="StringEqualNocase" />
+                                      <ConditionSingle Enabled="true" ExpressionL="${time}" ExpressionTypeL="String" ExpressionR="7" ExpressionTypeR="String" ConditionType="StringEqualNocase" />
                                       <ConditionSingle Enabled="true" ExpressionL="${var:绝亚_1.5麻将_序号_Clone}" ExpressionTypeL="String" ExpressionR="5" ExpressionTypeR="String" ConditionType="StringEqualNocase" />
                                     </Condition>
                                   </Action>
@@ -12095,7 +12073,7 @@
                               <ConditionSingle Enabled="true" ExpressionL="${tid}" ExpressionTypeL="String" ExpressionR="${_ffxivparty[1].id}" ExpressionTypeR="String" ConditionType="StringEqualNocase" />
                             </Condition>
                           </Trigger>
-                          <Trigger Enabled="false" Sequential="True" Name="2. 记录地火一炸位置 [别动,此触发通过其他触发进行开关]" Id="11abd2e9-cdea-477a-b02a-fdc641334e84" RegularExpression="^.{14} 264 108:(?&lt;sid&gt;[^:]*):4830:(?&lt;globalEffectCounter&gt;[^:]*):(?&lt;dataFlag&gt;[^:]*):(?&lt;x&gt;[^:]*):(?&lt;y&gt;[^:]*):(?&lt;z&gt;[^:]*)(?:$|:)" PeriodRefire="Deny" RefirePeriodExpression="3000">
+                          <Trigger Enabled="true" Sequential="True" Name="2. 记录地火一炸位置 [别动,此触发通过其他触发进行开关]" Id="11abd2e9-cdea-477a-b02a-fdc641334e84" RegularExpression="^.{14} 264 108:(?&lt;sid&gt;[^:]*):4830:(?&lt;globalEffectCounter&gt;[^:]*):(?&lt;dataFlag&gt;[^:]*):(?&lt;x&gt;[^:]*):(?&lt;y&gt;[^:]*):(?&lt;z&gt;[^:]*)(?:$|:)" PeriodRefire="Deny" RefirePeriodExpression="3000">
                             <Actions>
                               <Action OrderNumber="1" ActionType="Placeholder" Description="1， 5" DescriptionOverride="True">
                                 <Condition Enabled="false" Grouping="Or" />
@@ -12510,6 +12488,30 @@
                             </Actions>
                             <Condition Enabled="false" Grouping="Or" />
                           </Trigger>
+                          <Trigger Enabled="false" Name="Debug Log 新版 37" Id="929cf8f7-49db-480c-ad2e-48110bfc3742" RegularExpression="">
+                            <Actions>
+                              <Action OrderNumber="1" LogMessageText="[23:51:55.749] ActionEffect 15:4000D6F9:活水之怒:4830:鹰式破坏炮:E0000000::0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:::::::::::44:44:0:10000:::100.00:85.00:0.00:-0.53:000051FE:0:0" LogProcess="True" ActionType="LogMessage" ExecutionDelayExpression="0.0 * 1000" />
+                              <Action OrderNumber="2" LogMessageText="[23:51:55.749] ActionEffect 15:4000D6FA:活水之怒:4830:鹰式破坏炮:E0000000::0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:::::::::::44:44:0:10000:::100.00:115.00:0.00:2.38:000051FF:0:0" LogProcess="True" ActionType="LogMessage" ExecutionDelayExpression="0.0 * 1000" />
+                              <Action OrderNumber="3" LogMessageText="[23:51:57.989] ActionEffect 15:4000D6F9:巡航驱逐者:4830:鹰式破坏炮:E0000000::0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:::::::::::44:44:0:10000:::100.00:85.00:0.00:-0.53:00005204:0:0" LogProcess="True" ActionType="LogMessage" ExecutionDelayExpression="2.2 * 1000" />
+                              <Action OrderNumber="4" LogMessageText="[23:51:57.989] ActionEffect 15:4000D6FA:巡航驱逐者:4830:鹰式破坏炮:E0000000::0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:::::::::::44:44:0:10000:::100.00:115.00:0.00:2.38:00005205:0:0" LogProcess="True" ActionType="LogMessage" ExecutionDelayExpression="0.0 * 1000" />
+                              <Action OrderNumber="5" LogMessageText="[23:52:00.183] ActionEffect 15:4000D6F9:巡航驱逐者:4830:鹰式破坏炮:E0000000::0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:::::::::::44:44:0:10000:::100.00:85.00:0.00:-0.53:00005206:0:0" LogProcess="True" ActionType="LogMessage" ExecutionDelayExpression="2.2 * 1000" />
+                              <Action OrderNumber="6" LogMessageText="[23:52:00.183] ActionEffect 15:4000D6FA:巡航驱逐者:4830:鹰式破坏炮:E0000000::0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:::::::::::44:44:0:10000:::100.00:115.00:0.00:2.38:00005207:0:0" LogProcess="True" ActionType="LogMessage" ExecutionDelayExpression="0.0 * 1000" />
+                              <Action OrderNumber="7" LogMessageText="[23:52:02.374] ActionEffect 15:4000D6F9:巡航驱逐者:4830:鹰式破坏炮:E0000000::0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:::::::::::44:44:0:10000:::100.00:85.00:0.00:-0.53:00005208:0:0" LogProcess="True" ActionType="LogMessage" ExecutionDelayExpression="2.2 * 1000" />
+                              <Action OrderNumber="8" LogMessageText="[23:52:02.374] ActionEffect 15:4000D6FA:巡航驱逐者:4830:鹰式破坏炮:E0000000::0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:::::::::::44:44:0:10000:::100.00:115.00:0.00:2.38:00005209:0:0" LogProcess="True" ActionType="LogMessage" ExecutionDelayExpression="0.0 * 1000" />
+                              <Action OrderNumber="9" LogMessageText="[23:52:04.569] ActionEffect 15:4000D6FA:巡航驱逐者:4830:鹰式破坏炮:E0000000::0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:::::::::::44:44:0:10000:::100.00:115.00:0.00:2.38:0000520F:0:0" LogProcess="True" ActionType="LogMessage" ExecutionDelayExpression="2.2 * 1000" />
+                              <Action OrderNumber="10" LogMessageText="[23:52:06.765] ActionEffect 15:4000D6F9:巡航驱逐者:4830:鹰式破坏炮:E0000000::0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:::::::::::44:44:0:10000:::100.00:85.00:0.00:-0.53:00005212:0:0" LogProcess="True" ActionType="LogMessage" ExecutionDelayExpression="2.2 * 1000" />
+                              <Action OrderNumber="11" LogMessageText="[23:52:06.765] ActionEffect 15:4000D6FA:巡航驱逐者:4830:鹰式破坏炮:E0000000::0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:::::::::::44:44:0:10000:::100.00:115.00:0.00:2.38:00005213:0:0" LogProcess="True" ActionType="LogMessage" ExecutionDelayExpression="0.0 * 1000" />
+                              <Action OrderNumber="12" LogMessageText="[23:52:08.958] ActionEffect 15:4000D6F9:巡航驱逐者:4830:鹰式破坏炮:E0000000::0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:::::::::::44:44:0:10000:::100.00:85.00:0.00:-0.53:0000521A:0:0" LogProcess="True" ActionType="LogMessage" ExecutionDelayExpression="2.2 * 1000" />
+                              <Action OrderNumber="13" LogMessageText="[23:52:08.958] ActionEffect 15:4000D6FA:巡航驱逐者:4830:鹰式破坏炮:E0000000::0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:::::::::::44:44:0:10000:::100.00:115.00:0.00:2.38:0000521B:0:0" LogProcess="True" ActionType="LogMessage" ExecutionDelayExpression="0.0 * 1000" />
+                              <Action OrderNumber="14" LogMessageText="[23:52:11.151] ActionEffect 15:4000D6F9:巡航驱逐者:4830:鹰式破坏炮:E0000000::0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:::::::::::44:44:0:10000:::100.00:85.00:0.00:-0.53:00005221:0:0" LogProcess="True" ActionType="LogMessage" ExecutionDelayExpression="2.2 * 1000" />
+                              <Action OrderNumber="15" LogMessageText="[23:52:11.151] ActionEffect 15:4000D6FA:巡航驱逐者:4830:鹰式破坏炮:E0000000::0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:::::::::::44:44:0:10000:::100.00:115.00:0.00:2.38:00005222:0:0" LogProcess="True" ActionType="LogMessage" ExecutionDelayExpression="0.0 * 1000" />
+                              <Action OrderNumber="16" LogMessageText="[23:52:13.389] ActionEffect 15:4000D6F9:巡航驱逐者:4830:鹰式破坏炮:E0000000::0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:::::::::::44:44:0:10000:::100.00:85.00:0.00:-0.53:00005225:0:0" LogProcess="True" ActionType="LogMessage" ExecutionDelayExpression="2.2 * 1000" />
+                              <Action OrderNumber="17" LogMessageText="[23:52:13.389] ActionEffect 15:4000D6FA:巡航驱逐者:4830:鹰式破坏炮:E0000000::0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:::::::::::44:44:0:10000:::100.00:115.00:0.00:2.38:00005226:0:0" LogProcess="True" ActionType="LogMessage" ExecutionDelayExpression="0.0 * 1000" />
+                              <Action OrderNumber="18" LogMessageText="[23:52:15.582] ActionEffect 15:4000D6FA:巡航驱逐者:4830:鹰式破坏炮:E0000000::0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:0:::::::::::44:44:0:10000:::100.00:115.00:0.00:2.38:0000522D:0:0" LogProcess="True" ActionType="LogMessage" ExecutionDelayExpression="2.2 * 1000" />
+                            </Actions>
+                            <Condition Enabled="false" Grouping="Or" />
+                            <Conditions />
+                          </Trigger>
                         </Triggers>
                       </Folder>
                     </Folders>
@@ -12562,7 +12564,7 @@
                 <Actions />
                 <Condition Enabled="false" Grouping="Or" />
               </Trigger>
-              <Trigger Enabled="true" Name="修改日期：2024-01-13 开摆！添加了小怪血量显示与提醒[有可选项]与其他杂项功能，这是一个测试版，可能会有很多不可预料的错误发生。" Id="50c0b933-46be-456c-87bb-3d35433a8d94" RegularExpression="">
+              <Trigger Enabled="true" Name="修改日期：2024-01-14 添加P1小怪血量监控，修复了1.5麻将触发器地火类型37点名为5时的指引错误，P2踩地雷更改为计数销毁" Id="50c0b933-46be-456c-87bb-3d35433a8d94" RegularExpression="">
                 <Actions />
                 <Condition Enabled="false" Grouping="Or" />
               </Trigger>