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

Revert "Upd: Coalition 20260122"

Browse Source 
This reverts commit 238428f7b9.
This commit is contained in:
sui-feng-cb
2026-01-23 16:24:44 +08:00
parent 66388f314a
commit 77e4af6be7
31 changed files with 110 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
module/coalition/coalition.py
View File

@@ -9,7 +9,6 @@ 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):
@@ -60,8 +59,6 @@ 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
@@ -158,9 +155,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()
@@ -198,10 +195,10 @@ class Coalition(CoalitionCombat, CampaignEvent):
logger.info(f'Count: {self.run_count}')
# UI switches
self.ui_goto(page_campaign_menu)
if self.triggered_stop_condition(oil_check=True):
break
# if self.config.SERVER in ['tw']:
# 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()