7946 Commits

Author SHA1 Message Date
POLAR me
16c44d1458 Merge remote-tracking branch 'upstream/master' 2025-01-17 14:14:05 +08:00
LmeSzinc
ce5812d6bb
Merge pull request #4523 from LmeSzinc/dev
Add: Event Spring Fashion Festa (raid_20250116)
2025-01-17 13:40:32 +08:00
LmeSzinc
35fbc03212 Upd: UI switches from page_main_white to page_raid 2025-01-17 13:29:46 +08:00
LmeSzinc
372c3e74db Add: [EN][JP] Assets in raid_20250416 2025-01-17 13:25:59 +08:00
LmeSzinc
ee76c8925b Add: Assets in raid_20250416 2025-01-17 13:06:06 +08:00
LmeSzinc
5db4cbaeef Add: Event entrance of Spring Fashion Festa (raid_20250116) 2025-01-17 12:46:34 +08:00
LmeSzinc
c711584fa6 Opt: Reduce one extra screenshot call after retirement in auto search 2025-01-17 12:41:39 +08:00
LmeSzinc
22fedfefab Chore: Comments in catch_camera_repositioning 2025-01-17 12:37:49 +08:00
guoh064
4c1f673df0
Revert "tmp: [JP] OCR_REMAIN in daily" (#4521)
This reverts commit ba27a51cbb9dec41375c6db6e7f994e99748c341.
2025-01-17 12:34:46 +08:00
LmeSzinc
53572f9aeb Fix: Reduce background of SHIP_LEVEL_CHECK (#4513) 2025-01-16 19:03:08 +08:00
LmeSzinc
2bf1894ca7 Upd: [TW] Battle pass assets 2025-01-16 18:30:19 +08:00
LmeSzinc
9e421a29da
Merge pull request #4519 from guoh064/jp_commission
Revert JP commission ocr modification
2025-01-16 17:10:40 +08:00
guoh064
fea9326ffa Revert "Upd: [JP] commission suffix ocr pre_process (#4403)"
This reverts commit 4245109ed243cd8f152d0a88b0ed8f8aabdf2605.
2025-01-16 00:52:20 +08:00
guoh064
2ff0038b41 Revert "Fix: jp commission suffix pre_process (#4435)"
This reverts commit 52a29aa288b13d26f9a49c21ec9adc425be3c165.
2025-01-16 00:52:17 +08:00
dragonheart107
44742e3757
Updated EN assets for 2x book (#4516) 2025-01-16 00:08:29 +08:00
dragonheart107
40961382f9
remove outdated EN -Mail assets, enable EN AUTO-Dossier (#4478)
* Add files via upload

* Delete assets/cn/freebies/assets.py

* Delete assets/cn/freebies/campaign_14_4.py

* Add files via upload

* Add files via upload

* fix mail

* replaced/removed old EN Mail assets; add EN for AUTO-Dossier; need assets for JP (maybe TW?)

* Better differentiation between META_AUTO-ATTACK_START and META_AUTO-ATTACKING for EN

* revert 14-4 changes due to further testing needed

* Add missing picture for the new UI py function

* updated button extract

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2025-01-15 23:28:41 +08:00
sui_feng
1053d490cf
Add: War Archives 20220224 (#4512) 2025-01-15 23:24:48 +08:00
LmeSzinc
4ee9aa24b6
Merge pull request #4510 from guoh064/jp_digit_ocr
Add: ocr model replacement for azur_lane in JP server
2025-01-15 23:24:25 +08:00
LmeSzinc
c60bb4c37b Fix: Avoid clicking EXP_INFO_B in chapter A 2025-01-13 16:34:17 +08:00
POLAR me
c1a091bb9e feat(commission): 添加委托不适配判断功能
- 新增 COMMISSION_UNFIT 按钮用于识别委托不适配情况
2025-01-13 02:59:11 +08:00
guoh064
3995922253 Add: azur_lane_jp model injection interface 2025-01-12 13:06:06 +08:00
guoh064
10130c9882 Add: ocr model for azur_lane in JP server 2025-01-12 12:46:22 +08:00
POLAR me
4fb87c218a fix(module/config): 修复了上次merge的疏忽
- args.json中关于event3的遗漏
2025-01-12 02:47:39 +08:00
POLAR me
ad6617c1af Merge remote-tracking branch 'upstream/master' 2025-01-12 00:37:38 +08:00
POLAR me
a8527d2129 refactor(module/config): 调整任务优先级配置
- 按照个人习惯调整了多项任务的优先级顺序
2025-01-12 00:30:57 +08:00
POLAR me
70ef04f844 feat(module): 添加战役结束通知功能
- 在 FastForwardHandler 类中增加了战役结束时的通知功能
2025-01-10 21:57:38 +08:00
LmeSzinc
ea650eb507
Merge pull request #4506 from LmeSzinc/dev
Bug fix
2025-01-10 13:13:56 +08:00
LmeSzinc
3995010ce6 Upd: Enemy templates in event 20221222 to select weaker enemy 2025-01-10 13:10:11 +08:00
LmeSzinc
bad155d709 Fix: Subpress wrong siren predictions on land in B3/D3 2025-01-10 12:30:40 +08:00
LmeSzinc
156a988cf5 Fix: Skip using emergency repair if all HP is 0 (#4501) 2025-01-10 02:39:46 +08:00
LmeSzinc
c98ea50b04 Del: Remove scrcpy screenshot 2025-01-10 02:29:58 +08:00
LmeSzinc
2176fdf803 Fix: Getting index of a digit chapter when looking for a non-digit chapter (#4504) 2025-01-10 02:27:51 +08:00
POLAR me
517b11ea89 fix:补推上一次漏推送的活动开荒顺序 2025-01-09 23:28:02 +08:00
LmeSzinc
30e5ff10cb
Merge pull request #4503 from LmeSzinc/dev
Add: event entrance for rerun event 20250109
2025-01-09 22:36:04 +08:00
Air111
40a9e901e2
Fix: siren has boss icon small in event 20221222 rerun (#4502) 2025-01-09 22:24:19 +08:00
POLAR me
c244c29bb8 test(module/config): 更新活动事件ID
- 将 event_20241219_cn 替换为 event_20221222_cn
- 修改开荒顺序
2025-01-09 20:49:44 +08:00
guoh064
78c90831c2
Add: event entrance for rerun event 20250109 (#4500) 2025-01-09 15:13:42 +08:00
LmeSzinc
04de22164f Opt: Clear GET_ITEMS_1 interval before os_shop_buy_execute 2025-01-08 12:43:14 +08:00
POLARme
3d3d4c2ae8
Merge pull request #64 from LmeSzinc/master
[pull] master from LmeSzinc:master
2025-01-07 20:19:09 +08:00
LmeSzinc
a36b82b227
Merge pull request #4497 from LmeSzinc/dev
Bug fix
2025-01-07 12:23:34 +08:00
LmeSzinc
546f25d646 Chore: [ALAS] Directly mark nemuipc and ldopengl unavailable on non-Windows 2025-01-07 12:18:40 +08:00
LmeSzinc
38da2aba17 Fix: [ALAS] Patch to fix atx_agent_url on arm64-v8a 2025-01-07 11:35:20 +08:00
sui_feng
9b61faf308
Fix: z20_or_z21 should be filtered by any ship (#4494) 2025-01-07 11:19:21 +08:00
guoh064
ab9f2892dc
Upd: [JP] Opsi assets (#4492) 2025-01-06 18:31:52 +08:00
guoh064
e60ea81095
Add: [JP] asset GUILD_MISSION_NEW (#4493) 2025-01-06 18:31:26 +08:00
POLAR me
335488b71d feat(research): 添加允许空选科研项目的配置项
- 在 research 配置中添加 AllowNone 选项,默认为 false
2025-01-06 12:22:51 +08:00
POLAR me
fa916a985c Merge branch 'master' of https://github.com/W1NDes/M-AzurLaneAutoScript 2025-01-06 03:33:03 +08:00
POLAR me
01e551036e fix(alas): 调整 GameStuckError 的处理逻辑
- 在修改心情报错后,影响了原先的战败报错
2025-01-06 03:32:53 +08:00
W1NDes
843360b6d8 refactor(campaign): 修改心情检测队伍判定
- 第一舰队第二舰队不是官方名字,舰队名是可以自定义的,所以现在根据出击方式判断。
2025-01-06 02:18:49 +08:00
POLAR me
f7ae053713 Merge remote-tracking branch 'upstream/master' 2025-01-05 06:11:10 +08:00