[pull] v2 from MaaEnd:v2 - #321
Merged
Merged
Conversation
## 概要 此 PR 为武陵应龙关地区、武陵北部禁区地区添加了万能跳转支持和基质刷取支持。 此外调整了基质刷取的地区默认值。 ## Summary by Sourcery 为新的五陵区域添加 AutoEssence 支持，用于通用传送和精华刷取。 New Features: - 为五陵应龙关和五陵北部封锁区启用 AutoEssence 通用传送和精华刷取功能。 - 在场景内接口和场景管理器接口中暴露新的五陵区域，以支持地图追踪和传送。 - 更新地图追踪器的外部数据和本地化界面字符串，使其识别新的五陵 AutoEssence 区域。 Enhancements: - 扩展 AutoEssence 的通用与区域节点配置以及相关任务定义，以覆盖新的五陵区域。 <details> <summary>Original summary in English</summary> ## Summary by Sourcery Add AutoEssence support for universal teleport and essence farming in new Wuling regions. New Features: - Enable AutoEssence universal teleport and essence farming for Wuling Yinglong Pass and North Wuling Exclusion Zone regions. - Expose the new Wuling regions in the in-scene and scene manager interfaces for map tracking and teleport. - Update map tracker external data and localized interface strings to recognize the new Wuling AutoEssence regions. Enhancements: - Extend AutoEssence common and region node configurations and associated task definitions to cover the new Wuling areas. </details> --------- Co-authored-by: zmdyy0318 <zmdyy0318@hotmail.com>
## Summary by Sourcery 增强内容： - 调整本地化文件中的 UI 文案，以在英文、日文、韩文、简体中文和繁体中文中更清楚地描述在切换账号以及关闭画面生成提示时的行为。 <details> <summary>Original summary in English</summary> ## Summary by Sourcery Enhancements: - Adjust UI copy in localization files to clarify behavior when switching accounts and closing the frame generation prompt in English, Japanese, Korean, Simplified Chinese, and Traditional Chinese. </details>
之前的路径成功率是 0%，现在调整拍照路径尝试一下。 ## Summary by Sourcery 错误修复： - 修正环境监测配置中植物观测点照片的捕获路径。 <details> <summary>Original summary in English</summary> ## Summary by Sourcery Bug Fixes: - Correct flora observation point photo capture path in environment monitoring configuration. </details>
现在会在购买前计算,本次购买后是否会低于设置的阈值 如果低于阈值会直接停止购买 ## Summary by Sourcery 优化信用点购买的回退行为，防止购买操作使余额低于已配置的阈值。 New Features: - 添加预购买检查，用于评估购买后信用点余额是否会低于用户定义的阈值，如低于则终止交易。 Enhancements: - 更新信用点购买流程和货架配置，以集成新的基于阈值的购买保护机制。 - 刷新本地化界面文案以支持更新后的信用点购买行为。 <details> <summary>Original summary in English</summary> ## Summary by Sourcery Optimize the credit point purchasing fallback behavior to prevent purchases that would drop the balance below a configured threshold. New Features: - Add a pre-purchase check that evaluates whether the post-purchase credit balance would fall below the user-defined threshold and aborts the transaction if so. Enhancements: - Update credit shopping flow and shelf configuration to integrate the new threshold-based purchase guard. - Refresh localized interface strings to support the updated credit purchase behavior. </details> <details> <summary>Original summary in English</summary> ## Summary by Sourcery 优化信用点购买的回退行为，防止购买操作使余额低于已配置的阈值。 New Features: - 添加预购买检查，用于评估购买后信用点余额是否会低于用户定义的阈值，如低于则终止交易。 Enhancements: - 更新信用点购买流程和货架配置，以集成新的基于阈值的购买保护机制。 - 刷新本地化界面文案以支持更新后的信用点购买行为。 <details> <summary>Original summary in English</summary> ## Summary by Sourcery Optimize the credit point purchasing fallback behavior to prevent purchases that would drop the balance below a configured threshold. New Features: - Add a pre-purchase check that evaluates whether the post-purchase credit balance would fall below the user-defined threshold and aborts the transaction if so. Enhancements: - Update credit shopping flow and shelf configuration to integrate the new threshold-based purchase guard. - Refresh localized interface strings to support the updated credit purchase behavior. </details> </details>
## Summary by Sourcery 增强功能： - 为云端 ZMD 资源的 AutoStockStaple 通用物料配置补全缺失的颜色条目。 <details> <summary>Original summary in English</summary> ## Summary by Sourcery Enhancements: - Complete missing color entries in the AutoStockStaple general item configuration for cloud ZMD resources. </details>
## Summary by Sourcery
引入共享的布尔表达式引擎，并扩展 IMS 中的条目数量检查，以支持基于表达式的条件，对缓存计数进行判断。
New Features:
- 允许 IMS R1 `ItemQuantitySatisfied` 使用 `{ITEM_ID}` 占位符，在缓存的物品数量上评估布尔表达式。
- 提供可复用的 `boolexpr` 包，用于解析、占位符解析以及整数/布尔表达式的求值，供 ExpressionRecognition 和
IMS 共享使用。
Enhancements:
- 重构 ExpressionRecognition，使其使用共享的 `boolexpr`
引擎来进行占位符解析、整数字面值夹取（clamping）以及表达式求值。
- 调整 OCR 数值解析逻辑，改为通过 `boolexpr` 定义的整数范围辅助方法进行夹取，而不是使用本地常量。
Documentation:
- 更新 IMS 组件文档（中/英文），说明 `ItemQuantitySatisfied` 的表达式化用法、支持的运算符以及示例。
- 明确自定义 ExpressionRecognition 文档，将 IMS 的表达式使用场景指引到
`ItemQuantitySatisfied`。
Tests:
- 为 `boolexpr` 包添加单元测试，覆盖整数字面值夹取、占位符解析以及表达式求值行为。
- 扩展和修订 IMS `ItemQuantitySatisfied` 的测试，用于表达式参数、复合条件以及对非布尔表达式的拒绝行为。
- 更新 ExpressionRecognition 测试，使其依赖 `boolexpr` 的整数边界进行溢出夹取预期验证。
Chores:
- 更新 IMS 的 schema、pipelines、tasks 和本地化键，以反映新的基于表达式的
`ItemQuantitySatisfied` 接口。
<details>
<summary>Original summary in English</summary>
## Summary by Sourcery
Introduce a shared boolean expression engine and extend IMS item
quantity checks to support expression-based conditions over cached
counts.
New Features:
- Allow IMS R1 ItemQuantitySatisfied to evaluate boolean expressions
over cached item quantities using {ITEM_ID} placeholders.
- Provide a reusable boolexpr package for parsing, placeholder
resolution, and evaluation of integer/boolean expressions shared by
ExpressionRecognition and IMS.
Enhancements:
- Refactor ExpressionRecognition to use the shared boolexpr engine for
placeholder resolution, integer literal clamping, and expression
evaluation.
- Adjust OCR numeric parsing to clamp via boolexpr-defined integer range
helpers instead of local constants.
Documentation:
- Update IMS component docs (EN/ZH) to describe expression-based usage
of ItemQuantitySatisfied, supported operators, and examples.
- Clarify custom ExpressionRecognition docs to point IMS expression use
cases to ItemQuantitySatisfied instead.
Tests:
- Add unit tests for the boolexpr package covering integer literal
clamping, placeholder resolution, and expression evaluation behavior.
- Extend and revise IMS ItemQuantitySatisfied tests for expression
parameters, compound conditions, and non-boolean expression rejection.
- Update ExpressionRecognition tests to rely on boolexpr integer bounds
for overflow-clamp expectations.
Chores:
- Update IMS schema, pipelines, tasks, and localization keys to reflect
the new expression-based ItemQuantitySatisfied interface.
</details>
Triggered by c11d4eb [skip changelog]
<img width="1080" height="996" alt="09ab49766991e4c4af6c7e6ff89cde38" src="https://github.com/user-attachments/assets/cdeb7f9b-51cd-4661-960d-47d06bdae29e" /> ## Summary by Sourcery Bug Fixes: - 修正协议传递每日奖励条目，以便所有等级都能按预期被领取。 <details> <summary>Original summary in English</summary> ## Summary by Sourcery Bug Fixes: - Correct protocol pass daily rewards entries so all levels can be claimed as intended. </details>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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 : )