Skip to content

Revert "梦虚秘境支持PVP"#1535

Merged
runhey merged 1 commit into
devfrom
revert-1519-dev
May 8, 2026
Merged

Revert "梦虚秘境支持PVP"#1535
runhey merged 1 commit into
devfrom
revert-1519-dev

Conversation

@runhey
Copy link
Copy Markdown
Owner

@runhey runhey commented May 8, 2026

Summary by Sourcery

恢复与 PVP 相关的技能处理改动,同时调整探索、Orochi、英雄试炼和通缉任务界面的各类 UI 素材模板及检测逻辑。

Enhancements:

  • 更新多个游戏 UI 和 Orochi 图像资源的 ROI 配置,使其与当前布局保持一致。
  • 在移除 PVP 专属技能后,优化英雄试炼技能资源定义及其选择列表。
  • 将通缉任务剩余任务检测方式从基于 OCR 改为基于图像识别,并使用新的标记资源。
  • 从代码仓库中移除已废弃的技能图片自动更新器相关文档文件。
Original summary in English

Summary by Sourcery

Revert PVP-related skill handling changes and adjust various UI asset templates and detection logic for exploration, Orochi, Hero Test, and Wanted Quests screens.

Enhancements:

  • Update ROI configurations for multiple Game UI and Orochi image assets to match current layouts.
  • Refine Hero Test skill asset definitions and selection lists after removing PVP-specific skills.
  • Change Wanted Quests remaining-task detection from OCR-based to image-based using a new marker asset.
  • Remove obsolete skill image auto-updater documentation artifact from the repository.

Copy link
Copy Markdown

@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 - 我给出了一些整体性的反馈:

  • hero2_skill_wait 中,pvp_skill 现在是一个空列表,但仍然通过 SkillMode.PVP 被引用;建议要么对 PVP 模式做防护,要么恢复一个最小的后备技能集合,以避免在运行时变成空操作行为。
  • I_HERO2_SKILL6 重新指向之前的 I_HERO2_SKILL7 资源会改变它的语义含义;请再次检查所有使用 I_HERO2_SKILL6 的调用点,以确保在本次回滚之后,它们仍然指向预期的技能(加速祝福)。
  • 从 OCR(O_WQ_LIST_TOP_BOTTOM_CHECK)切换到基于图片的检测(I_WQ_LIST_TOP_BOTTOM_CHECK)来检查剩余的通缉任务,会改变检测条件;建议简单验证一下,在边缘 UI 状态(例如空列表、部分滚动)下,is_wq_remained 仍然能够正确区分任务存在/不存在。
面向 AI 代理的提示
Please address the comments from this code review:

## Overall Comments
- In `hero2_skill_wait`, `pvp_skill` is now an empty list while still being referenced via `SkillMode.PVP`; consider either guarding against PVP mode or restoring a minimal fallback set of skills to avoid runtime no-op behavior.
- The reassignment of `I_HERO2_SKILL6` to point at the former `I_HERO2_SKILL7` asset changes its semantic meaning; double-check all call sites using `I_HERO2_SKILL6` to ensure they still refer to the intended skill (speed blessing) after this revert.
- The switch from OCR (`O_WQ_LIST_TOP_BOTTOM_CHECK`) to image-based detection (`I_WQ_LIST_TOP_BOTTOM_CHECK`) for checking remaining wanted quests changes the detection conditions; consider briefly validating that `is_wq_remained` still correctly distinguishes the presence/absence of tasks in edge UI states (e.g., empty list, partially scrolled).

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

Hey - I've left some high level feedback:

  • In hero2_skill_wait, pvp_skill is now an empty list while still being referenced via SkillMode.PVP; consider either guarding against PVP mode or restoring a minimal fallback set of skills to avoid runtime no-op behavior.
  • The reassignment of I_HERO2_SKILL6 to point at the former I_HERO2_SKILL7 asset changes its semantic meaning; double-check all call sites using I_HERO2_SKILL6 to ensure they still refer to the intended skill (speed blessing) after this revert.
  • The switch from OCR (O_WQ_LIST_TOP_BOTTOM_CHECK) to image-based detection (I_WQ_LIST_TOP_BOTTOM_CHECK) for checking remaining wanted quests changes the detection conditions; consider briefly validating that is_wq_remained still correctly distinguishes the presence/absence of tasks in edge UI states (e.g., empty list, partially scrolled).
Prompt for AI Agents
Please address the comments from this code review:

## Overall Comments
- In `hero2_skill_wait`, `pvp_skill` is now an empty list while still being referenced via `SkillMode.PVP`; consider either guarding against PVP mode or restoring a minimal fallback set of skills to avoid runtime no-op behavior.
- The reassignment of `I_HERO2_SKILL6` to point at the former `I_HERO2_SKILL7` asset changes its semantic meaning; double-check all call sites using `I_HERO2_SKILL6` to ensure they still refer to the intended skill (speed blessing) after this revert.
- The switch from OCR (`O_WQ_LIST_TOP_BOTTOM_CHECK`) to image-based detection (`I_WQ_LIST_TOP_BOTTOM_CHECK`) for checking remaining wanted quests changes the detection conditions; consider briefly validating that `is_wq_remained` still correctly distinguishes the presence/absence of tasks in edge UI states (e.g., empty list, partially scrolled).

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.

@runhey runhey merged commit 6e03c72 into dev May 8, 2026
8 checks passed
@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 8, 2026

Findings

  • C1 [风险]
    位置:PR 整体
    原因:标题为 revert "梦虚秘境支持PVP",但实际改动除 HeroTest PVP 技能回退外,还包含 GameUi/Orochi 多处 ROI 配置更新、PNG 素材更新,超出单纯回退范围,属于把多个独立改动打包。
    修改:将纯 PVP revert 内容与其他 UI 调整拆分,分别提交。

  • C2 [风险]
    位置:tasks/HeroTest/script_task.py:hero2_skill_wait()
    原因:pvp_skill 列表已清空且仅有 # TODO: PVP 注释。当外部调用 SkillMode.PVP 时会进入 hero2_skill_wait,但拿到空列表,逻辑上无明确退出条件(无重试、超时或报错),存在静默卡住风险。
    修改:若暂不支持 PVP,应在 SkillMode.PVP 分支添加明确注释或抛出异常,而不是隐式返回空列表。

Generated by PR Review Checklist for issue #1535 · ● 172.1K ·

@runhey runhey deleted the revert-1519-dev branch May 13, 2026 16:06
huiyuhang1 added a commit to huiyuhang1/OnmyojiAutoScript that referenced this pull request May 18, 2026
commit 27ce720
Author: huangrunheng <2234044577@qq.com>
Date:   Thu May 14 11:07:34 2026 +0800

    fix(Handle): 句柄树构建加重试机制,优化日志输出

    - 修复模拟器子窗口未就绪时 screenshot_handle_num 访问空 children 导致 IndexError
    - __init__ 中 handle_tree 构建后若 children 为空则等待重试(最多10次×1s)
    - 移除 screenshot_handle_num/screenshot_size 初始化时预计算,延迟到首次截屏
    - 统一 handle 空值检查为单行判断
    - 修正多处日志拼写和措辞(wnidow→window, seclect→select, handle is handle→handle is a 等)

commit 7635e0a
Merge: 0bfddbd cbc343f
Author: huangrunheng <74492025+runhey@users.noreply.github.com>
Date:   Wed May 13 23:22:36 2026 +0800

    Merge pull request runhey#1555 from yEs1do/fix(Sougenbi)

    fix(Sougenbi): 移除冗余图像规则,更新OCR区域设置

commit cbc343f
Merge: 0a9461e 0bfddbd
Author: huangrunheng <74492025+runhey@users.noreply.github.com>
Date:   Wed May 13 23:20:44 2026 +0800

    Merge branch 'dev' into fix(Sougenbi)

commit 0bfddbd
Merge: 29ce9a7 199a5ad
Author: huangrunheng <74492025+runhey@users.noreply.github.com>
Date:   Wed May 13 23:17:59 2026 +0800

    Merge pull request runhey#1554 from LGG686/dev-CostumeShikigami

    Dev costume shikigami

commit 29ce9a7
Merge: 602eede 7c6c1ca
Author: huangrunheng <74492025+runhey@users.noreply.github.com>
Date:   Wed May 13 23:09:49 2026 +0800

    Merge pull request runhey#1545 from LGG686/dev1

    fix(Orochi): 修复组队御魂队员超时 runhey#1544

commit 0a9461e
Author: yEs1do <yangjiaxiyou@gmail.com>
Date:   Wed May 13 21:02:47 2026 +0800

    fix(Sougenbi): 删除冗余的图像文件

commit 199a5ad
Author: yuyuyuyuyu <190754820@qq.com>
Date:   Wed May 13 14:47:10 2026 +0800

    fix: update ROI values for check_main_4 images in JSON and assets

commit a1fa7a1
Author: AzurTian <azurtian@qq.com>
Date:   Wed May 13 11:20:09 2026 +0800

    fix(SwitchSoul): 修复切换御魂图像识别区域(仅更新了默认幕间)

    - 调整 ss_sou_switch_1 图像识别区域坐标,提高匹配精度
    - 调整 ss_sou_switch_2 图像识别区域坐标,优化检测效果
    - 调整 ss_sou_switch_3 图像识别区域坐标,提升定位准确性
    - 调整 ss_sou_switch_4 图像识别区域坐标,改善识别稳定性
    - 更新 ss_sou_click_present 点击预设按钮的识别区域
    - 统一前后端ROI区域参数,确保跨平台识别一致性

commit 84725ca
Author: yuyuyuyuyu <190754820@qq.com>
Date:   Wed May 13 13:10:55 2026 +0800

    fix(CostumeShikigami): add support for new costume shikigami entries

commit d5ccaf1
Author: yuyuyuyuyu <190754820@qq.com>
Date:   Wed May 13 12:50:27 2026 +0800

    fix(CostumeShikigami): 修复切换御魂图像识别区域(更新所有幕间)

    - 调整 ss_sou_switch_1 图像识别区域坐标,提高匹配精度
    - 调整 ss_sou_switch_2 图像识别区域坐标,优化检测效果
    - 调整 ss_sou_switch_3 图像识别区域坐标,提升定位准确性
    - 调整 ss_sou_switch_4 图像识别区域坐标,改善识别稳定性
    - 更新 ss_sou_click_present 点击预设按钮的识别区域
    - 统一前后端ROI区域参数,确保跨平台识别一致性

commit 7c6c1ca
Author: yuyuyuyuyu <190754820@qq.com>
Date:   Tue May 12 12:36:35 2026 +0800

    fix(Exploration): 调整创建队伍ROI识别坐标及模板图片

    更新 res_exp_create_team 模板图片,同步调整 assets.py 和 image.json
    中 I_EXP_CREATE_TEAM 的 roiFront 与 roiBack 检测区域坐标

commit 5f11a63
Author: yuyuyuyuyu <190754820@qq.com>
Date:   Tue May 12 12:29:57 2026 +0800

    fix(Sougenbi): 调整业原火相关OCR识别ROI  runhey#1550

commit 39855f3
Author: yEs1do <yangjiaxiyou@gmail.com>
Date:   Mon May 11 01:55:44 2026 +0800

    fix(Sougenbi): 移除冗余图像规则,更新OCR区域设置

commit adc2491
Author: yuyuyuyuyu <190754820@qq.com>
Date:   Sun May 10 18:20:29 2026 +0800

    fix(Orochi): 修复组队御魂队员超时  runhey#1544

    - 更新 gi_lock/gi_unlock/gi_explore 图片模板的 ROI 坐标
    - 同步更新 assets.py 中对应 RuleImage 参数
    - 大蛇脚本中将首页/探索检测由 GI 特定图片改为通用检测图片

commit 4e5d9d4
Author: yuyuyuyuyu <190754820@qq.com>
Date:   Sun May 10 11:04:25 2026 +0800

    fix(TrueOrochi): 更新st_find_ts模板图片及检测区域坐标

    调整roiFront和roiBack的检测范围参数,同步更新模板匹配图片

commit 602eede
Author: ryland <2234044577@qq.com>
Date:   Sun May 10 00:47:56 2026 +0800

    fix(WantedQuests): streamline exploration version checks and wanted quest detection

commit 8dd3b7a
Author: ryland <2234044577@qq.com>
Date:   Sun May 10 00:45:34 2026 +0800

    fix(WantedQuests): streamline exploration version checks and wanted quest detection

commit c36c511
Merge: 1943709 7ee5797
Author: huangrunheng <74492025+runhey@users.noreply.github.com>
Date:   Sat May 9 22:58:07 2026 +0800

    Merge pull request runhey#1539 from LGG686/dev-ui

    Dev UI

commit 7ee5797
Author: yuyuyuyuyu <190754820@qq.com>
Date:   Sat May 9 20:45:04 2026 +0800

    fix(WantedQuests): 修复OCR识别\"式神\"与用户配置\"挑战\"不匹配的问题

    - OCR识别文本可能返回\"式神\"而非\"挑战\",对此添加类型映射处理
    - 更新探索界面返回按钮检测,从红色按钮切换至黄色按钮(I_UI_BACK_RED → I_UI_BACK_YELLOW)
    - 调整多项ROI坐标以适配当前游戏画面布局(challenge/image.json, ocr.json, page_img.json)
    - 更新模板匹配图像资源(challenge unlock/lock, page_check_exploration)
    - 移除不再使用的wq_list_top_bottom_check图像及配置项

commit a6ec7a6
Author: yuyuyuyuyu <190754820@qq.com>
Date:   Sat May 9 16:13:05 2026 +0800

    fix: update ROI values for kirin images in assets and JSON

commit 0b40417
Author: yuyuyuyuyu <190754820@qq.com>
Date:   Sat May 9 16:12:38 2026 +0800

    fix(GoryouRealm): 移除副本的星期限制和日期检查逻辑

    副本已支持全天开放,不再需要按星期几切换式神或周一退出。

commit 1943709
Author: ryland <2234044577@qq.com>
Date:   Sat May 9 02:06:30 2026 +0800

    fix(Exploration): Update

commit 13efdc3
Merge: 6e03c72 aec7dfe
Author: huangrunheng <74492025+runhey@users.noreply.github.com>
Date:   Sat May 9 01:26:52 2026 +0800

    Merge pull request runhey#1533 from LGG686/dev-ui

    feat: 初步适配新探索界面

commit 6e03c72
Merge: a9f3537 98888a7
Author: huangrunheng <74492025+runhey@users.noreply.github.com>
Date:   Sat May 9 01:23:30 2026 +0800

    Merge pull request runhey#1535 from runhey/revert-1519-dev

    Revert "梦虚秘境支持PVP"

commit 98888a7
Author: huangrunheng <74492025+runhey@users.noreply.github.com>
Date:   Sat May 9 01:20:31 2026 +0800

    Revert "梦虚秘境支持PVP"

commit aec7dfe
Author: yuyuyuyuyu <190754820@qq.com>
Date:   Fri May 8 22:16:26 2026 +0800

    fix: update page_check_exploration.png

commit a9f3537
Merge: 6efb7e9 72e5129
Author: huangrunheng <74492025+runhey@users.noreply.github.com>
Date:   Fri May 8 22:10:18 2026 +0800

    Merge pull request runhey#1519 from lhye/dev

    梦虚秘境支持PVP

commit 72e5129
Author: lhye <woodree@gmail.com>
Date:   Fri May 8 21:57:41 2026 +0800

    refactor(WantedQuests): 删除旧的检测图片文件

commit 0fbbdc1
Author: lhye <woodree@gmail.com>
Date:   Fri May 8 21:56:54 2026 +0800

    fix(WantedQuests): 改'封'字检测为包含匹配

commit 6efb7e9
Merge: 477fea9 68e6ece
Author: huangrunheng <74492025+runhey@users.noreply.github.com>
Date:   Fri May 8 21:52:10 2026 +0800

    Merge pull request runhey#1525 from LGG686/dev-e

    refactor: 重构任务队列空闲处理与关闭游戏/模拟器配置

commit 690e55f
Author: lhye <woodree@gmail.com>
Date:   Fri May 8 21:51:46 2026 +0800

    fix(WantedQuests): 改悬赏任务检测为OCR识别'封'字

commit 30c686b
Author: lhye <woodree@gmail.com>
Date:   Fri May 8 21:42:05 2026 +0800

    fix(Orochi): update layer selection area to (125,99,74,585)

commit 2dc1e09
Author: lhye <woodree@gmail.com>
Date:   Fri May 8 21:39:26 2026 +0800

    fix(Orochi): update orochi images and coordinates

commit 252453c
Author: yuyuyuyuyu <190754820@qq.com>
Date:   Fri May 8 20:30:07 2026 +0800

    feat: 初步适配新探索界面

commit 6abfa5c
Author: lhye <woodree@gmail.com>
Date:   Fri May 8 08:13:14 2026 +0800

    fix(GameUi): 更新 page_check_soul_zones 图片及坐标 (152,20,68,36)

commit 3f73406
Author: lhye <woodree@gmail.com>
Date:   Fri May 8 07:47:45 2026 +0800

    fix(GameUi): 更新 page_check_exploration 图片及坐标 (1149,119,27,21)

commit 5284008
Author: lhye <woodree@gmail.com>
Date:   Thu May 7 22:54:02 2026 +0800

    fix(GameUi): 更新 page_check_exploration 图片及坐标

    - 替换 page_check_exploration.png 图片
    - 更新坐标 (1140,103,45,51)

commit 9bddd7a
Author: lhye <woodree@gmail.com>
Date:   Thu May 7 22:29:46 2026 +0800

    feat: 更新探索入口图片及坐标,优化HeroTest脚本

    GameUi:
    - 替换12个探索入口按钮图片,使用精确坐标匹配
    - 更新 roi_front 和 roi_back 参数与图片文件名中的坐标一致
    - 涉及图片: demon_encounter_goto_town, exploration_goto_main,
      exploration_goto_awake_zone, exploration_goto_soul_zone,
      exploration_goto_realm_raid, exploration_goto_goryou_realm,
      exploration_goto_delegation, exploration_goto_secret_zones,
      exploration_goto_area_boss, exploration_goto_six_gates,
      exploration_goto_bondling_fairyland, exploration_goto_hero_test
    - 更新 page_img.json, page_img_2.json, page_img_supplement.json 配置

    HeroTest:
    - 手动更新 script_task.py 脚本逻辑

commit 68e6ece
Author: yuyuyuyuyu <190754820@qq.com>
Date:   Mon May 4 21:57:23 2026 +0800

    refactor: 重构任务队列空闲处理与关闭游戏/模拟器配置

    - 重新整理任务队列空闲时的处理分支与执行流程
    - 调整关闭游戏/关闭模拟器相关的时间配置结构

commit 477fea9
Merge: ea2e619 3004213
Author: huangrunheng <74492025+runhey@users.noreply.github.com>
Date:   Mon May 4 17:52:17 2026 +0800

    Merge pull request runhey#1499 from LGG686/dev-d

    fix(Gameui): 增加新下载拓展包弹窗关闭识别

commit 237ed8a
Merge: 0ad3038 ea2e619
Author: LHY <woodree@gmail.com>
Date:   Sun May 3 09:47:08 2026 +0800

    Merge branch 'runhey:dev' into dev

commit 0ad3038
Author: lhye <woodree@gmail.com>
Date:   Sat May 2 19:46:46 2026 +0800

    fix(HeroTest): 对调skill6和skill7的文件和参数

    - skill6: 默认技能 (253,128,39,63)
    - skill7: 速度祝福 (427,356,62,38)
    - 优先级:默认技能在速度祝福之前

commit 0d73f06
Author: lhye <woodree@gmail.com>
Date:   Sat May 2 19:36:35 2026 +0800

    feat(HeroTest): 梦虚秘境新增默认技能兜底选项

    - 新增 I_HERO2_SKILL7 (默认技能) 图片规则
    - 添加 pve_skill 列表,作为选buff的兜底选项
    - 更新 image.json 添加 hero2_skill1-7 配置

commit ea2e619
Merge: b7fac9a 0ad172b
Author: huangrunheng <74492025+runhey@users.noreply.github.com>
Date:   Sat May 2 13:55:39 2026 +0800

    Merge pull request runhey#1502 from LGG686/pprr

    Enhance BondlingFairyland capture flow and guild monitor scheduling

commit 3004213
Author: yuyuyuyuyu <190754820@qq.com>
Date:   Sat May 2 13:39:48 2026 +0800

    feat(GameUi): 增加图鉴下载插画关闭识别

commit ae4f770
Author: yuyuyuyuyu <190754820@qq.com>
Date:   Sat May 2 13:38:43 2026 +0800

    feat(GameUi): 增加图鉴下载插画关闭识别

commit b7fac9a
Merge: 5fdcc12 2bbf9df
Author: huangrunheng <74492025+runhey@users.noreply.github.com>
Date:   Fri May 1 19:52:03 2026 +0800

    Merge pull request runhey#1516 from LGG686/dev-e

    feat: 无任务时支持关闭模拟器并预热拉起

commit 2bbf9df
Author: yuyuyuyuyu <190754820@qq.com>
Date:   Fri May 1 19:29:45 2026 +0800

    feat(config): 优化关闭游戏/模拟器限制时间配置项

    - 为配置字段添加描述信息以提供更清晰的帮助

commit 3bbf105
Author: yuyuyuyuyu <190754820@qq.com>
Date:   Fri May 1 18:50:27 2026 +0800

    fix(script):修复 _wait_close_game 日志误导及优化 datetime.now() 调用

    - 修复 _wait_close_game 中的误导性日志消息,使其与实际行为(未调用 GotoMain)一致
    - 优化 _wait_until_with_emulator_preheat 和 _wait_close_emulator_or 中的 datetime.now() 调用,
      预先捕获时间以避免轻微的竞态条件并提高阈值比较的可读性

commit d967bfa
Author: yuyuyuyuyu <190754820@qq.com>
Date:   Mon Apr 20 11:57:54 2026 +0800

    refactor(script): 空闲等待策略统一为 map 动态分发

    - 重构 _handle_wait_during_idle,统一通过 strategy_map 执行策略
    - 移除 map 之后的 if/else 参数分支逻辑
    - 策略方法统一只接收 next_run,配置项改为在方法内部读取
    - 拆分 close_emulator_or_goto_main 与 close_emulator_or_close_game 两个明确入口
    - 收敛关闭模拟器公共逻辑到 _wait_close_emulator_or,并用 fallback 回调处理后续动作
    - 保留无效策略回退 stay_there 的兜底行为
    - 添加翻译

commit c88daf3
Author: yuyuyuyuyu <190754820@qq.com>
Date:   Thu Apr 16 09:37:52 2026 +0800

    feat: 无任务时支持关闭模拟器并预热拉起

    - 新增 close_emulator_or_goto_main / close_emulator_or_close_game 策略
    - 新增 close_game_limit_time、close_emulator_limit_time、emulator_startup_lead_time 配置
    - 引入 _emulator_down 状态追踪,避免关闭后执行无效设备操作
    - 当模拟器处于关闭状态时,空闲分支统一走预热拉起流程
    - 配置变更后按新的 next_run 重新调度等待

    (cherry picked from commit 01e5d72)

commit 5fdcc12
Merge: 369197e 29aad9f
Author: huangrunheng <74492025+runhey@users.noreply.github.com>
Date:   Fri May 1 17:35:21 2026 +0800

    Merge pull request runhey#1515 from LGG686/dev-m

    fix(MemoryScrolls): 提高图像识别阈值以改善准确性

commit 369197e
Author: ryland <2234044577@qq.com>
Date:   Fri May 1 17:16:00 2026 +0800

    feat(workflows): enhance PR review intent workflow
    - switch to pull_request_target targeting dev branch
    - add pre_activation team membership check
    - wrap output sections in collapsible details tags
    - add pr-review-checklist workflow with shared template

commit 29aad9f
Author: yuyuyuyuyu <190754820@qq.com>
Date:   Fri May 1 12:29:24 2026 +0800

    fix(MemoryScrolls): 提高图像识别阈值以改善准确性

    将 ms/image.json 和 assets.py 中的图像匹配阈值从0.8 提升到 0.9,
    以提高绘卷任务中图像识别的准确性和稳定性。

commit 0a07704
Merge: 8ae172b 76e2a87
Author: huangrunheng <74492025+runhey@users.noreply.github.com>
Date:   Thu Apr 30 20:11:11 2026 +0800

    Merge pull request runhey#1513 from LGG686/dev-i

    fix(GeneralInvite): 修正 GeneralInvite 组件的标志位 ROI 参数  runhey#1509

commit 76e2a87
Author: yuyuyuyuyu <190754820@qq.com>
Date:   Thu Apr 30 13:53:33 2026 +0800

    fix(GeneralInvite): 修正 GeneralInvite 组件的标志位 ROI 参数  runhey#1509

    - 调整 `I_FLAG_2_ON` 的前后 ROI 区域坐标
    - 同步更新 `gi_flag_2_on.png` 资源及对应的 `image.json` 配置
    - 解决因坐标错误导致的识别匹配不准问题

commit 8ae172b
Merge: bb931f1 e93dad1
Author: huangrunheng <74492025+runhey@users.noreply.github.com>
Date:   Thu Apr 30 01:27:22 2026 +0800

    Merge pull request runhey#1512 from runhey/master

    Synchronize master to the dev branch

commit bb931f1
Author: ryland <2234044577@qq.com>
Date:   Thu Apr 30 01:09:32 2026 +0800

    fix(tasks/ActivityShikigame): Update

commit e93dad1
Author: ryland <2234044577@qq.com>
Date:   Thu Apr 30 00:18:15 2026 +0800

    feat(workflows): 优化 issue 分流和处理工作流
    - issue-triage: 简化激活流程,增加 skip-triage 标签支持,完善模板格式检查逻辑
    - issue-handle-question: 改进问题分类处理流程,更新评论模板和语气风格指导
    - issue-handle-*: 统一添加 roles 配置

    Co-authored-by: Copilot <copilot@github.com>

commit 5210524
Merge: 193be78 3e54a35
Author: huangrunheng <74492025+runhey@users.noreply.github.com>
Date:   Sat Apr 25 23:09:36 2026 +0800

    Merge pull request runhey#1505 from yEs1do/fix(GeneralInvite_img)

    fix(GeneralInvite): 更新 gi_flag_2_on.png 图像文件

commit 193be78
Merge: bbb081b c368e51
Author: huangrunheng <74492025+runhey@users.noreply.github.com>
Date:   Sat Apr 25 23:09:21 2026 +0800

    Merge pull request runhey#1508 from lhye/dev

    feat(DemonEncounter): 支持新的逢魔之时page切换

commit c368e51
Author: lhye <woodree@gmail.com>
Date:   Sat Apr 25 21:33:02 2026 +0800

    fix(DemonEncounter): 优化页面导航流程

    - 直接定位到 page_demon_encounter_realworld 页面
    - 移除多余的 page_demon_encounter 跳转

commit ee4746c
Author: lhye <woodree@gmail.com>
Date:   Sat Apr 25 21:26:34 2026 +0800

    feat(DemonEncounter): 重构逢魔之时页面切换逻辑

    - 更新 I_CHECK_DEMON_ENCOUNTER 参数为 (153,16,129,38)
    - 新增 I_CHECK_DEMON_ENCOUNTER_REALWORLD 检测图片
    - 新增 I_DEMON_ENCOUNTER_REALWORLD_GOTO 跳转图片
    - 新增 page_demon_encounter_realworld 页面
    - 重构页面导航:demon_encounter -> demon_encounter_realworld -> execute_boss
    - 移动图片 demon_de_boss_enter.png 到 GameUi/page 目录
    - 更新相关 JSON 配置

commit 1549ad3
Author: lhye <woodree@gmail.com>
Date:   Sat Apr 25 21:13:32 2026 +0800

    feat(DemonEncounter): 添加封魔boss进入按钮及wait_and_click函数

    - 添加 I_DE_BOSS_ENTER 图片规则 (994,485,106,30)
    - 在点灯笼后、执行boss前添加 wait_and_click(I_DE_BOSS_ENTER)
    - 新增 wait_and_click 函数:等待目标出现并点击
    - 更新 image.json 添加 de_boss_enter 配置

commit b6e0708
Author: ryland <2234044577@qq.com>
Date:   Sat Apr 25 01:42:53 2026 +0800

    feat: add GitHub Agentic Workflow for repository automation

commit cec3b6e
Merge: 984dcc0 bbb081b
Author: huangrunheng <74492025+runhey@users.noreply.github.com>
Date:   Fri Apr 24 23:54:48 2026 +0800

    Merge pull request runhey#1492 from runhey/dev

    Automated PR 2026.04.02

commit 3e54a35
Author: yEs1do <yangjiaxiyou@gmail.com>
Date:   Sat Apr 18 22:33:21 2026 +0800

    fix(GeneralInvite): 更新 gi_flag_2_on.png 图像文件

commit 0ad172b
Author: yuyuyuyuyu <190754820@qq.com>
Date:   Fri Apr 10 23:53:06 2026 +0800

    fix(GuildActivityMonitor): 修正运行日期解析与下次调度

    - 使用正则提取并过滤 1-7 的周几配置,避免异常输入导致误判
    - 在运行日期配置无效时记录警告并直接结束任务,避免继续调度
    - 当任务在命中当天配置后执行完成时,下一次调度排除当天,
      防止再次落回同一天
    - 统一按最近有效运行日计算下次执行时间,提升周期调度稳定性

commit 30ecbcd
Author: yuyuyuyuyu <190754820@qq.com>
Date:   Fri Apr 10 20:21:19 2026 +0800

    feat(GuildActivityMonitor): 支持按周几控制监控任务运行

    -在 GuildActivityMonitorCombatTime 中新增 run_days 配置项,默认值为 1,2,3,4,5,6,7(周一到周日)。
    -任务启动时根据 datetime.now().weekday()+1 判断当天星期,若不在 run_days 中则直接跳过并结束

commit 7339ff9
Author: Azure <bluetian1st@gmail.com>
Date:   Mon Nov 24 18:12:39 2025 +0800

    fix(BondlingFairyland): adopt new ui and add minimal mode switch

commit 3f5b3aa
Author: Azure <bluetian1st@gmail.com>
Date:   Fri Nov 14 21:45:22 2025 +0800

    add(BondlingFairyland): cap again and fix check bondling fairyland page

commit 11d08ff
Author: Azure <bluetian1st@gmail.com>
Date:   Fri Nov 14 16:27:04 2025 +0800

    add(BondlingFairyland): four mode and fix capture setting

commit f97ba39
Author: Azure <bluetian1st@gmail.com>
Date:   Thu Nov 13 17:54:08 2025 +0800

    add(BondlingFairyland): support new four bondling types and fix page check

commit 96b2d4b
Author: yuyuyuyuyu <190754820@qq.com>
Date:   Sun Apr 5 20:48:53 2026 +0800

    fix(GuildActivityMonitor): 监控任务加入长等待白名单避免误判卡死

commit 8e3bcb1
Author: yuyuyuyuyu <190754820@qq.com>
Date:   Tue Apr 14 11:24:42 2026 +0800

    Revert(GameUi): 回滚进入花和战与商店入口的部分资源配置

    - 回退由 71fb8ef 引入的图像与 ROI 调整
    - 花合战太大了月底会识别不到
    - 商店图标有多种类型,选择对文字识别

    (cherry picked from commit 85d097e)

commit 508d8bb
Author: yuyuyuyuyu <190754820@qq.com>
Date:   Sat Apr 11 16:57:21 2026 +0800

    fix(GameUi): 增加下载扩展包弹窗关闭识别

    - 扩大GlobalGame中取消按钮(小)的ROI区域,提升弹窗关闭识别稳定性
    - 在式神录等页面补充取消按钮识别,避免被弹窗遮挡后卡住流程
    - 调整商店页面的附加识别项,统一优先处理返回与取消类弹窗

commit a49c13b
Author: yuyuyuyuyu <190754820@qq.com>
Date:   Thu Apr 9 23:08:24 2026 +0800

    feat(AutoCheckinBigGod): 完成任务后恢复阴阳师前台状态

    -新增 cleanup 收尾恢复逻辑,任务结束时主动拉起阴阳师前台
    -按理可以直接注释#124行,但相比直接注释,该方案更保守

commit 984dcc0
Merge: ad85856 8e2f9d0
Author: huangrunheng <74492025+runhey@users.noreply.github.com>
Date:   Fri Mar 13 17:04:19 2026 +0800

    Merge pull request runhey#1471 from runhey/dev

    Dev

commit ad85856
Merge: da9a545 7d35a9f
Author: huangrunheng <74492025+runhey@users.noreply.github.com>
Date:   Thu Mar 12 23:59:09 2026 +0800

    Merge pull request runhey#1466 from runhey/dev

    Automated PR 2026.03.12
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.

1 participant