fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-20 02:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,944 Commits 60 Branches 1,840 Tags
984db71aca75971420bfb4ddc6ec01b0faac44fa
Commit Graph

3944 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wallsman
984db71aca doc: Japanese and English add 2022-09-30 23:22:53 +09:00
MistEO
cd46dcc5ee fix: 修复水月肉鸽委托任务完成后卡住的问题 
暂时还不会领奖励，起码别卡（

fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2016
 2022-09-30 22:19:16 +08:00
MistEO
a3677518b6 fix: 一定程度上缓解干员招募页滑动过快后卡住的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2033
 2022-09-30 22:02:58 +08:00
zzyyyl
439555b2d3 Merge pull request #2026 from MaaAssistantArknights/feat/guilog 
feat: 界面上的日志保存到 `gui.log`
close #434
close #1939
 2022-09-30 21:54:53 +08:00
MistEO
727907c7ed feat: 新增水月肉鸽新格子种类的评分，并修复一些干员朝向错误，以及黑名单地块不生效的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2024
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2025
 2022-09-30 21:29:44 +08:00
zzyyyl
b63b687245 feat: 改小日志大小阈值 2022-09-30 21:08:12 +08:00
zzyyyl
9f3c79d446 feat: 界面上的日志保存到 gui.log 
每次 GUI 启动时，若超过 16M, `gui.log` -> `gui.bak.log`

link to https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/434
link to https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1939
 2022-09-30 16:50:22 +08:00
zzyyyl
cada49478f fix: 修复有时候莫名截图错误的问题 
（修复 screencap 和 call_command 的 重连 和 socket 参数传递错误的问题）

link to d94a288a70
 2022-09-30 15:56:01 +08:00
MistEO
df37355d6f fix: 调高干员招募task的优先级，再次修复干员招页卡住的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2018
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2018
 2022-09-30 15:51:24 +08:00
MistEO
af157c4da4 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-09-30 15:47:08 +08:00
MistEO
2a24f1cadf fix: 简单修复一下肉鸽狂点开始的问题 2022-09-30 15:47:03 +08:00
MistEO
cf579ecafa fix: 简单修复下肉鸽在干员招募页卡住的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2018
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2023
 2022-09-30 15:46:00 +08:00
zzyyyl
d9534908e3 docs: style 2022-09-30 15:19:01 +08:00
zzyyyl
16455719d0 perf: 继续优化公招 Tags 逻辑 
link to a33e708b2b
 2022-09-30 14:29:25 +08:00
Helloworld
327d633cee Merge pull request #2021 from MaaAssistantArknights/i18n 
docs: inline some translations for JSON in JP docs
 2022-09-30 14:21:44 +08:00
Helloworld
8a071b2a07 docs: inline some translations for JSON in JP docs 2022-09-30 14:19:26 +08:00
MistEO
f552bdc79d refactor: 再次整理项目部分文件目录结构 2022-09-30 13:41:38 +08:00
Horror Proton
a33e708b2b chore: remove hardcoded stuff 2022-09-30 11:57:16 +08:00
Horror Proton
08d45ed839 fix: fix a compile error 2022-09-30 11:44:03 +08:00
GalvinGao
ef2a7e8ce1 docs: update icon 2022-09-29 14:06:04 -04:00
GalvinGao
76dce545a7 docs: update icon 2022-09-29 13:57:02 -04:00
MistEO
ec30b7c3b2 Merge pull request #2011 from MaaAssistantArknights/dev 
Release v4.6.0-alpha.4
v4.6.0-alpha.4 		2022-09-30 01:30:24 +08:00
MistEO
30ede2d7c8 docs: update icon, readme, and changelog 2022-09-30 01:30:02 +08:00
MistEO
37de7332e2 feat: 优化水月肉鸽招募配置 2022-09-30 01:13:14 +08:00
MistEO
c87d6a9e8a Merge pull request #1931 from MaaAssistantArknights/chore/recruitment_resource-zzyyyl-patch-1 
fix: 修复公招资源及其生成器
 2022-09-30 01:05:28 +08:00
Horror Proton
da00534847 fix: update include path of certain files 2022-09-30 00:55:58 +08:00
MistEO
ac1e9e537c fix: 修复 json 格式错误 2022-09-30 00:40:23 +08:00
zzyyyl
f62694525b fix: 尝试适配 range-v3 2022-09-30 00:36:37 +08:00
MistEO
8857aa0e7b fix: 修复公招tag不完全匹配的问题 2022-09-30 00:36:34 +08:00
MistEO
8e6c7dd0eb fix: 修复水月肉鸽一处卡住的问题 2022-09-30 00:32:55 +08:00
MistEO
d39b138faf feat: 再添加一些ProcessTask的日志 2022-09-30 00:32:55 +08:00
MistEO
2036426d47 fix: 修复一些水月肉鸽卡住的问题 2022-09-30 00:32:55 +08:00
zzyyyl
719746c95d chore: 修复公招支援机械词条消失的问题 
Co-authored-by: Horror Proton <107091537+horror-proton@users.noreply.github.com>
 2022-09-30 00:25:43 +08:00
zzyyyl
494092369c fix: 修复一个潜在的数组越界问题 2022-09-30 00:25:35 +08:00
zzyyyl
cb678fb86d rft: 使用 asst::utils 的 string 处理 2022-09-30 00:25:27 +08:00
zzyyyl
0ed041b089 feat(string_split_view): enable_view, enable_borrowed_range 2022-09-30 00:20:23 +08:00
zzyyyl
419f704429 fix: 修复公招忽略支援机械的问题 
link to https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1993
 2022-09-30 00:20:15 +08:00
zzyyyl
97261abe25 chore(issue-checker): 存在 roguelike 标签时跳过 copilot 2022-09-30 00:15:13 +08:00
MistEO
5847e3685f 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
11fa16a488 Update roguelike_copilot.json 2022-09-29 23:55:58 +08:00
zzyyyl
e5c69bb322 Merge pull request #2004 from MaaAssistantArknights/refactor/maacore 
refactor: 按照 filters 为 MaaCore 重新建立文件结构
 2022-09-29 23:51:29 +08:00
nightofknife
b9f51e4f4b Update roguelike_copilot.json 
添加了新字段支持，优化站位，尝试解决#1991问题
 2022-09-29 23:43:48 +08:00
zzyyyl
255758bb1c chore: blame-ignore 2022-09-29 23:35:13 +08:00
zzyyyl
559c913fca style: format 2022-09-29 23:30:40 +08:00
zzyyyl
c9b5aa638a refactor: 给头文件加上路径 
直接在上一个 commit 里改的话可能会导致 history 消失
 2022-09-29 23:30:32 +08:00
zzyyyl
206df466fd refactor: 按照 filters 为 MaaCore 重新建立文件结构 2022-09-29 23:25:33 +08:00
Horror Proton
1fae5d65d2 chore: update CMakeLists.txt 2022-09-29 23:09:05 +08:00
MistEO
24ea6ce17c feat: 再添加一些日志 2022-09-29 22:57:47 +08:00
MistEO
9d1547a150 feat: 保存图片时增加一些日志 2022-09-29 22:49:43 +08:00
MistEO
7d2b074620 feat: 优化肉鸽copilot，支持推荐方向和黑名单地块 2022-09-29 22:35:00 +08:00