Skip to content

fix(WeeklyTrifles):修复每周琐事摸鱼行动问题 - #1943

Merged
runhey merged 1 commit into
runhey:devfrom
Hurry2:dev
Oct 18, 2026
Merged

runhey merged 1 commit into
runhey:devfrom
Hurry2:dev

Conversation

@Hurry2

@Hurry2 Hurry2 commented Oct 16, 2026 •

Copy link
Copy Markdown
Contributor

-上周存储弹窗挡住全部存储标志直接退出的情况

  • 同时删除sleep,使用interval参数代替

Summary by Sourcery

修复每周摸鱼保存流程,确保弹窗遮挡时仍能正确完成保存操作。

Bug Fixes:

  • 修复每周摸鱼保存流程中存储弹窗遮挡保存标志导致流程提前退出的问题。

Enhancements:

  • 用交互操作的 interval 参数替代固定等待,提升每周摸鱼保存流程的稳定性。
Original summary in English

Summary by Sourcery

修复每周摸鱼保存流程,确保弹窗遮挡时仍能正确完成保存操作。

Bug Fixes:

  • 修复每周摸鱼保存流程中存储弹窗遮挡保存标志导致流程提前退出的问题。

Enhancements:

  • 用交互操作的 interval 参数替代固定等待,提升每周摸鱼保存流程的稳定性。

-上周存储弹窗挡住全部存储标志直接退出的情况

@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.

你好 - 我发现了 1 个问题

给 AI 代理的提示
请处理此次代码审查中的评论:

## 单条评论

### 评论 1
<location path="tasks/WeeklyTrifles/script_task.py" line_range="103" />
<code_context>
-                    )
-                    continue
-                if self.appear_then_click(self.I_WT_HAPPY_GET):
+                if self.appear_then_click(self.I_WT_HAPPY_GET, interval=1):
                     continue
                 if cu_tickts >= cost_tickts and not_save_flag:
</code_context>
<issue_to_address>
**上周弹窗导致跳过保存**

上次保存指示器消失后,如果上周弹窗仍然显示并遮挡了“全部保存”控件,`ui_click_until_smt_disappear` 可能会在上周弹窗仍覆盖“全部保存”控件时结束。随后,初始的 `appear(I_WT_SAVE_ALL)` 检查会跳过包含此 `I_WT_HAPPY_GET` 点击的循环,任务便会返回主页面而没有保存。

请在检查 `I_WT_SAVE_ALL` 之前关闭 `I_WT_HAPPY_GET`,然后刷新屏幕并继续保存流程。
</issue_to_address>

Sourcery 评估

等待批准。 请先处理 1 个问题。

阻塞性问题:tasks/WeeklyTrifles/script_task.py:103


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

Hey - I've found 1 issue

Prompt for AI Agents
Please address the comments from this code review:

## Individual Comments

### Comment 1
<location path="tasks/WeeklyTrifles/script_task.py" line_range="103" />
<code_context>
-                    )
-                    continue
-                if self.appear_then_click(self.I_WT_HAPPY_GET):
+                if self.appear_then_click(self.I_WT_HAPPY_GET, interval=1):
                     continue
                 if cu_tickts >= cost_tickts and not_save_flag:
</code_context>
<issue_to_address>
**Prior-week popup skips saving**

When the prior-week popup remains visible after the last-save indicator disappears and obscures the save-all control, `ui_click_until_smt_disappear` can finish while the prior-week popup still covers the save-all control. The initial `appear(I_WT_SAVE_ALL)` check then skips the loop containing this `I_WT_HAPPY_GET` click, and the task returns to the main page without saving.

Dismiss `I_WT_HAPPY_GET` before checking `I_WT_SAVE_ALL`, then refresh the screen and continue the save flow.
</issue_to_address>

Sourcery assessment

Approval pending. 1 finding to address first.

Blocking findings: tasks/WeeklyTrifles/script_task.py:103


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

Comment thread tasks/WeeklyTrifles/script_task.py
@github-actions

Copy link
Copy Markdown
Contributor

Findings

  • C2 [风险]
    位置:tasks/WeeklyTrifles/script_task.py:ScriptTask._save_touch_fish,进入保存页面后的等待逻辑(约第 87 行)
    原因:清单禁止任务流程使用 sleep,当前新增 sleep(0.5);同时折叠窗口 while 1 仅依赖页面出现,缺少超时或失败退出条件。
    修改:移除固定 sleep,改用已有交互等待/稳定性机制,并为入口循环增加超时或明确失败退出处理。

Warning

Firewall blocked 1 domain

The following domain was blocked by the firewall during workflow execution:

  • ab.chatgpt.com

To allow these domains, add them to the network.allowed list in your workflow frontmatter:

network:
  allowed:
    - defaults
    - "ab.chatgpt.com"

See Network Configuration for more information.

Generated by PR Review Checklist for #1943 · codex · gpt56 · 16.4 AIC · ⌖ 2.8 AIC · ⊞ 12.1K · ◷

@runhey
runhey merged commit 6d718fe into runhey:dev Oct 18, 2026
6 of 7 checks passed
ZH-CZR added a commit to ZH-CZR/OnmyojiAutoScript that referenced this pull request Oct 19, 2026
来源 runhey/dev / runhey/master(2026-10-15~18 新增):
- `1d990fce`/`d0bc419a`/`cafe832b`/`0e7edcc8`/`f80c3a6d`/`251cb1cd` 桌面客户端
  (PR runhey#1887):窗口后端、Device 层生命周期、独立配置组与多开账号隔离;
- `3252b071` MPay 登录弹窗、`6ea67658` Restart 桌面就地重试(已移植到
  `Component/Login` + 本地 Restart 架构);
- `84366fc5` Delegation 勾玉确认/返回死循环(PR runhey#1940);
- `9afe3d32` WantedQuests 邀请已选好友判定(PR runhey#1939);
- `43c84c88` GeneralBattle 关 buff 面板后点准备;
- `55b7d957` WeeklyTrifles 上周存储弹窗遮挡(PR runhey#1943)。

本地适配:roi_pad 服务端化(`module/image/runtime.py`),桌面登录/重启按本地
架构迁移;新增 26 项回归测试。

跳过:`7e506bc3`(本地已无 Task name mismatch 校验)、`911e996d`(本地无该
workflow 文件)、`60117f17`/`7f0728bf`(`battle_wait.py` 本地不存在;御魂溢出
提示本地 `_handle_reward`/`page_reward` 已覆盖)、`c2023476`+`d8677dc0`(净零)。
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.

2 participants