Skip to content

fix: 增加传送后位置判断#1762

Merged
MistEO merged 2 commits intoMaaEnd:v2from
egoist-hozumi:v2
Mar 31, 2026
Merged

fix: 增加传送后位置判断#1762
MistEO merged 2 commits intoMaaEnd:v2from
egoist-hozumi:v2

Conversation

@egoist-hozumi
Copy link
Copy Markdown
Contributor

@egoist-hozumi egoist-hozumi commented Mar 30, 2026

当判断进入"GoTo${Id}NotAtStartPos"时,直接传送然后进行寻路的逻辑改为传送后判断两次位置是否在目标附近,如果处于附近状态再进行寻路,不然退出任务。

Summary by Sourcery

调整 EnvironmentMonitoring OutskirtsMonitoringTerminal 任务,在传送后先验证玩家位置再继续后续流程。

Bug 修复:

  • 在 EnvironmentMonitoring OutskirtsMonitoringTerminal 流程中,当传送后的玩家位置不在预期目标附近时,防止任务错误地继续进行路径规划。

改进:

  • 将所有相关的 EnvironmentMonitoring OutskirtsMonitoringTerminal JSON 配置及其生成模板与新的传送后位置验证逻辑对齐。
Original summary in English

Summary by Sourcery

Adjust EnvironmentMonitoring OutskirtsMonitoringTerminal tasks to validate player position after teleporting before proceeding.

Bug Fixes:

  • Prevent tasks from incorrectly continuing pathfinding when post-teleport position is not near the intended target in EnvironmentMonitoring OutskirtsMonitoringTerminal flows.

Enhancements:

  • Align all related EnvironmentMonitoring OutskirtsMonitoringTerminal JSON configs and their generation template with the new post-teleport position validation logic.

当判断进入"GoTo${Id}NotAtStartPos"时,直接传送然后进行寻路的逻辑改为传送后判断两次位置是否在目标附近,如果处于附近状态再进行寻路,不然退出任务。
Copy link
Copy Markdown
Contributor

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

我们遇到错误,目前无法审查此 PR。我们已经收到通知,正在努力修复问题。

你可以在此 Pull Request 中评论 @sourcery-ai review 以重试,或者联系我们获取帮助。

Original comment in English

We encountered an error and are unable to review this PR. We have been notified and are working to fix it.

You can try again by commenting this pull request with @sourcery-ai review, or contact us for help.

Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

该 PR 针对 EnvironmentMonitoring/OutskirtsMonitoringTerminal 流程在“传送后落点不正确”场景下的误继续寻路问题,增加了传送后的落点复核与重试逻辑,避免错误路径规划继续执行。

Changes:

  • GoTo${Id}NotAtStartPos 分支中:传送后先进行位置断言复核;不满足则重试一次传送;仍不满足则结束当前子任务。
  • 批量同步更新各个 OutskirtsMonitoringTerminal 任务的 pipeline JSON,使其与模板逻辑一致。
  • 对若干 TemplateMatch 节点做字段顺序整理(不影响语义)。

Reviewed changes

Copilot reviewed 13 out of 13 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
tools/pipeline-generate/EnvironmentMonitoring/OutskirtsMonitoringTerminal/template.jsonc 模板中为“传送后落点复核 + 二次重试 + 失败退出”新增节点与跳转链路
assets/resource/pipeline/EnvironmentMonitoring/OutskirtsMonitoringTerminal/VigorousCisternOriginiumSlug.json 应用传送后落点复核/重试/失败退出逻辑到具体任务配置
assets/resource/pipeline/EnvironmentMonitoring/OutskirtsMonitoringTerminal/RainbowFin.json 同上,并调整部分 TemplateMatch 字段顺序
assets/resource/pipeline/EnvironmentMonitoring/OutskirtsMonitoringTerminal/ObservantSableChestedFowlbeast.json 同上,并调整部分 TemplateMatch 字段顺序
assets/resource/pipeline/EnvironmentMonitoring/OutskirtsMonitoringTerminal/InflatedAndGlowingBugspittingLankybeast.json 同上,并调整部分 TemplateMatch 字段顺序
assets/resource/pipeline/EnvironmentMonitoring/OutskirtsMonitoringTerminal/IndoorCrops.json 同上,并调整部分 TemplateMatch 字段顺序
assets/resource/pipeline/EnvironmentMonitoring/OutskirtsMonitoringTerminal/EternalSunset.json 同上,并调整部分 TemplateMatch 字段顺序
assets/resource/pipeline/EnvironmentMonitoring/OutskirtsMonitoringTerminal/EcologyNearTheFieldLogisticsDepot.json 同上,并调整部分 TemplateMatch 字段顺序
assets/resource/pipeline/EnvironmentMonitoring/OutskirtsMonitoringTerminal/CollapsedTianshiPillar.json 同上,并调整部分 TemplateMatch 字段顺序
assets/resource/pipeline/EnvironmentMonitoring/OutskirtsMonitoringTerminal/CleansingJade.json 同上,并调整部分 TemplateMatch 字段顺序
assets/resource/pipeline/EnvironmentMonitoring/OutskirtsMonitoringTerminal/CisternOriginiumSlugs.json 同上,并调整部分 TemplateMatch 字段顺序
assets/resource/pipeline/EnvironmentMonitoring/OutskirtsMonitoringTerminal/BeaconDamagedInBlightTide.json 同上,并调整部分 TemplateMatch 字段顺序
assets/resource/pipeline/EnvironmentMonitoring/OutskirtsMonitoringTerminal/AncientTree.json 同上,并调整部分 TemplateMatch 字段顺序

Comment on lines +203 to 252
"next": [
"GoTo${Id}RecheckStartPos",
"GoTo${Id}ReEnterMap"
]
},
"GoTo${Id}RecheckStartPos": {
"desc": "传送后再次检查是否已在${Name}任务开始位置附近",
"recognition": "Custom",
"custom_recognition": "MapTrackerAssertLocation",
"custom_recognition_param": {
"expected": [
{
"map_name": "${MapName}",
"target": "${MapTarget}"
}
]
},
"next": [
"GoTo${Id}MapTrackerMove"
]
},
"GoTo${Id}ReEnterMap": {
"desc": "传送后仍未到达${Name}任务开始位置附近,重试一次传送",
"action": "Custom",
"custom_action": "SubTask",
"custom_action_param": {
"sub": [
"${EnterMap}"
]
},
"next": [
"GoTo${Id}FinalCheckStartPos",
"GoTo${Id}StartPosFailed"
]
},
"GoTo${Id}FinalCheckStartPos": {
"desc": "二次传送后再次检查是否已在${Name}任务开始位置附近",
"recognition": "Custom",
"custom_recognition": "MapTrackerAssertLocation",
"custom_recognition_param": {
"expected": [
{
"map_name": "${MapName}",
"target": "${MapTarget}"
}
]
},
"next": [
"GoTo${Id}MapTrackerMove"
]
Copy link

Copilot AI Mar 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里新增了 GoTo${Id}RecheckStartPos / GoTo${Id}FinalCheckStartPos 两个节点,但它们的 MapTrackerAssertLocation 参数与既有的 GoTo${Id}StartPos 完全一致,导致模板与生成产物出现三份重复的 location 断言配置。建议复用 GoTo${Id}StartPos:例如传送后直接在 next 中按顺序引用 GoTo${Id}StartPos → GoTo${Id}ReEnterMap(第二次则 GoTo${Id}StartPos → GoTo${Id}StartPosFailed),即可保持同样的控制流并减少重复维护点。

Copilot uses AI. Check for mistakes.
@MistEO
Copy link
Copy Markdown
Contributor

MistEO commented Mar 31, 2026

请运行一下 pnpm format

@ocsin1 ocsin1 changed the title Fix: 增加传送后位置判断 fix: 增加传送后位置判断 Mar 31, 2026
@MistEO MistEO requested review from he0119 and zmdyy0318 March 31, 2026 15:57
Copy link
Copy Markdown
Contributor

@he0119 he0119 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

看起来没什么问题,不过不明白为什么传送会失败。

@MistEO MistEO merged commit 6bee3a6 into MaaEnd:v2 Mar 31, 2026
18 checks passed
@he0119 he0119 mentioned this pull request Apr 2, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants