Commit Graph

2342 Commits

Author SHA1 Message Date
Liam Sho
e557609dc3 Merge branch 'dev' into perf/cicd 2022-07-12 02:15:56 +08:00
Horror Proton
b688542b93 style: fix file mode 2022-07-12 00:40:05 +08:00
MistEO
a0c9c54220 chore: 删掉两个没用上的库 2022-07-12 00:31:48 +08:00
Liam Sho
b34d66a6a9 Merge branch 'dev' into perf/cicd 2022-07-11 23:40:01 +08:00
MistEO
a56cdcb30f Merge pull request #1132 from horror-proton/test/logger_template
在 log 函数的参数中支持 range-expression
2022-07-11 20:47:41 +08:00
MistEO
8d6ab22fa5 fix: 修复获取系统版本号的错误 2022-07-11 10:27:28 +08:00
Horror Proton
f441d2d6aa fix: update assertion message 2022-07-11 02:15:50 +08:00
Horror Proton
5a427767b9 feat: support range-expressions in log argument 2022-07-10 22:40:49 +08:00
Horror Proton
09a4f13a78 fix: add a left branch 2022-07-10 21:19:14 +08:00
MistEO
85ef8ea149 Merge pull request #1130 from horror-proton/test/logger_tweak
对 Logger 的一些修改
2022-07-10 14:09:14 +08:00
MistEO
e11b215949 perf: 优化分辨率获取方式
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1105
2022-07-10 14:02:18 +08:00
MistEO
6423465108 fix: 将额外的短程滑动改为向上滑,并重构小部分代码
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1129
2022-07-10 13:38:29 +08:00
Horror Proton
6ab3cd8548 fix. match arg types of printf 2022-07-10 13:32:33 +08:00
MistEO
11d9dd3fbf fix: 修复资源更新工具会让基建技能名重复的问题 2022-07-10 12:23:15 +08:00
Horror Proton
a0e6ea3bb8 fix: remove extra space in log, reopen stream after failure 2022-07-10 11:21:57 +08:00
Horror Proton
5827f9e8ae fix: fix typo 2022-07-10 10:57:24 +08:00
Horror Proton
d5fa39e22c fix: remove trailing space of line for log file 2022-07-10 10:29:49 +08:00
lhhxxxxx
d649366a3c Merge remote-tracking branch 'origin/dev' into dev 2022-07-10 00:01:57 +08:00
lhhxxxxx
7423092679 style. 微调了数个像素喵 2022-07-10 00:01:08 +08:00
ABA2396
78b4e635ef style: 对齐选框 2022-07-10 00:00:16 +08:00
ABA2396
f9d4f90eac style: 修改FightSettingsUserControl格式 2022-07-09 23:43:28 +08:00
lhhxxxxx
f4ece76cae Merge remote-tracking branch 'origin/dev' into dev 2022-07-09 23:19:39 +08:00
lhhxxxxx
39656babfb fixed. 漏改了 2022-07-09 23:19:01 +08:00
ABA2396
e457768e03 Merge pull request #1127 from lhhxxxxx/dev
[feat] 就连玛丽用了都会满意的清空与反选切换喵
2022-07-09 23:05:22 +08:00
lhhxxxxx
48fc9d82c6 feat. 设置中可切换样式喵 2022-07-09 22:48:30 +08:00
lhhxxxxx
7aef9841c9 perf. 删掉多余空格喵 2022-07-09 21:53:52 +08:00
lhhxxxxx
ec4655363c perf. 优化间隔喵 2022-07-09 21:46:56 +08:00
lhhxxxxx
0504df5655 feat. 就连玛丽用了都会满意的清空与反选切换喵 2022-07-09 20:37:11 +08:00
MistEO
5d4fc6c490 Merge pull request #1126 from lhhxxxxx/dev
[perf] 代码清理喵
2022-07-09 20:30:31 +08:00
lhhxxxxx
76b9e77e18 perf. 代码清理喵 2022-07-09 18:09:39 +08:00
MistEO
9e9770116c Merge pull request #1120 from MaaAssistantArknights/refactor/infrast
refactor: 重构基建配置文件,完成配置文件自动更新工具
2022-07-09 16:19:56 +08:00
MistEO
6340a92889 fix: 尝试修复一个奇怪的崩溃问题
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1119
2022-07-09 03:45:17 +08:00
MistEO
6d7736fb92 fix: 以一种简单粗暴的方法修复了一些掉落识别问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/883
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1118
2022-07-09 03:21:01 +08:00
MistEO
6e2b1bf205 Merge pull request #1114 from cglcv/dev
perf.简化启动模拟器的逻辑
2022-07-09 02:39:39 +08:00
MistEO
a06c2af788 chore: 完成基建数据自动更新工具,并适配新数据的解析 2022-07-09 02:37:35 +08:00
MistEO
66cd190dd8 chore: 整理了一下资源更新器 2022-07-08 23:21:21 +08:00
cglcv
a18cf8ddd1 perf.简化启动模拟器的逻辑 2022-07-08 21:29:29 +08:00
MistEO
71e7faeaa3 docs: update linux tutorial 2022-07-08 20:53:12 +08:00
MistEO
a5b4157b52 docs: fix typo 2022-07-08 20:34:13 +08:00
MistEO
f722aff2e5 docs: update readme en 2022-07-08 20:09:53 +08:00
MistEO
fbbb9d9b8a docs: zzzq 2022-07-08 09:55:15 +08:00
MistEO
8eb0556eb8 fix: 再次修复不结束线索交流的问题 v4.0.5 2022-07-07 23:59:44 +08:00
MistEO
c5d4a426bd Merge branch 'dev' 2022-07-07 23:55:57 +08:00
MistEO
8a8cbe9054 fix: 修复基建会客室在线索交流后偶现的各种问题 2022-07-07 23:55:51 +08:00
MistEO
eaf11f68e2 Merge pull request #1109 from MaaAssistantArknights/dev
Release v4.0.5
2022-07-07 23:49:03 +08:00
MistEO
8c444248d4 fix: 为CHANGELOG解析的崩溃问题加一个兜底机制
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/968
2022-07-07 23:39:26 +08:00
MistEO
00692f1045 docs: 更新CHANGELOG 2022-07-07 23:25:43 +08:00
MistEO
3312d92d22 Merge pull request #1082 from MaaAssistantArknights/feat/global_client
feat: Supports ALL clients
2022-07-07 23:10:23 +08:00
MistEO
29f6971f6d docs: 更新文档关于外服支持的内容 2022-07-07 23:10:10 +08:00
MistEO
adcacca1dc feat: 支持繁中服的基本功能 2022-07-07 22:59:54 +08:00