From a9a083ec791e20a1c03147e15915d7c3e6675da6 Mon Sep 17 00:00:00 2001
From: Roshin <123588653+RedAsteroid@users.noreply.github.com>
Date: Fri, 15 Sep 2023 00:08:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Test/Testtriggers_pure.xml | 98 +++++++++++++++++++++++++++++---------
 1 file changed, 76 insertions(+), 22 deletions(-)

diff --git a/Test/Testtriggers_pure.xml b/Test/Testtriggers_pure.xml
index c1ecec4..675ed9c 100644
--- a/Test/Testtriggers_pure.xml
+++ b/Test/Testtriggers_pure.xml
@@ -149,7 +149,7 @@
       </Folder>
       <Folder Id="12a76ec2-3665-4100-b28d-8d6299065bbe" Name="1. 绝境战" Enabled="true">
         <Folders>
-          <Folder Id="8d5f2375-15cb-4fd0-9ef2-94a365e7e2e3" Name="1.1 亚历山大绝境战 2023.08.20 [施工中,但仍然能用] 二选一" Enabled="true">
+          <Folder Id="8d5f2375-15cb-4fd0-9ef2-94a365e7e2e3" Name="1. 亚历山大绝境战 2023.08.20" Enabled="true">
             <Folders>
               <Folder FFXIVZoneFilterEnabled="True" FfxivZoneFilterRegularExpression="^887$" Id="caa11b00-8f49-45d0-a189-ddd2e1007856" Name="P1" Enabled="true">
                 <Folders>
@@ -881,7 +881,6 @@
                             <Condition Enabled="true" Grouping="Or">
                               <ConditionSingle Enabled="true" ExpressionL="${var:倾泻_Clone}" ExpressionTypeL="Numeric" ExpressionR="2" ExpressionTypeR="Numeric" ConditionType="StringEqualNocase" />
                             </Condition>
-                            <Conditions />
                           </Trigger>
                         </Triggers>
                       </Folder>
@@ -1450,7 +1449,6 @@
                             <Condition Enabled="true" Grouping="Or">
                               <ConditionSingle Enabled="true" ExpressionL="${var:倾泻_Clone}" ExpressionTypeL="Numeric" ExpressionR="1" ExpressionTypeR="Numeric" ConditionType="StringEqualNocase" />
                             </Condition>
-                            <Conditions />
                           </Trigger>
                         </Triggers>
                       </Folder>
@@ -2564,7 +2562,7 @@
                           <Action OrderNumber="2" VariableOp="SetNumeric" VariableName="liquidtid_${id}" VariableExpression="hex2dec(${tid})" ActionType="Variable">
                             <Condition Enabled="false" Grouping="Or" />
                           </Action>
-                          <Action OrderNumber="3" JsonEndpointExpression="http://127.0.0.1:47774/?namespace=liquidline${id}&amp;destroyAt=11000" JsonPayloadExpression="{&quot;Name&quot;:&quot;排水&quot;,&quot;type&quot;:1,&quot;radius&quot;:6.0,&quot;color&quot;:4294914560,&quot;overlayBGColor&quot;:4278190080,&quot;overlayTextColor&quot;:4278255590,&quot;thicc&quot;:3.0,&quot;overlayText&quot;:&quot;死刑&quot;,&quot;refActorObjectID&quot;:${var:liquidtid_${id}},&quot;refActorComparisonType&quot;:2,&quot;includeRotation&quot;:true}" ActionType="GenericJson">
+                          <Action OrderNumber="3" JsonEndpointExpression="http://127.0.0.1:47774/?namespace=liquidline${id}&amp;destroyAt=11000" JsonPayloadExpression="{&quot;Name&quot;:&quot;排水&quot;,&quot;type&quot;:1,&quot;radius&quot;:6.0,&quot;color&quot;:4294914560,&quot;overlayBGColor&quot;:4278190080,&quot;overlayTextColor&quot;:4278255590,&quot;thicc&quot;:3.0,&quot;overlayText&quot;:&quot;死刑&quot;,&quot;refActorObjectID&quot;:${var:liquidtid_${id}},&quot;refActorComparisonType&quot;:2,&quot;includeRotation&quot;:true}" ActionType="GenericJson" ExecutionDelayExpression="100">
                             <Condition Enabled="false" Grouping="And" />
                           </Action>
                           <Action OrderNumber="4" JsonEndpointExpression="http://127.0.0.1:47774/?namespace=liquidline${id}&amp;destroyAt=11000" JsonPayloadExpression="{&quot;Name&quot;:&quot;排水 2&quot;,&quot;type&quot;:1,&quot;radius&quot;:6.0,&quot;color&quot;:4294967295,&quot;overlayBGColor&quot;:4278190080,&quot;overlayTextColor&quot;:4294967295,&quot;thicc&quot;:5.0,&quot;refActorObjectID&quot;:${var:liquidtid_${id}},&quot;refActorComparisonType&quot;:2,&quot;includeRotation&quot;:true}" ActionType="GenericJson">
@@ -2711,7 +2709,7 @@
                           <Action OrderNumber="1" JsonEndpointExpression="http://127.0.0.1:47774/?destroy=icecircle" ActionType="GenericJson">
                             <Condition Enabled="false" Grouping="Or" />
                           </Action>
-                          <Action OrderNumber="2" JsonEndpointExpression="http://127.0.0.1:47774/?namespace=icecircle&amp;destroyAt=0,COMBAT_EXIT,TERRITORY_CHANGE" JsonPayloadExpression="{&quot;Name&quot;:&quot;冰圈Obj样式 1E958D 封边&quot;,&quot;type&quot;:1,&quot;radius&quot;:9.5,&quot;color&quot;:4293918588,&quot;overlayBGColor&quot;:4278190080,&quot;overlayTextColor&quot;:4294967295,&quot;thicc&quot;:3.0,&quot;refActorDataID&quot;:2004365,&quot;refActorComparisonType&quot;:3}" ActionType="GenericJson">
+                          <Action OrderNumber="2" JsonEndpointExpression="http://127.0.0.1:47774/?namespace=icecircle&amp;destroyAt=0,COMBAT_EXIT,TERRITORY_CHANGE" JsonPayloadExpression="{&quot;Name&quot;:&quot;冰圈Obj样式 1E958D 封边&quot;,&quot;type&quot;:1,&quot;radius&quot;:9.5,&quot;color&quot;:4293918588,&quot;overlayBGColor&quot;:4278190080,&quot;overlayTextColor&quot;:4294967295,&quot;thicc&quot;:3.0,&quot;refActorDataID&quot;:2004365,&quot;refActorComparisonType&quot;:3}" ActionType="GenericJson" ExecutionDelayExpression="100">
                             <Condition Enabled="false" Grouping="And" />
                           </Action>
                           <Action OrderNumber="3" JsonEndpointExpression="http://127.0.0.1:47774/?namespace=icecircle&amp;destroyAt=0,COMBAT_EXIT,TERRITORY_CHANGE" JsonPayloadExpression="{&quot;Name&quot;:&quot;冰圈Obj样式 1E958D&quot;,&quot;type&quot;:1,&quot;radius&quot;:9.5,&quot;color&quot;:1275061884,&quot;overlayBGColor&quot;:4278519045,&quot;overlayTextColor&quot;:4294955264,&quot;thicc&quot;:3.0,&quot;overlayText&quot;:&quot;! 冰圈危险 !&quot;,&quot;refActorDataID&quot;:2004365,&quot;refActorComparisonType&quot;:3,&quot;Filled&quot;:true}" ActionType="GenericJson">
@@ -2748,7 +2746,7 @@
                   </Folder>
                   <Folder Id="3d7aa297-f950-4d71-8211-bd652a204095" Name="3. 隐形地雷散布 (寄了)" Enabled="true">
                     <Folders>
-                      <Folder Id="5826ecbf-d11a-4619-b1b9-6d5e6bfb0ea3" Name="排序解法(实验中) 随机伤害源……找不到规律，不搞了，消不掉的时间到了自动销毁" Enabled="true">
+                      <Folder Id="5826ecbf-d11a-4619-b1b9-6d5e6bfb0ea3" Name="排序解法(实验中) 随机伤害源……找不到规律，不搞了，消不掉的时间到了自动销毁，踩雷能消但有1/2的概率反向消雷" Enabled="true">
                         <Folders />
                         <Triggers>
                           <Trigger Enabled="true" Sequential="True" Name="2. 地雷显示(15/16)" Id="1e3d4218-38d8-434c-898f-c28b32745ec2" RegularExpression="(?&lt;timestamp&gt;^.{14}) (?:ActionEffect|AOEActionEffect) (?&lt;type&gt;(?:15|16)):(?&lt;sourceId&gt;[^:]*):(?&lt;source&gt;[^:]*):4851:(?&lt;ability&gt;(?:[^:]|: )*?):(?&lt;targetId&gt;[^:]*):(?&lt;target&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;[^:]*)(?:$|:)">
@@ -5332,7 +5330,7 @@
                         </Actions>
                         <Condition Enabled="false" Grouping="Or" />
                       </Trigger>
-                      <Trigger Enabled="true" Name="喷火销毁" Id="92847a40-1c85-41c4-a98b-31a75f8f4f9c" RegularExpression="^.{14} (?:\w+) (15|16):(?&lt;sid&gt;[^:]*):(?&lt;sname&gt;[^:]*):486C:(?&lt;ability&gt;(?:[^:]|: )*?):10133000:(?&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">
+                      <Trigger Enabled="true" Name="喷火销毁" Id="92847a40-1c85-41c4-a98b-31a75f8f4f9c" RegularExpression="^.{14} (?:\w+) (15|16):(?&lt;sid&gt;[^:]*):(?&lt;sname&gt;[^:]*):486C:(?&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">
                         <Actions>
                           <Action OrderNumber="1" JsonEndpointExpression="http://127.0.0.1:47774/?destroy=B" ActionType="GenericJson">
                             <Condition Enabled="true" Grouping="Or">
@@ -5389,8 +5387,9 @@
                             </Condition>
                           </Action>
                         </Actions>
-                        <Condition Enabled="true" Grouping="Or">
+                        <Condition Enabled="true" Grouping="And">
                           <ConditionSingle Enabled="true" ExpressionL="${var:绝亚阶段_Clone}" ExpressionTypeL="String" ExpressionR="2" ExpressionTypeR="String" ConditionType="StringEqualNocase" />
+                          <ConditionSingle Enabled="true" ExpressionL="${_ffxivparty[1].id}" ExpressionTypeL="String" ExpressionR="${tid}" ExpressionTypeR="String" ConditionType="StringEqualNocase" />
                         </Condition>
                       </Trigger>
                     </Triggers>
@@ -7329,7 +7328,7 @@
                   </Folder>
                 </Folders>
                 <Triggers>
-                  <Trigger Enabled="true" Name="P3结晶破碎伤害判定发出滴滴声(4声为全部判定,播报tts提醒引导喷火)" Id="1af506e5-62a5-41dc-8753-d52a4e7d4f4e" RegularExpression="^.{14} (?:\w+) (15|16):(?&lt;sid&gt;[^:]*):(?&lt;sname&gt;[^:]*):4A88:(?&lt;ability&gt;(?:[^:]|: )*?):10133000:(?&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;[^:]*)(?:$|:)">
+                  <Trigger Enabled="true" Name="P3结晶破碎伤害判定发出滴滴声(4声为全部判定,播报tts提醒引导喷火)" Id="1af506e5-62a5-41dc-8753-d52a4e7d4f4e" RegularExpression="^.{14} (?:\w+) (15|16):(?&lt;sid&gt;[^:]*):(?&lt;sname&gt;[^:]*):4A88:(?&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;[^:]*)(?:$|:)">
                     <Actions>
                       <Action OrderNumber="1" SystemBeepLengthExpression="200" ActionType="SystemBeep">
                         <Condition Enabled="false" Grouping="Or" />
@@ -7340,7 +7339,9 @@
                         </Condition>
                       </Action>
                     </Actions>
-                    <Condition Enabled="false" Grouping="Or" />
+                    <Condition Enabled="true" Grouping="Or">
+                      <ConditionSingle Enabled="true" ExpressionL="${_ffxivparty[1].id}" ExpressionTypeL="String" ExpressionR="${tid}" ExpressionTypeR="String" ConditionType="StringEqualNocase" />
+                    </Condition>
                   </Trigger>
                 </Triggers>
               </Folder>
@@ -7365,7 +7366,7 @@
                         <Actions />
                         <Condition Enabled="false" Grouping="Or" />
                       </Trigger>
-                      <Trigger Enabled="true" Name="# 为什么没有1.5麻将？因为我找不到任何有关联的ACT日志" Id="4a3984b5-4707-4773-be3a-39e46914f007" RegularExpression="">
+                      <Trigger Enabled="true" Name="# 为什么没有1.5麻将？因为我找不到任何有关联的ACT日志，官库有脚本但不适配国服，如果哪天有有缘人修好我会贴上" Id="4a3984b5-4707-4773-be3a-39e46914f007" RegularExpression="">
                         <Actions />
                         <Condition Enabled="false" Grouping="Or" />
                       </Trigger>
@@ -7430,7 +7431,6 @@
                       <Trigger Enabled="true" Name="5. 修复一运喷火专属轮椅问题" Id="ff45a560-8e4d-4890-b575-ac0b34a5f507" RegularExpression="">
                         <Actions />
                         <Condition Enabled="false" Grouping="Or" />
-                        <Conditions />
                       </Trigger>
                     </Triggers>
                   </Folder>
@@ -8672,7 +8672,20 @@
                     <Triggers />
                   </Folder>
                 </Folders>
-                <Triggers />
+                <Triggers>
+                  <Trigger Enabled="true" Name="# 偶尔有抽风情况会莫名其妙在错误的阶段画不知所谓的绘制，这个问题是有些操作被堵了后在某个时间放出来，明明是异步执行……" Id="88b65155-5474-4ec0-a699-adf69d34b41f" RegularExpression="">
+                    <Actions />
+                    <Condition Enabled="false" Grouping="Or" />
+                  </Trigger>
+                  <Trigger Enabled="true" Name="# 有些清理重画或者条件较多的的绘制最好加延时，否则可能抽风……" Id="56ec5539-fe24-4b44-90b1-cf0725ecf12d" RegularExpression="">
+                    <Actions />
+                    <Condition Enabled="false" Grouping="Or" />
+                  </Trigger>
+                  <Trigger Enabled="true" Name="## 本次更新将修复至今为止所有可解决/优化的问题，请认真对待" Id="69cbd40a-50ce-45fb-883a-85e62f98c0f2" RegularExpression="">
+                    <Actions />
+                    <Condition Enabled="false" Grouping="Or" />
+                  </Trigger>
+                </Triggers>
               </Folder>
               <Folder Id="fe938ee8-c0ec-4675-9854-ff1595284066" Name="【适配攻略】" Enabled="true">
                 <Folders />
@@ -10134,7 +10147,7 @@
                 </Folders>
                 <Triggers />
               </Folder>
-              <Folder FFXIVZoneFilterEnabled="True" FfxivZoneFilterRegularExpression="^986$" Id="269e1ce7-402d-43d4-bf5a-7cf26256924f" Name="电脑梦境斯提格玛四" Enabled="true">
+              <Folder FFXIVZoneFilterEnabled="True" FfxivZoneFilterRegularExpression="^986$" Id="269e1ce7-402d-43d4-bf5a-7cf26256924f" Name="电脑梦境斯提格玛四" Enabled="false">
                 <Folders>
                   <Folder Id="3acb23d3-ef65-475e-95f3-e98d15892ae3" Name="Boss1 - 欧米茄原型" Enabled="true">
                     <Folders />
@@ -12002,7 +12015,7 @@
               </Folder>
               <Folder FFXIVZoneFilterEnabled="True" FfxivZoneFilterRegularExpression="^1097$" Id="b0ce7fbe-a3a8-459a-9906-785b39a65e93" Name="雪山奥窟冥魂石洞" Enabled="true">
                 <Folders>
-                  <Folder Id="7da71bbd-5ebf-42a8-af7b-75b0e95fff03" Name="【正常版】：标准绘制，电脑配置差可能会卡" Enabled="false">
+                  <Folder Id="7da71bbd-5ebf-42a8-af7b-75b0e95fff03" Name="【正常版】：标准绘制，电脑配置差可能会卡" Enabled="true">
                     <Folders>
                       <Folder Id="2d7836bf-9b28-4b7f-858d-f3c24595d88f" Name="Boss1 - 白雪兽" Enabled="true">
                         <Folders>
@@ -12122,7 +12135,7 @@
                                   <Action OrderNumber="1" VariableOp="SetNumeric" VariableName="个人绘制_人偶追逐计数" VariableExpression="${var:个人绘制_人偶追逐计数}+1" ActionType="Variable">
                                     <Condition Enabled="false" Grouping="Or" />
                                   </Action>
-                                  <Action OrderNumber="2" ActionType="Placeholder" ExecutionDelayExpression="100">
+                                  <Action OrderNumber="2" ActionType="Placeholder" ExecutionDelayExpression="200">
                                     <Condition Enabled="false" Grouping="Or" />
                                   </Action>
                                   <Action OrderNumber="3" JsonEndpointExpression="http://127.0.0.1:47774/?namespace=renou&amp;destroyAt=12000,COMBAT_EXIT,TERRITORY_CHANGE" JsonPayloadExpression="{&quot;Name&quot;:&quot;人偶追逐X A 7FBF&quot;,&quot;type&quot;:3,&quot;refY&quot;:40.0,&quot;offY&quot;:-40.0,&quot;radius&quot;:1.5,&quot;color&quot;:587264767,&quot;thicc&quot;:0.0,&quot;refActorObjectID&quot;:${var:个人绘制_人偶追逐麻将1},&quot;FillStep&quot;:0.2,&quot;refActorComparisonType&quot;:2,&quot;includeHitbox&quot;:true,&quot;includeRotation&quot;:true,&quot;AdditionalRotation&quot;:0.7853982}" ActionType="GenericJson">
@@ -12158,7 +12171,7 @@
                               </Trigger>
                               <Trigger Enabled="true" Name="EX. 人偶追逐 顺序标记" Id="52e10b85-64fb-45eb-b311-f1752ef9d672" RegularExpression="^.{14} TargetIcon 1B:(?&lt;tid&gt;[^:]*):(?&lt;tname&gt;[^:]*)(?::[^:]*){2}:01(?&lt;id&gt;(50|51|52|53))(?:$|:)" PeriodRefire="Deny" RefirePeriodExpression="2000">
                                 <Actions>
-                                  <Action OrderNumber="1" JsonEndpointExpression="http://127.0.0.1:47774/?namespace=mark1&amp;destroyAt=25000,COMBAT_EXIT,TERRITORY_CHANGE" JsonPayloadExpression="{&quot;Name&quot;:&quot;人偶追逐 顺序标记1&quot;,&quot;type&quot;:1,&quot;radius&quot;:1.0,&quot;color&quot;:3355507199,&quot;overlayBGColor&quot;:4278190080,&quot;overlayTextColor&quot;:4294967295,&quot;thicc&quot;:3.0,&quot;overlayText&quot;:&quot;1号&quot;,&quot;refActorObjectID&quot;:${var:个人绘制_人偶追逐麻将1},&quot;refActorComparisonType&quot;:2}" ActionType="GenericJson" ExecutionDelayExpression="200">
+                                  <Action OrderNumber="1" JsonEndpointExpression="http://127.0.0.1:47774/?namespace=mark1&amp;destroyAt=25000,COMBAT_EXIT,TERRITORY_CHANGE" JsonPayloadExpression="{&quot;Name&quot;:&quot;人偶追逐 顺序标记1&quot;,&quot;type&quot;:1,&quot;radius&quot;:1.0,&quot;color&quot;:3355507199,&quot;overlayBGColor&quot;:4278190080,&quot;overlayTextColor&quot;:4294967295,&quot;thicc&quot;:3.0,&quot;overlayText&quot;:&quot;1号&quot;,&quot;refActorObjectID&quot;:${var:个人绘制_人偶追逐麻将1},&quot;refActorComparisonType&quot;:2}" ActionType="GenericJson" ExecutionDelayExpression="100">
                                     <Condition Enabled="false" Grouping="And" />
                                   </Action>
                                   <Action OrderNumber="2" JsonEndpointExpression="http://127.0.0.1:47774/?namespace=mark2&amp;destroyAt=25000,COMBAT_EXIT,TERRITORY_CHANGE" JsonPayloadExpression="{&quot;Name&quot;:&quot;人偶追逐 顺序标记2&quot;,&quot;type&quot;:1,&quot;radius&quot;:1.0,&quot;color&quot;:3355507199,&quot;overlayBGColor&quot;:4278190080,&quot;overlayTextColor&quot;:4294967295,&quot;thicc&quot;:3.0,&quot;overlayText&quot;:&quot;2号&quot;,&quot;refActorObjectID&quot;:${var:个人绘制_人偶追逐麻将2},&quot;refActorComparisonType&quot;:2}" ActionType="GenericJson">
@@ -13049,7 +13062,7 @@
                       </Trigger>
                     </Triggers>
                   </Folder>
-                  <Folder Id="319ed5a3-84f1-45fe-bdcf-321389bfe957" Name="【低配版】：提高了填充步骤，适用于配置不足等原因卡顿的用户" Enabled="true">
+                  <Folder Id="319ed5a3-84f1-45fe-bdcf-321389bfe957" Name="【低配版】：提高了填充步骤，适用于配置不足等原因卡顿的用户" Enabled="false">
                     <Folders>
                       <Folder Id="ae13227d-c131-43d4-a651-b2f4c7fe1613" Name="Boss1 - 白雪兽" Enabled="true">
                         <Folders>
@@ -13169,7 +13182,7 @@
                                   <Action OrderNumber="1" VariableOp="SetNumeric" VariableName="个人绘制_人偶追逐计数" VariableExpression="${var:个人绘制_人偶追逐计数}+1" ActionType="Variable">
                                     <Condition Enabled="false" Grouping="Or" />
                                   </Action>
-                                  <Action OrderNumber="2" ActionType="Placeholder" ExecutionDelayExpression="100">
+                                  <Action OrderNumber="2" ActionType="Placeholder" ExecutionDelayExpression="200">
                                     <Condition Enabled="false" Grouping="Or" />
                                   </Action>
                                   <Action OrderNumber="3" JsonEndpointExpression="http://127.0.0.1:47774/?namespace=renou&amp;destroyAt=12000,COMBAT_EXIT,TERRITORY_CHANGE" JsonPayloadExpression="{&quot;Name&quot;:&quot;人偶追逐X A 7FBF&quot;,&quot;type&quot;:3,&quot;refY&quot;:40.0,&quot;offY&quot;:-40.0,&quot;radius&quot;:1.5,&quot;color&quot;:838923007,&quot;thicc&quot;:0.0,&quot;refActorObjectID&quot;:${var:个人绘制_人偶追逐麻将1},&quot;FillStep&quot;:0.5,&quot;refActorComparisonType&quot;:2,&quot;includeHitbox&quot;:true,&quot;includeRotation&quot;:true,&quot;AdditionalRotation&quot;:0.7853982}" ActionType="GenericJson">
@@ -13205,7 +13218,7 @@
                               </Trigger>
                               <Trigger Enabled="true" Name="EX. 人偶追逐 顺序标记" Id="d5c6f57c-20f0-4eac-a846-5793d274c4f9" RegularExpression="^.{14} TargetIcon 1B:(?&lt;tid&gt;[^:]*):(?&lt;tname&gt;[^:]*)(?::[^:]*){2}:01(?&lt;id&gt;(50|51|52|53))(?:$|:)" PeriodRefire="Deny" RefirePeriodExpression="2000">
                                 <Actions>
-                                  <Action OrderNumber="1" JsonEndpointExpression="http://127.0.0.1:47774/?namespace=mark1&amp;destroyAt=25000,COMBAT_EXIT,TERRITORY_CHANGE" JsonPayloadExpression="{&quot;Name&quot;:&quot;人偶追逐 顺序标记1&quot;,&quot;type&quot;:1,&quot;radius&quot;:1.0,&quot;color&quot;:3355507199,&quot;overlayBGColor&quot;:4278190080,&quot;overlayTextColor&quot;:4294967295,&quot;thicc&quot;:3.0,&quot;overlayText&quot;:&quot;1号&quot;,&quot;refActorObjectID&quot;:${var:个人绘制_人偶追逐麻将1},&quot;refActorComparisonType&quot;:2}" ActionType="GenericJson" ExecutionDelayExpression="200">
+                                  <Action OrderNumber="1" JsonEndpointExpression="http://127.0.0.1:47774/?namespace=mark1&amp;destroyAt=25000,COMBAT_EXIT,TERRITORY_CHANGE" JsonPayloadExpression="{&quot;Name&quot;:&quot;人偶追逐 顺序标记1&quot;,&quot;type&quot;:1,&quot;radius&quot;:1.0,&quot;color&quot;:3355507199,&quot;overlayBGColor&quot;:4278190080,&quot;overlayTextColor&quot;:4294967295,&quot;thicc&quot;:3.0,&quot;overlayText&quot;:&quot;1号&quot;,&quot;refActorObjectID&quot;:${var:个人绘制_人偶追逐麻将1},&quot;refActorComparisonType&quot;:2}" ActionType="GenericJson" ExecutionDelayExpression="100">
                                     <Condition Enabled="false" Grouping="And" />
                                   </Action>
                                   <Action OrderNumber="2" JsonEndpointExpression="http://127.0.0.1:47774/?namespace=mark2&amp;destroyAt=25000,COMBAT_EXIT,TERRITORY_CHANGE" JsonPayloadExpression="{&quot;Name&quot;:&quot;人偶追逐 顺序标记2&quot;,&quot;type&quot;:1,&quot;radius&quot;:1.0,&quot;color&quot;:3355507199,&quot;overlayBGColor&quot;:4278190080,&quot;overlayTextColor&quot;:4294967295,&quot;thicc&quot;:3.0,&quot;overlayText&quot;:&quot;2号&quot;,&quot;refActorObjectID&quot;:${var:个人绘制_人偶追逐麻将2},&quot;refActorComparisonType&quot;:2}" ActionType="GenericJson">
@@ -15881,7 +15894,48 @@
         <Triggers />
       </Folder>
       <Folder Id="1aefd34c-14e9-477b-a772-86be56125a3a" Name="0. 通用触发" Enabled="true">
-        <Folders />
+        <Folders>
+          <Folder Id="e6ef99d8-9c59-4c0c-863d-61029acf55b3" Name="Cactbotself日志转义记录 打本时使用(记得切掉默语污染屏幕)" Enabled="false">
+            <Folders />
+            <Triggers>
+              <Trigger Enabled="true" Sequential="True" Name="104" Id="491a298b-6910-4479-b0b8-b7566bc717fa" RegularExpression="^.{14} ChatLog 00:0:104:(?&lt;sid&gt;.*?):(?&lt;sname&gt;.*?):(?&lt;skillid&gt;.*?):(?&lt;skillidtype&gt;.*?):(?&lt;casttime&gt;.*?):(?&lt;tid&gt;.*?):(?&lt;tname&gt;.*?):(?&lt;flag&gt;.*?):(?&lt;heading&gt;.*?):(?&lt;x&gt;.*?):(?&lt;y&gt;.*?):(?&lt;z&gt;.*?):">
+                <Actions>
+                  <Action OrderNumber="1" LogMessageText="ChatLog2 00:0:104:${sid}:${sname}:${skillid}:${skillidtype}:${casttime}:${tid}:${tname}:${flag}:${heading}:${x}:${y}:${z}:" LogProcess="True" ActionType="LogMessage">
+                    <Condition Enabled="false" Grouping="Or" />
+                  </Action>
+                  <Action OrderNumber="2" LogMessageText="ChatLog2 00:0:104:${sid}:${sname}:${skillid}:${skillidtype}:${casttime}:${tid}:${tname}:${flag}:${heading}:${x}:${y}:${z}:" LogProcess="True" NamedCallbackName="command" NamedCallbackParam="/e ChatLog2 00:0:104:${sid}:${sname}:${skillid}:${skillidtype}:${casttime}:${tid}:${tname}:${flag}:${heading}:${x}:${y}:${z}:" ActionType="NamedCallback">
+                    <Condition Enabled="false" Grouping="Or" />
+                  </Action>
+                </Actions>
+                <Condition Enabled="false" Grouping="Or" />
+              </Trigger>
+              <Trigger Enabled="true" Name="# 调试用" Id="5512b822-3ef7-48ad-8736-6c8cf9baf7f9" RegularExpression="">
+                <Actions />
+                <Condition Enabled="false" Grouping="Or" />
+              </Trigger>
+            </Triggers>
+          </Folder>
+          <Folder Id="ed196edd-d509-43fc-8f00-36e3975c3f30" Name="Cactbotself日志转义还原 回放时使用" Enabled="false">
+            <Folders />
+            <Triggers>
+              <Trigger Enabled="true" Name="# 调试用" Id="5c8d6617-bba4-4a08-8661-fa3d3845f34a" RegularExpression="">
+                <Actions />
+                <Condition Enabled="false" Grouping="Or" />
+              </Trigger>
+              <Trigger Enabled="true" Sequential="True" Name="104" Id="d5e53e3e-f415-4d08-8d37-2814d921553a" RegularExpression="^ChatLog2 00:0:104:(?&lt;sid&gt;.*?):(?&lt;sname&gt;.*?):(?&lt;skillid&gt;.*?):(?&lt;skillidtype&gt;.*?):(?&lt;casttime&gt;.*?):(?&lt;tid&gt;.*?):(?&lt;tname&gt;.*?):(?&lt;flag&gt;.*?):(?&lt;heading&gt;.*?):(?&lt;x&gt;.*?):(?&lt;y&gt;.*?):(?&lt;z&gt;.*?):$">
+                <Actions>
+                  <Action OrderNumber="1" LogMessageText="[123456789012] ChatLog 00:0:104:${sid}:${sname}:${skillid}:${skillidtype}:${casttime}:${tid}:${tname}:${flag}:${heading}:${x}:${y}:${z}:" LogProcess="True" ActionType="LogMessage">
+                    <Condition Enabled="false" Grouping="Or" />
+                  </Action>
+                  <Action OrderNumber="2" LogMessageText="[00000000000000] ChatLog 00:0:104:${sid}:${sname}:${skillid}:${skillidtype}:${casttime}:${tid}:${tname}:${flag}:${heading}:${x}:${y}:${z}:" LogProcess="True" NamedCallbackName="command" NamedCallbackParam="/e [123456789012] ChatLog 00:0:104:${sid}:${sname}:${skillid}:${skillidtype}:${casttime}:${tid}:${tname}:${flag}:${heading}:${x}:${y}:${z}:" ActionType="NamedCallback">
+                    <Condition Enabled="false" Grouping="Or" />
+                  </Action>
+                </Actions>
+                <Condition Enabled="false" Grouping="Or" />
+              </Trigger>
+            </Triggers>
+          </Folder>
+        </Folders>
         <Triggers>
           <Trigger Enabled="true" Sequential="True" Name="切换地图清理职能信息" Id="c5a6f864-db74-457c-84aa-31ad20cec360" RegularExpression="^.{14} Territory 01:(?&lt;id&gt;(?:[^:]*)):(?&lt;ditu&gt;.*)">
             <Actions>
@@ -15959,7 +16013,7 @@
       </Folder>
     </Folders>
     <Triggers>
-      <Trigger Enabled="true" Sequential="True" Name="【初次导入提醒】2023/08/20" Id="4e99d138-e563-4d4f-b0ee-fbb1c7b93ac3" RegularExpression="^." PeriodRefire="Deny" RefirePeriodExpression="2000">
+      <Trigger Enabled="false" Sequential="True" Name="【初次导入提醒】2023/08/20" Id="4e99d138-e563-4d4f-b0ee-fbb1c7b93ac3" RegularExpression="^." PeriodRefire="Deny" RefirePeriodExpression="2000">
         <Actions>
           <Action OrderNumber="1" TriggerOp="DisableTrigger" TriggerId="4e99d138-e563-4d4f-b0ee-fbb1c7b93ac3" ActionType="Trigger">
             <Condition Enabled="false" Grouping="Or" />