mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-22 16:23:43 +08:00
Upd: Coalition 20260122
This commit is contained in:
@@ -9,6 +9,7 @@ from module.log_res.log_res import LogRes
|
||||
from module.logger import logger
|
||||
from module.ocr.ocr import Digit
|
||||
from module.ui.assets import BACK_ARROW
|
||||
from module.ui.page import page_campaign_menu
|
||||
|
||||
|
||||
class AcademyPtOcr(Digit):
|
||||
@@ -59,6 +60,8 @@ class Coalition(CoalitionCombat, CampaignEvent):
|
||||
ocr = Digit(NEONCITY_PT_OCR, name='OCR_PT', lang='cnocr', letter=(208, 208, 208), threshold=128)
|
||||
elif event == 'coalition_20251120':
|
||||
ocr = DALPtOcr(DAL_PT_OCR, name='OCR_PT' ,letter=(255, 213, 69), threshold=128)
|
||||
elif event == 'coalition_20260122':
|
||||
ocr = Digit(FASHION_PT_OCR, name='OCR_PT', letter=(41, 41, 42), threshold=128)
|
||||
else:
|
||||
logger.error(f'ocr object is not defined in event {event}')
|
||||
raise ScriptError
|
||||
@@ -155,9 +158,9 @@ class Coalition(CoalitionCombat, CampaignEvent):
|
||||
self.coalition_map_exit(event)
|
||||
raise
|
||||
|
||||
if self.triggered_stop_condition(oil_check=True):
|
||||
self.coalition_map_exit(event)
|
||||
raise ScriptEnd
|
||||
# if self.triggered_stop_condition(oil_check=True):
|
||||
# self.coalition_map_exit(event)
|
||||
# raise ScriptEnd
|
||||
|
||||
self.enter_map(event=event, stage=stage, mode=fleet)
|
||||
self.coalition_combat()
|
||||
@@ -195,10 +198,10 @@ class Coalition(CoalitionCombat, CampaignEvent):
|
||||
logger.info(f'Count: {self.run_count}')
|
||||
|
||||
# UI switches
|
||||
# if self.config.SERVER in ['tw']:
|
||||
# self.ui_goto(page_campaign_menu)
|
||||
# if self.triggered_stop_condition(oil_check=True):
|
||||
# break
|
||||
self.ui_goto(page_campaign_menu)
|
||||
if self.triggered_stop_condition(oil_check=True):
|
||||
break
|
||||
|
||||
self.device.stuck_record_clear()
|
||||
self.device.click_record_clear()
|
||||
self.ui_goto_coalition()
|
||||
|
||||
Reference in New Issue
Block a user