fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 10:10:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,814 Commits 61 Branches 1,839 Tags
cdb2238e5bc9bcbd609663bf38d93a500beedffb
Commit Graph

2814 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lhhxxxxx
cdb2238e5b Merge remote-tracking branch 'origin/dev' into dev 2022-07-30 18:22:10 +08:00
lhhxxxxx
e7658a83a2 Merge remote-tracking branch 'origin/dev' into dev 2022-07-30 18:21:33 +08:00
Horror Proton
6cf5bf0e01 fix: remove a fake error in auto recruit task 2022-07-30 15:57:20 +08:00
MistEO
5565d5ad0a fix: 修复战斗中干员 cooling 状态偶现识别错误问题 2022-07-30 15:55:17 +08:00
zzyyyl
d134905e4f fix: 修复公招文本 出现错误 的本地化问题 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1379
 2022-07-30 15:45:27 +08:00
uye
9fcedbab66 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-30 10:22:57 +08:00
uye
cf124965d7 feat: 添加连接设置提示 2022-07-30 10:20:05 +08:00
uye
a417152a6b feat: 更新作业群 2022-07-30 10:06:37 +08:00
Horror Proton
874e06ccb8 fix: fix wrong behavior when recruit permit ran out 2022-07-30 10:01:59 +08:00
lhhxxxxx
35b91cd217 revert. delete [[nodiscard]] 2022-07-30 06:11:56 +08:00
lhhxxxxx
8a3c5c37da Merge remote-tracking branch 'origin/dev' into dev_ 
# Conflicts:
#	src/MeoAsstGui/ViewModels/VersionUpdateViewModel.cs
 2022-07-30 05:33:11 +08:00
lhhxxxxx
af1c051522 perf. c++ code tidy 2022-07-30 05:31:19 +08:00
MistEO
5168abf0c8 perf: 优化肉鸽压轴登场摆放 2022-07-30 05:04:20 +08:00
MistEO
780e1487fe Merge branch 'dev' v4.2.0-alpha.3 2022-07-30 03:06:49 +08:00
MistEO
b91a3f1812 fix: 修复自选干员重装和术师不选的问题 2022-07-30 03:04:38 +08:00
MistEO
ccd7a34ceb Merge pull request #1372 from MaaAssistantArknights/dev 
Release v4.2.0-alpha.2
v4.2.0-alpha.2 		2022-07-30 02:37:30 +08:00
MistEO
b6c0a7dc6f docs: 更新CHANGELOG 2022-07-30 02:36:47 +08:00
MistEO
147b87c187 fix: 修复界面检查更新错误 2022-07-30 02:36:12 +08:00
zzyyyl
79b26af92c feat: 优化更新时的 Changelog 弹窗样式 (#1373) 
* feat: 优化贡献者名字显示

但是好丑

* feat: 换了个玛丽说好看的 Markdown
 2022-07-30 02:31:14 +08:00
MistEO
09df3c902f feat: 肉鸽下干员等等费用，不急着下 2022-07-30 02:30:55 +08:00
MistEO
5d2935b005 feat: 肉鸽不在需求内的干员排个序（招精二也要优先招等级高的！） 2022-07-30 01:32:38 +08:00
MistEO
7ae266e245 perf: 调整肉鸽一些阈值参数等 2022-07-30 01:18:51 +08:00
MistEO
94a96f7abc fix: 修复肉鸽干员优先级排序错误 2022-07-30 01:18:36 +08:00
MistEO
519dd4b4e1 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-30 00:34:06 +08:00
MistEO
b2cde7665a fix: 修复自定义干员不选的问题，修复临时招募的精二干员不选的问题 2022-07-30 00:33:59 +08:00
MistEO
88fc9ef6fb fix: 修复肉鸽第二次进入商店无法投资时，任务失败的问题 2022-07-30 00:23:37 +08:00
Horror Proton
ba23af1588 fix: fix post processing for recruit min level 2022-07-30 00:10:09 +08:00
lhhxxxxx
61a5d5ba7a Merge pull request #1370 from lhhxxxxx/dev 
style. fix typo
 2022-07-30 00:05:34 +08:00
lhhxxxxx
1c7ef396c2 perf. c# code tidy 
style. typo fixed
 2022-07-30 00:00:45 +08:00
MistEO
04e2723611 fix: 将肉鸽商店购买改成子串匹配即可，防止一些识别错误 2022-07-29 23:35:27 +08:00
lhhxxxxx
a39fec7c37 style. fix typo 2022-07-29 23:01:27 +08:00
MistEO
d91a5439dc style: 添加一个界面小提示 2022-07-29 22:59:56 +08:00
MistEO
56ac2ae2aa Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-29 22:40:31 +08:00
MistEO
c1f4e7f33e fix: 尝试修复肉鸽购买收藏品干员时卡住的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1364
 2022-07-29 22:40:15 +08:00
MistEO
66a1a28d55 fix: 修复肉鸽收藏品购买时卡住的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1367
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1363
 2022-07-29 22:23:28 +08:00
Helloworld
e03282772c docs: README 居中 2022-07-29 22:01:43 +08:00
Helloworld
c9bdde497e docs: 一些小细节 2022-07-29 22:00:29 +08:00
Helloworld
208200e112 docs: README ja-jp 2022-07-29 21:54:47 +08:00
Helloworld
b8e63a1223 styling: C# 代码格式化 (#1368) 
* Add stylecop package

* Reset .editorconfig

* Suppress unnecessary rules

* Replace header

* Fix AsstProxy

* styling: 格式化剩余的文件

* 啊，不对，这才是组织名

* 修复格式
 2022-07-29 21:35:35 +08:00
uye
f59f3d5b41 feat: 商店名单支持多种分隔符 2022-07-29 19:34:25 +08:00
uye
576cf6202c style: 修改部分英文描述 2022-07-29 18:20:37 +08:00
MistEO
5fc56281ba Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-29 17:15:35 +08:00
MistEO
89b1a37972 style: fix traslation. 2022-07-29 17:15:13 +08:00
uye
b671be11f4 feat: 更新肉鸽商品购买优先级顺序 2022-07-29 17:13:55 +08:00
MistEO
974933ba73 merge dev 2022-07-29 17:07:45 +08:00
MistEO
c49c61cd08 style: want a drunk? 2022-07-29 17:06:34 +08:00
uye
1ff174084d fix: 修复一个托盘语言设置界面的bug 2022-07-29 16:19:36 +08:00
MistEO
08d16ae05b perf: 优化肉鸽家门替换 2022-07-29 13:38:37 +08:00
uye
9d6079deff style: 稍微糊一下界面 2022-07-29 04:16:07 +08:00
MistEO
2e9ad73b95 fix: 修复肉鸽干员名不全匹配的问题 2022-07-29 02:12:06 +08:00