fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 09:50:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,877 Commits 61 Branches 1,837 Tags
d2e6b26aaba72bf2bcd2a877054042e3e9dedd33
Commit Graph

3877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zzyyyl
d2e6b26aab fix: 修复公招忽略支援机械的问题 
link to https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1993
 2022-09-30 00:20:15 +08:00
zzyyyl
c6a3d660b4 chore(issue-checker): 存在 roguelike 标签时跳过 copilot 2022-09-30 00:15:13 +08:00
MistEO
109b904221 Merge pull request #2008 from nightofknife/patch-2 
feat: Update `roguelike_copilot.json` [Skip module label]
 2022-09-29 23:56:13 +08:00
MistEO
d04e705246 Update roguelike_copilot.json 2022-09-29 23:55:58 +08:00
zzyyyl
682858af2f Merge pull request #2004 from MaaAssistantArknights/refactor/maacore 
refactor: 按照 filters 为 MaaCore 重新建立文件结构
 2022-09-29 23:51:29 +08:00
nightofknife
0a6dd582c7 Update roguelike_copilot.json 
添加了新字段支持，优化站位，尝试解决#1991问题
 2022-09-29 23:43:48 +08:00
zzyyyl
4bc1c16485 chore: blame-ignore 2022-09-29 23:35:13 +08:00
zzyyyl
19e1fd7268 style: format 2022-09-29 23:30:40 +08:00
zzyyyl
0ff6dd4b42 refactor: 给头文件加上路径 
直接在上一个 commit 里改的话可能会导致 history 消失
 2022-09-29 23:30:32 +08:00
zzyyyl
df3ff331be refactor: 按照 filters 为 MaaCore 重新建立文件结构 2022-09-29 23:25:33 +08:00
Horror Proton
4603d14dfd chore: update CMakeLists.txt 2022-09-29 23:09:05 +08:00
MistEO
453b70e9f4 feat: 再添加一些日志 2022-09-29 22:57:47 +08:00
MistEO
e11414ab3f feat: 保存图片时增加一些日志 2022-09-29 22:49:43 +08:00
MistEO
677df7710a feat: 优化肉鸽copilot，支持推荐方向和黑名单地块 2022-09-29 22:35:00 +08:00
MistEO
8f079e11a5 docs: update readme 2022-09-29 01:31:14 +08:00
MistEO
b7b33b2f34 Merge pull request #1986 from MaaAssistantArknights/dev 
Release v4.6.0-alpha.3
 2022-09-29 00:44:40 +08:00
MistEO
e18084cdee docs: update changelog 2022-09-29 00:44:22 +08:00
MistEO
80eb08a570 fix: 修复水月肉鸽第三层战利品选择卡住的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1964
 2022-09-29 00:07:55 +08:00
MistEO
82fd28b251 Merge pull request #1966 from JiHongYuan/patch-1 
fix: java doc集成文档地址
 2022-09-29 00:03:17 +08:00
nightofknife
bd32805d17 chore: Update roguelike_copilot.json (#1983) 2022-09-29 00:02:46 +08:00
MistEO
9b1d858638 fix: build errror 
@zzyyyl 屑！
 2022-09-28 23:53:10 +08:00
MistEO
5dce6ea48c Merge pull request #1982 from MaaAssistantArknights/feat/mizuki 
feat: 给水月肉鸽增加 招募 和 藏品 的配置文件
 2022-09-28 23:50:49 +08:00
zzyyyl
581930189b fix: fix build error 2022-09-28 23:47:52 +08:00
MistEO
28e6e934b9 fix: 修复了亿点点水月肉鸽的bug 2022-09-28 23:47:24 +08:00
zzyyyl
e982a539b8 feat: 给水月肉鸽增加 招募 和 藏品 的配置文件 2022-09-28 23:28:10 +08:00
MistEO
86a8cd55c8 feat: 肉鸽卡住时自动保存截图 2022-09-28 22:40:13 +08:00
zzyyyl
fa358c3ae6 Merge pull request #1975 from MaaAssistantArknights/docs/issue-template 
docs: Update issue template
 2022-09-28 20:15:21 +08:00
zzyyyl
8bda1d701e docs: Update issue template 2022-09-28 19:46:40 +08:00
zzyyyl
a40f67897c docs: Update issue template 2022-09-28 19:40:00 +08:00
JiHongYuan
51ccdc8b36 fix: java doc集成文档地址 
**java doc集成文档地址**
 2022-09-28 16:11:27 +08:00
MistEO
6c281a2131 perf: 优化抄作业json文件路径转换 2022-09-28 15:47:34 +08:00
MistEO
c8e93513a1 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-09-28 15:41:34 +08:00
MistEO
93d2d1d7e5 fix: 修复一些解析json时的crash问题 2022-09-28 15:41:15 +08:00
zzyyyl
528dcfad86 chore(issue-checker): fix Release 2022-09-28 15:06:37 +08:00
MistEO
bb0b059ef2 perf: 优化截图出错时的重试机制 2022-09-28 14:49:13 +08:00
Tastror
92779a01bb Merge pull request #1950 from wallsman/dev 
doc: add line Japanese traslate and minor change
 2022-09-28 14:21:52 +08:00
Wallsman
b72750c792 Update ja-jp.xaml 2022-09-28 15:11:20 +09:00
MistEO
ecbebb3c6e docs: fix link 2022-09-28 13:24:31 +08:00
Horror Proton
99d1d86058 chore: fix a compile error 2022-09-28 13:14:27 +08:00
MistEO
f854afc36f docs: 更新用户群 2022-09-28 11:23:31 +08:00
uye
381d201d0b feat: 添加五群链接 2022-09-28 11:08:58 +08:00
Wallsman
3a0d92de38 Update ja-jp.xaml 2022-09-28 02:51:04 +09:00
Wallsman
16b1184ada Update ja-jp.xaml 2022-09-28 02:35:22 +09:00
Wallsman
7539296ea0 doc:add Mizuki rogue 
追加抜け分の先行対応
 2022-09-28 02:34:12 +09:00
MistEO
62390bfc5a Merge pull request #1949 from MaaAssistantArknights/dev 
fix: 再次修复第三层boss卡住的问题
 2022-09-28 01:25:32 +08:00
MistEO
7b064f526e fix: 再次修复第三层boss卡住的问题 2022-09-28 01:24:47 +08:00
Wallsman
62d83428aa doc:Japanese traslation 
英語部分の日本語化と日本語説明の表示位置変更
English line to Japanese.
Japanese text priority to top view.
 2022-09-28 02:17:56 +09:00
MistEO
0d26eefe69 Merge pull request #1948 from MaaAssistantArknights/dev 
Release v4.6.0-alpha.2
 2022-09-28 01:15:17 +08:00
MistEO
5b39202ff4 fix: 修复水月肉鸽第三层boss卡住的问题 
但是这样第五层boss就会卡了，明天再改.jpg
 2022-09-28 01:14:29 +08:00
Wallsman
93d085b605 doc:minor change 
2Byte だったセミコロンの修正
OCRを分かりやすいように実例に変更
; to Byte code
 2022-09-28 02:11:47 +09:00