sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-26 07:05:02 +08:00
Code Activity

[Fix]: change the way of coding,

Browse Source 
now is more stable
This commit is contained in:
Cyunmi
2021-08-16 22:36:00 +08:00
parent 8e0b689e66
commit eecda9ba70
4 changed files with 27 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
module/equipment/equipment_change.py
View File

@@ -51,22 +51,17 @@ class EquipmentChange(Equipment):
for index in index_list:
if index in self.equipping_list:
logger.info(f'Record {index}')
while 1:
if skip_first_screenshot:
skip_first_screenshot = False
else:
self.device.screenshot()
if self.appear(EQUIPMENT_OPEN, interval=3):
self.device.click(EQUIP_INFO_BAR[(index, 0)])
continue
if self.appear_then_click(UPGRADE_ENTER, interval=3):
continue
if self.appear(UPGRADE_ENTER_CHECK, interval=3):
self.equip_list[index] = self.image_area(EQUIP_SAVE)
self.ui_click(
click_button=UPGRADE_QUIT, check_button=EQUIPMENT_OPEN, appear_button=UPGRADE_ENTER_CHECK, skip_first_screenshot=True)
break
logger.info('Enter equipment info')
self.ui_click(appear_button=EQUIPMENT_OPEN, click_button=EQUIP_INFO_BAR[(
index, 0)], check_button=UPGRADE_ENTER)
logger.info('Enter upgrade inform')
self.ui_click(click_button=UPGRADE_ENTER,
check_button=UPGRADE_ENTER_CHECK, skip_first_screenshot=True)
logger.info('Save equipment tamplate')
self.equip_list[index] = self.image_area(EQUIP_SAVE)
logger.info('Quit upgrade inform')
self.ui_click(
click_button=UPGRADE_QUIT, check_button=EQUIPMENT_OPEN, appear_button=UPGRADE_ENTER_CHECK, skip_first_screenshot=True)
def equipment_take_on(self, index_list=range(0, 5), skip_first_screenshot=True):
'''
@@ -109,7 +104,7 @@ class EquipmentChange(Equipment):
self.device.sleep(0.3)
self.device.screenshot()
def _equip_equipment(self, point, offset=(100, 100), skip_first_screenshot=True):
def _equip_equipment(self, point, offset=(100, 100)):
'''
Equip Equipment then back to ship details
Confirm the popup
@@ -117,24 +112,12 @@ class EquipmentChange(Equipment):
in: EQUIPMENT STATUS
out: SHIP_SIDEBAR_EQUIPMENT
'''
have_equipped = False
while 1:
if skip_first_screenshot:
skip_first_screenshot = False
else:
self.device.screenshot()
if not have_equipped and self.appear(EQUIPPING_OFF, interval=5):
self.device.click(
Button(button=(point[0], point[1], point[0]+offset[0], point[1]+offset[1]), color=None, area=None))
have_equipped = True
continue
if have_equipped and self.appear_then_click(EQUIP_CONFIRM, interval=2):
continue
if self.info_bar_count():
break
logger.info('Equip equipment')
self.ui_click(appear_button=EQUIPPING_OFF, click_button=Button(button=(
point[0], point[1], point[0]+offset[0], point[1]+offset[1]), color=None, area=None), check_button=EQUIP_CONFIRM)
logger.info('Equip confirm')
self.ui_click(click_button=EQUIP_CONFIRM,
check_button=SHIP_INFO_EQUIPMENT_CHECK)
def _find_equip(self, index):
'''