Skip to content

Automated PR 2026.10.30 - #1985

Merged
github-actions[bot] merged 23 commits into
masterfrom
dev
Oct 29, 2026
Merged

github-actions[bot] merged 23 commits into
masterfrom
dev

Conversation

@github-actions

@github-actions github-actions Bot commented Oct 29, 2026 •

Copy link
Copy Markdown
Contributor

Automated PR created by GitHub Actions. Merge dev into master

Sourcery 总结

改进商店购买和导航,同时更新战斗流程、游戏界面识别以及任务行为,以适配最新的界面变化。

新功能:

  • 添加价格感知购买功能,支持单件购买和数量选择对话框,同时考虑货币、剩余数量和最高单价。
  • 支持紫色商店界面,并通过感知页面的导航处理商店导航和返回流程。
  • 为队长和成员准备永恒之海战斗,并在进入搜索界面时启动已配置的多坎创建尝试。
  • 运行时替换图像资源后刷新缓存,并提供兼容非 Windows 系统的桌面设备导入路径。

错误修复:

  • 改进战斗完成处理,涵盖溢出提示,并在关键转换节点刷新长时间运行的战斗状态。
  • 修复商店返回导航、多坎调度行为、悬赏任务筛选与关闭,以及新版游戏布局下的购买行为。
  • 更新悬赏任务、全球游戏、购买和商店的图像/OCR 资源,以匹配调整后的屏幕坐标。

改进:

  • 将区域首领整合到战斗等待流程中,并配置其战斗奖励的完成检查。
  • 启用后,自动购买天平可在一次操作中完成。

测试:

  • 添加离线导航测试,覆盖两种商店外观、进入和返回流程,以及失败处理。
Original summary in English

Summary by Sourcery

Improve mall purchasing and navigation while updating battle flows, game-screen recognition, and task behavior for the latest interface changes.

New Features:

  • Add price-aware purchasing that supports both single-item and quantity-selection dialogs while respecting currency, remaining quantities, and maximum unit prices.
  • Support purple mall screens and route mall navigation and return flows through page-aware navigation.
  • Prepare Eternity Sea battles for both leaders and members and start configured Dokan creation attempts when entering the search screen.
  • Refresh cached image assets after runtime replacement and provide a non-Windows-safe desktop device import path.

Bug Fixes:

  • Improve battle completion handling for overflow prompts and refresh long-running battle state at key transitions.
  • Fix mall return navigation, Dokan scheduling behavior, wanted-quest filtering and closing, and purchasing behavior across updated game layouts.
  • Update Wanted Quests, Global Game, Buy, and mall image/OCR assets for revised screen coordinates.

Enhancements:

  • Integrate Area Boss with the battle-wait flow and configure completion checks for its battle rewards.
  • Allow automatic Scales purchases to complete in one operation when enabled.

Tests:

  • Add offline navigation tests covering both mall appearances, entry and return flows, and failure handling.

kunkun008 and others added 23 commits October 24, 2026 04:02
剩余次数大于1时点蓝票弹出的是带加号的多数量窗口, buy_one 一直等单个窗口导致卡死(GameStuckError)。新增 Buy.buy_one_or_more 按弹窗类型分流(出现加号走 buy_more, 出现单个窗口走 buy_one, 10s 超时返回 False), buy_mall_one 新增可选参数 more_window(默认 False 不影响其他调用), 只对蓝票开启。参考 #1761 (43ada9d) 荣誉商店蓝票改用 buy_more。
读取购买按钮上的勾玉单价;单价高于 85、低于 40(视为识别错误)或不是勾玉支付时取消购买。
购买数量 = min(剩余次数, 余额 // 单价)。
避免 buy_more(n) 在点加号时超过目标数量。
fix(MysteryShop): 蓝票改用 buy_more,并按单价判断,高于 85 勾玉不买
1 增加了旧版调用通用战斗的御魂溢出处理。(如果任务重写了battle_wait,比如御魂战斗的,需要单独修改,目前只修改了御魂战斗,其他重新了battle_wait的喂修改)
2 新版战斗处理中,不去interupt事件里面处理。原因是如果去新函数inerupt事件里面处理,再重新进入success该函数的时候,低概率出现战斗结束了,因检测不到几种奖励标志,在success处理函数中进入不到后续处理,不停循环。
…lure-interval-dev

修复道馆两次攻打间的任务调度时间
- 重新提取悬赏封印及协作邀请相关模板,匹配游戏新版本界面
- 悬赏目标识别由精确匹配改为子串包含匹配,避免前缀动词导致漏判
- 单个任务追踪弹窗关闭按钮改用通用红叉 I_UI_BACK_RED
- 清理已失效孤立资产 C_WQ_TRACE_ONE_CLOSE/I_WQ_CHECK_TASK 及其 png
- 重新提取通用接受/拒绝按钮模板并调整识别区,匹配游戏新版本界面
- 游戏内开启自动选择御魂时,海汐御魂购买逻辑改为一次买完并提前返回
- 移除按 cycles/res 分支中的 enable_book_auto 判断,统一走自动选择路径
…ck-dev

修复永生之海队员锁定阵容检查流程
…-dev

道馆任务每次运行时尝试开启道馆
fix(GameUi): 兼容商店两种招牌图片,修复反复进出商店的问题

@sourcery-ai sourcery-ai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

嗨——我已经审阅了你的更改,看起来很棒!

Sourcery 评估

需要人工审阅。 新增的神秘商店流程将 85 视为自动购买价格上限,并可使用可用的翡翠,确认购买至剩余限额。如果该上限或购买策略有误,翡翠会被消耗,却不会触发任何错误来提示这一决定;回滚可以阻止之后的购买,但无法恢复已经花掉的货币。


Sourcery 对开源项目免费——如果你喜欢我们的评审,欢迎分享 ✨
Original comment in English

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

Sourcery assessment

Needs a human reviewer. The new mystery-shop flow treats 85 as an automatic purchase-price ceiling and can confirm purchases up to the remaining limit using the available jade. If that ceiling or purchase policy is wrong, jade is spent without an error to signal the decision; reverting stops future buys but cannot restore currency already spent.


Sourcery is free for open source - if you like our reviews please consider sharing them ✨

@github-actions
github-actions Bot merged commit 2d2f6d8 into master Oct 29, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants