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

Add: 适配第一章, 修复大量bug

Browse Source 
- 修复处理夜间委托时, 出现递归调用的问题
- 增加红脸出击确认的功能
- 增加了透视识别错误图片保存的开关
- 修复了地图太小时, 透视识别报错的问题
- 修复了相机位于地图外时, 透视识别出错的问题
- 修复了离开退役时, 会连击的问题
- 修复了同时出现低心情和船坞已满弹窗时, 卡住的问题
- 更新了一键退役实装后的安全点击的位置
- 修复了换装滑动失败时, 卡住的问题
- 修复了关闭自动收获后, 出现委托完成的提示是, 进图卡住的问题
- 修复了, 无正在跑的委托时, 报错的问题
This commit is contained in:
LmeSzinc
2020-04-11 15:23:51 +08:00
parent f1c2d182db
commit be00742c3c
29 changed files with 246 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/retire/assets.py
View File

@@ -8,7 +8,7 @@ COMMON_SHIP_FILTER_DISABLE = Button(area=(666, 6, 802, 48), color=(71, 88, 125),
COMMON_SHIP_FILTER_ENABLE = Button(area=(666, 6, 802, 48), color=(182, 145, 96), button=(666, 6, 802, 48), file='./assets/retire/COMMON_SHIP_FILTER_ENABLE.png')
EQUIP_CONFIRM = Button(area=(871, 516, 1044, 573), color=(95, 143, 203), button=(871, 516, 1044, 573), file='./assets/retire/EQUIP_CONFIRM.png')
EQUIP_CONFIRM_2 = Button(area=(720, 541, 893, 598), color=(94, 142, 202), button=(720, 541, 893, 598), file='./assets/retire/EQUIP_CONFIRM_2.png')
GET_ITEMS_1_RETIREMENT_SAVE = Button(area=(951, 654, 987, 687), color=(64, 62, 69), button=(951, 654, 987, 687), file='./assets/retire/GET_ITEMS_1_RETIREMENT_SAVE.png')
GET_ITEMS_1_RETIREMENT_SAVE = Button(area=(1031, 656, 1063, 688), color=(49, 44, 54), button=(1031, 656, 1063, 688), file='./assets/retire/GET_ITEMS_1_RETIREMENT_SAVE.png')
IN_RETIREMENT_CHECK = Button(area=(854, 641, 1027, 698), color=(184, 99, 89), button=(854, 641, 1027, 698), file='./assets/retire/IN_RETIREMENT_CHECK.png')
RETIRE_APPEAR_1 = Button(area=(353, 492, 527, 550), color=(96, 144, 204), button=(353, 492, 527, 550), file='./assets/retire/RETIRE_APPEAR_1.png')
RETIRE_APPEAR_2 = Button(area=(553, 492, 727, 550), color=(94, 143, 204), button=(553, 492, 727, 550), file='./assets/retire/RETIRE_APPEAR_2.png')

19
module/retire/retirement.py
View File

@@ -4,7 +4,7 @@ from module.combat.assets import GET_ITEMS_1
from module.handler.info_bar import InfoBarHandler
from module.logger import logger
from module.retire.assets import *
from module.ui.ui import UI, BACK_ARROW
from module.ui.ui import UI
CARD_GRIDS = ButtonGrid(origin=(93, 76), delta=(164 + 2 / 3, 227), button_shape=(138, 204), grid_shape=(7, 2), name='CARD')
CARD_RARITY_GRIDS = ButtonGrid(origin=(93, 76), delta=(164 + 2 / 3, 227), button_shape=(138, 5), grid_shape=(7, 2), name='RARITY')
@@ -141,20 +141,11 @@ class Retirement(UI, InfoBarHandler):
and self.appear(RETIRE_APPEAR_2, offset=30) \
and self.appear(RETIRE_APPEAR_3, offset=30)
def _retirement_quit_check_func(self):
return not self.appear(IN_RETIREMENT_CHECK)
def _retirement_quit(self):
skip = True
while 1:
if skip:
skip = False
else:
self.device.screenshot()
# End
if not self.appear(IN_RETIREMENT_CHECK):
break
if self.appear_then_click(BACK_ARROW, offset=(20, 20)):
continue
self.ui_back(check_button=self._retirement_quit_check_func, skip_first_screenshot=True)
@property
def _retire_amount(self):