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

Fix: Can't get oil amount for TW server (#5217)

Browse Source 
* Fix: Can't get oil amount for TW server

* fix condition

forgot parameter

* delete unnecessary part

remove return main page
This commit is contained in:
whjhs1010203 2025-10-15 18:21:37 +08:00 committed by GitHub
parent c99b104f8f
commit 59e5a39d64
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
module/coalition/coalition.py
View File

@ -6,6 +6,7 @@ from module.coalition.combat import CoalitionCombat
from module.exception import ScriptError, ScriptEnd from module.exception import ScriptError, ScriptEnd
from module.logger import logger from module.logger import logger
from module.ocr.ocr import Digit from module.ocr.ocr import Digit
from module.ui.page import page_campaign_menu
class AcademyPtOcr(Digit): class AcademyPtOcr(Digit):
@ -110,7 +111,8 @@ class Coalition(CoalitionCombat, CampaignEvent):
raise raise
self.enter_map(event=event, stage=stage, mode=fleet) self.enter_map(event=event, stage=stage, mode=fleet)
if self.triggered_stop_condition(oil_check=True): oil_check_boolean=True if self.config.SERVER not in ['tw'] else False
if self.triggered_stop_condition(oil_check=oil_check_boolean):
self.coalition_map_exit(event) self.coalition_map_exit(event)
raise ScriptEnd raise ScriptEnd
self.coalition_combat() self.coalition_combat()
@ -148,6 +150,10 @@ class Coalition(CoalitionCombat, CampaignEvent):
logger.info(f'Count: {self.run_count}') logger.info(f'Count: {self.run_count}')
# UI switches # UI switches
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.stuck_record_clear()
self.device.click_record_clear() self.device.click_record_clear()
self.ui_goto_coalition() self.ui_goto_coalition()