fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 02:10:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
11,900 Commits 61 Branches 1,838 Tags
ed1650f7dd02be68070bf25b9a71ea7f0cfcb90a
Commit Graph

5722 Commits

Author SHA1 Message Date
uye
8eaebc9565 chore: 优化弹窗判断逻辑 2024-07-19 23:35:08 +08:00
pre-commit-ci[bot]
21837606dd chore: Auto update by pre-commit hooks [skip changelog] 2024-07-19 03:48:02 +00:00
Hao Guan
75e1ca75d7 feat: Mac GUI 支持萨卡兹肉鸽、开始/停止任务快捷键 2024-07-19 09:45:35 +08:00
DavidWang19
32ee1e8292 fix: 修复萨卡兹肉鸽卡死在结算界面的问题 2024-07-18 14:20:41 +01:00
DavidWang19
cd93a480be fix: 修复萨卡兹肉鸽商店不能刷新的问题 2024-07-18 13:11:32 +01:00
DavidWang19
63e4c17ebc fix: 修复肉鸽关卡通用策略无法识别费用的问题 2024-07-18 12:40:39 +01:00
status102
b78f6ed14f perf: 自动战斗-战斗列表 批量导入关卡名正则优化 (#9723) 2024-07-18 19:14:58 +08:00
status102
d1183830bd perf: 自动战斗-战斗列表 批量导入关卡名正则优化 2024-07-18 18:30:09 +08:00
uye
90afff247e chore: 添加弹窗提示 2024-07-18 13:56:34 +08:00
Constrat
2974799ff0 i18n: en tweaks 
[skip changelog]
 2024-07-17 21:38:17 +02:00
Constrat
586fde6d7b i18n: more tweaks 
[skip changelog]
 2024-07-17 21:33:05 +02:00
Constrat
57ff21e4bd i18n: EN tweak 
[skip changelog]
I swear webplate is more of a hassle then a help.
Correct translations are changed with wrong ones.
 2024-07-17 21:32:21 +02:00
Constrat
ae1f95b0f2 chore(i18n): Sami no longer beta 
[skip changelog] [no ci]
 2024-07-17 21:21:45 +02:00
DavidWang19
07487cd476 feat: 适配萨卡兹肉鸽 (#9677) 
* feat: 适配萨卡兹肉鸽

---------

Co-authored-by: 晓丶梦丶仁 <74444214+Daydreamer114@users.noreply.github.com>
Co-authored-by: SherkeyXD <57581480+SherkeyXD@users.noreply.github.com>
Co-authored-by: Lemon-miaow <61692393+Lemon-miaow@users.noreply.github.com>
Co-authored-by: Weiyou Wang <blspgzs@gmail.com>
 2024-07-17 15:56:16 +01:00
uye
368743a8fd style: 优化格式 2024-07-17 10:59:14 +08:00
uye
3861c2194b fix: 修改材料名称注释 2024-07-17 10:23:35 +08:00
status102
5197df6b6b perf: 复用RoguelikeCollapsalParadigmTaskPlugin插件 (#9682) 2024-07-17 05:17:41 +10:00
Loong
5f86aeb675 chore: bump maa-cli to 0.4.8 and update documents (#9683) 
* chore: bump maa-cli to 0.4.8 and update documents

* docs: 合并 cli 文档中的 README 和 intro

* docs: fix broken link to CLI guide

* docs: update order of CLI manual pages
 2024-07-16 18:39:02 +01:00
ManicSteiner
ba89c043ff chore: update ja-jp.xaml 2024-07-16 17:36:58 +01:00
Rbqwow
fea4919eaf docs: 修复被随机排序破坏的超链接 2024-07-16 18:08:35 +08:00
Weiyou Wang
aed0872dc1 refactor: 萨米肉鸽配置文件/插件单独文件夹 (#9651) 
* refactor: sami roguelike plugins
 2024-07-16 00:32:58 +01:00
uye
eb1055f1b1 chore: 优化更新策略 2024-07-15 16:35:01 +08:00
uye
64bfa62904 fix: test data 2024-07-15 14:52:55 +08:00
uye
f91cb96ffa chore: 更新部分配置修改为全局配置 2024-07-15 14:50:37 +08:00
uye
2aa3dfa182 chore: 优化版本更新 2024-07-15 12:56:01 +08:00
uye
dbf21efdcd chore: make AskRestartToApplySettingsYoStarEN static 2024-07-15 12:56:00 +08:00
Weiyou Wang
e622790fb9 refactor: 统一肉鸽模式介绍文字 (#9669) 2024-07-15 05:41:54 +01:00
status102
d1586de3d5 docs: 修改Task协议文档，以符合cache默认值 2024-07-14 20:19:50 +08:00
Hao Guan
083c22e398 feat: Mac GUI 添加萨米肉鸽策略 2024-07-14 13:18:01 +08:00
status102
1be6265bbb fix: 自动战斗开始时移除召唤物类头像缓存，以避免跨局错误识别相似技能的召唤物 (#9649) 
* fix: 自动战斗开始时移除召唤物类头像缓存，以避免跨局错误识别相似技能的召唤物

* chore: description
 2024-07-13 22:53:04 +08:00
DavidWang19
4fe6ce0eb4 feat: WPF Gui support for roguelike collapsal paradigm task plugin (#9648) 
* feat: WPF Gui support for roguelike collapsal paradigm task plugin
 2024-07-13 14:34:36 +01:00
Constrat
32b0d9aa1c chore: link for yostaren resolution 
[skip changelo]
 2024-07-13 14:14:12 +02:00
zzyyyl
4582dec4d6 fix: 修复连接前同步参数时日志报错的问题 (#9644) 
m_controller is not inited
 2024-07-13 10:02:16 +08:00
zzyyyl
c9a9a8a4cc feat: cache 统一默认为 false (#9642) 
workaround for #9639

之后删了
 2024-07-13 08:10:00 +08:00
zzyyyl
2b040b16ad feat: 重新加入 tasks.json 的默认值检查 (#9583) 2024-07-13 08:08:06 +08:00
Alisa
c6100e8636 i18n: Translations update from MAA Weblate (#9640) 
* i18n: Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (723 of 723 strings)

Translation: MAA Assistant Arknights/WPF GUI
Translate-URL: https://weblate.maa-org.net/projects/maa/wpf-gui/zh_Hans/

* i18n: Translated using Weblate (English (United States))

Currently translated at 99.1% (717 of 723 strings)

Translation: MAA Assistant Arknights/WPF GUI
Translate-URL: https://weblate.maa-org.net/projects/maa/wpf-gui/en_US/

* i18n: Translated using Weblate (Japanese)

Currently translated at 99.1% (717 of 723 strings)

Translation: MAA Assistant Arknights/WPF GUI
Translate-URL: https://weblate.maa-org.net/projects/maa/wpf-gui/ja/

* i18n: Translated using Weblate (Korean)

Currently translated at 99.4% (719 of 723 strings)

Translation: MAA Assistant Arknights/WPF GUI
Translate-URL: https://weblate.maa-org.net/projects/maa/wpf-gui/ko/

---------

Co-authored-by: Rbqwow <Rbqwow@users.noreply.weblate.maa-org.net>
 2024-07-12 23:26:24 +08:00
zzyyyl
fd6df3faff feat: 由ci生成的非正式/公测/内测版判断为调试版本并且不再检查更新 (#9632) 
close #7712

Fix of #7719
 2024-07-12 23:09:47 +08:00
zzyyyl
9fc24ce8d2 feat: 隐式空 text 检测仅对无基任务生效 2024-07-12 20:40:19 +08:00
status102
5271e0e7e7 perf: add log output (#9636) 2024-07-12 19:36:46 +08:00
Weiyou Wang
b45d424e0c fix: 修复萨米肉鸽因插件注册顺序导致的无法运行问题 (#9633) 
* fix: m_roguelike_register_plugins

* refactor: !(A == B) --> (A != B)
 2024-07-12 17:57:09 +08:00
SherkeyXD
cbbb610c44 feat: 为调试版本添加无需更新的提示 2024-07-12 12:33:39 +08:00
SherkeyXD
1ddda21ef0 feat: 由ci生成的非正式/公测/内测版判断为调试版本并且不再检查更新 
Co-authored-by: zzyyyl <aysyxx53@hotmail.com>
 2024-07-12 12:33:31 +08:00
Constrat
2b9518eab4 Style/gui consistency (#9567) 2024-07-11 18:26:33 +01:00
Weiyou Wang
c2319beb22 fix: 修复坍缩范式插件导致的Gui和傀影/水月肉鸽初始化Bug (#9573) 
* fix: call Clp_Pd plugin function directly from Encounter & FoldartalUse plugins

* refactor: 去除 tasks.json 中的冗余

* fix: 修正坍缩范式插件对banner文字位置的判断

* refactor: get_rare_clp_pds直接使用find结果返回

* refactor: delete code for debug

* refactor: 减少hard coding

* refactor: 减少hard coding

* refactor: use canonical debug mode

* refactor: add explanation for m_need_check_panel in comment

* fix: 日版翻译更正 thanks to @Manicsteiner

* refactor: refine the condition for using clp_pd_plugin in *.cpp files

* refactor: refine condition check for enabling clp_pd_task plugin

* refactor: change back to ASST_DEBUG
 2024-07-12 01:12:02 +08:00
Sherkey
4c97f0c97b refactor: 肉鸽资源加载逻辑及目录结构重构 (#9555) 
Todos:
~~+ [ ] autocopilot 也重构一下~~
+ [x] encounter 采用类似 tasks.json 的覆盖模式，各个模式的事件配置覆盖到 `default.json` 上面
+ [x] 肉鸽插件加载主题化（待定）
+ [x] Wait for #9561
 2024-07-11 20:11:45 +08:00
Weiyou Wang
1d1e6e0c4a refactor: 肉鸽根据主题选择加载的插件 2024-07-11 14:04:16 +08:00
Weiyou Wang
841b464746 refactor: 重构肉鸽不期而遇策略的加载与使用 2024-07-11 14:03:44 +08:00
Weiyou Wang
e2606f4620 fix: allow CMake build MaaCore with ASST_DEBUG under macOS 2024-07-11 00:02:39 +08:00
dantmnf
5a89cafe8e fix: leak fastdeploy objects to avoid crash 2024-07-10 14:44:39 +08:00
uye
57e9a4d1ef chore: 增加 ResourceUpdater 日志 2024-07-10 11:25:50 +08:00