ReDawn/wess09
1
0
Fork 0
mirror of https://github.com/wess09/AzurLaneAutoScript.git synced 2026-05-14 06:58:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #454 from wess09/dev

Browse Source 
fix
This commit is contained in:
茗 2026-05-12 09:42:48 +08:00 committed by GitHub
commit 84ffeeb573
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/cn/os_handler/FLEET_DEPLOYMENT.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

5
module/os/tasks/fleet_auto_change.py
View File

@ -16,6 +16,7 @@ from module.os_handler.assets import (
FAVORITE_BUTTON,
FAVORITE_TEMPLATE,
FLEET_DEPLOY_BUTTON,
FLEET_DEPLOYMENT,
FLEET_SLOT_1_BUTTON,
FLEET_SLOT_1_TEMPLATE,
FLEET_SLOT_2_BUTTON,
@ -328,7 +329,7 @@ class OpsiFleetAutoChange(CoinTaskMixin, DockMixin, OSMap):
timeout = 10
enter_timeout = 0
while not self.appear(FLEET_SLOT_1_TEMPLATE, offset=(20, 20)):
while not self.appear(FLEET_DEPLOYMENT, offset=(20, 20)):
self.device.screenshot()
enter_timeout += 1
if enter_timeout > timeout * 2:
@ -409,7 +410,7 @@ class OpsiFleetAutoChange(CoinTaskMixin, DockMixin, OSMap):
self.device.screenshot()
return_timeout = 0
while not self.appear(FLEET_SLOT_1_TEMPLATE, offset=(20, 20)):
while not self.appear(FLEET_DEPLOYMENT, offset=(20, 20)):
self.device.screenshot()
return_timeout += 1
if return_timeout > timeout * 2:

1
module/os_handler/assets.py
View File

@ -26,6 +26,7 @@ EXCHANGE_CHECK = Button(area={'cn': (144, 17, 249, 41), 'en': (143, 16, 240, 37)
EXCHANGE_ENTER = Button(area={'cn': (195, 629, 344, 693), 'en': (202, 640, 332, 690), 'jp': (195, 629, 345, 693), 'tw': (195, 629, 344, 693)}, color={'cn': (58, 54, 52), 'en': (64, 61, 59), 'jp': (53, 50, 48), 'tw': (59, 55, 54)}, button={'cn': (195, 629, 344, 693), 'en': (202, 640, 332, 690), 'jp': (195, 629, 345, 693), 'tw': (195, 629, 344, 693)}, file={'cn': './assets/cn/os_handler/EXCHANGE_ENTER.png', 'en': './assets/en/os_handler/EXCHANGE_ENTER.png', 'jp': './assets/jp/os_handler/EXCHANGE_ENTER.png', 'tw': './assets/tw/os_handler/EXCHANGE_ENTER.png'})
FAVORITE_BUTTON = Button(area={'cn': (1143, 630, 1218, 707), 'en': (1143, 630, 1218, 707), 'jp': (1143, 630, 1218, 707), 'tw': (1143, 630, 1218, 707)}, color={'cn': (154, 125, 133), 'en': (154, 125, 133), 'jp': (154, 125, 133), 'tw': (154, 125, 133)}, button={'cn': (1143, 630, 1218, 707), 'en': (1143, 630, 1218, 707), 'jp': (1143, 630, 1218, 707), 'tw': (1143, 630, 1218, 707)}, file={'cn': './assets/cn/os_handler/FAVORITE_BUTTON.png', 'en': './assets/cn/os_handler/FAVORITE_BUTTON.png', 'jp': './assets/cn/os_handler/FAVORITE_BUTTON.png', 'tw': './assets/cn/os_handler/FAVORITE_BUTTON.png'})
FAVORITE_TEMPLATE = Button(area={'cn': (1165, 674, 1196, 689), 'en': (1165, 674, 1196, 689), 'jp': (1165, 674, 1196, 689), 'tw': (1165, 674, 1196, 689)}, color={'cn': (206, 180, 125), 'en': (206, 180, 125), 'jp': (206, 180, 125), 'tw': (206, 180, 125)}, button={'cn': (1165, 674, 1196, 689), 'en': (1165, 674, 1196, 689), 'jp': (1165, 674, 1196, 689), 'tw': (1165, 674, 1196, 689)}, file={'cn': './assets/cn/os_handler/FAVORITE_TEMPLATE.png', 'en': './assets/cn/os_handler/FAVORITE_TEMPLATE.png', 'jp': './assets/cn/os_handler/FAVORITE_TEMPLATE.png', 'tw': './assets/cn/os_handler/FAVORITE_TEMPLATE.png'})
FLEET_DEPLOYMENT = Button(area={'cn': (100, 71, 364, 115), 'en': (100, 71, 364, 115), 'jp': (100, 71, 364, 115), 'tw': (100, 71, 364, 115)}, color={'cn': (91, 107, 139), 'en': (91, 107, 139), 'jp': (91, 107, 139), 'tw': (91, 107, 139)}, button={'cn': (100, 71, 364, 115), 'en': (100, 71, 364, 115), 'jp': (100, 71, 364, 115), 'tw': (100, 71, 364, 115)}, file={'cn': './assets/cn/os_handler/FLEET_DEPLOYMENT.png', 'en': './assets/cn/os_handler/FLEET_DEPLOYMENT.png', 'jp': './assets/cn/os_handler/FLEET_DEPLOYMENT.png', 'tw': './assets/cn/os_handler/FLEET_DEPLOYMENT.png'})
FLEET_DEPLOY_BUTTON = Button(area={'cn': (920, 122, 1220, 218), 'en': (920, 122, 1220, 218), 'jp': (920, 122, 1220, 218), 'tw': (920, 122, 1220, 218)}, color={'cn': (87, 126, 191), 'en': (87, 126, 191), 'jp': (87, 126, 191), 'tw': (87, 126, 191)}, button={'cn': (920, 122, 1220, 218), 'en': (920, 122, 1220, 218), 'jp': (920, 122, 1220, 218), 'tw': (920, 122, 1220, 218)}, file={'cn': './assets/cn/os_handler/FLEET_DEPLOY_BUTTON.png', 'en': './assets/cn/os_handler/FLEET_DEPLOY_BUTTON.png', 'jp': './assets/cn/os_handler/FLEET_DEPLOY_BUTTON.png', 'tw': './assets/cn/os_handler/FLEET_DEPLOY_BUTTON.png'})
FLEET_DEPLOY_TEMPLATE = Button(area={'cn': (991, 138, 1116, 170), 'en': (991, 138, 1116, 170), 'jp': (991, 138, 1116, 170), 'tw': (991, 138, 1116, 170)}, color={'cn': (160, 183, 220), 'en': (160, 183, 220), 'jp': (160, 183, 220), 'tw': (160, 183, 220)}, button={'cn': (991, 138, 1116, 170), 'en': (991, 138, 1116, 170), 'jp': (991, 138, 1116, 170), 'tw': (991, 138, 1116, 170)}, file={'cn': './assets/cn/os_handler/FLEET_DEPLOY_TEMPLATE.png', 'en': './assets/cn/os_handler/FLEET_DEPLOY_TEMPLATE.png', 'jp': './assets/cn/os_handler/FLEET_DEPLOY_TEMPLATE.png', 'tw': './assets/cn/os_handler/FLEET_DEPLOY_TEMPLATE.png'})
FLEET_SLOT_1_BUTTON = Button(area={'cn': (373, 170, 453, 248), 'en': (373, 170, 453, 248), 'jp': (373, 170, 453, 248), 'tw': (373, 170, 453, 248)}, color={'cn': (189, 172, 187), 'en': (189, 172, 187), 'jp': (189, 172, 187), 'tw': (189, 172, 187)}, button={'cn': (373, 170, 453, 248), 'en': (373, 170, 453, 248), 'jp': (373, 170, 453, 248), 'tw': (373, 170, 453, 248)}, file={'cn': './assets/cn/os_handler/FLEET_SLOT_1_BUTTON.png', 'en': './assets/cn/os_handler/FLEET_SLOT_1_BUTTON.png', 'jp': './assets/cn/os_handler/FLEET_SLOT_1_BUTTON.png', 'tw': './assets/cn/os_handler/FLEET_SLOT_1_BUTTON.png'})