1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 18:39:04 +08:00
Commit Graph

434 Commits

Author SHA1 Message Date
LmeSzinc
cdcdd16118 Fix: info_bar covers map clear percentage 2024-04-28 16:32:18 +08:00
LmeSzinc
cba28a8aac Fix: Full scan wasn't early stopped cuz mixed use of siren and boss 2024-04-26 13:37:25 +08:00
LmeSzinc
d512c4dadf Opt: Remove meaningless sleep from stone age 2024-04-20 02:50:12 +08:00
guoh064
27693a6762
Add: 15图开荒/周回 (#3563)
* Add: W15 maps extracted

* Add: template for Special Carrier in W15

* Add: method mob_move

* Fix: MapDetectionError in strategy mob move

* Fix: adjacent grid judge condition

* Fix: should focus on location before moving

* Fix: should update view before further operation

* Fix: wait for STRATEGY_OPENED after executing mob move

* Fix: offset for assets in _mob_move()

* Opt: judge if movable before moving camera

* Add: W15 mechanism

* Opt: Rename Special Carrier asset name

* Fix: offset for MOB_MOVE_1/MOB_MOVE_2

* Fix: separate MOB_MOVE_1 and MOB_MOVE_2

* Fix: should use appear_then_click in strategy_mob_move_enter

* Fix: function import in campaign_15_base.py

* Fix: missing assets import

* Fix: missing offset in strategy_mob_move_cancel()

* Fix: should move only once in a campaign

* Temp: modify special carrier filter string to 3E

* Fix: missing self. before 'moved' variable

* Revert "Fix: missing self. before 'moved' variable"

This reverts commit 00f70e0ab55e422898cb90c5d5e54d4e7c989511.

* Revert "Fix: should move only once in a campaign"

This reverts commit b588f5bb07dfc4511f39fa0797fbe160f356d604.

* Fix: force goto special carrier

* Fix: missing return True in battle function

* Fix: enlarge offset of MOB_MOVE_ICON

* Fix: typo in campaing_15_3

* Fix: update view after moving mob

* Fix: should use full_scan_movable since mob moved

* Fix: missing map_data_init() in campaign_15_4.py

* Fix: battle 4 should be done by mob fleet

* Revert "Fix: battle 4 should be done by mob fleet"

This reverts commit 0e2af1ec817b7bc89fe123f03a33ea9ad955973f.

* Fix: should switch to fleet_1 after battle_3

* Add: battle function when using clear mode

* Fix: missing import

* Fix: colliding Config class

* Fix: Config.when should contain all cases

* Opt: pick ammo after third battle in clear mode of 15-4

* Del: old assets CarrierSpecial

* Fix: remake of CarrierSpecial template

* Add: UI mask for W15

* Fix: missing ASSETS import

* Fix: change full_scan_movable() to predict()

* Fix: predict should be done after each move

* Opt: camera_data in W15

* Del: remove predict

* Add: map info process after mob move

* Add: support for multi bosses in _expected_end() for W15

* Opt: show map after moving

* Del: remove redundant import in fleet.py

* Opt: using clear_chosen_enemy() instead of goto() directly

* Fix: should first take screenshot before strategy enter/confirm/cancel

* Add: asset TEMPLATE_SIREN_BOSS

* Opt: Handle first stages of BOSS as Siren in 15-3/15-4

* Fix: missing override map_data

* Add: ignore is_boss prediction for siren boss in 15-3/15-4

* Fix: should not use decorator Config with battle_x functions

* Opt: camera data in 15-4

* Opt: directly overwrite map info into original map_data

* Fix: missing indent block in campaign_15_4.py

* Fix: expect 15-3/15-4 first bosses as siren

* Revert "Add: ignore is_boss prediction for siren boss in 15-3/15-4"

This reverts commit 1104631f92e5df0672dce8c7acaa1eb122731746.

* Revert "Add: asset TEMPLATE_SIREN_BOSS"

This reverts commit a29d6b6b9bfb9d79963adb404ce2091cbfafb810.

* Revert "Add: support for multi bosses in _expected_end() for W15"

This reverts commit 8d357abe5bab79a643e23e8513cefa87d31cb3e8.

* Del: redundent map config

* Fix: recover boss grids

* Del: redundant clear_siren()

* Del: redundant clear_siren() in battle_6

* Add: template for mob move icon

* Opt: enlarge reinforcement fleet mask area for W15

* Opt: method _mob_move

* Upd: TEMPLATE_MOB_MOVE_ICON

* Fix: should have cool time between clicks of grid

* Revert "Upd: TEMPLATE_MOB_MOVE_ICON"

This reverts commit b3f2dcbc88dbe166470905f33d041b91c2192f57.

* Upd: TEMPLATE_MOB_MOVE_ICON

* Upd: TEMPLATE_MOB_MOVE_ICON

* Upd: predict_mob_move_icon

* Fix: 15-2 camera spawn point

* Fix: should update view using self.device.image

* Revert "Upd: TEMPLATE_MOB_MOVE_ICON"

This reverts commit 92a12596a8f271ec64e249ecb58779d9b64ecea6.

* Del: redundant assets MOB_MOVE_ICON.png

* Fix: using map_is_clear_mode to get real value of clear mode

* Opt: check mob_movable before moving

* Opt: Refactor _mob_move

* Fix: camera_sight in W15

* Opt: move sight to further point in _mob_move
2024-04-19 01:29:17 +08:00
guoh064
b81818f030
Opt: load offsets of auto search settings at fleet preparation stage (#3612) 2024-04-08 22:47:44 +08:00
LmeSzinc
c59bddfc7e Upd: [TW] MAP_OFFENSIVE and SWITCH_OVER (#3544) 2024-03-21 18:21:15 +08:00
LmeSzinc
290456637c Fix: Allow enter map with is_combat_loading 2024-01-12 18:40:47 +08:00
LmeSzinc
c3c4c03a5b Fix: Handle perspective error caused by GET_MISSION 2024-01-11 10:54:58 +08:00
hephooey
99a4478563
[TW]: Update WITHDRAW and IN_MAP assets (#3276) 2023-11-10 10:53:29 +08:00
LmeSzinc
fb3d736bbb Fix: [JP] SUBMARINE_BAR 2023-10-22 21:51:52 +08:00
hephooey
12c3dfd159
[tw] Update WITHDRAW asset (#3217) 2023-10-22 16:14:17 +08:00
appleapple802
c5bd99ff4c Upd: [TW] map and handler assets 2023-10-21 12:34:05 +08:00
LmeSzinc
e8340df57c Upd: [EN] _fleet_sidebar 2023-10-20 01:11:59 +08:00
LmeSzinc
d2302836ec Upd: [EN] Fleet preparation 2023-10-20 01:02:47 +08:00
LmeSzinc
b8f89def7d Fix: Submarine hard satisfied button 2023-10-20 00:40:05 +08:00
LmeSzinc
0c93da2373 Upd: Sync FLEET_PREPARATION_CHECK 2023-10-20 00:03:28 +08:00
LmeSzinc
cc60e701fc Upd: [JP] Fleet preparation 2023-10-20 00:03:25 +08:00
LmeSzinc
ce13aaa8b7 Upd: [CN] _fleet_sidebar 2023-10-19 22:30:06 +08:00
LmeSzinc
4969dc01b0 Upd: [CN] Fleet preparation 2023-10-19 22:02:24 +08:00
LmeSzinc
e41658ad43 Fix: Accidentally entered daily when entering map 2023-10-07 09:26:50 +08:00
LmeSzinc
14c92519f8 Upd: [JP] FLEET_PREPARATION 2023-09-14 23:40:09 +08:00
LmeSzinc
46d07d1f45 Fix: Reset arrive timers after handle_map_cat_attack() 2023-08-20 00:15:33 +08:00
LmeSzinc
acfb08526d Fix: Lost siren tracking at J5 in B2D2 2023-08-19 01:01:22 +08:00
LmeSzinc
b68a711d39 Fix: Handle map detection error caused by OPSI_MISSION_CHECK 2023-08-05 18:11:51 +08:00
LmeSzinc
d389f75c5f Add: handle_map_walk_speedup() 2023-08-03 22:59:37 +08:00
LmeSzinc
f948fd502f Fix: Handle empty HP when using emergency repair (#2925) 2023-07-25 12:48:47 +08:00
LmeSzinc
881007979a Fix: Handle GET_ADAPTABILITY in map detection (#2915) 2023-07-25 12:36:53 +08:00
LmeSzinc
6f3d46d617 Fix: Rewrite fortress_data 2023-07-21 03:37:54 +08:00
LmeSzinc
27acff08af Fix: Handle GET_ITEMS_1 in perspective errors of OpSi (#2808) 2023-07-02 15:46:48 +08:00
LmeSzinc
18cba1f9d0 Chore: Remove the use of np.int 2023-05-30 10:28:51 +08:00
LmeSzinc
4d79738818 Fix: cost_2 sort is not working when FLEET_2 is empty but having fleet 2 on map (#2643) 2023-05-27 23:57:29 +08:00
LmeSzinc
ac6412d8c9 Fix: Handle MAP_PREPARATION at map detection 2023-05-26 11:58:12 +08:00
LmeSzinc
e420f4ed04 Upd: Magic map swipe multipliers 2023-05-26 03:01:09 +08:00
LmeSzinc
4f761b1e6f Upd: ALAS framework updates 2023-05-16 09:11:46 +08:00
LmeSzinc
d1b1b0ac7d Opt: No map clear percentage waiting in SOS maps 2023-04-15 22:16:40 +08:00
LmeSzinc
06b07ca003 Fix: Handle mysteries in strategy_open() 2023-04-11 23:41:20 +08:00
LmeSzinc
998a57bb09 Fix: Catch game died in camera update 2023-04-04 03:26:41 +08:00
LmeSzinc
4610d9babf Upd: [TW] FLEET_*_ADVICE 2023-03-11 03:56:46 +08:00
LmeSzinc
ac379b0143 Upd: [EN][JP] FLEET_*_ADVICE 2023-03-11 01:58:39 +08:00
LmeSzinc
cb1d4f24d3 Opt: Raise error when user running a hard mode but haven't prepared the fleets 2023-03-10 23:10:19 +08:00
LmeSzinc
ab79961869 Fix: Protect fleet2 in D2 to archive 3 stars 2023-03-10 21:18:53 +08:00
LmeSzinc
d191d16649 Opt: Re-organise CalculateEmotion and IgnoreLowEmotionWarn 2023-02-18 01:19:04 +08:00
LmeSzinc
41ac19345b Refactor: Correct fleet_2 and fleet_boss uses 2023-01-29 14:48:16 +08:00
LmeSzinc
34437c1dcc Fix: Double clicked MAP_PREPARATION_CANCEL 2023-01-11 00:53:16 +08:00
LmeSzinc
0d24106d0e Fix: Missing hunt_and_boss use in Fleet._goto() 2022-12-08 01:27:30 +08:00
LmeSzinc
64720bb336 Upd: [CN][JP] GET_ITEMS_1_RYZA 2022-11-25 03:55:36 +08:00
LmeSzinc
803c3749aa Add: The Alchemist and the Archipelago of Secrets chapter TH 2022-11-25 01:58:05 +08:00
LmeSzinc
3bd6ade8bb Fix: AzurStats updates 2022-10-23 02:16:16 +08:00
LmeSzinc
832e606635 Fix: Handle akashi shop in map detection 2022-09-25 16:45:17 +08:00
LmeSzinc
59e8b0d2bb Opt: Faster map preparation again 2022-08-21 01:56:24 +08:00
LmeSzinc
c4fdf0b6fe Fix: Different drop condition in Camera._map_swipe() and focus_to() (#1518) 2022-08-21 01:47:15 +08:00
LmeSzinc
f3f6d19a1f Add: Event Operation Convergence (event_20220818_cn) 2022-08-18 23:51:30 +08:00
LmeSzinc
94dd262d3e Opt: Faster SelectedGrids.select()
(cherry picked from commit 21a9ed004ca16ba50b6e41e6c0ead3883fd33753)
2022-08-16 00:39:14 +08:00
LmeSzinc
3eed7a0549 Upd: Research patches from azur-stats-server
(cherry picked from commit 2e43a157aa9314bd7e0209bfdf8204ef7c0730f0)
2022-08-16 00:31:02 +08:00
VirtualTowel
9e7760bddb Fix: Wrong step number while 'fleets_reversed' is True 2022-07-30 17:48:35 +08:00
bookbug666
24bfef47e4 Opt: Change"UseU522Skill" into "UseOpenOceanSupport" 2022-07-29 03:08:31 +08:00
LmeSzinc
84d34701ee Fix: Caught by siren when passing though portals 2022-07-15 22:25:08 +08:00
LmeSzinc
4bad04932c Revert "Opt: Faster map preparation" 2022-07-14 23:48:51 +08:00
hgjazhgj
e779fd7e64 Fix: Misspelling & Line-end spaces 2022-06-25 20:04:45 +08:00
LmeSzinc
52a6e44d53 Fix: Handle popups in OpSi map detection 2022-06-11 23:14:59 +08:00
LmeSzinc
64120abd02 Fix: Do not preserve enemies when prioritizing large enemies 2022-06-10 02:07:06 +08:00
LmeSzinc
25a4162d27 Fix: Add LDPlayer serial auto switching
- Opt: Show help text for wrong serial
2022-06-05 06:38:43 +08:00
LmeSzinc
01fd16c8bf Fix: More edge cases in OpSi detection
Fix: Retry after handle_retirement() in OpSi
Fix: Stuck after getting OS auto search reward
Fix: Handle AUTO_SEARCH_REWARD at map detection
Set all offset of AUTO_SEARCH_REWARD to (50, 50)
Fix: Accidentally entered globe map in wait_until_walk_stable()
2022-06-02 01:57:32 +08:00
LmeSzinc
83c3a9658c Fix: Handle story in fleet set 2022-05-28 16:11:50 +08:00
SarContDeli
dd66c8f289 Opt: Modified the options for all screenshots 2022-05-21 00:53:37 +08:00
LmeSzinc
15ae857212 Fix: Retry on Camera.update() to allow random MapDetectionError 2022-05-16 21:38:56 +08:00
LmeSzinc
ff3bb42cde Fix: Duplicate keyword argument when using EnemyPriority (fixed #1108) 2022-05-09 14:12:32 +08:00
LmeSzinc
442042c90e Fix: Fleet detection when MAP_WALK_USE_CURRENT_FLEET is enable 2022-04-30 21:12:46 +08:00
LmeSzinc
f2c284e1f5 Fix: MAP_WALK_USE_CURRENT_FLEET detected early fleet arrive at boss 2022-04-29 22:45:24 +08:00
LmeSzinc
2139d1c344 Fix: Ensure fleet index before calling goto() (#1066) 2022-04-29 19:56:54 +08:00
LmeSzinc
cef6e9f579 Opt: Clear strongest enemy first when MAP_CLEAR_ALL_THIS_TIME is on
to prevent attacking strong enemies when out of ammo
2022-04-29 19:40:14 +08:00
LmeSzinc
08aa64580d Add: Rondo at Rainbow's End chapter AC
- Fix: swipe route out of target box
- Fix: Re-add handle_combat_weapon_release()
2022-04-28 23:22:05 +08:00
SarContDeli
f1e500a8a8 Opt: AutoSearchFleetOrder is merged into FleetOrder 2022-04-23 14:11:00 +08:00
LmeSzinc
a048f04e64 Fix: Duplicate keyword argument when using EnemyPriority 2022-04-23 01:28:34 +08:00
Egor Nats
6eac8ae259 Opt: Imports isorted 2022-04-14 16:37:54 -03:00
SaarChaffee
303dd90fdc change CRLF to LF 2022-04-09 23:31:09 +08:00
LmeSzinc
e30f71c891 Opt: Faster map preparation
- Faster retry after retirement
- Faster get_map_clear_percentage()
2022-03-24 19:20:02 +08:00
LmeSzinc
e5492da3eb Opt: Close auto search menu and retreat at campaign start to reduce user mistakes 2022-03-20 16:55:05 +08:00
LmeSzinc
1a5c606439 Fix: Clicking MAP_CAT_ATTACK_MIRROR in Threat: Med 2022-03-02 11:41:18 +08:00
LmeSzinc
1bb2f48b0a Fix: Move MAP_CAT_ATTACK_MIRROR to map buff icons
because EN has a different fleet position on the left
2022-03-01 23:19:03 +08:00
LmeSzinc
7c90e4120a Fix: Handle the animation of being attacked by siren submarine in map 2022-02-25 19:13:02 +08:00
LmeSzinc
49c9e0afd9 Add: Abyssal Refrain chapter AC
- Add: clear_bouncing_enemy()
- Opt: Retry faster if fleet was caught by a moving enemy
2022-02-24 21:34:16 +08:00
LmeSzinc
839fb18661 Fix: MapDetectionError raised in submarine move (#937) 2022-02-17 21:36:27 +08:00
LmeSzinc
7508597492 Opt: Edge detection in Northern Overture Rerun
- Opt: Use bottom edges first, upper edges have higher errors rates
2022-02-11 00:34:06 +08:00
LmeSzinc
e754e45edb Opt: Faster story handling in event maps
- Del: Remove the use of handle_map_after_combat_story
- Opt: Skip checking arrive_timer when having a result
- Fix: Map detection is still working on story popup
2022-02-10 18:25:51 +08:00
LmeSzinc
e92579b5f9 Opt: Remove redundant converts from pillow to numpy 2022-01-24 23:43:53 +08:00
LmeSzinc
ea84f2edf0 Opt: Avoid importing numpy and opencv to reduce memory usage of web server process 2022-01-23 23:03:55 +08:00
LmeSzinc
65f166ad12 Refactor: Use numpy image cache instead of pillow image 2022-01-23 23:03:55 +08:00
LmeSzinc
8374174d55 Refactor: module/device, separate all screenshot method and control methods
- Better screenshot and control retries, handle common exceptions
2022-01-22 17:42:47 +08:00
LmeSzinc
0caf4ba990 Fix: Handle popup to use 2x book (#880) 2022-01-18 22:06:38 +08:00
LmeSzinc
897d179bbd Add: Maritime escort 2022-01-15 22:17:34 +08:00
LmeSzinc
e522077277 Add: Handle U522 skill 2022-01-11 22:14:19 +08:00
LmeSzinc
1abc415a03 Fix: Submarine on the upper grid is predicted as fleet arrived (#826) 2022-01-10 18:46:36 +08:00
LmeSzinc
caf476a41d Fix: Find missing submarines in find_submarine() 2022-01-10 17:49:07 +08:00
LmeSzinc
84f5e86077 Fix: Hunt zone view re-enabled by game
- Fix: Validate switch status
2022-01-10 01:27:03 +08:00
LmeSzinc
27bc8b3843 Add: Detecting and moving submarines 2022-01-10 00:46:37 +08:00
LmeSzinc
487d4ed9e8 Fix: Force to disable auto submarine call if only calling submarine at boss 2022-01-09 21:06:46 +08:00
LmeSzinc
c5a04c55dc Add: Submarine move in map (#864) 2022-01-09 19:26:49 +08:00
LmeSzinc
275bb364eb Fix: Doing map detection on auto search menu 2022-01-02 18:01:11 +08:00
LmeSzinc
cd0204f455 Opt: Better tips when having wrong configs 2021-12-31 01:34:01 +08:00