修复打开不了界面

ok-oldking · Jan 9, 2025 · 2a82492 · 2a82492
1 parent 268087e
commit 2a82492
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 42 deletions.
diff --git a/deploy.txt b/deploy.txt
@@ -1,8 +1,6 @@
 src
 ok
 config.py
-launcher.json
-launcher.py
 main.py
 ok-ww.exe
 main.py

diff --git a/launcher.json b/launcher.json
diff --git a/launcher.py b/launcher.py
diff --git a/requirements.txt b/requirements.txt
@@ -37,7 +37,7 @@ numpy==1.26.4
     #   openvino
     #   rapidocr-openvino
     #   shapely
-ok-script==0.0.438
+ok-script==0.0.439
     # via -r .\requirements.in
 opencv-contrib-python==4.10.0.84
     # via -r .\requirements.in

diff --git a/src/task/AutoCombatTask.py b/src/task/AutoCombatTask.py
@@ -26,11 +26,7 @@ def run(self):
                 else:
                     self.get_current_char().perform()
             except CharDeadException:
-                logger.info(f'char dead try teleport to heal')
-                try:
-                    self.teleport_to_heal()
-                except Exception as e:
-                    logger.error('teleport to heal error', e)
+                self.log_error(f'Characters dead', notify=True, tray=True)
                 break
             except NotInCombatException as e:
                 current_char = self.get_current_char()

diff --git a/src/task/FarmWorldBossTask.py b/src/task/FarmWorldBossTask.py
@@ -86,10 +86,9 @@ def run(self):
                             self.sleep(5)
                         try:
                             self.combat_once(wait_before=0)
-                        except CharDeadException:
-                            logger.info(f'char dead try teleport to heal')
-                            self.teleport_to_heal()
-                            continue
+                        except CharDeadException as e:
+                            self.log_error(f'Characters dead', notify=True, tray=True)
+                            return
                         logger.info(f'farm echo combat end')
                         if boss_name == 'Bell-Borne Geochelone':
                             logger.info(f'sleep for the Boss model to disappear')