From 2d1d024a27f8f6378728daa9cbb3cf32a6e82255 Mon Sep 17 00:00:00 2001 From: sunyink Date: Sun, 3 May 2026 10:49:28 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix:=E6=AF=8F=E6=97=A5=E4=BB=BB=E5=8A=A1,?= =?UTF-8?q?=E9=98=B2=E6=AD=A2=E8=BF=87=E5=A4=9A=E7=82=B9=E5=87=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/resource/base/pipeline/QuestList.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/resource/base/pipeline/QuestList.json b/assets/resource/base/pipeline/QuestList.json index 5f480b2f..0a2f7c59 100644 --- a/assets/resource/base/pipeline/QuestList.json +++ b/assets/resource/base/pipeline/QuestList.json @@ -50,8 +50,10 @@ 0, 0 ], + "post_delay": 1000, "next": [ "RewardsDaily_GetDailyReward", + "[JumpBack]Global_WaitingForLoading", "RewardsDaily_InIndex" ], "on_error": [ From bc1650122a838ed0d18fb7f905886faec04ddee1 Mon Sep 17 00:00:00 2001 From: sunyink Date: Sun, 3 May 2026 10:56:14 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix:=E6=B4=BB=E5=8A=A8=E9=A1=B5,=E8=B0=83?= =?UTF-8?q?=E4=BD=8E=E7=BA=A2=E7=82=B9=E9=98=88=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/resource/base/pipeline/Activities.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/resource/base/pipeline/Activities.json b/assets/resource/base/pipeline/Activities.json index 31e0d45b..829a0e64 100644 --- a/assets/resource/base/pipeline/Activities.json +++ b/assets/resource/base/pipeline/Activities.json @@ -121,7 +121,7 @@ "ActiveGe.png" ], "green_mask": true, - "threshold": [0.75], + "threshold": [0.7], "action": "Click", "target_offset": [ -50, From 767d814b886d32bb5417382321b13fb8f72b2507 Mon Sep 17 00:00:00 2001 From: sunyink Date: Fri, 8 May 2026 10:36:27 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix=EF=BC=9A=E9=92=93=E9=B1=BC=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E5=AF=BC=E8=87=B4=E4=B8=8D=E5=8D=96=E9=B1=BC=20#270?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- agent/fishing_agent.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/agent/fishing_agent.py b/agent/fishing_agent.py index 47d78f16..fccf4b6b 100644 --- a/agent/fishing_agent.py +++ b/agent/fishing_agent.py @@ -488,8 +488,7 @@ def main_loop(self) -> bool: self.tap(*self.coords.screen_center) self.delay(1.0) - if success: - self.check_and_sell_fish() + self.check_and_sell_fish() return success @@ -509,6 +508,10 @@ def run(self, max_count: Optional[int] = None) -> bool: self.main_loop() finally: self.running = False + # 兜底：结束后卖出剩余鱼获 + if self.fish_since_last_sell > 0: + print(f"\n📦 钓鱼结束，卖出剩余 {self.fish_since_last_sell} 条鱼") + self.sell_all_fish() return self.success_count > 0 From ef0680f09e2c9f22dd9a6272d95ea935cb7ca687 Mon Sep 17 00:00:00 2001 From: sunyink Date: Fri, 8 May 2026 15:29:24 +0800 Subject: [PATCH 4/6] =?UTF-8?q?fix:=E4=B8=A4=E5=A4=84OCR=E7=A8=B3=E5=81=A5?= =?UTF-8?q?=E6=80=A7=E8=B0=83=E6=95=B4,=E9=92=93=E9=B1=BC=E5=92=8C?= =?UTF-8?q?=E7=8B=A9=E7=8C=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/interface.json | 2 +- assets/resource/base/pipeline/Fishing.json | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/assets/interface.json b/assets/interface.json index 4bf45f27..e0b7dc82 100644 --- a/assets/interface.json +++ b/assets/interface.json @@ -569,7 +569,7 @@ 88 ], "expected": [ - "蜥蜴人祭坛" + "(?=.*[蜥])(?=.*[蜴])(?=.*[祭坛]).{5,}$" ] } } diff --git a/assets/resource/base/pipeline/Fishing.json b/assets/resource/base/pipeline/Fishing.json index f1795328..4ef6ed3e 100644 --- a/assets/resource/base/pipeline/Fishing.json +++ b/assets/resource/base/pipeline/Fishing.json @@ -169,15 +169,22 @@ "desc": "识别点击捕网", "recognition": "OCR", "roi": [ - 85, - 228, - 98, - 34 + 88, + 230, + 88, + 25 ], "expected": [ "经营管理" ], + "only_rec": true, "action": "Click", + "target": [ + 128, + 202, + 9, + 8 + ], "post_delay": 1000, "next": [ "Fishing_InFishingNet" From 750e0b1a887454cfec5e3220f7e28bbb52ee14c9 Mon Sep 17 00:00:00 2001 From: sunyink Date: Fri, 8 May 2026 21:18:51 +0800 Subject: [PATCH 5/6] =?UTF-8?q?chore:=E5=85=AC=E5=91=8A=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=B3=A8=E5=85=A5.=E6=B3=A8=E9=87=8A=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=A1=A8=E8=BE=BE=E6=96=B9=E5=BC=8F=E6=9B=B4=E5=8A=A0=E5=87=86?= =?UTF-8?q?=E7=A1=AE.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- release/app_msg.md | 4 +- release/release_header.md | 78 +++++++++++++++++++-------------------- 2 files changed, 40 insertions(+), 42 deletions(-) diff --git a/release/app_msg.md b/release/app_msg.md index a249aa5d..009732e5 100644 --- a/release/app_msg.md +++ b/release/app_msg.md @@ -18,10 +18,10 @@ # ci · 开发版 # # 【叠加示例】（示例中用 [target:...] 代替真实标记，避免被脚本误解析，实操时改成注释形式。） -# [target: all] +# # 这段所有版本都会看到 # -# [target: beta] +# # 这段只有 beta 版能看到 # # → stable 收到：第 1 段 diff --git a/release/release_header.md b/release/release_header.md index ea0e1d26..389b8f12 100644 --- a/release/release_header.md +++ b/release/release_header.md @@ -1,42 +1,40 @@ - - 内容… - - 版本类型： - all · 所有版本（stable / beta / alpha / ci） - stable · 正式版 - beta · 公测版 - alpha · 内测版 - ci · 开发版 - - 【叠加示例】 - - 这段所有版本的 Release Notes 都会显示 - - - 这段只出现在正式版 Release Notes 里 - - → stable 收到：第 1 段 + 第 2 段 - → beta 收到：第 1 段 - → ci 收到：第 1 段 - - 【使用方法】 - 1. 在本文件末尾（注释之后）按格式写好内容块 - 2. 将改动合并入主分支，下次对应版本 CI 自动读取并插入 Release Notes 头部 - 3. 发版后请清空内容块（保留本段注释），防止旧内容重复出现 - - ⚠️ 若版本类型标识（stable/beta/alpha/ci）发生变更， - 需同步修改 scripts/changelog_generator.py 中的 _get_tag_type() -════════════════════════════════════════════════════════════════ ---> +# ════════════════════════════════════════════════════════════════ +# Release 头部草稿 · 注入目标：GitHub Release Notes 顶部 +# ════════════════════════════════════════════════════════════════ +# +# 【格式规范】 +# 每段内容块前须标注目标版本标记，CI 脚本按顺序拼接所有匹配 +# 当前版本类型的块，插入到 Release Notes 正文最顶部。 +# +# 标记格式： +# +# 内容… +# +# 版本类型： +# all · 所有版本（stable / beta / alpha / ci） +# stable · 正式版 +# beta · 公测版 +# alpha · 内测版 +# ci · 开发版 +# +# 【叠加示例】 +# +# 这段所有版本的 Release Notes 都会显示 +# +# +# 这段只出现在正式版 Release Notes 里 +# +# → stable 收到：第 1 段 + 第 2 段 +# → beta 收到：第 1 段 +# → ci 收到：第 1 段 +# +# 【使用方法】 +# 1. 在本文件末尾（注释之后）按格式写好内容块 +# 2. 将改动合并入主分支，下次对应版本 CI 自动读取并插入 Release Notes 头部 +# 3. 发版后请清空内容块（保留本段注释），防止旧内容重复出现 +# +# ⚠️ 若版本类型标识（stable/beta/alpha/ci）发生变更， +# 需同步修改 scripts/changelog_generator.py 中的 _get_tag_type() +# ════════════════════════════════════════════════════════════════ 159 Moons of Grace , And miles to go with you. From abd1c1cef0075af12410045bc8da1b6dbaa2597e Mon Sep 17 00:00:00 2001 From: sunyink Date: Fri, 8 May 2026 21:28:32 +0800 Subject: [PATCH 6/6] =?UTF-8?q?ci:=E4=B8=8D=E5=86=8D=E5=85=81=E8=AE=B8DS?= =?UTF-8?q?=E5=AE=A1=E6=9F=A5=E8=87=AA=E5=8A=A8=E5=9C=A8PR=E4=B8=AD?= =?UTF-8?q?=E8=83=A1=E8=AF=B4=E5=85=AB=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deepseek-review.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deepseek-review.yml b/.github/workflows/deepseek-review.yml index ef145005..10c961de 100644 --- a/.github/workflows/deepseek-review.yml +++ b/.github/workflows/deepseek-review.yml @@ -11,8 +11,8 @@ name: DeepSeek PR Reviewer on: - pull_request: - types: [opened, synchronize, reopened, ready_for_review] +# pull_request: +# types: [opened, synchronize, reopened, ready_for_review] workflow_dispatch: inputs: pr_number: