fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 17:57:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,447 Commits 61 Branches 1,837 Tags
51e25eb78bd565729ab220ceb17110197a685d5d
Commit Graph

146 Commits

Author SHA1 Message Date
MistEO
51e25eb78b fix: 修复WpfGui肉鸽 等待&停止 重复调用AsstStop的错误 (#6878) 2023-10-13 15:26:30 +08:00
uye
66c482da90 chore: 修改 Stop 返回值，增加文档注释 2023-10-12 10:13:53 +08:00
status102
2e71598bc8 fix: 修复肉鸽等待&停止重复调用AsstStop的错误 
fix #6870
 2023-10-11 21:08:57 +08:00
uye
fa5930a443 fix: 定时执行强制启动无法切换基建计划 
fix #6757
 2023-10-11 16:28:11 +08:00
uye
926c22290b perf: 优化代码 2023-10-09 15:44:38 +08:00
MistEO
c4a992840e feat: 公招无招聘许可时继续尝试刷新 (#6569) 2023-10-08 15:09:49 +08:00
MistEO
21182a3997 perf: 对DEBUG VERSION禁用版本更新及资源更新检查 (#6751) 2023-10-08 15:09:13 +08:00
status102
80d7ee415e perf: 对DEBUG VERSION禁用版本更新及资源更新检查 2023-10-08 13:35:18 +08:00
uye
4a9c3d79b1 feat: 识别工具添加 idle 绑定 2023-10-08 10:35:28 +08:00
youqii
0b660f7cc7 Merge branch 'dev' into feature 2023-10-07 20:23:17 +08:00
uye
61ceb3788a perf: 根据 qodana 优化代码 2023-10-07 17:49:01 +08:00
uye
42e9542cd1 perf: 根据 qodana 优化代码 2023-10-07 14:09:17 +08:00
youqii
bdb8f777b6 feat: 在GUI中加入选项 2023-10-05 20:01:28 +08:00
status102
bd72f57f38 feat: 肉鸽新增 WpfGui选项-中止行为等待至本次战斗结束后 2023-10-02 19:58:48 +08:00
uye
cba20939a8 fix: 修复任务链结束后操作会在错误情况下被触发的错误 (#6574) 
- close #6567 

1. 自动战斗-战斗列表结束时
2. 自动战斗发生错误时
 2023-10-01 11:07:56 +08:00
status102
0536b9e7a7 fix: 在自动战斗-战斗列表错误中断时，不再清理_latestTaskId 2023-09-30 16:24:13 +08:00
Lancarus
d92677675e feat：肉鸽刷源石锭模式添加是否去第二层的选项 2023-09-29 02:16:05 +08:00
uye
624aa9c31e merge: 合并 dev 分支修改 2023-09-26 22:42:34 +08:00
MistEO
a0b7114b1b perf: Core不再缓存理智结果，Gui缓存理智读取结果，刷理智合并理智输出和战斗次数输出 (#6544) 
顺带修了一下
- close #6540 

船新输出（假装
![%
DEF1A(I%M7Y@DQ_1VWDHO](https://github.com/MaaAssistantArknights/MaaAssistantArknights/assets/102887808/cfaa1613-2a42-4b95-975d-b7f06cd5cbf5)
 2023-09-26 21:45:29 +08:00
status102
906f3b6952 perf: Core不再缓存理智结果，Gui缓存理智读取结果，刷理智合并理智输出和战斗次数输出 2023-09-26 21:35:38 +08:00
uye
afe3641f92 fix: 关卡选择为剿灭时刷理智任务会尝试所有备选关卡 #6524 2023-09-26 19:52:46 +08:00
uye
16033ae9ed style: Convert into constant，统一注释 2023-09-26 17:47:58 +08:00
uye
6c5265022c style: 规范变量命名，修正错误变量名，修正错误注释 2023-09-26 16:03:05 +08:00
uye
4a40f81334 perf: 优化部分 WPF 代码 2023-09-24 13:50:38 +08:00
youqii
774355c3a7 feat: 新增领取邮件功能 (#6438) 
close #6186 

---------

Co-authored-by: David <56174894+Constrat@users.noreply.github.com>
Co-authored-by: zzyyyl <aysyxx53@hotmail.com>
 2023-09-23 17:52:30 +08:00
uye
43651b1b44 feat: 开始唤醒-账号切换新增手动切换，可单独执行开始唤醒流程 (#6433) 
- close #6431
 2023-09-22 22:55:08 +08:00
status102
caef5c411d fix: Simulator -> Emulator 2023-09-22 17:13:00 +08:00
uye
4f5343aa41 chore: 通过进程名关闭蓝叠时如果模拟器个数超过1个则放弃关闭 2023-09-20 15:36:33 +08:00
Lancarus
ac0be48b1f feat: 增加肉鸽凹开局直升 2023-09-19 16:29:16 +08:00
status102
bfff060987 feat: 开始唤醒-账号切换新增手动切换，可单独执行开始唤醒流程 2023-09-18 16:58:04 +08:00
MistEO
171329994d fix: 修复SettingsView的Idle不生效，将开始唤醒-账号切换在非Idle情况下锁定 (#6364) 2023-09-15 19:13:33 +08:00
uye
9f66fd1039 chore: 优化定时任务 2023-09-15 12:57:58 +08:00
status102
7a3b402cfe perf: 开始唤醒-账号切换在WpfGui增加Trim 2023-09-15 09:30:36 +08:00
status102
757c0a4551 fix: 修复SettingsView的Idle不生效，将自动唤醒-账号切换在非Idle情况下锁定 2023-09-14 21:51:08 +08:00
枫雨
36c5bca88a fix: 给关卡选择为 null 时打个补丁 
#5742
 2023-09-13 16:01:47 +08:00
MistEO
5bfb033426 Merge branch 'dev' into dev_account_switch 2023-09-11 22:46:05 +08:00
uye
71ea085544 feat: YostarEN Reclamation Algorithm implementation (#6267) 
Full Reclamation Algorithm implementation for YostarEN
Early-Implementation for YostarJP (missing texts)

---------
Co-authored-by: David <56174894+Constrat@users.noreply.github.com>
Co-authored-by: ManicSteiner <bjjtgszc@163.com>
 2023-09-10 23:01:30 +02:00
MistEO
ab7beaac6e feat: update local resource by etag (#6283) 2023-09-09 23:33:45 +08:00
status102
9283928652 feat: 新增 官服、B服 账号切换功能 2023-09-09 14:47:30 +08:00
laffey
6ef5b03d8d feat: shutdown/hibernate after all other MAAs have exited, or just exit itself 2023-08-31 14:26:43 +08:00
uye
0207013518 chore: 添加报错信息 #6089 2023-08-26 23:28:40 +08:00
uye
b676bcb564 feat: 添加刷理智任务报错提示 2023-08-19 16:33:33 +08:00
uye
a9995e7b9b feat: 肉鸽开局干员支持点选 is_start 中的干员 2023-08-19 15:24:32 +08:00
uye
185f29293b style: 格式化代码 2023-08-18 10:10:50 +08:00
uye
bc32eb6a98 fix: 定时执行逻辑错误 
fix #5971
 2023-08-18 09:40:29 +08:00
uye
8079ca2bf6 fix: 错误的类型转换 
fix #5940
 2023-08-13 22:44:42 +08:00
uye
fcc8f84290 fix: 修复模拟器关闭逻辑错误，增加模拟器退出错误日志 2023-08-13 22:13:07 +08:00
uye
9032220b10 fix: 关闭模拟器时索引超出了数组界限 
fix #5930
 2023-08-13 15:50:14 +08:00
MistEO
ac9e7a414e fix: build error 2023-08-12 15:13:00 +08:00
uye
a4ecff2b4c Merge branch 'dev' into refactor/TaskQueueViewModel 2023-08-10 15:09:37 +08:00