ReDawn/M-AzurLaneAutoScript
1
0
Fork 0
mirror of https://github.com/W1NDes/M-AzurLaneAutoScript.git synced 2026-05-17 14:45:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,997 Commits 4 Branches 0 Tags
Commit Graph

5783 Commits

Author SHA1 Message Date
W1NDes
9abdfd862b fix(retire): 调整装备确认按钮的偏移值 
- 减小 EQUIP_CONFIRM_2 按钮的点击偏移量，防止在唯一保护窗口陷入三按钮点击死循环
 2025-02-19 00:44:59 +08:00
W1NDes
46a86de21b feat(ocr): 添加 Ocr Server线程 CPU 亲和性设置(windows) 
- 在各个配置模板中添加 OcrCpuAffinity 选项，用于设置 OCR 服务器使用的 CPU
- 在 ocr/rpc.py 中实现 OCR 服务器进程的 CPU 亲和性设置
 2025-02-17 10:43:12 +08:00
POLAR me
c0a9ef06fe fix(meowfficer): 处理喂猫在大世界中导致的无限点击 
- 记录连续出现相同按钮名的次数
- 当连续次数达到 7 次时，判断指挥猫在大世界中，直接确认，结束任务
 2025-02-15 06:09:49 +08:00
POLAR me
fd5c1982c5 feat(webui): 修改实例的排序显示规则 
- 修改alas实例的排序，数字结尾的实例按数字大小排序，其余情况按字母排序
 2025-02-15 05:17:56 +08:00
POLAR me
c1362531a8 Merge remote-tracking branch 'upstream/master' 2025-02-13 22:45:16 +08:00
LmeSzinc
2e395ac8ea Upd: [TW] Event entrance of Windborne Steel Wings (event_20240815_cn) (#4585) 2025-02-13 12:50:32 +08:00
LmeSzinc
fc90b8e72b Fix: Disable raid tasks if another event is ongoing 2025-02-13 12:50:29 +08:00
LmeSzinc
4082abda8f Fix: Catch account kicked by server maintenance 2025-02-13 12:43:01 +08:00
LmeSzinc
ca0f483487 Upd: OCR_GUILD_OPERATIONS_PROGRESS (fixed #4549) 
- TODO: [EN][JP][TW] Update OCR_GUILD_OPERATIONS_PROGRESS
 2025-02-12 01:53:08 +08:00
LmeSzinc
2d9556d21b Fix: [ALAS] Emulator tree-killed when Alas gets killed 2025-02-12 01:41:03 +08:00
Shane (Treasure) Xue
1435bb7252
Update shop_voucher.py (#4576) 
Corrected scroll action: should scroll to next page, not the bottom.
 2025-02-12 01:40:25 +08:00
W1NDes
f7eb6d2034 refactor(oilkeep): 重构石油检测逻辑 
- 移除冗余的 get_oil 方法，改为继承UI类CampaignStatus
- 优化油量检测流程，增加多次尝试以确保准确性
- 修复jp-servrer的石油读取
 2025-02-09 22:10:16 +08:00
POLARme
b62e7ac6e7
Merge pull request #69 from LmeSzinc/master 
[pull] master from LmeSzinc:master
 2025-02-08 06:55:22 +08:00
霞飛
3b23cc920b
fix: Incorrect truncation (#4570) 2025-02-08 00:50:11 +08:00
POLARme
53f23789d9
Merge pull request #68 from LmeSzinc/master 
[pull] master from LmeSzinc:master
 2025-02-07 06:29:00 +08:00
霞飛
6e4601dd2b
Fix bugs (#4569) 
* fix: add PAUSE_HolyLight at `_at_low_hp`

* fix: handle map file name
 2025-02-07 01:09:24 +08:00
guoh064
136100c7fd Fix: asset name of PAUSE_HolyLight 2025-02-06 23:38:18 +08:00
LmeSzinc
7ee0d4533f Fix: Missing "/" in OcrDataKey (#4563) 2025-02-06 23:09:34 +08:00
LmeSzinc
655b2fb361 Upd: Assets for battle UI Holy Light 2025-02-06 23:01:04 +08:00
LmeSzinc
7627b91549 Upd: Config update 2025-02-06 22:34:38 +08:00
zhenghan123
b8dbed59f6
Add: event entrance for rerun event 20250206 (#4564) 
* Update Readme.md

* Update args.json

* Update zh-CN.json

* Update args.json

* Update ja-JP.json

* Update en-US.json

* Update Readme.md

* Update Readme.md

* Update en-US.json
 2025-02-06 22:25:17 +08:00
POLARme
ad9414df76
Merge branch 'LmeSzinc:master' into master 2025-02-04 03:04:20 +08:00
LmeSzinc
c3464e52b1 Make some random changes 
to fix
error: unable to read sha1 file of module/os_ash/ash.py (aeee4e621dd77abc9ccb9024a053101b23d68dea)
 2025-02-04 01:26:34 +08:00
LmeSzinc
e5ff2dddbd Fix: [ALAS] Remove DroidCast testing on BlueStacks Air 2025-02-04 01:14:52 +08:00
LmeSzinc
463e5ff187 Chore: [ALAS] Prefer MaaTouch if both minitouch and MaaTouch are fastest 2025-02-03 23:42:34 +08:00
LmeSzinc
e55f14f246 Fix: Empty project duration in research_jp_detect (fixed #4528) 2025-02-03 23:19:04 +08:00
guoh064
09b6bc179b
Upd: [JP] ash_collect_status (#4554) 2025-02-03 22:53:24 +08:00
guoh064
710994f751
Fix: guild operations should start based on server time instead of local time (#4548) 2025-02-03 22:52:57 +08:00
LmeSzinc
3dc3e7682b Fix: [ALAS] netcat loopback address on BlueStacks Air 2025-02-01 00:14:12 +08:00
POLARme
17dfc223a7
Merge branch 'LmeSzinc:master' into master 2025-01-27 19:41:37 +08:00
guoh064
9fa0fab1b3
upd: [JP] OCR_REMAIN in daily (#4533) 2025-01-27 17:57:07 +08:00
hephooey
419f2ed6d5
[TW] Event: Spring Fashion Festa (#4539) 2025-01-27 17:56:45 +08:00
POLAR me
0d02f4a374 fix(module/campaign): 移除测试时的 handle_map_stop 调用 2025-01-23 02:46:40 +08:00
POLAR me
af99cc97e1 feat: 新增活动图相关配置项和短猫设置 
- 在 StopCondition 中添加 EventSwitch 配置项，用于控制是否在活动图开荒完成后刷PT
- 在 EventDaily 中添加 SyncEmotion 配置项，用于同步心情到活动图2
- 在 OpsiMeowfficerFarming 中添加 IgnoreStory 配置项，用于忽略剧情主线未完成的情况
 2025-01-23 02:21:13 +08:00
POLARme
b9ceddbca1
Merge pull request #67 from LmeSzinc/master 
[pull] master from LmeSzinc:master
 2025-01-19 09:37:26 +08:00
LmeSzinc
4582cb516b Upd: [JP][TW] Awaken assets 2025-01-19 03:19:28 +08:00
POLARme
6be4e3900f
Merge pull request #66 from LmeSzinc/master 
[pull] master from LmeSzinc:master
 2025-01-17 23:09:44 +08:00
LmeSzinc
5494a65dec Add: Purchase PR5 and DR4 blueprints in shipyard (#4522) 2025-01-17 23:03:07 +08:00
LmeSzinc
96a365f8ea Fix: Add azur_lane_jp model to ModelProxyFactory 2025-01-17 22:57:43 +08:00
POLAR me
16c44d1458 Merge remote-tracking branch 'upstream/master' 2025-01-17 14:14:05 +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
guoh064
fea9326ffa Revert "Upd: [JP] commission suffix ocr pre_process (#4403)" 
This reverts commit 4245109ed243cd8f152d0a88b0ed8f8aabdf2605.
 2025-01-16 00:52:20 +08:00