Skip to content

Commit 6488ff2

Browse files
kawayiYokamikawayiYokami
authored
fix: 修复叶瞬光常态识别、优化琉音合掌 (OneDragon-Anything#2436)
* feat: 琉音无脑合唱 * feat: 叶瞬光常态改用模板匹配 * feat: 叶瞬光pro max
1 parent e80afc7 commit 6488ff2

15 files changed

Lines changed: 499 additions & 440 deletions

File tree

‎assets/template/agent_state/yeshunguang_normal_2_1/config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ template_name: 角色状态-叶瞬光-常态-21
44
template_shape: rectangle
55
auto_mask: true
66
point_list:
7-
- 139, 112
8-
- 214, 113
7+
- 111, 116
8+
- 242, 120

‎assets/template/agent_state/yeshunguang_normal_2_1/mask.png‎

15 Bytes
Loading

‎assets/template/agent_state/yeshunguang_normal_2_1/raw.png‎

631 Bytes
Loading

‎assets/template/agent_state/yeshunguang_normal_3_1/config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ template_name: 角色状态-叶瞬光-常态-31
44
template_shape: rectangle
55
auto_mask: true
66
point_list:
7-
- 139, 112
8-
- 214, 113
7+
- 111, 116
8+
- 242, 120

‎assets/template/agent_state/yeshunguang_normal_3_1/mask.png‎

15 Bytes
Loading

‎assets/template/agent_state/yeshunguang_normal_3_1/raw.png‎

631 Bytes
Loading

‎config/auto_battle/全配队通用.merged.yml‎

Lines changed: 173 additions & 147 deletions
Large diffs are not rendered by default.

‎config/auto_battle/击破站场-强攻速切.merged.yml‎

Lines changed: 70 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -8030,14 +8030,17 @@
80308030
- "op_name": "按键-普通攻击-松开"
80318031
- "op_name": "等待秒数"
80328032
"seconds": 0.2
8033-
"states": "[琉音-客诉]{1, 1} & [琉音-好评]{90, 120} & ([自定义-失衡时间, 1, 15] | ([叶瞬光-青溟剑势-红]{0,6}))"
8033+
"states": "[琉音-客诉]{1, 1} & [琉音-好评]{90, 120} & ![叶瞬光-青溟剑势-白]{1,6}"
80348034
- "interrupt_states": "![琉音-特殊技可用] | ![前台-琉音]"
8035-
"states": "[琉音-特殊技可用] & ![琉音-好评]{90, 120}"
8035+
"states": "[琉音-特殊技可用] "
80368036
"sub_handlers":
80378037
- "debug_name": "能量都要溢出了"
80388038
"operations":
80398039
- "agent_name": "琉音"
80408040
"op_name": "按键-切换角色"
8041+
- "op_name": "设置状态"
8042+
"seconds": 2
8043+
"state": "自定义-无视闪光"
80418044
- "agent_name": "琉音"
80428045
"op_name": "按键-切换角色"
80438046
- "op_name": "等待秒数"
@@ -8243,7 +8246,7 @@
82438246
- "op_name": "按键-特殊攻击"
82448247
"post_delay": 0.2
82458248
"repeat": 5
8246-
"states": "[自定义-琉音-投诉]{1,1} & [琉音-能量]{50, 120}"
8249+
"states": "[自定义-琉音-投诉]{1,1} & [琉音-能量]{50, 120} & ![琉音-好评]{90, 120}"
82478250
- "debug_name": "恶意投诉差1个"
82488251
"operations":
82498252
- "agent_name": "琉音"
@@ -8288,7 +8291,7 @@
82888291
- "op_name": "按键-特殊攻击"
82898292
"post_delay": 0.2
82908293
"repeat": 5
8291-
"states": "[自定义-琉音-投诉]{2,2} & [琉音-能量]{25, 120}"
8294+
"states": "[自定义-琉音-投诉]{2,2} & [琉音-能量]{25, 120} & ![琉音-好评]{90, 120}"
82928295
- "operations":
82938296
- "op_name": "设置状态"
82948297
"state": "自定义-合轴时间"
@@ -8807,7 +8810,7 @@
88078810
"states": "[叶瞬光-常态]{0,0} & ![叶瞬光-明心境]{0,0}"
88088811
"sub_handlers":
88098812
- "debug_name": "等待变身就绪"
8810-
"interrupt_states": "[叶瞬光-青溟剑势-白]{4,4} & [叶瞬光-明心境]{90,110} | [叶瞬光-明心境]{0,20}"
8813+
"interrupt_states": "[叶瞬光-明心境]{0,110}"
88118814
"operations":
88128815
- "op_name": "设置状态"
88138816
"seconds": 9
@@ -8824,7 +8827,11 @@
88248827
"post_delay": 0.1
88258828
"repeat": 40
88268829
"states": "[叶瞬光-明心境]{110,120}"
8827-
- "interrupt_states": "[叶瞬光-青溟剑势-白]{4,4} | [叶瞬光-明心境]{0,20}"
8830+
- "debug_name": "明心境-输出"
8831+
"interrupt_states": "[叶瞬光-明心境]{0,20}"
8832+
"states": "[叶瞬光-明心境]{20,120}"
8833+
"sub_handlers":
8834+
- "interrupt_states": "[叶瞬光-青溟剑势-白]{4,4}"
88288835
"operations":
88298836
- "op_name": "设置状态"
88308837
"seconds": 9
@@ -8835,11 +8842,8 @@
88358842
- "op_name": "按键-特殊攻击"
88368843
"post_delay": 0.1
88378844
"repeat": 20
8838-
- "op_name": "按键-普通攻击"
8839-
"post_delay": 0.1
8840-
"repeat": 40
8841-
"states": "[叶瞬光-青溟剑势-白]{6,6} & [叶瞬光-明心境]{90,110}"
8842-
- "interrupt_states": "[叶瞬光-青溟剑势-白]{3,3} | [叶瞬光-明心境]{0,20}"
8845+
"states": "[叶瞬光-青溟剑势-白]{6,6}"
8846+
- "interrupt_states": "[叶瞬光-青溟剑势-白]{3,3}"
88438847
"operations":
88448848
- "op_name": "设置状态"
88458849
"seconds": 9
@@ -8851,7 +8855,7 @@
88518855
"post_delay": 0.1
88528856
"repeat": 20
88538857
"states": "[叶瞬光-青溟剑势-白]{4,4}"
8854-
- "interrupt_states": "[叶瞬光-青溟剑势-白]{1,1} | [叶瞬光-明心境]{0,20}"
8858+
- "interrupt_states": "[叶瞬光-青溟剑势-白]{1,1}"
88558859
"operations":
88568860
- "op_name": "设置状态"
88578861
"seconds": 9
@@ -8866,7 +8870,7 @@
88668870
"post_delay": 0.1
88678871
"repeat": 40
88688872
"states": "[叶瞬光-青溟剑势-白]{3,3}"
8869-
- "interrupt_states": "[叶瞬光-青溟剑势-白]{0,0} | [叶瞬光-明心境]{0,20}"
8873+
- "interrupt_states": "[叶瞬光-青溟剑势-白]{0,0}"
88708874
"operations":
88718875
- "op_name": "设置状态"
88728876
"seconds": 9
@@ -8890,46 +8894,46 @@
88908894
"post_delay": 0.1
88918895
"repeat": 20
88928896
"states": "[叶瞬光-青溟剑势-白]{2,2} | [叶瞬光-青溟剑势-白]{5,5}"
8893-
- "interrupt_states": "[叶瞬光-常态]{1,1} & [叶瞬光-明心境]{0,0}"
8894-
"operations":
8895-
- "op_name": "设置状态"
8896-
"seconds": 9
8897-
"state": "自定义-无视闪光"
8898-
- "op_name": "设置状态"
8899-
"seconds": 9
8900-
"state": "自定义-动作不打断"
8901-
- "op_name": "按键-特殊攻击-按下"
8902-
- "op_name": "等待秒数"
8903-
"seconds": 1
8904-
- "op_name": "按键-特殊攻击-按下"
8905-
- "op_name": "等待秒数"
8906-
"seconds": 1
8907-
- "op_name": "按键-特殊攻击-按下"
8908-
- "op_name": "等待秒数"
8909-
"seconds": 1
8910-
- "op_name": "按键-特殊攻击-按下"
8911-
- "op_name": "等待秒数"
8912-
"seconds": 1
8913-
- "op_name": "按键-特殊攻击-按下"
8914-
- "op_name": "等待秒数"
8915-
"seconds": 1
8916-
- "op_name": "按键-特殊攻击-按下"
8917-
- "op_name": "等待秒数"
8918-
"seconds": 1
8919-
- "op_name": "按键-特殊攻击-按下"
8920-
- "op_name": "等待秒数"
8921-
"seconds": 1
8922-
- "op_name": "按键-特殊攻击-按下"
8923-
- "op_name": "等待秒数"
8924-
"seconds": 1
8925-
- "op_name": "按键-特殊攻击-按下"
8926-
- "op_name": "等待秒数"
8927-
"seconds": 1
8928-
- "op_name": "按键-特殊攻击-按下"
8929-
- "op_name": "等待秒数"
8930-
"seconds": 1
8931-
- "op_name": "按键-特殊攻击-松开"
8932-
"states": "[叶瞬光-青溟剑势-白]{0,0} | [叶瞬光-明心境]{0,20}"
8897+
- "interrupt_states": "[叶瞬光-常态]{1,1} & [叶瞬光-明心境]{0,0}"
8898+
"operations":
8899+
- "op_name": "设置状态"
8900+
"seconds": 9
8901+
"state": "自定义-无视闪光"
8902+
- "op_name": "设置状态"
8903+
"seconds": 9
8904+
"state": "自定义-动作不打断"
8905+
- "op_name": "按键-特殊攻击-按下"
8906+
- "op_name": "等待秒数"
8907+
"seconds": 1
8908+
- "op_name": "按键-特殊攻击-按下"
8909+
- "op_name": "等待秒数"
8910+
"seconds": 1
8911+
- "op_name": "按键-特殊攻击-按下"
8912+
- "op_name": "等待秒数"
8913+
"seconds": 1
8914+
- "op_name": "按键-特殊攻击-按下"
8915+
- "op_name": "等待秒数"
8916+
"seconds": 1
8917+
- "op_name": "按键-特殊攻击-按下"
8918+
- "op_name": "等待秒数"
8919+
"seconds": 1
8920+
- "op_name": "按键-特殊攻击-按下"
8921+
- "op_name": "等待秒数"
8922+
"seconds": 1
8923+
- "op_name": "按键-特殊攻击-按下"
8924+
- "op_name": "等待秒数"
8925+
"seconds": 1
8926+
- "op_name": "按键-特殊攻击-按下"
8927+
- "op_name": "等待秒数"
8928+
"seconds": 1
8929+
- "op_name": "按键-特殊攻击-按下"
8930+
- "op_name": "等待秒数"
8931+
"seconds": 1
8932+
- "op_name": "按键-特殊攻击-按下"
8933+
- "op_name": "等待秒数"
8934+
"seconds": 1
8935+
- "op_name": "按键-特殊攻击-松开"
8936+
"states": "[叶瞬光-青溟剑势-白]{0,0} | [叶瞬光-明心境]{0,20}"
89338937
- "interrupt_states": "[前台-能量, 0, 0.1] & ![前台-照]"
89348938
"states": "[前台-照]"
89358939
"sub_handlers":
@@ -9116,36 +9120,39 @@
91169120
- "op_name": "设置状态"
91179121
"seconds": 3.0
91189122
"state": "自定义-动作不打断"
9123+
- "op_name": "按键-特殊攻击"
9124+
"post_delay": 0.1
9125+
"repeat": 10
91199126
- "op_name": "按键-特殊攻击-按下"
91209127
- "op_name": "等待秒数"
9121-
"seconds": 0.3
9128+
"seconds": 0.2
91229129
- "op_name": "按键-特殊攻击-按下"
91239130
- "op_name": "等待秒数"
9124-
"seconds": 0.3
9131+
"seconds": 0.2
91259132
- "op_name": "按键-特殊攻击-按下"
91269133
- "op_name": "等待秒数"
9127-
"seconds": 0.3
9134+
"seconds": 0.2
91289135
- "op_name": "按键-特殊攻击-按下"
91299136
- "op_name": "等待秒数"
9130-
"seconds": 0.3
9137+
"seconds": 0.2
91319138
- "op_name": "按键-特殊攻击-按下"
91329139
- "op_name": "等待秒数"
9133-
"seconds": 0.3
9140+
"seconds": 0.2
91349141
- "op_name": "按键-特殊攻击-按下"
91359142
- "op_name": "等待秒数"
9136-
"seconds": 0.3
9143+
"seconds": 0.2
91379144
- "op_name": "按键-特殊攻击-按下"
91389145
- "op_name": "等待秒数"
9139-
"seconds": 0.3
9146+
"seconds": 0.2
91409147
- "op_name": "按键-特殊攻击-按下"
91419148
- "op_name": "等待秒数"
9142-
"seconds": 0.3
9149+
"seconds": 0.2
91439150
- "op_name": "按键-特殊攻击-按下"
91449151
- "op_name": "等待秒数"
9145-
"seconds": 0.3
9152+
"seconds": 0.2
91469153
- "op_name": "按键-特殊攻击-按下"
91479154
- "op_name": "等待秒数"
9148-
"seconds": 0.3
9155+
"seconds": 0.2
91499156
- "op_name": "设置状态"
91509157
"state": "自定义-合轴时间"
91519158
"states": "[千夏-特殊技可用]"

0 commit comments

Comments
 (0)