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
2,679 Commits 62 Branches 1,839 Tags
0c8d0944bb883c052d5cfeafd75fdb2277f8d00f
Commit Graph

2679 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Liam Sho
63eaac9187 ci.修复参数错误 2022-05-10 00:15:13 +08:00
Liam Sho
8996f72b9c ci.添加 MaaBundle 的发布 2022-05-09 23:50:05 +08:00
Liam Sho
8e5d29f698 ci. 重命名 Bundle 名称 2022-05-09 23:49:38 +08:00
Liam Sho
466786dc7a ci.添加 MaaWpf 和 MaaResource 的 Release 2022-05-09 21:59:39 +08:00
Liam Sho
a919fe8b80 ci.限定 DevBuild 的生效范围 2022-05-09 21:06:17 +08:00
ABA2396
e66d16cc06 feat.添加了矿区开采和限定寻访功能图片 2022-05-09 19:21:22 +08:00
ABA2396
a5f3867c6d feat.添加了矿区开采和限定寻访功能 2022-05-09 19:05:52 +08:00
Liam Sho
c9309fa970 ci.修改 ReleaseCore 配置 2022-05-09 18:27:44 +08:00
Liam Sho
bcd00723ab ci.添加 ReleaseCore 2022-05-09 17:58:15 +08:00
Liam Sho
2f400b4adc ci.添加手动触发器 2022-05-09 16:51:24 +08:00
Liam Sho
9fe96c2228 ci.优化 DevBuild 2022-05-09 15:58:57 +08:00
Liam Sho
55a4e16208 ci.分开所有的 Artifacts 2022-05-09 14:27:22 +08:00
Liam Sho
74138012ce ci.修改使用 GitHub Action 的 Upload Artifacts 配置 2022-05-09 14:04:11 +08:00
Alisa
2bf62f25f2 ci.修复 CI 上传 Artifact 失败的问题 2022-05-09 13:45:00 +08:00
Liam Sho
76d1bc9eb4 ci.修 Ci 2022-05-09 13:12:41 +08:00
Liam Sho
2e7ff173d1 ci.添加 DevBuild 配置文件 2022-05-09 13:06:12 +08:00
Liam Sho
0394987d80 feat.添加构建项目 2022-05-09 13:05:46 +08:00
Liam Sho
188c1f5f3a bump.清理项目，更新依赖 2022-05-09 13:05:28 +08:00
MistEO
058c490286 chore. add cmake opt 2022-05-09 01:00:21 +08:00
Liam Sho
7fce10f584 Merge branch 'master' of https://github.com/LiamSho/MaaAssistantArknights 2022-05-09 00:55:23 +08:00
MistEO
77c0612edd chore.更新企鹅库，修复警告 
cf5ebbc89c
v3.3.2 		2022-05-09 00:53:55 +08:00
Liam Sho
60c70b723f chore.修改项目文件以适配构建工具 2022-05-09 00:53:20 +08:00
MistEO
e0442ffcc2 chore.更新版本号v3.3.2 2022-05-09 00:33:22 +08:00
MistEO
5fc6b31d88 fix.更新企鹅识别库，修复一些识别问题 2022-05-09 00:32:29 +08:00
MistEO
317e194ddc Merge branch 'master' into dev 2022-05-09 00:14:15 +08:00
MistEO
64228e095f Merge pull request #463 from zzyyyl/master 
chore.优化文档CI/CD使得在fork上不运行
 2022-05-08 23:49:12 +08:00
MistEO
fcd7c8803b Merge pull request #465 from ABA2396/ActivityStage2 
fix.活动更新后导航失败
 2022-05-08 23:39:46 +08:00
ABA2396
3efa6ac234 fix.活动更新后导航失败 2022-05-08 23:37:44 +08:00
MistEO
555958ab53 Merge pull request #462 from aa889788/master 
fix: Fix build error on Linux with gnustl
 2022-05-08 23:25:22 +08:00
zzyyyl
18caf9b3c0 style.随便改点测试一下 2022-05-08 13:16:13 +08:00
zzyyyl
819df66666 chore.优化CI使得在fork上不运行 2022-05-08 13:16:12 +08:00
shxyke
8c3e6d345a fix: Fix build error on Linux with gnustl 
This error seems caused by gnustl vector, I do not know
how to fix it, so I use macro to change container to deque
under gnustl, use deque under other STL library will also
cause problem.
 2022-05-08 10:37:22 +08:00
MistEO
28055235aa docs.更新文档及cmake,删除老版本企鹅库的相关内容 2022-05-07 22:51:47 +08:00
MistEO
423cc6bafd feat.界面关卡导航的一点小修改 2022-05-07 22:38:47 +08:00
MistEO
e43fb927ce fix.修复SN-9导航在加载动画较慢时卡住的问题 2022-05-07 22:34:50 +08:00
MistEO
d8ef5a1e1a Merge pull request #456 from ABA2396/Combined-navigation 
feat.合并LS-5 LS-6;CE-5 CE-6导航
 2022-05-07 22:32:29 +08:00