From 1124a7a242cda34115dd89c3f27e17d41d876d70 Mon Sep 17 00:00:00 2001 From: veadex <65024689+veadex@users.noreply.github.com> Date: Thu, 8 Feb 2024 00:00:46 +0800 Subject: [PATCH] =?UTF-8?q?#=20=E6=B7=BB=E5=8A=A0=E5=AF=B9=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=88=A9=E6=96=A7=E8=A1=8C=E5=8A=A8=E7=9A=84=E6=94=AF?= =?UTF-8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 添加对活动利斧行动的支持 --- README.md | 3 +- autowsgr/__init__.py | 2 +- autowsgr/data/images/event/20240206/1.PNG | Bin 0 -> 12769 bytes autowsgr/data/images/event/common/special.PNG | Bin 0 -> 7887 bytes autowsgr/data/map/event/20240206/E-1.yaml | 39 ++++++ autowsgr/data/map/event/20240206/E-2.yaml | 39 ++++++ autowsgr/data/map/event/20240206/E-3.yaml | 42 +++++++ autowsgr/data/map/event/20240206/E-4.yaml | 51 ++++++++ autowsgr/data/map/event/20240206/E-5.yaml | 39 ++++++ autowsgr/data/map/event/20240206/E-6.yaml | 36 ++++++ autowsgr/data/map/event/20240206/E-7.yaml | 36 ++++++ autowsgr/data/map/event/20240206/E-8.yaml | 39 ++++++ autowsgr/data/map/event/20240206/H-1.yaml | 39 ++++++ autowsgr/data/map/event/20240206/H-2.yaml | 39 ++++++ autowsgr/data/map/event/20240206/H-3.yaml | 42 +++++++ autowsgr/data/map/event/20240206/H-4.yaml | 51 ++++++++ autowsgr/data/map/event/20240206/H-5.yaml | 39 ++++++ autowsgr/data/map/event/20240206/H-6.yaml | 36 ++++++ autowsgr/data/map/event/20240206/H-7.yaml | 36 ++++++ autowsgr/data/map/event/20240206/H-8.yaml | 39 ++++++ autowsgr/data/plans/event/20240206/E10IJ.yaml | 15 +++ autowsgr/fight/event/event_2024_0206.py | 113 ++++++++++++++++++ ...71\346\267\267\347\252\201\350\242\255.md" | 35 +++--- examples/event.py | 17 ++- 24 files changed, 805 insertions(+), 22 deletions(-) create mode 100644 autowsgr/data/images/event/20240206/1.PNG create mode 100644 autowsgr/data/images/event/common/special.PNG create mode 100644 autowsgr/data/map/event/20240206/E-1.yaml create mode 100644 autowsgr/data/map/event/20240206/E-2.yaml create mode 100644 autowsgr/data/map/event/20240206/E-3.yaml create mode 100644 autowsgr/data/map/event/20240206/E-4.yaml create mode 100644 autowsgr/data/map/event/20240206/E-5.yaml create mode 100644 autowsgr/data/map/event/20240206/E-6.yaml create mode 100644 autowsgr/data/map/event/20240206/E-7.yaml create mode 100644 autowsgr/data/map/event/20240206/E-8.yaml create mode 100644 autowsgr/data/map/event/20240206/H-1.yaml create mode 100644 autowsgr/data/map/event/20240206/H-2.yaml create mode 100644 autowsgr/data/map/event/20240206/H-3.yaml create mode 100644 autowsgr/data/map/event/20240206/H-4.yaml create mode 100644 autowsgr/data/map/event/20240206/H-5.yaml create mode 100644 autowsgr/data/map/event/20240206/H-6.yaml create mode 100644 autowsgr/data/map/event/20240206/H-7.yaml create mode 100644 autowsgr/data/map/event/20240206/H-8.yaml create mode 100644 autowsgr/data/plans/event/20240206/E10IJ.yaml create mode 100644 autowsgr/fight/event/event_2024_0206.py diff --git a/README.md b/README.md index e4d62376..b37de90a 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ ## 近期更新 +- 支持当前活动 "特混突袭-利斧行动", 详细信息见[文档](/documentation/特混突袭.md) *2024/02/06* - 支持当前活动 "声威行动", 详细信息见文档 *2023/12/15* - 设置文件新增一个选型`auto_exercise`，设置为`True`将会在执行`auto_daily.py`时自动打完每天的三次战役 *2023/10/17* - 支持当前活动 "特混突袭", 详细信息见文档 *2023/9/27* @@ -24,7 +25,7 @@ 现已支持远征、修理、解装等基础操作，以及常规战、决战、活动等自动战斗。有简单易用封装的日常挂机脚本，也可以自己组合基础操作实现自定义脚本。 -安装使用与详细功能请见：[中文文档](/documentation/%E4%BD%BF%E7%94%A8%E8%AF%B4%E6%98%8E.md) +安装使用与详细功能请见：[中文文档](/documentation/%E4%BD%BF%E7%94%A8%E8%AF%B4%E6%98%8E.md) 或 [notion文档](https://sincere-theater-0e6.notion.site/56a26bfe32da4931a6a1ece332173211?v=428430662def42a2a7ea6dac48238d50) ## 参与开发 diff --git a/autowsgr/__init__.py b/autowsgr/__init__.py index 0e840189..8f697f7f 100644 --- a/autowsgr/__init__.py +++ b/autowsgr/__init__.py @@ -1 +1 @@ -__version__ = "0.2.2.9" +__version__ = "0.2.2.10" diff --git a/autowsgr/data/images/event/20240206/1.PNG b/autowsgr/data/images/event/20240206/1.PNG new file mode 100644 index 0000000000000000000000000000000000000000..1fc9d7815d9a1323e2e967b0c3e84f10d8249c13 GIT binary patch literal 12769 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 literal 0 HcmV?d00001 diff --git a/autowsgr/data/map/event/20240206/E-1.yaml b/autowsgr/data/map/event/20240206/E-1.yaml new file mode 100644 index 00000000..158dc1df --- /dev/null +++ b/autowsgr/data/map/event/20240206/E-1.yaml @@ -0,0 +1,39 @@ +A: !!python/tuple +- 149 +- 366 +B: !!python/tuple +- 290 +- 233 +C: !!python/tuple +- 336 +- 112 +D: !!python/tuple +- 448 +- 225 +E: !!python/tuple +- 285 +- 465 +F: !!python/tuple +- 546 +- 149 +G: !!python/tuple +- 561 +- 315 +H: !!python/tuple +- 471 +- 465 +I: !!python/tuple +- 696 +- 277 +J: !!python/tuple +- 663 +- 494 +K: !!python/tuple +- 659 +- 412 +L: !!python/tuple +- 839 +- 195 +M: !!python/tuple +- 861 +- 405 diff --git a/autowsgr/data/map/event/20240206/E-2.yaml b/autowsgr/data/map/event/20240206/E-2.yaml new file mode 100644 index 00000000..2fa05a5b --- /dev/null +++ b/autowsgr/data/map/event/20240206/E-2.yaml @@ -0,0 +1,39 @@ +A: !!python/tuple +- 91 +- 224 +B: !!python/tuple +- 93 +- 451 +C: !!python/tuple +- 284 +- 277 +D: !!python/tuple +- 286 +- 489 +E: !!python/tuple +- 293 +- 112 +F: !!python/tuple +- 396 +- 383 +G: !!python/tuple +- 466 +- 466 +H: !!python/tuple +- 433 +- 208 +I: !!python/tuple +- 587 +- 89 +J: !!python/tuple +- 609 +- 181 +K: !!python/tuple +- 607 +- 360 +L: !!python/tuple +- 792 +- 403 +M: !!python/tuple +- 826 +- 263 diff --git a/autowsgr/data/map/event/20240206/E-3.yaml b/autowsgr/data/map/event/20240206/E-3.yaml new file mode 100644 index 00000000..6fdf63dc --- /dev/null +++ b/autowsgr/data/map/event/20240206/E-3.yaml @@ -0,0 +1,42 @@ +A: !!python/tuple +- 112 +- 380 +B: !!python/tuple +- 321 +- 111 +C: !!python/tuple +- 285 +- 232 +D: !!python/tuple +- 254 +- 472 +E: !!python/tuple +- 262 +- 344 +F: !!python/tuple +- 418 +- 324 +G: !!python/tuple +- 479 +- 466 +H: !!python/tuple +- 576 +- 324 +I: !!python/tuple +- 545 +- 188 +J: !!python/tuple +- 682 +- 103 +K: !!python/tuple +- 710 +- 215 +L: !!python/tuple +- 664 +- 492 +M: !!python/tuple +- 886 +- 196 +N: !!python/tuple +- 753 +- 388 diff --git a/autowsgr/data/map/event/20240206/E-4.yaml b/autowsgr/data/map/event/20240206/E-4.yaml new file mode 100644 index 00000000..4e40e7f3 --- /dev/null +++ b/autowsgr/data/map/event/20240206/E-4.yaml @@ -0,0 +1,51 @@ +A: !!python/tuple +- 812 +- 353 +B: !!python/tuple +- 571 +- 355 +C: !!python/tuple +- 457 +- 487 +D: !!python/tuple +- 894 +- 231 +E: !!python/tuple +- 735 +- 172 +F: !!python/tuple +- 628 +- 280 +G: !!python/tuple +- 876 +- 98 +H: !!python/tuple +- 375 +- 366 +I: !!python/tuple +- 218 +- 411 +J: !!python/tuple +- 412 +- 277 +K: !!python/tuple +- 525 +- 96 +L: !!python/tuple +- 374 +- 186 +M: !!python/tuple +- 328 +- 81 +N: !!python/tuple +- 260 +- 255 +O: !!python/tuple +- 63 +- 491 +P: !!python/tuple +- 127 +- 306 +Q: !!python/tuple +- 120 +- 137 diff --git a/autowsgr/data/map/event/20240206/E-5.yaml b/autowsgr/data/map/event/20240206/E-5.yaml new file mode 100644 index 00000000..14629778 --- /dev/null +++ b/autowsgr/data/map/event/20240206/E-5.yaml @@ -0,0 +1,39 @@ +A: !!python/tuple +- 434 +- 81 +B: !!python/tuple +- 306 +- 215 +C: !!python/tuple +- 540 +- 171 +D: !!python/tuple +- 668 +- 96 +E: !!python/tuple +- 232 +- 480 +F: !!python/tuple +- 308 +- 352 +K: !!python/tuple +- 853 +- 164 +Q: !!python/tuple +- 448 +- 268 +R: !!python/tuple +- 458 +- 483 +U: !!python/tuple +- 831 +- 354 +W: !!python/tuple +- 662 +- 263 +X: !!python/tuple +- 533 +- 367 +Z: !!python/tuple +- 683 +- 369 diff --git a/autowsgr/data/map/event/20240206/E-6.yaml b/autowsgr/data/map/event/20240206/E-6.yaml new file mode 100644 index 00000000..639378c4 --- /dev/null +++ b/autowsgr/data/map/event/20240206/E-6.yaml @@ -0,0 +1,36 @@ +A: !!python/tuple +- 21 +- 24 +E: !!python/tuple +- 233 +- 299 +F: !!python/tuple +- 308 +- 173 +G: !!python/tuple +- 366 +- 457 +H: !!python/tuple +- 511 +- 421 +P: !!python/tuple +- 716 +- 463 +Q: !!python/tuple +- 447 +- 83 +R: !!python/tuple +- 457 +- 299 +W: !!python/tuple +- 668 +- 80 +X: !!python/tuple +- 533 +- 185 +Y: !!python/tuple +- 621 +- 328 +Z: !!python/tuple +- 679 +- 189 diff --git a/autowsgr/data/map/event/20240206/E-7.yaml b/autowsgr/data/map/event/20240206/E-7.yaml new file mode 100644 index 00000000..b7457c7c --- /dev/null +++ b/autowsgr/data/map/event/20240206/E-7.yaml @@ -0,0 +1,36 @@ +A: !!python/tuple +- 923 +- 48 +K: !!python/tuple +- 377 +- 48 +M: !!python/tuple +- 631 +- 368 +N: !!python/tuple +- 548 +- 472 +O: !!python/tuple +- 390 +- 503 +P: !!python/tuple +- 232 +- 525 +S: !!python/tuple +- 442 +- 367 +T: !!python/tuple +- 494 +- 269 +U: !!python/tuple +- 353 +- 234 +V: !!python/tuple +- 295 +- 391 +Y: !!python/tuple +- 143 +- 390 +Z: !!python/tuple +- 200 +- 248 diff --git a/autowsgr/data/map/event/20240206/E-8.yaml b/autowsgr/data/map/event/20240206/E-8.yaml new file mode 100644 index 00000000..6fdec366 --- /dev/null +++ b/autowsgr/data/map/event/20240206/E-8.yaml @@ -0,0 +1,39 @@ +A: !!python/tuple +- 1 +- 1 +D: !!python/tuple +- 278 +- 96 +I: !!python/tuple +- 614 +- 135 +J: !!python/tuple +- 737 +- 299 +K: !!python/tuple +- 466 +- 165 +L: !!python/tuple +- 570 +- 263 +Q: !!python/tuple +- 58 +- 264 +S: !!python/tuple +- 533 +- 488 +T: !!python/tuple +- 586 +- 390 +U: !!python/tuple +- 445 +- 353 +W: !!python/tuple +- 269 +- 262 +X: !!python/tuple +- 142 +- 367 +Z: !!python/tuple +- 290 +- 366 diff --git a/autowsgr/data/map/event/20240206/H-1.yaml b/autowsgr/data/map/event/20240206/H-1.yaml new file mode 100644 index 00000000..158dc1df --- /dev/null +++ b/autowsgr/data/map/event/20240206/H-1.yaml @@ -0,0 +1,39 @@ +A: !!python/tuple +- 149 +- 366 +B: !!python/tuple +- 290 +- 233 +C: !!python/tuple +- 336 +- 112 +D: !!python/tuple +- 448 +- 225 +E: !!python/tuple +- 285 +- 465 +F: !!python/tuple +- 546 +- 149 +G: !!python/tuple +- 561 +- 315 +H: !!python/tuple +- 471 +- 465 +I: !!python/tuple +- 696 +- 277 +J: !!python/tuple +- 663 +- 494 +K: !!python/tuple +- 659 +- 412 +L: !!python/tuple +- 839 +- 195 +M: !!python/tuple +- 861 +- 405 diff --git a/autowsgr/data/map/event/20240206/H-2.yaml b/autowsgr/data/map/event/20240206/H-2.yaml new file mode 100644 index 00000000..2fa05a5b --- /dev/null +++ b/autowsgr/data/map/event/20240206/H-2.yaml @@ -0,0 +1,39 @@ +A: !!python/tuple +- 91 +- 224 +B: !!python/tuple +- 93 +- 451 +C: !!python/tuple +- 284 +- 277 +D: !!python/tuple +- 286 +- 489 +E: !!python/tuple +- 293 +- 112 +F: !!python/tuple +- 396 +- 383 +G: !!python/tuple +- 466 +- 466 +H: !!python/tuple +- 433 +- 208 +I: !!python/tuple +- 587 +- 89 +J: !!python/tuple +- 609 +- 181 +K: !!python/tuple +- 607 +- 360 +L: !!python/tuple +- 792 +- 403 +M: !!python/tuple +- 826 +- 263 diff --git a/autowsgr/data/map/event/20240206/H-3.yaml b/autowsgr/data/map/event/20240206/H-3.yaml new file mode 100644 index 00000000..6fdf63dc --- /dev/null +++ b/autowsgr/data/map/event/20240206/H-3.yaml @@ -0,0 +1,42 @@ +A: !!python/tuple +- 112 +- 380 +B: !!python/tuple +- 321 +- 111 +C: !!python/tuple +- 285 +- 232 +D: !!python/tuple +- 254 +- 472 +E: !!python/tuple +- 262 +- 344 +F: !!python/tuple +- 418 +- 324 +G: !!python/tuple +- 479 +- 466 +H: !!python/tuple +- 576 +- 324 +I: !!python/tuple +- 545 +- 188 +J: !!python/tuple +- 682 +- 103 +K: !!python/tuple +- 710 +- 215 +L: !!python/tuple +- 664 +- 492 +M: !!python/tuple +- 886 +- 196 +N: !!python/tuple +- 753 +- 388 diff --git a/autowsgr/data/map/event/20240206/H-4.yaml b/autowsgr/data/map/event/20240206/H-4.yaml new file mode 100644 index 00000000..4e40e7f3 --- /dev/null +++ b/autowsgr/data/map/event/20240206/H-4.yaml @@ -0,0 +1,51 @@ +A: !!python/tuple +- 812 +- 353 +B: !!python/tuple +- 571 +- 355 +C: !!python/tuple +- 457 +- 487 +D: !!python/tuple +- 894 +- 231 +E: !!python/tuple +- 735 +- 172 +F: !!python/tuple +- 628 +- 280 +G: !!python/tuple +- 876 +- 98 +H: !!python/tuple +- 375 +- 366 +I: !!python/tuple +- 218 +- 411 +J: !!python/tuple +- 412 +- 277 +K: !!python/tuple +- 525 +- 96 +L: !!python/tuple +- 374 +- 186 +M: !!python/tuple +- 328 +- 81 +N: !!python/tuple +- 260 +- 255 +O: !!python/tuple +- 63 +- 491 +P: !!python/tuple +- 127 +- 306 +Q: !!python/tuple +- 120 +- 137 diff --git a/autowsgr/data/map/event/20240206/H-5.yaml b/autowsgr/data/map/event/20240206/H-5.yaml new file mode 100644 index 00000000..14629778 --- /dev/null +++ b/autowsgr/data/map/event/20240206/H-5.yaml @@ -0,0 +1,39 @@ +A: !!python/tuple +- 434 +- 81 +B: !!python/tuple +- 306 +- 215 +C: !!python/tuple +- 540 +- 171 +D: !!python/tuple +- 668 +- 96 +E: !!python/tuple +- 232 +- 480 +F: !!python/tuple +- 308 +- 352 +K: !!python/tuple +- 853 +- 164 +Q: !!python/tuple +- 448 +- 268 +R: !!python/tuple +- 458 +- 483 +U: !!python/tuple +- 831 +- 354 +W: !!python/tuple +- 662 +- 263 +X: !!python/tuple +- 533 +- 367 +Z: !!python/tuple +- 683 +- 369 diff --git a/autowsgr/data/map/event/20240206/H-6.yaml b/autowsgr/data/map/event/20240206/H-6.yaml new file mode 100644 index 00000000..639378c4 --- /dev/null +++ b/autowsgr/data/map/event/20240206/H-6.yaml @@ -0,0 +1,36 @@ +A: !!python/tuple +- 21 +- 24 +E: !!python/tuple +- 233 +- 299 +F: !!python/tuple +- 308 +- 173 +G: !!python/tuple +- 366 +- 457 +H: !!python/tuple +- 511 +- 421 +P: !!python/tuple +- 716 +- 463 +Q: !!python/tuple +- 447 +- 83 +R: !!python/tuple +- 457 +- 299 +W: !!python/tuple +- 668 +- 80 +X: !!python/tuple +- 533 +- 185 +Y: !!python/tuple +- 621 +- 328 +Z: !!python/tuple +- 679 +- 189 diff --git a/autowsgr/data/map/event/20240206/H-7.yaml b/autowsgr/data/map/event/20240206/H-7.yaml new file mode 100644 index 00000000..b7457c7c --- /dev/null +++ b/autowsgr/data/map/event/20240206/H-7.yaml @@ -0,0 +1,36 @@ +A: !!python/tuple +- 923 +- 48 +K: !!python/tuple +- 377 +- 48 +M: !!python/tuple +- 631 +- 368 +N: !!python/tuple +- 548 +- 472 +O: !!python/tuple +- 390 +- 503 +P: !!python/tuple +- 232 +- 525 +S: !!python/tuple +- 442 +- 367 +T: !!python/tuple +- 494 +- 269 +U: !!python/tuple +- 353 +- 234 +V: !!python/tuple +- 295 +- 391 +Y: !!python/tuple +- 143 +- 390 +Z: !!python/tuple +- 200 +- 248 diff --git a/autowsgr/data/map/event/20240206/H-8.yaml b/autowsgr/data/map/event/20240206/H-8.yaml new file mode 100644 index 00000000..6fdec366 --- /dev/null +++ b/autowsgr/data/map/event/20240206/H-8.yaml @@ -0,0 +1,39 @@ +A: !!python/tuple +- 1 +- 1 +D: !!python/tuple +- 278 +- 96 +I: !!python/tuple +- 614 +- 135 +J: !!python/tuple +- 737 +- 299 +K: !!python/tuple +- 466 +- 165 +L: !!python/tuple +- 570 +- 263 +Q: !!python/tuple +- 58 +- 264 +S: !!python/tuple +- 533 +- 488 +T: !!python/tuple +- 586 +- 390 +U: !!python/tuple +- 445 +- 353 +W: !!python/tuple +- 269 +- 262 +X: !!python/tuple +- 142 +- 367 +Z: !!python/tuple +- 290 +- 366 diff --git a/autowsgr/data/plans/event/20240206/E10IJ.yaml b/autowsgr/data/plans/event/20240206/E10IJ.yaml new file mode 100644 index 00000000..48d6167d --- /dev/null +++ b/autowsgr/data/plans/event/20240206/E10IJ.yaml @@ -0,0 +1,15 @@ +# E10 IJ两点夜战，此次活动跟之前的设置不一样 +# 本次活动 E6-E9 设置 map 为 1-4 +# E10的四个入口 阿尔法-德尔塔分别设置 map 为 5-8 +# from_which_entrance也设置为相应的 1-4 +# E5/10 通关, 推荐使用 nga 攻略上的低耗阵容 + +chapter: H +map: 8 +from_which_entrance: 4 +selected_nodes: [I , J] +repair_mode: 1 + +node_defaults: + formation: 4 + proceed: False diff --git a/autowsgr/fight/event/event_2024_0206.py b/autowsgr/fight/event/event_2024_0206.py new file mode 100644 index 00000000..681b4b08 --- /dev/null +++ b/autowsgr/fight/event/event_2024_0206.py @@ -0,0 +1,113 @@ +"""有选择入口和常规推图的活动可以抄这个 +""" + + +import os + +from autowsgr.constants.data_roots import MAP_ROOT +from autowsgr.controller.run_timer import Timer +from autowsgr.fight.common import start_march +from autowsgr.fight.event.event import Event +from autowsgr.fight.normal_fight import NormalFightInfo, NormalFightPlan +from autowsgr.game.game_operation import MoveTeam, quick_repair +from autowsgr.utils.math_functions import CalcDis + +NODE_POSITION = ( + None, + (218, 123), + (131, 343), + (887, 188), + (707, 436), + (478, 216), # 阿尔法入口用的地图 + (478, 216), # 贝塔入口用的地图 + (478, 216), # 西格玛入口用的地图 + (478, 216), # 德尔塔入口用的地图 +) + + +class EventFightPlan20240206(Event, NormalFightPlan): + def __init__( + self, + timer: Timer, + plan_path, + from_which_entrance=None, + fleet_id=None, + event="20240206", + ): + """ + Args: + fleet_id : 新的舰队参数, 优先级高于 plan 文件, 如果为 None 则使用计划参数. + + from_which_entrance : 指定入口, 默认为 1 表示从 alpha 进入, 如果为 2 则从 beta 进入, 以此类推， 优先级高于 plan 文件, 如果为 0 则使用计划文件的参数, 如果都没有指定, 默认从 alpha 进入 + """ + self.event_name = event + NormalFightPlan.__init__(self, timer, plan_path, fleet_id=fleet_id) + Event.__init__(self, timer, event) + + if from_which_entrance is not None: + self.from_alpha = from_which_entrance + + if "from_which_entrance" not in self.__dict__: + self.from_which_entrance = 0 + + def _load_fight_info(self): + self.Info = EventFightInfo20240206(self.timer, self.chapter, self.map) + self.Info.load_point_positions(os.path.join(MAP_ROOT, "event", self.event_name)) + + def _change_fight_map(self, chapter_id, map_id): + """选择并进入战斗地图(chapter-map)""" + # self.change_difficulty(chapter_id) + pass + + def _check_entrance(self, from_which_entrance): + # from_which_entrance为1,2,3,4 + check_position_pixel = [ + None, + ((119, 73), (11, 30, 73)), + ((277, 75), (12, 32, 81)), + ((419, 74), (14, 31, 75)), + ((56, 72), (12, 31, 73)), + ] + + # return self.timer.check_pixel((795, 321), (254, 148, 36), screen_shot=True) + # 第一个是xy坐标，第二个是三原色的像素 + # from_which_entrance=int(from_which_entrance) + if from_which_entrance == 0: + return True + else: + if 1 <= from_which_entrance <= 4: + return self.timer.check_pixel( + check_position_pixel[from_which_entrance][0], + check_position_pixel[from_which_entrance][1], + screen_shot=True, + ) + + else: + raise IndexError + + def _go_fight_prepare_page(self) -> None: + if not self.timer.image_exist(self.Info.event_image[1], need_screen_shot=0): + self.timer.Android.click(*NODE_POSITION[self.map]) + + # 选择入口 + if self._check_entrance(self.from_which_entrance) == False: + entrance_position = [None, (131, 58), (280, 54), (421, 55), (593, 51)] + self.timer.Android.click(*entrance_position[self.from_which_entrance]) + + self.timer.wait_image(self.event_image[1]) + self.timer.Android.click(850, 490) + try: + self.timer.wait_pages("fight_prepare_page", after_wait=0.15) + except: + self.timer.logger.warning("匹配战斗页面失败，尝试重新匹配") + self.timer.go_main_page() + self._go_map_page() + self._go_fight_prepare_page() + +class EventFightInfo20240206(Event, NormalFightInfo): + def __init__(self, timer: Timer, chapter_id, map_id, event="20240206") -> None: + NormalFightInfo.__init__(self, timer, chapter_id, map_id) + Event.__init__(self, timer, event) + self.map_image = self.common_image["special"] + [self.event_image[1]] + self.end_page = "unknown_page" + self.state2image["map_page"] = [self.map_image, 5] diff --git "a/documentation/\347\211\271\346\267\267\347\252\201\350\242\255.md" "b/documentation/\347\211\271\346\267\267\347\252\201\350\242\255.md" index ce645647..c35b575e 100644 --- "a/documentation/\347\211\271\346\267\267\347\252\201\350\242\255.md" +++ "b/documentation/\347\211\271\346\267\267\347\252\201\350\242\255.md" @@ -5,19 +5,22 @@ 例如: ```yaml -# E10 AD两点夜战，此次活动跟之前的设置不一样 -# 本次活动E6-E9设置map为1-4 -# E10的四个入口 阿尔法-德尔塔分别设置map为5-8 -# from_which_entrance也设置为相应的1-4 - -chapter: E -map: 7 -from_which_entrance: 2 -selected_nodes: [A,D] -repair_mode: 2 +# E10 IJ两点夜战，此次活动跟之前的设置不一样 +# 本次活动 E6-E9 设置 map 为 1-4 +# E10的四个入口 阿尔法-德尔塔分别设置 map 为 5-8 +# from_which_entrance也设置为相应的 1-4 +# E5/10 通关, 推荐使用 nga 攻略上的低耗阵容 + +chapter: H +map: 8 +from_which_entrance: 4 +selected_nodes: [I , J] +repair_mode: 1 node_defaults: formation: 4 + proceed: False + ``` @@ -29,11 +32,11 @@ map 参数为 1~8, 此次活动不需要切换简单和困难，所以chapter 以下是函数原型: -from autowsgr.fight.event.event_2023_0927.EventFightPlan20230927 +from autowsgr.fight.event.event_2024_0206.EventFightPlan20240206 ```python -class EventFightPlan20230927(Event, NormalFightPlan): +class EventFightPlan20240206(Event, NormalFightPlan): def __init__( self, timer: Timer, plan_path, from_which_entrance= None, fleet_id=None, event="20230927" ): @@ -50,12 +53,12 @@ class EventFightPlan20230927(Event, NormalFightPlan): 使用示例, 位于本项目地址 `/examples/event_20230927.py`: ```python -from autowsgr.fight.event.event_2023_0927 import EventFightPlan20230927 +from autowsgr.fight.event.event_2024_0206 import EventFightPlan20240206 from autowsgr.scripts.main import start_script timer = start_script() -plan = EventFightPlan20230927(timer, "event/20230927/E10AD.yaml", fleet_id=2) -plan.run_for_times(400) # 第一个参数是战斗次数,还有个可选参数为检查远征时间，默认为1800S +plan = EventFightPlan20230927(timer, "event/20240206/E10IJ.yaml", fleet_id=2) +plan.run_for_times(500) # 第一个参数是战斗次数,还有个可选参数为检查远征时间，默认为1800S ``` -我们提供了两个默认文件, 位于本项目 `/autowsgr/data/plans/event/20230927`, 你可以直接使用它们. +我们提供了两个默认文件, 位于本项目 `/autowsgr/data/plans/event/20240206`, 你可以直接使用它们. diff --git a/examples/event.py b/examples/event.py index 99004d61..508d358b 100644 --- a/examples/event.py +++ b/examples/event.py @@ -1,7 +1,16 @@ -from autowsgr.fight.event.event_2023_1215 import EventFightPlan20231215 +from autowsgr.fight.event.event_2024_0206 import EventFightPlan20240206 from autowsgr.scripts.main import start_script +from autowsgr.ocr.digit import get_loot_and_ship +from autowsgr.game.game_operation import SetSupport +import autowsgr.fight.exercise as ef +from autowsgr.scripts.daily_api import DailyOperation +import os -#活动自动化 -timer = start_script() -plan = EventFightPlan20231215(timer, "event/20231215/E10AG.yaml", fleet_id=2) +timer = start_script(f"{os.path.dirname(os.path.abspath(__file__))}/user_settings.yaml") +SetSupport(timer,True) +plan = EventFightPlan20240206(timer, "event/20240206/E10IJ.yaml", fleet_id=3) plan.run_for_times(500) # 第一个参数是战斗次数,还有个可选参数为检查远征时间，默认为1800S + + +operation = DailyOperation(f"{os.path.dirname(os.path.abspath(__file__))}/user_settings.yaml") +operation.run() \ No newline at end of file