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
13,355 Commits 61 Branches 1,837 Tags
4a4e8e47a9d68a85a5300d6e6a219c2fe2f2cd4f
Commit Graph

282 Commits

Author SHA1 Message Date
uye
4a4e8e47a9 chore: 移除最小化启动模拟器选项 2024-11-04 22:43:15 +08:00
uye
75e14c8379 fix: 修改任务/基建列表顺序后未开始任务会在程序重启后失效 
fix #10094
 2024-11-04 20:58:42 +08:00
uye
aff03a3bbd fix: UpdateStageList 只在 ui 线程执行 2024-11-03 04:00:07 +08:00
uye
62195dfa0b fix: 跨日更新崩溃 2024-11-03 04:01:44 +08:00
uye
9c5ba9e3ae refactor: 可自定义3~5星招募时间 (#11019) 2024-11-02 20:35:18 +08:00
uye
89a0c947a6 perf: 优化关卡列表更新 (#11022) 
* perf: 优化关卡列表更新

* fix: 显示错误

* chore: 调整结构
 2024-11-02 20:33:34 +08:00
status102
71216b8d4d i18n: UI 优化 2024-11-01 02:21:10 +08:00
Weiyou Wang
3ecbf8bc26 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
5014fb8e70 chore: 修改版本不一致描述，提前 return 位置 2024-10-29 18:03:40 +08:00
uye
627fa36b69 feat: 添加主任务进度条 2024-10-29 16:06:38 +08:00
uye
82e2c2ad6d chore: remove test 2024-10-29 15:22:11 +08:00
uye
f678f65c8e perf: 调整关卡选择更新逻辑 (#10913) 2024-10-29 14:47:52 +08:00
uye
482f013697 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
798869cbdb chore: 添加日志 2024-10-21 17:03:19 +08:00
uye
55a3f83e8a chore: 执行完成后动作前输出当前选择的动作 2024-09-28 00:39:58 +08:00
uye
4ab1e3704b perf: InvokeAsync 前判断是否已经在 ui 线程 2024-09-28 00:09:28 +08:00
uye
f88c90aa0c fix: 强制定时启动前显示窗口 导致程序崩溃 
fix #10692
 2024-09-27 23:47:26 +08:00
uye
f42f527015 fix: 强制定时启动报错 2024-09-23 12:58:06 +08:00
uye
525140fa75 chore: 定时启动添加日志 2024-09-23 11:44:49 +08:00
uye
0075b59da1 chore: 主定时器改用 Timer 2024-09-23 11:22:32 +08:00
uye
cb331b653c chore: 在 ui 线程清除日志 2024-09-23 11:21:29 +08:00
uye
94ff657808 perf: 优化 RecognizerViewModel (#10641) 
* perf: 优化 RecognizerViewModel

删除多余变量，避免大量内存重复申请

* perf: 优化 peep 逻辑

* chore: 优化异步截图

* perf: 移除不必要的任务调用

* perf: 优化截图

* chore: stream 使用 using

* chore: TestLinkAndGetImage 改用 AsstGetFreshImageAsync

* refactor: 提取 peep 页面，允许自定义触发器间隔

* chore: 添加 PeepInterval 最小值

* chore: 避免重复订阅事件

* chore: _peepImageTimer 改用 System.Timers.Timer

* refactor: PeepInterval 改为 PeepTargetFps

* fix: 截图时间过长时导致队列阻塞无法停止观测

* perf: 增加截图任务并发限制

* chore: 调整变量名

说起来真有人能截图截到 Int.Max 吗

* chore: 调整初始分配线程数

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2024-09-21 22:53:19 +08:00
uye
ef2873c977 fix: 重置战斗参数状态错误 2024-09-15 15:12:12 +08:00
uye
fbca4a6bf0 perf: 增强任务和基建列表健壮性，部分异常配置下可自动还原 
fix #10583
 2024-09-11 22:56:36 +08:00
Constrat
08f44e066d feat: time diff log output and notification (#10562) 
* feat: StartTaskTime + diff calculation

* chore: updated xaml with TimeDiff

* feat: logic for all task complete timediff log

* chore: update xaml for timediff log output

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>

* i18n: chinese tweak

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2024-09-10 12:03:52 +01:00
uye
4bd5b9ee79 chore: 关机倒计时前显示窗口 2024-09-09 14:58:32 +08:00
uye
32535dc79f chore: Add logging for timer cancellation status 2024-09-09 14:46:05 +08:00
uye
ca2d9ccf0b chore: 增加未取消关机的日志 2024-09-08 15:19:51 +08:00
uye
43d184c57c chore: 加点关机日志 2024-09-08 15:04:05 +08:00
uye
7d31fc8c29 perf: 允许 TimerCanceledAsync 提前返回 
#10520
 2024-09-07 13:51:38 +08:00
uye
92d4b012cb chore: 获取当地区域格式字符串 2024-09-05 15:34:46 +08:00
uye
4c07483079 chore: 调整 SleepManagement 调用 2024-09-04 18:17:34 +08:00
uye
89d016e88e refactor: 重构CheckAfterCompleted，添加睡眠 2024-09-04 15:46:59 +08:00
uye
78f3e7678b fix: 允许吃源石保存状态在任务完成时仍会重置状态 
fix #10447
 2024-09-03 20:50:31 +08:00
uye
42b773f219 feat: 生息演算模式 1 道具组装任务链插件化 (#10411) 2024-09-02 12:50:36 +08:00
uye
b6b15f498f feat: UI 支持 生息演算 num_craft_batches 参数 2024-09-02 11:27:42 +08:00
uye
35f3bb193f chore: UI 支持选择增加支援道具的方式 2024-09-02 10:01:20 +08:00
uye
1610e3b81a refactor: 重构 FightSettingsUserControl (#10407) 
* feat: 添加允许吃源石保存状态翻译

* refactor: 重构 FightSettingsUserControl

* fix: 绑定错误

* chore: 吃源石后的*根据AllowUseStoneSave改变
 2024-09-01 16:43:06 +08:00
uye
e60d708548 chore: 调用PowerManagement.Shutdown();后再次调用Bootstrapper.Shutdown(); 2024-09-01 13:22:59 +08:00
uye
784b94a440 chore: 关机前尝试保存配置 
fix #10405
 2024-09-01 13:08:49 +08:00
uye
5875de69aa chore: 第一次启动时默认不勾选肉鸽和生息演算 2024-08-29 14:17:04 +08:00
uye
9a1f59206d style: 格式化 
[skip changelog]
 2024-08-29 14:15:47 +08:00
Weiyou Wang
cdd4c4c78e refactor: 重构生息演算 (#10356) 
* refactor: 调整 tasks.json 中部分 doc field 格式

* feat: ReclamationConfig

* refactor: ReclamationTask

* refactor: template <Tales@Reclamation@ProsperityNoSave>

* refactor: tasks.json <Tales@Reclamation@ProsperityNoSave>

* refactor: template <Tales@Reclamation@ProsperityInSave>

* refactor: tasks.json <Tales@Reclamation@ProsperityInSave>

* refactor: 生息点数达到上限后停止任务

* refactor: global adaption

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

* chore: YostarKR CancelEnterBuildMode

* fix: typo in MaaCore.vcxproj

* refactor: Wpf Gui Support (still under progress)

* refactor: practice of template tasks

* refactor: strategy -> mode; mode -> difficulty

* refactor: WpfGui strategy -> mode; mode -> difficulty

* refactor: Tales@Reclamation -> Tales@RA

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

* refactor: simplify task names

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

* feat: 如果当前编队规模大于等于7人则清空当前编队

* refactor: 简化部分任务流

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

* feat: 跳过可能的对话事件

* fix: 修复部分任务流

* fix: add ocrReplace for JP "Tales@RA@ClickShrubberyGalore"

* fix: 加个 delay 防卡顿

* fix: enlarge roi

* feat: 加入日文适配

* fix: 部分任务 guard 通过后操作不一定马上起效，delay 未知，加入特殊处理

* refactor: 任务链描述

* fix: fix wrong task name

* fix: Yostar Confirmation window

* i18n: tweak YostarKR

* fix: enlarge roi for robustness

---------

Co-authored-by: 晓丶梦丶仁 <1020623818@qq.com>
Co-authored-by: HX3N <128385247+HX3N@users.noreply.github.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 2024-08-28 09:25:54 +10:00
uye
8e6ba0e21a refactor: 重构定时器和重启询问 (#10078) 2024-08-22 13:15:22 +08:00
uye
c0e3756a96 Revert "test: test ci" 
This reverts commit 3cc5aa554a3a8bab759a4238b409c28734485983.
 2024-08-17 17:14:23 +08:00
uye
bade06bee1 test: test ci 2024-08-17 17:14:22 +08:00
uye
2190016c06 feat: winapi 关机/睡眠/休眠 2024-08-17 15:49:19 +08:00
Rbqwow
d120a04206 refactor: StopGame (#9658) 
* perf: StopGame

* style: rename Intent to packageName

* chore: 不准不选择区服

* fix: 移除其他配置中的抽象 stop 匹配

* style: 统一驼峰

* style: 按照执行顺序重新排序

* feat: 添加回调和文档

* fix: 修复参数传入

* docs: 更新文档

* fix: merge

* chore: 把WSA的配置也改了

* chore: update submodule

---------

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
Co-authored-by: Loong <wangl.cc@outlook.com>
 2024-08-11 01:50:30 +08:00
status102
0afe548fd6 perf: null check 
[skip changelog]
 2024-08-08 11:00:47 +08:00
Constrat
242eab79c7 feat: visiting only once a day logic and gui (#10113) 
* feat: cs logic for daily visiting

* chore: wpf gui for setting

* i18n: localizations for wpf settings

* feat: daily lock bypass logic

* i18n: change key and localization

* chore: wpf gui
currently using 3rd gui option

* style: tweaked wpf gui

* fix: merge conflicts

* fix: conflicts?
 2024-08-07 10:11:32 +02:00