ReDawn/M-AzurLaneAutoScript
1
0
Fork 0
mirror of https://github.com/W1NDes/M-AzurLaneAutoScript.git synced 2026-05-16 16:30:42 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,020 Commits 4 Branches 0 Tags
Commit Graph

5798 Commits

Author SHA1 Message Date
POLARme
4f794c4697
Merge pull request #71 from LmeSzinc/master 
[pull] master from LmeSzinc:master
 2025-02-23 22:22:13 +08:00
guoh064
cf24123677
Upd: [JP] PRICE_OCR in os_shop (#4601) 2025-02-23 22:16:17 +08:00
guoh064
887938ba60
Upd: OCR parameters for JP zone name recognition (#4600) 2025-02-23 22:16:08 +08:00
LmeSzinc
6c081fd855 Fix: [ALAS] Missing import due to in-file running 2025-02-23 03:23:14 +08:00
LmeSzinc
abde744e29 Add: [ALAS] Util function xywh2xyxy(), xyxy2xywh() 2025-02-23 01:30:07 +08:00
LmeSzinc
054a218574 Upd: [JP] Assets for Meta sync 2025-02-23 01:29:16 +08:00
dragonheart107
a89608ff3f
Meta sync en assets (#4598) 
* Upd: En asset meta sync

* add en to available servers for meta sync

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2025-02-23 01:18:25 +08:00
LmeSzinc
0c3a3fa1d6 Fix: Use template match to check account kick 2025-02-20 12:12:19 +08:00
LmeSzinc
5b4f4538ab Fix: [ALAS] get_bbox_reversed should have a reversed threshold by default 2025-02-20 12:09:27 +08:00
POLARme
efad3e259a
Merge branch 'LmeSzinc:master' into master 2025-02-19 01:51:46 +08:00
LmeSzinc
ad8157ac6b Opt: Remove confirm_timer in meta_reward_receive() 
to satisfy current code standard
 2025-02-19 01:34:28 +08:00
LmeSzinc
b52e33e2b9 Add: Meta sync receive 
- TODO: [EN][JP][TW] Update SYNC_ENTER SYNC_TAP
 2025-02-19 01:29:40 +08:00
W1NDes
9abdfd862b fix(retire): 调整装备确认按钮的偏移值 
- 减小 EQUIP_CONFIRM_2 按钮的点击偏移量，防止在唯一保护窗口陷入三按钮点击死循环
 2025-02-19 00:44:59 +08:00
LmeSzinc
9ddbe2eadf Fix: Leave page_channel during ui switching 2025-02-19 00:16:09 +08:00
LmeSzinc
e1b11c0d69 Fix: Subpress handle_exp_info after entering page_main (#4591) 2025-02-19 00:10:31 +08:00
LmeSzinc
8e45d2fa46 Opt: Fast retry GOTO_MAIN after clicking AUTO_SEARCH_REWARD 2025-02-18 23:20:13 +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