fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 02:23:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,286 Commits 62 Branches 1,839 Tags
6f9a4541c9de2bfd4a287bbbc98011c8c19c7120
Commit Graph

3286 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zzyyyl
6f9a4541c9 chore: 更新 clang-formater.py 2022-08-27 22:31:01 +08:00
uye
91dfd58396 feat: 关卡匹配不上时导航至上一次的关卡 2022-08-27 20:30:14 +08:00
MistEO
51c28c0d2f chore: remove editconfig 2022-08-27 20:11:01 +08:00
MistEO
24bd4e5a9a fix: 修复基建线索识别失败时不重试的问题 2022-08-27 20:09:39 +08:00
MistEO
088a0fd239 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-08-27 20:09:02 +08:00
uye
f72b6abf2d feat: 活动关闭后导航至备选关卡 2022-08-27 19:45:56 +08:00
MistEO
c256d8061a Merge pull request #1676 from MaaAssistantArknights/style/code_tidy 
style: code tidy
 2022-08-27 19:29:08 +08:00
uye
a25bbbbe18 feat: 活动结束时自动关闭活动导航入口 2022-08-27 19:28:14 +08:00
MistEO
5e4cb20371 feat: 将 task id 改为进程级唯一 2022-08-27 19:25:09 +08:00
uye
f195259a39 style: 消除警告 2022-08-27 18:25:35 +08:00
uye
117e38bdc7 feat: 支持两个备选关卡（丑陋预定） 2022-08-27 18:25:35 +08:00
MistEO
3f75f98e7f Merge pull request #1678 from MaaAssistantArknights/docs/ja-jp 
docs: 部分翻译更新
 2022-08-27 17:58:39 +08:00
Tastror
e651ccccae docs: 增改日文文档 2022-08-27 13:32:50 +08:00
Tastror
5fbfd74c4d docs: 少量文本更新 2022-08-27 13:11:52 +08:00
Tastror
e3abf1aa6a fix: 部分与origin无关的英文文本配置文件删除 2022-08-27 12:10:14 +08:00
MistEO
a67c634496 style: fix space 2022-08-27 02:13:43 +08:00
MistEO
0df5eb4eb7 style: fix punctuations 2022-08-27 02:07:12 +08:00
MistEO
f061bd06c3 Merge pull request #1677 from MaaAssistantArknights/build/v143 
build: update to v143
 2022-08-27 00:04:31 +08:00
MistEO
843ba85a5a docs: update readme 2022-08-26 23:51:18 +08:00
MistEO
38b0d79757 build: update to v143 2022-08-26 23:48:56 +08:00
MistEO
c70daeafa4 Merge pull request #1664 from MaaAssistantArknights/feat/perf_ui 
feat: 优化图形化界面 (fix #1648)
 2022-08-26 23:21:07 +08:00
MistEO
50f8e8329d Merge pull request #1667 from MaaAssistantArknights/feat/gui_json 
fix: 修复linkstart以后的闪退bug
 2022-08-26 22:29:12 +08:00
zzyyyl
dab2cb8faf style: 按照 review 意见修改代码格式 
Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
 2022-08-26 21:17:55 +08:00
zzyyyl
bf8bf0ec1b feat: 简单调整界面 
Co-authored-by: uye <2396806385@qq.com>
 2022-08-26 19:29:56 +08:00
zzyyyl
5c58dff96d style: 美化部分代码格式 2022-08-26 19:11:42 +08:00
zzyyyl
2302ad0681 style: clang format 2022-08-26 19:11:34 +08:00
zzyyyl
b92423d5d3 chore: Add .clang-format 2022-08-26 19:11:26 +08:00
zzyyyl
24eb4a0d6a style: 小优化 2022-08-26 19:11:17 +08:00
zzyyyl
e666cef963 style: 删除了一些弃置许久的代码 2022-08-26 01:49:37 +08:00
zzyyyl
442aff4270 perf: 使在非 Windows 下调用 ansi_to_utf8 与 utf8_to_ansi 报错 
Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
 2022-08-26 01:46:27 +08:00
zzyyyl
a46aca8d34 fix: fix some of the compilation errors #1666 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1666

Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
 2022-08-26 01:46:19 +08:00
Tastror
751e7f8c73 fix: 修复linkstart以后的闪退bug 2022-08-25 23:44:09 +08:00
Tastror
84f1204273 feat: 去除部分硬编码 2022-08-25 23:44:09 +08:00
Tastror
6a1be65642 feat: 将旧有配置保存后再删除（中文） 2022-08-25 23:44:09 +08:00
Tastror
32b3bd4928 feat: 统一gui.json保存的内容，解决本地化不兼容问题 2022-08-25 23:44:09 +08:00
zzyyyl
6ad4502a9f feat: 不选中 指定材料 时不显示 刷取数量 
总有人误会 `刷取数量` 的意思，那就别显示了（x
 2022-08-25 22:37:32 +08:00
zzyyyl
321d2b04cb feat: 优化 UI 
1. 合并 `LinkStart` 和 `停止` 按钮
2. 禁止缩小界面
3. 修复一些语言界面日志显示不全的问题
4. 增加 `修改` 按钮宽度
5. 调整一些 UI 控件
 2022-08-25 22:14:50 +08:00
MistEO
36aa66c98a Merge pull request #1663 from MaaAssistantArknights/dev 
Release v4.3.0-beta.6
 2022-08-25 21:37:29 +08:00
MistEO
dc6856132d docs: 更新CHANGELOG 2022-08-25 21:37:08 +08:00
MistEO
8c226513d7 Merge pull request #1662 from MaaAssistantArknights/revert-1652-feat/gui_json 
Revert "feat: 统一gui.json保存的内容，解决本地化不兼容问题"
 2022-08-25 21:34:07 +08:00
MistEO
161dd88940 Revert "feat: 统一gui.json保存的内容，解决本地化不兼容问题" 2022-08-25 21:32:56 +08:00
MistEO
097716b98c Merge pull request #1661 from MaaAssistantArknights/dev 
Release v4.3.0-beta.5
 2022-08-25 20:53:36 +08:00
MistEO
b4a6c39513 docs: 更新CHANGELOG 2022-08-25 20:52:34 +08:00
MistEO
83292c6451 Merge pull request #1648 from MaaAssistantArknights/feat/perf_ui 
feat: 优化图形化界面
 2022-08-25 20:42:59 +08:00
MistEO
e13b662c5a Merge pull request #1657 from horror-proton/test/drop_line 
perf: 在关卡掉落识别中使用边缘检测判断线条位置
 2022-08-25 20:40:34 +08:00
MistEO
291b2a1ecb chore: fix typos 2022-08-25 20:40:13 +08:00
MistEO
414c437fb1 Merge pull request #1643 from et2012/perf/roguelike 
perf: 改进肉鸽招募逻辑
 2022-08-25 20:35:44 +08:00
MistEO
58783ea792 Merge pull request #1652 from MaaAssistantArknights/feat/gui_json 
feat: 统一gui.json保存的内容，解决本地化不兼容问题
 2022-08-25 20:35:08 +08:00
MistEO
5e5b2d3134 Merge pull request #1658 from MaaAssistantArknights/feat/logger 
feat: 更新 Logger
 2022-08-25 20:34:53 +08:00
MistEO
28d6739230 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-08-25 20:34:06 +08:00