From fe4bf677ad3327d7b6c92230005eaed021f19ac2 Mon Sep 17 00:00:00 2001
From: zhoulu <2289642279@qq.com>
Date: Wed, 19 Feb 2025 20:31:14 +0800
Subject: [PATCH] A

1111
---
 .gitignore                    |  1 +
 src/task/BaseWWTask.py        | 10 ++++++++--
 src/task/FarmWorldBossTask.py | 10 +++++++---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5e24594..57249f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,3 +61,4 @@ pip-log.txt
 pip-delete-this-directory.txt
 autohelper
 working_images/
+repo/
\ No newline at end of file
diff --git a/src/task/BaseWWTask.py b/src/task/BaseWWTask.py
index 24824b4..4456de6 100644
--- a/src/task/BaseWWTask.py
+++ b/src/task/BaseWWTask.py
@@ -352,7 +352,7 @@ class BaseWWTask(BaseTask):
             return 'en_US'
         return 'unknown_lang'
 
-    def teleport_to_boss(self, boss_name, use_custom=False):
+    def teleport_to_boss(self, boss_name, use_custom=False, dead=False):
         self.zoom_map()
         pos = self.bosses_pos.get(boss_name)
         page = pos[0]
@@ -397,7 +397,13 @@ class BaseWWTask(BaseTask):
         self.log_info(f'index after scrolling down {index}')
         self.click_relative(0.89, 0.91)
         self.sleep(1)
-        self.wait_click_travel(use_custom=use_custom)
+        # 判断是否是角色死亡，需要传送复活状态
+        if not dead:
+            self.wait_click_travel(use_custom=use_custom)
+        else:
+            self.click_relative(0.92, 0.91)
+            self.sleep(1)
+            self.click_relative(0.68, 0.6)
         self.wait_in_team_and_world(time_out=120)
         self.sleep(0.5)
 
diff --git a/src/task/FarmWorldBossTask.py b/src/task/FarmWorldBossTask.py
index 0aa74bd..d4e81d8 100644
--- a/src/task/FarmWorldBossTask.py
+++ b/src/task/FarmWorldBossTask.py
@@ -81,7 +81,7 @@ class FarmWorldBossTask(BaseCombatTask):
                             logger.info(f'sleep for the Bell-Borne model to appear')
                             self.sleep(15)
                         elif boss_name == 'Lorelei':
-                            if count % 6 < 3:                                
+                            if count % 6 < 3:
                                 self.change_time_to_night()
                         self.middle_click_relative(0.5, 0.5)
                         self.sleep(0.4)
@@ -92,8 +92,12 @@ class FarmWorldBossTask(BaseCombatTask):
                         try:
                             self.combat_once(wait_before=0)
                         except CharDeadException as e:
-                            self.log_error(f'Characters dead', notify=True, tray=True)
-                            return
+                            # self.log_error(f'Characters dead', notify=True, tray=True)
+                            # 打开书，选择一个没有传送点的Boss（老朔雷），传送到附近坐标复活角色，再从下一个boss继续
+                            self.sleep(1)
+                            self.send_key('esc')
+                            self.teleport_to_boss('Tempest Mephis', use_custom=True, dead=True)
+                            continue
                         logger.info(f'farm echo combat end')
                         if boss_name == 'Bell-Borne Geochelone':
                             logger.info(f'sleep for the Boss model to disappear')