fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-17 18:01:26 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,415 Commits 61 Branches 1,838 Tags
3dc622d1e5cf75f75bcd2cf1b08e33668d07306f
Commit Graph

1415 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shawnsdaddy
3dc622d1e5 Merge pull request #2 from MaaAssistantArknights/dev 
Dev
 2022-05-15 00:54:38 -07:00
MistEO
a99119c263 style.格式化 2022-05-15 15:15:14 +08:00
MistEO
4f05a45d6b perf.更新缩放图像的插值算法 2022-05-14 16:02:03 +08:00
MistEO
d967a2cf9d chore.加了一点日志以追踪问题 issues/502 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/502
 2022-05-14 15:56:22 +08:00
MistEO
450a9eb8ec Merge pull request #499 from zzyyyl/feat/encoding 
perf.用一种更合理的方式处理编码问题
 2022-05-14 15:33:11 +08:00
Alisa
cac2bab721 Merge pull request #500 from MaaAssistantArknights/feature/version 
perf.以一种更加优雅的方式生成版本号
 2022-05-14 14:21:34 +08:00
zzyyyl
27a91aee67 perf.小优化 2022-05-14 13:22:47 +08:00
zzyyyl
05052a0b56 fix.修复笔误 2022-05-14 13:17:39 +08:00
zzyyyl
48817ecc8c style.增加一个.gitattributes文件用于统一格式 2022-05-14 13:15:45 +08:00
MistEO
cd98e78ebb perf.以一种更加优雅的方式生成版本号 2022-05-14 03:54:21 +08:00
MistEO
7ebc78b91e fix.修复公招券不足时卡很久才报错的问题 2022-05-14 02:56:26 +08:00
MistEO
88f0d2546e fix.修复部分前一个任务出错，后面的任务不执行的问题 2022-05-14 02:56:18 +08:00
zzyyyl
104646833b fix.修复编码问题 
中文路径也能用maa辣！
windows下，路径相关的全都用gbk存储，输出到log的信息统一用utf8
 2022-05-14 02:20:17 +08:00
MistEO
b21c15dab1 fix.修复上次作战是愚人号关卡后卡住的问题 2022-05-14 02:08:49 +08:00
MistEO
c2198344e6 chore. Treat warninngs as errors 
赶尽杀绝（
 2022-05-14 01:57:03 +08:00
MistEO
dca63426a6 feat.新增支持信用商店优先购买选项 2022-05-14 01:19:54 +08:00
MistEO
c9bd4dcb63 feat.新增信用商店黑名单自定义功能 
C# 一直有编码问题，交给 C++ 来转了
 2022-05-14 00:14:57 +08:00
MistEO
0358aaaffd chore.强制打开检查更新开关 2022-05-14 00:14:57 +08:00
MistEO
31eb285f2f Merge pull request #492 from zhangchi0104/feat/dart-plugin 
添加了dart interface (但搞不定链接库)
 2022-05-13 22:00:17 +08:00
Alex Zhang
2dbfb27cd9 修复了json格式 2022-05-13 21:52:04 +08:00
Alex Zhang
f2864546d7 优化了dartapi 2022-05-13 21:49:46 +08:00
MistEO
3e50dc20de Merge pull request #496 from zzyyyl/feat/update-check 
feat.优化检查更新的UI
 2022-05-13 19:53:18 +08:00
zzyyyl
7eab0f15e5 fix.修复检查测试版本时不会检查正式版本的bug 
怎么还有for越界的问题（？
 2022-05-13 17:29:33 +08:00
zzyyyl
7766dabf8c perf.用全角空格对齐吃石头 
强迫症狂喜
 2022-05-13 17:29:17 +08:00
zzyyyl
eaa2981aa7 feat.增加一个是否检查更新的选项 2022-05-13 17:29:01 +08:00
MistEO
214d596764 Merge remote-tracking branch 'origin/master' into dev 2022-05-13 14:00:26 +08:00
Alex Zhang
611a84d4cf 添加了dart interface (但搞不定链接库) 2022-05-13 11:41:22 +08:00
bakashigure
1aafd343ec perf: 修改uuid获取方式 2022-05-12 11:17:47 +08:00
MistEO
d25348e9bb docs.修复文档链接错误 2022-05-11 23:44:23 +08:00
MistEO
7044c48e1a chore. disable a warning 2022-05-11 23:31:24 +08:00
MistEO
4f1b0bb450 Merge pull request #485 from zhangchi0104/patch-1 
修复了linux编译Logger.hpp报错
 2022-05-11 23:27:22 +08:00
MistEO
66dd3b4840 Merge pull request #482 from MaaAssistantArknights/dev 
MAA Core 4.0, New Version!
 2022-05-11 23:26:16 +08:00
MistEO
4ae9c05879 chore.删除一些用不上了的文件 2022-05-11 23:24:36 +08:00
MistEO
58f6819820 fix.修复SN活动关卡偶尔卡住的问题 2022-05-11 23:20:55 +08:00
MistEO
88f87da4df feat.初步完成4.0 core wpf适配 2022-05-11 23:17:34 +08:00
MistEO
9905037cb7 Merge pull request #488 from zzyyyl/dev 
feat.更新肉鸽用的干员配置
 2022-05-11 22:35:36 +08:00
zzyyyl
8a5fb6f710 feat.更新肉鸽用的干员配置 2022-05-11 22:32:12 +08:00
alexzhang
3a210bb0bd 修复了linux编译时logger.hpp报错 
linux编译时会报错
```
In file included from /home/alexzhang/code/maa-building/MaaAssistantArknights/src/MeoAssistant/AbstractConfiger.cpp:6:
/home/alexzhang/code/maa-building/MaaAssistantArknights/src/MeoAssistant/Logger.hpp: In member function ‘void asst::Logger::log(std::string_view, Args&& ...)’:
/home/alexzhang/code/maa-building/MaaAssistantArknights/src/MeoAssistant/Logger.hpp:136:52: error: ‘std::this_thread’ has not been declared
  136 |                       level.data(), getpid(), std::this_thread::get_id()
      |                                                    ^~~~~~~~~~~
```
添加了 `#include <thread>`后问题解决
 2022-05-11 07:12:42 +08:00
Liam Sho
6f16c47727 chore.加回 aria2c.exe 2022-05-11 01:12:11 +08:00
MistEO
07772d17e9 feat. WPF界面初步跑通新core 2022-05-10 22:59:38 +08:00
MistEO
77b2ef979b Merge pull request #479 from Andor233/patch-1 
Update 模拟器支持.md
 2022-05-10 22:28:03 +08:00
Spring Burst
a71e7b894e Update 模拟器支持.md 2022-05-10 22:26:51 +08:00
MistEO
430e706f5c merge.合并master 2022-05-10 21:32:11 +08:00
MistEO
ded8b1dc34 Merge pull request #470 from ABA2396/DigAndRecruit 
feat.添加了矿区开采和限定寻访功能
 2022-05-10 21:29:26 +08:00
MistEO
97bc803900 Merge branch 'LiamSho-master' 2022-05-10 21:25:05 +08:00
MistEO
46509c281b Merge branch 'master' of https://github.com/LiamSho/MaaAssistantArknights into LiamSho-master 2022-05-10 21:23:41 +08:00
Spring Burst
b47edc9670 Update 模拟器支持.md 2022-05-10 20:05:08 +08:00
MistEO
81d0f58694 docs.更新关于WSA的支持 2022-05-10 17:46:29 +08:00
Liam Sho
c06139a8e7 fix.修复编译 Warning 2022-05-10 01:50:42 +08:00
Alisa
978d6f1d12 Merge pull request #473 from LiamSho/master 
ci.GitHub Actiona 配置
Make GitHub Actions Great Again
 2022-05-10 00:27:32 +08:00