fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-15 17:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,400 Commits 61 Branches 1,836 Tags
dca63426a6bcfefd8bed9b294095fd41c85ddc19
Commit Graph

1400 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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