From 6af48d7be996335075c0af4e23441de514f64ff6 Mon Sep 17 00:00:00 2001
From: huangjiule <122609521+huangjiule@users.noreply.github.com>
Date: Thu, 22 Feb 2024 16:30:00 +0800
Subject: [PATCH 1/3] Update retirement.py (#3500)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Upd:[TW]Event assets (#3479)

* Upd:[TW]war_archives assets (#3490)

* Update retirement.py

选择更换任意白皮航母时，能够正确保留退役

---------

Co-authored-by: RilyLC <94281898+RilyLC@users.noreply.github.com>
---
 module/retire/retirement.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/retire/retirement.py b/module/retire/retirement.py
index ca04652fd..7f9abc842 100644
--- a/module/retire/retirement.py
+++ b/module/retire/retirement.py
@@ -468,7 +468,7 @@ class Retirement(Enhancement, QuickRetireSettingHandler):
                                   color=button.color,
                                   name=f'TEMPLATE_{common_cv_name}_RETIRE')
 
-                return None
+            return None
         else:
 
             template = globals()[

From b615ebf3cff9a63e1694488a854773d8740178b1 Mon Sep 17 00:00:00 2001
From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Date: Thu, 22 Feb 2024 16:31:14 +0800
Subject: [PATCH 2/3] Fix: Handle bugged AP button before game devs get it
 fixed

---
 module/os/map.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/module/os/map.py b/module/os/map.py
index 94f574908..0ca0dae7b 100644
--- a/module/os/map.py
+++ b/module/os/map.py
@@ -86,6 +86,11 @@ class OSMap(OSFleet, Map, GlobeCamera, StrategicSearchHandler):
             self.run_auto_search(rescan=False)
             self.handle_after_auto_search()
 
+        # 2024.02.22, game client bugged, action point button has no response
+        logger.error('Game client bugged, wait game devs have the AP button fixed')
+        self.config.task_delay(minute=60)
+        self.config.task_stop()
+
     def get_current_zone_from_globe(self):
         """
         Get current zone from globe map. See OSMapOperation.get_current_zone()

From c5fb5a57c5a8b227d9dcd57b8ea9faa55c9ee0af Mon Sep 17 00:00:00 2001
From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Date: Thu, 22 Feb 2024 21:00:39 +0800
Subject: [PATCH 3/3] Revert "Fix: Handle bugged AP button before game devs get
 it fixed"

This reverts commit b615ebf3
---
 module/os/map.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/module/os/map.py b/module/os/map.py
index 0ca0dae7b..94f574908 100644
--- a/module/os/map.py
+++ b/module/os/map.py
@@ -86,11 +86,6 @@ class OSMap(OSFleet, Map, GlobeCamera, StrategicSearchHandler):
             self.run_auto_search(rescan=False)
             self.handle_after_auto_search()
 
-        # 2024.02.22, game client bugged, action point button has no response
-        logger.error('Game client bugged, wait game devs have the AP button fixed')
-        self.config.task_delay(minute=60)
-        self.config.task_stop()
-
     def get_current_zone_from_globe(self):
         """
         Get current zone from globe map. See OSMapOperation.get_current_zone()