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,739 Commits 61 Branches 1,839 Tags
3f17fa90277d89b75205ea2b21fb447ea925c91a
Commit Graph

1448 Commits

Author SHA1 Message Date
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
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
MistEO
2602eda49c fix: 修复已修改的语言设置显示不正确的问题 2022-07-27 22:42:10 +08:00
MistEO
a018a63bf4 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-27 22:39:16 +08:00
MistEO
77cc6cfaec style: 牛牛喝酒 2022-07-27 22:39:10 +08:00
Helloworld
56d4b99ed9 ko-kr localization (60%) 2022-07-27 22:31:55 +08:00
Helloworld
358aa534f5 ko-kr localization (40%) 2022-07-27 21:51:52 +08:00
Helloworld
b04e72892f ko-kr localization (20%) 2022-07-27 21:04:16 +08:00
Horror Proton
2b5c38b492 fix: add workaround for issues/1336 2022-07-27 20:58:11 +08:00
Horror Proton
74cef5eee7 perf: remove an unused task, etc. 2022-07-27 20:17:12 +08:00
ABA2396
1eb9d65931 style: 修改美服控件格式 2022-07-27 19:43:29 +08:00
ABA2396
2e8c63ae66 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-27 19:34:00 +08:00
ABA2396
38f11abcaf style: 尝试对齐各版本控件 2022-07-27 19:33:43 +08:00
MistEO
e28ad1744d style: KR, help us! 2022-07-27 19:01:07 +08:00
ABA2396
3a40890603 style: 修改部分翻译描述 2022-07-27 16:52:46 +08:00
ABA2396
ff1a81c3af feat: 添加台服翻譯 2022-07-27 16:17:33 +08:00
ABA2396
5306a54b8f style: 修复copilot界面显示不全的问题 2022-07-27 15:59:26 +08:00
Tastror
0c8d0944bb feat: add ja-jp translation (#1340) 
* add ja-jp

* ja-jp debug
 2022-07-27 15:40:46 +08:00
MistEO
e0330f158f Merge branch 'dev' into dev-1 2022-07-27 14:34:58 +08:00
ABA2396
b2537d0f36 style: en-us 2022-07-27 14:32:56 +08:00
MistEO
befdd26422 style: fix translation 2022-07-27 14:32:02 +08:00
cloakWatcher
8207b337fa Merge branch 'dev' of https://github.com/cloakWatcher/MaaAssistantArknights into dev 2022-07-27 00:09:08 -06:00
cloakWatcher
8197cde605 添加英文翻译参考 2022-07-27 00:08:27 -06:00
ABA2396
f431303fec style: style了个我也看不懂的东西 2022-07-27 13:58:43 +08:00
ABA2396
4468432c3e fix: xml错误 2022-07-27 13:54:56 +08:00
ABA2396
202bd77b81 fix: 字段名错误 2022-07-27 13:48:02 +08:00
ABA2396
e65308e23e feat: 韩语翻译（完全机翻） 2022-07-27 13:31:36 +08:00
MistEO
aef7160c54 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-27 11:26:12 +08:00
MistEO
a6f4bf4d1d style: Add KR and JP language supports, but not complete. And fix some translation 2022-07-27 11:25:54 +08:00
ABA2396
1d5451d3a6 Merge branch 'dev' of https://github.com/MaaAssistantArknights/MaaAssistantArknights into dev 2022-07-27 11:21:09 +08:00