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
11,811 Commits 60 Branches 1,840 Tags
57ff21e4bd82f5e11bfbb188621bd9349775c69a
Commit Graph

5711 Commits

Author SHA1 Message Date
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
ChingCdesu
c0eeab9732 pref: 将Head和ETag请求设置为Connection: close 2024-07-10 10:08:57 +08:00
Alisa
e1eb6bcd88 i18n: Translations update from MAA Weblate (#9598) 
* Translated using Weblate (Chinese (Traditional))

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_Hant/

* Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (579 of 579 strings)

Translation: MAA Assistant Arknights/Glossary
Translate-URL: https://weblate.maa-org.net/projects/maa/glossary/zh_Hant/

---------

Co-authored-by: momomochi <as99us301@gmail.com>
 2024-07-10 09:43:19 +08:00
Horror Proton
d14c2dfd49 fix: fix typings in Recruit task 
fix: https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/9517
 2024-07-09 00:31:49 +08:00
EvATive7
e6555b4e44 chore: update python API (#9538) 
* chore: update python API

* fix: remove non-exist return value

* style: docstring of param of set_static_option

* feat: python API get_image
 2024-07-08 21:52:01 +08:00
Constrat
cb0d64a3cf refactor: Yostar interface consistency 
[no ci] [skip changelog]
 2024-07-07 21:37:41 +02:00
SherkeyXD
b26ea061a1 refactor: 重构肉鸽不期而遇策略的目录格式 2024-07-08 03:30:24 +08:00
SherkeyXD
2165d9a7d7 chore: 规范化肉鸽策略命名 2024-07-08 03:29:42 +08:00
Constrat
7f188eb09e refactor: YoStar -> Yostar only for interfaces (#9548) 2024-07-07 21:28:16 +02:00
Rbqwow
fde413a32e fix: wrong proxy detection 2024-07-08 03:27:52 +08:00
uye
67bbf9aac5 refactor: website docs **translation needed** (#9287) 
Co-authored-by: wlwxj <d1ve_wh4le@outlook.com>
Co-authored-by: Rbqwow <55343783+Rbqwow@users.noreply.github.com>
Co-authored-by: Constrat <56174894+Constrat@users.noreply.github.com>
Co-authored-by: HX3N <scarlet7518@gmail.com>
Co-authored-by: Wallsman <63186641+wallsman@users.noreply.github.com>
Co-authored-by: Loong <wangl.cc@outlook.com>
Co-authored-by: 神代綺凛 <i@loli.best>
Co-authored-by: SherkeyXD <57581480+SherkeyXD@users.noreply.github.com>
 2024-07-08 01:57:20 +08:00
Sherkey
666b0076d1 feat: 增加识别坍缩范式的插件，增加萨米肉鸽刷隐藏坍缩范式模式 (#9172) 
### 更新功能

1. 增加`RoguelikeMode::CLP_PDS = 5`作为萨米肉鸽刷隐藏坍缩范式的模式，可且仅可用于萨米肉鸽。

在此模式下，将在每次回到关卡选择界面时检查坍缩状态，同时会优先使用带有`_collapse`后缀的战斗部署方案，也会使用特有的不期而遇和购物设置。

2. 肉鸽任务新增以下参数：
- `check_collapsal_paradigms`：是否检查坍缩范式，若`mode = 5`则默认为`true`，否则为`false`。
- `double_check_collapsal_paradigms`：是否增加对坍缩范式的检查频率，若`mode =
5`则默认为`true`，否则为`false`。
- `expected_collapsal_paradigms`：需要刷的坍缩范式，若`mode = 5`则默认为两组隐藏坍缩范式。
- `use_foldartal`：是否使用密文板，若`mode = 5`则默认为`false`，否则为`true`。

### 机制介绍

本插件将以两种不同的手段检查坍缩范式：

- 在选关界面点击屏幕中上方展开坍缩状态栏（以下称`Panel Check`）；
- 观察屏幕右侧是否有坍缩范式通知（以下称`Banner Check`）。

获取坍缩值的方法多种多样，本插件考虑到了以下情况：

1. 战斗后因非完美战斗而使坍缩值增加，进行`Banner Check`。
2. 战斗后因获得收藏品而使坍缩值变动，进行`Banner Check`。
3. 在不期而遇等（MAA中失与得等节点也会触发不期而遇插件）节点中使坍缩值变动，进行`Banner Check`。
4. 再诡异行商节点中因购买收藏品而使坍缩值变动，进行`Banner Check`。
5. 因使用密文版而使坍缩值减少，进行`Banner Check`。
6. 因进入新的一层而使坍缩值增加，进行`Panel Check`。
7. 若进行`Banner
Check`时发现坍缩范式消退，因不知道会不会一次性消退两层（即便会也概率极低），会在下一次回到选关洁面的时候额外触发一次`Panel
Check`。
8. 在`double_check_collapsal_paradigms =
true`的情况下，每次回到选关界面的时候都会额外触发一次`Panel
Check`以验证是否之前有漏、多记录坍缩范式，并以回调信息的形式传回Debug信息。

**注意事项**

1.
为了防止错过坍缩范式通知，会适当sleep，若检测到屏幕下方有`正在提交反馈至神经`的提示的话会额外sleep。所以开启检查坍缩范式的功能后整体流程会变得拖沓一些（目前在我本人可接受范围内）。
2.
在`RoguelikeMode::CLP_PDS`模式下，获得不需要的坍缩范式会直接重开，遇到需要的坍缩范式则会停止任务。理论上可能在不期而遇事件中获得了不需要的坍缩范式，但因为右上角没有退出按钮而没有及时重开。但我目前没有观察到这样的情形，故没有做处理。不放心的话请设置`double_check_collapsal_paradigms
= true`，等回到选关界面后再检查一遍已获得的坍缩范式。
3.
无论如何，强烈推荐开启`double_check_collapsal_paradigms`。慢点就慢点，求稳才是关键。在我本人测试的过程中，遇到过一两次遗漏`Banner
Check`的情况（截图错过了右上角通知），幸好在额外触发的`Panel
Check`中补上了。怀疑是系统卡顿或网络延迟所致（我在澳大利亚用着MBP2017开着MUMU+MAA刷官服，时间长了后模拟器本身就偶尔会卡住）。

### 回调信息

当`check_collapsal_paradigms == true`时会输出类似于下方的回调信息：
```C++
callback(AsstMsg::SubTaskExtraInfo, json::object { 
    { "what", "RoguelikeCollapsalParadigms" },
    { "details", json::object {
        { "cur", "目空一些" },
        { "deepen_or_weaken", 1 },
        { "prev", "睁眼瞎" }
    } }
});
```
其中`deepen_or_weaken = 1`代表坍缩范式从`prev`加深至`cur`，若`deepen_or_weaken =
-1`则代表坍缩范式消退。
偶尔也会有测试信息以`deepen_or_weaken = 0`被传回，主要用于我自己测试用。

### 任务设置范例

以下是我的测试用任务设置：
```Python
asst.append_task('Roguelike', {
    'theme': 'Sami',
    'mode': 5,
    'investment_enabled': False,
    'squad': '远程战术分队',
    'roles': '稳扎稳打',
    'core_char': '维什戴尔',
    # 'expected_collapsal_paradigms': ['趋同性消耗'],
    # 'check_collapsal_paradigms': True, # 在mode = 5时默认为True
    double_check_collapsal_paradigms': True, # 建议打开，以防万一错过了什么
    # 'use_foldartal': False # 在mode = 5时默认为False
})
```
建议在难度10刷隐藏坍缩，我只做了第一层的漏怪作业且以`维什戴尔`为战斗核心。

### To-Do(s)

- [ ] 补充相关文档 （要不就把上述文字作为文档吧？）

### Need Help

- [ ] 外服适配
- [ ] UI适配

---

小孩子不懂事乱写的代码，请各位多指教。
 2024-07-07 20:56:14 +08:00