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: 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 diff --git a/assets/interface.json b/assets/interface.json index 255d01ef..234c3743 100644 --- a/assets/interface.json +++ b/assets/interface.json @@ -569,7 +569,7 @@ 88 ], "expected": [ - "蜥蜴人祭坛" + "(?=.*[蜥])(?=.*[蜴])(?=.*[祭坛]).{5,}$" ] } } 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, 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" 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": [ 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 40953bb6..2778a8a5 100644 --- a/release/release_header.md +++ b/release/release_header.md @@ -18,10 +18,10 @@ # ci · 开发版 # # 【叠加示例】 -# target: all +# # 这段所有版本的 Release Notes 都会显示 # -# target: stable +# # 这段只出现在正式版 Release Notes 里 # # → stable 收到:第 1 段 + 第 2 段