fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 01:40:46 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,893 Commits 61 Branches 1,836 Tags
c6c640c2a64d1b2eb63c4100a6ef70135d33f68a
Commit Graph

252 Commits

Author SHA1 Message Date
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
Constrat
adf2501615 chore: reclamation algorithm #2 except txwy 2024-08-06 23:36:28 +02:00
status102
7c7f44bb45 perf: 增加完成后动作仅一次时锁定退模拟器和MAA 
[skip changelog]
 2024-08-03 16:49:42 +08:00
status102
f4ed000684 perf: 简化完成后动作逻辑 
[skip changelog]
 2024-08-02 15:38:18 +08:00
status102
dc923fa092 perf: 完成后动作标题下方增加分隔线 2024-08-02 13:10:59 +08:00
XBB
a8d406e57c 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
34540de430 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
85f1a719a3 fix: 未开启自定义基建可能遇到的除数为0 2024-07-22 10:49:08 +08:00
SherkeyXD
423a37bfbb fix: 修复基建排版表数量为为0时引起的崩溃问题 2024-07-22 10:41:03 +08:00
uye
a57d8cf46d fix: 修复更换不同班次数的基建排班表可能遇到的数组越界 
fix #9779
 2024-07-21 22:48:45 +08:00
lingting
3a18ab2970 feat: 无法连接设备时尝试断开连接然后重新连接 (#9433) 2024-06-21 16:53:09 +08:00
uye
f815d850e6 style: 优化代码 2024-06-19 18:08:51 +08:00
uye
ab484ffdc4 perf: 优化数据绑定逻辑，减少 AsstProxy 逻辑处理 2024-06-19 17:01:42 +08:00
uye
825f3afe3f perf: 优化关卡选择为剿灭时的逻辑判断 
fix #9327
 2024-06-11 01:09:03 +08:00
uye
1fc47ab475 perf: 更新关卡列表与提示延迟至空闲时间，避免动态修改关卡列表 2024-06-08 16:28:55 +08:00
uye
8cc7fe3e33 fix: 选择休眠动作则结束后脚本没时间运行 
fix #7023
 2024-06-05 00:22:11 +08:00
uye
655e03f815 fix: 肉鸽部分选项在未显示时仍然生效 
fix #9278
 2024-06-04 16:26:45 +08:00
uye
f89d71d5c1 feat: 生息演算支持制造物品刷点数 (#9268) 
* feat: 支持制造物品刷点数

* feat: ui 支持 Reclamation2Ex 参数

* chore: 修改界面描述
 2024-06-03 00:48:53 +08:00
Linisdjxm
1652647f17 feat:在特定环节执行启动前/后脚本 (#9153) 
* feat:在特定环节执行启动前/后脚本

* fix:fix
 2024-05-26 23:01:29 +08:00
uye
78f6ca6fa8 refactor: 统一使用OnUIThread，AddLog默认在ui线程执行 2024-05-26 22:25:54 +08:00
北雁 Cryolitia
5b7029ca76 docs(treewide): fix license typo 
introduced in b8e63a1223 (diff-4d3cb3f2d417ec9595021db8d2d4eb91950a210be491d64525152588b3a2f908R10)
 2024-05-26 06:21:33 +08:00
uye
cbcfeac0de feat: 连战次数选项可隐藏 2024-05-10 22:28:53 +08:00
uye
6b0f7ea6ef style: format TaskQueueViewModel 2024-05-07 14:38:49 +08:00
70CentsApple
362a872b00 feat: 新增公招 3 星 Tag 的倾向策略 (#8868) 
* feat: 新增3星Tag的倾向策略

* docs: add docs for `first_tags`

* i18n: remove unexpected dots

* fix: 在 `NoExtra` 模式下返回默认 `final_combination`
 2024-05-03 09:16:50 +00:00
SherkeyXD
8dcfcc06a8 feat: 开放限时开采许可的ui 2024-05-02 01:39:51 +08:00
Sherkey
78258ccc6f feat: 支持五周年赠送月卡的领取 (#8918) 2024-04-28 00:12:20 +08:00
status102
cf05d0d4bb perf: 肉鸽投资模式进入第二层拓展为投资模式启用购物、招募 (#8620) 
perf: 肉鸽投资模式`进入第二层`拓展为`投资模式启用购物、招募`
 2024-03-23 14:33:00 +08:00
uye
9d2a4720e7 fix: 所有任务都添加失败时清空任务列表 
fix #8658
 2024-03-19 16:50:37 +08:00
status102
37ae5d611e perf: 肉鸽投资模式进入第二层拓展为投资模式启用购物、招募 2024-03-15 11:40:14 +08:00
Lancarus
bf73e14937 feat: 萨米肉鸽增加凹远见密文板 2024-03-09 12:17:13 +08:00
David
3412d57f2c feat: Visit Friends can be toggled off (#8488) 2024-03-07 16:58:42 +08:00