fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 02:23:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,163 Commits 62 Branches 1,839 Tags
ea76c837b9f0d3e4c3ddd90845bcb26d2f067458
Commit Graph

160 Commits

Author SHA1 Message Date
Lancarus
324c550b79 feat: 优化萨米肉鸽逻辑 2023-10-04 02:09:00 +08:00
Sherkey
31c2e08856 Merge branch 'MaaAssistantArknights:dev' into dev 2023-09-30 20:56:34 +08:00
uye
0acaef9c33 Merge branch 'dev' into dev 2023-09-29 23:15:26 +08:00
Lancarus
d5cfd6e147 feat：肉鸽刷源石锭模式添加是否去第二层的选项 2023-09-29 02:16:05 +08:00
uye
ed6fa41dc9 feat: 公告弹窗 (#6557) 2023-09-28 09:24:29 +08:00
Cryolitia
45af5d7c41 Merge remote-tracking branch 'upstream/dev' into config-refector 
# Conflicts:
#	src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
 2023-09-27 18:47:16 +08:00
uye
f23db66996 feat: 公告弹窗 2023-09-27 17:12:05 +08:00
Cryolitia
07e4cfbbf9 refactor: config 
Signed-off-by: Cryolitia <cryolitia@gmail.com>
 2023-09-27 03:37:51 +08:00
SherkeyXD
75640bc04a Revert "refactor: 迁移部分设置判断到SettingsViewModel" 
This reverts commit a6bd83e248.
 2023-09-26 20:11:18 +08:00
uye
819748ee2f style: Convert into constant，统一注释 2023-09-26 17:47:58 +08:00
uye
0da6a0a0bb style: 修正错误单词，修改示例 2023-09-26 16:33:56 +08:00
uye
3005f5593f style: 规范变量命名，修正错误变量名，修正错误注释 2023-09-26 16:03:05 +08:00
SherkeyXD
2f87337235 refactor: 是否显示精二干员开局由binding判断 2023-09-26 15:50:35 +08:00
SherkeyXD
a6bd83e248 refactor: 迁移部分设置判断到SettingsViewModel 2023-09-26 15:45:15 +08:00
SherkeyXD
403003ffae feat: 非水月肉鸽不显示刷新商店获取指路鳞选项 2023-09-25 23:43:53 +08:00
uye
2f5b58c6f5 perf: 优化部分 WPF 代码 2023-09-24 13:50:38 +08:00
Lancarus
a6fb861fd2 fix: 修复凹直升模式造成的bug 2023-09-23 23:21:29 +08:00
Lancarus
1ed73d9e08 fix: 修复凹直升模式造成的bug 
feat：优化凹直升的ui显示
 2023-09-23 23:19:03 +08:00
MistEO
d4fef50852 feat: 在非烧水模式，取消刷直升按钮 (#6484) 2023-09-23 17:55:31 +08:00
youqii
360850a5c4 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
mole828
20bf248ee7 #fix 隐藏与否弄反了 2023-09-23 00:32:50 +08:00
mole828
ede0e2a146 feat: 在非烧水模式，取消刷直升按钮 2023-09-22 23:06:55 +08:00
uye
a04f1b3478 feat: 开始唤醒-账号切换新增手动切换，可单独执行开始唤醒流程 (#6433) 
- close #6431
 2023-09-22 22:55:08 +08:00
Lancarus
282fd5e35b feat: 增加肉鸽凹开局直升 2023-09-19 16:29:16 +08:00
status102
7382c9dae1 feat: 开始唤醒-账号切换新增手动切换，可单独执行开始唤醒流程 2023-09-18 16:58:04 +08:00
Liam Sho
cd9b8a5089 fix: #6349 put external notification job in dedicated async task context 2023-09-17 16:11:02 +08:00
MistEO
a701c444e9 fix: warnings 2023-09-12 22:16:54 +08:00
Liam Sho
244205b972 fix: send test button status wont change 2023-09-12 21:48:07 +08:00
Liam Sho
9f20fe9241 feat: add external notification 2023-09-12 20:23:16 +08:00
Liam Sho
d604a3ced6 Merge branch 'dev' into feat/notifications 2023-09-12 16:13:05 +08:00
MistEO
9f33650591 Merge branch 'dev' into dev_account_switch 2023-09-11 22:46:05 +08:00
MistEO
1244ad656b feat: 基建支持加工站 2023-09-11 22:40:34 +08:00
MistEO
b325ed64d3 feat: update local resource by etag (#6283) 2023-09-09 23:33:45 +08:00
status102
f5d49e6eb5 feat: 新增 官服、B服 账号切换功能 2023-09-09 14:47:30 +08:00
uye
4da676a883 feat: 可自选日志日期显示格式 2023-09-08 18:21:47 +08:00
Liam Sho
48e9b44f8e feat: add serverchan config ui 2023-09-07 21:43:54 +08:00
MistEO
308a50d415 feat: 注册表查询bluestacks hyper-v的conf位置 (#6083) 2023-08-31 22:00:03 +08:00
Gliese129
c7da8167bd optimized the way of testing adb port 2023-08-29 20:35:16 +09:00
uye
432b47bd4f chore: 合并关闭+重启方法 2023-08-26 13:22:54 +08:00
Gliese
12e54f6cdf Merge branch 'MaaAssistantArknights:dev' into dev 2023-08-25 22:55:36 +09:00
Lancarus
a4ca7c5315 feat: 增加烧开水功能，优化萨米肉鸽策略 (#6053) 2023-08-25 14:00:44 +08:00
David
afbd1bff50 Update src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs 
Very clean! Thank you for the heads up

Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
 2023-08-22 17:04:39 +02:00
David
c9513e7a52 feat: event/pool display follows current time 2023-08-22 13:23:51 +02:00
Gliese129
7afd82bd0e use register key to detect bs config 2023-08-21 22:45:55 +09:00
Gliese
ada5ba7892 Merge branch 'MaaAssistantArknights:dev' into dev 2023-08-20 11:03:59 +09:00
uye
af5ec664ab feat: 肉鸽开局干员支持点选 is_start 中的干员 2023-08-19 15:24:32 +08:00
Gliese
8c326bf40a add default bluestacks.conf 2023-08-07 18:12:44 +08:00
MistEO
cd01f17705 Merge branch 'dev' into refactor/TaskQueueViewModel 2023-08-06 20:08:19 +08:00
uye
3299c408a3 feat: 增加强制替换adb的信息提示，增加异常处理 2023-08-05 12:17:45 +08:00
MistEO
8f89e9d5a6 Revert "feat:自动检测特定目录下的bluestacks.conf" (#5794) 2023-08-04 23:02:29 +08:00