Skip to content

Commit 2ad259f

Browse files
committed
♻️ refactor(tasks): 优化任务完成后的界面处理
- 更改任务完成后的继续按钮点击逻辑
1 parent 64c7260 commit 2ad259f

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

src/tasks/CommissionsTask.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,11 @@ def continue_mission(self, timeout=0):
158158
if self.in_team():
159159
return False
160160
action_timeout = self.action_timeout if timeout == 0 else timeout
161-
continue_btn = self.wait_until(self.find_ingame_continue_btn, time_out=action_timeout, raise_if_not_found=True)
162-
left_extend = -continue_btn.width / self.width
161+
# continue_btn = self.wait_until(self.find_ingame_continue_btn, time_out=action_timeout, raise_if_not_found=True)
162+
# left_extend = -continue_btn.width / self.width
163163
self.wait_until(
164-
condition=lambda: not self.find_ingame_continue_btn(),
165-
post_action=lambda: self.click_box_random(continue_btn, left_extend=left_extend, right_extend=0.1, up_extend=-0.002, down_extend=-0.002, post_sleep=0, after_sleep=0.25),
164+
condition=lambda: not self.find_ingame_continue_btn() and not self.find_ingame_quit_btn(),
165+
post_action=lambda: self.click_relative_random(0.647, 0.683, 0.696, 0.704, after_sleep=0.25),
166166
time_out=action_timeout,
167167
raise_if_not_found=True,
168168
)
@@ -458,7 +458,7 @@ def handle_mission_interface(self, stop_func=lambda: False):
458458
self.start_mission()
459459
self.mission_status = Mission.START
460460
return
461-
elif self.find_ingame_continue_btn():
461+
elif self.find_ingame_continue_btn() or self.find_ingame_quit_btn():
462462
if stop_func():
463463
self.log_info("处理任务界面: 终止任务")
464464
return Mission.STOP

0 commit comments

Comments
 (0)