fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-17 10:00:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,299 Commits 61 Branches 1,838 Tags
aeebb7cb2464a7bc2cb9e4cccf0a08da34a503a7
Commit Graph

8299 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clock
aeebb7cb24 chore: localization update 2023-08-16 01:05:30 +09:00
Lancarus
ac4a09e5db fix:肉鸽在招募逻辑内可以将同一干员纳入多个群组,修复由于拆分文件造成的bug (#5946) 
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2023-08-15 17:44:11 +08:00
Yumi0606
c281767cf3 fix: 新版萨米肉鸽商店文件&水月肉鸽商店文件提交 (#5936) 
录入商品效果信息，增加所有商品，小调了商品优先级

---------

Co-authored-by: MistEO <mistereo@hotmail.com>
 2023-08-15 17:43:27 +08:00
MistEO
00c4a8d03b chore: Auto Update Game Resources - 2023-08-15 2023-08-15 09:06:20 +00:00
MistEO
10d30338d1 feat: merge and re-structure stage.json (#5944) 
fix #5881
 2023-08-14 18:20:41 +08:00
MistEO
ae49930852 feat: add config CompatPOSIXShell (#5945) 
在POSIX shell标准中，双引号内的`$`内的内容将被提前展开，这将导致`CloseDown`任务失效。大多数*nix
shell的实现都遵守这一标准，所以这里添加了一个配置`CompatPOSIXShell`，将`Stop`字段相应的双引号换成单引号，以防止CloseDown在使用符合上述标准shell的系统上失效。

另见： #5920，因为那个PR已经合并了，所以我新提了一个PR。
 2023-08-14 15:56:38 +08:00
MistEO
627df36447 feat: merge and re-structure stage.json 
fix #5881
 2023-08-14 15:21:00 +08:00
Long Wang
d255bd9eda feat: add config CompatPOSIXShell 2023-08-14 15:18:11 +08:00
uye
1c2f55f6ef fix: 错误的类型转换 
fix #5940
 2023-08-13 22:44:42 +08:00
Clock
58155a2cd8 fix: make the option to not recruit selectable in SSS for YoStarKR 2023-08-13 23:25:03 +09:00
uye
2048231cae fix: 修复模拟器关闭逻辑错误，增加模拟器退出错误日志 2023-08-13 22:13:07 +08:00
Clock
ee278857a6 feat: SSS copilot support for YostarKR 2023-08-13 22:34:46 +09:00
David
ba861617b1 fix: Infrast Task stuck Max Trust notification EN 2023-08-13 13:25:00 +02:00
uye
d7476f086b chore: 调整肉鸽商品识别roi范围 2023-08-13 19:11:47 +08:00
David
84e24372ad fix: #5931 2023-08-13 11:18:39 +02:00
MistEO
7c7c95bee8 chore: Auto Update Game Resources - 2023-08-13 2023-08-13 08:07:35 +00:00
MistEO
a4a0fcbf31 Revert "添加繁中服对于鸿雪的OCR等价规则 #5931" (#5935) 2023-08-13 15:57:35 +08:00
MistEO
606bd6b0b3 fix: CloseDown not works on macOS (#5920) 2023-08-13 15:54:15 +08:00
uye
af1fbe39f5 fix: 关闭模拟器时索引超出了数组界限 
fix #5930
 2023-08-13 15:50:14 +08:00
David
3636e6b2d8 fix: 添加繁中服对于鸿雪的OCR等价规则 #5931 #5933 2023-08-13 09:50:04 +02:00
MistEO
5c662d4df4 Revert "添加繁中服对于鸿雪的OCR等价规则 #5931" 2023-08-13 15:41:19 +08:00
uye
284cff675f fix: 肉鸽打折商品识别错误 
fix #5919
 2023-08-13 15:29:32 +08:00
David
0263245bdd 添加繁中服对于鸿雪的OCR等价规则 #5931 (#5933) 2023-08-13 08:52:44 +02:00
David
9f59e2bf36 Revert "Useless png in roguelike JP" 
This reverts commit 68e957fa14.

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

有試過加上自己寫到一半的蘿蔔礦場作業可以正常開刷，應該是....沒有什麼問題 (?
 2023-08-12 18:20:28 +02:00
momomochi987
ad1b8147cd 增加 "鋼鐵蘿蔔礦場" 的關卡 text 2023-08-12 23:41:14 +08:00
momomochi987
423b59ce17 補充保全派駐圖片 2023-08-12 23:34:09 +08:00
momomochi987
655f267885 重製 "放棄行動" 圖片 2023-08-12 23:32:27 +08:00
momomochi987
be6c4e003a 更新保全派駐相關 text 2023-08-12 23:29:47 +08:00
cenfusheng
e7ba697944 fix: 修复特别关注干员的识别问题 (#5924) 
先把膏药糊上，模型修了再删（
 2023-08-12 23:01:37 +08:00
cenfusheng
6a6a11c8ee fix: 修复特别关注干员的识别问题 
先把膏药糊上，模型修了再删（
 2023-08-12 23:00:36 +08:00
David
b38d803c98 optimized: regex for I.S. trader shopping in EN 2023-08-12 16:51:23 +02:00
David
7e8020ede9 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-08-12 12:23:54 +02:00
David
76d543dd3e fix: wrong template for reception room detection 2023-08-12 12:23:52 +02:00
MistEO
db21006500 fix: 修复自动编队时不重试的问题 2023-08-12 16:36:46 +08:00
MistEO
9db54db1a4 feat: 抄作业自动编队支持含有不同职业的组 2023-08-12 15:17:10 +08:00
MistEO
11222a1055 fix: build error 2023-08-12 15:13:00 +08:00
MistEO
5df801ecfa chore: 删除目前用不上了的肉鸽代码 2023-08-12 15:06:48 +08:00
Loong
6bdc2f0a90 Merge branch 'MaaAssistantArknights:dev' into fix/closedown 2023-08-12 14:28:22 +08:00
MistEO
7961f699af chore: Auto Update Game Resources - 2023-08-11 2023-08-11 21:26:59 +00:00
Long Wang
dde53827fa Only apply to CompatMac 2023-08-12 01:48:58 +08:00
David
04c8e93dc2 typo: e5d331fc22 2023-08-11 19:48:49 +02:00
David
e5d331fc22 chore: Invitation to Wine rerun implementation for EN 2023-08-11 19:44:29 +02:00
David
6c148ed993 chore: Oper Regex Tweaked for EN (BattleMatcher) 2023-08-11 19:28:08 +02:00
Long Wang
d87b1ca622 fix: CloseDown not works on macOS 2023-08-12 01:05:50 +08:00
cenfusheng
a302c46148 fix: 修复干员煌的文字识别问题 (#5910) 2023-08-11 11:40:37 +08:00