Skip to content

Commit 4a4b507

Browse files
committed
♻️ refactor(autoescort_fast): 优化超级飞枪80适配1.99攻速
1 parent 652131c commit 4a4b507

1 file changed

Lines changed: 11 additions & 12 deletions

File tree

src/tasks/fullauto/AutoEscortTask_Fast.py

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ def __init__(self, *args, **kwargs):
3737
"我已在 OK-DNA 游戏快捷键设置里配置【螺旋飞跃按键】": False,
3838
"帧数敏感,如果不能稳120帧,大概率坠机": False,
3939
"设置: 镜头距离1.3,120帧,最低画质,垂直同步关, 插帧关": False,
40-
"阵容: 黎瑟 + 0精春玦戟 + 弧光百劫/裂魂 + 任意协战": False,
41-
"近战魔之楔:【金色迅捷+10 / 紫色穿引共鸣 / 紫色迅捷蓄势+5 / 紫色迅捷坠击+5(面板攻速2.0)": False,
40+
"阵容: 黎瑟 + 春玦戟(0熔/5熔)+ 弧光百劫/裂魂 + 任意协战": False,
41+
"近战魔之楔:【金色迅捷 0熔 +10 / 5熔 +6】/ 穿引共鸣 / 迅捷蓄势+5 / 迅捷坠击+5(面板攻速2.00/1.99)": False,
4242
"远程魔之楔:【请勿携带“专注·厚重”】推荐装备金色迅捷+10或任意迅捷(面板攻速1.3~2.0)": False,
4343
"路线1·4撤离撞门超级跳延迟Offset": 0,
4444
"路线1·4撤离撞门超级跳延迟-/+": "-",
@@ -69,8 +69,8 @@ def __init__(self, *args, **kwargs):
6969
"我已在 OK-DNA 游戏快捷键设置里配置【螺旋飞跃按键】": "必须勾选才能执行任务!",
7070
"帧数敏感,如果不能稳120帧,大概率坠机": "必须勾选才能执行任务!",
7171
"设置: 镜头距离1.3,120帧,最低画质,垂直同步关, 插帧关": "必须勾选才能执行任务!",
72-
"阵容: 黎瑟 + 0精春玦戟 + 弧光百劫/裂魂 + 任意协战": "必须勾选才能执行任务!",
73-
"近战魔之楔:【金色迅捷+10 / 紫色穿引共鸣 / 紫色迅捷蓄势+5 / 紫色迅捷坠击+5(面板攻速2.0)":"必须勾选才能执行任务!",
72+
"阵容: 黎瑟 + 春玦戟(0熔/5熔)+ 弧光百劫/裂魂 + 任意协战": "必须勾选才能执行任务!",
73+
"近战魔之楔:【金色迅捷 0熔 +10 / 5熔 +6】/ 穿引共鸣 / 迅捷蓄势+5 / 迅捷坠击+5(面板攻速2.00/1.99)":"必须勾选才能执行任务!",
7474
"远程魔之楔:【请勿携带“专注·厚重”】推荐装备金色迅捷+10或任意迅捷(面板攻速1.3~2.0)": "必须勾选才能执行任务!",
7575
"路线1·4撤离撞门超级跳延迟Offset": "-/+ 1",
7676
"路线1·4撤离撞门超级跳延迟-/+": "撤离点自动门前撞墙-不开门+",
@@ -177,8 +177,8 @@ def do_run(self):
177177
or not self.config.get("我已在 OK-DNA 游戏快捷键设置里配置【螺旋飞跃按键】", False)
178178
or not self.config.get("帧数敏感,如果不能稳120帧,大概率坠机", False)
179179
or not self.config.get("设置: 镜头距离1.3,120帧,最低画质,垂直同步关, 插帧关", False)
180-
or not self.config.get("阵容: 黎瑟 + 0精春玦戟 + 弧光百劫/裂魂 + 任意协战", False)
181-
or not self.config.get("近战魔之楔:【金色迅捷+10 / 紫色穿引共鸣 / 紫色迅捷蓄势+5 / 紫色迅捷坠击+5(面板攻速2.0)", False)
180+
or not self.config.get("阵容: 黎瑟 + 春玦戟(0熔/5熔)+ 弧光百劫/裂魂 + 任意协战", False)
181+
or not self.config.get("近战魔之楔:【金色迅捷 0熔 +10 / 5熔 +6】/ 穿引共鸣 / 迅捷蓄势+5 / 迅捷坠击+5(面板攻速2.00/1.99)", False)
182182
or not self.config.get("远程魔之楔:【请勿携带“专注·厚重”】推荐装备金色迅捷+10或任意迅捷(面板攻速1.3~2.0)", False)
183183
):
184184
logger.error("⚠️ 请先阅读注意事项并确认配置!")
@@ -341,8 +341,6 @@ def do_run(self):
341341
self.stats["current_phase"] = "重新开始"
342342
if self.stats.get("selected_path", None) is not None:
343343
self.stats["path_fail"][self.stats.get("selected_path", 1)-1] += 1
344-
if self.door_count > 0:
345-
self.stats["door_fail"][self.door_count-1] += 1
346344
self.info_set("上轮路径", f"路径{selected_path} 机关{self.door_count}")
347345
self.info_set("当前阶段", "重新开始")
348346
self.wait_until(
@@ -618,6 +616,7 @@ def execute_escort_path_cont(self):
618616
self.sleep(DEFAULT_PA_DELAY)
619617
self.execute_pa()
620618
self.sleep(DEFAULT_PA_DELAY)
619+
self.sleep(0.100)
621620
self.mouse_down(key="left")
622621
self.sleep(0.050)
623622
self.mouse_up(key="left")
@@ -721,7 +720,7 @@ def execute_escort_path_door_C_exit(self):
721720
self.sleep(0.200)
722721

723722
def execute_escort_path_door_D(self):
724-
self.execute_mouse_rot_deg(deg_x=-51.5, deg_y=-30)
723+
self.execute_mouse_rot_deg(deg_x=-52, deg_y=-30)
725724
self.sleep(0.050)
726725
self.execute_pa()
727726
self.sleep(DEFAULT_PA_DELAY)
@@ -741,7 +740,7 @@ def execute_escort_path_door_D(self):
741740
self.wait_for_interaction()
742741

743742
def execute_escort_path_door_D_exit(self):
744-
self.execute_mouse_rot_deg(deg_x=115, deg_y=15)
743+
self.execute_mouse_rot_deg(deg_x=115.5, deg_y=15)
745744
self.execute_pa()
746745
self.sleep(DEFAULT_PA_DELAY)
747746
self.execute_pa(deg_x=-30,deg_y=-15)
@@ -752,11 +751,11 @@ def execute_escort_path_door_D_exit(self):
752751
self.sleep(DEFAULT_PA_DELAY)
753752
self.execute_pa(deg_x=-5)
754753
self.sleep(DEFAULT_PA_DELAY)
755-
self.execute_pa(deg_x=-15)
754+
self.execute_pa(deg_x=-15, deg_y=10)
756755
self.sleep(DEFAULT_PA_DELAY)
757756
self.execute_pa(deg_x=-10)
758757
self.sleep(DEFAULT_PA_DELAY)
759-
self.execute_pa(deg_x=20)
758+
self.execute_pa(deg_x=20, deg_y=-10)
760759
self.sleep(DEFAULT_PA_DELAY)
761760
self.sleep(0.200)
762761

0 commit comments

Comments
 (0)