Skip to content

Commit 7c6e4b6

Browse files
committed
fix switching level
1 parent 0779690 commit 7c6e4b6

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

tableturf/manager/tableturf.py

+8-2
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ def run(self, profile: Profile, closer: Closer = None, debug=False):
8787
self.run_once(task.deck, closer=task_closer, debug=debug)
8888
if closer.close(self.job_stats):
8989
return
90+
self.__switch_level()
9091
current_level += 1
9192
current_win = 0
92-
self.__switch_level()
9393
if current_level == task.target_level:
9494
to_win = task.target_win - current_win
9595
if to_win > 0:
@@ -310,7 +310,7 @@ def __close(self, close: bool):
310310
self.__controller.press_buttons([Controller.Button.A])
311311
target = 0 if close else 1
312312
count = 0
313-
while True:
313+
for i in range(101):
314314
current = self.__multi_detect(detection.replay_cursor)(debug=self.__session['debug'])
315315
if current == target:
316316
break
@@ -330,11 +330,14 @@ def __start(self):
330330
while not self.__multi_detect(detection.level)(debug=self.__session['debug']):
331331
self.__controller.press_buttons([Controller.Button.A])
332332
sleep(2)
333+
self.__controller.press_buttons([Controller.Button.DPAD_RIGHT])
334+
self.__controller.press_buttons([Controller.Button.DPAD_RIGHT])
333335
while not self.__multi_detect(detection.start)(debug=self.__session['debug']):
334336
self.__controller.press_buttons([Controller.Button.DPAD_DOWN])
335337
sleep(0.5)
336338
self.__controller.press_buttons([Controller.Button.A])
337339
self.__controller.press_buttons([Controller.Button.A]) # in case command is lost
340+
sleep(2)
338341
# while self.__multi_detect(detection.deck_cursor)(debug=self.__session['debug']) == -1:
339342
# self.__controller.press_buttons([Controller.Button.A])
340343
# sleep(0.5)
@@ -344,11 +347,14 @@ def __switch_level(self):
344347
while not self.__multi_detect(detection.level)(debug=self.__session['debug']):
345348
self.__controller.press_buttons([Controller.Button.A])
346349
sleep(2)
350+
self.__controller.press_buttons([Controller.Button.DPAD_RIGHT])
351+
self.__controller.press_buttons([Controller.Button.DPAD_RIGHT])
347352
while not self.__multi_detect(detection.start)(debug=self.__session['debug']):
348353
self.__controller.press_buttons([Controller.Button.DPAD_DOWN])
349354
sleep(0.5)
350355
self.__controller.press_buttons([Controller.Button.A])
351356
self.__controller.press_buttons([Controller.Button.A]) # in case command is lost
357+
sleep(2)
352358
# while self.__multi_detect(detection.deck_cursor)(debug=self.__session['debug']) == -1:
353359
# self.__controller.press_buttons([Controller.Button.A])
354360
# sleep(0.5)

0 commit comments

Comments
 (0)