fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 10:10:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,359 Commits 61 Branches 1,839 Tags
72bc76aa244489996b8ecaa8ff67cf441d9fd8bc
Commit Graph

8359 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
uye
72bc76aa24 chore: 调整肉鸽商品识别roi范围 2023-08-13 19:11:47 +08:00
David
7a9ec26241 fix: #5931 2023-08-13 11:18:39 +02:00
MistEO
0fc5374c3d chore: Auto Update Game Resources - 2023-08-13 alpha/v4.22.0-beta.1.d065.g0fc5374c3 2023-08-13 08:07:35 +00:00
MistEO
4586e536c3 Revert "添加繁中服对于鸿雪的OCR等价规则 #5931" (#5935) 2023-08-13 15:57:35 +08:00
MistEO
0b6a07bdfa fix: CloseDown not works on macOS (#5920) 2023-08-13 15:54:15 +08:00
uye
9032220b10 fix: 关闭模拟器时索引超出了数组界限 
fix #5930
 2023-08-13 15:50:14 +08:00
David
404ac43cc5 fix: 添加繁中服对于鸿雪的OCR等价规则 #5931 #5933 2023-08-13 09:50:04 +02:00
MistEO
3e1a7a17a5 Revert "添加繁中服对于鸿雪的OCR等价规则 #5931" 2023-08-13 15:41:19 +08:00
uye
c75de28019 fix: 肉鸽打折商品识别错误 
fix #5919
 2023-08-13 15:29:32 +08:00
David
8cc9bc6ab9 添加繁中服对于鸿雪的OCR等价规则 #5931 (#5933) 2023-08-13 08:52:44 +02:00
David
1ac79248df Revert "Useless png in roguelike JP" 
This reverts commit 8b08e10aa3.

My bad, I've removed the wrong image.
 2023-08-13 08:45:20 +02:00
Roland125
4336c1b789 添加繁中服对于鸿雪的OCR等价规则 #5931 2023-08-13 13:30:48 +08:00
David
37e26c6ea3 Removed useless .png from JP I.S. 2023-08-13 00:09:06 +02:00
David
8b08e10aa3 Useless png in roguelike JP 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/4921#issuecomment-1562944784
 2023-08-13 00:00:16 +02:00
David
44c51044ea feat: Invitation to Wine rerun implemen. for JP 2023-08-12 20:43:22 +02:00
David
f5c61a30ac feat: 適配繁中服保全派駐 (#5926) 
~~坐牢~~ 坐到很煩，所以動手更新一下保全派駐的東西。

有試過加上自己寫到一半的蘿蔔礦場作業可以正常開刷，應該是....沒有什麼問題 (?
 2023-08-12 18:20:28 +02:00
momomochi987
c37b889cf2 增加 "鋼鐵蘿蔔礦場" 的關卡 text 2023-08-12 23:41:14 +08:00
momomochi987
5e1cefa539 補充保全派駐圖片 2023-08-12 23:34:09 +08:00
momomochi987
0eb9e68993 重製 "放棄行動" 圖片 2023-08-12 23:32:27 +08:00
momomochi987
d77a542f95 更新保全派駐相關 text 2023-08-12 23:29:47 +08:00
cenfusheng
c2a9fabd8d fix: 修复特别关注干员的识别问题 (#5924) 
先把膏药糊上，模型修了再删（
 2023-08-12 23:01:37 +08:00
cenfusheng
0b6f34dbaa fix: 修复特别关注干员的识别问题 
先把膏药糊上，模型修了再删（
 2023-08-12 23:00:36 +08:00
David
117ddb84ae optimized: regex for I.S. trader shopping in EN 2023-08-12 16:51:23 +02:00
David
9747ac6f62 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev alpha/v4.22.0-beta.1.d041.g9747ac6f6 2023-08-12 12:23:54 +02:00
David
06703048c4 fix: wrong template for reception room detection 2023-08-12 12:23:52 +02:00
MistEO
ff1668e6f0 fix: 修复自动编队时不重试的问题 2023-08-12 16:36:46 +08:00
MistEO
60644902a5 feat: 抄作业自动编队支持含有不同职业的组 2023-08-12 15:17:10 +08:00
MistEO
ac9e7a414e fix: build error 2023-08-12 15:13:00 +08:00
MistEO
5142a63201 chore: 删除目前用不上了的肉鸽代码 2023-08-12 15:06:48 +08:00
Loong
9b3f0c995f Merge branch 'MaaAssistantArknights:dev' into fix/closedown 2023-08-12 14:28:22 +08:00
MistEO
d5ea735124 chore: Auto Update Game Resources - 2023-08-11 alpha/v4.22.0-beta.1.d035.gd5ea73512 2023-08-11 21:26:59 +00:00
Long Wang
efb2447680 Only apply to CompatMac 2023-08-12 01:48:58 +08:00
David
afdd57c9d5 typo: 1646e76704 2023-08-11 19:48:49 +02:00
David
1646e76704 chore: Invitation to Wine rerun implementation for EN 2023-08-11 19:44:29 +02:00
David
35487f87fe chore: Oper Regex Tweaked for EN (BattleMatcher) 2023-08-11 19:28:08 +02:00
Long Wang
5c6378f836 fix: CloseDown not works on macOS 2023-08-12 01:05:50 +08:00
cenfusheng
71e0b876f3 fix: 修复干员煌的文字识别问题 (#5910) 2023-08-11 11:40:37 +08:00
cenfusheng
2f22697bf9 fix: 修复干员煌的文字识别问题 2023-08-11 11:39:23 +08:00
David
282dcfe90a chore: Paradox Simulation for YostarEN + BattleMatcher regex 2023-08-10 21:49:14 +02:00
cenfusheng
3853e2e385 fix: 修复临光的文字识别错误 (#5906) 2023-08-10 21:54:15 +08:00
cenfusheng
2bb41066e0 fix: 修复临光的文字识别错误 2023-08-10 21:53:21 +08:00
MistEO
653a59778f chore: Auto Update Game Resources - 2023-08-10 alpha/v4.22.0-beta.1.d026.g653a59778 2023-08-10 09:29:27 +00:00
MistEO
acf72e6079 refactor: 重构TaskQueueViewModel (#5753) 2023-08-10 17:06:26 +08:00
David
58fd37d877 feat: add roguelike encounter ocrReplace for JP and EN (#5903) 
After I added the "Roguelike@StageEncounterOcr" for txwy server (#5790),
I noticed that task.json for JP and EN server also don't have
"Roguelike@StageEncounterOcr",
so I checked out wiki and added them. 
 
Except for "深蓝仪式" and "升华", I couldn't find translations of these two
stage name.

Phantom & Crimson Solitaire : [JP
wiki](https://arknights.wikiru.jp/?%E7%B5%B1%E5%90%88%E6%88%A6%E7%95%A5%E3%80%8C%E3%83%95%E3%82%A1%E3%83%B3%E3%83%88%E3%83%A0%E3%81%A8%E7%B7%8B%E3%81%8D%E8%B2%B4%E7%9F%B3%E3%80%8D#eac89207)
/ [EN
wiki](https://arknights.fandom.com/wiki/Phantom_%26_Crimson_Solitaire/Nodes)
Mizuki & Caerula Arbor : [JP
wiki](https://arknights.wikiru.jp/?%E7%B5%B1%E5%90%88%E6%88%A6%E7%95%A5%E3%80%8C%E3%83%9F%E3%83%85%E3%82%AD%E3%81%A8%E7%B4%BA%E7%A2%A7%E3%81%AE%E6%A8%B9%E3%80%8D#eac89207)
/ [EN
wiki](https://arknights.fandom.com/wiki/Mizuki_%26_Caerula_Arbor/Nodes#Encounters)

If there are any other problems, please feel free to adjust them,
because I don't have JP or EN account to continue testing. ☹️☹️☹️

Sorry for poor Engilsh... ( ´•̥̥ω•̥̥` )
 2023-08-10 11:02:25 +02:00
David
069041fdc2 chore: Adapted EndOfActionAnnihilation for EN 2023-08-10 10:57:09 +02:00
momomochi
d3d9378088 add encounter ocrReplace for EN 2023-08-10 15:45:03 +08:00
momomochi
38c80dff1a add encounter ocrReplace for JP 2023-08-10 15:40:32 +08:00
MistEO
66dd06a4ac chore: Auto Update Game Resources - 2023-08-10 alpha/v4.22.0-beta.1.d008.g66dd06a4a 2023-08-10 07:28:00 +00:00
uye
a4ecff2b4c Merge branch 'dev' into refactor/TaskQueueViewModel 2023-08-10 15:09:37 +08:00
MistEO
32290f4315 chore: 更新简中OCR识别模型 | Re-training OCR rec model of CN client (#5895) 
使用Arknights Ver2.0.61客户端的数据重新Fine-tune了OCR rec 模型
 2023-08-10 10:56:25 +08:00