fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 10:32:19 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,696 Commits 61 Branches 1,840 Tags
eaee3bff44369e546af30602468a9262a2947d65
Commit Graph

311 Commits

Author SHA1 Message Date
BxFS
eaee3bff44 feat: 肉鸽满级自动停止选项 (#11466) 
---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: momomochi987 <as99us301@gmail.com>
Co-authored-by: ManicSteiner <manicsteiner@outlook.com>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2025-01-10 15:27:39 +01:00
uye
d76851cefe chore: 界面设置改为全局配置 2024-12-28 16:38:45 +08:00
Constrat
e07bdaf3d3 feat: RA2 multi-crafting 2024-12-23 18:07:35 +01:00
status102
c5a39bda9f rft: WpfGui重构 拆分一键长草-公招任务 (#11311) 2024-12-08 14:53:29 +08:00
status102
c2c47cf6b7 rft: WpfGui重构 拆分一键长草-刷理智任务 (#11223) 2024-12-02 20:19:08 +08:00
status102
87514809dc rft: WpfGui游戏设置修改为运行设置 (#11209) 
* rft: 暂停下干员

* rft: 掉线自动重连

* rft: 执行脚本

* rft: 不睡眠

* rft: 肉鸽延迟停止

* i18n: 游戏设置->运行设置

* i18n: EN tweak

---------

Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
 2024-11-25 13:10:46 +01:00
uye
0f4ef55d84 chore: 通过控制台退出模拟器时不再kill端口 
fix #11234
 2024-11-24 18:17:57 +08:00
status102
f28e63c7d0 fix: 避免非预期的任务参数设置检查 (#11232) 2024-11-24 14:15:54 +08:00
status102
79cca14d5e rft: WpfGui重构 拆分一键长草-领取奖励任务 (#11228) 2024-11-23 21:47:40 +08:00
uye
9594dc5549 fix: API 中被删除的已关闭活动关卡被误判为常驻关卡 2024-11-22 22:41:07 +08:00
status102
05e68d2bae rft: WpfGui重构 拆分一键长草-基建任务任务 (#11219) 
* rft: WpfGui重构 拆分`一键长草-基建任务`

* perf: 简化
 2024-11-22 21:48:21 +08:00
status102
df464beff1 chore: format & nullable 
[skip changelog]
 2024-11-22 21:44:20 +08:00
status102
b7e9166804 rft: WpfGui重构 拆分一键长草-获取信用及购物任务 (#11218) 
* rft: WpfGui重构 拆分`一键长草-获取信用及购物任务`

* perf: 修改绑定
 2024-11-22 18:41:11 +08:00
status102
2e9e490518 rft: WpfGui重构 拆分一键长草-自动肉鸽 (#11201) 2024-11-21 09:18:15 +08:00
uye
a9201c943e perf: 优化参数解析 2024-11-21 00:22:13 +08:00
uye
4dca1dcaf0 fix: 使用命令行切换配置时有可能使关卡选择被覆盖 
fix #11199
 2024-11-20 22:47:44 +08:00
status102
b5e7b424e1 rft: WpfGui重构 拆分设置-定时执行 (#11192) 
rft: 拆分 设置-定时执行
 2024-11-20 09:24:19 +08:00
status102
4829a2b165 rft: 拆分 设置-游戏设置 (#11185) 
* rft: 拆分 设置-游戏设置

* perf: 简化数据绑定
 2024-11-18 20:47:16 +08:00
status102
f67ec6e1b4 rft: rename VersionUpdateDataContext to VersionUpdateSettings 2024-11-18 16:59:52 +08:00
status102
facf7df1af rft: 拆分 一键长草-生息演算 任务设置 (#11166) 
* rft: 拆分 一键长草-生息演算 任务设置

* fix: 移除遗漏
 2024-11-17 09:19:15 +08:00
status102
9383dc5a89 rft: 拆分 设置-启动设置 (#11152) 
* rft: 拆分 设置-启动设置

* chore: 加点注释
 2024-11-16 15:07:38 +08:00
status102
41b783981a fix: 修复连接设置下 开始前、结束后脚本及运行任务时休眠设置绑定 2024-11-14 13:00:30 +08:00
status102
0a4ffd1798 rft: 移动统一部分设置路径 2024-11-14 09:54:45 +08:00
status102
6628649f01 rft: 拆分 设置-连接设置 (#11120) 
* rft: 拆分 设置-连接设置

* rft: 迁移Model路径以细分ViewModel

* rft: 迁移Model及UserControl路径以细分Views
 2024-11-13 19:41:52 +08:00
status102
4becaa4b02 perf: WpfGui优化任务进度显示 (#11055) 
perf: 优化任务进度显示
 2024-11-12 13:52:22 +08:00
status102
78ec0e66c7 Reapply "rft: 拆分设置-软件更新 (#11085)" 
This reverts commit d043af977f.
 2024-11-09 12:22:38 +08:00
Ali (Daixin) Tian
0bc65f6f10 perf: 公招三星优先tag 改为复选框 (#11097) 
* feat: Replace AutoRecruitHighPriority (公招三星优先tag) Textbox with CheckComboBox & ListBox

* chore: update translation for AutoRecruitHighPriority and AutoRecruitHighPriorityTooltip

* perf: UI perform

* fix: Assign default value of _autoRecruitFirstList as empty string

* i18n: 支持外服及显示语言切换

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2024-11-08 11:50:41 +08:00
status102
d043af977f Revert "rft: 拆分设置-软件更新 (#11085)" 
This reverts commit d0402916c2.
 2024-11-08 10:04:18 +08:00
status102
d0402916c2 rft: 拆分设置-软件更新 (#11085) 
* rft: 拆分设置-软件更新

* perf: static var

* style: format
 2024-11-07 12:30:22 +08:00
uye
146763b32e chore: 移除最小化启动模拟器选项 2024-11-04 22:43:15 +08:00
uye
fbf8c05212 fix: 修改任务/基建列表顺序后未开始任务会在程序重启后失效 
fix #10094
 2024-11-04 20:58:42 +08:00
uye
430f4a8dab fix: UpdateStageList 只在 ui 线程执行 2024-11-03 04:00:07 +08:00
uye
d601075fdd fix: 跨日更新崩溃 2024-11-03 04:01:44 +08:00
uye
94febb6987 refactor: 可自定义3~5星招募时间 (#11019) 2024-11-02 20:35:18 +08:00
uye
84e0392cba perf: 优化关卡列表更新 (#11022) 
* perf: 优化关卡列表更新

* fix: 显示错误

* chore: 调整结构
 2024-11-02 20:33:34 +08:00
status102
0639c20add i18n: UI 优化 2024-11-01 02:21:10 +08:00
Weiyou Wang
4c385f0915 fix: 修复对 expected_collapsal_paradigms 参数支持 (#10978) 
* fix: 修复对 expected_collapsal_paradigms 参数支持

* refactor: 简化一下

* feat: ui 添加坍缩列表

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2024-10-31 21:35:49 +08:00
uye
12da3b36d8 chore: 修改版本不一致描述，提前 return 位置 2024-10-29 18:03:40 +08:00
uye
23549003b2 feat: 添加主任务进度条 2024-10-29 16:06:38 +08:00
uye
eb12ebf8fc chore: remove test 2024-10-29 15:22:11 +08:00
uye
cd5397bfc9 perf: 调整关卡选择更新逻辑 (#10913) 2024-10-29 14:47:52 +08:00
uye
f4cb72aef9 feat: 支持肉鸽选难度 (#10918) 
* feat: 支持肉鸽选难度

* chore: Auto update by pre-commit hooks [skip changelog]

* refactor: 补充相关机制

* chore: Auto update by pre-commit hooks [skip changelog]

* feat: 瞎写一个wpf，切系统测试去

* feat: select roguelike difficulty using wpf gui

* fix: 简单修补凹开局密文板功能，等待未来重构

* chore: global adaptation

* refactor: 舍弃 next_difficulty 参数

* refactor: 增加对 RoguelikeMode::Collectible 模式下衍生参数有效性的判定

* rft: 移除run_for_collectible

* chore: Auto update by pre-commit hooks [skip changelog]

* style: format

* chore: 调整肉鸽等级列表初始化

* perf: 减少不必要判断

* fix: 傀影肉鸽修复潜在的干员招募逻辑错误，并添加难度参数校验

* Revert "fix: 傀影肉鸽修复潜在的干员招募逻辑错误，并添加难度参数校验"

This reverts commit 08b715a8eb.

* perf: 难度参数校验

* Revert "rft: 移除run_for_collectible"

This reverts commit cf170750c5.

# Conflicts:
#	src/MaaCore/Task/Interface/RoguelikeTask.cpp
#	src/MaaCore/Task/Roguelike/RoguelikeConfig.cpp
#	src/MaaCore/Task/Roguelike/Sami/RoguelikeFoldartalStartTaskPlugin.cpp

* fix: 水烧开是 !get_run_for_collectible()，之前我写错了

* doc: 补充 zh-cn 文档

* doc: 补充其他语言的文档（机翻）

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Weiyou Wang <44151844+Alan-Charred@users.noreply.github.com>
Co-authored-by: Weiyou Wang <Weiyou.Wang@anu.edu.au>
Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2024-10-29 09:08:22 +08:00
uye
2beaedbd8d chore: 添加日志 2024-10-21 17:03:19 +08:00
uye
e7c993bffb chore: 执行完成后动作前输出当前选择的动作 2024-09-28 00:39:58 +08:00
uye
0ec3512827 perf: InvokeAsync 前判断是否已经在 ui 线程 2024-09-28 00:09:28 +08:00
uye
7d405c8291 fix: 强制定时启动前显示窗口 导致程序崩溃 
fix #10692
 2024-09-27 23:47:26 +08:00
uye
5027b10319 fix: 强制定时启动报错 2024-09-23 12:58:06 +08:00
uye
7a603abe59 chore: 定时启动添加日志 2024-09-23 11:44:49 +08:00
uye
13912fda44 chore: 主定时器改用 Timer 2024-09-23 11:22:32 +08:00
uye
638af3fe5a chore: 在 ui 线程清除日志 2024-09-23 11:21:29 +08:00