From 39aa03ca82ea9998ed172884942e2e7a1df065b6 Mon Sep 17 00:00:00 2001 From: W1NDes Date: Thu, 29 Jan 2026 20:59:18 +0800 Subject: [PATCH] =?UTF-8?q?Upd(os):=20=E6=B7=BB=E5=8A=A0=E5=9C=A8merge?= =?UTF-8?q?=E4=B8=AD=E4=B8=A2=E5=A4=B1=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- module/os/tasks/abyssal.py | 2 +- module/os/tasks/shop.py | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/module/os/tasks/abyssal.py b/module/os/tasks/abyssal.py index d90b3a179..f9527f352 100644 --- a/module/os/tasks/abyssal.py +++ b/module/os/tasks/abyssal.py @@ -45,7 +45,7 @@ class OpsiAbyssal(OSMap): self.zone_init() result = self.run_abyssal() if not result: - raise RequestHumanTakeover + self.map_exit() self.fleet_repair(revert=False) self.delay_abyssal() diff --git a/module/os/tasks/shop.py b/module/os/tasks/shop.py index b2df86f44..3050a4afe 100644 --- a/module/os/tasks/shop.py +++ b/module/os/tasks/shop.py @@ -36,6 +36,12 @@ class OpsiShop(OSMap): self.config.task_delay(target=next_reset) self.config.task_stop() + def os_voucher_buy_loggerUnlock(self): + logger.hr('OS voucher buy loggerUnlock', level=1) + self._os_voucher_enter() + VoucherShop(self.config, self.device).run_loggerUnlock() + self._os_voucher_exit() + def _os_shop_delay(self, not_empty) -> datetime: """ Calculate the delay of OpsiShop.