From ec4997b1aeaf9367b9c02b53ec24c246d4b8a398 Mon Sep 17 00:00:00 2001 From: sui-feng-cb <2518179942@qq.com> Date: Wed, 8 Oct 2025 17:51:55 +0800 Subject: [PATCH] Fix: image_color_count for storage_hp_get --- .../os_handler/TEMPLATE_STORAGE_SHIP_EMPTY.png | Bin 1914 -> 0 bytes module/os/fleet.py | 7 ++++--- module/os_handler/assets.py | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 assets/cn/os_handler/TEMPLATE_STORAGE_SHIP_EMPTY.png diff --git a/assets/cn/os_handler/TEMPLATE_STORAGE_SHIP_EMPTY.png b/assets/cn/os_handler/TEMPLATE_STORAGE_SHIP_EMPTY.png deleted file mode 100644 index 023ed5c114e9d5a097d579498ea6573a40b5fccd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1914 zcmbVNe^3-v9AA<2G(^QL#3px^!&JE2y%*?rt?cei`o?s12j zfA|9xNX4f7tw}LbhT0D$(-JcsZ7{9TVL*y3Wpr>VtY9>e-W|t{HkOk+^Y*>B@AE$2 z-``!ImpgOR$heURf{e;GQ~7Yl;E0z+!1s#s*#w+MxXtrK1bKQ~U<^UF?~Fx|$X_^X zkyK>KAsNA?q* zfP$sDR%WS#F|b&w37z35A%P1>H0pObd6D!Ru^=xA*MZMCh6W*$!-%B?1foTjJTyb_ z0MwvVDHwuKp?ZUoPGPlrohAuY6KV}kXmGVgL8OqnWKyF?Lk|YUdDs#%pUMgegF7Q; zmn1id<368H>C-3$j}2ED3~>} z78VPc&5IJvGa#EXV$fzK$FXDyt<&o@Dandry+Nzc8nleUkir@iKwV-0w4u0It2GSX zrv%0ui0t5f_J7`=?crc)(atC42^3r)B}g+T!eEt$Dxv_ChE`4v4Q2sJGlA?jVoV^c zfW<R;fa1(A~fQOyS16!2OuD*mI5$bFz&1zm>H+R;Coy3@i!em8L;nt*&sydw?Z)8wk zlKSRO@1E4$eFa~?lp3qD-RtVzQ{5IVbjttIFWA&w7rUW}A~rR2T{d)nGIwECW#zo_ z)875DZ^OyvSBCCryX1YnH9@YvWpa&*>y%A7?Va=CPqUVlZn^#Zo}$P#c7aEf`}3c> zyWE6VpW+)UB5Ry$O0QxK)+C4EytoZ1t>7P%i*voB~SDnSqG-WMWxk7z@Rif(n z;@Sx8=mHLj?anP*{N;*qcG=jmn!-8Ut3$8JGB4DBaAqNofa)RjT_$Q+ZF}E~-Q*7W zxteX3Ihs#h(;fY%Z}knEtlCv-E?-qU+V=dWm#-#{_+gL)jd4=y2chv|{GOGjGZ34jieA+=AX7=8lVM z0`s_r&$@JXBStn}Nk~dZCNh=jzLwDrSAI*?r59o?ROR@g=dXX)drH}*IM{ykz38T% w*F;YA9=`M2vSZV~rR3PT<<9yF#r^)_W2|4azMre70)NNs%v|a~`jVA@1LJwENB{r; diff --git a/module/os/fleet.py b/module/os/fleet.py index 4dc03d2d2..38bc8ad4d 100644 --- a/module/os/fleet.py +++ b/module/os/fleet.py @@ -22,7 +22,7 @@ from module.os.camera import OSCamera from module.os.map_base import OSCampaignMap from module.os_ash.ash import OSAsh from module.os_combat.combat import Combat -from module.os_handler.assets import AUTO_SEARCH_REWARD, CLICK_SAFE_AREA, IN_MAP, PORT_ENTER, TEMPLATE_STORAGE_SHIP_EMPTY +from module.os_handler.assets import AUTO_SEARCH_REWARD, CLICK_SAFE_AREA, IN_MAP, PORT_ENTER from module.os_shop.assets import PORT_SUPPLY_CHECK from module.ui.assets import BACK_ARROW @@ -202,8 +202,9 @@ class OSFleet(OSCamera, Combat, Fleet, OSAsh): def _storage_hp_get(self): super().hp_get() ship_icon = self._hp_grid().crop((-29, -165, 106, -30)) - has_ship = [not TEMPLATE_STORAGE_SHIP_EMPTY.match( - self.image_crop(button, copy=False)) for button in ship_icon.buttons] + # gray background if no ship + has_ship = [not self.image_color_count(button, color=(36, 41, 46), threshold=221, count=15000) + for button in ship_icon.buttons] need_repair = [not repair for repair in self.hp_has_ship] for index, repair in enumerate(need_repair): if repair: diff --git a/module/os_handler/assets.py b/module/os_handler/assets.py index f8cb85b6d..2ec84caf9 100644 --- a/module/os_handler/assets.py +++ b/module/os_handler/assets.py @@ -100,5 +100,4 @@ TEMPLATE_STORAGE_QUALITY_COMBAT = Template(file={'cn': './assets/cn/os_handler/T TEMPLATE_STORAGE_QUALITY_OFFENSE = Template(file={'cn': './assets/cn/os_handler/TEMPLATE_STORAGE_QUALITY_OFFENSE.png', 'en': './assets/en/os_handler/TEMPLATE_STORAGE_QUALITY_OFFENSE.png', 'jp': './assets/jp/os_handler/TEMPLATE_STORAGE_QUALITY_OFFENSE.png', 'tw': './assets/tw/os_handler/TEMPLATE_STORAGE_QUALITY_OFFENSE.png'}) TEMPLATE_STORAGE_QUALITY_SURVIVAL = Template(file={'cn': './assets/cn/os_handler/TEMPLATE_STORAGE_QUALITY_SURVIVAL.png', 'en': './assets/en/os_handler/TEMPLATE_STORAGE_QUALITY_SURVIVAL.png', 'jp': './assets/jp/os_handler/TEMPLATE_STORAGE_QUALITY_SURVIVAL.png', 'tw': './assets/tw/os_handler/TEMPLATE_STORAGE_QUALITY_SURVIVAL.png'}) TEMPLATE_STORAGE_REPAIR_PACK = Template(file={'cn': './assets/cn/os_handler/TEMPLATE_STORAGE_REPAIR_PACK.png', 'en': './assets/cn/os_handler/TEMPLATE_STORAGE_REPAIR_PACK.png', 'jp': './assets/cn/os_handler/TEMPLATE_STORAGE_REPAIR_PACK.png', 'tw': './assets/cn/os_handler/TEMPLATE_STORAGE_REPAIR_PACK.png'}) -TEMPLATE_STORAGE_SHIP_EMPTY = Template(file={'cn': './assets/cn/os_handler/TEMPLATE_STORAGE_SHIP_EMPTY.png', 'en': './assets/cn/os_handler/TEMPLATE_STORAGE_SHIP_EMPTY.png', 'jp': './assets/cn/os_handler/TEMPLATE_STORAGE_SHIP_EMPTY.png', 'tw': './assets/cn/os_handler/TEMPLATE_STORAGE_SHIP_EMPTY.png'}) TEMPLATE_STORAGE_SURVIVAL = Template(file={'cn': './assets/cn/os_handler/TEMPLATE_STORAGE_SURVIVAL.png', 'en': './assets/en/os_handler/TEMPLATE_STORAGE_SURVIVAL.png', 'jp': './assets/jp/os_handler/TEMPLATE_STORAGE_SURVIVAL.png', 'tw': './assets/tw/os_handler/TEMPLATE_STORAGE_SURVIVAL.png'})