fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 02:10:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,603 Commits 61 Branches 1,838 Tags
0da322b1cef550263ea478fd2c344844f78e95ca
Commit Graph

9603 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
status102
0da322b1ce feat: 调整理智药使用为按瓶计数，优化掉了博朗台在使用理智药不溢出情况下的额外等待 2023-10-25 11:59:21 +08:00
David
575c84f652 fix: SkipThePreBattlePlot lowered threshold 
@MistEO this task is intended for IN-BATTLE plot, not the one before the battle correct?
 2023-10-24 21:47:32 +02:00
David
f880ddd183 feat: As in my Adumbration operator implementation 2023-10-24 19:33:24 +02:00
MistEO
c8e004f829 refactor: Wpf迁移MaaCore引用，统一合并至MaaService (#6945) 2023-10-25 00:50:22 +08:00
status102
3d4283b6a9 Merge branch 'dev' into feat/service 2023-10-24 23:51:20 +08:00
MistEO
8acb5e3d10 fix: 修复公招多选 Tags 选项不保存的问题 (#7065) 2023-10-24 22:21:50 +08:00
youqii
edd5cf8a2c fix: 公招多选 Tags 保存至配置文件 2023-10-24 19:07:05 +08:00
zzyyyl
934dccefcb docs: fix code block in user guide for CLI (#7060) 2023-10-24 16:51:25 +08:00
Loong
0799dba152 docs: fix code block 2023-10-24 13:38:43 +08:00
MistEO
82cd135bf6 Release v4.26.0-beta.2 (#6999) 2023-10-24 01:00:56 +08:00
github-actions[bot]
dc5b9e4942 docs: Auto Update Changelogs of v4.26.0-beta.2 (#7055) 
Co-authored-by: MistEO <MistEO@users.noreply.github.com>
Co-authored-by: MistEO <mistereo@hotmail.com>
 2023-10-24 01:00:23 +08:00
MistEO
c109acd709 Revert "feat: 萨米肉鸽使用密文板 (#6949)" (#7054) 2023-10-24 01:00:09 +08:00
zzyyyl
b4ec798353 Revert "feat: 萨米肉鸽使用密文板 (#6949)" 
This reverts commit f1b4d55e3b.
 2023-10-24 00:24:26 +08:00
zzyyyl
2bdbdefa14 fix: update MaaCore.vcxproj.filters 2023-10-23 22:40:27 +08:00
MistEO
c20d899043 feat: 公招出高星干员时选中多个tag (#6900) 2023-10-23 21:13:04 +08:00
MistEO
bc3de44baf chore: bump maa-cli and update documents (#7050) 2023-10-23 21:12:34 +08:00
MistEO
762dbc5e87 chore: add 1 sec delay for resource OTA 2023-10-23 21:11:49 +08:00
Loong
bcb142a6ab docs: update CLI document for latest version 2023-10-23 21:08:13 +08:00
Loong
80d8e8aefe chore: bump maa-cli to v0.3.12 2023-10-23 17:59:16 +08:00
MistEO
3d55251f60 fix: fix some warnings from visual studio (#7031) 2023-10-23 17:38:21 +08:00
youqii
dd82e0aa5e feat: GUI新增选项 2023-10-23 17:27:08 +08:00
zzyyyl
b62ec87b60 chore: 增加 TaskSorter 脚本对 tasks.json 进行排序 (#7046) 2023-10-23 16:51:45 +08:00
zzyyyl
59fb2f355b chore: Remove "tools/ResourceUpdater/Tasks_Sorter.py" 2023-10-23 16:24:54 +08:00
zzyyyl
b55a247ed6 style: 对 tasks.json 进行排序 2023-10-23 16:22:41 +08:00
zzyyyl
d73d59b677 ci: 更新 TaskSorter 脚本 2023-10-23 16:22:33 +08:00
zzyyyl
87cf077827 chore: 增加 TaskSorter 脚本对 tasks.json 进行排序 
外服任务内字段顺序也依照国服
 2023-10-23 16:22:25 +08:00
youqii
2053c5bf6e pref: 将代码段拆进函数 2023-10-23 16:12:20 +08:00
youqii
a66a6bce42 feat: 公招出高星干员时选中多个tag 2023-10-23 16:12:19 +08:00
Lancarus
9d6ea45802 perf 优化萨米肉鸽部分关卡策略 2023-10-23 13:46:07 +08:00
zzyyyl
9661bc5ae1 fix: 修复“迷城”界面公开招募有时出错的问题 2023-10-23 13:38:05 +08:00
zzyyyl
59c7f1ed92 fix: 修复肉鸽探索失败后卡在每月委托/解锁收藏品等界面 
fix #7033
 2023-10-23 11:30:09 +08:00
zzyyyl
10fbf8650d style: format 
[skip changelog]
 2023-10-23 11:09:42 +08:00
zzyyyl
5ecf5f20af perf: 优化水月肉鸽策略 (#7043) 2023-10-23 11:06:43 +08:00
北雁 Cryolitia
2929715512 Change to Appimage Package on Linux (#7030) 
build:
https://github.com/Cryolitia/MaaAssistantArknights/actions/runs/6601833217

test:

![image](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/23723294/fcf66055-fb11-42a5-95fe-6271437d6a6d)

PS: 浏览器里写的所以历史有点乱，建议 squash merge
 2023-10-23 10:30:22 +08:00
羽弥Tian_Yumi
80f90d38c1 优化水月肉鸽部署策略 2023-10-23 09:28:45 +08:00
羽弥Tian_Yumi
521c90cec9 增加一些分组 2023-10-23 09:26:19 +08:00
David
965b3c17b0 fix: 繁中服 保全派駐識別修正 (#7041) 2023-10-22 21:30:51 +02:00
uye
2e13801672 style: 删除多余引用 2023-10-23 00:45:55 +08:00
uye
066c446712 fix: 剪切板错误 
fix #7040
 2023-10-23 00:40:56 +08:00
vonnoq
f8fcdc0bd6 繁中服 保全派駐識別修正 2023-10-23 00:19:25 +08:00
David
cdcc0312d3 fix #7027 (#7039) 
fix #7027
 2023-10-22 17:58:07 +02:00
zzyyyl
be4581a47c feat: 声明 baseTask 的任务直接覆盖同名任务 (#7016) 2023-10-22 23:49:31 +08:00
Cryolitia
e25f085ec6 fix #7027 2023-10-22 23:37:05 +08:00
MistEO
976f7bf72c chore: Auto Update Game Resources - 2023-10-22 2023-10-22 11:07:43 +00:00
David
ee4ffdf4ae perf & typo: removed redundant variable & variable typo (#7032) 2023-10-22 12:41:12 +02:00
David
e46b341c4d perf & typo: removed redundant variable & variable typo 2023-10-22 12:37:56 +02:00
uye
8b8dbb039d Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2023-10-22 17:52:29 +08:00
uye
c5e78bfed8 feat: IS 关卡复刻 2023-10-22 17:49:01 +08:00
status102
e563cac4fc fix: qodana 2023-10-22 16:59:41 +08:00
MistEO
882d078de5 chore: Auto Update Game Resources - 2023-10-22 2023-10-22 08:28:38 +00:00