From 6684d2ddd11f6311d677fcebe30c0355c87433ee Mon Sep 17 00:00:00 2001
From: sui-feng-cb <2518179942@qq.com>
Date: Sun, 8 Feb 2026 23:06:50 +0800
Subject: [PATCH] Upd: island ui_additional

---
 assets/cn/island/ISLAND_INFO_EXIT.png | Bin 0 -> 3679 bytes
 module/island/assets.py               |   1 +
 module/island/island.py               |   1 -
 module/island/project.py              |   4 +-
 module/island/ui.py                   |  62 +++++++++-----------------
 5 files changed, 24 insertions(+), 44 deletions(-)
 create mode 100644 assets/cn/island/ISLAND_INFO_EXIT.png

diff --git a/assets/cn/island/ISLAND_INFO_EXIT.png b/assets/cn/island/ISLAND_INFO_EXIT.png
new file mode 100644
index 0000000000000000000000000000000000000000..71eca8e335b1e9d638f7fd2944df3c0fdbddfc5c
GIT binary patch
literal 3679
zcmeAS@N?(olHy`uVBq!ia0y~yU<ERnE^sgbDF=BkMg|5xHBT4EkcwMx?;iA@oG!!u
zA>8d+P?zJvt(`Y7c5L2K-yqX=?<}9(U-oB7V*cIc(=7`1wn_y1@)&xn%(3?S$6R%x
zd1>Os9nI|eCwdekwZd4wU%IZ?$aL!E+MhL-_Ei2l@L8^Idw$)YiYB0yqhK@ys2T!I
z3H?G03<BEc=h;^O{&u#Nd;gUz<K1<h3k_;MK3f0q(S?Q1UR)dp7#NNOF8-KrG_&Sw
z*26P1<<rvt-#RM&>E~keygNQiCuwUt#>dZ}#57S)m4QJa?A^V+(stk9zn7QS7w<lL
z-d0YIlmFZI@9nQ&zFbwsl)Wzqn0u0*zP!A@x;nVkNpY@Uf1h0aj}Hg`{IQ>3VK(1B
zYGnu;8{6TpbFC*oetiAevu9I81R59_Iu_Ud{$^Vhayo^ry{%2C^U20!<*!wLk9Lb&
z%jt-;c`sev+`Rf_dDSkdW%rLBJvv=KUQ1Jfftf+TeWp)ZX6DO#dw<*7uC9Hsx7vOs
z|D9KV?{!>y|K!P&soMM7Uz*2oA826UVQ{EnF8C1>7q{+e*3CCr@;jERTN)V|8E;ON
z-w~lR?ex+Y`tw&`&Dt5$cWFHX4>(+G8QK@wedzmq;Pvym<;(28)v+cxFt9N!FlH*a
z@QOL#o_|l`yX_%b>;3mL8Gu}KL6Xtp$A11hWpWj(cg8bHfPD614};8>+3f4Czup=1
z?$y;GHRB)u{vHF#W@JO+$GuM`bN74?m2-1{zx?v@^24gcM8z6ln6j_Em%p=S?aiER
zwqJjIOjc!8vI0fc>1TWeDSvGWHmPR(J^%b{@&4B@8JM$oO<`bY@Vl5{vg)dRcv#a`
z{~xAzLL@=1eb61GBc>lO7rnpu<)w%nD~&*5abUXgeEX`uzrN;}iEnxLo7euK()81<
zvmf?fVZSj^GJ%2N(bBg(AD;cLleeju0W9L|_E_=n`C0eCG_8S=QG%hNkMlt8``^9q
z*!`9U{rt1Nwzj%o{(pu221vk_#4+fJbw4f2Oh_>Oo44b=`7Ze%2O8g))h0m0q=5k#
zM`4S;Set%b_<i@k>5J_OtmaC|=`FeZ@+?eIM>WGeoA0;3?YsY??!nq;jgYWcxW>5S
z?Va~w?u+aSjDCLoP*8W+25RdObB285@4Kfyefo6f%qq3XvQob;umdCe^XJcy=n)8B
zy!d{uJy6NgrAvQ*w?D@`-=a|I&#xyZg@J)v4GO`C%71?<^`>)274J_@-ft?^d*15a
z?c3G={+w6$ue*O$^vv0_vNk_@CowS@FfbHe$<Zq-FTcO<ulv%VOtaa$E1Z=kT2y~K
z9=zOdZ}s=Q1ck**9F|0LGB9*Zy?OKI_4W6Ce0<*M{oSTi^7-1@&Kf&;w#=_ARL%3F
uhK+{6Xb6mkz-S1JhQMeD&?5vI=Kf*l6#P@4#j8^Tvd`1i&t;ucLK6VC1_Z(Y

literal 0
HcmV?d00001

diff --git a/module/island/assets.py b/module/island/assets.py
index 49e6d2c51..63329a674 100644
--- a/module/island/assets.py
+++ b/module/island/assets.py
@@ -7,6 +7,7 @@ from module.base.template import Template
 GET_ITEMS_ISLAND = Button(area={'cn': (588, 260, 692, 289), 'en': (588, 260, 692, 289), 'jp': (588, 260, 692, 289), 'tw': (588, 260, 692, 289)}, color={'cn': (178, 180, 180), 'en': (149, 151, 152), 'jp': (178, 180, 180), 'tw': (178, 180, 180)}, button={'cn': (0, 263, 129, 555), 'en': (588, 260, 692, 289), 'jp': (0, 263, 129, 555), 'tw': (0, 263, 129, 555)}, file={'cn': './assets/cn/island/GET_ITEMS_ISLAND.png', 'en': './assets/en/island/GET_ITEMS_ISLAND.png', 'jp': './assets/cn/island/GET_ITEMS_ISLAND.png', 'tw': './assets/cn/island/GET_ITEMS_ISLAND.png'})
 ISLAND_AMOUNT_MAX = Button(area={'cn': (960, 382, 988, 405), 'en': (960, 382, 988, 405), 'jp': (960, 382, 988, 405), 'tw': (960, 382, 988, 405)}, color={'cn': (72, 72, 78), 'en': (78, 78, 84), 'jp': (72, 72, 78), 'tw': (72, 72, 78)}, button={'cn': (960, 382, 988, 405), 'en': (960, 382, 988, 405), 'jp': (960, 382, 988, 405), 'tw': (960, 382, 988, 405)}, file={'cn': './assets/cn/island/ISLAND_AMOUNT_MAX.png', 'en': './assets/en/island/ISLAND_AMOUNT_MAX.png', 'jp': './assets/cn/island/ISLAND_AMOUNT_MAX.png', 'tw': './assets/cn/island/ISLAND_AMOUNT_MAX.png'})
 ISLAND_CLICK_SAFE_AREA = Button(area={'cn': (0, 263, 129, 555), 'en': (0, 263, 129, 555), 'jp': (0, 263, 129, 555), 'tw': (0, 263, 129, 555)}, color={'cn': (50, 52, 56), 'en': (50, 52, 56), 'jp': (50, 52, 56), 'tw': (50, 52, 56)}, button={'cn': (0, 263, 129, 555), 'en': (0, 263, 129, 555), 'jp': (0, 263, 129, 555), 'tw': (0, 263, 129, 555)}, file={'cn': './assets/cn/island/ISLAND_CLICK_SAFE_AREA.png', 'en': './assets/cn/island/ISLAND_CLICK_SAFE_AREA.png', 'jp': './assets/cn/island/ISLAND_CLICK_SAFE_AREA.png', 'tw': './assets/cn/island/ISLAND_CLICK_SAFE_AREA.png'})
+ISLAND_INFO_EXIT = Button(area={'cn': (907, 160, 933, 187), 'en': (907, 160, 933, 187), 'jp': (907, 160, 933, 187), 'tw': (907, 160, 933, 187)}, color={'cn': (96, 96, 96), 'en': (96, 96, 96), 'jp': (96, 96, 96), 'tw': (96, 96, 96)}, button={'cn': (907, 160, 933, 187), 'en': (907, 160, 933, 187), 'jp': (907, 160, 933, 187), 'tw': (907, 160, 933, 187)}, file={'cn': './assets/cn/island/ISLAND_INFO_EXIT.png', 'en': './assets/cn/island/ISLAND_INFO_EXIT.png', 'jp': './assets/cn/island/ISLAND_INFO_EXIT.png', 'tw': './assets/cn/island/ISLAND_INFO_EXIT.png'})
 ISLAND_MANAGEMENT = Button(area={'cn': (1077, 493, 1119, 533), 'en': (1077, 493, 1119, 533), 'jp': (1077, 493, 1119, 533), 'tw': (1077, 493, 1119, 533)}, color={'cn': (187, 224, 135), 'en': (187, 224, 135), 'jp': (187, 224, 135), 'tw': (187, 224, 135)}, button={'cn': (1077, 493, 1119, 533), 'en': (1077, 493, 1119, 533), 'jp': (1077, 493, 1119, 533), 'tw': (1077, 493, 1119, 533)}, file={'cn': './assets/cn/island/ISLAND_MANAGEMENT.png', 'en': './assets/cn/island/ISLAND_MANAGEMENT.png', 'jp': './assets/cn/island/ISLAND_MANAGEMENT.png', 'tw': './assets/cn/island/ISLAND_MANAGEMENT.png'})
 ISLAND_MANAGEMENT_CHECK = Button(area={'cn': (123, 21, 304, 47), 'en': (123, 21, 304, 47), 'jp': (123, 21, 304, 47), 'tw': (123, 21, 304, 47)}, color={'cn': (77, 83, 96), 'en': (90, 96, 108), 'jp': (77, 83, 96), 'tw': (77, 83, 96)}, button={'cn': (123, 21, 304, 47), 'en': (123, 21, 304, 47), 'jp': (123, 21, 304, 47), 'tw': (123, 21, 304, 47)}, file={'cn': './assets/cn/island/ISLAND_MANAGEMENT_CHECK.png', 'en': './assets/en/island/ISLAND_MANAGEMENT_CHECK.png', 'jp': './assets/cn/island/ISLAND_MANAGEMENT_CHECK.png', 'tw': './assets/cn/island/ISLAND_MANAGEMENT_CHECK.png'})
 ISLAND_MANAGEMENT_LOCKED = Button(area={'cn': (1092, 504, 1105, 520), 'en': (1092, 504, 1105, 520), 'jp': (1092, 504, 1105, 520), 'tw': (1092, 504, 1105, 520)}, color={'cn': (197, 206, 195), 'en': (197, 206, 195), 'jp': (197, 206, 195), 'tw': (197, 206, 195)}, button={'cn': (1092, 504, 1105, 520), 'en': (1092, 504, 1105, 520), 'jp': (1092, 504, 1105, 520), 'tw': (1092, 504, 1105, 520)}, file={'cn': './assets/cn/island/ISLAND_MANAGEMENT_LOCKED.png', 'en': './assets/cn/island/ISLAND_MANAGEMENT_LOCKED.png', 'jp': './assets/cn/island/ISLAND_MANAGEMENT_LOCKED.png', 'tw': './assets/cn/island/ISLAND_MANAGEMENT_LOCKED.png'})
diff --git a/module/island/island.py b/module/island/island.py
index b03e03c12..9505f62fe 100644
--- a/module/island/island.py
+++ b/module/island/island.py
@@ -63,7 +63,6 @@ class Island(IslandProjectRun, IslandTransportRun):
             project = any(project_config)
             names = self.island_config_to_names(project_config)
             if transport or project:
-                self.ui_goto_island()
                 self.ui_ensure(page_island_phone)
                 self.island_run(transport=transport, project=project, names=names)
                 self.ui_goto(page_main, get_ship=False)
diff --git a/module/island/project.py b/module/island/project.py
index 61d418094..e61ca143f 100644
--- a/module/island/project.py
+++ b/module/island/project.py
@@ -367,6 +367,7 @@ class IslandProjectRun(IslandUI):
             # UI additional
             if self.island_in_management(interval=5):
                 self.device.click(button)
+                self.device.sleep(0.1)
                 click_timer.reset()
                 continue
 
@@ -387,16 +388,13 @@ class IslandProjectRun(IslandUI):
                 continue
 
             if self.appear_then_click(PROJECT_COMPLETE, offset=(20, 20), interval=1):
-                self.device.sleep(0.1)
                 success = True
-                # enter = False
                 self.interval_clear(GET_ITEMS_ISLAND)
                 self.interval_reset(ROLE_SELECT_ENTER)
                 click_timer.reset()
                 continue
 
             if self.handle_get_items():
-                # enter = True
                 self.interval_clear(ROLE_SELECT_ENTER)
                 click_timer.reset()
                 continue
diff --git a/module/island/ui.py b/module/island/ui.py
index 1d5ff5861..08117267d 100644
--- a/module/island/ui.py
+++ b/module/island/ui.py
@@ -2,8 +2,8 @@ from module.base.timer import Timer
 from module.handler.assets import MAINTENANCE_ANNOUNCE, USE_DATA_KEY_NOTIFIED
 from module.island.assets import *
 from module.logger import logger
-from module.ui.assets import DORMMENU_GOTO_ISLAND, SHOP_BACK_ARROW
-from module.ui.page import page_dormmenu, page_island, page_island_phone
+from module.ui.assets import SHOP_BACK_ARROW
+from module.ui.page import page_island_phone
 from module.ui.ui import UI
 
 
@@ -88,7 +88,7 @@ class IslandUI(UI):
             skip_first_screenshot=True
         )
 
-    def ui_ensure_management_page(self, skip_first_screenshot=True):
+    def ui_ensure_management_page(self):
         """
         Pages:
             in: page_island_phone or product page
@@ -97,12 +97,7 @@ class IslandUI(UI):
         logger.info('UI ensure management page')
         self.interval_clear(ISLAND_MANAGEMENT_CHECK)
         confirm_timer = Timer(1, count=2).start()
-        while 1:
-            if skip_first_screenshot:
-                skip_first_screenshot = False
-            else:
-                self.device.screenshot()
-
+        for _ in self.loop():
             if self.island_in_management():
                 if confirm_timer.reached():
                     break
@@ -121,38 +116,25 @@ class IslandUI(UI):
             return True
         return False
 
-    def handle_island_ui_additional(self, skip_first_screenshot=True):
-        if not self.appear(MAINTENANCE_ANNOUNCE, offset=(100, 50)):
-            return False
+    def ui_additional(self, get_ship=True):
+        # notify in page_dormmenu
+        if self.appear(MAINTENANCE_ANNOUNCE, offset=(100, 50)):
+            for _ in self.loop():
+                enabled = self.image_color_count(
+                    USE_DATA_KEY_NOTIFIED, color=(140, 207, 66), threshold=180, count=10)
+                if enabled:
+                    break
 
-        while 1:
-            if skip_first_screenshot:
-                skip_first_screenshot = False
-            else:
-                self.device.screenshot()
+                if self.appear(MAINTENANCE_ANNOUNCE, offset=(100, 50), interval=5):
+                    self.device.click(USE_DATA_KEY_NOTIFIED)
+                    continue
 
-            enabled = self.image_color_count(
-                USE_DATA_KEY_NOTIFIED, color=(140, 207, 66), threshold=180, count=10)
-            if enabled:
-                break
-
-            if self.appear(MAINTENANCE_ANNOUNCE, offset=(100, 50), interval=5):
-                self.device.click(USE_DATA_KEY_NOTIFIED)
-                continue
-
-        self.interval_clear(MAINTENANCE_ANNOUNCE)
-        self.appear_then_click(MAINTENANCE_ANNOUNCE, offset=(100, 50), interval=2)
-        return True
-
-    def ui_goto_island(self):
-        if self.ui_get_current_page() in [page_island, page_island_phone]:
-            logger.info(f'Already at {self.ui_current}')
+            self.interval_clear(MAINTENANCE_ANNOUNCE)
+            self.appear_then_click(MAINTENANCE_ANNOUNCE, offset=(100, 50), interval=2)
+            return True
+        
+        # info in page_island
+        if self.appear_then_click(ISLAND_INFO_EXIT, offset=(30, 30), interval=3):
             return True
 
-        self.ui_ensure(page_dormmenu)
-        self.ui_click(click_button=DORMMENU_GOTO_ISLAND,
-                      check_button=page_island.check_button,
-                      additional=self.handle_island_ui_additional,
-                      offset=(30, 30),
-                      retry_wait=2,
-                      skip_first_screenshot=True)
+        return super().ui_additional(get_ship=False)