fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 10:32:19 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,176 Commits 61 Branches 1,840 Tags
d331ec017c584a23fd00a075e9565eeb671fe50e
Commit Graph

7176 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GD-GK
b6de94460d Merge pull request #1 from moomiji/feat/OperRecognizer 
feat: 干员识别加入识别工具
 2023-04-20 08:12:06 +08:00
枫雨
c901489f32 feat: 干员识别加入识别工具 2023-04-19 23:11:24 +08:00
枫雨
60deef5a71 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into pr/4368 2023-04-19 21:59:46 +08:00
罗家欣
e58e37673a fix:wpf 2023-04-19 21:34:36 +08:00
MistEO
3166642e55 chore: 调整启动后ReleaseNote弹窗的显示顺序、替换wpf控件以获得更好的显示效果 (#4393) 2023-04-19 21:21:25 +08:00
MistEO
e5911bf847 feat: 新增保全雷神工业测试平台作业 (#4396) 2023-04-19 20:32:19 +08:00
Annoying Flower
d42ff9652f feat: 添加保全雷神工业测试平台作业 2023-04-19 19:33:42 +08:00
MistEO
64578c48c8 chore: 扬了app.config 2023-04-19 19:14:43 +08:00
枫雨
8c433b0a60 chore: 干掉beta（ 2023-04-19 17:26:05 +08:00
枫雨
987368ba73 chore: use TabItem instead buttons in RecognizerView 2023-04-19 17:26:04 +08:00
枫雨
1b7305057d perf: 纵向丝滑 2023-04-19 17:26:04 +08:00
枫雨
a0f69792a7 chore: 调整启动后窗口的显示顺序、Bootstrapper中取实例的方法 2023-04-19 17:26:04 +08:00
罗家欣
7380969e81 Merge branch 'dev' of https://github.com/GD-GK/MaaAssistantArknights into dev 2023-04-19 16:40:02 +08:00
罗家欣
05ddb26e8d 修复未识别完错误 2023-04-19 16:22:48 +08:00
罗家欣
83883a3ac9 修改tip,使用clang格式化 2023-04-19 14:11:22 +08:00
罗家欣
05a9549cbd Merge branch 'dev' into role_branch 2023-04-19 13:40:16 +08:00
GD-GK
b46f06589b Merge branch 'dev' into dev 2023-04-19 13:36:05 +08:00
罗家欣
87b63c95a8 优化逻辑,debug存图 2023-04-19 13:19:29 +08:00
MistEO
828e03280b Add missing comma (#4390) 2023-04-19 10:08:34 +08:00
zewoosJ
781cd9b1c2 Add missing comma 2023-04-19 09:48:54 +09:00
uye
71dc4a4dd1 feat: 合并识别工具 2023-04-19 01:44:04 +08:00
uye
165cd73deb chore: 删除多余类 2023-04-19 01:44:04 +08:00
MistEO
a75f0d9ed5 Operator add for KR (#4384) 
Add operators from Endless carnival to An obscure wonderer at KR
 2023-04-19 00:56:34 +08:00
zewoosJ
f542fa13d2 Update operators.md 2023-04-19 00:12:15 +09:00
zewoosJ
d734d400c1 Update tasks.json 2023-04-19 00:06:39 +09:00
MistEO
28aeaebaa7 feat: 根据自定义配置修改订单/产物种类 (#4293) 
1、新增根据自定义配置改变贸易站订单/制造站产物的函数
2、新增两个相关的GUILog字符串信息，用于检测产物报错后/切换产物后发送GUI Log信息
3、新增Tasks任务和任务所需要的资源，在新增的函数中调用
 2023-04-18 20:00:11 +08:00
MistEO
0f8d6befb3 perf: LoadingText for product 2023-04-18 19:59:33 +08:00
MistEO
efb0a47973 perf: 更新内置保全作业JSON (#4376) 
并尝试兼容应急（实际还没弄好）
 2023-04-18 19:53:44 +08:00
MistEO
c4ef684f22 feat: UiColor适配DarkMode & feat: 在主界面保存位置时进行检查 (#4352) 
close #4336 
close #4365

<!-- Add GUI -->

示例作业中，
```
"xxx_color": "dark"
```

实际上是不合法的，正确的方式是使用[Colors类的命名](https://learn.microsoft.com/zh-cn/dotnet/api/system.windows.media.colors?view=netframework-4.8#properties)
_(:з」∠)_ ，之前会默认使用Colors.Black，现在默认使用UiLogColor.Message。

同时会检查TextBlock使用的Foreground颜色是否和背景颜色太相近。
 2023-04-18 19:51:59 +08:00
yueshen
50ae17f16d Update SSS_约翰老妈新建地块.json 2023-04-18 18:35:24 +08:00
罗家欣
4b089c8bad 还原其他文件 2023-04-18 16:22:03 +08:00
罗家欣
cf6a1a0598 还原其他文件 2023-04-18 16:08:26 +08:00
GD-GK
449617fc85 Merge branch 'dev' into dev 2023-04-18 15:46:41 +08:00
罗家欣
dbd0f4ffc1 干员识别,fix 2023-04-18 15:32:19 +08:00
MistEO
9d741770d5 fix: 修复肉鸽关卡名识别错误 
#4370
 2023-04-18 00:58:33 +08:00
Horror Proton
56988157f5 feat: revert using std::function in append_async_c 2023-04-18 00:43:24 +08:00
Horror Proton
d44bbdd57a feat: make sure async func args listed explicitly 2023-04-18 00:43:24 +08:00
Horror Proton
3afb656154 perf: reduce amout of mutex in Assistant 2023-04-18 00:43:24 +08:00
MistEO
5242dbbb79 feat: 为 Config 文件写入添加锁 (#4373) 2023-04-18 00:16:21 +08:00
Liam Sho
dc3fbdb732 feat: config file write lock 2023-04-18 00:13:23 +08:00
枫雨
63f24cf359 feat: 在主界面保存位置时进行检查 2023-04-17 18:30:13 +08:00
罗家欣
358ed2ddf5 干员识别 2023-04-17 15:54:10 +08:00
MistEO
d15824b6ab 新增保全作业 (#4367) 2023-04-17 15:39:33 +08:00
yueshen
c9f1353064 Create SSS_约翰老妈新建地块.json 2023-04-17 15:17:10 +08:00
yueshen
d186a10709 Delete SSS_约翰老妈新建地块 2023-04-17 15:16:49 +08:00
yueshen
a33be9f113 Create SSS_约翰老妈新建地块 2023-04-17 15:15:21 +08:00
枫雨
551a841d4b feat: UiColor适配DarkMode 2023-04-17 14:57:53 +08:00
枫雨
ad60249827 chore: add ThemeHelper again 2023-04-17 14:53:56 +08:00
uye
56c90e6c9e docs: 更新图片 2023-04-17 12:53:55 +08:00
MistEO
44ec93ccfd perf: 优化下抄作业的小逻辑 2023-04-17 00:03:05 +08:00