417 Commits

Author SHA1 Message Date
POLAR me
dcb7912e93 feat(campaign): SP图、活动图3还有WalkStep
- 添加了SP图的配置文件
- 添加了活动图3的配置文件
- 修改了舰队行走错误处理逻辑
2024-12-24 22:10:34 +08:00
POLARme
283782cf35
Merge pull request #60 from LmeSzinc/master
[pull] master from LmeSzinc:master
2024-12-21 12:58:01 +08:00
POLAR me
bd6a8896af Merge branch 'dev' into _master 2024-12-20 22:46:49 +08:00
LmeSzinc
cc2cf0d046 Refactor: Abstract chapter switches from 20240725 to 20241219 2024-12-20 22:24:47 +08:00
POLAR me
98d5066ea8
Merge branch 'LmeSzinc:master' into master 2024-12-09 23:46:08 +08:00
LmeSzinc
ba5b853cb9 Refactor: Standardize the use of match_template_color() 2024-12-09 16:09:34 +08:00
POLAR me
23095d31e9
Merge pull request #44 from LmeSzinc/master
[pull] master from LmeSzinc:master
2024-08-31 01:11:11 +08:00
LmeSzinc
782c8d0752 Opt: Skip waiting map clear percentage in SP 2024-08-30 23:04:36 +08:00
POLAR me
be997b7520
Merge branch 'LmeSzinc:master' into master 2024-08-20 23:05:46 +08:00
LmeSzinc
80baf3ee0c Opt: Ignore enemy filter if MAP_HAS_MOVABLE_NORMAL_ENEMY (#4095) 2024-08-20 02:19:52 +08:00
LmeSzinc
edbbc7b8cb Fix: Avoid turning_optimize in event maps 2024-08-20 02:14:00 +08:00
POLAR me
a10bdcbdca
Merge branch 'LmeSzinc:master' into master 2024-08-17 11:13:40 +08:00
LmeSzinc
95eb23de32 Opt: Show Map_clear_percentage as percentage instead of full float 2024-08-17 00:29:55 +08:00
POLAR me
0901555cfc
Merge pull request #38 from LmeSzinc/master
[pull] master from LmeSzinc:master
2024-07-28 14:20:31 +08:00
LmeSzinc
5e05db05d0 Add: Switch mode in map preparation 2024-07-26 02:20:15 +08:00
POLAR me
9525217da5 Merge branch 'master' into _master 2024-06-26 23:49:58 +08:00
POLAR me
7ef3aa1495 Update map_fleet_preparation.py 2024-06-21 02:46:38 +08:00
霞飛
0b97b40c46
Feature: New OpsiShop. (#3086)
* feat: New OpsiShop

* fix: use AdaptiveScroll

* feat: scan counter

* perf: calculate y value
2024-06-17 11:24:40 +08:00
POLAR me
42bd5305c2 Merge branch 'master' into 0master 2024-06-10 01:08:45 +08:00
LmeSzinc
58202c6a40 Pref: Reuse image array to improve memory performance 2024-06-05 01:15:41 +08:00
POLAR me
d0f680e416
Merge pull request #24 from LmeSzinc/master
[pull] master from LmeSzinc:master
2024-05-23 23:18:48 +08:00
LmeSzinc
ecfd5d50bf Upd: [CN] Support UI in 2024.05.21 2024-05-23 01:16:41 +08:00
POLAR me
2887ae6fe7 Merge branch 'master' into master- 2024-05-20 13:26:24 +08:00
LmeSzinc
65fe0c1ebd Fix: center_offset hasn't been calculated if map detection failed 2024-05-19 23:06:52 +08:00
POLAR me
4cced94938
Merge branch 'LmeSzinc:master' into master 2024-04-30 23:28:03 +08:00
LmeSzinc
499639f657 Fix: Predict swipe end 2024-04-30 17:42:56 +08:00
POLAR me
adc71febf8
Merge pull request #16 from LmeSzinc/master
[pull] master from LmeSzinc:master
2024-04-30 05:34:07 +08:00
LmeSzinc
cdcdd16118 Fix: info_bar covers map clear percentage 2024-04-28 16:32:18 +08:00
POLAR me
2329fb8d67
Merge branch 'LmeSzinc:master' into master 2024-04-27 00:04:07 +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
POLAR me
b8a0c792c9
Merge pull request #8 from LmeSzinc/master
[pull] master from LmeSzinc:master
2024-04-10 16:02:53 +08:00
W1NDes
809ba5d737 修复新号选舰队时的识别问题 2024-04-09 02:50:12 +08:00
guoh064
b81818f030
Opt: load offsets of auto search settings at fleet preparation stage (#3612) 2024-04-08 22:47:44 +08:00
POLAR me
e69b118f96
Merge pull request #2 from LmeSzinc/master
[pull] master from LmeSzinc:master
2024-03-22 21:27:57 +08:00
LmeSzinc
c59bddfc7e Upd: [TW] MAP_OFFENSIVE and SWITCH_OVER (#3544) 2024-03-21 18:21:15 +08:00
W1NDes
62c060b718 test2 2024-03-16 03:26:08 +08:00
POLAR me
e95a083955 同步
同步迷你主机上的更新
2024-03-16 01:09:13 +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