From 64fa1797b02c3ce6313e606f9f03b511e6cc0751 Mon Sep 17 00:00:00 2001
From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Date: Thu, 20 Jun 2024 02:03:41 +0800
Subject: [PATCH] Upd: Add another state of
 _dungeon_wait_survival_index_loaded() end

---
 .../dungeon/ui/SURVIVAL_INDEX_OE_LOADED.png     | Bin 0 -> 7354 bytes
 ....png => SURVIVAL_INDEX_SU_LOADED.SEARCH.png} | Bin
 ..._LOADED.png => SURVIVAL_INDEX_SU_LOADED.png} | Bin
 tasks/dungeon/assets/assets_dungeon_ui.py       |  16 +++++++++++++---
 tasks/dungeon/ui.py                             |   9 ++++++---
 5 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 assets/share/dungeon/ui/SURVIVAL_INDEX_OE_LOADED.png
 rename assets/share/dungeon/ui/{SURVIVAL_INDEX_LOADED.SEARCH.png => SURVIVAL_INDEX_SU_LOADED.SEARCH.png} (100%)
 rename assets/share/dungeon/ui/{SURVIVAL_INDEX_LOADED.png => SURVIVAL_INDEX_SU_LOADED.png} (100%)

diff --git a/assets/share/dungeon/ui/SURVIVAL_INDEX_OE_LOADED.png b/assets/share/dungeon/ui/SURVIVAL_INDEX_OE_LOADED.png
new file mode 100644
index 0000000000000000000000000000000000000000..1deb1e701ce146bab6b6499ffdc6e3af2f853259
GIT binary patch
literal 7354
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

literal 0
HcmV?d00001

diff --git a/assets/share/dungeon/ui/SURVIVAL_INDEX_LOADED.SEARCH.png b/assets/share/dungeon/ui/SURVIVAL_INDEX_SU_LOADED.SEARCH.png
similarity index 100%
rename from assets/share/dungeon/ui/SURVIVAL_INDEX_LOADED.SEARCH.png
rename to assets/share/dungeon/ui/SURVIVAL_INDEX_SU_LOADED.SEARCH.png
diff --git a/assets/share/dungeon/ui/SURVIVAL_INDEX_LOADED.png b/assets/share/dungeon/ui/SURVIVAL_INDEX_SU_LOADED.png
similarity index 100%
rename from assets/share/dungeon/ui/SURVIVAL_INDEX_LOADED.png
rename to assets/share/dungeon/ui/SURVIVAL_INDEX_SU_LOADED.png
diff --git a/tasks/dungeon/assets/assets_dungeon_ui.py b/tasks/dungeon/assets/assets_dungeon_ui.py
index 77c5fe3e6..87d79d6f7 100644
--- a/tasks/dungeon/assets/assets_dungeon_ui.py
+++ b/tasks/dungeon/assets/assets_dungeon_ui.py
@@ -143,10 +143,20 @@ SURVIVAL_INDEX_CLICK = ButtonWrapper(
         button=(332, 94, 370, 133),
     ),
 )
-SURVIVAL_INDEX_LOADED = ButtonWrapper(
-    name='SURVIVAL_INDEX_LOADED',
+SURVIVAL_INDEX_OE_LOADED = ButtonWrapper(
+    name='SURVIVAL_INDEX_OE_LOADED',
     share=Button(
-        file='./assets/share/dungeon/ui/SURVIVAL_INDEX_LOADED.png',
+        file='./assets/share/dungeon/ui/SURVIVAL_INDEX_OE_LOADED.png',
+        area=(473, 207, 498, 232),
+        search=(453, 187, 518, 252),
+        color=(185, 135, 74),
+        button=(473, 207, 498, 232),
+    ),
+)
+SURVIVAL_INDEX_SU_LOADED = ButtonWrapper(
+    name='SURVIVAL_INDEX_SU_LOADED',
+    share=Button(
+        file='./assets/share/dungeon/ui/SURVIVAL_INDEX_SU_LOADED.png',
         area=(451, 286, 476, 302),
         search=(449, 263, 489, 356),
         color=(142, 150, 197),
diff --git a/tasks/dungeon/ui.py b/tasks/dungeon/ui.py
index 571771f00..177ccc6bf 100644
--- a/tasks/dungeon/ui.py
+++ b/tasks/dungeon/ui.py
@@ -296,8 +296,11 @@ class DungeonUI(DungeonState):
             if timeout.reached():
                 logger.warning('Wait survival index loaded timeout')
                 return False
-            if self.appear(SURVIVAL_INDEX_LOADED):
-                logger.info('Survival index loaded')
+            if self.appear(SURVIVAL_INDEX_SU_LOADED):
+                logger.info('Survival index loaded, SURVIVAL_INDEX_SU_LOADED')
+                return True
+            if self.appear(SURVIVAL_INDEX_OE_LOADED):
+                logger.info('Survival index loaded, SURVIVAL_INDEX_OE_LOADED')
                 return True
 
     def _dungeon_wait_treasures_lightward_loaded(self, skip_first_screenshot=True):
@@ -703,7 +706,7 @@ class DungeonUI(DungeonState):
             self._rogue_teleport()
         """
         self.dungeon_tab_goto(KEYWORDS_DUNGEON_TAB.Survival_Index)
-        if self.appear(SURVIVAL_INDEX_LOADED):
+        if self.appear(SURVIVAL_INDEX_SU_LOADED):
             logger.info('Already at nav Simulated_Universe')
         else:
             self._dungeon_nav_goto(KEYWORDS_DUNGEON_NAV.Simulated_Universe)