From 04665d19a4e1af96a3f98fa1c5c6ff60d68e1ec6 Mon Sep 17 00:00:00 2001 From: veadex <65024689+veadex@users.noreply.github.com> Date: Sun, 28 Jan 2024 00:13:08 +0800 Subject: [PATCH] =?UTF-8?q?#=E6=B7=BB=E5=8A=A0=E5=AF=B9=E5=B8=B8=E8=A7=84?= =?UTF-8?q?=E5=9B=BE9-3=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- autowsgr/__init__.py | 2 +- autowsgr/constants/other_constants.py | 2 +- autowsgr/data/default_settings.yaml | 2 +- autowsgr/data/images/normal_map_image/9-3.PNG | Bin 0 -> 9983 bytes autowsgr/data/map/normal/9-3.yaml | 45 ++++++++++++++++++ autowsgr/data/plans/normal_fight/9-3.yaml | 15 ++++++ autowsgr/fight/decisive_battle.py | 4 +- autowsgr/fight/normal_fight.py | 2 +- examples/auto_daily.py | 1 + examples/battle.py | 1 + examples/decisive_battle.py | 7 ++- examples/event.py | 1 + examples/user_settings.yaml | 2 +- examples/user_settings_debug.yaml | 2 +- 14 files changed, 77 insertions(+), 9 deletions(-) create mode 100644 autowsgr/data/images/normal_map_image/9-3.PNG create mode 100644 autowsgr/data/map/normal/9-3.yaml create mode 100644 autowsgr/data/plans/normal_fight/9-3.yaml diff --git a/autowsgr/__init__.py b/autowsgr/__init__.py index 5ccf8d0c..0e840189 100644 --- a/autowsgr/__init__.py +++ b/autowsgr/__init__.py @@ -1 +1 @@ -__version__ = "0.2.2.8" +__version__ = "0.2.2.9" diff --git a/autowsgr/constants/other_constants.py b/autowsgr/constants/other_constants.py index 48305496..038b4c13 100644 --- a/autowsgr/constants/other_constants.py +++ b/autowsgr/constants/other_constants.py @@ -156,5 +156,5 @@ # 维修船坞, 建造位, 开发位 -CHAPTER_NODE_COUNT = [0, 5, 6, 4, 4, 5, 4, 5, 5, 2] +CHAPTER_NODE_COUNT = [0, 5, 6, 4, 4, 5, 4, 5, 5, 3] # 常规图节点数 diff --git a/autowsgr/data/default_settings.yaml b/autowsgr/data/default_settings.yaml index 4dcfdf8f..289fe34d 100644 --- a/autowsgr/data/default_settings.yaml +++ b/autowsgr/data/default_settings.yaml @@ -5,7 +5,7 @@ emulator: config_file: "" emulator_name: emulator-5554 # 雷电模拟器使用多开器请填写该项, 不多开默认为 "emulator-5554" -game_app: "官服" #官服 小米(暂不支持) 应用宝 +game_app: "官服" #官服 小米 应用宝 LOG_PATH: "log" DELAY: 1.5 diff --git a/autowsgr/data/images/normal_map_image/9-3.PNG b/autowsgr/data/images/normal_map_image/9-3.PNG new file mode 100644 index 0000000000000000000000000000000000000000..5c512ead5a58066a06010654e6a7f01c8a5c5f19 GIT binary patch literal 9983 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 1 self.stats = DecisiveStats(timer, chapter, map, node, version) if logic is None: @@ -289,7 +291,7 @@ def go_fleet_page(self): def repair(self): self.go_fleet_page() - quick_repair(self.timer, 1) # TODO：我的中破比很高，先改成只修大破控制一下用桶 + quick_repair(self.timer, self.repair_strategy) # TODO：我的中破比很高，先改成只修大破控制一下用桶 # quick_repair(self.timer, 2) def next(self): diff --git a/autowsgr/fight/normal_fight.py b/autowsgr/fight/normal_fight.py index a3db7c54..c16d95c5 100644 --- a/autowsgr/fight/normal_fight.py +++ b/autowsgr/fight/normal_fight.py @@ -20,7 +20,7 @@ 常规战决策模块/地图战斗用模板 """ -MAP_NUM = [5, 6, 4, 4, 5, 4, 5, 5, 2] # 每一章的地图数量 +MAP_NUM = [5, 6, 4, 4, 5, 4, 5, 5, 3] # 每一章的地图数量 class NormalFightInfo(FightInfo): diff --git a/examples/auto_daily.py b/examples/auto_daily.py index f3731b57..e3d39494 100644 --- a/examples/auto_daily.py +++ b/examples/auto_daily.py @@ -2,5 +2,6 @@ from autowsgr.scripts.daily_api import DailyOperation +#日常，可以实现日常出击，战役，演习等操作 operation = DailyOperation(f"{os.path.dirname(os.path.abspath(__file__))}/user_settings.yaml") operation.run() diff --git a/examples/battle.py b/examples/battle.py index f13850bb..72e25b2f 100644 --- a/examples/battle.py +++ b/examples/battle.py @@ -1,6 +1,7 @@ import autowsgr.fight.battle as bf from autowsgr.scripts.main import start_script +#实现战役的出击 timer = start_script() baf = bf.BattlePlan(timer, "battle/困难驱逐.yaml") baf.run() diff --git a/examples/decisive_battle.py b/examples/decisive_battle.py index 0cf16d47..aaf042ed 100644 --- a/examples/decisive_battle.py +++ b/examples/decisive_battle.py @@ -1,7 +1,9 @@ +import os from autowsgr.fight import DecisiveBattle from autowsgr.scripts.main import start_script -timer = start_script() +#实现决战的自动化 +timer = start_script(f"{os.path.dirname(os.path.abspath(__file__))}/user_settings.yaml") decisive_battle = DecisiveBattle( timer, 6, @@ -10,5 +12,6 @@ level1=["肥鱼", "U-1206", "U-47", "射水鱼", "U-96", "U-1405"], level2=["U-81", "大青花鱼"], flagship_priority=["U-1405", "U-47"], + repair_level=1 , #维修策略，1为中破修，2为大破修 ) -decisive_battle.start_fight() +decisive_battle.run_for_times(20) # 数字为决战出击的次数 \ No newline at end of file diff --git a/examples/event.py b/examples/event.py index 5c390250..99004d61 100644 --- a/examples/event.py +++ b/examples/event.py @@ -1,6 +1,7 @@ from autowsgr.fight.event.event_2023_1215 import EventFightPlan20231215 from autowsgr.scripts.main import start_script +#活动自动化 timer = start_script() plan = EventFightPlan20231215(timer, "event/20231215/E10AG.yaml", fleet_id=2) plan.run_for_times(500) # 第一个参数是战斗次数,还有个可选参数为检查远征时间，默认为1800S diff --git a/examples/user_settings.yaml b/examples/user_settings.yaml index 70d37959..59208fad 100644 --- a/examples/user_settings.yaml +++ b/examples/user_settings.yaml @@ -5,7 +5,7 @@ emulator: config_file: "" emulator_name: emulator-5554 # 雷电模拟器使用多开器请填写该项, 不多开默认为 "emulator-5554" -game_app: "官服" #官服 小米(暂不支持) 应用宝 +game_app: "官服" #官服 小米 应用宝 LOG_PATH: "log" DELAY: 1.5 diff --git a/examples/user_settings_debug.yaml b/examples/user_settings_debug.yaml index 70d37959..59208fad 100644 --- a/examples/user_settings_debug.yaml +++ b/examples/user_settings_debug.yaml @@ -5,7 +5,7 @@ emulator: config_file: "" emulator_name: emulator-5554 # 雷电模拟器使用多开器请填写该项, 不多开默认为 "emulator-5554" -game_app: "官服" #官服 小米(暂不支持) 应用宝 +game_app: "官服" #官服 小米 应用宝 LOG_PATH: "log" DELAY: 1.5