5708 Commits

Author SHA1 Message Date
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
POLAR me
b28ad8b72f 修改配置文件 2025-01-05 04:21:53 +08:00
LmeSzinc
875133d1f3 Upd: [EN] Allow running task Awaken 2025-01-05 03:18:24 +08:00
LmeSzinc
cc5b26e477 Upd: [EN] Awaken assets 2025-01-05 03:15:51 +08:00
LmeSzinc
5a74418a20 Fix: Missing awaken_popup_close if resource insufficient 2025-01-05 01:02:10 +08:00
LmeSzinc
46b1abfdff Fix: Handle game tips in ship_info_enter() 2025-01-04 22:48:17 +08:00
LmeSzinc
0ad3c2e2db Fix: Skip second awaken if first run get timeout 2025-01-04 22:47:13 +08:00
LmeSzinc
0052dc470f Fix: Subpress get_ship in dorm (#4488) 2025-01-04 22:44:56 +08:00
LmeSzinc
b72095e39f Upd: [TW] Raid assets of raid_20240130 2025-01-04 22:33:31 +08:00
LmeSzinc
6070785978 Upd: [TW] Raid entrance of Spring Festive Fiasco (raid_20240130) 2025-01-04 22:32:52 +08:00
LmeSzinc
da81498211 Add: Task Awaken to GUI 2025-01-04 22:19:30 +08:00
LmeSzinc
c8bf55b4ad Upd: [EN] MEOWFFICER_BUY_ENTER 2025-01-04 21:21:35 +08:00
LmeSzinc
93957382e8 Opt: Quick exit if there's only a few CV to retire 2025-01-04 05:24:10 +08:00
LmeSzinc
47e833fd9e Add: Awaken ships 2025-01-04 04:02:07 +08:00
LmeSzinc
b9be029b72 Chore: Update comments in dock_filter_set 2025-01-04 03:05:26 +08:00
LmeSzinc
8366b71f81 Add: page_dock 2025-01-04 03:05:05 +08:00
LmeSzinc
4a2eb4470c Opt: Combine dock filter operations to skip waiting dock loaded 2025-01-04 00:02:29 +08:00
POLARme
b5f1a2f0b4
Merge pull request #62 from LmeSzinc/master
[pull] master from LmeSzinc:master
2025-01-02 19:06:44 +08:00
LmeSzinc
3be9adc485 Fix: Switch handler in campaign_ensure_aside_20241219 2025-01-02 01:04:51 +08:00
LmeSzinc
39546d55c6 Fix: get_event_story_state should not have interval 2025-01-02 00:49:13 +08:00
LmeSzinc
f434784c6e Add: Do event story, not added to GUI yet
run with `python -m module.eventstory.eventstory`
2025-01-02 00:38:28 +08:00
LmeSzinc
72142c698b Chore: campaign_set_chapter_20241219 should use wrapped methods 2025-01-02 00:12:48 +08:00
LmeSzinc
b23ff47c50 Fix: Expand search area of MISSION_WEEKLY_RED_DOT 2025-01-01 21:39:54 +08:00
POLAR me
9811899751 feat(campaign): 添加低心情检测
- 新增低心情检测功能,识别并处理低心情提示
- 当计算误差过大时再报错
2025-01-01 06:07:30 +08:00
POLAR me
958fcead2d fix(os_ash): 添加combat_preparation自律提示确认处理
- 继承并调用了父类的 handle_combat_automation_confirm 方法
2024-12-31 06:33:54 +08:00
POLAR me
9c9d45666c refactor(module/oilkeep): 调整邮箱取油点击偏移
- 将 NO_OIL_GET 的点击偏移量从 (30, 30) 调整为 (2, 2),否则0/60000会覆盖有石油的情况
2024-12-31 06:26:56 +08:00
POLAR me
e33abb7b16 refactor(oilkeep): 更新 NO_OIL_GET 识别要素
- 修改了 NO_OIL_GET 识别要素
2024-12-31 06:18:55 +08:00
POLAR me
85c23219b6 feat(os_ash):增加处理META作战添加船只准备流程
- 增加处理META预设、添加船只等操作的逻辑
2024-12-30 05:25:52 +08:00
POLAR me
1531be5ded Merge branch 'master' into _master 2024-12-28 14:10:41 +08:00
POLAR me
7beeca25d2 feat(oilkeep): 优化邮箱领油逻辑
- 添加判断邮箱中是否有油可领,修复在没有油的情况下脚本可能卡在邮箱界面的问题
- 调整 MAIL_OIL_ADD 点击间隔为 0.3 秒,防止wait too long报错
2024-12-28 03:40:15 +08:00
LmeSzinc
3d112b4c6c Opt: [ALAS] Dynamically extends nemu_ipc timeout on retries for slow PCs 2024-12-27 23:45:00 +08:00
LmeSzinc
a6f81729e5 Refactor: [ALAS] Use trio-like thread pool in nemu_ipc instead of asyncio.run_in_executor() 2024-12-27 23:39:58 +08:00
LmeSzinc
0973cbc6f8 Upd: _at_low_hp() in various battle UI 2024-12-27 21:32:14 +08:00
LmeSzinc
9b69de459d Upd: [EN] QUIT_Christmas 2024-12-27 21:28:06 +08:00
LmeSzinc
42b4eb38b7 Opt: [ALAS] Match luma template in match_template_color
This is an untested change
2024-12-27 02:57:08 +08:00
LmeSzinc
62b3bd1390 Chore: Log battle UI theme 2024-12-27 02:35:54 +08:00
LmeSzinc
76fcfdf42a Upd: Battle UI Christmas, Cyber, Neon
- TODO: [EN][JP][TW] add QUIT_Christmas
2024-12-27 02:26:15 +08:00
LmeSzinc
1e7aaf5628 Fix: Handle BATTLE_PASS_NEW_SEASON 2024-12-27 00:58:07 +08:00
POLAR me
7ab86a2f14 refactor(module): 新增 appear_then_click_nocheck 方法并调整油井模块逻辑
- 在 ModuleBase 类中添加appear_then_click_nocheck,进行点击后不检查
- 修改 oilkeep 模块使用 appear_then_click_nocheck
2024-12-27 00:28:16 +08:00
POLAR me
628814c4b6 feat(Oilkeep): 添加石油平衡功能
- 实现每日领取储藏室石油的功能
2024-12-26 04:23:59 +08:00
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
LmeSzinc
7b4a716273 Add: Chapter SP
- Spilt map config MAP_CHAPTER_SWITCH_20241219 and MAP_HAS_MODE_SWITCH
2024-12-20 23:31:49 +08:00
LmeSzinc
c9fff1efa2 Fix: Handle mis-clicked to page_exercise (#4434) 2024-12-20 22:58:34 +08:00
LmeSzinc
be48eca020 Fix: Avoid clicking EXERCISE_PREPARATION after DORM_FURNITURE_SHOP_FIRST (#4422) 2024-12-20 22:47:41 +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