Ver Fonte

fix(Exploration): end task #214

ryland há 2 anos atrás
pai
commit
1e34bee214

+ 2 - 1
tasks/Exploration/script_task.py

@@ -11,7 +11,7 @@ from tasks.GameUi.game_ui import GameUi
 from tasks.GameUi.page import page_exploration, page_shikigami_records, page_main
 from tasks.GameUi.page import page_exploration, page_shikigami_records, page_main
 
 
 from module.logger import logger
 from module.logger import logger
-from module.exception import RequestHumanTakeover
+from module.exception import RequestHumanTakeover, TaskEnd
 from module.atom.image_grid import ImageGrid
 from module.atom.image_grid import ImageGrid
 
 
 
 
@@ -78,6 +78,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, ExplorationAssets):
                 self.appear_then_click(self.I_RED_CLOSE)
                 self.appear_then_click(self.I_RED_CLOSE)
             self.ui_goto(page_main)
             self.ui_goto(page_main)
             self.set_next_run(task='Exploration', success=True, finish=False)
             self.set_next_run(task='Exploration', success=True, finish=False)
+        raise TaskEnd
 
 
     # 查找指定的章节:
     # 查找指定的章节:
     def open_expect_level(self):
     def open_expect_level(self):

+ 1 - 1
tasks/Hyakkiyakou/utils/exp_test.py

@@ -291,7 +291,7 @@ class ExpTest(RightActivity, FastDevice, RestartAssets, ExplorationAssets):
                       save_roi=(random.randint(100, 540), 80))
                       save_roi=(random.randint(100, 540), 80))
         back_4 = Step('back_4', pos=(pos_left, pos_bottom), time=2, save_time=1.6, save_img=True,
         back_4 = Step('back_4', pos=(pos_left, pos_bottom), time=2, save_time=1.6, save_img=True,
                       save_roi=(random.randint(100, 540), 80))
                       save_roi=(random.randint(100, 540), 80))
-        back_5 = Step('back_5', pos=(pos_left, pos_level), time=1.7, save_img=True,
+        back_5 = Step('back_5', pos=(pos_left, pos_level), time=1.4, save_img=True,
                       save_roi=(random.randint(100, 540), 80))
                       save_roi=(random.randint(100, 540), 80))
 
 
         self.run_step(back_1)
         self.run_step(back_1)