Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/script-guide/maa.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ MAA 是一个明日方舟第三方软件,能够轻松完成明日方舟日常
![AUTO_MAS配置8](/docs/img/script-guide/maa/AUTO-MAA-8.png)

::: info 注意
**详细** 配置模式下不要忘了 **设置具体配置**。
**用户** 配置模式下不要忘了 **设置具体配置**。
:::
::: tip 账号 ID 小贴士

Expand Down Expand Up @@ -85,7 +85,7 @@ MAA 是一个明日方舟第三方软件,能够轻松完成明日方舟日常
- **日常任务**:跑你在 **任务配置** 里勾选的任务,**顺序是固定的,改不了**。
- **定时执行** 会被强制关掉(定时交给 AUTO-MAS 的调度队列管)。任务完成后行为、启动后行为、最小化、更新这几类设置也会被自动调整。

没被接管的设置,取决于你用哪种配置模式:**简洁** 模式沿用 MAA 的全局设置,**详细** 模式沿用该用户自己的具体配置。
没被接管的设置,取决于你用哪种配置模式:**脚本** 模式沿用 MAA 的全局设置,**用户** 模式沿用该用户自己的具体配置。

::: tip 同类型任务只有第一个生效
如果你在 MAA 里排了两个同类型的任务(比如两个"刷理智"),只有第一个会被 AUTO-MAS 采用。一个都没有时用默认值。
Expand Down
2 changes: 1 addition & 1 deletion docs/task-scheduler.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

**自动代理** 模式下,任务是这样一层层展开的:

- **一个用户** = 该用户勾选的所有任务。MAA 脚本的用户分 **剿灭** 和 **日常** 两块,先剿灭后日常;简洁模式默认开日常
- **一个用户** = 该用户勾选的所有任务。MAA 脚本的用户分 **剿灭** 和 **日常** 两块,先剿灭后日常;脚本模式默认开日常
- **一个脚本** = 它下面所有用户的任务,按用户在列表里的顺序往下跑。同一个脚本不能同时跑两遍——已经在跑的话,重复启动会被跳过。
- **一个队列** = 队列里所有脚本的任务,按队列里的顺序往下跑。同一个队列可以重复启动。
- **一个调度台** 同时只跑一个队列。想并行跑多个队列,就多开几个调度台。
Expand Down
4 changes: 2 additions & 2 deletions en/docs/script-guide/maa.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ MAA is a third-party Arknights tool that can handle repetitive tasks such as dai
![AUTO-MAS configuration 8](/docs/img/script-guide/maa/AUTO-MAA-8.png)

::: info Note
In **detailed** configuration mode, do not forget to **set specific configuration**.
In **user** configuration mode, do not forget to **set specific configuration**.
:::

::: tip Account ID Tips
Expand Down Expand Up @@ -87,7 +87,7 @@ During an auto-proxy run, AUTO-MAS takes over some MAA settings, so whatever you
- **Daily task**: runs whatever you ticked in **Task configuration**. **The order is fixed and cannot be changed.**
- **Scheduled execution** is force-disabled, because scheduling belongs to the AUTO-MAS queue. Behavior after task completion, behavior after MAA startup, minimization, and update settings are also adjusted automatically.

Anything not taken over follows your configuration mode: **simple** mode uses MAA's global settings, **detailed** mode uses that user's own configuration.
Anything not taken over follows your configuration mode: **script** mode uses MAA's global settings, **user** mode uses that user's own configuration.

::: tip Only the First Task of Each Type Is Used
If you queued two tasks of the same type in MAA, for example two **Use sanity** tasks, AUTO-MAS uses only the first one. If there are none, defaults apply.
Expand Down
2 changes: 1 addition & 1 deletion en/docs/task-scheduler.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ A **scheduling queue** is a to-do list: you put the scripts you want to run into

In **auto-proxy** mode, tasks are nested like this:

- **One user** = all the tasks that user has selected. For MAA scripts, a user's tasks split into **Annihilation** and **Daily**, with Annihilation first; simple mode has Daily on by default.
- **One user** = all the tasks that user has selected. For MAA scripts, a user's tasks split into **Annihilation** and **Daily**, with Annihilation first; script mode has Daily on by default.
- **One script** = the tasks of all users under it, run in the order the users appear in the list. The same script can't run twice at once. If it's already running, starting it again is skipped.
- **One queue** = the tasks of all scripts in the queue, run in queue order. The same queue can be started more than once.
- **One scheduler console** runs one queue at a time. To run several queues in parallel, open more consoles.
Expand Down