sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 13:17:00 +08:00
Code Activity

Fix: rename equip_enter

Browse Source
This commit is contained in:
Air111
2024-04-19 14:13:18 +08:00
parent 01a3c29c8b
commit cddfea680d
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/campaign/gems_farming.py
View File

@@ -67,7 +67,7 @@ class GemsCampaignOverride(CampaignBase):
raise CampaignEnd('Emotion withdraw') raise CampaignEnd('Emotion withdraw')
class GemsFarming(CampaignRun, Dock, FleetEquipment): class GemsFarming(CampaignRun, FleetEquipment, Dock):
def load_campaign(self, name, folder='campaign_main'): def load_campaign(self, name, folder='campaign_main'):
super().load_campaign(name, folder) super().load_campaign(name, folder)

4
module/retire/dock.py
View File

@@ -1,13 +1,13 @@
from module.base.button import ButtonGrid from module.base.button import ButtonGrid
from module.base.decorator import cached_property from module.base.decorator import cached_property
from module.base.timer import Timer from module.base.timer import Timer
from module.equipment.equipment import Equipment
from module.logger import logger from module.logger import logger
from module.ocr.ocr import DigitCounter from module.ocr.ocr import DigitCounter
from module.retire.assets import * from module.retire.assets import *
from module.ui.scroll import Scroll from module.ui.scroll import Scroll
from module.ui.setting import Setting from module.ui.setting import Setting
from module.ui.switch import Switch from module.ui.switch import Switch
from module.ui.ui import UI
DOCK_SORTING = Switch('Dork_sorting') DOCK_SORTING = Switch('Dork_sorting')
DOCK_SORTING.add_status('Ascending', check_button=SORT_ASC, click_button=SORTING_CLICK) DOCK_SORTING.add_status('Ascending', check_button=SORT_ASC, click_button=SORTING_CLICK)
@@ -28,7 +28,7 @@ DOCK_SCROLL = Scroll(DOCK_SCROLL, color=(247, 211, 66), name='DOCK_SCROLL')
OCR_DOCK_SELECTED = DigitCounter(DOCK_SELECTED, threshold=64, name='OCR_DOCK_SELECTED') OCR_DOCK_SELECTED = DigitCounter(DOCK_SELECTED, threshold=64, name='OCR_DOCK_SELECTED')
class Dock(UI): class Dock(Equipment):
def handle_dock_cards_loading(self): def handle_dock_cards_loading(self):
# Poor implementation. # Poor implementation.
self.device.sleep((1, 1.5)) self.device.sleep((1, 1.5))

2
module/retire/enhancement.py
View File

@@ -49,7 +49,7 @@ class Enhancement(Dock):
if self.appear(DOCK_EMPTY, offset=(30, 30)): if self.appear(DOCK_EMPTY, offset=(30, 30)):
return False return False
self.equip_enter( self.ship_info_enter(
CARD_GRIDS[(0, 0)], check_button=SHIP_DETAIL_CHECK, long_click=False) CARD_GRIDS[(0, 0)], check_button=SHIP_DETAIL_CHECK, long_click=False)
return True return True