From 46099be0600adbfeb42f94bc0085be746a5c5143 Mon Sep 17 00:00:00 2001
From: Bella kira <2374035698@qq.com>
Date: Mon, 9 Dec 2024 22:37:42 +0800
Subject: [PATCH 1/3] fix bug apocalyptic

---
 tasks/challenge/apocalyptic.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tasks/challenge/apocalyptic.py b/tasks/challenge/apocalyptic.py
index a390b031..97bc6c8a 100644
--- a/tasks/challenge/apocalyptic.py
+++ b/tasks/challenge/apocalyptic.py
@@ -82,8 +82,11 @@ def start_challenges(self):
             if not self.start_challenge(level):
                 log.error(f"第{level}层挑战失败")
                 break
-
+            time.sleep(1)
+            if auto.find_element("3星通关所有", 'text', include=True):
+                auto.click_element("确认", 'text', max_retries=10, include=True)
             time.sleep(2)
+            
             screen.wait_for_screen_change('apocalyptic')
 
     def find_level(self, level, max_retries=4):

From d8af7a61f3977a0e7b7794d1bc6f859ae8e09516 Mon Sep 17 00:00:00 2001
From: Bella kira <2374035698@qq.com>
Date: Mon, 9 Dec 2024 23:03:14 +0800
Subject: [PATCH 2/3] fix bug apocalyptic

---
 3rdparty/Fhoe-Rail             | 2 +-
 tasks/challenge/apocalyptic.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/3rdparty/Fhoe-Rail b/3rdparty/Fhoe-Rail
index 06b26e29..7e8f5788 160000
--- a/3rdparty/Fhoe-Rail
+++ b/3rdparty/Fhoe-Rail
@@ -1 +1 @@
-Subproject commit 06b26e29f137903c9f1841299205ab60a892c0de
+Subproject commit 7e8f57889b3a9b81c6025779a0162812a77cf5e8
diff --git a/tasks/challenge/apocalyptic.py b/tasks/challenge/apocalyptic.py
index 59cefdf9..8da4099a 100644
--- a/tasks/challenge/apocalyptic.py
+++ b/tasks/challenge/apocalyptic.py
@@ -82,7 +82,7 @@ def start_challenges(self):
             if not self.start_challenge(level):
                 log.error(f"第{level}层挑战失败")
                 break
-            time.sleep(1)
+            time.sleep(3)
             if auto.find_element("3星通关所有", 'text', include=True):
                 auto.click_element("确认", 'text', max_retries=10, include=True)
             time.sleep(2)

From df954454a8db423f6af8ab42b683e0a16bed75a9 Mon Sep 17 00:00:00 2001
From: Bella kira <2374035698@qq.com>
Date: Mon, 9 Dec 2024 23:48:03 +0800
Subject: [PATCH 3/3] fix bug apocalyptic

---
 tasks/challenge/apocalyptic.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tasks/challenge/apocalyptic.py b/tasks/challenge/apocalyptic.py
index 8da4099a..53ce83e6 100644
--- a/tasks/challenge/apocalyptic.py
+++ b/tasks/challenge/apocalyptic.py
@@ -85,6 +85,7 @@ def start_challenges(self):
             time.sleep(3)
             if auto.find_element("3星通关所有", 'text', include=True):
                 auto.click_element("确认", 'text', max_retries=10, include=True)
+                auto.press_key("esc")
             time.sleep(2)
             
             screen.wait_for_screen_change('apocalyptic')