sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-02 00:16:21 +08:00
Code Activity

Fix: shop can also encounter dock full; re-base to Retirement, UI is ancestor

Browse Source
This commit is contained in:
nEEtdo0d
2022-05-29 15:20:30 -04:00
parent e22f3a3523
commit c43b73ba36
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
module/shop/base.py
View File

@@ -7,11 +7,11 @@ 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_SHIP
from module.exception import ScriptError from module.exception import ScriptError
from module.logger import logger from module.logger import logger
from module.retire.retirement import Retirement
from module.shop.assets import * from module.shop.assets import *
from module.statistics.item import ItemGrid from module.statistics.item import ItemGrid
from module.tactical.tactical_class import Book from module.tactical.tactical_class import Book
from module.ui.assets import BACK_ARROW from module.ui.assets import BACK_ARROW
from module.ui.ui import UI
FILTER_REGEX = re.compile( FILTER_REGEX = re.compile(
'^(cube|drill|chip|array|pr|dr|box|bulin|book|food|plate|retrofit|cat)' '^(cube|drill|chip|array|pr|dr|box|bulin|book|food|plate|retrofit|cat)'
@@ -73,7 +73,7 @@ class ShopItemGrid(ItemGrid):
return self.items return self.items
class ShopBase(UI): class ShopBase(Retirement):
@cached_property @cached_property
def shop_filter(self): def shop_filter(self):
""" """
@@ -296,6 +296,9 @@ class ShopBase(UI):
self.device.click(SHOP_CLICK_SAFE_AREA) self.device.click(SHOP_CLICK_SAFE_AREA)
self.interval_reset(BACK_ARROW) self.interval_reset(BACK_ARROW)
continue continue
if self.handle_retirement():
self.interval_reset(BACK_ARROW)
continue
if self.appear(GET_ITEMS_1, interval=1): if self.appear(GET_ITEMS_1, interval=1):
self.device.click(SHOP_CLICK_SAFE_AREA) self.device.click(SHOP_CLICK_SAFE_AREA)
self.interval_reset(BACK_ARROW) self.interval_reset(BACK_ARROW)