optimize jue

ok-oldking · Jul 12, 2024 · 488d1c7 · 488d1c7
1 parent f38fe77
commit 488d1c7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/task/BaseCombatTask.py b/src/task/BaseCombatTask.py
@@ -48,6 +48,7 @@ def combat_once(self, wait_combat_time=180, wait_before=2):
         self.sleep(wait_before)
         self.wait_until(lambda: self.in_combat(), time_out=3, raise_if_not_found=True)
         self.load_chars()
+        self.info['Combat Count'] = self.info.get('Combat Count', 0) + 1
         while self.in_combat():
             try:
                 logger.debug(f'combat_once loop {self.chars}')

diff --git a/src/task/FarmEchoTask.py b/src/task/FarmEchoTask.py
@@ -53,7 +53,8 @@ def run(self):
 
         while count < self.config.get("Repeat Farm Count", 0):
             count += 1
-            self.wait_until(lambda: self.in_team()[0], time_out=40)
+            self.wait_in_team_and_world(time_out=20)
+            self.sleep(1)
             self.walk_until_f(time_out=10,
                               direction='w' if self.config.get('Entrance Direction') == 'Forward' else 's')
             logger.info(f'enter success')