From 1544efc0c3115589b6c885d835c65422c426a897 Mon Sep 17 00:00:00 2001 From: KirisameVanilla Date: Mon, 20 Jan 2025 01:44:04 +0800 Subject: [PATCH 1/8] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE,=20=E6=94=AF=E6=8C=81=E5=9C=A8=E6=AF=8F=E6=97=A5?= =?UTF-8?q?=E8=83=96=E6=AC=A1=E6=8D=9E=E5=AE=8C=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=E5=81=9C=E6=AD=A2=E5=B8=B8=E8=A7=84=E5=9B=BE=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 7d6c28549173b7615cf2d5aa53e5c5725ffa114f) --- autowsgr/scripts/daily_api.py | 23 +++++++++++++++++++---- autowsgr/user_config.py | 2 ++ examples/user_settings.yaml | 2 ++ 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/autowsgr/scripts/daily_api.py b/autowsgr/scripts/daily_api.py index 79d4ea5..c5b12f0 100644 --- a/autowsgr/scripts/daily_api.py +++ b/autowsgr/scripts/daily_api.py @@ -76,7 +76,7 @@ def run(self): # 自动出征 if self.config.auto_normal_fight: - while self._has_unfinished() and self._ship_max(): + while self._has_unfinished() and self._ship_max() and self._loot_max(): task_id = self._get_unfinished() plan = self.fight_plans[task_id] @@ -115,12 +115,19 @@ def run(self): def _has_unfinished(self) -> bool: return any(times[0] < times[1] for times in self.fight_complete_times) + def _get_unfinished_plan_description(self, i: int) -> str: + plan_str = '' + plan_str += f'正在执行的PLAN: {self.fight_complete_times[i][2]}, ' + plan_str += f'已出击次数/目标次数: {self.fight_complete_times[i][0]}/{self.fight_complete_times[i][1]}, ' + plan_str += f'消耗快修数量: {self.timer.quick_repaired_cost}, ' + plan_str += f'已掉落船数量: {self.timer.got_ship_num}, ' + plan_str += f'已掉落胖次数量: {self.timer.got_loot_num}' + return plan_str + def _get_unfinished(self) -> int: for i, times in enumerate(self.fight_complete_times): if times[0] < times[1]: - self.timer.logger.info( - f'正在执行的PLAN：{self.fight_complete_times[i][2]}, 已出击次数：{self.fight_complete_times[i][0]}, 目标次数：{self.fight_complete_times[i][1]}, 消耗快修数量：{self.timer.quick_repaired_cost}, 已掉落船数量:{self.timer.got_ship_num}', - ) + self.timer.logger.info(self._get_unfinished_plan_description(i)) return i raise ValueError('没有未完成的任务') @@ -145,6 +152,14 @@ def _ship_max(self) -> bool: self.timer.logger.info('船只数量已达到上限，结束出征') return False + def _loot_max(self) -> bool: + if not self.config.stop_max_loot: + return True + if self.timer.got_loot_num < 50: + return True + self.timer.logger.info('胖次数量已达到上限，结束出征') + return False + def check_exercise(self) -> None: # 判断在哪个时间段 now_time = time.localtime(time.time()) diff --git a/autowsgr/user_config.py b/autowsgr/user_config.py index d652c6f..8089dbb 100644 --- a/autowsgr/user_config.py +++ b/autowsgr/user_config.py @@ -100,6 +100,8 @@ class DailyAutomationConfig(BaseConfig): """快修消耗上限，达到时终止常规战出征。不填则无上限""" stop_max_ship: bool = False """是否获取完当天上限500船后终止常规战出征""" + stop_max_loot: bool = False + """是否获取完当天上限50胖次后终止常规战出征""" @dataclass(frozen=True) diff --git a/examples/user_settings.yaml b/examples/user_settings.yaml index 0a17b04..6d26d12 100644 --- a/examples/user_settings.yaml +++ b/examples/user_settings.yaml @@ -54,6 +54,8 @@ daily_automation: # 捞到每天最大舰船(500)时停止 stop_max_ship: True + # 捞到每天最大胖次(50)时停止 + stop_max_loot: True # ========= 决战设置 ========= decisive_battle: From a02165c53a040d68b314ed6c8877785f63fbe3ea Mon Sep 17 00:00:00 2001 From: KirisameVanilla Date: Mon, 20 Jan 2025 20:02:29 +0800 Subject: [PATCH 2/8] WIP --- autowsgr/data/images/fight_result/LOOT.PNG | Bin 0 -> 15129 bytes autowsgr/fight/battle.py | 1 + autowsgr/fight/common.py | 9 +++++++++ 3 files changed, 10 insertions(+) create mode 100644 autowsgr/data/images/fight_result/LOOT.PNG diff --git a/autowsgr/data/images/fight_result/LOOT.PNG b/autowsgr/data/images/fight_result/LOOT.PNG new file mode 100644 index 0000000000000000000000000000000000000000..cd47b097be737c87adef6e1d828b805550308965 GIT binary patch literal 15129 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 None: if self.result is None: timer.log_screen() timer.logger.warning("can't identify fight result, screen logged") + if timer.image_exist(IMG.fight_image['LOOT'], need_screen_shot=False): + self.loot = True + else: + self.loot = False def __str__(self) -> str: return f'MVP 为 {self.mvp} 号位, 战果为 {self.result}' @@ -254,6 +258,9 @@ def _after_match(self): if self.state == 'result': try: result = FightResultInfo(self.timer, self.ship_stats) + if result.loot: + self.timer.got_loot_num += 1 + self.timer.logger.info(f'胖次:{self.timer.got_loot_num}') self.ship_stats = result.ship_stats self.fight_history.add_event( '战果结算', @@ -724,11 +731,13 @@ def make_decision(self, state, last_state, last_action, info: FightInfo): return 'no', literals.FIGHT_CONTINUE_FLAG if state == 'result': + self.timer.logger.info('调用 DecisionBlock.make_decision() #738') # time.sleep(1.5) # self.timer.click(900, 500, times=2, delay=0.2) click_result(self.timer) return None, literals.FIGHT_CONTINUE_FLAG if state == 'get_ship': + self.timer.logger.info('调用 DecisionBlock.make_decision() #744') get_ship(self.timer) return None, literals.FIGHT_CONTINUE_FLAG self.logger.error('Unknown State') From 881adec8f5f6807e4bf3397117b16c4264b7efc2 Mon Sep 17 00:00:00 2001 From: KirisameVanilla Date: Mon, 20 Jan 2025 22:34:53 +0800 Subject: [PATCH 3/8] finish --- autowsgr/data/images/fight_result/LOOT.PNG | Bin 15129 -> 6600 bytes autowsgr/fight/common.py | 9 --------- autowsgr/game/game_operation.py | 5 +++++ examples/user_settings.yaml | 4 ++-- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/autowsgr/data/images/fight_result/LOOT.PNG b/autowsgr/data/images/fight_result/LOOT.PNG index cd47b097be737c87adef6e1d828b805550308965..01fc20e3e224d0fea2f18977fda621892fbddad4 100644 GIT binary patch delta 6573 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 None: if self.result is None: timer.log_screen() timer.logger.warning("can't identify fight result, screen logged") - if timer.image_exist(IMG.fight_image['LOOT'], need_screen_shot=False): - self.loot = True - else: - self.loot = False def __str__(self) -> str: return f'MVP 为 {self.mvp} 号位, 战果为 {self.result}' @@ -258,9 +254,6 @@ def _after_match(self): if self.state == 'result': try: result = FightResultInfo(self.timer, self.ship_stats) - if result.loot: - self.timer.got_loot_num += 1 - self.timer.logger.info(f'胖次:{self.timer.got_loot_num}') self.ship_stats = result.ship_stats self.fight_history.add_event( '战果结算', @@ -731,13 +724,11 @@ def make_decision(self, state, last_state, last_action, info: FightInfo): return 'no', literals.FIGHT_CONTINUE_FLAG if state == 'result': - self.timer.logger.info('调用 DecisionBlock.make_decision() #738') # time.sleep(1.5) # self.timer.click(900, 500, times=2, delay=0.2) click_result(self.timer) return None, literals.FIGHT_CONTINUE_FLAG if state == 'get_ship': - self.timer.logger.info('调用 DecisionBlock.make_decision() #744') get_ship(self.timer) return None, literals.FIGHT_CONTINUE_FLAG self.logger.error('Unknown State') diff --git a/autowsgr/game/game_operation.py b/autowsgr/game/game_operation.py index 97e596a..6a13110 100644 --- a/autowsgr/game/game_operation.py +++ b/autowsgr/game/game_operation.py @@ -58,6 +58,11 @@ def click_result(timer: Timer, max_times=1): """点击加速两页战果界面""" timer.wait_images(IMG.fight_image[14]) while timer.wait_image(IMG.fight_image[14], timeout=0.5): + if timer.image_exist(IMG.fight_result['LOOT'], need_screen_shot=True): + timer.got_loot_num += 1 + timer.logger.info(f'捞到胖次! 当前胖次数:{timer.got_loot_num}') + else: + timer.logger.debug('没有胖次') timer.click(915, 515, delay=0.25, times=1) diff --git a/examples/user_settings.yaml b/examples/user_settings.yaml index f11b4a9..dd92561 100644 --- a/examples/user_settings.yaml +++ b/examples/user_settings.yaml @@ -54,8 +54,8 @@ daily_automation: - [8-5AI, 2, 250] # 6鱼 # 快修消耗上限，达到时终止常规战出征。 - # 注释掉或者填 None 则无上限 - quick_repair_limit: None + # 注释掉则无上限 + # quick_repair_limit: None # 捞到每天最大舰船(500)时停止 stop_max_ship: True From 88e117bd66e0b2529734a218c5215ef360ea641b Mon Sep 17 00:00:00 2001 From: Vanillaaaa Date: Mon, 20 Jan 2025 22:36:43 +0800 Subject: [PATCH 4/8] fix: delete unused --- autowsgr/fight/battle.py | 1 - 1 file changed, 1 deletion(-) diff --git a/autowsgr/fight/battle.py b/autowsgr/fight/battle.py index abd2d05..dc0340c 100644 --- a/autowsgr/fight/battle.py +++ b/autowsgr/fight/battle.py @@ -65,7 +65,6 @@ def _before_match(self): self.timer.update_screen() def _after_match(self): - self.timer.logger.info('调用 BattleInfo._after_match() #68') if self.state == 'get_ship': get_ship(self.timer) super()._after_match() From 3adeaa30e09d1fc39d849e3b09d3382cbdbe3416 Mon Sep 17 00:00:00 2001 From: KirisameVanilla Date: Mon, 20 Jan 2025 22:58:18 +0800 Subject: [PATCH 5/8] =?UTF-8?q?fix:=20=E9=81=BF=E5=85=8D=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E8=AF=86=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- autowsgr/game/game_operation.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/autowsgr/game/game_operation.py b/autowsgr/game/game_operation.py index 6a13110..6660ee2 100644 --- a/autowsgr/game/game_operation.py +++ b/autowsgr/game/game_operation.py @@ -57,10 +57,15 @@ def match_night(timer: Timer, is_night): def click_result(timer: Timer, max_times=1): """点击加速两页战果界面""" timer.wait_images(IMG.fight_image[14]) + looted = False while timer.wait_image(IMG.fight_image[14], timeout=0.5): if timer.image_exist(IMG.fight_result['LOOT'], need_screen_shot=True): - timer.got_loot_num += 1 - timer.logger.info(f'捞到胖次! 当前胖次数:{timer.got_loot_num}') + if not looted: + timer.got_loot_num += 1 + timer.logger.info(f'捞到胖次! 当前胖次数:{timer.got_loot_num}') + looted = True + else: + timer.logger.debug('已经识别过胖次') else: timer.logger.debug('没有胖次') timer.click(915, 515, delay=0.25, times=1) From a7a883a1f669a2deb746dd14fab496e39936d487 Mon Sep 17 00:00:00 2001 From: KirisameVanilla Date: Tue, 21 Jan 2025 00:55:39 +0800 Subject: [PATCH 6/8] =?UTF-8?q?document:=20=E6=B7=BB=E5=8A=A0=E4=BA=86?= =?UTF-8?q?=E5=AF=B9=E4=BA=8Equick=5Frepair=5Flimit=E7=9A=84=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=A1=B9=E7=9A=84=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/user_settings.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/user_settings.yaml b/examples/user_settings.yaml index dd92561..6e85b04 100644 --- a/examples/user_settings.yaml +++ b/examples/user_settings.yaml @@ -54,7 +54,8 @@ daily_automation: - [8-5AI, 2, 250] # 6鱼 # 快修消耗上限，达到时终止常规战出征。 - # 注释掉则无上限 + # 在选项前添加 # 注释掉则无上限 + # 注意⚠️ 请勿填写 None # quick_repair_limit: None # 捞到每天最大舰船(500)时停止 @@ -63,6 +64,7 @@ daily_automation: stop_max_loot: True # ========= 决战设置 ========= +# 注意⚠️ 如不想进行决战, 请在下列所有选项前添加 # 注释掉 decisive_battle: # 决战章节,请保证为 [1, 6] 中的整数. Defaults to 6. chapter: 6 From b687d3a8b70e3ec85e293162b57f4de1bf4b8993 Mon Sep 17 00:00:00 2001 From: KirisameVanilla Date: Wed, 22 Jan 2025 17:21:12 +0800 Subject: [PATCH 7/8] =?UTF-8?q?perf:=20=E6=9B=B4=E6=94=B9=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E9=A1=BA=E5=BA=8F,=20=E4=BC=98=E5=8C=96=E5=8D=95?= =?UTF-8?q?=E6=AC=A1=E7=9A=8450ms=E6=80=A7=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- autowsgr/game/game_operation.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/autowsgr/game/game_operation.py b/autowsgr/game/game_operation.py index 6660ee2..cc20c2b 100644 --- a/autowsgr/game/game_operation.py +++ b/autowsgr/game/game_operation.py @@ -59,15 +59,15 @@ def click_result(timer: Timer, max_times=1): timer.wait_images(IMG.fight_image[14]) looted = False while timer.wait_image(IMG.fight_image[14], timeout=0.5): - if timer.image_exist(IMG.fight_result['LOOT'], need_screen_shot=True): - if not looted: + if not looted: + if timer.image_exist(IMG.fight_result['LOOT'], need_screen_shot=True): timer.got_loot_num += 1 timer.logger.info(f'捞到胖次! 当前胖次数:{timer.got_loot_num}') looted = True else: - timer.logger.debug('已经识别过胖次') + timer.logger.debug('没有识别到胖次') else: - timer.logger.debug('没有胖次') + timer.logger.debug('已经识别过胖次') timer.click(915, 515, delay=0.25, times=1) From b1c1915c67fe1e88f2d6c7f6e393ed71c57f6c68 Mon Sep 17 00:00:00 2001 From: KirisameVanilla Date: Wed, 22 Jan 2025 19:29:50 +0800 Subject: [PATCH 8/8] document: comment --- examples/user_settings.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/examples/user_settings.yaml b/examples/user_settings.yaml index 6e85b04..e394d1a 100644 --- a/examples/user_settings.yaml +++ b/examples/user_settings.yaml @@ -54,17 +54,16 @@ daily_automation: - [8-5AI, 2, 250] # 6鱼 # 快修消耗上限，达到时终止常规战出征。 - # 在选项前添加 # 注释掉则无上限 - # 注意⚠️ 请勿填写 None - # quick_repair_limit: None + # 在选项前添加 # 注释掉, 或填写 null 则无上限 + quick_repair_limit: null # 捞到每天最大舰船(500)时停止 stop_max_ship: True + # 捞到每天最大胖次(50)时停止 stop_max_loot: True # ========= 决战设置 ========= -# 注意⚠️ 如不想进行决战, 请在下列所有选项前添加 # 注释掉 decisive_battle: # 决战章节,请保证为 [1, 6] 中的整数. Defaults to 6. chapter: 6