diff --git a/src/task/BaseWWTask.py b/src/task/BaseWWTask.py index 2a36757..29d054a 100644 --- a/src/task/BaseWWTask.py +++ b/src/task/BaseWWTask.py @@ -88,7 +88,7 @@ class BaseWWTask(BaseTask, FindFeature, OCR): if f and target_text: search_text_box = f.copy(x_offset=f.width * 5, width_offset=f.width * 7, height_offset=1.5 * f.height, y_offset=-0.8 * f.height, name='search_text_box') - text = self.ocr(box=search_text_box, match=target_text) + text = self.ocr(box=search_text_box, match=target_text, target_height=540) logger.debug(f'found f with text {text}, target_text {target_text}') if not text: return None diff --git a/src/task/FarmEchoTask.py b/src/task/FarmEchoTask.py index 8718baf..04c2ab4 100644 --- a/src/task/FarmEchoTask.py +++ b/src/task/FarmEchoTask.py @@ -59,11 +59,11 @@ class FarmEchoTask(BaseCombatTask): self.send_key('esc') self.wait_click_feature('gray_confirm_exit_button', relative_x=-1, raise_if_not_found=True, use_gray_scale=True) - self.wait_in_team_and_world(time_out=40) + self.wait_in_team_and_world(time_out=120) self.sleep(4) if self.config.get('Entrance Direction') == 'Backward': - self.send_key('a', down_time=0.2) # Jue - self.sleep(1) + self.right_click() # Jue + self.sleep(3) def incr_drop(self, dropped): if dropped: diff --git a/src/task/FarmWorldBossTask.py b/src/task/FarmWorldBossTask.py index ce43e02..2bc2741 100644 --- a/src/task/FarmWorldBossTask.py +++ b/src/task/FarmWorldBossTask.py @@ -96,7 +96,7 @@ class FarmWorldBossTask(BaseCombatTask): self.wait_click_feature('gray_custom_way_point', box=self.box_of_screen(0.62, 0.48, 0.70, 0.86), raise_if_not_found=True, threshold=0.75, time_out=2) self.click_fast_travel() - self.wait_in_team_and_world(time_out=30) + self.wait_in_team_and_world(time_out=120) def click_fast_travel(self): travel = self.wait_feature('fast_travel_custom', raise_if_not_found=True, threshold=0.75)