sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-11 19:48:21 +08:00
Code Activity

Fix: Handle GET_ITEMS when switching from guild lobby to logistics

Browse Source
This commit is contained in:
LmeSzinc
2022-10-15 23:48:44 +08:00
parent 6968e77cc7
commit 95738436b7
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
module/ui/navbar.py
View File

@@ -1,7 +1,7 @@
from module.base.base import ModuleBase from module.base.base import ModuleBase
from module.base.button import ButtonGrid from module.base.button import ButtonGrid
from module.base.timer import Timer from module.base.timer import Timer
from module.combat.assets import GET_ITEMS_1, GET_SHIP from module.combat.assets import GET_ITEMS_1, GET_ITEMS_2, GET_SHIP
from module.logger import logger from module.logger import logger
from module.shop.assets import SHOP_CLICK_SAFE_AREA from module.shop.assets import SHOP_CLICK_SAFE_AREA
@@ -100,20 +100,22 @@ class Navbar:
""" """
# Check name, identifies if NavBar # Check name, identifies if NavBar
# instance belongs to shop module # instance belongs to shop module
if self.name != 'SHOP_BOTTOM_NAVBAR': if self.name not in ['SHOP_BOTTOM_NAVBAR', 'GUILD_SIDE_NAVBAR']:
return False return False
# Handle shop obstructions # Handle shop obstructions
if main.appear(GET_SHIP, interval=1): if main.appear(GET_SHIP, interval=1):
main.device.click(SHOP_CLICK_SAFE_AREA) main.device.click(SHOP_CLICK_SAFE_AREA)
return True return True
if main.appear(GET_ITEMS_1, interval=1): if main.appear(GET_ITEMS_1, offset=(30, 30), interval=1):
main.device.click(SHOP_CLICK_SAFE_AREA)
return True
if main.appear(GET_ITEMS_2, offset=(30, 30), interval=1):
main.device.click(SHOP_CLICK_SAFE_AREA) main.device.click(SHOP_CLICK_SAFE_AREA)
return True return True
return False return False
def set(self, main, left=None, right=None, upper=None, bottom=None, skip_first_screenshot=True): def set(self, main, left=None, right=None, upper=None, bottom=None, skip_first_screenshot=True):
""" """
Set nav bar from 1 direction. Set nav bar from 1 direction.