From b7445099d2c571fa24b5026ddee32100042098d3 Mon Sep 17 00:00:00 2001 From: BBElysia <163398337+BBElysia@users.noreply.github.com> Date: Sat, 11 Oct 2025 15:46:49 +0800 Subject: [PATCH 1/2] Add files via upload --- autowsgr/data/images/symbol_image/14.png | Bin 0 -> 6329 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 autowsgr/data/images/symbol_image/14.png diff --git a/autowsgr/data/images/symbol_image/14.png b/autowsgr/data/images/symbol_image/14.png new file mode 100644 index 0000000000000000000000000000000000000000..1282d09a42f3595ef0b3848dde2d15c2d85daa5d GIT binary patch literal 6329 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 aS9aZM`;tSK9R~a_g2&v%+PJ~UJ?VdE08bnM literal 0 HcmV?d00001 From 35b53b21b8f9812929a4f68bfd2ec2cc1ec0b879 Mon Sep 17 00:00:00 2001 From: BBElysia <163398337+BBElysia@users.noreply.github.com> Date: Sat, 11 Oct 2025 15:50:47 +0800 Subject: [PATCH 2/2] Update battle.py --- autowsgr/fight/battle.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/autowsgr/fight/battle.py b/autowsgr/fight/battle.py index ac629f68..e1098a93 100644 --- a/autowsgr/fight/battle.py +++ b/autowsgr/fight/battle.py @@ -87,15 +87,16 @@ def __init__(self, timer, plan_path: str | None = None, plan_args: dict | None = self.node = DecisionBlock(timer, node_args) self.info = BattleInfo(timer) - def _go_fight_prepare_page(self): + def _enter_fight(self) -> ConditionFlag: self.timer.goto_game_page('battle_page') + if self.timer.image_exist(IMG.symbol_image[15], confidence=0.87): + self.logger.warning('战役次数耗尽') + return ConditionFlag.BATTLE_TIMES_EXCEED now_hard = self.timer.wait_images([IMG.fight_image[9], IMG.fight_image[15]]) hard = self.config.map > 5 if now_hard != hard: self.timer.click(800, 80, delay=1) - def _enter_fight(self) -> ConditionFlag: - self._go_fight_prepare_page() self.timer.click(180 * ((self.config.map - 1) % 5 + 1), 200) self.timer.wait_pages('fight_prepare_page', after_wait=0.15) self.info.ship_stats = detect_ship_stats(self.timer)