From b97615126366b3c8302c9b81e55b26314a3330a8 Mon Sep 17 00:00:00 2001 From: AttilaNet Date: Tue, 17 Nov 2026 00:17:52 +0800 Subject: [PATCH] feat: add configurable battle loss cooldown in Web 2.0.13 --- .github/workflows/web-image.yml | 8 ++ Dockerfile | 2 +- HANDOFF.md | 14 +++ README.md | 10 +- analysis/RELEASE_2_0_13.md | 27 ++++ compose.yaml | 4 +- deploy/web/README.md | 18 +-- deploy/web/image.env.example | 4 +- ranch_assistant/battle_retry.py | 19 +++ ranch_assistant/battles.py | 16 ++- ranch_assistant/engine.py | 4 + ranch_assistant/policy_io.py | 2 + ranch_assistant/progression.py | 26 ++-- ranch_assistant/progression_gui.py | 4 +- ranch_assistant/quests.py | 8 ++ ranch_assistant/tests/test_battle_retry.py | 139 +++++++++++++++++++++ ranch_web/PRODUCT.md | 10 +- ranch_web/README.md | 12 +- ranch_web/__init__.py | 2 +- ranch_web/policies.py | 1 + ranch_web/static/app.js | 4 +- ranch_web/static/index.html | 2 +- ranch_web/views.py | 4 +- 23 files changed, 297 insertions(+), 43 deletions(-) create mode 100644 analysis/RELEASE_2_0_13.md create mode 100644 ranch_assistant/battle_retry.py create mode 100644 ranch_assistant/tests/test_battle_retry.py diff --git a/.github/workflows/web-image.yml b/.github/workflows/web-image.yml index a3e41e0..5581a8a 100644 --- a/.github/workflows/web-image.yml +++ b/.github/workflows/web-image.yml @@ -59,6 +59,8 @@ jobs: PY - name: Install Web runtime and test dependencies run: python -m pip install -r ranch_web/requirements-test.txt + - name: Offline battle loss cooldown and progression regression + run: python -B -m unittest ranch_assistant.tests.test_battle_retry ranch_assistant.tests.test_progression_replay_loop ranch_web.tests.test_web_policies -v - name: Offline sweep hidden handoff, battles, and engine regression timeout-minutes: 3 run: | @@ -111,6 +113,12 @@ jobs: WEB_VERSION: ${{ steps.version.outputs.version }} VCS_REF: ${{ github.sha }} run: docker build --build-arg "WEB_VERSION=$WEB_VERSION" --build-arg "VCS_REF=$VCS_REF" --tag ranch-web-smoke . + - name: Verify image version and source revision + env: + VCS_REF: ${{ github.sha }} + run: | + docker image inspect ranch-web-smoke --format '{{json .Config.Labels}}' > /tmp/ranch-web-image-labels.json + python -c "import json,os; from ranch_web import __version__; labels=json.load(open('/tmp/ranch-web-image-labels.json')); assert labels['org.opencontainers.image.version']==__version__; assert labels['org.opencontainers.image.revision']==os.environ['VCS_REF']" - name: Offline container health, persistence permissions, and graceful stop run: | docker run --detach --name ranch-web-smoke --network none --read-only \ diff --git a/Dockerfile b/Dockerfile index 0e3d045..89b4933 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM python:3.12-slim-bookworm -ARG WEB_VERSION=2.0.12 +ARG WEB_VERSION=2.0.13 ARG VCS_REF=unknown LABEL org.opencontainers.image.source="https://github.com/attilanet/myrzx_bot" \ org.opencontainers.image.title="myrzx_bot Web" \ diff --git a/HANDOFF.md b/HANDOFF.md index 0633bc5..6a0a5df 100644 --- a/HANDOFF.md +++ b/HANDOFF.md @@ -1,3 +1,17 @@ +# ?????Web 2.0.13?2026-11-17? + +- ???????`D:\Projects\myrzx_bot`? +- ???????????????????3?????1?168??????????????????????????? [2.0.13 ????](analysis/RELEASE_2_0_13.md)? +- ?????560????????558???2? Windows ???????26?????19?????? +- ??????????????????? GitHub Release + GHCR????? Gitea ?? API???????? X99? +- ?????`origin` ? `https://gitea.witchercheung.cn/witcher/myrzx_bot.git`?`github` ? `https://github.com/AttilaNet/myrzx_bot.git`?????????????????????? `github`? +- ?? Git Credential Manager ??? AttilaNet??? GitHub ???????????????????????? +- ???? `2.0.13`??? `v2.0.13`???????? GitHub Actions?Release??????????? SHA???????????????????? + +## ??? 2026-11-16 ? 2.0.12 ???? + +???????? remote ???????????????????????? Git ???????????????????????????? + # 项目交接入口 > 整理日期:2026-11-16,Asia/Shanghai。面向没有看过历史对话的新模型。 diff --git a/README.md b/README.md index 1c94432..7d09b90 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,13 @@ # 牧羊人之心Bot -Web **2.0.12**,源码发布入口为 `main`;原生 PySide6 桌面正式版本保留 **1.2.0**(`v1.2.0`)。两者的适配资料基线均为《牧羊人之心》Android **1.9.68**。 +Web **2.0.13**,源码发布入口为 `main`;原生 PySide6 桌面正式版本保留 **1.2.0**(`v1.2.0`)。两者的适配资料基线均为《牧羊人之心》Android **1.9.68**。 支持多账号独立运行、牧场培养、每日事务、主线与委托推进、近似战斗模拟、探险、扫荡及本地掉落分析,能力与验证限制见下文。 +**2.0.13** 新增战败冷却自动重试:主线与委托达到连续战败上限后,默认等待3小时,可配置1~168小时;冷却结束后重新检查队伍、资源和策略授权。冷却跨重启保留,手动停止和未知请求不重发的规则继续生效。每日委托额度耗尽时显示下次刷新时间。见 [2.0.13 发布说明](analysis/RELEASE_2_0_13.md)。 + ## 运行指引 -### Web 2.0.12(源码发布入口 main) +### Web 2.0.13(源码发布入口 main) Windows 使用 Python 3.12+,在项目根目录执行: @@ -23,7 +25,7 @@ Web 无需 Node/npm 或 PySide6,数据独立保存在 `local_state/ranch_web` 现场旧 pending 仅保留 `0211 / 3`、提示与 `sampleId`,原始响应已被日志轮转覆盖,无法还原隐藏关卡 ID。仅对符合精确四字段 legacy 形态、严格确认已入场且未结算的这类旧阶段,本版保留证据,在本地归档为未完成并放弃,不提交胜利或失败、不重发入场,让后续策略继续;这不表示当前生产战斗已经打通。 -本版共 **491 项唯一仓库测试:489 通过、2 项 Windows 预期跳过,0 失败 / 错误**;历史测试不计入本版。正式镜像与稳定 Release 就绪后,由用户通过“帮助 → 检查版本更新…”在线升级,详情见 [本版发布说明](analysis/RELEASE_2_0_12.md)。 +2.0.12 历史版本共 **491 项唯一仓库测试:489 通过、2 项 Windows 预期跳过,0 失败 / 错误**;历史测试不计入本版。正式镜像与稳定 Release 就绪后,由用户通过“帮助 → 检查版本更新…”在线升级,详情见 [本版发布说明](analysis/RELEASE_2_0_12.md)。 沿用 2.0.11 的 Linux 战斗输入传输与按证据恢复修复。手动停止继续阻止提交,来源策略关闭时等待启用,未知已发送写请求不重放,见 [2.0.11 发布说明](analysis/RELEASE_2_0_11.md)。 @@ -48,7 +50,7 @@ Web 无需 Node/npm 或 PySide6,数据独立保存在 `local_state/ranch_web` | 组件与版本 | 《牧羊人之心》Android 基线 | 入口与状态 | | --- | --- | --- | -| Web 2.0.12 | 1.9.68 | 源码发布入口 `main`,`Start_Ranch_Web.cmd` / `sh start-web.sh` | +| Web 2.0.13 | 1.9.68 | 源码发布入口 `main`,`Start_Ranch_Web.cmd` / `sh start-web.sh` | | 桌面 1.2.0(`v1.2.0`) | 1.9.68 | 当前桌面版本;`Start_Ranch_Helper.cmd` / `python -m ranch_assistant` | | 桌面 1.1.1(`v1.1.1`) | 1.9.68 | 历史正式版本,1.1 系列修复与界面更新 | | 桌面 1.1.0(`v1.1.0`) | 1.9.68 | 历史已发布版本 | diff --git a/analysis/RELEASE_2_0_13.md b/analysis/RELEASE_2_0_13.md new file mode 100644 index 0000000..7bdb9d4 --- /dev/null +++ b/analysis/RELEASE_2_0_13.md @@ -0,0 +1,27 @@ +# Web 2.0.13 发布说明 + +Web **2.0.13** 基于 **2.0.12**;游戏资料 **1.9.68**,桌面正式版保留 **1.2.0**。 + +## 本版范围 + +- **战败冷却后自动重试**:主线、支线及委托战斗达到配置的连续战败上限后,默认冷却3小时。新增“战败冷却时间(小时)”,支持1~168小时;Web 自动主线、自动委托共享同一设置,桌面位于“自动主线 → 推进策略”。 +- **等待时间明确**:任务阻塞原因显示北京时间的冷却截止时间。到期后重新检查策略、队伍、体力、资源和战斗支持条件,再决定是否继续;不再因历史战败计数永久阻塞。 +- **重启保留进度**:记录最近一次确认战败的时间,冷却不会因刷新或重启重新计时。没有时间戳的旧战败记录在首次读取时开始一次冷却,并持久保存;不修改任务步骤或战果。 +- **恢复缓存同步**:任务规划与战斗日志两处战败计数均能到期恢复,即使角色快照没有变化,也会重新规划。 +- **每日委托等待**:接取额度耗尽时显示下次每日刷新时间。沿用原有跨日刷新与10秒宽限逻辑,等待服务器确认后再接取,不虚增额度。 + +## 沿用约束 + +手动停止仍阻止策略执行;关闭来源策略不会被冷却恢复擅自开启。结果未知的入场、结算等请求继续保留待核对,不因冷却到期删除或重放。多账号状态继续隔离。 + +战斗继续使用现有快速近似模型和 `client_v4_x10` 伤害配置;本版不修改伤害参数,10倍伤害也不构成所有关卡必胜的保证。 + +## 验证 + +本版验证结果在发布前由实际离线回归报告填入。测试不调用真实游戏 API,不部署生产、不修改真实账号策略或 journal。 + +## 发布与升级 + +源码与同一版本标签同步到 GitHub 和 Gitea。在线更新继续使用原 GitHub Release + GHCR 通道;本版不迁移更新服务器。 + +正式镜像及稳定 Release 核验就绪后,用户在“帮助 → 检查版本更新…”发起升级。随版提供 `updater.pyz` 和 `SHA256SUMS`;升级完成后刷新网页。发布成功与生产安装验收分别核对。 diff --git a/compose.yaml b/compose.yaml index a110c60..14f0e2a 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,11 +1,11 @@ name: ranch-web services: web: - image: ${RANCH_WEB_IMAGE:-ghcr.io/attilanet/myrzx_bot-web:v2.0.12} + image: ${RANCH_WEB_IMAGE:-ghcr.io/attilanet/myrzx_bot-web:v2.0.13} build: context: . args: - WEB_VERSION: ${RANCH_WEB_BUILD_VERSION:-2.0.12} + WEB_VERSION: ${RANCH_WEB_BUILD_VERSION:-2.0.13} user: "10001:10001" init: true restart: unless-stopped diff --git a/deploy/web/README.md b/deploy/web/README.md index 2f8cd5e..da7c57a 100644 --- a/deploy/web/README.md +++ b/deploy/web/README.md @@ -1,8 +1,10 @@ # Web 2 Linux Docker 部署与更新 -当前应用及更新示例为 `v2.0.12`。下文首次初始化章节保留 2.0.1 流程及历史版本示例。游戏资料基线为 `1.9.68`,桌面版保留 `1.2.0`。镜像流水线成功、Git tag 与 GitHub Release 是不同的发布步骤:在线更新必须等对应镜像及非草稿、非预发布的 Release 均发布后才能使用。私有仓库未获授权返回 404 属于访问失败,不代表没有版本;只有成功读取列表且没有稳定 2.x 时才显示“暂无正式版”。 +**2.0.13** 新增战败冷却自动重试:主线与委托达到连续战败上限后,默认等待3小时,可配置1~168小时;冷却结束后重新检查队伍、资源和策略授权。冷却跨重启保留,手动停止和未知请求不重发的规则继续生效。每日委托额度耗尽时显示下次刷新时间。见 [2.0.13 发布说明](../../analysis/RELEASE_2_0_13.md)。 -2.0.12 修复扫荡隐藏事件的自动战斗接续:完整入场响应与原始队伍快照等原始输入均已保存且可验证时,才按 `stageEvent.hideStageId` 直接构建隐藏关卡难度1的战斗,不再请求入场,战后使用隐藏 ID 结算。旧记录即使能从 trace 找回隐藏 ID,缺少原始队伍也保留中文待核对状态,不以当前属性重算,不发送游戏写请求。现场旧 `0211 / 3` 记录的原始响应已被日志轮转覆盖,无法还原隐藏 ID;仅对符合精确四字段 legacy 形态、严格确认已入场且未结算的这类旧阶段,保留证据并在本地归档为未完成、放弃,不提交胜负或重发入场。归档不等于服务端已结算,也不表示当前生产战斗已打通,见 [本版发布说明](../../analysis/RELEASE_2_0_12.md)。 +当前应用及更新示例为 `v2.0.13`。下文首次初始化章节保留 2.0.1 流程及历史版本示例。游戏资料基线为 `1.9.68`,桌面版保留 `1.2.0`。镜像流水线成功、Git tag 与 GitHub Release 是不同的发布步骤:在线更新必须等对应镜像及非草稿、非预发布的 Release 均发布后才能使用。私有仓库未获授权返回 404 属于访问失败,不代表没有版本;只有成功读取列表且没有稳定 2.x 时才显示“暂无正式版”。 + +2.0.13 修复扫荡隐藏事件的自动战斗接续:完整入场响应与原始队伍快照等原始输入均已保存且可验证时,才按 `stageEvent.hideStageId` 直接构建隐藏关卡难度1的战斗,不再请求入场,战后使用隐藏 ID 结算。旧记录即使能从 trace 找回隐藏 ID,缺少原始队伍也保留中文待核对状态,不以当前属性重算,不发送游戏写请求。现场旧 `0211 / 3` 记录的原始响应已被日志轮转覆盖,无法还原隐藏 ID;仅对符合精确四字段 legacy 形态、严格确认已入场且未结算的这类旧阶段,保留证据并在本地归档为未完成、放弃,不提交胜负或重发入场。归档不等于服务端已结算,也不表示当前生产战斗已打通,见 [本版发布说明](../../analysis/RELEASE_2_0_12.md)。 已在 2.0.1 完成私有仓库和 GHCR 认证的部署,稳定 Release 与正式镜像发布后,可直接通过“帮助 → 检查版本更新…”升级,无需先安装 2.0.2、重复初始化或替换宿主机更新器。尚未接入私有在线更新的宿主机才需参考下文“已有宿主机首次初始化”。 @@ -23,7 +25,7 @@ sudo install -m 0600 -o root -g root deploy/web/image.env.example .image.env sudoedit .env .image.env ``` -在 `.env` 填入独立的 `RANCH_WEB_PASSWORD`,这是 Web 管理密码,不是游戏密码;`.image.env` 的目标示例为 `RANCH_WEB_IMAGE=ghcr.io/attilanet/myrzx_bot-web:v2.0.12`,需确认对应镜像已发布后再 pull。Compose 默认只发布到宿主机 `127.0.0.1:8765`,容器内监听 `0.0.0.0:8765` 并强制管理密码。使用域名反代时,同时配置 `RANCH_WEB_ALLOWED_HOSTS` 与 `RANCH_WEB_ALLOWED_ORIGINS`;TLS 入口设置 `RANCH_WEB_SECURE_COOKIE=true`。代理保留正确的 Host,写请求依赖来源校验。 +在 `.env` 填入独立的 `RANCH_WEB_PASSWORD`,这是 Web 管理密码,不是游戏密码;`.image.env` 的目标示例为 `RANCH_WEB_IMAGE=ghcr.io/attilanet/myrzx_bot-web:v2.0.13`,需确认对应镜像已发布后再 pull。Compose 默认只发布到宿主机 `127.0.0.1:8765`,容器内监听 `0.0.0.0:8765` 并强制管理密码。使用域名反代时,同时配置 `RANCH_WEB_ALLOWED_HOSTS` 与 `RANCH_WEB_ALLOWED_ORIGINS`;TLS 入口设置 `RANCH_WEB_SECURE_COOKIE=true`。代理保留正确的 Host,写请求依赖来源校验。 `/opt/ranch-web/data` 挂到容器 `/data`,包括账号、加密会话与密钥、配置、委托历史、SQLite 统计和更新请求;独立于桌面数据。心跳控制目录独立只读挂到 `/run/ranch-updater`。使用 bind mount 的目录必须预先创建,Compose 不会悄悄创建 root 所有、容器无法写入的目录。默认容器用户 `10001:10001`,根文件系统只读,临时文件写到 `/tmp`。不要对现有账号目录重新初始化密钥。 @@ -55,7 +57,7 @@ Web 只读检查官方 GitHub Releases;默认只接受 `v2.MINOR.PATCH`,跳 ### 已完成 2.0.1 初始化的宿主机 -稳定 Release 与正式镜像发布后,用户打开“帮助 → 检查版本更新…”,检查到 2.0.12 后手动提交更新请求,可从 2.0.1 直接安装。现有私有仓库认证、GHCR 登录与宿主机更新器继续使用;Web 按钮仍要求有效心跳及 `accept_web_requests=true`。请求显示 `pending` 只表示已提交,宿主机完成备份、安装及健康检查后才确认成功;升级完成后刷新网页以加载新版界面,底部日志默认收起。Windows 或未启用执行器时仍仅可检查版本。自动安装默认关闭。 +稳定 Release 与正式镜像发布后,用户打开“帮助 → 检查版本更新…”,检查到 2.0.13 后手动提交更新请求,可从 2.0.1 直接安装。现有私有仓库认证、GHCR 登录与宿主机更新器继续使用;Web 按钮仍要求有效心跳及 `accept_web_requests=true`。请求显示 `pending` 只表示已提交,宿主机完成备份、安装及健康检查后才确认成功;升级完成后刷新网页以加载新版界面,底部日志默认收起。Windows 或未启用执行器时仍仅可检查版本。自动安装默认关闭。 ### 全新宿主机安装 @@ -165,14 +167,14 @@ Windows 或未安装执行器的 Docker 部署仍能检查版本,但按钮会 [web-image.yml](../../.github/workflows/web-image.yml) 仅对官方仓库的严格稳定 `v2.x.y` tag 推送 `ghcr.io/attilanet/myrzx_bot-web:v2.x.y`;校验 `ranch_web.__version__` 必须与 tag 一致,不能只改变镜像 label。PR 与手动运行只测试、构建,不推送。开发分支 push 不触发正式镜像发布,也没有 `latest` 滚动升级通道。CI 执行更新器、私有凭据和独立包回归,并在无外网容器中检查 healthcheck、非 root 数据写权限、无 Qt 和正常停止;镜像发布状态以对应 tag 的工作流结果为准。 -本版共 **491 项唯一仓库测试:489 通过、2 项 Windows 预期跳过,0 失败 / 错误**,见 [2.0.12 发布说明](../../analysis/RELEASE_2_0_12.md#验证)。本轮不实际调用游戏 API、不部署生产、不修改真实用户策略或生产 journal。2.0.11 的测试结果见 [历史发布说明](../../analysis/RELEASE_2_0_11.md#验证),不计入本版。CI 保留通过 `ranch_web/requirements-test.txt` 安装 HTTPX 的修复。 +2.0.12 历史版本共 **491 项唯一仓库测试:489 通过、2 项 Windows 预期跳过,0 失败 / 错误**,见 [2.0.12 发布说明](../../analysis/RELEASE_2_0_12.md#验证)。本轮不实际调用游戏 API、不部署生产、不修改真实用户策略或生产 journal。2.0.11 的测试结果见 [历史发布说明](../../analysis/RELEASE_2_0_11.md#验证),不计入本版。CI 保留通过 `ranch_web/requirements-test.txt` 安装 HTTPX 的修复。 2.0.8 共验证739项独立测试:736通过、3项 Windows 跳过;其中非浏览器662项(659通过、3跳过),浏览器77项全部验证通过,详见 [发布说明](../../analysis/RELEASE_2_0_8.md#验证)。2.0.7 结果保留在 [历史发布说明](../../analysis/RELEASE_2_0_7.md#验证)。以下命令可复现本地更新器构建与离线检查;历史 Windows 离线验证与 Linux 部署烟测见 [Web 运行说明](../../ranch_web/README.md#离线验证),不计入本版验收。可在无 Docker 的机器上构建临时更新器资产并打印计划;`--dry-run` 不联网、不读取凭据、不调用 Docker,也不写文件: ```sh -python -B tools/build_web_updater.py --output test-artifacts/releases/v2.0.12/updater.pyz -python -B test-artifacts/releases/v2.0.12/updater.pyz --version -python -B test-artifacts/releases/v2.0.12/updater.pyz --config deploy/web/updater.example.toml --apply v2.0.12 --dry-run +python -B tools/build_web_updater.py --output test-artifacts/releases/v2.0.13/updater.pyz +python -B test-artifacts/releases/v2.0.13/updater.pyz --version +python -B test-artifacts/releases/v2.0.13/updater.pyz --config deploy/web/updater.example.toml --apply v2.0.13 --dry-run python -B -m unittest ranch_web.tests.test_updates ranch_web.tests.test_web_updater ranch_web.tests.test_private_updates ranch_web.tests.test_web_updater_package -v ``` diff --git a/deploy/web/image.env.example b/deploy/web/image.env.example index c4b1fbb..8b7baca 100644 --- a/deploy/web/image.env.example +++ b/deploy/web/image.env.example @@ -1,2 +1,2 @@ -# Pull only after the v2.0.12 image publishing workflow succeeds and the image is available. -RANCH_WEB_IMAGE=ghcr.io/attilanet/myrzx_bot-web:v2.0.12 +# Pull only after the v2.0.13 image publishing workflow succeeds and the image is available. +RANCH_WEB_IMAGE=ghcr.io/attilanet/myrzx_bot-web:v2.0.13 diff --git a/ranch_assistant/battle_retry.py b/ranch_assistant/battle_retry.py new file mode 100644 index 0000000..39f79cd --- /dev/null +++ b/ranch_assistant/battle_retry.py @@ -0,0 +1,19 @@ +"""Local cooldown for confirmed battle losses.""" +import math +from datetime import datetime, timedelta, timezone + + +def loss_retry_reason(state, now, policy): + limit = int(getattr(policy, "stop_after_loss", 0) or 0) + if not limit or int(state.get("losses", 0)) < limit: + return "" + last_loss = state.get("last_loss_at") + if type(last_loss) not in (int, float) or not math.isfinite(last_loss) or last_loss <= 0: + last_loss = float(now) + state["last_loss_at"] = last_loss + deadline = last_loss + getattr(policy, "loss_retry_hours", 3) * 3600 + if now >= deadline: + state.update(losses=0, last_loss_at=None) + return "" + retry_at = datetime.fromtimestamp(deadline, timezone(timedelta(hours=8))).strftime("%m-%d %H:%M:%S") + return f"已达战败停止次数,冷却至 {retry_at}(北京时间)后自动重新检查并重试" diff --git a/ranch_assistant/battles.py b/ranch_assistant/battles.py index d5b1425..57e1175 100644 --- a/ranch_assistant/battles.py +++ b/ranch_assistant/battles.py @@ -32,6 +32,7 @@ from .resource_stages import resource_entry_reason, item_requirements, available from .quests import indexed, stage_has_level from .sweeping import SweepPolicy, hidden_stage_id from .team_availability import team_availability_reason +from .battle_retry import loss_retry_reason def value(obj, name, default=None): @@ -152,6 +153,14 @@ class BattleJournal: state = self.role(snapshot) return next((r for r in state["records"] if r["attempt_id"] == state["pending"]), None) + def loss_reason(self, snapshot, policy): + state = self.role(snapshot) + before = (state.get("losses"), state.get("last_loss_at")) + reason = loss_retry_reason(state, snapshot.now, policy) + if before != (state.get("losses"), state.get("last_loss_at")): + self.save() + return reason + def records(self, snapshot): with self.lock: self.reload() @@ -201,8 +210,10 @@ class BattleJournal: shared_loss_budget = record.get("kind") != "map_battle" and not record.get("sweep_sample_id") if outcome == "loss" and shared_loss_budget: state["losses"] += 1 + state["last_loss_at"] = snapshot.now elif outcome == "win" and shared_loss_budget: state["losses"] = 0 + state["last_loss_at"] = None self.save() def cursors(self, snapshot): @@ -350,9 +361,8 @@ class BattleOrchestrator: return "任务实例或服务器步骤已变化,请重新规划" if planner_validated is None and checkpoints.get(str(number), {}).get("submitted"): return "该任务步骤已有确认记录,等待剧情 / 服务器步骤核对" - limit = max(0, int(policy.stop_after_loss)) - if limit and self.journal.role(snapshot)["losses"] >= limit: - return "已达战败停止次数,请核对阵容后重置战败计数" + if reason := self.journal.loss_reason(snapshot, policy): + return reason reason = team_availability_reason(snapshot, policy.team) if reason: return reason diff --git a/ranch_assistant/engine.py b/ranch_assistant/engine.py index c2d3e6e..e01e818 100644 --- a/ranch_assistant/engine.py +++ b/ranch_assistant/engine.py @@ -956,6 +956,8 @@ class Engine: try: self._ensure_progression() self._recover_confirmed_progression() + retry_reason = self.progression_planner.battle_retry_reason(self.snapshot, self.progression_policy) + journal_retry_reason = self.battle_journal.loss_reason(self.snapshot, self.progression_policy) self._battle_snapshot_source = self.snapshot self._battle_snapshot_digest = digest(self.snapshot.raw) self.progression_planner.battle_capability_key = digest({ @@ -963,6 +965,7 @@ class Engine: key = digest({"snapshot": self._battle_snapshot_digest, "policy": vars(self.progression_policy), "quests": vars(self.quest_policy), "ranch": vars(self.policy), "local_state": self.progression_planner.state_signature(self.snapshot), "purchase_left": self.progression_planner.procurement_daily_left, + "loss_retry": (retry_reason, journal_retry_reason), "pending": self._progression_pending(), "runtime": id(self.battles.runtime), "day": ProgressionPlanner._loop_day(self.snapshot, self.snapshot.now - 10)}) if force or key != self._progression_cache_key: @@ -990,6 +993,7 @@ class Engine: self._progression_cache_key = digest({"snapshot": self._battle_snapshot_digest, "policy": vars(self.progression_policy), "quests": vars(self.quest_policy), "ranch": vars(self.policy), "local_state": self.progression_planner.state_signature(self.snapshot), "purchase_left": self.progression_planner.procurement_daily_left, + "loss_retry": (retry_reason, journal_retry_reason), "pending": self._progression_pending(), "runtime": id(self.battles.runtime), "day": ProgressionPlanner._loop_day(self.snapshot, self.snapshot.now - 10)}) self._progression_error = "" diff --git a/ranch_assistant/policy_io.py b/ranch_assistant/policy_io.py index c51096c..d9cedbf 100644 --- a/ranch_assistant/policy_io.py +++ b/ranch_assistant/policy_io.py @@ -40,6 +40,8 @@ def checked_progression_policy(data): if not isinstance(data, dict): raise ValueError("主线策略必须是对象") raw = asdict(ProgressionPolicy()) | data + if type(raw["loss_retry_hours"]) is not int or not 1 <= raw["loss_retry_hours"] <= 168: + raise ValueError("战败冷却时间须为1至168小时") for key in ("reserve_ti", "max_money"): if type(raw[key]) is not int or not 0 <= raw[key] <= 1_000_000_000: raise ValueError("主线策略数量超出范围:" + key) diff --git a/ranch_assistant/progression.py b/ranch_assistant/progression.py index d2735e2..1ff014f 100644 --- a/ranch_assistant/progression.py +++ b/ranch_assistant/progression.py @@ -45,8 +45,9 @@ import uuid from .game_data import ProgressionData, load_progression_data from .model import Planner, seconds -from .quests import commission_priority, commission_selection, commission_reason_kind, indexed, stage_has_level +from .quests import commission_priority, commission_selection, commission_reason_kind, commission_quota_reason, indexed, stage_has_level from .procurement import ResourceProcurement, resource_kind +from .battle_retry import loss_retry_reason CATEGORIES = {1: ("mainline", "主线"), 2: ("sidequest", "支线"), @@ -96,6 +97,7 @@ class ProgressionPolicy: allow_monsters: bool = False item_reserves: dict[str, int] = field(default_factory=dict) stop_after_loss: int = 1 + loss_retry_hours: int = 3 repair_chain: bool = True battle_mode: str = "original" auto_farm: bool = True @@ -105,13 +107,15 @@ class ProgressionPolicy: "allow_sweep", "allow_items", "allow_monsters", "repair_chain", "auto_farm"): if not isinstance(getattr(self, name), bool): raise ValueError(f"{name} must be a boolean") - for name in ("reserve_ti", "max_money", "stop_after_loss"): + for name in ("reserve_ti", "max_money", "stop_after_loss", "loss_retry_hours"): value = getattr(self, name) if type(value) is not int or value < 0: raise ValueError(f"{name} must be a nonnegative integer") setattr(self, name, _integer(value)) if self.stop_after_loss < 1: raise ValueError("stop_after_loss must be at least 1") + if not 1 <= self.loss_retry_hours <= 168: + raise ValueError("loss_retry_hours must be between 1 and 168") if (not isinstance(self.team, str) or not 1 <= len(self.team) <= 64 or self.team.strip() != self.team or not self.team.isprintable()): raise ValueError("team must be a nonempty printable name of at most 64 characters") @@ -203,11 +207,15 @@ class ProgressionPlanner: "position": str(snapshot.raw.get("position") or ""), "tasks": {}, "received": {}, "unlocked": [], "finished": [], "stage_unlocks": [], "city_unlocks": [], "stage_passes": [], "stage_levels": [], "stage_locks": [], - "pending": None, "losses": 0, "applied": [], + "pending": None, "losses": 0, "last_loss_at": None, "applied": [], "commissions": {"day": None, "remaining": None, "offers": None, "accepted": [], "expired_ids": [], "finished": []}, }) return scope, account + def battle_retry_reason(self, snapshot, policy): + _, account = self._account(snapshot) + return loss_retry_reason(account, snapshot.now, policy) + def _tasks(self, snapshot, account): received = {key: task for key, task in account["received"].items() if not account["tasks"].get(f"{_integer(task.get('id'))}:{key}", {}).get("removed")} @@ -626,8 +634,8 @@ class ProgressionPlanner: """Reject an unusable battle before navigation or its before-story.""" if _integer(snapshot.raw["master"].get("ti")) < policy.reserve_ti: return "当前体力低于保留体力" - if account["losses"] >= policy.stop_after_loss: - return "达到任务战败停止次数" + if reason := loss_retry_reason(account, snapshot.now, policy): + return reason if kind == "battle" and not step.get("battle"): return "任务战斗配置缺失" if kind == "passStage": @@ -742,7 +750,7 @@ class ProgressionPlanner: else: return [] scope, account = self._account(snapshot) - if account["losses"] >= policy.stop_after_loss: + if loss_retry_reason(account, snapshot.now, policy): return [] ranked = [] seen = set() @@ -1008,7 +1016,7 @@ class ProgressionPlanner: city_info = self.city_diagnostic(city, snapshot) supply = None reason = ("城市编号无效" if city <= 0 else - "当日接取次数已用完(剩余0次),等待次日刷新" if remaining <= 0 else + commission_quota_reason(snapshot) if remaining <= 0 else f"策略限定城市 {quest_policy.city}" if quest_policy.city and city != quest_policy.city else city_info["city_reason"] if not city_info["city_unlocked"] else "委托列表已跨日,等待刷新确认" if recorded is not None and recorded != today and account["commissions"]["day"] != today else @@ -1335,6 +1343,7 @@ class ProgressionPlanner: record["next_value"] = response.get("taskStepValue") if intent.kind == "progression_battle" and not _from_snapshot: account["losses"] = 0 + account["last_loss_at"] = None if intent.battle_kind == "passStage": # Exact TaskStartPanel.step2WinHandler -> passLocalStage # effects, only after the real step settlement succeeded. @@ -1492,6 +1501,7 @@ class ProgressionPlanner: if intent.account_key != scope or intent.kind != "progression_battle": raise ValueError("Battle intent/account mismatch") account["losses"] += 1 + account["last_loss_at"] = snapshot.now if account["pending"] and account["pending"]["token"] == intent.token: account["pending"] = None @@ -1518,10 +1528,12 @@ class ProgressionPlanner: for scope, account in restored.items(): if not re.fullmatch(r"[0-9a-f]{64}", scope) or not isinstance(account, dict): raise ValueError("Invalid local progression account") + account.setdefault("last_loss_at", None) for key in ("stage_passes", "stage_levels", "stage_locks"): account.setdefault(key, []) account.setdefault("commissions", {"day": None, "remaining": None, "offers": None, "accepted": [], "expired_ids": [], "finished": []}) required = {"position", "tasks", "received", "unlocked", "finished", "stage_unlocks", "city_unlocks", "pending", "losses", "applied", "stage_passes", "stage_levels", "stage_locks", "commissions"} + required.add("last_loss_at") if set(account) != required or not isinstance(account["tasks"], dict) or not isinstance(account["received"], dict): raise ValueError("Invalid local progression state fields") if account["pending"]: diff --git a/ranch_assistant/progression_gui.py b/ranch_assistant/progression_gui.py index 08d2ec1..0016ea5 100644 --- a/ranch_assistant/progression_gui.py +++ b/ranch_assistant/progression_gui.py @@ -265,9 +265,9 @@ class ProgressionPages: self.progression_team.addItem(team, team) form.addRow("推进战斗队伍", self.progression_team) for key, label, maximum in (("reserve_ti", "保留体力", 1_000_000_000), ("max_money", "单次交付金币上限(0=不交金币)", 1_000_000_000), - ("stop_after_loss", "连续失败后停止次数", 999)): + ("stop_after_loss", "连续失败后停止次数", 999), ("loss_retry_hours", "战败冷却时间(小时)", 168)): widget = IntegerInput() - widget.setRange(1 if key == "stop_after_loss" else 0, maximum) + widget.setRange(1 if key in ("stop_after_loss", "loss_retry_hours") else 0, maximum) widget.setValue(getattr(defaults, key)) setattr(self, "progression_" + key, widget) form.addRow(label, widget) diff --git a/ranch_assistant/quests.py b/ranch_assistant/quests.py index 5faa4ad..471cb4f 100644 --- a/ranch_assistant/quests.py +++ b/ranch_assistant/quests.py @@ -7,6 +7,14 @@ from .model import Action, Planner, seconds CN = timezone(timedelta(hours=8)) +def commission_quota_reason(snapshot): + offset = (9 if (snapshot.raw.get("client_context") or {}).get("lang") == "JP" else 8) * 3600 + day = int((snapshot.now - 10 + offset) // 86400) + reset_at = (day + 1) * 86400 - offset + 10 + stamp = datetime.fromtimestamp(reset_at, timezone(timedelta(seconds=offset))).strftime("%m-%d %H:%M:%S") + return f"当日接取次数已用完(剩余0次),等待 {stamp} 自动刷新后继续" + + def commission_reason_kind(reason): text = str(reason or "") for kind, words in ( diff --git a/ranch_assistant/tests/test_battle_retry.py b/ranch_assistant/tests/test_battle_retry.py new file mode 100644 index 0000000..ab74748 --- /dev/null +++ b/ranch_assistant/tests/test_battle_retry.py @@ -0,0 +1,139 @@ +"""Offline checks for cooldown recovery and midnight quota refresh.""" +from datetime import datetime, timedelta, timezone +from pathlib import Path +import tempfile +import unittest +from unittest.mock import Mock, patch + +from ranch_assistant.battles import BattleJournal +from ranch_assistant.engine import Engine +from ranch_assistant.game_data import ProgressionData +from ranch_assistant.model import Catalog, Policy +from ranch_assistant.policy_io import checked_progression_policy +from ranch_assistant.progression import ProgressionPlanner, ProgressionPolicy +from ranch_assistant.quests import QuestPolicy +from ranch_assistant.tests.test_progression import config, snapshot, step, task + + +class BattleRetryTests(unittest.TestCase): + def setUp(self): + self.catalog = Catalog() + self.tasks = {"400": task("400", type=4, steps=[step("battle", battle={"teams": []})])} + self.snapshot = snapshot(currentTasks=[{"id": 40, "typeId": "400", "curStep": 1}]) + self.planner = ProgressionPlanner(self.catalog, config(self.tasks)) + self.quest = QuestPolicy(enabled=True, battle_tasks=True) + self.policy = ProgressionPolicy() + + def test_configured_interval_controls_next_battle_attempt(self): + self.policy.loss_retry_hours = 2 + with patch("ranch_assistant.model.time.time", return_value=100000): + self.planner.battle_lost(self.snapshot, self.plan()[0]) + with patch("ranch_assistant.model.time.time", return_value=107199): + self.assertTrue(self.plan()[0].blocked) + with patch("ranch_assistant.model.time.time", return_value=107200): + self.assertFalse(self.plan()[0].blocked) + + def test_retry_hour_validation(self): + self.assertEqual(checked_progression_policy({}).loss_retry_hours, 3) + for hours in (0, 169, True, 1.5): + with self.subTest(hours=hours), self.assertRaises(ValueError): + checked_progression_policy({"loss_retry_hours": hours}) + + def test_legacy_loss_wait_survives_planner_restore(self): + account = self.planner._account(self.snapshot)[1] + account.update(losses=1) + account.pop("last_loss_at") + state = self.planner.export_state() + self.planner.restore_state(state) + with patch("ranch_assistant.model.time.time", return_value=100000): + self.assertTrue(self.plan()[0].blocked) + state = self.planner.export_state() + self.planner.restore_state(state) + with patch("ranch_assistant.model.time.time", return_value=110799): + self.assertTrue(self.plan()[0].blocked) + with patch("ranch_assistant.model.time.time", return_value=110800): + self.assertFalse(self.plan()[0].blocked) + + def plan(self): + return self.planner.commission_plan(self.snapshot, self.quest, Policy(), battle_policy=self.policy) + + def test_loss_wait_expires_without_changing_task_progress(self): + with patch("ranch_assistant.model.time.time", return_value=100000): + intent = self.plan()[0] + self.planner.battle_lost(self.snapshot, intent) + blocked = self.plan()[0] + self.assertIn("冷却", blocked.block_reason) + with patch("ranch_assistant.model.time.time", return_value=110799): + self.assertTrue(self.plan()[0].blocked) + with patch("ranch_assistant.model.time.time", return_value=110800): + resumed = self.plan()[0] + self.assertFalse(resumed.blocked) + self.assertEqual(resumed.kind, "progression_battle") + self.assertEqual(resumed.step_number, 1) + + def test_quota_exhaustion_waits_for_midnight_reset(self): + now = datetime(2026, 11, 16, 12, tzinfo=timezone(timedelta(hours=8))).timestamp() + self.snapshot.raw["currentTasks"] = [] + self.snapshot.raw["history"].update(loopTaskTime=now, loopTaskNum=0, loopTask={"1": ["400"]}) + with patch("ranch_assistant.model.time.time", return_value=now): + self.assertEqual(self.plan(), []) + row = self.planner.commission_offers(self.snapshot, self.quest, Policy())[0] + self.assertIn("00:00", row["reason"]) + self.assertIn("自动", row["reason"]) + with patch("ranch_assistant.model.time.time", return_value=now + 2 * 86400): + self.assertEqual(self.plan()[0].kind, "progression_loop_reset") + + def test_old_policy_uses_three_hour_default(self): + self.assertEqual(self.policy.loss_retry_hours, 3) + + def test_restart_keeps_original_loss_deadline(self): + with tempfile.TemporaryDirectory() as root: + path = Path(root) / "battle.json" + with patch("ranch_assistant.model.time.time", return_value=100000): + journal = BattleJournal(path) + record = journal.begin(self.snapshot, {"kind": "progression_battle"}) + journal.finish(self.snapshot, record, "loss") + original = journal.loss_reason(self.snapshot, self.policy) + with patch("ranch_assistant.model.time.time", return_value=103600): + restarted = BattleJournal(path) + self.assertEqual(restarted.loss_reason(self.snapshot, self.policy), original) + with patch("ranch_assistant.model.time.time", return_value=110800): + restarted = BattleJournal(path) + self.assertEqual(restarted.loss_reason(self.snapshot, self.policy), "") + self.assertEqual(restarted.role(self.snapshot)["losses"], 0) + + def test_expired_cooldown_preserves_unknown_request(self): + journal = BattleJournal() + journal.role(self.snapshot).update(losses=1, last_loss_at=100000) + record = journal.begin(self.snapshot, {"kind": "progression_battle"}) + journal.update(record, "unknown", message="verify first") + with patch("ranch_assistant.model.time.time", return_value=110800): + self.assertEqual(journal.loss_reason(self.snapshot, self.policy), "") + self.assertEqual(journal.pending(self.snapshot)["phase"], "unknown") + + def test_cooldown_boundary_invalidates_engine_cached_intents(self): + engine = Engine(self.catalog, game_data=ProgressionData(config(self.tasks))) + engine.snapshot = self.snapshot + engine.quest_policy = self.quest + engine._battle_capability = Mock(return_value=(True, "")) + with patch("ranch_assistant.model.time.time", return_value=100000): + engine._ensure_progression() + engine.progression_planner._account(self.snapshot)[1].update(losses=1, last_loss_at=100000) + engine.battle_journal.role(self.snapshot).update(losses=1, last_loss_at=100000) + engine._refresh_progression_cache(force=True) + self.assertTrue(engine._progression_intents[0].blocked) + with patch("ranch_assistant.model.time.time", return_value=110800): + engine._refresh_progression_cache() + self.assertFalse(engine._progression_intents[0].blocked) + self.assertEqual(engine.battle_journal.role(self.snapshot)["losses"], 0) + engine.auto = False + engine.demo = False + engine.client = Mock() + engine.read_snapshot = Mock(return_value=self.snapshot) + engine.settle_pending_growth = Mock(return_value=False) + engine.poll() + self.assertFalse(engine.last_executed) + engine.client.call.assert_not_called() + engine.quest_policy.enabled = False + engine._refresh_progression_cache(force=True) + self.assertEqual(engine._progression_intents, []) diff --git a/ranch_web/PRODUCT.md b/ranch_web/PRODUCT.md index 4b28e71..dd8ac33 100644 --- a/ranch_web/PRODUCT.md +++ b/ranch_web/PRODUCT.md @@ -1,8 +1,10 @@ -# 牧羊人之心牧场助手 · Web 2.0.12 +# 牧羊人之心牧场助手 · Web 2.0.13 + +**2.0.13** 新增战败冷却自动重试:主线与委托达到连续战败上限后,默认等待3小时,可配置1~168小时;冷却结束后重新检查队伍、资源和策略授权。冷却跨重启保留,手动停止和未知请求不重发的规则继续生效。每日委托额度耗尽时显示下次刷新时间。见 [2.0.13 发布说明](../analysis/RELEASE_2_0_13.md)。 ## 产品约束 -把现有桌面助手的功能和操作结构迁移至单管理员 Web 工作台。桌面版是页面顺序、信息密度、业务名称、保护条件与交互的依据,保留桌面兼容。Web `2.0.12`,源码发布入口 `main`,游戏数据版本 `1.9.68`;桌面正式版保留 `1.2.0`。启动与配置见 [运行说明](README.md),Docker 与更新条件见 [部署说明](../deploy/web/README.md),既有功能与历史验证见 [2.0.8 发布说明](../analysis/RELEASE_2_0_8.md)。 +把现有桌面助手的功能和操作结构迁移至单管理员 Web 工作台。桌面版是页面顺序、信息密度、业务名称、保护条件与交互的依据,保留桌面兼容。Web `2.0.13`,源码发布入口 `main`,游戏数据版本 `1.9.68`;桌面正式版保留 `1.2.0`。启动与配置见 [运行说明](README.md),Docker 与更新条件见 [部署说明](../deploy/web/README.md),既有功能与历史验证见 [2.0.8 发布说明](../analysis/RELEASE_2_0_8.md)。 2.0.12 聚焦扫荡隐藏事件的自动战斗接续与旧缺失响应记录的本地归档;保留账号简短状态、错误、表格、表单与原单一底部分类日志,见 [本版发布说明](../analysis/RELEASE_2_0_12.md)。 @@ -28,7 +30,7 @@ - 帮助可检查 GitHub 正式版本并提交受控更新请求。未配置部署器时明确显示原因,更新提交不表示更新成功。 - 已在 2.0.1 完成私有仓库和 GHCR 认证的部署,稳定 Release 与正式镜像发布后,可直接通过“帮助 → 检查版本更新…”升级,无需先安装 2.0.2、重复初始化或替换宿主机更新器;升级完成后刷新网页以加载新版界面,安装结果以宿主机健康检查为准。 -## 2.0.12 本轮范围 +## 2.0.12 历史修复 - 完整入场响应与原始队伍快照等原始输入均已保存且可验证时,隐藏事件才按 `stageEvent.hideStageId` 直接构建隐藏关卡难度1的战斗,关闭扫荡并自动战斗,无需手动确认,不再发送第二次 `stageStart`;`battleEnd` / `recordBattleResult` 使用隐藏 ID。 - 新记录或可恢复旧记录仅在完整入场及原始输入可验证时自动续打,保留用户停止、来源策略及未知已发送请求的核对约束。旧记录即使能从 trace 找回隐藏 ID,缺少原始队伍也保留中文待核对状态,不用当前属性替代原始属性,不发送游戏写请求。 @@ -97,7 +99,7 @@ ## 安全与验证 -本版共 **491 项唯一仓库测试:489 通过、2 项 Windows 预期跳过,0 失败 / 错误**,见 [2.0.12 发布说明](../analysis/RELEASE_2_0_12.md#验证)。2.0.11 的测试结果见 [历史发布说明](../analysis/RELEASE_2_0_11.md#验证),不计入本版;战斗模型仍为近似实现。 +2.0.12 历史版本共 **491 项唯一仓库测试:489 通过、2 项 Windows 预期跳过,0 失败 / 错误**,见 [2.0.12 发布说明](../analysis/RELEASE_2_0_12.md#验证)。2.0.11 的测试结果见 [历史发布说明](../analysis/RELEASE_2_0_11.md#验证),不计入本版;战斗模型仍为近似实现。 2.0.9 的历史验证见 [历史发布说明](../analysis/RELEASE_2_0_9.md#验证),不计入本版。 diff --git a/ranch_web/README.md b/ranch_web/README.md index 9733183..38f054f 100644 --- a/ranch_web/README.md +++ b/ranch_web/README.md @@ -1,8 +1,10 @@ -# Web 2.0.12 运行说明 +# Web 2.0.13 运行说明 -Web **2.0.12**,源码发布入口 `main`,游戏资料基线 **1.9.68**。桌面正式版保留 **1.2.0**,入口为 `python -m ranch_assistant`;Web 使用独立依赖与数据根。自动委托提供当前委托与每日记录,功能和历史验证状态见 [2.0.8 发布说明](../analysis/RELEASE_2_0_8.md)。 +**2.0.13** 新增战败冷却自动重试:主线与委托达到连续战败上限后,默认等待3小时,可配置1~168小时;冷却结束后重新检查队伍、资源和策略授权。冷却跨重启保留,手动停止和未知请求不重发的规则继续生效。每日委托额度耗尽时显示下次刷新时间。见 [2.0.13 发布说明](../analysis/RELEASE_2_0_13.md)。 -2.0.12 修复扫荡触发隐藏关卡后的接续:完整入场响应与原始队伍快照等原始输入均已保存且可验证时,新记录或可恢复旧记录才按 `stageEvent.hideStageId` 构建隐藏关卡难度1的战斗,自动战斗且无需手动确认,不再发送第二次 `stageStart`,战后使用隐藏 ID 结算。旧记录即使能从 trace 找回隐藏 ID,缺少原始队伍也保留中文待核对状态,不用当前属性替代原始属性,不发送游戏写请求。现场旧 `0211 / 3` pending 的原始响应已被日志轮转覆盖,隐藏 ID 无法还原;仅对符合精确四字段 legacy 形态、严格确认已入场且未结算的这类旧阶段,保留证据、本地归档为未完成并放弃,不提交胜负或重发入场,让后续策略继续。归档不等于服务端已结算,本版未在生产打通当前这场战斗,见 [本版发布说明](../analysis/RELEASE_2_0_12.md)。 +Web **2.0.13**,源码发布入口 `main`,游戏资料基线 **1.9.68**。桌面正式版保留 **1.2.0**,入口为 `python -m ranch_assistant`;Web 使用独立依赖与数据根。自动委托提供当前委托与每日记录,功能和历史验证状态见 [2.0.8 发布说明](../analysis/RELEASE_2_0_8.md)。 + +2.0.13 修复扫荡触发隐藏关卡后的接续:完整入场响应与原始队伍快照等原始输入均已保存且可验证时,新记录或可恢复旧记录才按 `stageEvent.hideStageId` 构建隐藏关卡难度1的战斗,自动战斗且无需手动确认,不再发送第二次 `stageStart`,战后使用隐藏 ID 结算。旧记录即使能从 trace 找回隐藏 ID,缺少原始队伍也保留中文待核对状态,不用当前属性替代原始属性,不发送游戏写请求。现场旧 `0211 / 3` pending 的原始响应已被日志轮转覆盖,隐藏 ID 无法还原;仅对符合精确四字段 legacy 形态、严格确认已入场且未结算的这类旧阶段,保留证据、本地归档为未完成并放弃,不提交胜负或重发入场,让后续策略继续。归档不等于服务端已结算,本版未在生产打通当前这场战斗,见 [本版发布说明](../analysis/RELEASE_2_0_12.md)。 正常执行默认使用现有内置实验运行时入口的快速 HP/DPS 模型,保留现有伤害配置,无需选择新模式;逐帧实现仅供研发。模型按双方属性、血量、每秒伤害、时间与目标估算胜利、战败或超时,仍有机制简化,不保证全部关卡可通关或与客户端结果一致。 @@ -108,11 +110,11 @@ sh start-web.sh --no-browser Web 检查固定官方 GitHub Releases 的稳定 `v2.x.y`,跳过桌面 1.x、未来 3.x、草稿和预发布。开发版本 `2.0.0.dev1` 可升级至同数字的正式 `v2.0.0`;没有正式 Web 2 发布时明确显示暂无更新。Windows 默认仅检查;Web “更新”按钮仅在宿主机显式启用并有有效只读心跳时可提交 `pending` 请求,安装、备份和回滚由宿主机执行。默认定时检查只通知,自动安装需操作者 opt-in。 -已在 **2.0.1** 完成私有仓库和 GHCR 认证的部署,稳定 Release 和正式镜像就绪、宿主机心跳有效后,可直接通过“帮助 → 检查版本更新…”升级 **2.0.12**,无需先安装 2.0.2、重复初始化或替换宿主机更新器。升级完成后刷新网页以加载新版界面,底部日志默认收起。安装结果以宿主机健康检查为准;首次配置仅供尚未初始化的宿主机参考。 +已在 **2.0.1** 完成私有仓库和 GHCR 认证的部署,稳定 Release 和正式镜像就绪、宿主机心跳有效后,可直接通过“帮助 → 检查版本更新…”升级 **2.0.13**,无需先安装 2.0.2、重复初始化或替换宿主机更新器。升级完成后刷新网页以加载新版界面,底部日志默认收起。安装结果以宿主机健康检查为准;首次配置仅供尚未初始化的宿主机参考。 ## 离线验证 -本版共 **491 项唯一仓库测试:489 通过、2 项 Windows 预期跳过,0 失败 / 错误**,见 [2.0.12 发布说明](../analysis/RELEASE_2_0_12.md#验证)。镜像工作流在安装测试依赖后,独立执行隐藏关卡 handoff、battles、engine 三个专用回归模块;通过 `ranch_web/requirements-test.txt` 安装 HTTPX 的修复继续保留。2.0.11 的测试结果见 [历史发布说明](../analysis/RELEASE_2_0_11.md#验证),不计入本版。以下为继续保留的子进程传输、战斗恢复、能力展示、Web 生命周期、恢复契约及状态 API 回归命令: +2.0.12 历史版本共 **491 项唯一仓库测试:489 通过、2 项 Windows 预期跳过,0 失败 / 错误**,见 [2.0.12 发布说明](../analysis/RELEASE_2_0_12.md#验证)。镜像工作流在安装测试依赖后,独立执行隐藏关卡 handoff、battles、engine 三个专用回归模块;通过 `ranch_web/requirements-test.txt` 安装 HTTPX 的修复继续保留。2.0.11 的测试结果见 [历史发布说明](../analysis/RELEASE_2_0_11.md#验证),不计入本版。以下为继续保留的子进程传输、战斗恢复、能力展示、Web 生命周期、恢复契约及状态 API 回归命令: ```console python -B -m unittest ranch_assistant.tests.test_battle_worker_transport ranch_assistant.tests.test_battle_recovery ranch_assistant.tests.test_battle_capability_presentation ranch_web.tests.test_lifecycle_recovery ranch_web.tests.test_battle_recovery_contract ranch_web.tests.test_status_recovery_api -v diff --git a/ranch_web/__init__.py b/ranch_web/__init__.py index a57439c..e0c9137 100644 --- a/ranch_web/__init__.py +++ b/ranch_web/__init__.py @@ -1,6 +1,6 @@ """Headless Web workspace for the ranch assistant.""" -__version__ = "2.0.12" +__version__ = "2.0.13" GAME_VERSION = "1.9.68" __all__ = ["__version__", "GAME_VERSION"] diff --git a/ranch_web/policies.py b/ranch_web/policies.py index 5a76036..d419165 100644 --- a/ranch_web/policies.py +++ b/ranch_web/policies.py @@ -166,6 +166,7 @@ def validate_config(config): for section in ("sweep_policy", "progression_policy"): _choice(result[section]["team"], ("teamA", "teamB", "teamC"), "战队") _int(result["progression_policy"]["stop_after_loss"], "连续失败停止次数", 1, 999) + _int(result["progression_policy"]["loss_retry_hours"], "战败冷却小时", 1, 168) _object(result["explore_policy"]["teams"], "探险队伍") for key, raw in result["explore_policy"]["teams"].items(): _id(key, "探险队伍") diff --git a/ranch_web/static/app.js b/ranch_web/static/app.js index e23fa2a..671bf08 100644 --- a/ranch_web/static/app.js +++ b/ranch_web/static/app.js @@ -415,7 +415,7 @@ async function exportYields(account=current()) { async function command(name,account=current()) { try { if(name==='add-account'||name==='add-demo')return await addAccount(name==='add-demo'); - if(name==='about')return dialog('关于牧场助手',el('div',{},el('p',{text:`牧羊人之心牧场助手 Web ${state.meta?.version || '2.0.12'}`}),el('p',{text:`游戏数据版本 ${state.meta?.gameVersion || '1.9.68'}`})),{info:true}); + if(name==='about')return dialog('关于牧场助手',el('div',{},el('p',{text:`牧羊人之心牧场助手 Web ${state.meta?.version || '2.0.13'}`}),el('p',{text:`游戏数据版本 ${state.meta?.gameVersion || '1.9.68'}`})),{info:true}); if(name==='updates')return await showUpdates(); if(name==='admin-logout'){hideWorkbench();try{await api.logout();}finally{requireAuth();}return;} if(!account)throw new Error('请先新增或选择账号。'); @@ -640,7 +640,7 @@ async function bootstrap() { $('#app').hidden=false; const [meta,schema]=await Promise.all([api.meta(),api.schema()]);state.meta=meta;state.schema=schema; if(state.redirecting)return; - $('#app-version').textContent=meta.version || '2.0.12';$('#game-version').textContent=meta.gameVersion || '1.9.68';$('#access-mode').textContent=auth.access_mode==='local'||auth.access_mode==='loopback'?'本机工作台':auth.required?'管理工作台':'本机工作台'; + $('#app-version').textContent=meta.version || '2.0.13';$('#game-version').textContent=meta.gameVersion || '1.9.68';$('#access-mode').textContent=auth.access_mode==='local'||auth.access_mode==='loopback'?'本机工作台':auth.required?'管理工作台':'本机工作台'; await syncAccounts();if(state.redirecting)return;state.ready=true;setStatus('工作台已连接'); }catch(failure){if(failure.status===401||$('#app').hidden){requireAuth();return;}if(state.redirecting)return;setStatus(failure.message);$('#page-host').replaceChildren(el('div',{class:'initial-state'},el('p',{text:failure.message}),el('button',{text:'重新连接',onClick:bootstrap})));} } diff --git a/ranch_web/static/index.html b/ranch_web/static/index.html index 7ed3ce0..d77b65a 100644 --- a/ranch_web/static/index.html +++ b/ranch_web/static/index.html @@ -26,7 +26,7 @@ - 牧羊人之心牧场助手 2.0.12 + 牧羊人之心牧场助手 2.0.13
diff --git a/ranch_web/views.py b/ranch_web/views.py index 2ac599e..53036da 100644 --- a/ranch_web/views.py +++ b/ranch_web/views.py @@ -69,6 +69,8 @@ def _strategy_fields(catalog): quest += [_field(["quest_policy", "city"], "城市编号(0=所有已解锁城市)", "integer", min=0, max=99), _field(["quest_policy", "max_money"], "单次最多提交金币", "integer", min=0, max=10_000_000), _field(["quest_policy", "item_reserves"], "保留道具", "id_counts")] + quest += [_field(["progression_policy", "stop_after_loss"], "连续战败暂停次数(与主线共用)", "integer", min=1, max=999), + _field(["progression_policy", "loss_retry_hours"], "战败冷却时间(小时)", "integer", min=1, max=168)] progression_labels = [("enabled", "启用自动主线策略"), ("mainline", "主线"), ("sidequests", "支线"), ("commissions", "委托(仅诊断)"), ("accept", "接取已确认的任务"), ("auto_dialogue", "自动推进已支持的对话"), ("repair_chain", "补全已确认的任务链"), ("allow_items", "允许提交物品"), ("allow_monsters", "允许提交魔物"), @@ -77,7 +79,7 @@ def _strategy_fields(catalog): progression += [_field(["progression_policy", "team"], "推进战斗队伍", "select", options=team_options)] progression += [_field(["progression_policy", key], label, "integer", min=low, max=high) for key, label, low, high in ( ("reserve_ti", "保留体力", 0, 1_000_000_000), ("max_money", "单次交付金币上限(0=不交金币)", 0, 1_000_000_000), - ("stop_after_loss", "连续失败后停止次数", 1, 999))] + ("stop_after_loss", "连续失败后停止次数", 1, 999), ("loss_retry_hours", "战败冷却时间(小时)", 1, 168))] progression += [_field(["progression_policy", "item_reserves"], "交付后至少保留物品", "id_counts")] maps = [_field(["sweep_policy", key], label) for key, label in ( ("enabled", "启用勾选关卡自动刷图"), ("allow_challenge", "未满星时自动挑战"), ("allow_special", "允许矿洞 / 门票关卡"))]