242 Commits

Author SHA1 Message Date
W1NDes
062860370d Merge remote-tracking branch 'upstream/master' into dev 2025-11-14 14:26:42 +08:00
guoh064
1a29d642a0
Upd: [JP] USE_DATA_KEY_NOTIFIED asset (#5303) 2025-11-13 17:50:50 +08:00
W1NDes
418211223f Merge remote-tracking branch 'upstream/master' into dev 2025-11-08 19:17:30 +08:00
sui-feng-cb
b14ab02c97 Upd: [CN] USE_DATA_KEY_NOTIFIED asset 2025-11-06 17:11:57 +08:00
W1NDes
edd39486a8 Merge remote-tracking branch 'upstream/master' into dev 2025-09-13 19:25:29 +08:00
LmeSzinc
913b019ee7 Fix: AUTO_SEARCH_OFF4 should in cn folder 2025-09-13 03:21:35 +08:00
LmeSzinc
88fc235a24 Upd: [EN] AUTO_SEARCH_ON AUTO_SEARCH_OFF 2025-09-13 03:09:06 +08:00
LmeSzinc
69e99e6692 Upd: [EN] MAP_STAR_* 2025-09-13 03:04:36 +08:00
LmeSzinc
59393d6d31 Fix: AUTO_SEARCH for minor icon shift (#5126) 2025-09-13 01:09:58 +08:00
LmeSzinc
d113f71a3d Fix: Use template matching in MAP_GREEN 2025-09-13 00:04:24 +08:00
LmeSzinc
2028b7426c Fix: MAP_STAR detection for minor icon shift
- TODO: [EN] Update MAP_STAR_*
2025-09-12 23:46:08 +08:00
nEEtdo0d
b4cceb7f8e Upd: [EN] event current and rerun check icons; other button_extract output 2025-08-02 13:32:52 -04:00
W1NDes
983d67e50a Fix(ResearchInspect): 添加任务提交图片 2025-07-22 22:24:36 +08:00
W1NDes
bd27896399 Merge remote-tracking branch 'upstream/master' 2025-07-17 22:48:07 +08:00
HexatomicRing
4f0f2a2c87
Fix: Emulator no respond (#4947)
* Fix Leidian Emulator no respond

* [fix] assets name

* [fix] Avoid clearing stuck record
2025-07-17 22:44:28 +08:00
POLARme
2132288867 Merge remote-tracking branch 'upstream/master' 2025-06-06 03:02:22 +08:00
guoh064
3b65dfe6f0 Add: check manjuu loading in os_mission_overview_accept 2025-06-06 01:57:43 +08:00
POLAR me
d32575229d Merge remote-tracking branch 'upstream/master' 2025-03-17 21:06:41 +08:00
dragonheart107
2a02cb4aa2
Merge pull request #4662 from dragonheart107/Fix--Submarine-asset-en
Upd: Submarine EN assets
2025-03-15 21:27:28 +08:00
POLAR me
16c44d1458 Merge remote-tracking branch 'upstream/master' 2025-01-17 14:14:05 +08:00
dragonheart107
44742e3757
Updated EN assets for 2x book (#4516) 2025-01-16 00:08:29 +08:00
POLAR me
9811899751 feat(campaign): 添加低心情检测
- 新增低心情检测功能,识别并处理低心情提示
- 当计算误差过大时再报错
2025-01-01 06:07:30 +08:00
POLAR me
1531be5ded Merge branch 'master' into _master 2024-12-28 14:10:41 +08:00
LmeSzinc
1e7aaf5628 Fix: Handle BATTLE_PASS_NEW_SEASON 2024-12-27 00:58:07 +08:00
POLAR me
628814c4b6 feat(Oilkeep): 添加石油平衡功能
- 实现每日领取储藏室石油的功能
2024-12-26 04:23:59 +08:00
POLAR me
6782c1be27
Merge branch 'LmeSzinc:master' into master 2024-11-22 22:36:46 +08:00
LmeSzinc
c7908073b2 Upd: [JP] USE_DATA_KEY (fixed #4344) 2024-11-22 22:22:07 +08:00
POLAR me
93cc60b7f2
Merge pull request #51 from LmeSzinc/master
[pull] master from LmeSzinc:master
2024-09-26 00:46:23 +08:00
LmeSzinc
cf7b208a4f Upd: [TW] MISSION_POPUP_ACK MISSION_POPUP_GO (#fixed 4228)
Signed-off-by: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
2024-09-25 11:44:31 +08:00
POLAR me
19d810d389 Merge branch 'master' into _master 2024-06-29 01:49:50 +08:00
LmeSzinc
ec5f0f92a6 Upd: [EN] MOB_MOVE_CANCEL 2024-06-28 09:12:18 +08:00
LmeSzinc
3958373fc4 Upd: [TW] MOB_MOVE_CANCEL (#3922) 2024-06-27 22:51:59 +08:00
POLAR me
f4382b7d1f
Merge pull request #27 from LmeSzinc/master
[pull] master from LmeSzinc:master
2024-06-03 12:03:38 +08:00
Air111
1e793295e8 Fix: mob move optimization 2024-06-03 00:04:42 +08:00
POLAR me
2329fb8d67
Merge branch 'LmeSzinc:master' into master 2024-04-27 00:04:07 +08:00
LmeSzinc
89aa1ad7dc Fix: W15 optimizations
- Upd: [CN] MOB_MOVE_CANCEL
- Opt: MAP_SWIPE_MULTIPLY
- Fix: 15-1 did not inherit ConfigBase
2024-04-20 01:57:27 +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
bf533d9c89
Merge pull request #5 from LmeSzinc/master
[pull] master from LmeSzinc:master
2024-04-04 09:24:39 +08:00
guoh064
555fb2ad29 Upd: Assets FORMATION to adapt to W15 2024-04-03 17:24:40 +08:00
WINDes
4cc61dd054 Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript into LmeSzinc-master 2024-03-29 16:04:27 +08:00
W1NDes
e01fda370f LOGIN_ANNOUNCE适配新版 2024-03-29 02:56:35 +08:00
LmeSzinc
32e4571afc Upd: LOGIN_ANNOUNCE 2024-03-28 23:43:18 +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
d1a9ce771d Upd: [CN] MISSION_POPUP_ACK and MISSION_POPUP_GO (#3530) 2024-03-21 18:44:49 +08:00
POLAR me
e95a083955 同步
同步迷你主机上的更新
2024-03-16 01:09:13 +08:00
POLAR me
e14435630d 回滚
回滚至alas-with-dashboard
2024-03-16 00:54:26 +08:00
WINDes
8841b3da74 NO COLLISON 2023-12-28 20:41:03 +08:00
WINDes
d4aa52c258 back 2023-12-28 20:32:24 +08:00
WINDes
1bf5a15431 No Collision 2023-12-28 20:24:25 +08:00
WINDes
e9d520d9f0 fix 2023-12-28 20:22:04 +08:00