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

Fix: Expiration detection when selected a commission

Browse Source 
Red background of expiration become lighter when commission is selected
This commit is contained in:
LmeSzinc
2022-03-10 21:07:42 +08:00
parent 2d7135f7e7
commit ca2491611b
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/combat/combat.py
View File

@@ -420,7 +420,7 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
if not exp_info and self.handle_battle_status(drop=drop): if not exp_info and self.handle_battle_status(drop=drop):
battle_status = True battle_status = True
continue continue
if self.handle_popup_confirm('combat_status'): if self.handle_popup_confirm('COMBAT_STATUS'):
if battle_status and not exp_info: if battle_status and not exp_info:
logger.info('Locking a new ship') logger.info('Locking a new ship')
self.config.GET_SHIP_TRIGGERED = True self.config.GET_SHIP_TRIGGERED = True

2
module/commission/commission.py
View File

@@ -264,7 +264,7 @@ class RewardCommission(UI, InfoHandler):
self.device.sleep(0.3) self.device.sleep(0.3)
comm_timer.reset() comm_timer.reset()
if self.handle_popup_confirm(): if self.handle_popup_confirm('COMMISSION_START'):
comm_timer.reset() comm_timer.reset()
pass pass
if self.appear(COMMISSION_ADVICE, offset=(5, 20), interval=7): if self.appear(COMMISSION_ADVICE, offset=(5, 20), interval=7):

8
module/commission/project.py
View File

@@ -123,7 +123,7 @@ class Commission:
area = area_offset((-49, 68, -45, 84), self.area[0:2]) area = area_offset((-49, 68, -45, 84), self.area[0:2])
button = Button(area=area, color=(189, 65, 66), button = Button(area=area, color=(189, 65, 66),
button=area, name='IS_URGENT') button=area, name='IS_URGENT')
if button.appear_on(self.image): if button.appear_on(self.image, threshold=30):
area = area_offset((-49, 67, 45, 94), self.area[0:2]) area = area_offset((-49, 67, 45, 94), self.area[0:2])
button = Button(area=area, color=(), button=area, name='EXPIRE') button = Button(area=area, color=(), button=area, name='EXPIRE')
ocr = Duration(button) ocr = Duration(button)
@@ -167,7 +167,7 @@ class Commission:
area = area_offset((-49, 68, -45, 84), self.area[0:2]) area = area_offset((-49, 68, -45, 84), self.area[0:2])
button = Button(area=area, color=(189, 65, 66), button = Button(area=area, color=(189, 65, 66),
button=area, name='IS_URGENT') button=area, name='IS_URGENT')
if button.appear_on(self.image): if button.appear_on(self.image, threshold=30):
area = area_offset((-49, 67, 45, 94), self.area[0:2]) area = area_offset((-49, 67, 45, 94), self.area[0:2])
button = Button(area=area, color=(), button=area, name='EXPIRE') button = Button(area=area, color=(), button=area, name='EXPIRE')
ocr = Duration(button) ocr = Duration(button)
@@ -211,7 +211,7 @@ class Commission:
area = area_offset((-49, 68, -45, 84), self.area[0:2]) area = area_offset((-49, 68, -45, 84), self.area[0:2])
button = Button(area=area, color=(189, 65, 66), button = Button(area=area, color=(189, 65, 66),
button=area, name='IS_URGENT') button=area, name='IS_URGENT')
if button.appear_on(self.image): if button.appear_on(self.image, threshold=30):
area = area_offset((-49, 67, 45, 94), self.area[0:2]) area = area_offset((-49, 67, 45, 94), self.area[0:2])
button = Button(area=area, color=(), button=area, name='EXPIRE') button = Button(area=area, color=(), button=area, name='EXPIRE')
ocr = Duration(button) ocr = Duration(button)
@@ -255,7 +255,7 @@ class Commission:
area = area_offset((-49, 68, -45, 84), self.area[0:2]) area = area_offset((-49, 68, -45, 84), self.area[0:2])
button = Button(area=area, color=(189, 65, 66), button = Button(area=area, color=(189, 65, 66),
button=area, name='IS_URGENT') button=area, name='IS_URGENT')
if button.appear_on(self.image): if button.appear_on(self.image, threshold=30):
area = area_offset((-49, 67, 45, 94), self.area[0:2]) area = area_offset((-49, 67, 45, 94), self.area[0:2])
button = Button(area=area, color=(), button=area, name='EXPIRE') button = Button(area=area, color=(), button=area, name='EXPIRE')
ocr = Duration(button) ocr = Duration(button)