fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 18:47:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,571 Commits 60 Branches 1,840 Tags
de49f4b763d7a940ec0cea40cb06ccd82c8be31e
Commit Graph

3571 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MistEO
de49f4b763 fix: 调整基建控制中心歌蕾蒂娅的效率计算 
link to https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1800
 2022-09-11 02:15:43 +08:00
MistEO
6f2445844a fix: 修复仓库识别错误 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1795
 2022-09-11 02:05:57 +08:00
MistEO
4e61686e18 fix: 初步优化仓库数字ROI检测错误 2022-09-10 23:52:40 +08:00
Horror Proton
b46d12ad6a fix: fix return types 2022-09-10 23:23:27 +08:00
zzyyyl
d74ed5ed09 fix: fix relwithdebinfo build error 
(cherry picked from commit 2650af0c750db7c6a01ccdfcce9256fdb7fe1168)
 2022-09-10 22:50:12 +08:00
Horror Proton
381cc9bbb9 fix: add replace map for AutoRecruitTask::check_timer 
https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1798
 2022-09-10 19:39:09 +08:00
Tastror
c15bbf866a style & doc: 更新样式与错误描述 2022-09-10 16:43:48 +08:00
Tastror
501c853fd6 docs: 修改部分文本 2022-09-10 16:23:10 +08:00
Tastror
5174e3ea8e Merge remote-tracking branch 'refs/remotes/origin/dev' into dev 2022-09-10 16:08:04 +08:00
Tastror
6400976f24 docs(fix): 修改常见问题的uri，并添加多语言uri跳转 2022-09-10 16:04:35 +08:00
zzyyyl
7a5cb927e3 perf: 小优化 
(cherry picked from commit 7a7e947a9d)
 2022-09-10 13:14:54 +08:00
Helloworld
36d6db117f docs: 添加zh-tw文档 2022-09-09 22:41:55 +08:00
MistEO
c42128ee68 perf: 优化调用命令时的日志 2022-09-09 22:03:57 +08:00
zzyyyl
6225a2e819 style: format 2022-09-09 20:52:24 +08:00
zzyyyl
6ea48f69d8 perf: 继续修复连接时间过长的问题 
fix 83d6b7b738
 2022-09-09 20:48:44 +08:00
Helloworld
d3fc19d018 docs: 同步zh-tw的README 2022-09-09 20:36:18 +08:00
MistEO
4c6edc130f Merge pull request #1786 from BombaxCeiba/fix_cmake 
chore:修复在Windows下因CMake脚本缺少宏定义导致构建失败的问题
 2022-09-09 20:05:31 +08:00
MistEO
b4f30a00fd perf: 优化调整 但书 和 玛恩纳 基建效率 2022-09-09 20:05:04 +08:00
zzyyyl
83d6b7b738 fix: 修复连接时间过长的问题 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1789
 2022-09-09 15:59:41 +08:00
Helloworld
e6ee4bbac4 docs: 同步README 2022-09-09 15:28:44 +08:00
Helloworld
f50966735f docs: 同步en-us文档 2022-09-09 15:28:44 +08:00
Horror Proton
ced63a522e fix: fix compile error 
revert: ddedf824c0
fix: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1791
 2022-09-09 14:39:09 +08:00
Helloworld
2ff4c034d9 docs: 更新README_en-US.md 2022-09-09 14:25:27 +08:00
Tastror
ed7b9d4521 Merge pull request #1787 from wallsman/patch-4 2022-09-09 10:07:39 +08:00
Wallsman
0d6354d596 Fixed and Tweaked. 
The text was cut down to fit the UI.(一部をUIの表示幅に合わせて微調整) / Fixed wrong argument.（公開求人タブの項目が新規UIの引数に替わっていなかったのを修正）/　Added Depot Recognition was missing in its entirety.（Depot Recognitionがまるまる抜け落ちていたのを追加。）
 2022-09-09 02:30:05 +09:00
Dusk_NM02
864ec70796 chore: CMake仅在WIN32下定义UNICODE相关宏 2022-09-09 00:48:19 +08:00
Dusk_NM02
1def108445 chore: 移除NDEBUG宏 2022-09-08 23:08:22 +08:00
zzyyyl
0817a9e57c style: 增加一些 clang-format 15 新配置 2022-09-08 23:08:14 +08:00
Dusk_NM02
112861e3be chore: 修复在Windows下使用CMake构建失败的问题 2022-09-08 22:25:55 +08:00
MistEO
3de7b3409c Merge pull request #1785 from MaaAssistantArknights/master 
Release v4.4.0
v4.4.0 		2022-09-08 21:11:52 +08:00
MistEO
85d2a99488 Merge pull request #1784 from MaaAssistantArknights/dev 
Release v4.4.0-rc.1
v4.4.0-rc.1 		2022-09-08 16:28:09 +08:00
MistEO
32a6377e31 docs: update changelog 2022-09-08 16:27:35 +08:00
MistEO
7b678475bd chore: 更新泰迪仓库里的资源 + 企鹅的关卡资源 2022-09-08 16:17:30 +08:00
MistEO
ef02b1a886 fix: 修复自动战斗自动编队时最右侧的干员识别不到的问题 2022-09-08 13:24:59 +08:00
Tastror
1036ffb746 docs: 日语文本小修订2 2022-09-08 01:57:26 +08:00
Tastror
ffaf93cd60 docs: 日语文本小修订 2022-09-08 01:49:11 +08:00
Tastror
93a29e28c8 docs: 更新readme跳转显示 2022-09-08 01:47:20 +08:00
Tastror
7cd77b9d18 Merge pull request #1775 from wallsman/patch-3 
docs: Update ja-jp.xaml
 2022-09-08 01:42:52 +08:00
MistEO
71fa8e0cda Merge pull request #1783 from MaaAssistantArknights/dev 
Release v4.4.0-beta.3
v4.4.0-beta.3 		2022-09-08 01:09:42 +08:00
MistEO
de31a644b1 docs: update CHANGELOG 2022-09-08 01:09:13 +08:00
MistEO
0d7c137b2b docs: update changelog 2022-09-08 01:08:29 +08:00
Tastror
db4bff8774 Merge branch 'dev' into patch-3 2022-09-08 01:03:01 +08:00
MistEO
a980a5517a fix: 修复自动战斗编队点错位置的问题 2022-09-08 00:59:58 +08:00
Tastror
51a294b78d Merge branch 'dev' into patch-3 2022-09-08 00:55:28 +08:00
MistEO
f6ca683366 feat: 新增仓库识别 UI 2022-09-08 00:40:08 +08:00
MistEO
14d4b0b87e feat: 修改本地化翻译的读取逻辑 2022-09-07 23:43:03 +08:00
MistEO
b82247b90e fix: 再次修复界面自定义关卡名和其他选项排列组合的错误 2022-09-07 22:51:56 +08:00
MistEO
45e4f01d8b fix: 修复手动输入关卡选项和其他选项排列组合时的界面显示问题 2022-09-07 22:29:55 +08:00
MistEO
cd5ea8754b fix: 修复自定义关卡选项切换不实时生效的问题 2022-09-07 22:18:46 +08:00
MistEO
81b6f1ff77 feat: 界面新增支持手动输入关卡ID 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1776
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1778
 2022-09-07 22:14:57 +08:00