Commit Graph

1478 Commits

Author SHA1 Message Date
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
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
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
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
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
89b1a37972 style: fix traslation. 2022-07-29 17:15:13 +08:00
MistEO
c49c61cd08 style: want a drunk? 2022-07-29 17:06:34 +08:00
uye
9d6079deff style: 稍微糊一下界面 2022-07-29 04:16:07 +08:00
MistEO
f028e3222b style: add a tip 2022-07-29 01:09:00 +08:00
MistEO
6918225a80 feat: 主页清空按钮也会清掉肉鸽的选择 2022-07-29 01:06:06 +08:00
MistEO
44c599e843 merge: merge dev 2022-07-29 01:05:50 +08:00
MistEO
9ec3b9bb60 feat: 修改界面,适配新肉鸽参数 2022-07-29 00:57:54 +08:00
MistEO
227a3d2af3 feat: 肉鸽商店支持按优先级购买 2022-07-29 00:37:27 +08:00
MistEO
4fa3e60150 perf: 优化肉鸽干员攻击范围计算、及一些部署逻辑等 2022-07-28 22:24:02 +08:00
Helloworld
311518a5bf i18n: 一些小修改 2022-07-28 20:52:46 +08:00
Helloworld
4cca3898ae Merge remote-tracking branch 'origin/dev' into dev 2022-07-28 20:47:32 +08:00
Helloworld
aa7502ec5a ko-kr localization (100%) 2022-07-28 20:46:45 +08:00
MistEO
61580ea1c5 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-28 20:36:37 +08:00
MistEO
c9eb0aeb1a fix: 修复会客室传递线索时卡住的问题
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1307
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1175
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/768
2022-07-28 20:36:26 +08:00
MistEO
3cdead1ade Merge pull request #1327 from horror-proton/test/recruit_task
重构公招相关的部分代码
2022-07-28 19:03:22 +08:00
MistEO
c58026055d style: fix translation 2022-07-28 18:49:05 +08:00
ABA2396
839b5234b5 fix: 修复一个牛牛引起的错误(x) 2022-07-28 16:57:27 +08:00
ABA2396
686836247d feat: Drink drink 2022-07-28 15:34:08 +08:00
ABA2396
0bdec005f9 style: 肉鸽任务中的拼写错误 2022-07-28 11:45:36 +08:00
ABA2396
d77392365f style: Format XAML again 2022-07-28 11:14:57 +08:00
ABA2396
5d9f9ede24 style: Fromat XAML 2022-07-28 11:05:54 +08:00
ABA2396
5f7df65b0d style: 更改FightSettings控件布局 2022-07-28 10:55:13 +08:00
ABA2396
9250f6d2f4 style: GUISetting 2022-07-28 02:31:20 +08:00
ABA2396
0435c9a3da style: StartSetting 2022-07-28 02:08:41 +08:00
ABA2396
52506a76c3 style: ConnectSetting 2022-07-28 02:02:06 +08:00
ABA2396
d798a1f7b2 style: MallSetting 2022-07-28 01:48:54 +08:00
ABA2396
da7fce722b style: AutoRecruitSetting 2022-07-28 01:39:07 +08:00
ABA2396
938ab1308e style: RougleliekSetting (什么奇怪的拼写) 2022-07-28 01:14:27 +08:00
ABA2396
2a2666a35c style: FightSetting 2022-07-28 00:50:19 +08:00
MistEO
8d0b2b1e85 feat: 完成自定义核心干员选择 2022-07-28 00:37:20 +08:00
MistEO
562ede03bf feat: 添加战斗资源读取 2022-07-27 23:15:39 +08:00
Helloworld
012dc56989 Merge remote-tracking branch 'origin/dev' into dev 2022-07-27 23:01:06 +08:00
Helloworld
1ccbfb4622 ko-kr localization (70%) 2022-07-27 23:01:00 +08:00