yarukon
/
FFXIV_Triggers
mirror of https://github.com/RedAsteroid/FFXIV_Triggers
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修复Bug

duplicate
RedAsteroid 2023-02-24 00:11:27 +08:00 committed by GitHub
parent 233e1e8bec
commit 20eda97199
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7737 additions and 7767 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Test/Testtriggers_pure.xml
View File

@ -554,7 +554,6 @@
</Action>
</Actions>
<Condition Enabled="false" Grouping="Or" />
<Conditions />
</Trigger>
</Triggers>
</Folder>
@ -1002,23 +1001,6 @@
<ConditionSingle Enabled="true" ExpressionL="${var:倾泻_Clone}" ExpressionTypeL="Numeric" ExpressionR="2" ExpressionTypeR="Numeric" ConditionType="StringEqualNocase" />
</Condition>
</Trigger>
<Trigger Enabled="true" Name="水圈水波出现 49B5" Id="9e3b065a-aae8-48ba-9ab8-a57d67ce3eed" RegularExpression="^.{14} StartsCasting 14:(?&lt;sid&gt;[^:]*):(?&lt;sname&gt;[^:]*):49B5:(?&lt;ability&gt;(?:[^:]|: )*?):(?&lt;tid&gt;[^:]*):(?&lt;tname&gt;[^:]*):(?&lt;castTime&gt;[^:]*):(?&lt;x&gt;[^:]*):(?&lt;y&gt;[^:]*):(?&lt;z&gt;[^:]*):(?&lt;heading&gt;[^:]*)(?:$|:)" PeriodRefire="Deny" RefirePeriodExpression="1000">
<Actions>
<Action OrderNumber="1" JsonEndpointExpression="http://127.0.0.1:47774/?destroy=H12" TextAuraFontSize="9" TextAuraFontName="宋体" ActionType="GenericJson">
<Condition Enabled="false" Grouping="Or" />
</Action>
<Action OrderNumber="2" JsonEndpointExpression="http://127.0.0.1:47774/?destroy=D3" TextAuraFontSize="9" TextAuraFontName="宋体" ActionType="GenericJson">
<Condition Enabled="false" Grouping="Or" />
</Action>
<Action OrderNumber="3" JsonEndpointExpression="http://127.0.0.1:47774/?destroy=D4" TextAuraFontSize="9" TextAuraFontName="宋体" ActionType="GenericJson">
<Condition Enabled="false" Grouping="Or" />
</Action>
</Actions>
<Condition Enabled="true" Grouping="Or">
<ConditionSingle Enabled="true" ExpressionL="${var:倾泻_Clone}" ExpressionTypeL="Numeric" ExpressionR="2" ExpressionTypeR="Numeric" ConditionType="StringEqualNocase" />
</Condition>
<Conditions />
</Trigger>
<Trigger Enabled="true" Sequential="True" Name="可见水波出现 4824" Id="40569757-d5c6-483b-8c45-35c31569fc3f" RegularExpression="^.{14} StartsCasting 14:(?&lt;sid&gt;[^:]*):(?&lt;sname&gt;[^:]*):4824:(?&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" OBSEndPoint="ws://${_const[OBSWebsocketEndpoint]}:${_const[OBSWebsocketPort]}" OBSPassword="${_const[OBSWebsocketPassword]}" TextAuraFontSize="9" TextAuraFontName="宋体" ActionType="Placeholder" Description="引导黄圈 H1、H2、D3、D4" DescriptionOverride="True">
@ -1226,7 +1208,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>
@ -1950,7 +1931,6 @@
</Action>
</Actions>
<Condition Enabled="false" Grouping="Or" />
<Conditions />
</Trigger>
<Trigger Enabled="true" Name="2. 销毁" Id="96c6fc38-7a0d-4da7-8ac0-ee65c2d1bb58" RegularExpression="^.{14} (?:\w+) (15|16):(?&lt;sid&gt;[^:]*):(?&lt;sname&gt;[^:]*):4831:(?&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>
@ -1959,7 +1939,6 @@
</Action>
</Actions>
<Condition Enabled="false" Grouping="Or" />
<Conditions />
</Trigger>
</Triggers>
</Folder>
@ -3560,17 +3539,14 @@
<Condition Enabled="true" Grouping="Or">
<ConditionSingle Enabled="true" ExpressionL="${var:残暴x}" ExpressionTypeL="Numeric" ExpressionR="100" ExpressionTypeR="Numeric" ConditionType="NumericLess" />
</Condition>
<Conditions />
</Trigger>
<Trigger Enabled="true" Name="飞轮判定" Id="ded29b3f-3a1d-4063-9c6c-2b70db40bbb1" RegularExpression="">
<Actions />
<Condition Enabled="false" Grouping="Or" />
<Conditions />
</Trigger>
<Trigger Enabled="true" Name="罪恶感" Id="c35a6d6a-7711-4803-8b3d-a920287c1314" RegularExpression="">
<Actions />
<Condition Enabled="false" Grouping="Or" />
<Conditions />
</Trigger>
</Triggers>
</Folder>
@ -4796,7 +4772,7 @@
</Folder>
</Folders>
<Triggers>
<Trigger Enabled="true" Name="修改日期：2023-02-21 初步完成绝亚P1万变水波指引，维修/重画部分绘制。" Id="066ef6cf-5add-4d77-874a-4198186a1443" RegularExpression="">
<Trigger Enabled="true" Name="修改日期：2023-02-21 初步完成绝亚P1万变水波指引，维修/重画部分绘制，修复bug。" Id="066ef6cf-5add-4d77-874a-4198186a1443" RegularExpression="">
<Actions />
<Condition Enabled="false" Grouping="Or" />
</Trigger>
@ -5204,7 +5180,6 @@
</Action>
</Actions>
<Condition Enabled="false" Grouping="Or" />
<Conditions />
</Trigger>
<Trigger Enabled="true" Sequential="True" Name="2. 躁怒的诅咒 （红色）" Id="d6766a83-d82d-440a-a6c8-21223614d57e" RegularExpression="^.{14} StartsCasting 14:(?&lt;sid&gt;[^:]*):(?&lt;sname&gt;[^:]*):6736:(?&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>
@ -5222,7 +5197,6 @@
</Action>
</Actions>
<Condition Enabled="false" Grouping="Or" />
<Conditions />
</Trigger>
</Triggers>
</Folder>
@ -5450,7 +5424,6 @@
</Action>
</Actions>
<Condition Enabled="false" Grouping="Or" />
<Conditions />
</Trigger>
</Triggers>
</Folder>
@ -5834,7 +5807,6 @@
</Action>
</Actions>
<Condition Enabled="false" Grouping="Or" />
<Conditions />
</Trigger>
</Triggers>
</Folder>
@ -5887,7 +5859,6 @@
</Action>
</Actions>
<Condition Enabled="false" Grouping="Or" />
<Conditions />
</Trigger>
</Triggers>
</Folder>
@ -6811,7 +6782,6 @@
</Action>
</Actions>
<Condition Enabled="false" Grouping="Or" />
<Conditions />
</Trigger>
</Triggers>
</Folder>