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
2,781 Commits 61 Branches 1,836 Tags
56ac2ae2aa80bc0eb37a23a97b353fffccfda79e
Commit Graph

2781 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Liam Sho
94e79032dc chore: revert #1320 2022-07-29 01:46:51 +08:00
MistEO
209f555a14 Merge pull request #1344 from MaaAssistantArknights/feat/custom_roguelike 
feat: custom roguelike
 2022-07-29 01:27:36 +08:00
MistEO
985abc7078 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-29 01:27:12 +08:00
MistEO
86ce47b468 docs: update changelog 2022-07-29 01:27: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
Alisa
e03f2eed73 Merge pull request #1358 from MaaAssistantArknights/feat/release-simulation 
[CI] Release Simulation workflow
 2022-07-29 00:55:50 +08:00
MistEO
227a3d2af3 feat: 肉鸽商店支持按优先级购买 2022-07-29 00:37:27 +08:00
bakashigure
6c45b02132 chore: 修改NoAvx包名 2022-07-28 23:53:28 +08:00
Liam Sho
29a1b1fbc3 fix: 修复版本号丢失问题 
笨逼操作又来了（
 2022-07-28 23:26:05 +08:00
Liam Sho
e8982c78c1 chore: 更新 Workflow 2022-07-28 23:11:43 +08:00
Liam Sho
89381b7926 feat: 支持手动触发构建 Release 包 2022-07-28 23:10:21 +08:00
Helloworld
ece8ec7099 i18n: 修正错字 2022-07-28 22:25:28 +08:00
MistEO
4fa3e60150 perf: 优化肉鸽干员攻击范围计算、及一些部署逻辑等 2022-07-28 22:24:02 +08:00
Helloworld
d090a27275 不好意思忘了加链接了 2022-07-28 21:54:47 +08:00
MistEO
d9837786fb perf: 删除所有肉鸽中不好用的干员 2022-07-28 21:54:42 +08:00
Helloworld
65fa3a89c3 i18n: README zh-TW 2022-07-28 21:50:54 +08:00
Helloworld
3f17fa9027 i18n: 修改README文件后缀 2022-07-28 21:10:38 +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
4f4b36336a feat: 删除无用的模板图片 2022-07-28 18:01:58 +08:00
ABA2396
825aec81b5 feat: 删除不必要的滑动 2022-07-28 17:56:42 +08:00
ABA2396
60d7055eaf Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-28 17:49:36 +08:00
ABA2396
84130ca426 feat: 支持主线全章节导航 2022-07-28 17:41:29 +08:00
Alisa
d8c1414d98 Merge pull request #1345 from MaaAssistantArknights/fix/release-checksum 
修改 Checksum 的计算方式
 2022-07-28 17:30:07 +08:00