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
17,533 Commits 60 Branches 1,840 Tags
3e926892b4d2e53df9adf5aa852c5c68cae671fb
Commit Graph

416 Commits

Author SHA1 Message Date
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
uye
36f12c31ed 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
4a81db5980 fix: 重置战斗参数状态错误 2024-09-15 15:12:12 +08:00
uye
808b2598e9 perf: 增强任务和基建列表健壮性，部分异常配置下可自动还原 
fix #10583
 2024-09-11 22:56:36 +08:00
Constrat
c3cade6651 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
1dea3e5f30 chore: 关机倒计时前显示窗口 2024-09-09 14:58:32 +08:00
uye
54f5a7b304 chore: Add logging for timer cancellation status 2024-09-09 14:46:05 +08:00
uye
cd2bd91b6f chore: 增加未取消关机的日志 2024-09-08 15:19:51 +08:00
uye
6889b020e7 chore: 加点关机日志 2024-09-08 15:04:05 +08:00
uye
9afe0599fe perf: 允许 TimerCanceledAsync 提前返回 
#10520
 2024-09-07 13:51:38 +08:00
uye
c8881f04e1 chore: 获取当地区域格式字符串 2024-09-05 15:34:46 +08:00
uye
6b826adaea chore: 调整 SleepManagement 调用 2024-09-04 18:17:34 +08:00
uye
8708aa168e refactor: 重构CheckAfterCompleted，添加睡眠 2024-09-04 15:46:59 +08:00
uye
864f47a12a fix: 允许吃源石保存状态在任务完成时仍会重置状态 
fix #10447
 2024-09-03 20:50:31 +08:00
uye
f1c96db7f4 feat: 生息演算模式 1 道具组装任务链插件化 (#10411) 2024-09-02 12:50:36 +08:00
uye
991857ba0d feat: UI 支持 生息演算 num_craft_batches 参数 2024-09-02 11:27:42 +08:00
uye
fc5c61c9f7 chore: UI 支持选择增加支援道具的方式 2024-09-02 10:01:20 +08:00
uye
41f086a5d8 refactor: 重构 FightSettingsUserControl (#10407) 
* feat: 添加允许吃源石保存状态翻译

* refactor: 重构 FightSettingsUserControl

* fix: 绑定错误

* chore: 吃源石后的*根据AllowUseStoneSave改变
 2024-09-01 16:43:06 +08:00
uye
e52f4f5f15 chore: 调用PowerManagement.Shutdown();后再次调用Bootstrapper.Shutdown(); 2024-09-01 13:22:59 +08:00
uye
9ad63ec5fa chore: 关机前尝试保存配置 
fix #10405
 2024-09-01 13:08:49 +08:00
uye
018f353bbe chore: 第一次启动时默认不勾选肉鸽和生息演算 2024-08-29 14:17:04 +08:00
uye
413a23ebec style: 格式化 
[skip changelog]
 2024-08-29 14:15:47 +08:00
Weiyou Wang
72f06f469a 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
3f1d293a8d refactor: 重构定时器和重启询问 (#10078) 2024-08-22 13:15:22 +08:00
uye
3435b34990 Revert "test: test ci" 
This reverts commit 3cc5aa554a3a8bab759a4238b409c28734485983.
 2024-08-17 17:14:23 +08:00
uye
bb3b04fe38 test: test ci 2024-08-17 17:14:22 +08:00
uye
6ed153dfb7 feat: winapi 关机/睡眠/休眠 2024-08-17 15:49:19 +08:00
Rbqwow
67c10f1982 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
12005f0e1a perf: null check 
[skip changelog]
 2024-08-08 11:00:47 +08:00
Constrat
877722ddef 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
Constrat
5be2e2f653 chore: reclamation algorithm #2 except txwy 2024-08-06 23:36:28 +02:00
status102
33f8110241 perf: 增加完成后动作仅一次时锁定退模拟器和MAA 
[skip changelog]
 2024-08-03 16:49:42 +08:00
status102
17506e642b perf: 简化完成后动作逻辑 
[skip changelog]
 2024-08-02 15:38:18 +08:00
status102
15add729fd perf: 完成后动作标题下方增加分隔线 2024-08-02 13:10:59 +08:00
XBB
101232dde4 feat!: 可组合式完成后任务 (#9960) 
* feat: 可组合完成后指令

* feat: 勾选式完成后指令

* style: xaml format

* perf: 统一默认值

* perf: 移除未使用的键

* style: 遵循项目风格

* fix: 移除废弃判断

* perf: visible -> isEnable

* perf: UI 对齐

* chore: 修正仅一次配置提示文本

* perf: 移除原来的任务结束配置键

* perf: 修正绑定值格式

* perf: 修改 仅一次 逻辑与当前一致

* perf: 移除不再使用的显示文本及翻译

* perf: 移除 仅一次 的额外提示

* revert: format

* fix: 修复部分情况仅一次动作后未能还原

* fix: 修复部分情况仅一次动作后未能还原

* fix: for Rider

* perf: 减少Config写入

* perf: 取消`仅一次`时，保存动作到配置

* perf: 左下角显示仅一次

* perf: 增加提示

---------

Co-authored-by: status102 <102887808+status102@users.noreply.github.com>
 2024-07-31 11:07:59 +08:00
Sherkey
0516b91406 feat: 肉鸽五层 BOSS 前暂停功能 (#9801) 
* feat: 肉鸽五层 BOSS 前暂停功能

Co-authored-by: Lancarus <34369130+Lancarus@users.noreply.github.com>
Co-authored-by: DavidWang19 <dwang0340@gmail.com>
 2024-07-25 11:50:45 +01:00
uye
13279b8c30 fix: 未开启自定义基建可能遇到的除数为0 2024-07-22 10:49:08 +08:00
SherkeyXD
983b9adab8 fix: 修复基建排版表数量为为0时引起的崩溃问题 2024-07-22 10:41:03 +08:00
uye
328e5db765 fix: 修复更换不同班次数的基建排班表可能遇到的数组越界 
fix #9779
 2024-07-21 22:48:45 +08:00
lingting
b3b09d82e6 feat: 无法连接设备时尝试断开连接然后重新连接 (#9433) 2024-06-21 16:53:09 +08:00
uye
4b07b28fec style: 优化代码 2024-06-19 18:08:51 +08:00
uye
ae821a7848 perf: 优化数据绑定逻辑，减少 AsstProxy 逻辑处理 2024-06-19 17:01:42 +08:00
uye
0fcda2167c perf: 优化关卡选择为剿灭时的逻辑判断 
fix #9327
 2024-06-11 01:09:03 +08:00
uye
442336623e perf: 更新关卡列表与提示延迟至空闲时间，避免动态修改关卡列表 2024-06-08 16:28:55 +08:00
uye
920532eaa9 fix: 选择休眠动作则结束后脚本没时间运行 
fix #7023
 2024-06-05 00:22:11 +08:00
uye
0a15418154 fix: 肉鸽部分选项在未显示时仍然生效 
fix #9278
 2024-06-04 16:26:45 +08:00