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,539 Commits 61 Branches 1,839 Tags
2d23e2da6fa57470a3bcddb359c62a17be400a80
Commit Graph

8539 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
uye
2d23e2da6f chore: 消除 CopilotViewModel qodana 警告 2023-08-25 17:08:07 +08:00
uye
5a2d3783f7 refactor: 重构 RecognizerViewModel.cs 2023-08-25 16:29:49 +08:00
uye
a13ce2f389 refactor: 重构剩余 ViewModel（Settings 除外），添加字典 2023-08-25 15:59:33 +08:00
uye
6a34b4e255 docs: 更新蓝叠配置说明文档 
fix #5302
 2023-08-25 14:35:25 +08:00
github-actions[bot]
840216e7c0 docs: Auto Update Changelogs of v4.23.0-beta.1 (#6078) 
Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
 2023-08-25 14:27:04 +08:00
Lancarus
d7fb47714b feat: 增加烧开水功能，优化萨米肉鸽策略 (#6053) 2023-08-25 14:00:44 +08:00
uye
7093a820c4 docs: [JP] Docs Update (#6070) 2023-08-25 10:15:03 +08:00
Wallsman
b1392ff51b [JP] Update Documents (#6057) 
Update for CN base

[Update
1.1-詳細説明.md](dabaa51f7f)

[1.2-よくある質問.md](5d4da7ed0b)

[エミュレータのサポート.md](eb58f574fa)
 2023-08-24 18:20:16 +09:00
David
0acb6c7cf5 fix: battlequickformationocr modified roi for EN alpha/v4.22.0-beta.1.d226.g0acb6c7cf 2023-08-22 23:12:27 +02:00
Wallsman
eb58f574fa Update 1.3-エミュレータのサポート.md 2023-08-23 03:58:44 +09:00
David
137caf662b feat: Events and Banners displayed according to timetable (#6050) 
Thanks @ABA2396 for the Method heads up.
 2023-08-22 19:38:56 +02:00
Wallsman
9f46d65b01 Merge pull request #7 from wallsman/wallsman-patch-3 
Update 1.1-詳細説明.md
 2023-08-23 02:29:01 +09:00
Wallsman
f304dd5af2 Merge pull request #6 from wallsman/wallsman-patch-4 
Update 1.2-よくある質問.md
 2023-08-23 02:23:46 +09:00
Wallsman
5d4da7ed0b Update 1.2-よくある質問.md 2023-08-23 02:22:13 +09:00
David
6d2b62bde9 docs: tweaked english tasks json schema 2023-08-22 18:41:24 +02:00
Lancarus
cbe6bbbf28 Update 覆水难收.json 2023-08-23 00:24:49 +08:00
Wallsman
dabaa51f7f Update 1.1-詳細説明.md 2023-08-23 01:02:56 +09:00
Wallsman
2817f5fa31 Merge branch 'MaaAssistantArknights:dev' into dev 2023-08-23 00:58:10 +09:00
Wallsman
fedc66a812 Update 1.1-詳細説明.md 2023-08-23 00:52:38 +09:00
David
e280cefced Update src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs 
Very clean! Thank you for the heads up

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2023-08-22 17:04:39 +02:00
Clock
1cb0fe8dba chore: update tasks.json (YoStarKR) 2023-08-22 23:30:17 +09:00
MistEO
3029e6d9b9 Revert "fix: 尝试修复日志被占用的问题" 
This reverts commit a655c2bf14.
alpha/v4.22.0-beta.1.d219.g3029e6d9b 		2023-08-22 20:32:04 +08:00
David
3fa182d735 feat: event/pool display follows current time 2023-08-22 13:23:51 +02:00
MistEO
9c1a3f64e5 chore: Auto Update Game Resources - 2023-08-22 alpha/v4.22.0-beta.1.d218.g9c1a3f64e 2023-08-22 09:27:24 +00:00
MistEO
92ca091a5d chore: Auto Update Game Resources - 2023-08-22 alpha/v4.22.0-beta.1.d217.g92ca091a5 2023-08-22 07:08:58 +00:00
Hao Guan
cf7ab4dd40 chore: reload resource when controller changes 2023-08-22 17:04:08 +10:00
MistEO
663400f034 chore: Auto Update Game Resources - 2023-08-22 alpha/v4.22.0-beta.1.d215.g663400f03 2023-08-22 06:32:21 +00:00
MistEO
cd23ffe994 chore: Auto Update Game Resources - 2023-08-22 alpha/v4.22.0-beta.1.d214.gcd23ffe99 2023-08-22 06:10:52 +00:00
MistEO
6ae5453933 chore: rename platform resource for iOS 2023-08-22 10:11:31 +08:00
MistEO
763aa60990 docs: 3.1-Integration.md (#6039) 
Update descriptions.
 2023-08-22 09:54:55 +08:00
DL_君逸寒
aa6ba11f75 perf: 保全派驻 阿尔斯特6 开局小优化 (#6037) 
阿尔斯特6 开局小优化
 2023-08-22 09:53:02 +08:00
MistEO
6490396ae5 fix: 修复肉鸽中干员 山 2 技能反复释放的问题 (#6033) 
之前实现的开x次技能忘了改肉鸽部分，这次补上
 2023-08-22 09:52:36 +08:00
Ntkskwk
1294a1ded9 Update(docs): 3.1-Integration.md 2023-08-22 06:26:12 +08:00
MistEO
490bcc9078 chore: Auto Update Game Resources - 2023-08-21 alpha/v4.22.0-beta.1.d206.g490bcc907 2023-08-21 20:07:24 +00:00
David
4b0f84a1e7 Update 3.1-集成文档.md (#6036) 
在集成文档的Roguelike项目中添加萨米肉鸽的描述
 2023-08-21 21:30:31 +02:00
HZXJY
838035341d Update 3.1-集成文档.md 
在集成文档的Roguelike项目中添加萨米肉鸽的描述
 2023-08-22 01:22:33 +08:00
MiaoYan JY
a19df2e24e fix: 修复肉鸽中干员 山 2 技能反复释放的问题 2023-08-21 23:40:40 +08:00
Annoying Flower
bd989df3d7 docs: 修改 "skill_usage" 、 "skill_times" 等字段说明 2023-08-21 23:34:39 +08:00
DL_君逸寒
29ef60e1b4 chore: 小作文加上最后一句话 (#6032) 2023-08-21 23:03:43 +08:00
David
64dff48960 fix: Senior Operator tag EN 2023-08-21 16:42:40 +02:00
David
ac430180e5 Adapted EN regex for new AutoSquad algorithm (#6028) 
Huge thanks to Anthon @biscuit_lmao for giving me access to his AK account
 2023-08-21 16:35:46 +02:00
David
8a64d347f8 fix: Skadi Alter and Greyy Alter Squads regex for 1080 2023-08-21 16:31:16 +02:00
MistEO
24a7a47d9a Merge branch 'dev' into David/NewENRegex 2023-08-21 21:37:09 +08:00
David
1720966320 revert: wrong branch my bad 2023-08-21 15:16:42 +02:00
David
17d2674188 fix: senior tag detection 
fix #6012
 2023-08-21 15:04:39 +02:00
MistEO
f391614827 styles: format 2023-08-21 20:41:19 +08:00
MistEO
5a4298e404 fix: build error of logger 2023-08-21 20:31:41 +08:00
MistEO
9edee9013c fix: build error 2023-08-21 20:15:04 +08:00
MistEO
f5a700b804 chore: 删除小作文！ (#6029) 
@junyihan233
 2023-08-21 20:13:20 +08:00
DL_君逸寒
43500be3a6 Create SSS_荒废灯塔_浊蒂纯艾版.json (#6026) 
Create SSS_荒废灯塔_浊蒂纯艾版.json
 2023-08-21 19:45:43 +08:00