Skip to content

[pull] v2 from MaaEnd:v2 - #324

Merged
pull[bot] merged 4 commits into
Yuneko-dev:v2from
MaaEnd:v2
Aug 3, 2026
Merged

[pull] v2 from MaaEnd:v2#324
pull[bot] merged 4 commits into
Yuneko-dev:v2from
MaaEnd:v2

Conversation

@pull

@pull pull Bot commented Aug 3, 2026

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

zmdyy0318 and others added 4 commits August 3, 2026 23:52
非主要用户优先级降低

## Summary by Sourcery

增强:
- 当活动控制器不是 Win32-Front 实现时,记录并忽略任务失败反馈提示。

<details>
<summary>Original summary in English</summary>

## Summary by Sourcery

Enhancements:
- Log and ignore task failure feedback hints when the active controller
is not the Win32-Front implementation.

</details>
close #4713

## Summary by Sourcery

改进屏幕显示消息以及相关的场景加载配置。

改进内容:
- 优化所有受支持语言中的本地化 OSD 提示字符串。
- 调整场景加载管线配置,使其与更新后的 OSD 提示保持一致。

<details>
<summary>Original summary in English</summary>

## Summary by Sourcery

Improve on-screen display messaging and related scene loading
configuration.

Enhancements:
- Refine localized OSD prompt strings across all supported languages.
- Adjust scene loading pipeline configuration to align with updated OSD
prompts.

</details>
## Summary by Sourcery

在进入 Protocol Space 机关之门时,为 AutoFight 添加战前等待流程,在怪物生成之前延迟锁定操作。

新功能:
- 在挑战事件中,在开始自动战斗前,引入一个基于识别的等待循环,用于检测 Protocol Space 的重启状态。

增强优化:
- 在 Protocol Space 自动战斗流程中,等待战斗开始或超时时,显示本地化状态消息。
- 扩展 AutoFight 识别资源,以检测 Protocol Space 机关之门和重启状态。

<details>
<summary>Original summary in English</summary>

## Summary by Sourcery

Add a pre-battle wait flow to AutoFight when entering the Protocol Space
mechanics gate, delaying lock actions until monsters have spawned.

New Features:
- Introduce a recognition-driven wait loop for Protocol Space restart
before starting auto battle in challenge events.

Enhancements:
- Display localized status messages while waiting for battle start or
timeout in Protocol Space auto-fight flow.
- Extend AutoFight recognition resources to detect Protocol Space
mechanics gate and restart states.

</details>
Triggered by b48f62a
[skip changelog]
@pull pull Bot locked and limited conversation to collaborators Aug 3, 2026
@pull pull Bot added the ⤵️ pull label Aug 3, 2026
@pull
pull Bot merged commit 3df218c into Yuneko-dev:v2 Aug 3, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant