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

Fix: check once in combat_preparation

Browse Source
This commit is contained in:
sui-feng-cb 2026-02-05 21:43:38 +08:00
parent 6f1bdf1315
commit 701807ec9f
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
module/raid/raid.py
View File

@ -261,12 +261,15 @@ class Raid(MapOperation, RaidCombat, CampaignEvent):
# if emotion_reduce:
# self.emotion.wait(fleet_index)
checked = False
for _ in self.loop():
if self.appear(BATTLE_PREPARATION, offset=(30, 20)):
if self.handle_combat_automation_set(auto=auto == 'combat_auto'):
continue
if self._raid_has_oil_icon and self.triggered_stop_condition(oil_check=True, coin_check=True):
self.config.task_stop()
if not checked and self._raid_has_oil_icon:
checked = True
if self.triggered_stop_condition(oil_check=True, coin_check=True):
self.config.task_stop()
if self.handle_raid_ticket_use():
continue
if self.handle_retirement():

4
module/ui/ui.py
View File

@ -551,8 +551,8 @@ class UI(InfoHandler):
return True
# RPG event (raid_20240328)
# if self.appear_then_click(RPG_STATUS_POPUP, offset=(30, 30), interval=3):
# return True
if self.appear_then_click(RPG_STATUS_POPUP, offset=(30, 30), interval=3):
return True
# Hospital event (20250327)
# if self.appear_then_click(HOSIPITAL_CLUE_CHECK, offset=(20, 20), interval=2):
# return True