Skip to content

feat: 修复多种规则同时命中时无法锁定的问题#1612

Merged
MistEO merged 2 commits intov2from
fix/essence
Mar 26, 2026
Merged

feat: 修复多种规则同时命中时无法锁定的问题#1612
MistEO merged 2 commits intov2from
fix/essence

Conversation

@Joe-Bao
Copy link
Copy Markdown
Contributor

@Joe-Bao Joe-Bao commented Mar 26, 2026

fix #1587

Summary by Sourcery

Bug Fixes:

  • 修复在“future-promising”和“slot3-level3 practical”规则同时匹配时,无法锁定条目的问题。
Original summary in English

Summary by Sourcery

Bug Fixes:

  • Fix failure to lock items when both future-promising and slot3-level3 practical rules match simultaneously.
Original summary in English

Summary by Sourcery

Bug Fixes:

  • 修复在“future-promising”和“slot3-level3 practical”规则同时匹配时,无法锁定条目的问题。
Original summary in English

Summary by Sourcery

Bug Fixes:

  • Fix failure to lock items when both future-promising and slot3-level3 practical rules match simultaneously.

@Joe-Bao Joe-Bao marked this pull request as ready for review March 26, 2026 02:32
Copilot AI review requested due to automatic review settings March 26, 2026 02:32
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.

Hey - 我已经审查了你的更改,看起来很棒!


Sourcery 对开源项目是免费的——如果你觉得我们的审查有帮助,欢迎分享 ✨
帮我变得更有用!请在每条评论上点 👍 或 👎,我会根据你的反馈来改进审查质量。
Original comment in English

Hey - I've reviewed your changes and they look great!


Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

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 修复 EssenceFilter 扩展规则在“未来可期 (FuturePromising)”与“3 号词条实用 (Slot3Level3Practical)”同时命中时,由于先匹配先返回导致后续规则锁定决策被短路,从而出现应锁未锁的问题(#1587)。

Changes:

  • 将两条扩展规则从“命中即提前 return”改为“先分别计算是否命中,再合并 ShouldLock 决策(OR)后统一返回结果”
  • 保留原有匹配优先级:两条都命中时,返回结果字段展示仍优先按 FuturePromising 构造

@MistEO MistEO merged commit 4b8db44 into v2 Mar 26, 2026
16 checks passed
@MistEO MistEO deleted the fix/essence branch March 26, 2026 09:16
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.

基质筛选的扩展规则有顺序bug

3 participants