diff --git a/AGENTS.md b/AGENTS.md
index b03bab1..4165d70 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -264,6 +264,7 @@ AI 应主动：
 * 少解释
 * 优先 patch
 * 优先 diff
+* 写好中文注释
 
 除非用户明确要求：
 否则不要输出完整项目。
diff --git a/doc.md b/doc.md
index ca46096..9566c3c 100644
--- a/doc.md
+++ b/doc.md
@@ -113,4 +113,134 @@ git push origin test
 2. **每次合并前先拉取最新代码**，避免覆盖他人改动
 3. **体验版发布前确认代码已提交**，避免遗漏
 4. **开发分支命名建议**：`feature/姓名-功能名`，如 `feature/zhangsan-login`
-5. **删除已合并的开发分支**：`git branch -d feature/your-name-work`
\ No newline at end of file
+5. **删除已合并的开发分支**：`git branch -d feature/your-name-work`
+
+---
+
+## 六、比赛服 Proto 更新流程
+
+### 1. 新开发人员快速接手
+
+首次拉取项目后，先安装依赖并确认当前协议与运行时解码器一致：
+
+```bash
+npm install
+npm run proto:check
+npm run build
+```
+
+如果 `proto:check` 提示协议不同步，先执行 `npm run proto:generate`，不要直接修改生成区块。
+
+### 2. 相关文件职责
+
+| 文件 | 职责 | 修改规则 |
+|------|------|----------|
+| `src/utils/match.min.js` | 后端比赛服协议描述，是生成字段表的输入文件 | 后端协议更新时整体替换；禁止在小程序运行时代码中导入 |
+| `scripts/generate-match-schema.mjs` | 解析协议、校验字段并生成运行时字段表 | 只有新增通用协议能力时才修改 |
+| `src/utils/matchProtocol.js` | 小程序实际使用的 protobuf 编解码器 | `<match-schema-generated>` 标记区间内禁止手动修改 |
+| `src/matchWebsocket.js` | 服务端消息路由、ACK 和业务事件分发 | 新增消息业务行为时人工接入 |
+| `src/utils/matchAdapter.js` | 将解码结果从 snake_case 统一转换为 camelCase | 页面继续使用适配后的字段名 |
+
+`match.min.js` 不是小程序运行时解码器。运行时仍使用 `protobufjs/minimal.js` 的 `Reader/Writer`，`int64` 字段统一保留为字符串，避免大整数精度丢失。
+
+### 3. 日常协议更新步骤
+
+```text
+替换 src/utils/match.min.js
+        ↓
+执行 npm run proto:update
+        ↓
+检查生成差异和业务接入范围
+        ↓
+执行 git diff --check
+        ↓
+微信开发者工具检查包体并上传
+```
+
+具体操作：
+
+1. 从后端获取最新的 `match.min.js`，整体覆盖 `src/utils/match.min.js`。
+2. 执行推荐命令：
+
+```bash
+npm run proto:update
+```
+
+3. 该命令会依次完成：
+   - 解析 `match.min.js`
+   - 更新 `matchProtocol.js` 内的生成区块
+   - 校验生成区块与协议源文件一致
+   - 执行微信小程序正式构建
+4. 检查 Git 差异。普通字段更新通常只应涉及：
+   - `src/utils/match.min.js`
+   - `src/utils/matchProtocol.js` 的生成区块
+5. 如果新增了消息业务行为，再单独检查 `src/matchWebsocket.js`、页面或组件的接入改动。
+6. 执行空白和换行检查：
+
+```bash
+git diff --check
+```
+
+7. 打开微信开发者工具，导入 `dist/build/mp-weixin`，检查代码依赖分析和主包体积后再上传。
+
+### 4. Proto 命令说明
+
+| 命令 | 用途 | 是否修改文件 |
+|------|------|--------------|
+| `npm run proto:generate` | 根据 `match.min.js` 更新生成区块 | 是 |
+| `npm run proto:check` | 检查生成区块是否与协议同步 | 否 |
+| `npm run proto:update` | 执行生成，然后运行正式构建 | 是，日常更新推荐使用 |
+| `npm run dev` | 启动开发构建，启动前自动执行 `proto:check` | 协议不同步时直接中止 |
+| `npm run build` | 执行正式构建，构建前自动执行 `proto:check` | 协议不同步时直接中止 |
+
+`npm run dev` 和 `npm run build` 只负责检查，不会自动改写协议；发现不同步时应执行 `npm run proto:generate` 或 `npm run proto:update`。
+
+### 5. 自动生成与人工接入边界
+
+以下内容由生成器自动处理：
+
+- 服务端和客户端消息枚举
+- 普通 scalar 字段
+- 嵌套 message
+- repeated message
+- 当前解码器支持的 map
+- snake_case 字段名和 oneof 兼容信息
+
+以下情况仍需人工处理：
+
+- **新增服务端消息类型**：枚举会自动生成，但 `matchWebsocket.js` 的路由、ACK、音频或页面事件仍需接入。
+- **新增客户端指令**：枚举会自动生成，但发送函数、字段编码和业务调用入口仍需接入。
+- **修改既有字段编号或类型**：属于协议兼容性变更，必须先与后端确认，不能只看构建是否通过。
+- **新增解码器不支持的类型**：生成器会直接报错，需要同时扩展生成器和 `matchProtocol.js` 的通用解码能力。
+
+当前生成器会拒绝不支持的 scalar、map key、字段规则以及 packed scalar repeated，避免继续构建后静默丢字段。
+
+### 6. 常见报错处理
+
+| 报错或现象 | 原因 | 处理方式 |
+|------------|------|----------|
+| 生成区块与 `match.min.js` 不同步 | 替换协议后没有重新生成 | 执行 `npm run proto:update` |
+| 找不到 `Root.create(...)` | 后端提供的文件格式发生变化或文件不完整 | 停止更新，确认协议文件来源和生成格式 |
+| 使用了不支持的类型、规则或 map key | 新协议超出当前通用解码器能力 | 不要手补生成区块，先扩展生成器和解码器并补充验证 |
+| packed scalar repeated 不支持 | protobuf 默认可能使用 packed 编码，当前通用解码器未覆盖 | 增加 packed 解码能力后再重新生成 |
+| `matchProtocol.js` 缺少生成区块标记 | 标记被误删或生成区块被手改 | 恢复 `<match-schema-generated>` 标记，重新执行生成 |
+| 协议生成成功但构建失败 | 问题位于项目构建或业务代码，不是字段表同步 | 保留生成结果，按构建错误继续定位 |
+
+### 7. 禁止事项与验收清单
+
+禁止：
+
+- 禁止在运行时代码中导入 `match.min.js`。
+- 禁止手动修改 `<match-schema-generated>` 与 `</match-schema-generated>` 之间的内容。
+- 禁止绕过 `proto:check` 后直接上传。
+- 禁止把 `int64` 字段直接转换为普通 `Number`。
+- 禁止把“枚举已经生成”等同于“业务消息已经完成接入”。
+
+每次协议更新至少确认：
+
+1. `npm run proto:check` 通过。
+2. `npm run build` 通过，或直接确认 `npm run proto:update` 已完整通过。
+3. `git diff --check` 通过。
+4. 生成区块之外没有意外改动。
+5. 新消息已完成必要的 WebSocket 路由和页面验证。
+6. 微信开发者工具中的主包、分包体积符合上传限制。
diff --git a/package.json b/package.json
index 4fe0d15..b4d948c 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,12 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
+    "proto:generate": "node scripts/generate-match-schema.mjs",
+    "proto:check": "node scripts/generate-match-schema.mjs --check",
+    "proto:update": "npm run proto:generate && npm run build",
+    "predev": "npm run proto:check",
     "dev": "uni -p mp-weixin",
+    "prebuild": "npm run proto:check",
     "build": "uni build -p mp-weixin"
   },
   "dependencies": {
diff --git a/project.config.json b/project.config.json
index 0ffafb0..b9375da 100644
--- a/project.config.json
+++ b/project.config.json
@@ -235,6 +235,14 @@
       {
         "type": "file",
         "value": "static/tab-mall.png"
+      },
+      {
+        "type": "folder",
+        "value": "static/training-home"
+      },
+      {
+        "type": "folder",
+        "value": "static/training-difficulty-design"
       }
     ],
     "include": []
diff --git a/scripts/generate-match-schema.mjs b/scripts/generate-match-schema.mjs
new file mode 100644
index 0000000..47d7a76
--- /dev/null
+++ b/scripts/generate-match-schema.mjs
@@ -0,0 +1,441 @@
+import { createHash } from "node:crypto";
+import { readFileSync, writeFileSync } from "node:fs";
+import { dirname, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+import vm from "node:vm";
+
+const scriptDirectory = dirname(fileURLToPath(import.meta.url));
+const projectRoot = resolve(scriptDirectory, "..");
+const sourcePath = resolve(projectRoot, "src/utils/match.min.js");
+const runtimePath = resolve(projectRoot, "src/utils/matchProtocol.js");
+const generatedStartMarker = "// <match-schema-generated>";
+const generatedEndMarker = "// </match-schema-generated>";
+
+const supportedScalarKinds = new Set([
+  "int32",
+  "int64",
+  "float",
+  "double",
+  "bool",
+  "string",
+  "bytes",
+]);
+const supportedMapKeyKinds = new Set(["int32", "int64", "bool", "string"]);
+// 新版描述文件未携带旧协议的 oneof 元数据，保留现有解码结果中的 payload 标识。
+const compatibilityOneofs = {
+  ServerMessage: {
+    match_info: "payload",
+    shoot_data: "payload",
+    practice_info: "payload",
+  },
+};
+
+function isRecord(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+
+function extractRootCreateArgument(source) {
+  const match = /(?:\$protobuf\.)?Root\.create\s*\(/.exec(source);
+  if (!match) {
+    throw new Error("match.min.js 中未找到 Root.create(...) 协议描述");
+  }
+
+  const openIndex = source.indexOf("(", match.index);
+  let depth = 0;
+  let quote = "";
+  let escaped = false;
+  let lineComment = false;
+  let blockComment = false;
+
+  for (let index = openIndex; index < source.length; index += 1) {
+    const char = source[index];
+    const next = source[index + 1];
+
+    if (lineComment) {
+      if (char === "\n") lineComment = false;
+      continue;
+    }
+    if (blockComment) {
+      if (char === "*" && next === "/") {
+        blockComment = false;
+        index += 1;
+      }
+      continue;
+    }
+    if (quote) {
+      if (escaped) {
+        escaped = false;
+      } else if (char === "\\") {
+        escaped = true;
+      } else if (char === quote) {
+        quote = "";
+      }
+      continue;
+    }
+    if (char === '"' || char === "'" || char === "`") {
+      quote = char;
+      continue;
+    }
+    if (char === "/" && next === "/") {
+      lineComment = true;
+      index += 1;
+      continue;
+    }
+    if (char === "/" && next === "*") {
+      blockComment = true;
+      index += 1;
+      continue;
+    }
+    if (char === "(") {
+      depth += 1;
+      continue;
+    }
+    if (char === ")") {
+      depth -= 1;
+      if (depth === 0) {
+        return source.slice(openIndex + 1, index).trim();
+      }
+    }
+  }
+
+  throw new Error("match.min.js 中的 Root.create(...) 括号不完整");
+}
+
+function stripQuotedText(source) {
+  let output = "";
+  let quote = "";
+  let escaped = false;
+
+  for (const char of source) {
+    if (quote) {
+      output += " ";
+      if (escaped) {
+        escaped = false;
+      } else if (char === "\\") {
+        escaped = true;
+      } else if (char === quote) {
+        quote = "";
+      }
+      continue;
+    }
+    if (char === '"' || char === "'") {
+      quote = char;
+      output += " ";
+    } else {
+      output += char;
+    }
+  }
+
+  return output;
+}
+
+function parseDescriptor(argumentSource) {
+  if (!argumentSource.startsWith("{") || !argumentSource.endsWith("}")) {
+    throw new Error("Root.create(...) 参数不是静态对象字面量");
+  }
+
+  try {
+    return JSON.parse(argumentSource);
+  } catch {
+    // 兼容旧版 pbjs 生成的未加引号对象键；只允许静态对象语法。
+    const syntaxOnly = stripQuotedText(argumentSource);
+    if (/[();`=]/.test(syntaxOnly)) {
+      throw new Error("旧版协议描述包含非静态表达式，已拒绝执行");
+    }
+    const descriptor = vm.runInNewContext(
+      `(${argumentSource})`,
+      Object.create(null),
+      { timeout: 1000 }
+    );
+    return JSON.parse(JSON.stringify(descriptor));
+  }
+}
+
+function findProtocolNamespace(node, path = []) {
+  if (!isRecord(node)) return null;
+  const entries = isRecord(node.nested) ? node.nested : node;
+
+  if (isRecord(entries.ServerMessage?.fields) && isRecord(entries.ClientMessage?.fields)) {
+    return { entries, path };
+  }
+
+  for (const [name, child] of Object.entries(entries)) {
+    if (!isRecord(child) || isRecord(child.fields)) continue;
+    const found = findProtocolNamespace(child, [...path, name]);
+    if (found) return found;
+  }
+
+  return null;
+}
+
+function getEnumValues(definition) {
+  if (!isRecord(definition)) return null;
+  const candidate = isRecord(definition.values) ? definition.values : definition;
+  const entries = Object.entries(candidate);
+  if (entries.length === 0 || entries.some(([, value]) => !Number.isInteger(value))) {
+    return null;
+  }
+  return Object.fromEntries(entries.sort((left, right) => left[1] - right[1]));
+}
+
+function normalizeTypeName(type) {
+  return String(type || "")
+    .replace(/^\./, "")
+    .split(".")
+    .pop();
+}
+
+function getOneofByField(definition) {
+  const result = new Map();
+  if (!isRecord(definition.oneofs)) return result;
+
+  for (const [groupName, groupDefinition] of Object.entries(definition.oneofs)) {
+    const fieldNames = Array.isArray(groupDefinition)
+      ? groupDefinition
+      : groupDefinition?.oneof;
+    if (!Array.isArray(fieldNames)) continue;
+    for (const fieldName of fieldNames) result.set(fieldName, groupName);
+  }
+
+  return result;
+}
+
+function buildSchema({ messageName, definition, messages, enumNames }) {
+  const schema = {};
+  const usedIds = new Set();
+  const oneofByField = getOneofByField(definition);
+
+  for (const [fieldKey, fieldDefinition] of Object.entries(definition.fields)) {
+    const id = Number(fieldDefinition.id);
+    if (!Number.isInteger(id) || id <= 0) {
+      throw new Error(`${messageName}.${fieldKey} 的字段编号无效`);
+    }
+    if (usedIds.has(id)) {
+      throw new Error(`${messageName} 存在重复字段编号 ${id}`);
+    }
+    usedIds.add(id);
+
+    const rule = fieldDefinition.rule;
+    if (rule && !["optional", "required", "repeated", "map"].includes(rule)) {
+      throw new Error(`${messageName}.${fieldKey} 使用了不支持的规则 ${rule}`);
+    }
+
+    const fieldName = fieldDefinition.protoName || fieldKey;
+    const typeName = normalizeTypeName(fieldDefinition.type);
+    const keyTypeName = normalizeTypeName(
+      fieldDefinition.keyType ?? fieldDefinition.keytype
+    );
+    const isMap = rule === "map" || Boolean(keyTypeName);
+
+    if (isMap) {
+      if (!supportedMapKeyKinds.has(keyTypeName)) {
+        throw new Error(
+          `${messageName}.${fieldKey} 使用了不支持的 map key 类型 ${keyTypeName}`
+        );
+      }
+      const valueIsMessage = messages.has(typeName);
+      const valueKind = enumNames.has(typeName) ? "int32" : typeName;
+      if (!valueIsMessage && !supportedScalarKinds.has(valueKind)) {
+        throw new Error(
+          `${messageName}.${fieldKey} 使用了不支持的 map value 类型 ${typeName}`
+        );
+      }
+      schema[id] = valueIsMessage
+        ? {
+            name: fieldName,
+            kind: "map",
+            keyKind: keyTypeName,
+            valueKind: "message",
+            valueType: typeName,
+          }
+        : {
+            name: fieldName,
+            kind: "map",
+            keyKind: keyTypeName,
+            valueKind,
+          };
+      continue;
+    }
+
+    const isMessage = messages.has(typeName);
+    const kind = enumNames.has(typeName) ? "int32" : typeName;
+    if (!isMessage && !supportedScalarKinds.has(kind)) {
+      throw new Error(`${messageName}.${fieldKey} 使用了不支持的类型 ${typeName}`);
+    }
+
+    const repeated = rule === "repeated";
+    if (repeated && !isMessage && !["string", "bytes"].includes(kind)) {
+      throw new Error(
+        `${messageName}.${fieldKey} 是 packed scalar repeated，当前通用解码器尚不支持`
+      );
+    }
+
+    const field = isMessage
+      ? { name: fieldName, kind: "message", type: typeName }
+      : { name: fieldName, kind };
+    if (repeated) field.repeated = true;
+
+    const oneof =
+      fieldDefinition.oneof ||
+      oneofByField.get(fieldKey) ||
+      compatibilityOneofs[messageName]?.[fieldName];
+    if (oneof) field.oneof = oneof;
+    schema[id] = field;
+  }
+
+  return schema;
+}
+
+function formatPropertyKey(key) {
+  return /^(?:[A-Za-z_$][\w$]*|\d+)$/.test(key) ? key : JSON.stringify(key);
+}
+
+function formatJsValue(value, depth = 0) {
+  if (!isRecord(value)) return JSON.stringify(value);
+
+  const entries = Object.entries(value);
+  if (entries.length === 0) return "{}";
+
+  const indent = "  ".repeat(depth);
+  const primitiveEntries = entries.every(([, child]) => !isRecord(child));
+  if (primitiveEntries && value.kind !== "map") {
+    const singleLine = `{ ${entries
+      .map(([key, child]) => `${formatPropertyKey(key)}: ${JSON.stringify(child)}`)
+      .join(", ")} }`;
+    if (indent.length + singleLine.length <= 100) return singleLine;
+  }
+
+  const childIndent = "  ".repeat(depth + 1);
+  const lines = entries.map(
+    ([key, child]) =>
+      `${childIndent}${formatPropertyKey(key)}: ${formatJsValue(child, depth + 1)},`
+  );
+  return `{\n${lines.join("\n")}\n${indent}}`;
+}
+
+function createGeneratedSource(source) {
+  const descriptor = parseDescriptor(extractRootCreateArgument(source));
+  const namespace = findProtocolNamespace(descriptor);
+  if (!namespace) {
+    throw new Error("协议描述中未找到 ServerMessage 和 ClientMessage");
+  }
+
+  const messages = new Map();
+  const enums = new Map();
+  for (const [name, definition] of Object.entries(namespace.entries)) {
+    if (isRecord(definition?.fields)) {
+      messages.set(name, definition);
+      continue;
+    }
+    const values = getEnumValues(definition);
+    if (values) enums.set(name, values);
+  }
+
+  const serverMessageType = enums.get("ServerMessageType");
+  const clientMessageType = enums.get("ClientMessageType");
+  if (!serverMessageType || !clientMessageType) {
+    throw new Error("协议描述缺少 ServerMessageType 或 ClientMessageType");
+  }
+
+  const enumNames = new Set(enums.keys());
+  const schemaByName = new Map();
+  for (const [messageName, definition] of messages) {
+    schemaByName.set(
+      messageName,
+      buildSchema({ messageName, definition, messages, enumNames })
+    );
+  }
+
+  const reachable = new Set();
+  function collectReachable(messageName) {
+    if (reachable.has(messageName)) return;
+    const schema = schemaByName.get(messageName);
+    if (!schema) throw new Error(`找不到消息定义 ${messageName}`);
+    reachable.add(messageName);
+    for (const field of Object.values(schema)) {
+      if (field.kind === "message") collectReachable(field.type);
+      if (field.kind === "map" && field.valueKind === "message") {
+        collectReachable(field.valueType);
+      }
+    }
+  }
+  collectReachable("ServerMessage");
+
+  const schemas = {};
+  for (const messageName of messages.keys()) {
+    if (reachable.has(messageName)) schemas[messageName] = schemaByName.get(messageName);
+  }
+
+  const sourceHash = createHash("sha256").update(source).digest("hex").slice(0, 16);
+  const namespaceName = namespace.path.join(".") || "root";
+  const fieldCount = Object.values(schemas).reduce(
+    (total, schema) => total + Object.keys(schema).length,
+    0
+  );
+  const generatedBlock = [
+    generatedStartMarker,
+    "// 此区块由 scripts/generate-match-schema.mjs 自动生成，请勿手动修改。",
+    `// 来源：src/utils/match.min.js（sha256: ${sourceHash}）`,
+    `// 协议命名空间：${namespaceName}；消息数：${Object.keys(schemas).length}；字段数：${fieldCount}`,
+    "",
+    `export const ServerMessageType = ${formatJsValue(serverMessageType)};`,
+    "",
+    `export const ClientMessageType = ${formatJsValue(clientMessageType)};`,
+    "",
+    `const SCHEMAS = ${formatJsValue(schemas)};`,
+    generatedEndMarker,
+  ].join("\n");
+
+  return {
+    generatedBlock,
+    messageCount: Object.keys(schemas).length,
+    fieldCount,
+  };
+}
+
+function main() {
+  const args = process.argv.slice(2);
+  const unknownArgs = args.filter((arg) => arg !== "--check");
+  if (unknownArgs.length > 0) {
+    throw new Error(`未知参数：${unknownArgs.join(", ")}`);
+  }
+
+  // 统一换行符，避免 Windows 的 CRLF 让未变更的协议产生不同哈希。
+  const source = readFileSync(sourcePath, "utf8").replace(/\r\n?/g, "\n");
+  const { generatedBlock, messageCount, fieldCount } = createGeneratedSource(source);
+  const runtimeSource = readFileSync(runtimePath, "utf8");
+  const startIndex = runtimeSource.indexOf(generatedStartMarker);
+  const endMarkerIndex = runtimeSource.indexOf(generatedEndMarker);
+  if (startIndex < 0 || endMarkerIndex < startIndex) {
+    throw new Error("matchProtocol.js 缺少协议生成区块标记");
+  }
+  const endIndex = endMarkerIndex + generatedEndMarker.length;
+  const currentBlock = runtimeSource.slice(startIndex, endIndex);
+
+  if (args.includes("--check")) {
+    if (currentBlock !== generatedBlock) {
+      throw new Error(
+        "matchProtocol.js 的生成区块与 match.min.js 不同步，请运行 npm run proto:generate"
+      );
+    }
+    console.log(`[match-schema] 同步校验通过：${messageCount} 个消息，${fieldCount} 个字段`);
+    return;
+  }
+
+  if (currentBlock === generatedBlock) {
+    console.log(`[match-schema] 无需更新：${messageCount} 个消息，${fieldCount} 个字段`);
+    return;
+  }
+
+  const nextRuntimeSource =
+    runtimeSource.slice(0, startIndex) + generatedBlock + runtimeSource.slice(endIndex);
+  writeFileSync(runtimePath, nextRuntimeSource, "utf8");
+  console.log(`[match-schema] 已生成：${messageCount} 个消息，${fieldCount} 个字段`);
+}
+
+try {
+  main();
+} catch (error) {
+  console.error(`[match-schema] ${error.message}`);
+  process.exitCode = 1;
+}
diff --git a/src/App.vue b/src/App.vue
index 608b1ec..1b364ec 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -21,7 +21,9 @@
 	import audioManager from "./audioManager";
 	const store = useStore();
 	const {
-		user
+		user,
+		device,
+		online
 	} = storeToRefs(store);
 	const {
 		updateUser,
@@ -68,7 +70,11 @@
 
 	async function emitUpdateOnline() {
 		const data = await getDeviceBatteryAPI();
-		updateOnline(data.online);
+		const wasOnline = Boolean(online.value);
+		const nextOnline = Boolean(data.online);
+		updateOnline(nextOnline);
+		if (!device.value.deviceId || wasOnline === nextOnline) return;
+		audioManager.play(nextOnline ? "设备已连接" : "设备连接已断开");
 	}
 
 	function onDeviceBindInvalid() {
diff --git a/src/apis.js b/src/apis.js
index 2ec8229..b55a320 100644
--- a/src/apis.js
+++ b/src/apis.js
@@ -26,8 +26,6 @@ try {
 }
 
 const ADDONS_BASE_URL = BASE_URL.replace(/\/api\/shoot$/, "/api/shoot");
-const PRACTICE_BASE_URL = BASE_URL.replace(/\/api\/shoot$/, "/api");
-
 // 统一处理业务接口请求，包含登录态、业务错误和 WiFi 连接空响应兼容。
 function request(method, url, data = {}, baseUrl = BASE_URL) {
     const token = uni.getStorageSync(
@@ -188,8 +186,19 @@ export const getDailyCountAPI = () => {
     return request("GET", "/index/dailyCount", {}, ADDONS_BASE_URL);
 };
 
-export const getHomeData = (seasonId) => {
-    return request("GET", `/user/myHome?seasonId=${seasonId}`);
+export const getHomeData = async (seasonId) => {
+    const data = await request("GET", `/user/myHome?seasonId=${seasonId}`);
+    if (!data?.user) return data;
+
+    // 段位信息由 myHome 接口直接返回，统一并入用户数据供各页面展示。
+    return {
+        ...data,
+        user: {
+            ...data.user,
+            rankIcon: data.rankIcon,
+            rankName: data.rankName,
+        },
+    };
 };
 
 export const getProvinceData = () => {
@@ -270,13 +279,15 @@ export const createPractiseAPI = (arrows, time, target) => {
     });
 };
 
-export const createPractiseV2API = (arrows, time, target, deviceId) => {
-    return request("POST", "/practice/create-v2", {
-        shootNumber: arrows,
-        shootTime: time,
-        targetType: Number(target || 1) * 20,
-        deviceId,
-    }, PRACTICE_BASE_URL);
+export const createPractiseV2API = (trainingType, difficultyLevel) => {
+    return request("POST", "/user/practice/create/v2", {
+        trainingType,
+        difficultyLevel,
+    });
+};
+
+export const getCurrentPractiseAPI = () => {
+    return request("GET", "/user/practice/current");
 };
 
 export const startPractiseAPI = (id) => {
@@ -469,6 +480,15 @@ export const getPractiseDataAPI = async () => {
     return request("GET", "/user/practice/statistics");
 };
 
+export const getPersonalTrainingAPI = async () => {
+    return request("GET", "/personal/training");
+};
+
+export const getTrainingDifficultyListAPI = async (type) => {
+    const query = type ? `?type=${encodeURIComponent(type)}` : "";
+    return request("GET", `/training/difficulty/list${query}`);
+};
+
 export const getBattleDataAPI = async () => {
     return request("GET", "/user/fight/statistics");
 };
@@ -499,6 +519,25 @@ export const laserAimAPI = async () => {
     return request("POST", "/user/device/laserAim");
 };
 
+// 调瞄续期只负责发送请求，不等待或处理响应，避免阻塞下一次续期。
+export const aimRenewAPI = () => {
+    const token = uni.getStorageSync(
+        `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
+    );
+    const header = {};
+    if (token) header.Authorization = `Bearer ${token}`;
+
+    uni.request({
+        url: `${BASE_URL}/user/device/aimRenew`,
+        method: "POST",
+        header,
+        data: {},
+        timeout: 10000,
+        success: () => {},
+        fail: () => {},
+    });
+};
+
 export const laserCloseAPI = async () => {
     return request("POST", "/user/device/closeAim");
 };
diff --git a/src/audioManager.js b/src/audioManager.js
index fc7f899..1bf8f31 100644
--- a/src/audioManager.js
+++ b/src/audioManager.js
@@ -4,6 +4,10 @@ export const AUDIO_INTERRUPTION_END_EVENT = "audio-interruption-end";
 export const audioFils = {
   tententen: "https://static.shelingxingqiu.com/shootmini/static/audio/tententen.mp3",
   点击按钮: "https://static.shelingxingqiu.com/shootmini/static/audio/%E7%82%B9%E5%87%BB%E6%8C%89%E9%92%AE.mp3",
+  设备连接已断开:
+    "https://static.shelingxingqiu.com/shootmini/static/audio/%E8%AE%BE%E5%A4%87%E8%BF%9E%E6%8E%A5%E5%B7%B2%E6%96%AD%E5%BC%80.MP3",
+  设备已连接:
+    "https://static.shelingxingqiu.com/shootmini/static/audio/%E8%AE%BE%E5%A4%87%E5%B7%B2%E8%BF%9E%E6%8E%A5.MP3",
   "20CM全环靶": "https://static.shelingxingqiu.com/shootmini/static/audio/20CM%E5%85%A8%E7%8E%AF%E9%9D%B6-%E6%97%A0%E6%95%88.mp3",
   "40CM全环靶": "https://static.shelingxingqiu.com/shootmini/static/audio/40CM%E5%85%A8%E7%8E%AF%E9%9D%B6-%E6%97%A0%E6%95%88.mp3",
   // 激光已校准:
@@ -16,6 +20,8 @@ export const audioFils = {
     "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutwrda0amn5kqr4j.mp3",
   距离不足:
     "https://static.shelingxingqiu.com/attachment/2025-11-12/de6hr2faw28t0ianh0.mp3",
+  "未发现靶纸，请瞄准靶纸射箭":
+    "https://static.shelingxingqiu.com/shootmini/static/audio/%E6%9C%AA%E5%8F%91%E7%8E%B0%E9%9D%B6%E7%BA%B8%EF%BC%8C%E8%AF%B7%E7%9E%84%E5%87%86%E9%9D%B6%E7%BA%B8%E5%B0%84%E7%AE%AD.MP3",
   轮到你了:
     "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutzdrn4lxcpv8aqr.mp3",
   第一轮:
@@ -89,6 +95,8 @@ export const audioFils = {
     "https://static.shelingxingqiu.com/attachment/2025-11-13/de7kzzllq0futwynso.mp3",
   练习开始:
     "https://static.shelingxingqiu.com/attachment/2025-11-14/de88w0lmmt43nnfmoi.mp3",
+  练习结束:
+    "https://static.shelingxingqiu.com/shootmini/static/audio/%E7%BB%83%E4%B9%A0%E7%BB%93%E6%9D%9F.mp3",
   射箭声音:
 	"https://static.shelingxingqiu.com/shootaudio/v4/v4/%E7%AE%AD%E9%A3%9E%E8%A1%8C.mp3",
   命中:
@@ -100,8 +108,11 @@ const AUDIO_WARM_CONCURRENCY = 3;
 const AUDIO_WARM_RETRIES = 1;
 const AUDIO_WARM_PRIORITY_KEYS = [
   "点击按钮",
+  "设备连接已断开",
+  "设备已连接",
   "比赛开始",
   "练习开始",
+  "练习结束",
   "请开始射击",
   "轮到你了",
   "比赛结束",
@@ -113,6 +124,7 @@ const AUDIO_WARM_PRIORITY_KEYS = [
   "请红方射箭",
   "距离合格",
   "距离不足",
+  "未发现靶纸，请瞄准靶纸射箭",
   "未上靶",
   "X环",
 ];
diff --git a/src/canvas.js b/src/canvas.js
index 7c5b66b..853fae6 100644
--- a/src/canvas.js
+++ b/src/canvas.js
@@ -635,7 +635,7 @@ export function renderScores(ctx, arrows = [], bgImg) {
         );
       } else {
         ctx.drawImage(
-          "../static/score-bg.png",
+          "/static/score-bg.png",
           16 + (i % 9) * 30,
           290 + Math.ceil((i + 1) / 9) * 30,
           27,
@@ -657,7 +657,7 @@ export function renderScores(ctx, arrows = [], bgImg) {
         ctx.drawImage(bgImg, 24 + rowIndex * 42, i > 5 ? 362 : 320, 38, 38);
       } else {
         ctx.drawImage(
-          "../static/score-bg.png",
+          "/static/score-bg.png",
           24 + rowIndex * 42,
           i > 5 ? 362 : 320,
           38,
@@ -706,22 +706,39 @@ export async function sharePractiseData(canvasId, type, user, data) {
     );
     const bgImg = await loadCanvasImage(canvas, bgImgSrc);
 
-    const avatarImgPromise = loadImage(user.avatar).then((path) =>
-      loadCanvasImage(canvas, path)
-    );
-    const lvlImgPromise = loadImage(user.lvlImage).then((path) =>
-      loadCanvasImage(canvas, path)
-    );
+    // 头像与段位框属于装饰图片，缺失时使用兜底或跳过，避免阻断分享。
+    const loadProfileImage = async (src, fallbackSrc = "", label = "") => {
+      const normalizedSrc =
+        typeof src === "string" && src.startsWith("../static/")
+          ? src.slice(2)
+          : src;
+      if (normalizedSrc) {
+        try {
+          const path = await loadImage(normalizedSrc);
+          return await loadCanvasImage(canvas, path);
+        } catch (error) {
+          console.warn(`share ${label} image load failed`, error);
+        }
+      }
+      return fallbackSrc ? loadCanvasImage(canvas, fallbackSrc) : null;
+    };
 
-    let titleImageSrc = "../static/first-try-title.png";
+    const avatarImgPromise = loadProfileImage(
+      user?.avatar,
+      "/static/user-icon.png",
+      "avatar"
+    );
+    const lvlImgPromise = loadProfileImage(user?.lvlImage, "", "level");
+
+    let titleImageSrc = "/static/first-try-title.png";
     if (type == 2) {
-      titleImageSrc = "../static/practise-one-title.png";
+      titleImageSrc = "/static/practise-one-title.png";
     } else if (type == 3) {
-      titleImageSrc = "../static/practise-two-title.png";
+      titleImageSrc = "/static/practise-two-title.png";
     }
     const titleImgPromise = loadCanvasImage(canvas, titleImageSrc);
-    const scoreBgImgPromise = loadCanvasImage(canvas, "../static/score-bg.png");
-    const qrCodeImgPromise = loadCanvasImage(canvas, "../static/qr-code.png");
+    const scoreBgImgPromise = loadCanvasImage(canvas, "/static/score-bg.png");
+    const qrCodeImgPromise = loadCanvasImage(canvas, "/static/qr-code.png");
 
     const [avatarImg, lvlImg, titleImg, scoreBgImg, qrCodeImg] =
       await Promise.all([
@@ -738,8 +755,8 @@ export async function sharePractiseData(canvasId, type, user, data) {
 
     ctx.drawImage(bgImg, 0, 0, width, height);
 
-    drawRoundImage(ctx, avatarImg, 17, 20, 32, 32, 20);
-    ctx.drawImage(lvlImg, 12, 15, 42, 42);
+    if (avatarImg) drawRoundImage(ctx, avatarImg, 17, 20, 32, 32, 20);
+    if (lvlImg) ctx.drawImage(lvlImg, 12, 15, 42, 42);
 
     renderText(ctx, user.nickName, 13, "#fff", 58, 34);
     renderRankTitle(ctx, user.lvlName);
diff --git a/src/components/AppBackground.vue b/src/components/AppBackground.vue
index 00feb51..7feadea 100644
--- a/src/components/AppBackground.vue
+++ b/src/components/AppBackground.vue
@@ -57,6 +57,30 @@ const props = defineProps({
 	  src="https://static.shelingxingqiu.com/shootmini/static/rank/rank-bg.png"
 	  mode="widthFix"
 	/>
+  <image
+      class="bg-image"
+      v-if="type === 7"
+      src="https://static.shelingxingqiu.com/shootmini/static/app-bg6.png"
+      mode="widthFix"
+    />
+    <image
+      class="bg-image"
+      v-if="type === 8"
+      src="https://static.shelingxingqiu.com/shootmini/static/app-bg7.png"
+      mode="widthFix"
+    />
+    <image
+      class="bg-image"
+      v-if="type === 9"
+      src="https://static.shelingxingqiu.com/shootmini/static/app-bg8.png"
+      mode="widthFix"
+    />
+    <image
+      class="bg-image"
+      v-if="type === 11"
+      src="https://static.shelingxingqiu.com/shootmini/static/app-bg9.png"
+      mode="widthFix"
+    />
   <image
 	  class="bg-image"
 	  v-if="type === 10"
diff --git a/src/components/AppFooter.vue b/src/components/AppFooter.vue
index f65b8fc..e58e45a 100644
--- a/src/components/AppFooter.vue
+++ b/src/components/AppFooter.vue
@@ -43,9 +43,13 @@ function handleTabClick(index) {
 
 <style scoped>
 .footer {
-  height: 120px;
+  /* height: 120px; */
+  height: 190rpx;
   width: 100vw;
-  position: relative;
+  /* position: relative; */
+  position: fixed;
+  bottom: 0;
+  left: 0;
   display: flex;
   justify-content: space-around;
   align-items: center;
diff --git a/src/components/Avatar.vue b/src/components/Avatar.vue
index dc8290b..470db77 100644
--- a/src/components/Avatar.vue
+++ b/src/components/Avatar.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, watch } from "vue";
+import { computed, ref, watch } from "vue";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const store = useStore();
@@ -26,12 +26,33 @@ const props = defineProps({
     type: Number,
     default: 45,
   },
+  sizeUnit: {
+    type: String,
+    default: "px",
+  },
+  imageMode: {
+    type: String,
+    default: "widthFix",
+  },
   borderColor: {
     type: String,
     default: "",
   },
 });
 const avatarFrame = ref("");
+const sizeValue = computed(() => `${Number(props.size)}${props.sizeUnit}`);
+const frameSizeValue = computed(() => `${Number(props.size) + 10}${props.sizeUnit}`);
+const avatarImageStyle = computed(() => ({
+  width: sizeValue.value,
+  height: sizeValue.value,
+  minHeight: sizeValue.value,
+  borderColor: props.borderColor || "#fff",
+}));
+const avatarFrameStyle = computed(() => ({
+  width: frameSizeValue.value,
+  height: frameSizeValue.value,
+}));
+
 watch(
   () => [config.value, props.rankLvl],
   () => {
@@ -51,10 +72,7 @@ watch(
       v-if="avatarFrame"
       :src="avatarFrame"
       mode="widthFix"
-      :style="{
-        width: Number(size) + 10 + 'px',
-        height: Number(size) + 10 + 'px',
-      }"
+      :style="avatarFrameStyle"
       class="avatar-frame"
     />
     <image
@@ -78,13 +96,8 @@ watch(
     <view v-if="rank > 3" class="rank-view">{{ rank }}</view>
     <image
       :src="src || '../static/user-icon.png'"
-      mode="widthFix"
-      :style="{
-        width: size + 'px',
-        height: size + 'px',
-        minHeight: size + 'px',
-        borderColor: borderColor || '#fff',
-      }"
+      :mode="imageMode"
+      :style="avatarImageStyle"
       class="avatar-image"
     />
   </view>
diff --git a/src/components/BattleHeader.vue b/src/components/BattleHeader.vue
index 0b0489a..9cdc95e 100644
--- a/src/components/BattleHeader.vue
+++ b/src/components/BattleHeader.vue
@@ -38,7 +38,7 @@ const isMember = (player = {}) => player.vip === true || player.sVip === true;
 </script>
 
 <template>
-  <view class="container" :style="{ paddingTop: showHeader ? '5px' : '0' }">
+  <view class="container">
     <image
       v-if="showHeader"
       :src="`https://static.shelingxingqiu.com/shootmini/static/battle-header${players.length ? '-melee' : ''}.png`"
@@ -47,7 +47,7 @@ const isMember = (player = {}) => player.vip === true || player.sVip === true;
     <view
       v-if="!players.length && blueTeam.length && redTeam.length"
       class="players"
-      :style="{ paddingTop: showHeader ? '15px' : '0' }"
+      :style="{ paddingTop: showHeader ? '48rpx' : '0' }"
     >
       <view>
         <view
@@ -113,6 +113,7 @@ const isMember = (player = {}) => player.vip === true || player.sVip === true;
       v-if="players.length"
       class="players-melee"
       scroll-x
+      :show-scrollbar="false"
       @touchmove="(e) => players.length > 5 && e.stopPropagation()"
       :style="{ paddingTop: showHeader ? '15px' : '0' }"
     >
@@ -151,13 +152,15 @@ const isMember = (player = {}) => player.vip === true || player.sVip === true;
 .container {
   width: 100%;
   position: relative;
+  z-index: 999;
   margin-bottom: 10px;
 }
 .container > image:first-child {
   position: absolute;
   width: 100%;
-  top: -5px;
+  /* top: -5px; */
   z-index: 1;
+  pointer-events: none;
 }
 .players {
   display: flex;
@@ -188,15 +191,12 @@ const isMember = (player = {}) => player.vip === true || player.sVip === true;
 .players-melee {
   height: 80px;
   width: 100%;
-}
-.players-melee::-webkit-scrollbar {
-  width: 0;
-  height: 0;
-  color: transparent;
+  white-space: nowrap;
 }
 /* 小程序 scroll-view 不支持直接 flex，通过内层 wrapper 承载横向排列 */
 .players-melee-inner {
-  display: flex;
+  display: inline-flex;
+  min-width: 100%;
   height: 100%;
   flex-wrap: nowrap;
 }
diff --git a/src/components/BowShotEffect.vue b/src/components/BowShotEffect.vue
index abc5ecc..171c9a3 100644
--- a/src/components/BowShotEffect.vue
+++ b/src/components/BowShotEffect.vue
@@ -22,10 +22,22 @@ const props = defineProps({
     type: Number,
     default: 0,
   },
+  targetLeft: {
+    type: Number,
+    default: 0,
+  },
+  targetTop: {
+    type: Number,
+    default: 0,
+  },
   hitOffsetPx: {
     type: Number,
     default: 0,
   },
+  viewportMode: {
+    type: Boolean,
+    default: false,
+  },
 });
 
 const emit = defineEmits(["complete", "impact"]);
@@ -35,11 +47,14 @@ const activePlayKey = ref("");
 const animationKey = ref("");
 const impactEmitted = ref(false);
 const activeShot = ref(null);
+const activeLayout = ref(null);
 let timers = [];
 
 const isActive = computed(() => phase.value !== "idle");
 const ARROW_IMPACT_MS = 340;
 const COMPLETE_FALLBACK_MS = 980;
+// 箭头尖端统一从屏幕中下区域出发，箭身自然延伸到屏幕底部之外。
+const SHOT_START_VIEWPORT_Y_RATIO = 0.82;
 
 const safeTargetRadius = computed(() => {
   const radius = Number(props.targetRadius);
@@ -49,12 +64,33 @@ const safeTargetRadius = computed(() => {
 const safeTargetSize = computed(() => {
   const width = Number(props.targetWidth);
   const height = Number(props.targetHeight);
+  const left = Number(props.targetLeft);
+  const top = Number(props.targetTop);
   return {
     width: Number.isFinite(width) && width > 0 ? width : 0,
     height: Number.isFinite(height) && height > 0 ? height : 0,
+    left: Number.isFinite(left) ? left : 0,
+    top: Number.isFinite(top) ? top : 0,
   };
 });
 
+function getWindowSize() {
+  try {
+    const info =
+      typeof uni.getWindowInfo === "function"
+        ? uni.getWindowInfo()
+        : uni.getSystemInfoSync();
+    const width = Number(info?.windowWidth);
+    const height = Number(info?.windowHeight);
+    return {
+      width: Number.isFinite(width) && width > 0 ? width : 0,
+      height: Number.isFinite(height) && height > 0 ? height : 0,
+    };
+  } catch {
+    return { width: 0, height: 0 };
+  }
+}
+
 function hasShotPoint(shot) {
   const x = Number(shot?.x);
   const y = Number(shot?.y);
@@ -62,6 +98,17 @@ function hasShotPoint(shot) {
 }
 
 const effectiveShot = computed(() => activeShot.value || props.shot);
+const effectiveTargetSize = computed(
+  () => activeLayout.value?.target || safeTargetSize.value
+);
+const effectiveWindowSize = computed(
+  () => activeLayout.value?.window || getWindowSize()
+);
+const isViewportMode = computed(() =>
+  activeLayout.value
+    ? activeLayout.value.viewportMode
+    : props.viewportMode === true
+);
 
 const shotPoint = computed(() => {
   const x = Number(effectiveShot.value?.x);
@@ -105,23 +152,69 @@ const hitPercent = computed(() => {
   };
 });
 
-const arrowAngle = computed(() => {
-  const size = safeTargetSize.value;
-  if (!size.width || !size.height) {
-    const dx = hitPercent.value.left - 50;
-    const dy = 114 - hitPercent.value.top;
-    const fallbackAngle = Math.atan2(dx, dy || 1) * (180 / Math.PI);
-    return Math.max(-18, Math.min(18, fallbackAngle));
+const flightPath = computed(() => {
+  const size = effectiveTargetSize.value;
+  const windowSize = effectiveWindowSize.value;
+
+  if (
+    isViewportMode.value &&
+    size.width > 0 &&
+    size.height > 0 &&
+    windowSize.width > 0 &&
+    windowSize.height > 0
+  ) {
+    const startX = windowSize.width * 0.5;
+    const endX =
+      size.left +
+      size.width * (hitPercent.value.left / 100) +
+      hitOffset.value.x;
+    const endY =
+      size.top +
+      size.height * (hitPercent.value.top / 100) +
+      hitOffset.value.y;
+    // 常规情况下从视口底部进入；靶面局部超出视口时仍保证起点在命中点下方。
+    const startY = Math.max(windowSize.height + 16, endY + 80);
+    const dx = endX - startX;
+    const dy = endY - startY;
+
+    return {
+      startX,
+      startY,
+      endX,
+      endY,
+      translateX: dx,
+      translateY: dy,
+      angle: Math.atan2(dx, -dy) * (180 / Math.PI),
+    };
   }
 
-  const startX = size.width * 0.5;
-  const startY = size.height * 1.14;
-  const endX = size.width * (hitPercent.value.left / 100) + hitOffset.value.x;
-  const endY = size.height * (hitPercent.value.top / 100) + hitOffset.value.y;
+  const hasScreenCoordinates =
+    size.width > 0 &&
+    size.height > 0 &&
+    windowSize.width > 0 &&
+    windowSize.height > 0;
+  const startX = hasScreenCoordinates
+    ? windowSize.width * 0.5 - size.left
+    : size.width * 0.5;
+  const startY = hasScreenCoordinates
+    ? windowSize.height * SHOT_START_VIEWPORT_Y_RATIO - size.top
+    : size.height * 1.14;
+  const endX =
+    size.width * (hitPercent.value.left / 100) + hitOffset.value.x;
+  const endY =
+    size.height * (hitPercent.value.top / 100) + hitOffset.value.y;
   const dx = endX - startX;
-  const dy = startY - endY;
-  const angle = Math.atan2(dx, dy || 1) * (180 / Math.PI);
-  return Math.max(-18, Math.min(18, angle));
+  const dy = endY - startY;
+
+  return {
+    startX,
+    startY,
+    endX,
+    endY,
+    translateX: dx,
+    translateY: dy,
+    angle: Math.atan2(dx, -dy) * (180 / Math.PI),
+  };
 });
 
 function formatPxOffset(value) {
@@ -135,10 +228,19 @@ function formatTargetPosition(percent, offset) {
   return pxOffset ? `calc(${percent}%${pxOffset})` : `${percent}%`;
 }
 
-const crackStyle = computed(() => ({
-  left: formatTargetPosition(hitPercent.value.left, hitOffset.value.x),
-  top: formatTargetPosition(hitPercent.value.top, hitOffset.value.y),
-}));
+const crackStyle = computed(() => {
+  if (isViewportMode.value) {
+    return {
+      left: `${flightPath.value.endX}px`,
+      top: `${flightPath.value.endY}px`,
+    };
+  }
+
+  return {
+    left: formatTargetPosition(hitPercent.value.left, hitOffset.value.x),
+    top: formatTargetPosition(hitPercent.value.top, hitOffset.value.y),
+  };
+});
 
 function getTargetTranslate(percent) {
   const absPercent = Math.abs(percent);
@@ -147,23 +249,24 @@ function getTargetTranslate(percent) {
 }
 
 const arrowMoveStyle = computed(() => {
-  const size = safeTargetSize.value;
+  const size = effectiveTargetSize.value;
+  const path = flightPath.value;
   let x = getTargetTranslate(hitPercent.value.left - 50);
   let y = getTargetTranslate(hitPercent.value.top - 114);
 
-  if (size.width && size.height) {
-    const startX = size.width * 0.5;
-    const startY = size.height * 1.14;
-    const endX = size.width * (hitPercent.value.left / 100) + hitOffset.value.x;
-    const endY = size.height * (hitPercent.value.top / 100) + hitOffset.value.y;
-    x = `${endX - startX}px`;
-    y = `${endY - startY}px`;
+  if (isViewportMode.value || (size.width && size.height)) {
+    x = `${path.translateX}px`;
+    y = `${path.translateY}px`;
   }
 
   return {
+    "--shot-start-x":
+      isViewportMode.value || size.width ? `${path.startX}px` : "50%",
+    "--shot-start-y":
+      isViewportMode.value || size.height ? `${path.startY}px` : "114%",
     "--shot-tx": x,
     "--shot-ty": y,
-    "--shot-angle": `${arrowAngle.value}deg`,
+    "--shot-angle": `${path.angle}deg`,
   };
 });
 
@@ -189,6 +292,7 @@ function finish(playKey) {
   phase.value = "idle";
   activePlayKey.value = "";
   activeShot.value = null;
+  activeLayout.value = null;
   emit("complete", playKey);
 }
 
@@ -202,6 +306,11 @@ function play() {
   animationKey.value = `${props.playKey}`;
   impactEmitted.value = false;
   activeShot.value = { ...props.shot };
+  activeLayout.value = {
+    target: { ...safeTargetSize.value },
+    window: getWindowSize(),
+    viewportMode: props.viewportMode === true,
+  };
   phase.value = "playing";
 
   queueTimer(() => {
@@ -236,7 +345,11 @@ onBeforeUnmount(() => {
 <template>
   <view
     v-show="isActive"
-    :class="['shot-effect', `shot-effect--${phase}`]"
+    :class="[
+      'shot-effect',
+      `shot-effect--${phase}`,
+      { 'shot-effect--viewport': isViewportMode },
+    ]"
     :style="arrowMoveStyle"
   >
     <view
@@ -284,10 +397,16 @@ onBeforeUnmount(() => {
   transform: translateZ(0);
 }
 
+.shot-effect--viewport {
+  position: fixed;
+  width: 100vw;
+  height: 100vh;
+}
+
 .shot-arrow-track {
   position: absolute;
-  left: 50%;
-  top: 114%;
+  left: var(--shot-start-x);
+  top: var(--shot-start-y);
   width: 0;
   height: 0;
   opacity: 0;
diff --git a/src/components/BowTarget.vue b/src/components/BowTarget.vue
index 7da471d..f3801e6 100644
--- a/src/components/BowTarget.vue
+++ b/src/components/BowTarget.vue
@@ -12,7 +12,7 @@ import PointSwitcher from "@/components/PointSwitcher.vue";
 import BowShotEffect from "@/components/BowShotEffect.vue";
 
 import { MESSAGETYPES, MESSAGETYPESV2 } from "@/constants";
-import { simulShootAPI } from "@/apis";
+import { simulShootAPI, laserAimAPI, laserCloseAPI } from "@/apis";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const store = useStore();
@@ -63,6 +63,10 @@ const props = defineProps({
     type: Number,
     default: 5,
   },
+  stableShotEffect: {
+    type: Boolean,
+    default: false,
+  },
 });
 
 const pMode = ref(true);
@@ -73,12 +77,14 @@ const dirTimer = ref(null);
 const angle = ref(null);
 const circleColor = ref("");
 const shotEffect = ref(null);
+const pendingShotEffect = ref(null);
 const hiddenRedLatestKey = ref("");
 const hiddenBlueLatestKey = ref("");
 const targetShaking = ref(false);
-const targetSize = ref({ width: 0, height: 0 });
+const targetRect = ref({ left: 0, top: 0, width: 0, height: 0 });
 const shakeTimer = ref(null);
 const instance = getCurrentInstance();
+let shotEffectRequestGeneration = 0;
 const ROUND_TIP_OFFSET_Y = -32;
 const EXPERIENCE_TIP_OFFSET_Y = -68;
 
@@ -135,7 +141,7 @@ function showShotTip(team, shot) {
   }, 1000);
 }
 
-function triggerShotEffect(team, shot, index) {
+function triggerShotEffect(team, shot, index, viewportMode = false) {
   const key = buildShotEffectKey(team, shot, index);
 
   if (shotEffect.value?.team === "red") hiddenRedLatestKey.value = "";
@@ -149,7 +155,29 @@ function triggerShotEffect(team, shot, index) {
     hiddenBlueLatestKey.value = key;
   }
 
-  shotEffect.value = { key, team, shot };
+  shotEffect.value = { key, team, shot, viewportMode };
+}
+
+async function prepareShotEffect(team, shot, index) {
+  const requestGeneration = ++shotEffectRequestGeneration;
+  const key = buildShotEffectKey(team, shot, index);
+  pendingShotEffect.value = { generation: requestGeneration, team, key };
+  clearTipTimer();
+  if (team === "red") latestOne.value = null;
+  if (team === "blue") bluelatestOne.value = null;
+
+  const viewportMode = props.stableShotEffect
+    ? await updateTargetRect()
+    : false;
+
+  if (requestGeneration !== shotEffectRequestGeneration) {
+    if (pendingShotEffect.value?.generation === requestGeneration) {
+      pendingShotEffect.value = null;
+    }
+    return;
+  }
+  pendingShotEffect.value = null;
+  triggerShotEffect(team, shot, index, viewportMode);
 }
 
 function completeShotEffect(key) {
@@ -178,35 +206,67 @@ function shakeTarget() {
   });
 }
 
-function updateTargetSize() {
-  nextTick(() => {
-    const query = instance?.proxy
-      ? uni.createSelectorQuery().in(instance.proxy)
-      : uni.createSelectorQuery();
+function hasValidTargetRect(rect = targetRect.value) {
+  return (
+    Number.isFinite(Number(rect?.left)) &&
+    Number.isFinite(Number(rect?.top)) &&
+    Number(rect?.width) > 0 &&
+    Number(rect?.height) > 0
+  );
+}
 
-    query
-      .select(".target")
-      .boundingClientRect((rect) => {
-        const width = Number(rect?.width);
-        const height = Number(rect?.height);
-        if (!Number.isFinite(width) || !Number.isFinite(height)) return;
-        if (width <= 0 || height <= 0) return;
-        targetSize.value = { width, height };
-      })
-      .exec();
+async function updateTargetRect() {
+  await nextTick();
+
+  return new Promise((resolve) => {
+    let settled = false;
+    const finish = (rect) => {
+      if (settled) return;
+      settled = true;
+
+      const isValid = hasValidTargetRect(rect);
+      if (isValid) {
+        targetRect.value = {
+          left: Number(rect.left),
+          top: Number(rect.top),
+          width: Number(rect.width),
+          height: Number(rect.height),
+        };
+      }
+      resolve(isValid);
+    };
+
+    try {
+      const query = instance?.proxy
+        ? uni.createSelectorQuery().in(instance.proxy)
+        : uni.createSelectorQuery();
+
+      query
+        .select(".target")
+        .boundingClientRect()
+        .exec((result) => finish(Array.isArray(result) ? result[0] : null));
+    } catch {
+      finish(null);
+    }
   });
 }
 
 function handleWindowResize() {
-  updateTargetSize();
+  void updateTargetRect();
 }
 
 function shouldHideRedHit(index) {
-  return !!hiddenRedLatestKey.value && index === props.scores.length - 1;
+  return (
+    (!!hiddenRedLatestKey.value || pendingShotEffect.value?.team === "red") &&
+    index === props.scores.length - 1
+  );
 }
 
 function shouldHideBlueHit(index) {
-  return !!hiddenBlueLatestKey.value && index === props.blueScores.length - 1;
+  return (
+    (!!hiddenBlueLatestKey.value || pendingShotEffect.value?.team === "blue") &&
+    index === props.blueScores.length - 1
+  );
 }
 
 watch(
@@ -215,14 +275,18 @@ watch(
     if (newLen === oldLen + 1) {
       const latestShot = props.scores[newLen - 1];
       if (shouldPlayShotEffect(latestShot)) {
-        triggerShotEffect("red", latestShot, newLen - 1);
+        void prepareShotEffect("red", latestShot, newLen - 1);
       } else {
+        shotEffectRequestGeneration += 1;
+        pendingShotEffect.value = null;
         showShotTip("red", latestShot);
       }
       return;
     }
 
     if (newLen < oldLen) {
+      shotEffectRequestGeneration += 1;
+      pendingShotEffect.value = null;
       latestOne.value = null;
       hiddenRedLatestKey.value = "";
       if (shotEffect.value?.team === "red") shotEffect.value = null;
@@ -236,14 +300,18 @@ watch(
     if (newLen === oldLen + 1) {
       const latestShot = props.blueScores[newLen - 1];
       if (shouldPlayShotEffect(latestShot)) {
-        triggerShotEffect("blue", latestShot, newLen - 1);
+        void prepareShotEffect("blue", latestShot, newLen - 1);
       } else {
+        shotEffectRequestGeneration += 1;
+        pendingShotEffect.value = null;
         showShotTip("blue", latestShot);
       }
       return;
     }
 
     if (newLen < oldLen) {
+      shotEffectRequestGeneration += 1;
+      pendingShotEffect.value = null;
       bluelatestOne.value = null;
       hiddenBlueLatestKey.value = "";
       if (shotEffect.value?.team === "blue") shotEffect.value = null;
@@ -357,6 +425,14 @@ const simulShoot2 = async () => {
   }
 };
 
+const openAim = async () => {
+  await laserAimAPI();
+};
+
+const closeAim = async () => {
+  await laserCloseAPI();
+};
+
 const env = computed(() => {
   const accountInfo = uni.getAccountInfoSync();
   return accountInfo.miniProgram.envVersion;
@@ -394,11 +470,13 @@ async function onReceiveMessage(message) {
 
 onMounted(() => {
   uni.$on("socket-inbox", onReceiveMessage);
-  updateTargetSize();
+  void updateTargetRect();
   if (uni.onWindowResize) uni.onWindowResize(handleWindowResize);
 });
 
 onBeforeUnmount(() => {
+  shotEffectRequestGeneration += 1;
+  pendingShotEffect.value = null;
   if (timer.value) {
     clearTimeout(timer.value);
     timer.value = null;
@@ -504,17 +582,34 @@ onBeforeUnmount(() => {
         </view>
       </block>
       <BowShotEffect
+        v-if="!shotEffect || !shotEffect.viewportMode"
         :shot="shotEffect && shotEffect.shot"
         :playKey="shotEffect ? shotEffect.key : ''"
         :targetRadius="safeTargetRadius"
-        :targetWidth="targetSize.width"
-        :targetHeight="targetSize.height"
+        :targetLeft="targetRect.left"
+        :targetTop="targetRect.top"
+        :targetWidth="targetRect.width"
+        :targetHeight="targetRect.height"
         :hitOffsetPx="currentHitRadiusPx"
         @impact="shakeTarget"
         @complete="completeShotEffect"
       />
       <image src="https://static.shelingxingqiu.com/shootmini/static/bow-target.png" mode="widthFix" />
     </view>
+    <BowShotEffect
+      v-if="shotEffect && shotEffect.viewportMode"
+      :shot="shotEffect.shot"
+      :playKey="shotEffect.key"
+      :targetRadius="safeTargetRadius"
+      :targetLeft="targetRect.left"
+      :targetTop="targetRect.top"
+      :targetWidth="targetRect.width"
+      :targetHeight="targetRect.height"
+      :hitOffsetPx="currentHitRadiusPx"
+      :viewportMode="true"
+      @impact="shakeTarget"
+      @complete="completeShotEffect"
+    />
     <view class="footer">
       <PointSwitcher
         :onChange="(val) => (pMode = val)"
@@ -524,6 +619,8 @@ onBeforeUnmount(() => {
     <view class="simul" v-if="env !== 'release'">
       <button @click="simulShoot">模拟</button>
       <button @click="simulShoot2">射箭</button>
+      <button @click="openAim">开瞄</button>
+      <button @click="closeAim">关瞄</button>
     </view>
   </view>
 </template>
diff --git a/src/components/Container.vue b/src/components/Container.vue
index 93d652a..3b6e60f 100644
--- a/src/components/Container.vue
+++ b/src/components/Container.vue
@@ -25,6 +25,10 @@ const props = defineProps({
     type: Boolean,
     default: true,
   },
+  usePageScroll: {
+    type: Boolean,
+    default: false,
+  },
   isHome: {
     type: Boolean,
     default: false,
@@ -41,6 +45,10 @@ const props = defineProps({
     type: Boolean,
     default: true,
   },
+  headerClass: {
+    type: String,
+    default: "",
+  },
   titleStyle: {
     type: [String, Object, Array],
     default: () => ({}),
@@ -49,6 +57,14 @@ const props = defineProps({
     type: Boolean,
     default: true,
   },
+  loading: {
+    type: Boolean,
+    default: false,
+  },
+  loadingText: {
+    type: String,
+    default: "",
+  },
 });
 const isIOS = uni.getDeviceInfo().osName === "ios";
 const showHint = ref(false);
@@ -116,13 +132,27 @@ const goCalibration = async () => {
     <AppBackground :type="bgType" :bgColor="bgColor" />
     <Header
       v-if="!isHome"
+      :class="headerClass"
       :title="title"
       :onBack="onBack"
       :whiteBackArrow="whiteBackArrow"
       :titleStyle="titleStyle"
+      :style="
+        usePageScroll
+          ? {
+              position: 'sticky',
+              top: capsuleHeight + 'px',
+              zIndex: 10,
+            }
+          : undefined
+      "
     />
     <BackToGame v-if="showBackToGame" />
+    <view v-if="usePageScroll">
+      <slot></slot>
+    </view>
     <scroll-view
+      v-else
       :scroll-y="scroll"
       :enhanced="true"
       :bounces="false"
@@ -184,6 +214,18 @@ const goCalibration = async () => {
         </view>
       </view>
     </ScreenHint>
+    <view v-if="loading" class="audio-progress">
+      <image
+        src="https://static.shelingxingqiu.com/attachment/2025-11-26/deihtj15xjwcz3c1tx.png"
+        mode="widthFix"
+      />
+      <view>
+        <view :style="{ width: '100%' }"></view>
+      </view>
+      <view>
+        <text>{{ loadingText || "加载中..." }}</text>
+      </view>
+    </view>
   </view>
 </template>
 
@@ -225,4 +267,55 @@ const goCalibration = async () => {
   color: #666;
   opacity: 0.6;
 }
+
+.audio-progress {
+  z-index: 999;
+  width: 100vw;
+  height: 100vh;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background: rgb(0 0 0 / 0.8);
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+
+.audio-progress > image:nth-child(1) {
+  width: 140rpx;
+  height: 150rpx;
+  margin-bottom: 20rpx;
+}
+
+.audio-progress > view:nth-child(2) {
+  width: 380rpx;
+  height: 6rpx;
+  background: #595959;
+  border-radius: 4rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  justify-content: flex-start;
+}
+
+.audio-progress > view:nth-child(2) > view {
+  width: 100%;
+  min-height: 6rpx;
+  background: #ffe431;
+  border-radius: 4rpx;
+}
+
+.audio-progress > view:nth-child(3) {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.audio-progress > view:nth-child(3) > text {
+  font-size: 22rpx;
+  color: #a2a2a2;
+  text-align: center;
+  line-height: 32rpx;
+}
 </style>
diff --git a/src/components/ScorePanel2.vue b/src/components/ScorePanel2.vue
index bdd6c04..c12addd 100644
--- a/src/components/ScorePanel2.vue
+++ b/src/components/ScorePanel2.vue
@@ -5,13 +5,19 @@ const props = defineProps({
     default: () => [],
   },
 });
-const getSum = (a, b, c) => {
-  const sum = (Number(a) || 0) + (Number(b) || 0) + (Number(c) || 0);
-  return sum > 0 ? sum + "环" : "-";
+const getSum = (...arrows) => {
+  const recordedArrows = arrows.filter(Boolean);
+  if (!recordedArrows.length) return "-";
+  const sum = recordedArrows.reduce(
+    (total, arrow) => total + (Number(arrow.ring) || 0),
+    0
+  );
+  return `${sum}环`;
 };
 const roundsName = ["第一轮", "第二轮", "第三轮", "第四轮"];
-const getShowText = (arrow = {}) => {
-  return arrow.ring ? (arrow.ringX ? "X" : arrow.ring + "环") : "-";
+const getShowText = (arrow) => {
+  if (!arrow) return "-";
+  return arrow.ringX ? "X" : `${Number(arrow.ring) || 0}环`;
 };
 </script>
 <template>
diff --git a/src/components/ScoreResult.vue b/src/components/ScoreResult.vue
index e0eec08..1198663 100644
--- a/src/components/ScoreResult.vue
+++ b/src/components/ScoreResult.vue
@@ -57,19 +57,22 @@ onMounted(() => {
 });
 
 const getRing = (arrow) => {
+  if (!arrow) return "-";
   if (arrow.ringX) return "X";
-  return arrow.ring ? arrow.ring : "-";
+  return Number(arrow.ring) || 0;
 };
 
 const arrows = computed(() => {
-  const data = new Array(props.total).fill({ ring: 0 });
+  const data = new Array(props.total).fill(null);
   (props.result.details || []).forEach((arrow, index) => {
     data[index] = arrow;
   });
   return data;
 });
 
-const validArrows = computed(() => arrows.value.filter((a) => !!a.ring).length);
+const validArrows = computed(
+  () => arrows.value.filter((a) => Number(a?.ring) > 0).length
+);
 const isMember = computed(() => user.value.vip === true || user.value.sVip === true);
 const openCoachComment = () => {
   if (!isMember.value) return;
diff --git a/src/components/ShootProgress.vue b/src/components/ShootProgress.vue
index 0e0d407..6f4f91c 100644
--- a/src/components/ShootProgress.vue
+++ b/src/components/ShootProgress.vue
@@ -46,6 +46,10 @@ const props = defineProps({
     type: Function,
     default: () => {},
   },
+  endAudioKey: {
+    type: String,
+    default: "比赛结束",
+  },
 });
 
 const barColor = ref("#fed847");
@@ -144,7 +148,7 @@ async function onReceiveMessage(msg) {
     halfTime.value = false;
     audioManager.play(audioKey);
   } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
-    audioManager.play("比赛结束", false);
+    audioManager.play(props.endAudioKey, false);
   } else if (msg.type === MESSAGETYPESV2.ShootResult) {
     let arrow = {};
     if (msg.details && Array.isArray(msg.details)) {
diff --git a/src/components/TargetCanvas.vue b/src/components/TargetCanvas.vue
new file mode 100644
index 0000000..f699158
--- /dev/null
+++ b/src/components/TargetCanvas.vue
@@ -0,0 +1,531 @@
+<script setup>
+import { computed, getCurrentInstance, nextTick, onMounted, ref, watch } from "vue";
+
+const defaultCanvasSize = 300;
+const defaultRingCount = 10;
+
+const props = defineProps({
+  // canvas 唯一标识；不传时组件内部自动生成，避免多个靶面 canvas-id 冲突。
+  canvasId: {
+    type: String,
+    default: "",
+  },
+  // 业务坐标半径，例如 20 表示命中点坐标范围为 -20 到 20。
+  // 当前组件主要用它参与重绘判断，外层命中点定位也应使用同一半径。
+  coordinateRadius: {
+    type: Number,
+    default: 20,
+  },
+  // 是否显示靶心十字辅助线。
+  showCrosshair: {
+    type: Boolean,
+    default: false,
+  },
+  // 是否显示环数文字。
+  showRingLabels: {
+    type: Boolean,
+    default: true,
+  },
+  // 从正上方开始顺时针等分的区域数量。
+  sectorCount: {
+    type: Number,
+    default: 0,
+  },
+  // 当前高亮区域，范围为 1 到 sectorCount。
+  activeSector: {
+    type: Number,
+    default: 0,
+  },
+  // 指定环数，1 到 10；无效值表示高亮整个区域。
+  activeRing: {
+    type: Number,
+    default: 0,
+  },
+  showSectorLabels: {
+    type: Boolean,
+    default: false,
+  },
+  // 只绘制透明高亮层，不绘制完整靶纸；用于叠加在靶纸图片上。
+  highlightOnly: {
+    type: Boolean,
+    default: false,
+  },
+  // 外部指定 canvas 绘制尺寸；用于让高亮层跟随靶图真实显示区域。
+  canvasWidth: {
+    type: Number,
+    default: 0,
+  },
+  canvasHeight: {
+    type: Number,
+    default: 0,
+  },
+  // 靶纸样式覆盖配置，例如环数、环色、环线颜色、环数字体等。
+  targetStyleConfig: {
+    type: Object,
+    default: () => ({}),
+  },
+  // 十字辅助线样式覆盖配置。
+  crosshairStyle: {
+    type: Object,
+    default: () => ({}),
+  },
+  // 区域分割线样式覆盖配置。
+  sectorStyle: {
+    type: Object,
+    default: () => ({}),
+  },
+  // 区域数字样式覆盖配置。
+  sectorLabelStyle: {
+    type: Object,
+    default: () => ({}),
+  },
+  // 高亮样式覆盖配置。
+  highlightStyle: {
+    type: Object,
+    default: () => ({}),
+  },
+});
+
+const instance = getCurrentInstance();
+const localCanvasId = `target-canvas-${Math.random().toString(36).slice(2, 10)}`;
+const currentCanvasId = computed(() => props.canvasId || localCanvasId);
+const lastDrawKey = ref("");
+const canvasSize = ref({
+  width: defaultCanvasSize,
+  height: defaultCanvasSize,
+});
+
+// 完整靶纸默认样式，调用方可以通过 targetStyleConfig 局部覆盖。
+const defaultTargetStyleConfig = {
+  ringCount: defaultRingCount,
+  ringColors: {
+    1: "#f8f8f3",
+    2: "#f8f8f3",
+    3: "#595959",
+    4: "#595959",
+    5: "#24aee0",
+    6: "#24aee0",
+    7: "#ff1f35",
+    8: "#ff1f35",
+    9: "#f7d34a",
+    10: "#f7d34a",
+  },
+  ringLineColor: "rgba(150, 150, 150, 0.55)",
+  ringLineWidthRatio: 0.0022,
+  centerDotColor: "#ffffff",
+  centerDotRadiusRatio: 0.0048,
+  ringLabelFontRatio: 0.032,
+  ringLabelDarkColor: "#111111",
+  ringLabelLightColor: "#ffffff",
+};
+
+// 十字辅助线默认样式。
+const defaultCrosshairStyle = {
+  color: "rgba(20, 20, 20, 0.38)",
+  lineWidthRatio: 0.0025,
+};
+
+// 顺时针等分线默认样式。
+const defaultSectorStyle = {
+  color: "rgba(255, 255, 255, 0.82)",
+  lineWidthRatio: 0.004,
+};
+
+// 区域数字默认样式。
+const defaultSectorLabelStyle = {
+  color: "#ffffff",
+  backgroundColor: "rgba(0, 0, 0, 0.62)",
+  fontSizeRatio: 0.075,
+  radiusRatio: 0.76,
+  badgeRadiusRatio: 0.07,
+};
+
+// 高亮区域默认样式。
+const defaultHighlightStyle = {
+  color: "rgba(255, 228, 0, 0.6)",
+  strokeColor: "rgba(254, 216, 71, 0.82)",
+  lineWidthRatio: 0.003,
+};
+
+// 合并默认靶纸样式和外部传入样式，ringColors 单独深合并。
+const mergeTargetStyleConfig = () => ({
+  ...defaultTargetStyleConfig,
+  ...props.targetStyleConfig,
+  ringColors: {
+    ...defaultTargetStyleConfig.ringColors,
+    ...(props.targetStyleConfig?.ringColors || {}),
+  },
+});
+
+// 统一把外部传入值转成有效数字，非法值使用 fallback。
+const getNumber = (value, fallback = 0) => {
+  const numberValue = Number(value);
+  return Number.isFinite(numberValue) ? numberValue : fallback;
+};
+
+// 获取指定环数的填充色，兼容数字 key 和字符串 key。
+const getRingColor = (ring, config) => {
+  return config.ringColors?.[ring] || config.ringColors?.[String(ring)] || "#ffffff";
+};
+
+const getPositiveInteger = (value) => {
+  const numberValue = Number(value);
+  return Number.isInteger(numberValue) && numberValue > 0 ? numberValue : 0;
+};
+
+// 正上方作为第一区起始边界，Canvas 角度递增方向即为顺时针。
+const getSectorAngles = (sector, sectorCount) => {
+  const count = getPositiveInteger(sectorCount);
+  const index = getPositiveInteger(sector);
+  if (!count || !index || index > count) return null;
+
+  const step = (Math.PI * 2) / count;
+  const startAngle = -Math.PI / 2 + (index - 1) * step;
+  return {
+    startAngle,
+    endAngle: startAngle + step,
+    middleAngle: startAngle + step / 2,
+  };
+};
+
+// 绘制实心圆，靶纸环区和中心点都会用到。
+const drawCircle = (ctx, centerX, centerY, radius, fillColor) => {
+  ctx.beginPath();
+  ctx.arc(centerX, centerY, radius, 0, Math.PI * 2);
+  ctx.setFillStyle(fillColor);
+  ctx.fill();
+};
+
+// 绘制环形扇区，用于按象限高亮指定环数。
+const drawAnnularSector = (
+  ctx,
+  centerX,
+  centerY,
+  innerRadius,
+  outerRadius,
+  startAngle,
+  endAngle,
+  fillColor,
+  strokeColor = "",
+  lineWidth = 0
+) => {
+  ctx.beginPath();
+  ctx.arc(centerX, centerY, outerRadius, startAngle, endAngle);
+
+  if (innerRadius > 0) {
+    ctx.arc(centerX, centerY, innerRadius, endAngle, startAngle, true);
+  } else {
+    ctx.lineTo(centerX, centerY);
+  }
+
+  ctx.closePath();
+  ctx.setFillStyle(fillColor);
+  ctx.fill();
+
+  if (strokeColor && lineWidth > 0) {
+    ctx.setStrokeStyle(strokeColor);
+    ctx.setLineWidth(lineWidth);
+    ctx.stroke();
+  }
+};
+
+// 从外到内绘制完整靶纸色环。
+const drawTargetRings = (ctx, centerX, centerY, targetRadius, config) => {
+  for (let ring = 1; ring <= config.ringCount; ring += 1) {
+    const radius = targetRadius * ((config.ringCount + 1 - ring) / config.ringCount);
+    drawCircle(ctx, centerX, centerY, radius, getRingColor(ring, config));
+  }
+};
+
+// 高亮后端指定区域；activeRing 有效时只高亮该区域内的单个环。
+const drawSectorHighlight = (ctx, centerX, centerY, targetRadius, config) => {
+  const angles = getSectorAngles(props.activeSector, props.sectorCount);
+  if (!angles) return;
+
+  const ring = getPositiveInteger(props.activeRing);
+  const hasActiveRing = ring >= 1 && ring <= config.ringCount;
+  const innerRadius = hasActiveRing
+    ? targetRadius * ((config.ringCount - ring) / config.ringCount)
+    : 0;
+  const outerRadius = hasActiveRing
+    ? targetRadius * ((config.ringCount + 1 - ring) / config.ringCount)
+    : targetRadius;
+  const style = {
+    ...defaultHighlightStyle,
+    ...props.highlightStyle,
+  };
+
+  drawAnnularSector(
+    ctx,
+    centerX,
+    centerY,
+    innerRadius,
+    outerRadius,
+    angles.startAngle,
+    angles.endAngle,
+    style.color,
+    style.strokeColor,
+    Math.max(1, targetRadius * style.lineWidthRatio)
+  );
+};
+
+// 从正上方开始顺时针绘制所有区域边界。
+const drawSectorLines = (ctx, centerX, centerY, targetRadius) => {
+  const count = getPositiveInteger(props.sectorCount);
+  if (!count) return;
+
+  const style = {
+    ...defaultSectorStyle,
+    ...props.sectorStyle,
+  };
+  const step = (Math.PI * 2) / count;
+
+  ctx.beginPath();
+  for (let index = 0; index < count; index += 1) {
+    const angle = -Math.PI / 2 + index * step;
+    ctx.moveTo(centerX, centerY);
+    ctx.lineTo(
+      centerX + Math.cos(angle) * targetRadius,
+      centerY + Math.sin(angle) * targetRadius
+    );
+  }
+  ctx.setStrokeStyle(style.color);
+  ctx.setLineWidth(Math.max(1, targetRadius * style.lineWidthRatio));
+  ctx.stroke();
+};
+
+// 绘制各环之间的分割线。
+const drawRingLines = (ctx, centerX, centerY, targetRadius, config) => {
+  const lineWidth = Math.max(1, targetRadius * config.ringLineWidthRatio);
+
+  ctx.setStrokeStyle(config.ringLineColor);
+  ctx.setLineWidth(lineWidth);
+
+  for (let index = 1; index <= config.ringCount; index += 1) {
+    const radius = targetRadius * (index / config.ringCount);
+    ctx.beginPath();
+    ctx.arc(centerX, centerY, radius, 0, Math.PI * 2);
+    ctx.stroke();
+  }
+};
+
+// 绘制靶心十字辅助线。
+const drawCrosshair = (ctx, centerX, centerY, targetRadius) => {
+  if (!props.showCrosshair) {
+    return;
+  }
+
+  const style = {
+    ...defaultCrosshairStyle,
+    ...props.crosshairStyle,
+  };
+
+  ctx.beginPath();
+  ctx.moveTo(centerX - targetRadius, centerY);
+  ctx.lineTo(centerX + targetRadius, centerY);
+  ctx.moveTo(centerX, centerY - targetRadius);
+  ctx.lineTo(centerX, centerY + targetRadius);
+  ctx.setStrokeStyle(style.color);
+  ctx.setLineWidth(Math.max(1, targetRadius * style.lineWidthRatio));
+  ctx.stroke();
+};
+
+// 绘制环数文字。
+const drawRingLabels = (ctx, centerX, centerY, targetRadius, config) => {
+  if (!props.showRingLabels) {
+    return;
+  }
+
+  const ringWidth = targetRadius / config.ringCount;
+  const fontSize = Math.max(10, targetRadius * config.ringLabelFontRatio);
+
+  ctx.setFontSize(fontSize);
+  ctx.setTextAlign("center");
+  ctx.setTextBaseline("middle");
+
+  for (let ring = config.ringCount; ring >= 1; ring -= 1) {
+    const y = centerY + (config.ringCount - ring + 0.45) * ringWidth;
+    const color = ring <= 2 ? config.ringLabelDarkColor : config.ringLabelLightColor;
+    ctx.setFillStyle(color);
+    ctx.fillText(String(ring), centerX, y);
+  }
+};
+
+// 在每个区域中线位置绘制编号，编号层始终位于高亮和分割线之上。
+const drawSectorLabels = (ctx, centerX, centerY, targetRadius) => {
+  const count = getPositiveInteger(props.sectorCount);
+  if (!props.showSectorLabels || !count) return;
+
+  const style = {
+    ...defaultSectorLabelStyle,
+    ...props.sectorLabelStyle,
+  };
+  const labelRadius = targetRadius * style.radiusRatio;
+  const badgeRadius = Math.max(10, targetRadius * style.badgeRadiusRatio);
+
+  ctx.setFontSize(Math.max(11, targetRadius * style.fontSizeRatio));
+  ctx.setTextAlign("center");
+  ctx.setTextBaseline("middle");
+
+  for (let sector = 1; sector <= count; sector += 1) {
+    const angles = getSectorAngles(sector, count);
+    const x = centerX + Math.cos(angles.middleAngle) * labelRadius;
+    const y = centerY + Math.sin(angles.middleAngle) * labelRadius;
+    drawCircle(ctx, x, y, badgeRadius, style.backgroundColor);
+    ctx.setFillStyle(style.color);
+    ctx.fillText(String(sector), x, y);
+  }
+};
+
+// 生成本次绘制状态的唯一 key，用于避免相同内容重复 draw。
+const getDrawKey = (width, height) => {
+  return JSON.stringify({
+    width,
+    height,
+    coordinateRadius: props.coordinateRadius,
+    showCrosshair: props.showCrosshair,
+    showRingLabels: props.showRingLabels,
+    sectorCount: props.sectorCount,
+    activeSector: props.activeSector,
+    activeRing: props.activeRing,
+    showSectorLabels: props.showSectorLabels,
+    targetStyleConfig: props.targetStyleConfig,
+    crosshairStyle: props.crosshairStyle,
+    sectorStyle: props.sectorStyle,
+    sectorLabelStyle: props.sectorLabelStyle,
+    highlightStyle: props.highlightStyle,
+    highlightOnly: props.highlightOnly,
+  });
+};
+
+// 主绘制入口：根据 highlightOnly 决定画完整靶纸，还是只画透明高亮层。
+const drawTarget = () => {
+  const width = Math.max(getNumber(canvasSize.value.width, defaultCanvasSize), 1);
+  const height = Math.max(getNumber(canvasSize.value.height, defaultCanvasSize), 1);
+  const drawKey = getDrawKey(width, height);
+
+  if (drawKey === lastDrawKey.value) {
+    return;
+  }
+
+  const size = Math.min(width, height);
+  const centerX = width / 2;
+  const centerY = height / 2;
+  const targetRadius = size / 2;
+  const config = mergeTargetStyleConfig();
+  const ctx = uni.createCanvasContext(currentCanvasId.value, instance?.proxy);
+
+  ctx.clearRect(0, 0, width, height);
+
+  if (!props.highlightOnly) {
+    drawTargetRings(ctx, centerX, centerY, targetRadius, config);
+  }
+
+  drawSectorHighlight(ctx, centerX, centerY, targetRadius, config);
+
+  if (!props.highlightOnly) {
+    drawRingLines(ctx, centerX, centerY, targetRadius, config);
+    drawCircle(
+      ctx,
+      centerX,
+      centerY,
+      Math.max(1, targetRadius * config.centerDotRadiusRatio),
+      config.centerDotColor
+    );
+    drawCrosshair(ctx, centerX, centerY, targetRadius);
+    drawRingLabels(ctx, centerX, centerY, targetRadius, config);
+  }
+
+  // 高亮先画，等分线和编号后画，避免高亮覆盖区域边界。
+  drawSectorLines(ctx, centerX, centerY, targetRadius);
+  drawSectorLabels(ctx, centerX, centerY, targetRadius);
+
+  ctx.draw();
+  lastDrawKey.value = drawKey;
+};
+
+const setCanvasSizeAndDraw = async (width, height) => {
+  canvasSize.value = {
+    width: width > 0 ? width : defaultCanvasSize,
+    height: height > 0 ? height : width || defaultCanvasSize,
+  };
+
+  await nextTick();
+  drawTarget();
+};
+
+// 读取 canvas 实际渲染尺寸后再绘制，保证小程序真机尺寸和坐标一致。
+const measureAndDraw = () => {
+  const propWidth = Math.round(getNumber(props.canvasWidth, 0));
+  const propHeight = Math.round(getNumber(props.canvasHeight, 0));
+
+  if (propWidth > 0 && propHeight > 0) {
+    setCanvasSizeAndDraw(propWidth, propHeight);
+    return;
+  }
+
+  const query = uni.createSelectorQuery().in(instance?.proxy);
+
+  query
+    .select(`#${currentCanvasId.value}`)
+    .boundingClientRect(async (rect) => {
+      const width = Math.round(getNumber(rect?.width, defaultCanvasSize));
+      const height = Math.round(getNumber(rect?.height, width || defaultCanvasSize));
+
+      await setCanvasSizeAndDraw(width, height);
+    })
+    .exec();
+};
+
+// 等待 Vue 完成 DOM 更新后重新测量和绘制。
+const scheduleDraw = async () => {
+  await nextTick();
+  measureAndDraw();
+};
+
+watch(
+  () => [
+    props.coordinateRadius,
+    props.showCrosshair,
+    props.showRingLabels,
+    props.sectorCount,
+    props.activeSector,
+    props.activeRing,
+    props.showSectorLabels,
+    props.highlightOnly,
+    props.canvasWidth,
+    props.canvasHeight,
+    props.targetStyleConfig,
+    props.crosshairStyle,
+    props.sectorStyle,
+    props.sectorLabelStyle,
+    props.highlightStyle,
+  ],
+  scheduleDraw,
+  {
+    deep: true,
+  }
+);
+
+onMounted(() => {
+  setTimeout(measureAndDraw, 30);
+});
+</script>
+
+<template>
+  <canvas
+    :id="currentCanvasId"
+    class="target-canvas"
+    :canvas-id="currentCanvasId"
+    :width="canvasSize.width"
+    :height="canvasSize.height"
+  />
+</template>
+
+<style scoped>
+.target-canvas {
+  display: block;
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/components/TargetPicker.vue b/src/components/TargetPicker.vue
index d68b819..c502817 100644
--- a/src/components/TargetPicker.vue
+++ b/src/components/TargetPicker.vue
@@ -1,12 +1,17 @@
 <script setup>
 import { ref, watch } from "vue";
 import SButton from "@/components/SButton.vue";
+import audioManager from "@/audioManager";
 
 const props = defineProps({
   show: {
     type: Boolean,
     default: false,
   },
+  clickSound: {
+    type: Boolean,
+    default: false,
+  },
   onClose: {
     type: Function,
     default: () => {},
@@ -39,7 +44,19 @@ watch(
   {}
 );
 
+const playClickSound = () => {
+  if (props.clickSound) {
+    audioManager.play("点击按钮");
+  }
+};
+
+const handleSelectTarget = (target) => {
+  playClickSound();
+  selectedTarget.value = target;
+};
+
 const handleConfirm = () => {
+  playClickSound();
   props.onConfirm(selectedTarget.value);
   props.onClose();
 };
@@ -70,14 +87,14 @@ const handleConfirm = () => {
       <view class="target-options">
         <view
           :class="{ 'target-btn': true, 'target-choosen': selectedTarget === 1 }"
-          @click="() => (selectedTarget = 1)"
+          @click="handleSelectTarget(1)"
         >
           <text>20厘米全环靶</text>
         </view>
         <view style="width: 30rpx"></view>
         <view
           :class="{ 'target-btn': true, 'target-choosen': selectedTarget === 2 }"
-          @click="() => (selectedTarget = 2)"
+          @click="handleSelectTarget(2)"
         >
           <text>40厘米全环靶</text>
         </view>
@@ -194,4 +211,4 @@ const handleConfirm = () => {
   color: #fed847;
   border: 4rpx solid #fed847;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/TestDistance.vue b/src/components/TestDistance.vue
index f75de58..fbbb91d 100644
--- a/src/components/TestDistance.vue
+++ b/src/components/TestDistance.vue
@@ -51,8 +51,13 @@ onBeforeUnmount(() => {
 async function onReceiveMessage(msg) {
   if (Array.isArray(msg)) return;
   if (msg.type === MESSAGETYPESV2.TestDistance) {
-    distance.value = Number((msg.shootData.distance / 100).toFixed(2));
-    if (distance.value >= 5) audioManager.play("距离合格");
+    const rawDistance = Number(msg.shootData?.distance);
+    distance.value = Number.isFinite(rawDistance)
+      ? Number((rawDistance / 100).toFixed(2))
+      : 0;
+    if (rawDistance === 0) {
+      audioManager.play("未发现靶纸，请瞄准靶纸射箭");
+    } else if (distance.value >= 5) audioManager.play("距离合格");
     else audioManager.play("距离不足");
   }
 }
@@ -113,7 +118,7 @@ onBeforeUnmount(() => {
     <view v-if="isBattle" class="ready-timer">
       <image src="https://static.shelingxingqiu.com/shootmini/static/test-tip.png" mode="widthFix" />
       <view v-if="count >= 0">
-        <text>具体正式比赛还有</text>
+        <text>距离正式比赛还有</text>
         <text>{{ count }}</text>
         <text>秒</text>
       </view>
diff --git a/src/components/UserHeader.vue b/src/components/UserHeader.vue
index 5b375fe..c382931 100644
--- a/src/components/UserHeader.vue
+++ b/src/components/UserHeader.vue
@@ -10,6 +10,10 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  fullNickname: {
+    type: Boolean,
+    default: false,
+  },
   onSignin: {
     type: Function,
     default: () => {},
@@ -61,7 +65,13 @@ watch(
 </script>
 
 <template>
-  <view class="container" :style="{ width: containerWidth }">
+  <view
+    :class="[
+      'container',
+      fullNickname ? 'container--full-nickname' : '',
+    ]"
+    :style="{ width: containerWidth }"
+  >
     <block v-if="user.id">
       <Avatar
         :rankLvl="user.rankLvl"
@@ -83,11 +93,11 @@ watch(
               user.nickName
             }}</text>
           </view>
-          <image
+          <!-- <image
             class="user-name-image"
             src="../static/vip1.png"
             mode="widthFix"
-          />
+          /> -->
         </view>
         <view class="user-stats">
           <text class="level-tag level-tag-first">段位积分</text>
@@ -165,6 +175,19 @@ watch(
   max-width: 180rpx;
 }
 
+.container--full-nickname .user-details {
+  flex: 1;
+  min-width: 0;
+}
+
+.container--full-nickname .user-name {
+  width: 100%;
+}
+
+.container--full-nickname .user-name .member-nickname {
+  max-width: 80%;
+}
+
 .user-name .member-nickname__text,
 .user-name .member-nickname__shine {
   font-size: 13px;
diff --git a/src/manifest.json b/src/manifest.json
index a074640..16a0bbe 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -286,9 +286,20 @@
                 {
                     "type" : "file",
                     "value" : "static/tab-mall.png"
+                },
+                {
+                    "type" : "folder",
+                    "value" : "static/training-home"
+                },
+                {
+                    "type" : "folder",
+                    "value" : "static/training-difficulty-design"
                 }
             ]
         },
+        "optimization" : {
+            "subPackages" : true
+        },
         "setting" : {
             "urlCheck" : false,
             "minified" : true,
diff --git a/src/matchWebsocket.js b/src/matchWebsocket.js
index cc0b803..dd86531 100644
--- a/src/matchWebsocket.js
+++ b/src/matchWebsocket.js
@@ -4,6 +4,7 @@ import {
   createAckMessage,
   createHeartbeatAckMessage,
   createLeaveMessage,
+  createSyncPracticeInfoMessage,
   decodeServerMessage,
   getServerMessageTypeName,
 } from "@/utils/matchProtocol";
@@ -57,6 +58,7 @@ const BUSINESS_TYPE_BY_SERVER_TYPE = {
 const MATCH_READY_SNAPSHOT_PREFIX = "match-ready-snapshot:";
 export const MATCH_WS_AUDIO_ACK_EVENT = "match-ws-audio-ack";
 export const MATCH_WS_STATE_EVENT = "match-ws-state";
+export const MATCH_WS_PRACTICE_SYNC_EVENT = "match-ws-practice-sync";
 
 function normalizeShootData(shootData) {
   if (!shootData || typeof shootData !== "object") return shootData;
@@ -184,6 +186,22 @@ function buildBusinessMessage(message) {
   };
 }
 
+function buildPracticeSyncMessage(message) {
+  const practiceInfo = normalizePracticeInfo(message.practice_info);
+  const matchId = normalizeId(
+    pickField(message, "matchId", "match_id") ||
+      practiceInfo.id ||
+      currentContext?.matchId
+  );
+
+  return {
+    matchId,
+    timestamp: message.timestamp,
+    sequence: message.sequence,
+    practiceInfo,
+  };
+}
+
 function getReadySnapshotKey(matchId) {
   return `${MATCH_READY_SNAPSHOT_PREFIX}${normalizeId(matchId)}`;
 }
@@ -227,15 +245,27 @@ function normalizeRoute(route) {
   return String(route || "").replace(/^\//, "");
 }
 
-function isCurrentBattlePage(matchId) {
+function getRouteFromUrl(url) {
+  return normalizeRoute(String(url || "").split("?")[0]);
+}
+
+function isCurrentBattlePage(url, matchId) {
   const page = getCurrentPageInfo();
   const route = normalizeRoute(page?.route);
-  if (route !== "pages/team-battle/index" && route !== "pages/melee-battle") {
-    return false;
-  }
+  const targetRoute = getRouteFromUrl(url);
+  if (!targetRoute || route !== targetRoute) return false;
 
   const options = page?.options || page?.$page?.options || {};
-  return !matchId || normalizeId(options.battleId) === normalizeId(matchId);
+  const expectedMatchId = normalizeId(matchId);
+  if (!expectedMatchId) return true;
+
+  const routeMatchId = normalizeId(options.battleId);
+  if (routeMatchId) return routeMatchId === expectedMatchId;
+
+  return Boolean(
+    options.fromReturn &&
+      normalizeId(currentContext?.matchId) === expectedMatchId
+  );
 }
 
 function scheduleReadyRouteFallback(message) {
@@ -246,7 +276,7 @@ function scheduleReadyRouteFallback(message) {
 
   lastReadyRouteKey = routeKey;
   setTimeout(() => {
-    if (isCurrentBattlePage(matchId)) return;
+    if (isCurrentBattlePage(url, matchId)) return;
 
     const currentRoute = normalizeRoute(getCurrentPageInfo()?.route);
     // battle-room 和 match-page 本身会消费 AboutToStart；这里不绕过页面内状态，避免好友房误触退房逻辑。
@@ -319,6 +349,7 @@ function getShootResultAudioKeys(shootData) {
 function getTestDistanceAudioKeys(shootData) {
   const distance = Number(shootData?.distance ?? shootData?.dst);
   if (Number.isNaN(distance)) return [];
+  if (distance === 0) return ["未发现靶纸，请瞄准靶纸射箭"];
   return [distance / 100 >= 5 ? "\u8ddd\u79bb\u5408\u683c" : "\u8ddd\u79bb\u4e0d\u8db3"];
 }
 
@@ -343,7 +374,7 @@ function getAckAudioKeys(message, businessMessage) {
       if (businessMessage?.type === MESSAGETYPESV2.HalfRest) return ["中场休息"];
       return ["比赛结束"];
     case ServerMessageType.SERVER_MSG_PRACTICE_END:
-      return ["比赛结束"];
+      return [currentContext?.practiceEndAudioKey || "比赛结束"];
     case ServerMessageType.SERVER_MSG_CHECK:
       return getTestDistanceAudioKeys(businessMessage?.shootData);
     case ServerMessageType.SERVER_MSG_NOT_ENOUGH_DISTANCE:
@@ -599,6 +630,24 @@ function sendHeartbeatAck() {
   );
 }
 
+function sendPracticeInfoSync() {
+  if (!socket || !currentContext?.matchId || !currentContext?.userId) return;
+
+  const clientMessage = {
+    type: ClientMessageType.CLIENT_MSG_SYNC_PRACTICE_INFO,
+    match_id: currentContext.matchId,
+    user_id: currentContext.userId,
+  };
+  sendBuffer(
+    createSyncPracticeInfoMessage({
+      matchId: clientMessage.match_id,
+      userId: clientMessage.user_id,
+    }),
+    "CLIENT_MSG_SYNC_PRACTICE_INFO",
+    clientMessage
+  );
+}
+
 function sendAck({ matchId, sequence }) {
   // sequence 由后端处理，前端只原样带回，不做重排和断线补发。
   if (sequence === undefined || sequence === null || sequence === "") return;
@@ -670,26 +719,27 @@ function removeAudioAckListener() {
 }
 
 function queueAckAfterAudio(message, businessMessage) {
-  // 除心跳外，只要服务端带了 sequence，都需要走 ACK；没有语音的消息立即 ACK。
-  if (
-    message.sequence === undefined ||
-    message.sequence === null ||
-    message.sequence === ""
-  ) {
-    return;
-  }
+  // 终止消息即使没有 sequence，也要等结束语音完成后主动关闭连接。
+  const leaveAfterAck = shouldCloseAfterAck(message, businessMessage);
+  const hasSequence =
+    message.sequence !== undefined &&
+    message.sequence !== null &&
+    message.sequence !== "";
+  if (!hasSequence && !leaveAfterAck) return;
+
   const task = {
     matchId: normalizeId(
       pickField(message, "matchId", "match_id") || currentContext?.matchId
     ),
     sequence: message.sequence,
-    leaveAfterAck: shouldCloseAfterAck(message, businessMessage),
+    leaveAfterAck,
   };
+  const actionLabel = hasSequence ? "ack" : "terminal close";
 
   const audioKeys = getAckAudioKeys(message, businessMessage).filter(Boolean);
   if (!audioKeys.length) {
     console.log(
-      "[match-ws] ack immediately without audio",
+      `[match-ws] ${actionLabel} immediately without audio`,
       getServerMessageTypeName(message.type),
       message.sequence
     );
@@ -703,7 +753,7 @@ function queueAckAfterAudio(message, businessMessage) {
     if (index === -1) return;
     pendingAcks.splice(index, 1);
     console.log(
-      "[match-ws] ack audio wait timeout",
+      `[match-ws] ${actionLabel} audio wait timeout`,
       getServerMessageTypeName(message.type),
       message.sequence,
       task.expectedAudioKey
@@ -712,7 +762,7 @@ function queueAckAfterAudio(message, businessMessage) {
   }, ACK_AUDIO_TIMEOUT_MS);
   pendingAcks.push(task);
   console.log(
-    "[match-ws] ack queued until audioEnded",
+    `[match-ws] ${actionLabel} queued until audioEnded`,
     getServerMessageTypeName(message.type),
     message.sequence,
     task.expectedAudioKey
@@ -729,11 +779,6 @@ function handleMessage(data) {
     return;
   }
 
-  const decodedMatchId = normalizeId(pickField(message, "matchId", "match_id"));
-  if (decodedMatchId && currentContext) {
-    currentContext.matchId = decodedMatchId;
-  }
-
   if (message.type === ServerMessageType.SERVER_MSG_HEARTBEAT) {
     sendHeartbeatAck();
     return;
@@ -742,6 +787,34 @@ function handleMessage(data) {
   const typeName = getServerMessageTypeName(message.type);
   console.log("收到比赛服 WebSocket 消息", typeName, message);
 
+  const decodedMatchId = normalizeId(pickField(message, "matchId", "match_id"));
+  if (message.type === ServerMessageType.SERVER_MSG_SYNC_PRACTICE_INFO) {
+    // 同步响应是完整快照，不映射成开始/报靶等实时事件，避免重放页面副作用。
+    queueAckAfterAudio(message, null);
+    if (
+      decodedMatchId &&
+      currentContext?.matchId &&
+      decodedMatchId !== currentContext.matchId
+    ) {
+      console.log("[match-ws] ignore mismatched practice sync", {
+        expectedMatchId: currentContext.matchId,
+        receivedMatchId: decodedMatchId,
+      });
+      return;
+    }
+
+    const syncMessage = buildPracticeSyncMessage(message);
+    if (syncMessage.matchId && currentContext) {
+      currentContext.matchId = syncMessage.matchId;
+    }
+    uni.$emit(MATCH_WS_PRACTICE_SYNC_EVENT, syncMessage);
+    return;
+  }
+
+  if (decodedMatchId && currentContext) {
+    currentContext.matchId = decodedMatchId;
+  }
+
   const businessMessage = buildBusinessMessage(message);
   if (businessMessage?.matchId && currentContext) {
     currentContext.matchId = businessMessage.matchId;
@@ -776,6 +849,9 @@ export function connectMatchWebSocket(options = {}) {
     userId,
     token,
     mode,
+    requestPracticeInfoOnOpen = false,
+    appHideResumable = false,
+    practiceEndAudioKey = "",
     force = false,
     reconnecting = false,
     reconnectReason = "",
@@ -846,6 +922,9 @@ export function connectMatchWebSocket(options = {}) {
     mode: Number.isFinite(normalizedMode) ? normalizedMode : undefined,
     isMelee:
       Number.isFinite(normalizedMode) ? normalizedMode > 3 : undefined,
+    requestPracticeInfoOnOpen: requestPracticeInfoOnOpen === true,
+    appHideResumable: appHideResumable === true,
+    practiceEndAudioKey: String(practiceEndAudioKey || "").trim(),
     meleeHalfRest: isSameContext
       ? currentContext?.meleeHalfRest === true
       : false,
@@ -899,6 +978,9 @@ export function connectMatchWebSocket(options = {}) {
       reason: reconnectReason,
       reconnected: wasReconnected,
     });
+    if (currentContext?.requestPracticeInfoOnOpen) {
+      sendPracticeInfoSync();
+    }
   });
 
   socketTask.onMessage((res) => {
@@ -939,9 +1021,22 @@ export function connectMatchWebSocketFromNotice(notice, fallbackUserId) {
   });
 }
 
+export function setMatchAppHideResumable(enabled) {
+  if (!currentContext) return;
+  currentContext.appHideResumable = enabled === true;
+}
+
 export function closeMatchWebSocket(options = {}) {
   // 默认关闭时会发送 LEAVE；内部切换连接可通过 sendLeave:false 跳过。
-  const { sendLeave: shouldSendLeave = true, reason = "manual" } = options;
+  const { reason = "manual" } = options;
+  // 可恢复训练切后台只断开传输层，不能把它上报成主动离场。
+  const shouldSendLeave =
+    options.sendLeave === undefined
+      ? !(
+          reason === "app-hide" &&
+          currentContext?.appHideResumable === true
+        )
+      : options.sendLeave === true;
 
   manualClose = true;
   clearReconnectTimer();
@@ -974,6 +1069,7 @@ export default {
   ServerMessageType,
   connectMatchWebSocket,
   connectMatchWebSocketFromNotice,
+  setMatchAppHideResumable,
   closeMatchWebSocket,
   forceReconnectMatchWebSocket,
   handleMatchNetworkStatusChange,
diff --git a/src/mock/index.js b/src/mock/index.js
new file mode 100644
index 0000000..c716202
--- /dev/null
+++ b/src/mock/index.js
@@ -0,0 +1,104 @@
+// 首页一周打卡展示数据，直接对应顶部 7 个日期卡片。
+export const trainingHomeWeekSchedule = [
+  {
+    key: "mon",
+    label: "周一",
+    status: "done",
+    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/done.png",
+  },
+  {
+    key: "tue",
+    label: "周二",
+    status: "done",
+    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/done.png",
+  },
+  {
+    key: "wed",
+    label: "周三",
+    status: "missed",
+    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/missed.png",
+  },
+  {
+    key: "thu",
+    label: "周四",
+    status: "missed",
+    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/missed.png",
+  },
+  {
+    key: "fri",
+    label: "周五",
+    status: "done",
+    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/done.png",
+  },
+  {
+    key: "sat",
+    label: "周六",
+    status: "done",
+    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/done.png",
+  },
+  {
+    key: "sun",
+    label: "周日",
+    status: "missed",
+    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/missed.png",
+  },
+];
+
+// 首页统计卡数据，按设计稿从左到右展示。
+export const trainingHomeStats = [
+  { key: "days", value: "12", unit: "天", label: "共训练" },
+  { key: "shots", value: "112", unit: "支", label: "累计射箭" },
+  { key: "hitRate", value: "30", unit: "%", label: "命中率" },
+  { key: "endurance", value: "6", unit: "支/分钟", label: "耐力射击" },
+  { key: "calories", value: "31W", unit: "卡路里", label: "共消耗" },
+];
+
+// 雷达图区文案与数值配置。
+export const trainingHomeRadar = {
+  labels: ["基础", "精准", "力量", "节奏", "耐力"],
+  values: [5.5, 6.3, 10, 4.5, 6],
+  maxValue: 10,
+  surpassValue: '80%'
+};
+
+// 首页主推荐训练卡数据。
+export const trainingHomeFeatured = {
+  title: "基础训练",
+  progressText: "当前进度 LV7 >",
+};
+
+// 首页四个训练入口卡片数据。
+export const trainingHomeModes = [
+  {
+    key: "endurance",
+    title: "耐力训练",
+    progressText: "当前进度 LV5 >",
+    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/img_3.png",
+    recommended: true,
+    disabled: false,
+  },
+  {
+    key: "precision",
+    title: "精准训练",
+    progressText: "当前进度 LV3 >",
+    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/img_4.png",
+    recommended: false,
+    disabled: false,
+  },
+  {
+    key: "rhythm",
+    title: "节奏训练",
+    progressText: "当前进度 LV6 >",
+    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/img_5.png",
+    recommended: false,
+    disabled: false,
+  },
+  {
+    key: "power",
+    title: "力量训练",
+    progressText: "Coming!  LV10",
+    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/img_6.png",
+    recommended: false,
+    disabled: true,
+  },
+];
diff --git a/src/mock/trainingDifficulty.js b/src/mock/trainingDifficulty.js
new file mode 100644
index 0000000..f6bd42d
--- /dev/null
+++ b/src/mock/trainingDifficulty.js
@@ -0,0 +1,113 @@
+// 难度页当前用于保存“开始训练前上下文”的本地存储 key。
+export const trainingDifficultyStorageKey = "training-selection";
+
+// 当前是页面联调用的模拟数据：
+// 1. 总难度 20 级
+// 2. 已解锁到 Lv3
+// 3. 前三关展示不同完成进度
+const totalDifficultyLevel = 20;
+const mockedUnlockedDifficultyId = "lv3";
+const mockedDifficultyProgressMap = {
+  lv1: 100,
+  lv2: 90,
+  lv3: 70,
+};
+
+const modeList = [
+  {
+    key: "endurance",
+    title: "耐力训练",
+  },
+  {
+    key: "precision",
+    title: "精准训练",
+  },
+  {
+    key: "rhythm",
+    title: "节奏训练",
+  },
+  {
+    key: "basic",
+    title: "基础训练",
+  },
+  {
+    key: "power",
+    title: "力量训练",
+  },
+  {
+    key: "focus",
+    title: "专注训练",
+  },
+];
+
+const createDifficultyId = (level) => `lv${level}`;
+
+const createDifficultyLabel = (level) => `Lv${level}`;
+
+// 根据等级生成模拟文案，方便一次性扩展到更多关卡。
+const createDifficultySummary = (level) => {
+  return [
+    `箭靶划分为${Math.min(1 + Math.floor((level - 1) / 5), 4)}个区域`,
+    `需${4 + level}次命中目标`,
+    `${100 + Math.floor((level - 1) / 2) * 10}秒内完成所有射击`,
+    "需使用20CM全环靶",
+  ];
+};
+
+// 难度页的节点位置已经在页面内统一计算，
+// 这里保留最核心的 id / label 即可，不再维护无效的 left / top / style 字段。
+const createDifficultyNode = (level) => {
+  return {
+    id: createDifficultyId(level),
+    label: createDifficultyLabel(level),
+  };
+};
+
+const createDifficultyDetail = (level) => {
+  const id = createDifficultyId(level);
+  const label = createDifficultyLabel(level);
+
+  return {
+    id,
+    label,
+    title: `${label}难度`,
+    summary: createDifficultySummary(level),
+    startText: "开始",
+    targetPaperType: "20CM全环靶",
+  };
+};
+
+// 所有训练模式当前共用同一套难度定义。
+const sharedDifficultyNodes = Array.from(
+  { length: totalDifficultyLevel },
+  (_, index) => createDifficultyNode(index + 1)
+);
+
+const sharedDifficultyDetails = Object.fromEntries(
+  Array.from({ length: totalDifficultyLevel }, (_, index) => {
+    const detail = createDifficultyDetail(index + 1);
+    return [detail.id, detail];
+  })
+);
+
+const createModeConfig = ({ key, title, reward = null }) => {
+  return {
+    key,
+    title,
+    nodes: sharedDifficultyNodes,
+    details: sharedDifficultyDetails,
+    activeDifficultyId: mockedUnlockedDifficultyId,
+    progressMap: mockedDifficultyProgressMap,
+    reward,
+  };
+};
+
+// 难度页数据源入口：
+// 页面通过 getTrainingDifficultyModeConfig(modeKey) 获取当前模式完整配置。
+export const trainingDifficultyModeMap = Object.fromEntries(
+  modeList.map((mode) => [mode.key, createModeConfig(mode)])
+);
+
+export const getTrainingDifficultyModeConfig = (modeKey) => {
+  return trainingDifficultyModeMap[modeKey] || trainingDifficultyModeMap.precision;
+};
diff --git a/src/pages.json b/src/pages.json
index 5489311..e8702ee 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -33,9 +33,9 @@
         "navigationBarTitleText": ""
       }
     },
-    {
-      "path": "pages/melee-battle"
-    },
+    {
+      "path": "pages/melee-battle"
+    },
     {
       "path": "pages/battle-result"
     },
@@ -69,9 +69,9 @@
     {
       "path": "pages/user"
     },
-    {
-      "path": "pages/grade-intro"
-    },
+    {
+      "path": "pages/grade-intro"
+    },
     {
       "path": "pages/rank-intro"
     },
@@ -102,9 +102,9 @@
     {
       "path": "pages/match-detail"
     },
-    {
-      "path": "pages/melee-bow-data"
-    },
+    {
+      "path": "pages/melee-bow-data"
+    },
     {
       "path": "pages/mine-bow-data"
     },
@@ -132,37 +132,51 @@
       "^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue"
     }
   },
-  "subPackages": [
-    {
-      "root": "pages/member",
-      "pages": [
-        {
-          "path": "orders"
-        },
-        {
-          "path": "order-detail"
-        },
-        {
-          "path": "be-vip"
-        },
-        {
-          "path": "vip-intro"
-        },
-        {
-          "path": "agreement"
-        }
-      ]
-    },
-    {
-      "root": "pages/team-battle",
-      "pages": [
-        {
-          "path": "index"
-        },
-        {
-          "path": "team-bow-data"
-        }
-      ]
-    }
-  ]
-}
+  "subPackages": [
+    {
+      "root": "pages/member",
+      "pages": [
+        {
+          "path": "orders"
+        },
+        {
+          "path": "order-detail"
+        },
+        {
+          "path": "be-vip"
+        },
+        {
+          "path": "vip-intro"
+        },
+        {
+          "path": "agreement"
+        }
+      ]
+    },
+    {
+      "root": "pages/team-battle",
+      "pages": [
+        {
+          "path": "index"
+        },
+        {
+          "path": "team-bow-data"
+        }
+      ]
+    },
+    {
+      "root": "pages/training",
+      "pages": [
+        {
+          "path": "index"
+        },
+        {
+          "path": "difficulty"
+        },
+        {
+          "path": "practise-one"
+        }
+      ]
+    }
+  ]
+}
diff --git a/src/pages/calibration.vue b/src/pages/calibration.vue
index 734ced9..8b3d8a4 100644
--- a/src/pages/calibration.vue
+++ b/src/pages/calibration.vue
@@ -1,9 +1,10 @@
 <script setup>
 import { ref, onMounted, onBeforeUnmount } from "vue";
+import { onShow, onHide } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import SButton from "@/components/SButton.vue";
 
-import { laserAimAPI, laserCloseAPI } from "@/apis";
+import { aimRenewAPI, laserAimAPI, laserCloseAPI } from "@/apis";
 import { MESSAGETYPES } from "@/constants";
 // import audioManager from "@/audioManager";
 
@@ -23,8 +24,56 @@ const guides = [
 ];
 
 const done = ref(true);
+let aimRenewTimer = null;
+let pageMounted = false;
+let pageVisible = false;
+let aimSessionVersion = 0;
+
+const stopAimRenew = () => {
+  if (!aimRenewTimer) return;
+  clearInterval(aimRenewTimer);
+  aimRenewTimer = null;
+};
+
+const startAimRenew = () => {
+  stopAimRenew();
+  aimRenewTimer = setInterval(() => {
+    aimRenewAPI();
+  }, 1000);
+};
+
+const openAimSession = async (sessionVersion) => {
+  try {
+    await laserAimAPI();
+  } catch (error) {
+    return;
+  }
+
+  if (
+    !pageMounted ||
+    !pageVisible ||
+    sessionVersion !== aimSessionVersion
+  ) {
+    void laserCloseAPI().catch(() => {});
+    return;
+  }
+
+  startAimRenew();
+};
+
+const stopAimSession = (closeLaser = true) => {
+  const wasVisible = pageVisible;
+  pageVisible = false;
+  aimSessionVersion += 1;
+  stopAimRenew();
+
+  if (closeLaser && wasVisible) {
+    void laserCloseAPI().catch(() => {});
+  }
+};
 
 const onComplete = async () => {
+  stopAimSession(false);
   await laserCloseAPI();
   uni.navigateBack();
 };
@@ -39,14 +88,26 @@ function onReceiveMessage(messages = []) {
   });
 }
 
-onMounted(async () => {
-  uni.$on("socket-inbox", onReceiveMessage);
-  await laserAimAPI();
+onShow(() => {
+  pageVisible = true;
+  const sessionVersion = ++aimSessionVersion;
+  if (pageMounted) void openAimSession(sessionVersion);
 });
 
-onBeforeUnmount(async () => {
+onHide(() => {
+  stopAimSession();
+});
+
+onMounted(() => {
+  uni.$on("socket-inbox", onReceiveMessage);
+  pageMounted = true;
+  if (pageVisible) void openAimSession(aimSessionVersion);
+});
+
+onBeforeUnmount(() => {
+  pageMounted = false;
+  stopAimSession();
   uni.$off("socket-inbox", onReceiveMessage);
-  await laserCloseAPI();
 });
 </script>
 
diff --git a/src/pages/first-try.vue b/src/pages/first-try.vue
index eef6bb7..4cbb378 100644
--- a/src/pages/first-try.vue
+++ b/src/pages/first-try.vue
@@ -154,7 +154,10 @@ async function onReceiveMessage(msg) {
   } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
     setTimeout(() => onOver(msg), 1500);
   } else if (msg.type === MESSAGETYPESV2.TestDistance && step.value === 3) {
-    if (msg.shootData.distance / 100 >= 5) {
+    const rawDistance = Number(msg.shootData?.distance);
+    if (rawDistance === 0) {
+      audioManager.play("未发现靶纸，请瞄准靶纸射箭");
+    } else if (rawDistance / 100 >= 5) {
       audioManager.play("距离合格");
       btnDisabled.value = false;
       showGuide.value = true;
diff --git a/src/pages/index.vue b/src/pages/index.vue
index 6200833..12b714f 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -428,7 +428,8 @@ onShareTimeline(() => {
             </BubbleTip>
           </view>
           <view class="play-card">
-            <view @click="$clickSound(() => toPage('/pages/practise'))">
+            <!-- toPage('/pages/practise') -->
+            <view @click="$clickSound(() => toPage('/pages/training/index'))">
               <image src="https://static.shelingxingqiu.com/shootmini/static/my-practise.png" mode="widthFix"/>
             </view>
             <view @click="$clickSound(() => toPage('/pages/friend-battle'))">
@@ -510,6 +511,7 @@ onShareTimeline(() => {
       </view>
       <Signin :show="showModal" :onClose="() => (showModal = false)"/>
     </view>
+    <view class="foot-space"></view>
     <AppFooter/>
   </Container>
 </template>
@@ -517,9 +519,12 @@ onShareTimeline(() => {
 <style scoped>
 .container {
   width: 100%;
-  height: calc(100% - 120px);
+  /* height: calc(100% + 240rpx); */
+}
+.foot-space{
+  width: 100%;
+  height: 200rpx;
 }
-
 .feature-grid {
   width: 100%;
   display: flex;
@@ -679,7 +684,7 @@ onShareTimeline(() => {
 
 .my-data > view:nth-child(2) {
   width: 68%;
-  font-size: 12px;
+  font-size: 24rpx;
   color: #fff6;
   display: flex;
   justify-content: space-between;
diff --git a/src/pages/match-detail.vue b/src/pages/match-detail.vue
index b604584..e2bc460 100644
--- a/src/pages/match-detail.vue
+++ b/src/pages/match-detail.vue
@@ -13,10 +13,10 @@ const data = ref({
   rounds: [],
 });
 const players = ref([]);
+const isLoading = ref(true);
+const loadError = ref("");
 
-onLoad(async (options) => {
-  if (!options.battleId) return;
-  battleId.value = options.battleId || "60510101693403136";
+const loadBattle = async () => {
   const result = await getBattleAPI(battleId.value);
   data.value = result;
   if (result.mode > 3) {
@@ -62,6 +62,32 @@ onLoad(async (options) => {
 
     players.value = [...rankedPlayers, ...unrankedPlayers];
   }
+
+  // 数据和派生列表均已就绪后再关闭占位，避免空壳闪烁。
+  isLoading.value = false;
+};
+
+const requestBattle = () => {
+  if (!battleId.value) return;
+
+  isLoading.value = true;
+  loadError.value = "";
+  loadBattle().catch((error) => {
+    console.error("加载比赛详情失败:", error);
+    loadError.value = "赛况加载失败";
+    isLoading.value = false;
+  });
+};
+
+onLoad((options) => {
+  if (!options.battleId) {
+    loadError.value = "缺少比赛信息";
+    isLoading.value = false;
+    return;
+  }
+
+  battleId.value = options.battleId;
+  requestBattle();
 });
 
 const checkBowData = (selected) => {
@@ -80,6 +106,17 @@ const checkBowData = (selected) => {
 <template>
   <Container title="详情">
     <view class="container">
+      <view v-if="isLoading" class="page-state">
+        <text>赛况加载中...</text>
+      </view>
+      <view
+        v-else-if="loadError"
+        class="page-state page-state--error"
+        @click="requestBattle"
+      >
+        <text>{{ loadError }}</text>
+        <text v-if="battleId" class="retry-text">点击重新加载</text>
+      </view>
       <BattleHeader
         v-if="data.mode <= 3"
         :winner="data.winTeam"
@@ -165,6 +202,22 @@ const checkBowData = (selected) => {
   width: 100%;
   height: 100%;
 }
+.page-state {
+  min-height: 60vh;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  color: rgba(255, 255, 255, 0.6);
+  font-size: 26rpx;
+}
+.page-state--error {
+  color: rgba(255, 255, 255, 0.72);
+}
+.retry-text {
+  margin-top: 16rpx;
+  color: #fed847;
+}
 .score-header,
 .score-row {
   display: flex;
diff --git a/src/pages/melee-battle.vue b/src/pages/melee-battle.vue
index 2cc71cc..446175a 100644
--- a/src/pages/melee-battle.vue
+++ b/src/pages/melee-battle.vue
@@ -8,6 +8,7 @@ import BattleHeader from "@/components/BattleHeader.vue";
 import PlayerScore from "@/components/PlayerScore.vue";
 import SButton from "@/components/SButton.vue";
 import Avatar from "@/components/Avatar.vue";
+import BowPower from "@/components/BowPower.vue";
 import ScreenHint from "@/components/ScreenHint.vue";
 import TestDistance from "@/components/TestDistance.vue";
 import SModal from "@/components/SModal.vue";
@@ -489,8 +490,8 @@ onShow(() => {
         :totalRound="12"
         :scores="playersScores.map((r) => r[user.id]).flat()"
         :isSvip="isCurrentUserSvip"
-        :missAsZero="true"
         :stop="halfRest"
+        stable-shot-effect
       />
       <view :style="{ paddingBottom: '20px' }">
         <PlayerScore
diff --git a/src/pages/member/be-vip.vue b/src/pages/member/be-vip.vue
index f11d8b8..ff76185 100644
--- a/src/pages/member/be-vip.vue
+++ b/src/pages/member/be-vip.vue
@@ -35,7 +35,7 @@ const memberTypes = [
     heroBadge: "../../static/vip/normal-hero-badge.png",
     buttonClass: "activate-btn--normal",
     benefits: [
-      { label: "专属会员标识", icon: "../../static/vip/vip-badge.png" },
+      { label: "黄金昵称", icon: "../../static/vip/vip-badge.png" },
       { label: "教练点评", icon: "../../static/vip/vip-comment.png" },
       { label: "专享VIP客服", icon: "../../static/vip/vip-service.png" },
       { label: "排位赛\n每日+20次", icon: "../../static/vip/vip-rank.png" },
@@ -59,7 +59,7 @@ const memberTypes = [
       { label: "专属落点标识", icon: "../../static/vip/svip-point.png" },
       { label: "专属命中效果", icon: "../../static/vip/svip-hit.png" },
       { label: "专属射箭效果", icon: "../../static/vip/svip-arrow.png" },
-      { label: "专属会员标识", icon: "../../static/vip/svip-badge.png" },
+      { label: "炫彩昵称", icon: "../../static/vip/svip-badge.png" },
       { label: "教练点评", icon: "../../static/vip/svip-comment.png" },
       { label: "约战无限制", icon: "../../static/vip/svip-battle.png" },
       { label: "排位赛无限制", icon: "../../static/vip/svip-rank.png" },
diff --git a/src/pages/member/vip-intro.vue b/src/pages/member/vip-intro.vue
index 3c2584c..8e89841 100644
--- a/src/pages/member/vip-intro.vue
+++ b/src/pages/member/vip-intro.vue
@@ -80,8 +80,8 @@ import Container from "@/components/Container.vue";
             <view class="table-row">
               <text class="table-cell table-cell--feature">昵称美化</text>
               <text class="table-cell">无</text>
-              <text class="table-cell">专享</text>
-              <text class="table-cell">专享</text>
+              <text class="table-cell">黄金</text>
+              <text class="table-cell">炫彩</text>
             </view>
             <view class="table-row">
               <text class="table-cell table-cell--feature">专属客服</text>
diff --git a/src/pages/practise-one.vue b/src/pages/practise-one.vue
index 28390ad..934b247 100644
--- a/src/pages/practise-one.vue
+++ b/src/pages/practise-one.vue
@@ -1,6 +1,6 @@
 <script setup>
-import { ref, onMounted, onBeforeUnmount } from "vue";
-import { onLoad } from "@dcloudio/uni-app";
+import { ref, nextTick, onMounted, onBeforeUnmount } from "vue";
+import { onHide, onLoad, onShow } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import ShootProgress from "@/components/ShootProgress.vue";
 import BowTarget from "@/components/BowTarget.vue";
@@ -16,10 +16,17 @@ import audioManager from "@/audioManager";
 import {
   createPractiseAPI,
   endPractiseAPI,
+  getCurrentPractiseAPI,
   getPractiseAPI,
   startPractiseAPI,
 } from "@/apis";
-import { connectMatchWebSocket, closeMatchWebSocket } from "@/matchWebsocket";
+import {
+  connectMatchWebSocket,
+  closeMatchWebSocket,
+  setMatchAppHideResumable,
+  MATCH_WS_PRACTICE_SYNC_EVENT,
+  MATCH_WS_STATE_EVENT,
+} from "@/matchWebsocket";
 import { sharePractiseData } from "@/canvas";
 import { wxShare, debounce } from "@/util";
 import { MESSAGETYPESV2, roundsName } from "@/constants";
@@ -35,11 +42,21 @@ const isSvip = ref(false);
 const total = 12;
 const practiseResult = ref({});
 const practiseId = ref("");
+const serverAddr = ref("");
 const showGuide = ref(false);
 const tips = ref("");
 const targetType = ref(1);
 const sharing = ref(false);
 const exiting = ref(false);
+const hiddenWhileActive = ref(false);
+const resumeInFlight = ref(false);
+const foregroundResumeSyncPending = ref(false);
+const pageVisible = ref(true);
+const appHideResumable = ref(false);
+const restoringSnapshot = ref(false);
+let practiceSyncTimer = null;
+let waitingPracticeSync = false;
+const PRACTICE_SYNC_TIMEOUT_MS = 5000;
 const RESULT_TIP_CDN = "https://static.shelingxingqiu.com/shootmini/static";
 
 onLoad((options) => {
@@ -48,6 +65,63 @@ onLoad((options) => {
   }
 });
 
+const setPracticeAppHideResumable = (enabled) => {
+  appHideResumable.value = enabled === true;
+  setMatchAppHideResumable(appHideResumable.value);
+};
+
+const clearPracticeSyncTimer = () => {
+  if (!practiceSyncTimer) return;
+  clearTimeout(practiceSyncTimer);
+  practiceSyncTimer = null;
+};
+
+const cancelPracticeSyncWait = () => {
+  waitingPracticeSync = false;
+  clearPracticeSyncTimer();
+};
+
+const startPracticeSyncTimer = () => {
+  clearPracticeSyncTimer();
+  waitingPracticeSync = true;
+  practiceSyncTimer = setTimeout(() => {
+    practiceSyncTimer = null;
+    if (!waitingPracticeSync) return;
+
+    waitingPracticeSync = false;
+    foregroundResumeSyncPending.value = false;
+    hiddenWhileActive.value = false;
+    closeMatchWebSocket({
+      reason: "legacy-practice-resume-timeout",
+      sendLeave: false,
+    });
+    uni.showToast({
+      title: "训练重连失败，请重试",
+      icon: "none",
+    });
+  }, PRACTICE_SYNC_TIMEOUT_MS);
+};
+
+const connectPracticeServer = () => {
+  const latestServerAddr = String(serverAddr.value || "").trim();
+  if (!practiseId.value || !latestServerAddr) return false;
+
+  cancelPracticeSyncWait();
+  closeMatchWebSocket({
+    reason: "legacy-practice-switch",
+    sendLeave: false,
+  });
+  connectMatchWebSocket({
+    serverAddr: latestServerAddr,
+    matchId: practiseId.value,
+    userId: user.value.id,
+    requestPracticeInfoOnOpen: true,
+    appHideResumable: true,
+  });
+  setPracticeAppHideResumable(true);
+  return true;
+};
+
 const createPractise = async () => {
   closeMatchWebSocket({ reason: "practice-recreate" });
   const result = await createPractiseAPI(
@@ -64,11 +138,8 @@ const createPractise = async () => {
     });
     return null;
   }
-  connectMatchWebSocket({
-    serverAddr: result.serverAddr,
-    matchId: result.id,
-    userId: user.value.id,
-  });
+  serverAddr.value = result.serverAddr;
+  connectPracticeServer();
   return result;
 };
 
@@ -94,6 +165,10 @@ const onReady = async () => {
 };
 
 const onOver = async (message) => {
+  setPracticeAppHideResumable(false);
+  hiddenWhileActive.value = false;
+  foregroundResumeSyncPending.value = false;
+  cancelPracticeSyncWait();
   practiseResult.value = Array.isArray(message?.details)
     ? message
     : await getPractiseAPI(practiseId.value);
@@ -105,11 +180,16 @@ async function onReceiveMessage(msg) {
     isSvip.value = msg.sVip === true;
     scores.value = Array.isArray(msg.details) ? msg.details : scores.value;
   } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
+    setPracticeAppHideResumable(false);
+    hiddenWhileActive.value = false;
+    foregroundResumeSyncPending.value = false;
+    cancelPracticeSyncWait();
     setTimeout(() => onOver(msg), 1500);
   }
 }
 
 async function onComplete() {
+  setPracticeAppHideResumable(false);
   const validArrows = (practiseResult.value.details || []).filter(
     (a) => a.x !== -30 && a.y !== -30
   );
@@ -117,6 +197,7 @@ async function onComplete() {
     uni.navigateBack();
   } else {
     practiseId.value = "";
+    serverAddr.value = "";
     practiseResult.value = {};
     start.value = false;
     scores.value = [];
@@ -128,6 +209,10 @@ async function onComplete() {
 async function exitPractise() {
   if (exiting.value) return;
   exiting.value = true;
+  setPracticeAppHideResumable(false);
+  hiddenWhileActive.value = false;
+  foregroundResumeSyncPending.value = false;
+  cancelPracticeSyncWait();
 
   try {
     if (practiseId.value && !practiseResult.value?.details) {
@@ -140,6 +225,141 @@ async function exitPractise() {
   }
 }
 
+const stopMissingCurrentPracticeAndExit = async () => {
+  if (exiting.value) return;
+
+  const localPractiseId = practiseId.value;
+  exiting.value = true;
+  setPracticeAppHideResumable(false);
+  hiddenWhileActive.value = false;
+  foregroundResumeSyncPending.value = false;
+  cancelPracticeSyncWait();
+
+  try {
+    if (localPractiseId) {
+      await endPractiseAPI(localPractiseId);
+    }
+  } catch (error) {
+    console.error("Failed to stop missing current practice", error);
+  } finally {
+    closeMatchWebSocket({ reason: "legacy-practice-current-missing" });
+    practiseId.value = "";
+    serverAddr.value = "";
+    practiseResult.value = {};
+    start.value = false;
+    scores.value = [];
+    isSvip.value = false;
+    uni.showToast({
+      title: "训练已结束，请重新进入",
+      icon: "none",
+    });
+    uni.navigateBack();
+  }
+};
+
+const resumeCurrentPractice = async () => {
+  if (
+    resumeInFlight.value ||
+    !hiddenWhileActive.value ||
+    !appHideResumable.value ||
+    exiting.value
+  ) {
+    return;
+  }
+
+  resumeInFlight.value = true;
+  try {
+    let currentPractice;
+    try {
+      currentPractice = await getCurrentPractiseAPI();
+    } catch (error) {
+      if (!pageVisible.value || exiting.value) return;
+      console.error("Failed to get current practice", error);
+      await stopMissingCurrentPracticeAndExit();
+      return;
+    }
+
+    if (!pageVisible.value || !hiddenWhileActive.value || exiting.value) return;
+
+    const latestPractiseId = currentPractice?.id;
+    const latestServerAddr = String(currentPractice?.serverAddr || "").trim();
+    if (
+      currentPractice === null ||
+      !latestPractiseId ||
+      !latestServerAddr
+    ) {
+      await stopMissingCurrentPracticeAndExit();
+      return;
+    }
+
+    practiseId.value = latestPractiseId;
+    serverAddr.value = latestServerAddr;
+    foregroundResumeSyncPending.value = true;
+    if (!connectPracticeServer()) {
+      foregroundResumeSyncPending.value = false;
+      await stopMissingCurrentPracticeAndExit();
+    }
+  } finally {
+    resumeInFlight.value = false;
+  }
+};
+
+const onMatchSocketState = (event = {}) => {
+  if (event.state !== "open") return;
+  if (
+    event.matchId &&
+    String(event.matchId) !== String(practiseId.value)
+  ) {
+    return;
+  }
+  startPracticeSyncTimer();
+};
+
+const onPracticeInfoSync = async (payload = {}) => {
+  const responsePractiseId = String(
+    payload.matchId || payload.practiceInfo?.id || ""
+  );
+  if (
+    !responsePractiseId ||
+    responsePractiseId !== String(practiseId.value)
+  ) {
+    return;
+  }
+
+  const snapshot = payload.practiceInfo;
+  if (!snapshot || typeof snapshot !== "object") return;
+
+  cancelPracticeSyncWait();
+  foregroundResumeSyncPending.value = false;
+  hiddenWhileActive.value = false;
+
+  restoringSnapshot.value = true;
+  await nextTick();
+  try {
+    scores.value = Array.isArray(snapshot.details) ? snapshot.details : [];
+    isSvip.value = snapshot.sVip === true;
+
+    const status = Number(snapshot.status);
+    if (status === 1) {
+      start.value = false;
+    } else if (status === 2) {
+      start.value = true;
+    }
+  } finally {
+    restoringSnapshot.value = false;
+    await nextTick();
+  }
+
+  const timeLimit = Number(snapshot.timeLimit);
+  const duration = Number(snapshot.duration);
+  if (Number(snapshot.status) === 2 && Number.isFinite(timeLimit) && timeLimit > 0) {
+    uni.$emit(
+      "update-remain",
+      Math.max(0, timeLimit - (Number.isFinite(duration) ? duration : 0))
+    );
+  }
+};
+
 const getResultTipSrc = (result = {}) => {
   const validCount = (result.details || []).filter(
     (arrow) => arrow.x !== -30 && arrow.y !== -30
@@ -163,6 +383,25 @@ const onClickShare = debounce(async () => {
   }
 });
 
+onHide(() => {
+  pageVisible.value = false;
+  if (
+    !appHideResumable.value ||
+    exiting.value ||
+    !practiseId.value ||
+    practiseResult.value?.details
+  ) {
+    return;
+  }
+
+  hiddenWhileActive.value = true;
+});
+
+onShow(async () => {
+  pageVisible.value = true;
+  await resumeCurrentPractice();
+});
+
 onMounted(async () => {
   void audioManager.warmAll();
   // audioManager.play("第一轮");
@@ -170,15 +409,21 @@ onMounted(async () => {
     keepScreenOn: true,
   });
   uni.$on("socket-inbox", onReceiveMessage);
+  uni.$on(MATCH_WS_PRACTICE_SYNC_EVENT, onPracticeInfoSync);
+  uni.$on(MATCH_WS_STATE_EVENT, onMatchSocketState);
   uni.$on("share-image", onClickShare);
   await createPractise();
 });
 
 onBeforeUnmount(() => {
+  setPracticeAppHideResumable(false);
+  cancelPracticeSyncWait();
   uni.setKeepScreenOn({
     keepScreenOn: false,
   });
   uni.$off("socket-inbox", onReceiveMessage);
+  uni.$off(MATCH_WS_PRACTICE_SYNC_EVENT, onPracticeInfoSync);
+  uni.$off(MATCH_WS_STATE_EVENT, onMatchSocketState);
   uni.$off("share-image", onClickShare);
   audioManager.stopAll();
   closeMatchWebSocket({ reason: "practice-leave" });
@@ -205,6 +450,7 @@ onBeforeUnmount(() => {
           }`"
           :start="start"
           :onStop="onOver"
+          end-audio-key="练习结束"
         />
         <view class="user-row">
           <Avatar :src="user.avatar" :size="35" />
@@ -215,10 +461,12 @@ onBeforeUnmount(() => {
           <BowPower />
         </view>
         <BowTarget
+          v-if="!restoringSnapshot"
           :totalRound="start ? total / 4 : 0"
           :currentRound="scores.length % 3"
           :scores="scores"
           :isSvip="isSvip"
+          stable-shot-effect
         />
         <ScorePanel2 :arrows="scores" />
         <ScoreResult
diff --git a/src/pages/practise-two.vue b/src/pages/practise-two.vue
index ef48621..414aaf6 100644
--- a/src/pages/practise-two.vue
+++ b/src/pages/practise-two.vue
@@ -1,5 +1,6 @@
 <script setup>
-import { ref, onMounted, onBeforeUnmount } from "vue";
+import { ref, nextTick, onMounted, onBeforeUnmount } from "vue";
+import { onHide, onLoad, onShow } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import ShootProgress from "@/components/ShootProgress.vue";
 import BowTarget from "@/components/BowTarget.vue";
@@ -15,17 +16,23 @@ import audioManager from "@/audioManager";
 import {
   createPractiseAPI,
   endPractiseAPI,
+  getCurrentPractiseAPI,
   getPractiseAPI,
   startPractiseAPI,
 } from "@/apis";
-import { connectMatchWebSocket, closeMatchWebSocket } from "@/matchWebsocket";
+import {
+  connectMatchWebSocket,
+  closeMatchWebSocket,
+  setMatchAppHideResumable,
+  MATCH_WS_PRACTICE_SYNC_EVENT,
+  MATCH_WS_STATE_EVENT,
+} from "@/matchWebsocket";
 import { sharePractiseData } from "@/canvas";
 import { wxShare, debounce } from "@/util";
 import { MESSAGETYPESV2 } from "@/constants";
 
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
-import {onLoad} from "@dcloudio/uni-app";
 const store = useStore();
 const { user, device } = storeToRefs(store);
 
@@ -35,10 +42,20 @@ const isSvip = ref(false);
 const total = 36;
 const practiseResult = ref({});
 const practiseId = ref("");
+const serverAddr = ref("");
 const showGuide = ref(false);
 const targetType = ref(1);
 const sharing = ref(false);
 const exiting = ref(false);
+const hiddenWhileActive = ref(false);
+const resumeInFlight = ref(false);
+const foregroundResumeSyncPending = ref(false);
+const pageVisible = ref(true);
+const appHideResumable = ref(false);
+const restoringSnapshot = ref(false);
+let practiceSyncTimer = null;
+let waitingPracticeSync = false;
+const PRACTICE_SYNC_TIMEOUT_MS = 5000;
 const RESULT_TIP_CDN = "https://static.shelingxingqiu.com/shootmini/static";
 
 onLoad((options) => {
@@ -47,6 +64,63 @@ onLoad((options) => {
   }
 });
 
+const setPracticeAppHideResumable = (enabled) => {
+  appHideResumable.value = enabled === true;
+  setMatchAppHideResumable(appHideResumable.value);
+};
+
+const clearPracticeSyncTimer = () => {
+  if (!practiceSyncTimer) return;
+  clearTimeout(practiceSyncTimer);
+  practiceSyncTimer = null;
+};
+
+const cancelPracticeSyncWait = () => {
+  waitingPracticeSync = false;
+  clearPracticeSyncTimer();
+};
+
+const startPracticeSyncTimer = () => {
+  clearPracticeSyncTimer();
+  waitingPracticeSync = true;
+  practiceSyncTimer = setTimeout(() => {
+    practiceSyncTimer = null;
+    if (!waitingPracticeSync) return;
+
+    waitingPracticeSync = false;
+    foregroundResumeSyncPending.value = false;
+    hiddenWhileActive.value = false;
+    closeMatchWebSocket({
+      reason: "legacy-practice-resume-timeout",
+      sendLeave: false,
+    });
+    uni.showToast({
+      title: "训练重连失败，请重试",
+      icon: "none",
+    });
+  }, PRACTICE_SYNC_TIMEOUT_MS);
+};
+
+const connectPracticeServer = () => {
+  const latestServerAddr = String(serverAddr.value || "").trim();
+  if (!practiseId.value || !latestServerAddr) return false;
+
+  cancelPracticeSyncWait();
+  closeMatchWebSocket({
+    reason: "legacy-practice-switch",
+    sendLeave: false,
+  });
+  connectMatchWebSocket({
+    serverAddr: latestServerAddr,
+    matchId: practiseId.value,
+    userId: user.value.id,
+    requestPracticeInfoOnOpen: true,
+    appHideResumable: true,
+  });
+  setPracticeAppHideResumable(true);
+  return true;
+};
+
 const createPractise = async () => {
   closeMatchWebSocket({ reason: "practice-recreate" });
   const result = await createPractiseAPI(
@@ -63,11 +137,8 @@ const createPractise = async () => {
     });
     return null;
   }
-  connectMatchWebSocket({
-    serverAddr: result.serverAddr,
-    matchId: result.id,
-    userId: user.value.id,
-  });
+  serverAddr.value = result.serverAddr;
+  connectPracticeServer();
   return result;
 };
 
@@ -93,6 +164,10 @@ const onReady = async () => {
 };
 
 const onOver = async (message) => {
+  setPracticeAppHideResumable(false);
+  hiddenWhileActive.value = false;
+  foregroundResumeSyncPending.value = false;
+  cancelPracticeSyncWait();
   practiseResult.value = Array.isArray(message?.details)
     ? message
     : await getPractiseAPI(practiseId.value);
@@ -104,6 +179,10 @@ async function onReceiveMessage(msg) {
     isSvip.value = msg.sVip === true;
     scores.value = Array.isArray(msg.details) ? msg.details : scores.value;
   } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
+    setPracticeAppHideResumable(false);
+    hiddenWhileActive.value = false;
+    foregroundResumeSyncPending.value = false;
+    cancelPracticeSyncWait();
     setTimeout(() => onOver(msg), 1500);
   }
   // messages.forEach((msg) => {
@@ -125,6 +204,7 @@ async function onReceiveMessage(msg) {
 }
 
 async function onComplete() {
+  setPracticeAppHideResumable(false);
   const validArrows = (practiseResult.value.details || []).filter(
     (a) => a.x !== -30 && a.y !== -30
   );
@@ -132,6 +212,7 @@ async function onComplete() {
     uni.navigateBack();
   } else {
     practiseId.value = "";
+    serverAddr.value = "";
     practiseResult.value = {};
     start.value = false;
     scores.value = [];
@@ -143,6 +224,10 @@ async function onComplete() {
 async function exitPractise() {
   if (exiting.value) return;
   exiting.value = true;
+  setPracticeAppHideResumable(false);
+  hiddenWhileActive.value = false;
+  foregroundResumeSyncPending.value = false;
+  cancelPracticeSyncWait();
 
   try {
     if (practiseId.value && !practiseResult.value?.details) {
@@ -155,6 +240,141 @@ async function exitPractise() {
   }
 }
 
+const stopMissingCurrentPracticeAndExit = async () => {
+  if (exiting.value) return;
+
+  const localPractiseId = practiseId.value;
+  exiting.value = true;
+  setPracticeAppHideResumable(false);
+  hiddenWhileActive.value = false;
+  foregroundResumeSyncPending.value = false;
+  cancelPracticeSyncWait();
+
+  try {
+    if (localPractiseId) {
+      await endPractiseAPI(localPractiseId);
+    }
+  } catch (error) {
+    console.error("Failed to stop missing current practice", error);
+  } finally {
+    closeMatchWebSocket({ reason: "legacy-practice-current-missing" });
+    practiseId.value = "";
+    serverAddr.value = "";
+    practiseResult.value = {};
+    start.value = false;
+    scores.value = [];
+    isSvip.value = false;
+    uni.showToast({
+      title: "训练已结束，请重新进入",
+      icon: "none",
+    });
+    uni.navigateBack();
+  }
+};
+
+const resumeCurrentPractice = async () => {
+  if (
+    resumeInFlight.value ||
+    !hiddenWhileActive.value ||
+    !appHideResumable.value ||
+    exiting.value
+  ) {
+    return;
+  }
+
+  resumeInFlight.value = true;
+  try {
+    let currentPractice;
+    try {
+      currentPractice = await getCurrentPractiseAPI();
+    } catch (error) {
+      if (!pageVisible.value || exiting.value) return;
+      console.error("Failed to get current practice", error);
+      await stopMissingCurrentPracticeAndExit();
+      return;
+    }
+
+    if (!pageVisible.value || !hiddenWhileActive.value || exiting.value) return;
+
+    const latestPractiseId = currentPractice?.id;
+    const latestServerAddr = String(currentPractice?.serverAddr || "").trim();
+    if (
+      currentPractice === null ||
+      !latestPractiseId ||
+      !latestServerAddr
+    ) {
+      await stopMissingCurrentPracticeAndExit();
+      return;
+    }
+
+    practiseId.value = latestPractiseId;
+    serverAddr.value = latestServerAddr;
+    foregroundResumeSyncPending.value = true;
+    if (!connectPracticeServer()) {
+      foregroundResumeSyncPending.value = false;
+      await stopMissingCurrentPracticeAndExit();
+    }
+  } finally {
+    resumeInFlight.value = false;
+  }
+};
+
+const onMatchSocketState = (event = {}) => {
+  if (event.state !== "open") return;
+  if (
+    event.matchId &&
+    String(event.matchId) !== String(practiseId.value)
+  ) {
+    return;
+  }
+  startPracticeSyncTimer();
+};
+
+const onPracticeInfoSync = async (payload = {}) => {
+  const responsePractiseId = String(
+    payload.matchId || payload.practiceInfo?.id || ""
+  );
+  if (
+    !responsePractiseId ||
+    responsePractiseId !== String(practiseId.value)
+  ) {
+    return;
+  }
+
+  const snapshot = payload.practiceInfo;
+  if (!snapshot || typeof snapshot !== "object") return;
+
+  cancelPracticeSyncWait();
+  foregroundResumeSyncPending.value = false;
+  hiddenWhileActive.value = false;
+
+  restoringSnapshot.value = true;
+  await nextTick();
+  try {
+    scores.value = Array.isArray(snapshot.details) ? snapshot.details : [];
+    isSvip.value = snapshot.sVip === true;
+
+    const status = Number(snapshot.status);
+    if (status === 1) {
+      start.value = false;
+    } else if (status === 2) {
+      start.value = true;
+    }
+  } finally {
+    restoringSnapshot.value = false;
+    await nextTick();
+  }
+
+  const timeLimit = Number(snapshot.timeLimit);
+  const duration = Number(snapshot.duration);
+  if (Number(snapshot.status) === 2 && Number.isFinite(timeLimit) && timeLimit > 0) {
+    uni.$emit(
+      "update-remain",
+      Math.max(0, timeLimit - (Number.isFinite(duration) ? duration : 0))
+    );
+  }
+};
+
 const getResultTipSrc = (result = {}) => {
   const validCount = (result.details || []).filter(
     (arrow) => arrow.x !== -30 && arrow.y !== -30
@@ -178,21 +398,46 @@ const onClickShare = debounce(async () => {
   }
 });
 
+onHide(() => {
+  pageVisible.value = false;
+  if (
+    !appHideResumable.value ||
+    exiting.value ||
+    !practiseId.value ||
+    practiseResult.value?.details
+  ) {
+    return;
+  }
+
+  hiddenWhileActive.value = true;
+});
+
+onShow(async () => {
+  pageVisible.value = true;
+  await resumeCurrentPractice();
+});
+
 onMounted(async () => {
   void audioManager.warmAll();
   uni.setKeepScreenOn({
     keepScreenOn: true,
   });
   uni.$on("socket-inbox", onReceiveMessage);
+  uni.$on(MATCH_WS_PRACTICE_SYNC_EVENT, onPracticeInfoSync);
+  uni.$on(MATCH_WS_STATE_EVENT, onMatchSocketState);
   uni.$on("share-image", onClickShare);
   await createPractise();
 });
 
 onBeforeUnmount(() => {
+  setPracticeAppHideResumable(false);
+  cancelPracticeSyncWait();
   uni.setKeepScreenOn({
     keepScreenOn: false,
   });
   uni.$off("socket-inbox", onReceiveMessage);
+  uni.$off(MATCH_WS_PRACTICE_SYNC_EVENT, onPracticeInfoSync);
+  uni.$off(MATCH_WS_STATE_EVENT, onMatchSocketState);
   uni.$off("share-image", onClickShare);
   audioManager.stopAll();
   closeMatchWebSocket({ reason: "practice-leave" });
@@ -214,6 +459,7 @@ onBeforeUnmount(() => {
           :start="start"
           :total="3600"
           :onStop="onOver"
+          end-audio-key="练习结束"
         />
         <view class="user-row">
           <Avatar :src="user.avatar" :size="35" />
@@ -224,6 +470,7 @@ onBeforeUnmount(() => {
           <BowPower />
         </view>
         <BowTarget
+          v-if="!restoringSnapshot"
           :currentRound="scores.length"
           :totalRound="start ? total : 0"
           :scores="scores"
diff --git a/src/pages/rank-intro.vue b/src/pages/rank-intro.vue
index f44b29c..f8b577d 100644
--- a/src/pages/rank-intro.vue
+++ b/src/pages/rank-intro.vue
@@ -1,5 +1,61 @@
 <script setup>
 import Container from "@/components/Container.vue";
+
+const LEVEL_ICON_BASE_URL = "https://static.shelingxingqiu.com/levelicon";
+
+const rankRows = [
+  {
+    name: "倔强青铜",
+    levels: ["倔强青铜1", "倔强青铜2", "倔强青铜3"],
+    picNames: ["青铜1", "青铜2", "青铜3"],
+    score: "每个小段位需要满3颗星才能晋升到下一个段位，共9颗星。",
+  },
+  {
+    name: "秩序白银",
+    levels: ["秩序白银1", "秩序白银2", "秩序白银3"],
+    picNames: ["白银1", "白银2", "白银3"],
+    score: "每个小段位需要满3颗星才能晋升到下一个段位，共9颗星。",
+  },
+  {
+    name: "荣耀黄金",
+    levels: ["荣耀黄金1", "荣耀黄金2", "荣耀黄金3", "荣耀黄金4"],
+    picNames: ["黄金1", "黄金2", "黄金3", "黄金4"],
+    score: "每个小段位需要满4颗星才能晋升到下一个段位，共16颗星。",
+  },
+  {
+    name: "永恒钻石",
+    levels: ["永恒钻石1", "永恒钻石2", "永恒钻石3", "永恒钻石4", "永恒钻石5"],
+    picNames: ["钻石1", "钻石2", "钻石3", "钻石4", "钻石5"],
+    score: "每个小段位需要满5颗星才能晋升到下一个段位，共25颗星。",
+  },
+];
+
+const kingRankRows = [
+  { name: "最强王者", score: "0-9" },
+  { name: "非凡王者", score: "10-19" },
+  { name: "无双王者", score: "20-29" },
+  { name: "绝世王者", score: "30-39" },
+  { name: "至圣王者", score: "40-49" },
+  { name: "荣耀王者", score: "50-99" },
+  { name: "传奇王者", score: "100+" },
+];
+
+const meleeScoreTables = [
+  {
+    title: "5人大乱斗",
+    rankings: [1, 2, 3, 4, 5],
+    scores: [150, 75, 0, -100, -100],
+  },
+  {
+    title: "10人大乱斗",
+    rankings: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+    scores: [200, 125, 75, 0, 0, 0, -50, -100, -100, -100],
+  },
+];
+
+// 图片文件名与段位名称一致，统一在这里拼接远程地址。
+const getLevelIcon = (levelName) =>
+  `${LEVEL_ICON_BASE_URL}/${levelName}.png`;
 </script>
 
 <template>
@@ -22,25 +78,89 @@ import Container from "@/components/Container.vue";
 
           <view class="sub-section">
             <view class="sub-title">（一）基本规则</view>
-            <view class="rule-item">
-              <text class="rule-label">重一局：</text>
-              <text class="rule-value">+100积分</text>
+            <view class="rule-mode">
+              <view class="rule-mode-title">1V1、2V2、3V3对抗模式：</view>
+              <view class="rule-item">
+                <text class="rule-bullet">●</text>
+                <text class="rule-content"
+                  >每胜一局，胜方每人+100积分；每负一局，负方每人-100积分</text
+                >
+              </view>
+              <view class="rule-item">
+                <text class="rule-bullet">●</text>
+                <text class="rule-content"
+                  >2V2模式：胜方队伍中，总成绩最高且箭均成绩≥7环者，为本局MVP，额外获得40积分。</text
+                >
+              </view>
+              <view class="rule-item">
+                <text class="rule-bullet">●</text>
+                <text class="rule-content"
+                  >3V3模式：胜方队伍中，总成绩最高且箭均成绩≥7环者，为本局MVP，额外获得60积分。</text
+                >
+              </view>
+              <view class="rule-item">
+                <text class="rule-bullet">●</text>
+                <text class="rule-content"
+                  >在1V1/2V2/3V3三种模式中，连续获得五连胜（三类模式一起算），则从第五场开始，每场胜利可额外再加15分，直至结束连胜。（仅限对抗模式，不含大乱斗模式。）</text
+                >
+              </view>
             </view>
-            <view class="rule-item">
-              <text class="rule-label">输一局：</text>
-              <text class="rule-value">-100积分</text>
-            </view>
-            <view class="rule-item">
-              <text class="rule-label">全场MVP（2v2）：</text>
-              <text class="rule-value">额外+40积分</text>
-            </view>
-            <view class="rule-item">
-              <text class="rule-label">全场MVP（3v3）：</text>
-              <text class="rule-value">额外+60积分</text>
-            </view>
-            <view class="rule-item">
-              <text class="rule-label">五连胜：</text>
-              <text class="rule-value">每局额外+15积分</text>
+
+            <view class="rule-mode">
+              <view class="rule-mode-title">5人、10人大乱斗模式：</view>
+              <view class="rule-paragraph">
+                5人大乱斗和10人大乱斗按个人总环数成绩排序，排名从高到低依次设置系统默认奖励/扣除积分，默认初始排名和积分规则具体如下：
+              </view>
+
+              <view class="melee-score-table">
+                <view
+                  v-for="table in meleeScoreTables"
+                  :key="table.title"
+                  class="melee-table-section"
+                >
+                  <view class="melee-table-title">{{ table.title }}</view>
+                  <scroll-view
+                    class="melee-table-scroll"
+                    scroll-x
+                    :enhanced="true"
+                    :show-scrollbar="false"
+                  >
+                    <view
+                      :class="[
+                        'melee-table-body',
+                        table.rankings.length > 5
+                          ? 'melee-table-body--wide'
+                          : '',
+                      ]"
+                    >
+                      <view class="melee-table-row">
+                        <text class="melee-table-cell melee-table-label"
+                          >排名</text
+                        >
+                        <text
+                          v-for="ranking in table.rankings"
+                          :key="ranking"
+                          class="melee-table-cell"
+                        >
+                          {{ ranking }}
+                        </text>
+                      </view>
+                      <view class="melee-table-row">
+                        <text class="melee-table-cell melee-table-label"
+                          >积分</text
+                        >
+                        <text
+                          v-for="(score, index) in table.scores"
+                          :key="index"
+                          class="melee-table-cell"
+                        >
+                          {{ score }}
+                        </text>
+                      </view>
+                    </view>
+                  </scroll-view>
+                </view>
+              </view>
             </view>
           </view>
 
@@ -55,77 +175,57 @@ import Container from "@/components/Container.vue";
         <view class="section">
           <view class="title">三、（表格）</view>
           <view class="rank-table">
-            <view class="table-row">
-              <text>大段位</text>
-              <text>小段位</text>
-              <text>积分（100积分=1星）</text>
+            <view class="table-row table-header">
+              <text class="table-cell major-column">大段位</text>
+              <text class="table-cell minor-column">小段位</text>
+              <text class="table-cell score-column">积分（100积分=1星）</text>
             </view>
-            <view class="table-row">
-              <text>倔强青铜</text>
-              <view>
-                <text>青铜1</text>
-                <text>青铜2</text>
-                <text>青铜3</text>
+
+            <view
+              v-for="rank in rankRows"
+              :key="rank.name"
+              class="table-row rank-group-row"
+            >
+              <view class="table-cell major-column major-rank-cell">
+                <image
+                  class="rank-icon"
+                  :src="getLevelIcon(rank.picNames[0])"
+                  mode="aspectFit"
+                  lazy-load
+                />
+                <text class="major-rank-name">{{ rank.name }}</text>
               </view>
-              <text>每个小段位需要满 3星才能晋升到下一个段位，共9颗星。</text>
-            </view>
-            <view class="table-row">
-              <text>秩序白银</text>
-              <view>
-                <text>白铜1</text>
-                <text>白铜2</text>
-                <text>白铜3</text>
+
+              <view class="minor-column minor-rank-cell">
+                <text
+                  v-for="level in rank.levels"
+                  :key="level"
+                  class="table-cell minor-rank-item"
+                >
+                  {{ level }}
+                </text>
               </view>
-              <text>每个小段位需要满 3颗星才能晋升到下一个段位，共9颗星。</text>
+
+              <text class="table-cell score-column score-text">
+                {{ rank.score }}
+              </text>
             </view>
-            <view class="table-row">
-              <text>荣耀黄金</text>
-              <view>
-                <text>黄金1</text>
-                <text>黄金2</text>
-                <text>黄金3</text>
-                <text>黄金4</text>
+
+            <view
+              v-for="rank in kingRankRows"
+              :key="rank.name"
+              class="table-row king-rank-row"
+            >
+              <view class="table-cell king-rank-cell">
+                <image
+                  class="rank-icon"
+                  :src="getLevelIcon(rank.name)"
+                  mode="aspectFit"
+                  lazy-load
+                />
+                <text class="major-rank-name">{{ rank.name }}</text>
               </view>
-              <text>每个小段位需要满4颗星才能晋升到下一个段位，共16颗星。</text>
-            </view>
-            <view class="table-row">
-              <text>永恒钻石</text>
-              <view>
-                <text>钻石1</text>
-                <text>钻石2</text>
-                <text>钻石3</text>
-                <text>钻石4</text>
-                <text>钻石5</text>
-              </view>
-              <text>每个小段位需要满5颗星才能晋升到下一个段位，共25颗星。</text>
-            </view>
-            <view class="table-row2">
-              <text>最强王者</text>
-              <text>0-9</text>
-            </view>
-            <view class="table-row2">
-              <text>非凡王者</text>
-              <text>10-19</text>
-            </view>
-            <view class="table-row2">
-              <text>无双王者</text>
-              <text>20-29</text>
-            </view>
-            <view class="table-row2">
-              <text>绝世王者</text>
-              <text>30-39</text>
-            </view>
-            <view class="table-row2">
-              <text>至圣王者</text>
-              <text>40-49</text>
-            </view>
-            <view class="table-row2">
-              <text>荣耀王者</text>
-              <text>50-99</text>
-            </view>
-            <view class="table-row2">
-              <text>传奇王者</text>
-              <text>100+</text>
+              <text class="table-cell king-score-cell">{{ rank.score }}</text>
             </view>
           </view>
         </view>
@@ -181,17 +281,103 @@ import Container from "@/components/Container.vue";
 
 .rule-item {
   display: flex;
-  margin-bottom: 8px;
-}
-
-.rule-label {
-  font-size: 14px;
+  align-items: flex-start;
+  margin-bottom: 16rpx;
+  font-size: 28rpx;
   color: #666666;
+  line-height: 1.7;
 }
 
-.rule-value {
-  font-size: 14px;
+.rule-mode {
+  margin-bottom: 24rpx;
+}
+
+.rule-mode:last-child {
+  margin-bottom: 0;
+}
+
+.rule-mode-title {
+  margin-bottom: 12rpx;
+  font-size: 28rpx;
   color: #333333;
+  font-weight: 600;
+  line-height: 1.6;
+}
+
+.rule-bullet {
+  flex-shrink: 0;
+  margin-right: 10rpx;
+  font-size: 20rpx;
+  line-height: 2.38;
+}
+
+.rule-content {
+  flex: 1;
+}
+
+.rule-paragraph {
+  font-size: 28rpx;
+  color: #666666;
+  line-height: 1.7;
+}
+
+.melee-score-table {
+  margin-top: 20rpx;
+  border: $uni-border;
+  color: #333333;
+  font-size: 26rpx;
+}
+
+.melee-table-section + .melee-table-section {
+  border-top: $uni-border;
+}
+
+.melee-table-title {
+  padding: 14rpx 16rpx;
+  background-color: #f5f6f7;
+  color: #e53935;
+  font-weight: 600;
+  border-bottom: $uni-border;
+}
+
+.melee-table-scroll {
+  width: 100%;
+  white-space: nowrap;
+}
+
+.melee-table-body {
+  width: 100%;
+}
+
+.melee-table-body--wide {
+  width: 900rpx;
+}
+
+.melee-table-row {
+  display: flex;
+}
+
+.melee-table-row + .melee-table-row {
+  border-top: $uni-border;
+}
+
+.melee-table-cell {
+  display: flex;
+  flex: 1;
+  align-items: center;
+  min-width: 0;
+  min-height: 72rpx;
+  padding: 10rpx 12rpx;
+  box-sizing: border-box;
+  border-left: $uni-border;
+}
+
+.melee-table-cell:first-child {
+  border-left: 0;
+}
+
+.melee-table-label {
+  flex: 0 0 86rpx;
 }
 
 .rank-table {
@@ -201,41 +387,94 @@ import Container from "@/components/Container.vue";
   width: calc(100vw - 20px);
 }
 
-.rank-table > view {
+.table-row {
   display: flex;
 }
 
-.rank-table > view > text:last-child {
-  margin-left: -1rpx;
-}
-
-.rank-table text {
+.table-cell {
   padding: 10rpx 20rpx;
   border: $uni-border;
   box-sizing: border-box;
-  display: inline-block;
   margin-top: -1rpx;
+  margin-left: -1rpx;
 }
 
-.table-row text {
+.major-column,
+.minor-column {
   width: 25%;
 }
 
-.table-row > view {
+.score-column {
+  width: 50%;
+}
+
+.table-header .table-cell {
+  display: flex;
+  align-items: center;
+}
+
+.major-rank-cell,
+.minor-rank-cell {
   display: flex;
   flex-direction: column;
-  width: 25%;
+  padding: 0;
 }
 
-.table-row > view > text {
+.minor-rank-item {
+  min-height: 70rpx;
+  box-sizing: border-box;
+}
+
+.major-rank-cell {
+  align-items: center;
+  justify-content: center;
+  padding: 12rpx 8rpx;
+}
+
+.rank-icon {
+  width: 120rpx;
+  height: 120rpx;
+  flex-shrink: 0;
+}
+
+.major-rank-name {
+  margin-top: 8rpx;
+  font-size: 24rpx;
+  line-height: 1.4;
+  text-align: center;
+}
+
+.minor-rank-item {
+  display: flex;
+  align-items: center;
+  justify-content: center;
   width: 100%;
+  margin-left: 0;
+  padding: 10rpx;
+  border-right: 0;
 }
 
-.table-row > text:nth-child(3) {
+.score-text {
+  display: flex;
+  align-items: center;
+  line-height: 1.6;
+}
+
+.king-rank-cell,
+.king-score-cell {
   width: 50%;
 }
 
-.table-row2 > text {
-  width: 50%;
+.king-rank-cell {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  min-height: 210rpx;
+}
+
+.king-score-cell {
+  display: flex;
+  align-items: center;
 }
 </style>
diff --git a/src/pages/team-battle/components/BattleHeader.vue b/src/pages/team-battle/components/BattleHeader.vue
index a6ee495..05f8d7d 100644
--- a/src/pages/team-battle/components/BattleHeader.vue
+++ b/src/pages/team-battle/components/BattleHeader.vue
@@ -151,6 +151,7 @@ const isMember = (player = {}) => player.vip === true || player.sVip === true;
 .container {
   width: 100%;
   position: relative;
+  z-index: 999;
   margin-bottom: 10px;
 }
 .container > image:first-child {
diff --git a/src/pages/team-battle/components/BowTarget.vue b/src/pages/team-battle/components/BowTarget.vue
index d22375d..6cae4c6 100644
--- a/src/pages/team-battle/components/BowTarget.vue
+++ b/src/pages/team-battle/components/BowTarget.vue
@@ -12,7 +12,7 @@ import PointSwitcher from "./PointSwitcher.vue";
 import BowShotEffect from "@/components/BowShotEffect.vue";
 
 import { MESSAGETYPES, MESSAGETYPESV2 } from "@/constants";
-import { simulShootAPI } from "@/apis";
+import { simulShootAPI, laserAimAPI, laserCloseAPI } from "@/apis";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const store = useStore();
@@ -67,6 +67,10 @@ const props = defineProps({
     type: Number,
     default: 5,
   },
+  stableShotEffect: {
+    type: Boolean,
+    default: false,
+  },
 });
 
 const pMode = ref(true);
@@ -77,12 +81,14 @@ const dirTimer = ref(null);
 const angle = ref(null);
 const circleColor = ref("");
 const shotEffect = ref(null);
+const pendingShotEffect = ref(null);
 const hiddenRedLatestKey = ref("");
 const hiddenBlueLatestKey = ref("");
 const targetShaking = ref(false);
-const targetSize = ref({ width: 0, height: 0 });
+const targetRect = ref({ left: 0, top: 0, width: 0, height: 0 });
 const shakeTimer = ref(null);
 const instance = getCurrentInstance();
+let shotEffectRequestGeneration = 0;
 const ROUND_TIP_OFFSET_Y = -32;
 const EXPERIENCE_TIP_OFFSET_Y = -68;
 
@@ -137,7 +143,7 @@ function showShotTip(team, shootData) {
   }, 1000);
 }
 
-function triggerShotEffect(team, shot, fallbackKey = "") {
+function triggerShotEffect(team, shot, fallbackKey = "", viewportMode = false) {
   const key = buildShotEffectKey(team, shot, fallbackKey);
 
   if (shotEffect.value?.team === "red") hiddenRedLatestKey.value = "";
@@ -151,7 +157,29 @@ function triggerShotEffect(team, shot, fallbackKey = "") {
     hiddenBlueLatestKey.value = key;
   }
 
-  shotEffect.value = { key, team, shot };
+  shotEffect.value = { key, team, shot, viewportMode };
+}
+
+async function prepareShotEffect(team, shot, fallbackKey = "") {
+  const requestGeneration = ++shotEffectRequestGeneration;
+  const key = buildShotEffectKey(team, shot, fallbackKey);
+  pendingShotEffect.value = { generation: requestGeneration, team, key };
+  clearTipTimer();
+  if (team === "red") latestOne.value = null;
+  if (team === "blue") bluelatestOne.value = null;
+
+  const viewportMode = props.stableShotEffect
+    ? await updateTargetRect()
+    : false;
+
+  if (requestGeneration !== shotEffectRequestGeneration) {
+    if (pendingShotEffect.value?.generation === requestGeneration) {
+      pendingShotEffect.value = null;
+    }
+    return;
+  }
+  pendingShotEffect.value = null;
+  triggerShotEffect(team, shot, fallbackKey, viewportMode);
 }
 
 function completeShotEffect(key) {
@@ -180,40 +208,74 @@ function shakeTarget() {
   });
 }
 
-function updateTargetSize() {
-  nextTick(() => {
-    const query = instance?.proxy
-      ? uni.createSelectorQuery().in(instance.proxy)
-      : uni.createSelectorQuery();
+function hasValidTargetRect(rect = targetRect.value) {
+  return (
+    Number.isFinite(Number(rect?.left)) &&
+    Number.isFinite(Number(rect?.top)) &&
+    Number(rect?.width) > 0 &&
+    Number(rect?.height) > 0
+  );
+}
 
-    query
-      .select(".target")
-      .boundingClientRect((rect) => {
-        const width = Number(rect?.width);
-        const height = Number(rect?.height);
-        if (!Number.isFinite(width) || !Number.isFinite(height)) return;
-        if (width <= 0 || height <= 0) return;
-        targetSize.value = { width, height };
-      })
-      .exec();
+async function updateTargetRect() {
+  await nextTick();
+
+  return new Promise((resolve) => {
+    let settled = false;
+    const finish = (rect) => {
+      if (settled) return;
+      settled = true;
+
+      const isValid = hasValidTargetRect(rect);
+      if (isValid) {
+        targetRect.value = {
+          left: Number(rect.left),
+          top: Number(rect.top),
+          width: Number(rect.width),
+          height: Number(rect.height),
+        };
+      }
+      resolve(isValid);
+    };
+
+    try {
+      const query = instance?.proxy
+        ? uni.createSelectorQuery().in(instance.proxy)
+        : uni.createSelectorQuery();
+
+      query
+        .select(".target")
+        .boundingClientRect()
+        .exec((result) => finish(Array.isArray(result) ? result[0] : null));
+    } catch {
+      finish(null);
+    }
   });
 }
 
 function handleWindowResize() {
-  updateTargetSize();
+  void updateTargetRect();
 }
 
 function shouldHideRedHit(index) {
-  return !!hiddenRedLatestKey.value && index === props.scores.length - 1;
+  return (
+    (!!hiddenRedLatestKey.value || pendingShotEffect.value?.team === "red") &&
+    index === props.scores.length - 1
+  );
 }
 
 function shouldHideBlueHit(index) {
-  return !!hiddenBlueLatestKey.value && index === props.blueScores.length - 1;
+  return (
+    (!!hiddenBlueLatestKey.value || pendingShotEffect.value?.team === "blue") &&
+    index === props.blueScores.length - 1
+  );
 }
 
 function showShotFlash(flash) {
   const shootData = flash?.shootData;
   if (!shootData) {
+    shotEffectRequestGeneration += 1;
+    pendingShotEffect.value = null;
     hiddenRedLatestKey.value = "";
     hiddenBlueLatestKey.value = "";
     shotEffect.value = null;
@@ -222,10 +284,12 @@ function showShotFlash(flash) {
 
   const team = flash.team === "red" ? "red" : "blue";
   if (shouldPlayShotEffect(shootData, team)) {
-    triggerShotEffect(team, shootData, flash.key);
+    void prepareShotEffect(team, shootData, flash.key);
     return;
   }
 
+  shotEffectRequestGeneration += 1;
+  pendingShotEffect.value = null;
   showShotTip(team, shootData);
 }
 
@@ -241,6 +305,8 @@ watch(
   () => props.scores.length,
   (newLen, oldLen) => {
     if (newLen > oldLen) return;
+    shotEffectRequestGeneration += 1;
+    pendingShotEffect.value = null;
     latestOne.value = null;
     hiddenRedLatestKey.value = "";
     if (shotEffect.value?.team === "red") shotEffect.value = null;
@@ -251,6 +317,8 @@ watch(
   () => props.blueScores.length,
   (newLen, oldLen) => {
     if (newLen > oldLen) return;
+    shotEffectRequestGeneration += 1;
+    pendingShotEffect.value = null;
     bluelatestOne.value = null;
     hiddenBlueLatestKey.value = "";
     if (shotEffect.value?.team === "blue") shotEffect.value = null;
@@ -363,6 +431,14 @@ const simulShoot2 = async () => {
   }
 };
 
+const openAim = async () => {
+  await laserAimAPI();
+};
+
+const closeAim = async () => {
+  await laserCloseAPI();
+};
+
 const env = computed(() => {
   const accountInfo = uni.getAccountInfoSync();
   return accountInfo.miniProgram.envVersion;
@@ -400,11 +476,13 @@ async function onReceiveMessage(message) {
 
 onMounted(() => {
   uni.$on("socket-inbox", onReceiveMessage);
-  updateTargetSize();
+  void updateTargetRect();
   if (uni.onWindowResize) uni.onWindowResize(handleWindowResize);
 });
 
 onBeforeUnmount(() => {
+  shotEffectRequestGeneration += 1;
+  pendingShotEffect.value = null;
   if (timer.value) {
     clearTimeout(timer.value);
     timer.value = null;
@@ -522,17 +600,34 @@ onBeforeUnmount(() => {
         </view>
       </block>
       <BowShotEffect
+        v-if="!shotEffect || !shotEffect.viewportMode"
         :shot="shotEffect && shotEffect.shot"
         :playKey="shotEffect ? shotEffect.key : ''"
         :targetRadius="safeTargetRadius"
-        :targetWidth="targetSize.width"
-        :targetHeight="targetSize.height"
+        :targetLeft="targetRect.left"
+        :targetTop="targetRect.top"
+        :targetWidth="targetRect.width"
+        :targetHeight="targetRect.height"
         :hitOffsetPx="currentHitRadiusPx"
         @impact="shakeTarget"
         @complete="completeShotEffect"
       />
       <image src="https://static.shelingxingqiu.com/shootmini/static/bow-target.png" mode="widthFix" />
     </view>
+    <BowShotEffect
+      v-if="shotEffect && shotEffect.viewportMode"
+      :shot="shotEffect.shot"
+      :playKey="shotEffect.key"
+      :targetRadius="safeTargetRadius"
+      :targetLeft="targetRect.left"
+      :targetTop="targetRect.top"
+      :targetWidth="targetRect.width"
+      :targetHeight="targetRect.height"
+      :hitOffsetPx="currentHitRadiusPx"
+      :viewportMode="true"
+      @impact="shakeTarget"
+      @complete="completeShotEffect"
+    />
     <view class="footer">
       <PointSwitcher
         :onChange="(val) => (pMode = val)"
@@ -542,6 +637,8 @@ onBeforeUnmount(() => {
     <view class="simul" v-if="env !== 'release'">
       <button @click="simulShoot">模拟</button>
       <button @click="simulShoot2">射箭</button>
+      <button @click="openAim">开瞄</button>
+      <button @click="closeAim">关瞄</button>
     </view>
   </view>
 </template>
diff --git a/src/pages/team-battle/components/TestDistance.vue b/src/pages/team-battle/components/TestDistance.vue
index c2b4b4c..372ab92 100644
--- a/src/pages/team-battle/components/TestDistance.vue
+++ b/src/pages/team-battle/components/TestDistance.vue
@@ -51,8 +51,13 @@ onBeforeUnmount(() => {
 async function onReceiveMessage(msg) {
   if (Array.isArray(msg)) return;
   if (msg.type === MESSAGETYPESV2.TestDistance) {
-    distance.value = Number((msg.shootData.distance / 100).toFixed(2));
-    if (distance.value >= 5) audioManager.play("距离合格");
+    const rawDistance = Number(msg.shootData?.distance);
+    distance.value = Number.isFinite(rawDistance)
+      ? Number((rawDistance / 100).toFixed(2))
+      : 0;
+    if (rawDistance === 0) {
+      audioManager.play("未发现靶纸，请瞄准靶纸射箭");
+    } else if (distance.value >= 5) audioManager.play("距离合格");
     else audioManager.play("距离不足");
   }
 }
@@ -113,7 +118,7 @@ onBeforeUnmount(() => {
     <view v-if="isBattle" class="ready-timer">
       <image src="https://static.shelingxingqiu.com/shootmini/static/test-tip.png" mode="widthFix" />
       <view v-if="count >= 0">
-        <text>具体正式比赛还有</text>
+        <text>距离正式比赛还有</text>
         <text>{{ count }}</text>
         <text>秒</text>
       </view>
diff --git a/src/pages/team-battle/index.vue b/src/pages/team-battle/index.vue
index 7507c47..65998e4 100644
--- a/src/pages/team-battle/index.vue
+++ b/src/pages/team-battle/index.vue
@@ -1417,6 +1417,7 @@ onShow(() => {
           :latestShotFlash="latestShotFlash"
           :redTeam="redTeam"
           :blueTeam="blueTeam"
+          stable-shot-effect
       />
       <BattleFooter
           v-if="start"
diff --git a/src/pages/training/components/BowData.vue b/src/pages/training/components/BowData.vue
new file mode 100644
index 0000000..8a5fe25
--- /dev/null
+++ b/src/pages/training/components/BowData.vue
@@ -0,0 +1,134 @@
+<script setup>
+import { computed } from "vue";
+import AppBackground from "@/components/AppBackground.vue";
+import Avatar from "@/components/Avatar.vue";
+import BowTarget from "./BowTarget.vue";
+import ScorePanel from "./ScorePanel.vue";
+import useStore from "@/store";
+import { storeToRefs } from "pinia";
+const store = useStore();
+const { user } = storeToRefs(store);
+const isSvip = computed(() => user.value.sVip === true);
+const isVip = computed(() => user.value.vip === true && !isSvip.value);
+
+const props = defineProps({
+  show: {
+    type: Boolean,
+    default: false,
+  },
+  onClose: {
+    type: Function,
+    default: () => {},
+  },
+  arrows: {
+    type: Array,
+    default: () => [],
+  },
+  total: {
+    type: Number,
+    default: 0,
+  },
+});
+</script>
+
+<template>
+  <view class="container" :style="{ display: show ? 'flex' : 'none' }">
+    <AppBackground :type="10" />
+    <view class="header">
+      <view>
+        <Avatar :src="user.avatar" :rankLvl="user.rankLvl" :size="45" />
+        <view>
+          <view
+            :class="[
+              'header-nickname',
+              'member-nickname',
+              isVip ? 'member-nickname--vip' : '',
+              isSvip ? 'member-nickname--svip' : '',
+            ]"
+          >
+            <text class="member-nickname__text">{{ user.nickName }}</text>
+            <text v-if="isSvip" class="member-nickname__shine">
+              {{ user.nickName }}
+            </text>
+          </view>
+          <text>{{ user.lvlName }}</text>
+        </view>
+      </view>
+      <view @click="onClose">
+        <image src="/static/close-white.png" mode="widthFix" />
+      </view>
+    </view>
+    <view :style="{ width: '100%', marginBottom: '20px' }">
+      <BowTarget :scores="arrows" :isSvip="isSvip" />
+    </view>
+    <view class="desc">
+      <text>{{ arrows.length }}</text>
+      <text>支箭，共</text>
+      <text>{{ arrows.reduce((a, b) => a + (b.ring || 0), 0) }}</text>
+      <text>环</text>
+    </view>
+    <ScorePanel
+      :completeEffect="false"
+      :rowCount="total === 12 ? 6 : 9"
+      :total="total"
+      :arrows="arrows"
+      :margin="total === 12 ? 4 : 1"
+      :fontSize="total === 12 ? 25 : 22"
+    />
+  </view>
+</template>
+
+<style scoped>
+.container {
+  width: 100vw;
+  height: 100vh;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background-color: #232323;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  z-index: 10;
+}
+.header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: calc(100% - 20px);
+  padding: 10px;
+}
+.header > view:first-child {
+  display: flex;
+  align-items: center;
+  margin-left: 10px;
+}
+.header > view:first-child > view:last-child {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  margin-left: 10px;
+  color: #fff;
+}
+.header-nickname {
+  max-width: 240rpx;
+}
+.header > view:first-child > view:last-child > text:last-child {
+  font-size: 10px;
+  background-color: #5f51ff;
+  padding: 2px 5px;
+  border-radius: 10px;
+  margin-top: 5px;
+}
+.header > view:last-child > image {
+  width: 40px;
+}
+.desc {
+  color: #fff;
+  margin-bottom: 40px;
+}
+.desc > text:nth-child(2),
+.desc > text:nth-child(4) {
+  color: #fed847;
+}
+</style>
diff --git a/src/pages/training/components/BowTarget.vue b/src/pages/training/components/BowTarget.vue
new file mode 100644
index 0000000..550a43d
--- /dev/null
+++ b/src/pages/training/components/BowTarget.vue
@@ -0,0 +1,954 @@
+<script setup>
+import {
+  computed,
+  getCurrentInstance,
+  nextTick,
+  onBeforeUnmount,
+  onMounted,
+  ref,
+  watch,
+} from "vue";
+import BowShotEffect from "@/components/BowShotEffect.vue";
+import PointSwitcher from "@/components/PointSwitcher.vue";
+import TargetCanvas from "@/components/TargetCanvas.vue";
+
+import { MESSAGETYPES, MESSAGETYPESV2 } from "@/constants";
+import { simulShootAPI, laserAimAPI, laserCloseAPI } from "@/apis";
+import useStore from "@/store";
+import { storeToRefs } from "pinia";
+const store = useStore();
+const { user, device } = storeToRefs(store);
+
+const props = defineProps({
+  currentRound: {
+    type: Number,
+    default: 0,
+  },
+  totalRound: {
+    type: Number,
+    default: 0,
+  },
+  scores: {
+    type: Array,
+    default: () => [],
+  },
+  blueScores: {
+    type: Array,
+    default: () => [],
+  },
+  isSvip: {
+    type: Boolean,
+    default: false,
+  },
+  shotEffectToken: {
+    type: Number,
+    default: 0,
+  },
+  mode: {
+    type: String,
+    default: "solo", // solo 单排，team 双排
+  },
+  stop: {
+    type: Boolean,
+    default: false,
+  },
+  coordinateRadius: {
+    type: Number,
+    default: 20,
+  },
+  hitRadiusPx: {
+    type: Number,
+    default: 2,
+  },
+  zoomHitRadiusPx: {
+    type: Number,
+    default: 5,
+  },
+  showCrosshair: {
+    type: Boolean,
+    default: false,
+  },
+  sectorCount: {
+    type: Number,
+    default: 0,
+  },
+  activeSector: {
+    type: Number,
+    default: 0,
+  },
+  activeRing: {
+    type: Number,
+    default: 0,
+  },
+  showSectorLabels: {
+    type: Boolean,
+    default: false,
+  },
+  stableShotEffect: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+const emit = defineEmits(["shot-effect-complete"]);
+
+const pMode = ref(true);
+const latestOne = ref(null);
+const bluelatestOne = ref(null);
+const prevScores = ref([]);
+const prevBlueScores = ref([]);
+const timer = ref(null);
+const dirTimer = ref(null);
+const angle = ref(null);
+const circleColor = ref("");
+const shotEffect = ref(null);
+const pendingShotEffect = ref(null);
+const hiddenLatestKey = ref("");
+const targetShaking = ref(false);
+const targetRect = ref({ left: 0, top: 0, width: 0, height: 0 });
+const shakeTimer = ref(null);
+const instance = getCurrentInstance();
+let shotEffectRequestGeneration = 0;
+const ROUND_TIP_OFFSET_Y = -32;
+const EXPERIENCE_TIP_OFFSET_Y = -68;
+
+const getNumber = (value, fallback = 0) => {
+  const numberValue = Number(value);
+  return Number.isFinite(numberValue) ? numberValue : fallback;
+};
+
+const safeTargetRadius = computed(() => {
+  return Math.max(getNumber(props.coordinateRadius, 20), 1);
+});
+
+const currentHitRadiusPx = computed(() => {
+  const radius = Number(
+    pMode.value ? props.zoomHitRadiusPx : props.hitRadiusPx
+  );
+  return Number.isFinite(radius) && radius >= 0 ? radius : 0;
+});
+
+function getShotPoint(shot, fallbackCenter = false) {
+  const x = Number(shot?.x);
+  const y = Number(shot?.y);
+  if (Number.isFinite(x) && Number.isFinite(y)) return { x, y };
+  return fallbackCenter ? { x: 0, y: 0 } : null;
+}
+
+function getPointDirection(point) {
+  if (!point) return null;
+  const distance = Math.sqrt(point.x * point.x + point.y * point.y);
+  if (distance === 0) return null;
+
+  return {
+    x: point.x / distance,
+    y: point.y / distance,
+  };
+}
+
+function formatPxOffset(value) {
+  if (!value) return "";
+  const operator = value > 0 ? "+" : "-";
+  return ` ${operator} ${Math.abs(value)}px`;
+}
+
+function formatTargetPosition(percent, offset) {
+  const pxOffset = formatPxOffset(offset);
+  return pxOffset ? `calc(${percent}%${pxOffset})` : `${percent}%`;
+}
+
+function getTargetPositionStyle(point, offsetPx = 0, extraOffset = {}) {
+  if (!point) return { display: "none" };
+
+  const radius = safeTargetRadius.value;
+  const diameter = radius * 2;
+  const direction = getPointDirection(point);
+  const xOffset = (direction ? direction.x * offsetPx : 0) + (extraOffset.x || 0);
+  const yOffset = (direction ? -direction.y * offsetPx : 0) + (extraOffset.y || 0);
+  const leftPercent = ((point.x + radius) / diameter) * 100;
+  const topPercent = ((radius - point.y) / diameter) * 100;
+
+  return {
+    left: formatTargetPosition(leftPercent, xOffset),
+    top: formatTargetPosition(topPercent, yOffset),
+    transform: "translate(-50%, -50%)",
+  };
+}
+
+function getHitStyle(shot) {
+  const radius = currentHitRadiusPx.value;
+  const point = getShotPoint(shot);
+
+  return {
+    ...getTargetPositionStyle(point, radius),
+    width: `${radius * 2}px`,
+    height: `${radius * 2}px`,
+  };
+}
+
+function getSvipHitBgStyle(shot) {
+  const radius = currentHitRadiusPx.value;
+  const point = getShotPoint(shot);
+
+  return getTargetPositionStyle(point, radius);
+}
+
+function getRoundTipStyle(shot) {
+  const point = getShotPoint(shot, true);
+  return getTargetPositionStyle(
+    point,
+    shot?.ring ? currentHitRadiusPx.value : 0,
+    { y: ROUND_TIP_OFFSET_Y }
+  );
+}
+
+function getExperienceTipStyle(shot) {
+  const point = getShotPoint(shot, true);
+  return getTargetPositionStyle(
+    point,
+    shot?.ring ? currentHitRadiusPx.value : 0,
+    { y: EXPERIENCE_TIP_OFFSET_Y }
+  );
+}
+
+function clearTipTimer() {
+  if (!timer.value) return;
+  clearTimeout(timer.value);
+  timer.value = null;
+}
+
+function showShotTip(shot) {
+  clearTipTimer();
+  latestOne.value = shot;
+  timer.value = setTimeout(() => {
+    latestOne.value = null;
+    timer.value = null;
+  }, 1000);
+}
+
+function hasShotPoint(shot) {
+  return !!getShotPoint(shot);
+}
+
+function shouldPlayShotEffect(shot) {
+  return (
+    props.isSvip &&
+    !!shot &&
+    Number(shot.ring) > 0 &&
+    hasShotPoint(shot)
+  );
+}
+
+function buildShotEffectKey(shot, index) {
+  return [
+    props.shotEffectToken,
+    index,
+    shot?.playerId ?? "",
+    shot?.x ?? "",
+    shot?.y ?? "",
+    shot?.ring ?? "",
+    shot?.ringX ? 1 : 0,
+  ].join("-");
+}
+
+function triggerShotEffect(shot, index, viewportMode = false) {
+  const key = buildShotEffectKey(shot, index);
+  clearTipTimer();
+  latestOne.value = null;
+  hiddenLatestKey.value = key;
+  shotEffect.value = {
+    key,
+    shot,
+    token: props.shotEffectToken,
+    viewportMode,
+  };
+}
+
+async function prepareShotEffect(shot, index) {
+  const requestGeneration = ++shotEffectRequestGeneration;
+  const key = buildShotEffectKey(shot, index);
+  pendingShotEffect.value = { generation: requestGeneration, key };
+  clearTipTimer();
+  latestOne.value = null;
+
+  const viewportMode = props.stableShotEffect
+    ? await updateTargetRect()
+    : false;
+
+  if (requestGeneration !== shotEffectRequestGeneration) {
+    if (pendingShotEffect.value?.generation === requestGeneration) {
+      pendingShotEffect.value = null;
+    }
+    return;
+  }
+  pendingShotEffect.value = null;
+  triggerShotEffect(shot, index, viewportMode);
+}
+
+function completeShotEffect(key) {
+  if (!shotEffect.value || shotEffect.value.key !== key) return;
+
+  const completedEffect = shotEffect.value;
+  const shot = completedEffect.shot;
+  hiddenLatestKey.value = "";
+  shotEffect.value = null;
+  showShotTip(shot);
+  emit("shot-effect-complete", {
+    key,
+    token: completedEffect.token,
+  });
+}
+
+function shouldHideLatestHit(index) {
+  return (
+    (!!hiddenLatestKey.value || !!pendingShotEffect.value) &&
+    index === props.scores.length - 1
+  );
+}
+
+function shakeTarget() {
+  targetShaking.value = false;
+  if (shakeTimer.value) {
+    clearTimeout(shakeTimer.value);
+    shakeTimer.value = null;
+  }
+
+  nextTick(() => {
+    targetShaking.value = true;
+    shakeTimer.value = setTimeout(() => {
+      targetShaking.value = false;
+      shakeTimer.value = null;
+    }, 260);
+  });
+}
+
+function hasValidTargetRect(rect = targetRect.value) {
+  return (
+    Number.isFinite(Number(rect?.left)) &&
+    Number.isFinite(Number(rect?.top)) &&
+    Number(rect?.width) > 0 &&
+    Number(rect?.height) > 0
+  );
+}
+
+async function updateTargetRect() {
+  await nextTick();
+
+  return new Promise((resolve) => {
+    let settled = false;
+    const finish = (rect) => {
+      if (settled) return;
+      settled = true;
+
+      const isValid = hasValidTargetRect(rect);
+      if (isValid) {
+        targetRect.value = {
+          left: Number(rect.left),
+          top: Number(rect.top),
+          width: Number(rect.width),
+          height: Number(rect.height),
+        };
+      }
+      resolve(isValid);
+    };
+
+    try {
+      const query = instance?.proxy
+        ? uni.createSelectorQuery().in(instance.proxy)
+        : uni.createSelectorQuery();
+
+      query
+        .select(".target")
+        .boundingClientRect()
+        .exec((result) => finish(Array.isArray(result) ? result[0] : null));
+    } catch {
+      finish(null);
+    }
+  });
+}
+
+function handleWindowResize() {
+  void updateTargetRect();
+}
+
+watch(
+  () => props.scores,
+  (newVal) => {
+    if (newVal.length - prevScores.value.length === 1) {
+      showShotTip(newVal[newVal.length - 1]);
+    } else if (newVal.length < prevScores.value.length) {
+      shotEffectRequestGeneration += 1;
+      pendingShotEffect.value = null;
+      clearTipTimer();
+      latestOne.value = null;
+      hiddenLatestKey.value = "";
+      shotEffect.value = null;
+    }
+    prevScores.value = [...newVal];
+  },
+  {
+    deep: true,
+  }
+);
+
+watch(
+  () => props.shotEffectToken,
+  (token) => {
+    // token 只由实时 ShootResult 推进，同步快照不会重播飞箭。
+    if (!token || props.scores.length === 0) return;
+    const latestIndex = props.scores.length - 1;
+    const latestShot = props.scores[latestIndex];
+    if (shouldPlayShotEffect(latestShot)) {
+      void prepareShotEffect(latestShot, latestIndex);
+    } else {
+      shotEffectRequestGeneration += 1;
+      pendingShotEffect.value = null;
+    }
+  }
+);
+
+watch(
+  () => props.blueScores,
+  (newVal) => {
+    if (newVal.length - prevBlueScores.value.length === 1) {
+      bluelatestOne.value = newVal[newVal.length - 1];
+      if (timer.value) clearTimeout(timer.value);
+      timer.value = setTimeout(() => {
+        bluelatestOne.value = null;
+      }, 1000);
+    }
+    prevBlueScores.value = [...newVal];
+  },
+  {
+    deep: true,
+  }
+);
+
+const simulShoot = async () => {
+  if (device.value.deviceId) await simulShootAPI(device.value.deviceId);
+};
+const simulShoot2 = async () => {
+  if (device.value.deviceId) {
+    const r1 = Math.random() > 0.5 ? 0.01 : 0.02;
+    await simulShootAPI(device.value.deviceId, r1, r1);
+  }
+};
+
+const openAim = async () => {
+  await laserAimAPI();
+};
+
+const closeAim = async () => {
+  await laserCloseAPI();
+};
+
+const env = computed(() => {
+  const accountInfo = uni.getAccountInfoSync();
+  return accountInfo.miniProgram.envVersion;
+});
+
+const arrowStyle = computed(() => {
+  return {
+    transform: `rotateX(180deg) translate(-50%, -50%) rotate(${
+      360 - angle.value
+    }deg) translateY(105%)`,
+  };
+});
+
+const showSectorCanvas = computed(() => {
+  const count = Number(props.sectorCount);
+  return props.totalRound > 0 && Number.isInteger(count) && count > 0;
+});
+
+async function onReceiveMessage(message) {
+  if (Array.isArray(message)) return;
+  if (message.type === MESSAGETYPESV2.ShootResult && message.shootData) {
+    if (
+      message.shootData.playerId === user.value.id &&
+      !message.shootData.ring &&
+      message.shootData.angle >= 0
+    ) {
+      angle.value = null;
+      setTimeout(() => {
+        if (props.scores[0]) {
+          circleColor.value =
+            message.shootData.playerId === props.scores[0].playerId
+              ? "#ff4444"
+              : "#1840FF";
+        }
+        angle.value = message.shootData.angle;
+      }, 200);
+    }
+  }
+}
+
+onMounted(() => {
+  uni.$on("socket-inbox", onReceiveMessage);
+  void updateTargetRect();
+  if (uni.onWindowResize) uni.onWindowResize(handleWindowResize);
+});
+
+onBeforeUnmount(() => {
+  shotEffectRequestGeneration += 1;
+  pendingShotEffect.value = null;
+  clearTipTimer();
+  if (dirTimer.value) {
+    clearTimeout(dirTimer.value);
+    dirTimer.value = null;
+  }
+  if (shakeTimer.value) {
+    clearTimeout(shakeTimer.value);
+    shakeTimer.value = null;
+  }
+  uni.$off("socket-inbox", onReceiveMessage);
+  if (uni.offWindowResize) uni.offWindowResize(handleWindowResize);
+});
+</script>
+
+<template>
+  <view :class="['container', { 'container--effecting': shotEffect }]">
+    <!-- <view class="header" v-if="totalRound > 0">
+      <text v-if="totalRound > 0" class="round-count">{{
+        (currentRound > totalRound ? totalRound : currentRound) +
+        "/" +
+        totalRound
+      }}</text>
+    </view> -->
+    <view :class="['target', { 'target--shake': targetShaking }]">
+      <image
+        class="target-image"
+        src="https://static.shelingxingqiu.com/shootmini/static/bow-target.png"
+        mode="aspectFit"
+      />
+      <TargetCanvas
+        v-if="showSectorCanvas"
+        class="target-highlight-layer"
+        :coordinateRadius="coordinateRadius"
+        :showCrosshair="false"
+        :showRingLabels="false"
+        :highlightOnly="true"
+        :sectorCount="sectorCount"
+        :activeSector="activeSector"
+        :activeRing="activeRing"
+        :showSectorLabels="showSectorLabels"
+      />
+      <view v-if="angle !== null" class="arrow-dir" :style="arrowStyle">
+        <view :style="{ background: circleColor }">
+          <image src="https://static.shelingxingqiu.com/shootmini/static/dot-circle.png" mode="widthFix" />
+        </view>
+      </view>
+      <view v-if="stop" class="stop-sign">中场休息</view>
+      <view
+        v-if="
+          !shotEffect &&
+          latestOne &&
+          latestOne.ring &&
+          user.id === latestOne.playerId
+        "
+        class="e-value fade-in-out"
+        :style="getExperienceTipStyle(latestOne)"
+      >
+        经验 +1
+      </view>
+      <view
+        v-if="!shotEffect && latestOne"
+        class="round-tip fade-in-out"
+        :style="getRoundTipStyle(latestOne)"
+        >{{ latestOne.ringX ? "X" : latestOne.ring || "未上靶"
+        }}<text v-if="latestOne.ring">环</text>
+      </view>
+      <view
+        v-if="
+          bluelatestOne &&
+          bluelatestOne.ring &&
+          user.id === bluelatestOne.playerId
+        "
+        class="e-value fade-in-out"
+        :style="getExperienceTipStyle(bluelatestOne)"
+      >
+        经验 +1
+      </view>
+      <view
+        v-if="bluelatestOne"
+        class="round-tip fade-in-out"
+        :style="getRoundTipStyle(bluelatestOne)"
+        >{{ bluelatestOne.ringX ? "X" : bluelatestOne.ring || "未上靶"
+        }}<text v-if="bluelatestOne.ring">环</text></view
+      >
+      <block v-for="(bow, index) in scores" :key="index">
+        <image
+          v-if="pMode && isSvip && bow.ring > 0 && !shouldHideLatestHit(index)"
+          class="svip-hit-bg"
+          src="../../../static/vip/svip-xuan.png"
+          :style="getSvipHitBgStyle(bow)"
+          mode="aspectFit"
+        />
+        <view
+          v-if="bow.ring > 0 && !shouldHideLatestHit(index)"
+          :class="`hit ${pMode ? 'b' : 's'}-point ${
+            index === scores.length - 1 && latestOne ? 'pump-in' : ''
+          }`"
+          :style="{
+            ...getHitStyle(bow),
+            backgroundColor: mode === 'solo' ? '#00bf04' : '#FF0000',
+          }"
+          ><text v-if="pMode">{{ index + 1 }}</text></view
+        >
+      </block>
+      <block v-for="(bow, index) in blueScores" :key="index">
+        <view
+          v-if="bow.ring > 0"
+          :class="`hit ${pMode ? 'b' : 's'}-point ${
+            index === blueScores.length - 1 && bluelatestOne ? 'pump-in' : ''
+          }`"
+          :style="{
+            ...getHitStyle(bow),
+            backgroundColor: '#1840FF',
+          }"
+        >
+          <text v-if="pMode">{{ index + 1 }}</text>
+        </view>
+      </block>
+      <BowShotEffect
+        v-if="!shotEffect || !shotEffect.viewportMode"
+        :shot="shotEffect && shotEffect.shot"
+        :playKey="shotEffect ? shotEffect.key : ''"
+        :targetRadius="safeTargetRadius"
+        :targetLeft="targetRect.left"
+        :targetTop="targetRect.top"
+        :targetWidth="targetRect.width"
+        :targetHeight="targetRect.height"
+        :hitOffsetPx="currentHitRadiusPx"
+        @impact="shakeTarget"
+        @complete="completeShotEffect"
+      />
+    </view>
+    <BowShotEffect
+      v-if="shotEffect && shotEffect.viewportMode"
+      :shot="shotEffect.shot"
+      :playKey="shotEffect.key"
+      :targetRadius="safeTargetRadius"
+      :targetLeft="targetRect.left"
+      :targetTop="targetRect.top"
+      :targetWidth="targetRect.width"
+      :targetHeight="targetRect.height"
+      :hitOffsetPx="currentHitRadiusPx"
+      :viewportMode="true"
+      @impact="shakeTarget"
+      @complete="completeShotEffect"
+    />
+    <view class="footer">
+      <PointSwitcher
+        :onChange="(val) => (pMode = val)"
+        :style="{ zIndex: 999 }"
+      />
+    </view>
+    <view class="simul" v-if="env !== 'release'">
+      <button @click="simulShoot">模拟</button>
+      <button @click="simulShoot2">射箭</button>
+      <button @click="openAim">开瞄</button>
+      <button @click="closeAim">关瞄</button>
+    </view>
+  </view>
+</template>
+
+<style scoped>
+.container {
+  width: calc(100vw - 30px);
+  height: calc(100vw - 30px);
+  padding: 0px 15px;
+  position: relative;
+  z-index: 3;
+}
+.container--effecting {
+  z-index: 10000;
+}
+.target {
+  position: relative;
+  margin: 10px;
+  width: calc(100% - 20px);
+  height: calc(100% - 20px);
+  z-index: 1;
+  pointer-events: none;
+  transform-origin: center center;
+}
+.target--shake {
+  animation: target-shake 0.26s ease-out;
+}
+.target-image {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 0;
+  pointer-events: none;
+}
+.target-highlight-layer {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 1;
+  pointer-events: none;
+}
+.e-value {
+  position: absolute;
+  background-color: #0006;
+  color: #fff;
+  font-size: 12px;
+  padding: 4px 7px;
+  border-radius: 5px;
+  z-index: 4;
+  width: 50px;
+  text-align: center;
+}
+.round-tip {
+  position: absolute;
+  color: #fff;
+  font-size: 30px;
+  font-weight: bold;
+  z-index: 4;
+  width: 100px;
+  text-align: center;
+}
+.round-tip > text {
+  font-size: 24px;
+  margin-left: 5px;
+}
+@keyframes target-tip-fade-in-out {
+  0% {
+    transform: translate(-50%, -50%) translateY(20px);
+    opacity: 0;
+  }
+
+  30% {
+    transform: translate(-50%, -50%);
+    opacity: 1;
+  }
+
+  80% {
+    transform: translate(-50%, -50%);
+    opacity: 1;
+  }
+
+  100% {
+    transform: translate(-50%, -50%);
+    opacity: 0;
+  }
+}
+.round-tip.fade-in-out,
+.e-value.fade-in-out {
+  animation: target-tip-fade-in-out 1.2s ease forwards;
+}
+.svip-hit-bg {
+  position: absolute;
+  width: 48rpx;
+  height: 48rpx;
+  z-index: 2;
+  pointer-events: none;
+  transform-origin: center center;
+  animation: svip-hit-xuan 1.2s linear infinite;
+}
+.hit {
+  position: absolute;
+  border-radius: 50%;
+  z-index: 3;
+  color: #fff;
+  transition: all 0.3s ease;
+  box-sizing: border-box;
+}
+.s-point {
+}
+.b-point {
+  border: 1px solid #fff;
+  z-index: 3;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.b-point > text {
+  font-size: 16rpx;
+  color: #fff;
+  font-family: "DINCondensed";
+  /* text-align: center;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);*/
+  margin-top: 2rpx;
+}
+@keyframes svip-hit-xuan {
+  0% {
+    opacity: 0.9;
+    transform: translate(-50%, -50%) rotate(0deg) scale(0.92);
+  }
+  50% {
+    opacity: 1;
+    transform: translate(-50%, -50%) rotate(180deg) scale(1.08);
+  }
+  100% {
+    opacity: 0.9;
+    transform: translate(-50%, -50%) rotate(360deg) scale(0.92);
+  }
+}
+@keyframes target-pump-in {
+  from {
+    transform: translate(-50%, -50%) scale(2);
+  }
+
+  to {
+    transform: translate(-50%, -50%) scale(1);
+  }
+}
+@keyframes target-shake {
+  0% {
+    transform: translate(0, 0);
+  }
+  14% {
+    transform: translate(-20rpx, 8rpx);
+  }
+  28% {
+    transform: translate(16rpx, -8rpx);
+  }
+  44% {
+    transform: translate(-12rpx, 6rpx);
+  }
+  64% {
+    transform: translate(8rpx, -4rpx);
+  }
+  82% {
+    transform: translate(-4rpx, 2rpx);
+  }
+  100% {
+    transform: translate(0, 0);
+  }
+}
+.hit.pump-in {
+  animation: target-pump-in 0.3s ease-out forwards;
+  transform-origin: center center;
+}
+.header {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: -40px;
+}
+.header > image:first-child {
+  width: 40px;
+  height: 40px;
+}
+.round-count {
+  font-size: 20px;
+  color: #fed847;
+  top: 75px;
+  font-weight: bold;
+}
+.footer {
+  width: calc(100% - 20px);
+  padding: 0 10px;
+  display: flex;
+  margin-top: -40px;
+  justify-content: flex-end;
+}
+.footer > image {
+  width: 40px;
+  min-height: 40px;
+  max-height: 40px;
+  border-radius: 50%;
+  border: 1px solid #fff;
+}
+.simul {
+  position: absolute;
+  top: 0;
+  right: 20px;
+  margin-left: 20px;
+  z-index: 999;
+}
+.simul > button {
+  color: #fff;
+}
+.stop-sign {
+  position: absolute;
+  font-size: 44px;
+  color: #fff9;
+  text-align: center;
+  width: 200px;
+  height: 60px;
+  left: calc(50% - 100px);
+  top: calc(50% - 30px);
+  z-index: 5;
+  font-weight: bold;
+}
+.arrow-dir {
+  position: absolute;
+  width: 100%;
+  height: 52%;
+  left: 50%;
+  bottom: 50%;
+  z-index: 4;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.arrow-dir > view {
+  width: 40rpx;
+  height: 40rpx;
+  border-radius: 50%;
+}
+.arrow-dir > view > image {
+  width: 100rpx;
+  height: 100rpx;
+  transform: translate(-30%, -30%);
+}
+@keyframes spring-in {
+  0% {
+    transform: scale(2);
+    opacity: 0.4;
+  }
+  15% {
+    transform: scale(3);
+    opacity: 1;
+  }
+  30% {
+    transform: scale(2);
+    opacity: 0.4;
+  }
+  45% {
+    transform: scale(3);
+    opacity: 1;
+  }
+  60% {
+    transform: scale(2);
+    opacity: 0.4;
+  }
+  75% {
+    transform: scale(3);
+    opacity: 1;
+  }
+  100% {
+    transform: scale(1);
+    opacity: 0;
+  }
+}
+@keyframes disappear {
+  0% {
+    opacity: 1;
+  }
+  75% {
+    opacity: 1;
+  }
+  100% {
+    opacity: 0;
+  }
+}
+.arrow-dir > view {
+  animation: disappear 3s ease forwards;
+}
+.arrow-dir > view > image {
+  animation: spring-in 3s ease forwards;
+  width: 100%;
+}
+</style>
diff --git a/src/pages/training/components/BubbleTip.vue b/src/pages/training/components/BubbleTip.vue
new file mode 100644
index 0000000..4fdfdb6
--- /dev/null
+++ b/src/pages/training/components/BubbleTip.vue
@@ -0,0 +1,62 @@
+<script setup>
+const props = defineProps({
+  type: {
+    type: String,
+    default: "normal",
+  },
+  location: {
+    type: Object,
+    default: () => ({}),
+  },
+});
+</script>
+
+<template>
+  <view :class="`container ${type}`" :style="{ ...location }">
+    <slot />
+  </view>
+</template>
+
+<style scoped>
+.container {
+  position: absolute;
+  color: #fff;
+  display: flex;
+  flex-direction: column;
+  background-size: contain;
+  background-repeat: no-repeat;
+  background-position: center;
+  font-size: 24rpx;
+}
+.normal {
+  background-image: url("../static/bubble-tip.png");
+  width: 157rpx;
+  height: 105rpx;
+  padding-top: 10px;
+  padding-left: 30rpx;
+}
+.normal2 {
+  background-image: url("../static/bubble-tip4.png");
+  width: 190rpx;
+  height: 105rpx;
+  padding-top: 10px;
+  padding-left: 20rpx;
+  top: 0;
+  left: 15%;
+  z-index: 1;
+}
+.long {
+  background-image: url("../static/bubble-tip2.png");
+  width: 370rpx;
+  height: 70rpx;
+  top: -50%;
+  left: 49%;
+}
+.short {
+  background-image: url("../static/bubble-tip3.png");
+  width: 300rpx;
+  height: 70rpx;
+  top: -50%;
+  right: -1%;
+}
+</style>
diff --git a/src/pages/training/components/ScorePanel.vue b/src/pages/training/components/ScorePanel.vue
new file mode 100644
index 0000000..d03814e
--- /dev/null
+++ b/src/pages/training/components/ScorePanel.vue
@@ -0,0 +1,157 @@
+<script setup>
+import { ref, watch, onMounted, onBeforeUnmount } from "vue";
+const props = defineProps({
+  rowCount: {
+    type: Number,
+    default: 0,
+  },
+  total: {
+    type: Number,
+    default: 0,
+  },
+  arrows: {
+    type: Array,
+    default: () => [],
+  },
+  fontSize: {
+    type: Number,
+    default: 25,
+  },
+  completeEffect: {
+    type: Boolean,
+    default: true,
+  },
+});
+const items = ref(new Array(props.total).fill(9));
+const bgImages = [
+  "../static/complete-light1.png",
+  "../static/complete-light2.png",
+];
+const bgIndex = ref(0);
+
+const getDisplayText = (arrow) => {
+  if (!arrow) return "-";
+  if (arrow.ringX) return "X";
+  return arrow.ring ?? "-";
+};
+
+const isLowScore = (arrow) => {
+  if (!arrow || arrow.ringX) return false;
+  const ring = Number(arrow.ring);
+  return Number.isFinite(ring) && ring < 6;
+};
+
+watch(
+  () => props.total,
+  (newValue) => {
+    items.value = new Array(newValue).fill(9);
+  }
+);
+const timer = ref(null);
+onMounted(() => {
+  timer.value = setInterval(() => {
+    bgIndex.value = bgIndex.value === 0 ? 1 : 0;
+  }, 200);
+});
+onBeforeUnmount(() => {
+  if (timer.value) {
+    clearInterval(timer.value);
+  }
+});
+</script>
+<template>
+  <view class="container">
+    <image
+      v-if="total > 0 && arrows.length === total && completeEffect"
+      :src="bgImages[bgIndex]"
+      class="complete-light"
+      :style="{
+        width: `calc(${(100 / (rowCount + 2)) * rowCount}vw + ${
+          (100 / (total * 2)) * (rowCount * 2 + (total === 12 ? 8 : 24))
+        }px)`,
+        height: `calc(${(100 / (rowCount + 2)) * (total / rowCount)}vw + ${
+          (100 / (total * 2)) *
+          ((total / rowCount) * 2 + (total === 12 ? 7 : 24))
+        }px)`,
+        top: `${total === 12 ? -2 : -3}vw`,
+      }"
+    />
+    <view
+      v-for="(_, index) in items"
+      :key="index"
+      class="score-item"
+    >
+      <image
+        class="score-item-bg"
+        :src="
+          isLowScore(arrows[index])
+            ? 'https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/block-gray.png'
+            : 'https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/block-gold.png'
+        "
+      />
+      <text
+        class="score-value"
+        :class="{ 'score-value--low': isLowScore(arrows[index]) }"
+      >
+        {{ getDisplayText(arrows[index]) }}
+      </text>
+    </view>
+  </view>
+</template>
+
+<style scoped lang="scss">
+.container {
+  width: 100%;
+  display: flex;
+  flex-wrap: wrap;
+  box-sizing: border-box;
+  position: relative;
+  padding: 30rpx 40rpx 0 40rpx;
+}
+.score-item {
+  position: relative;
+  width: 100rpx;
+  height: 56rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  overflow: hidden;
+  margin-right: 14rpx;
+  margin-bottom: 14rpx;
+}
+
+.score-item:nth-child(6n) {
+  margin-right: 0;
+}
+
+.score-item-bg {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100rpx;
+  height: 56rpx;
+}
+
+.score-value {
+  position: relative;
+  z-index: 1;
+  min-width: 28rpx;
+  text-align: center;
+  font-size: 34rpx;
+  line-height: 1;
+  font-weight: 700;
+  font-style: italic;
+  color: #f6e3b2;
+  text-shadow: 0 2rpx 0 rgba(36, 36, 48, 0.5);
+  margin-left: -10rpx;
+}
+
+.score-value--low {
+  color: #cfcfcf;
+  text-shadow: 0 2rpx 0 rgba(0, 0, 0, 0.5);
+}
+
+.complete-light {
+  position: absolute;
+}
+</style>
diff --git a/src/pages/training/components/ScorePanel2.vue b/src/pages/training/components/ScorePanel2.vue
new file mode 100644
index 0000000..fe96acd
--- /dev/null
+++ b/src/pages/training/components/ScorePanel2.vue
@@ -0,0 +1,108 @@
+<script setup>
+import { computed } from "vue";
+
+const props = defineProps({
+  arrows: {
+    type: Array,
+    default: () => [],
+  },
+  total: {
+    type: Number,
+    default: 0,
+  },
+});
+
+const getDisplayText = (arrow = {}) => {
+  if (!arrow) return "";
+  if (!arrow.ring) return "0";
+  return arrow.ringX ? "X" : String(arrow.ring);
+};
+
+const isLowScore = (arrow = {}) => {
+  if (!arrow || arrow.ringX) return false;
+  return Number(arrow.ring) < 6;
+};
+
+const displayArrows = computed(() => {
+  const list = [...props.arrows];
+  // total 是达标箭数，不是实际射箭上限；训练中始终预留下一箭空框。
+  list.push(null);
+  return list;
+});
+</script>
+
+<template>
+  <view v-if="displayArrows.length" class="score-panel">
+    <view class="score-grid">
+      <view
+        v-for="(arrow, index) in displayArrows"
+        :key="index"
+        class="score-card"
+      >
+        <image class="score-card-bg" :src="isLowScore(arrow)?'https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/block-gray.png':'https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/block-gold.png'"></image>
+        <text
+          class="score-value"
+          :class="{ 'score-value--low': isLowScore(arrow) }"
+        >
+          {{ getDisplayText(arrow) }}
+        </text>
+      </view>
+    </view>
+  </view>
+</template>
+
+<style scoped lang="scss">
+.score-panel {
+  width: 100%;
+  padding: 30rpx 40rpx 0 40rpx;
+  box-sizing: border-box;
+}
+
+.score-grid {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.score-card {
+  position: relative;
+  width: 100rpx;
+  height: 56rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  overflow: hidden;
+  margin-right: 14rpx;
+  margin-bottom: 14rpx;
+}
+
+.score-card:nth-child(6n) {
+  margin-right: 0;
+}
+
+.score-card-bg {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100rpx;
+  height: 56rpx;
+}
+
+.score-value {
+  position: relative;
+  z-index: 1;
+  min-width: 28rpx;
+  text-align: center;
+  font-size: 34rpx;
+  line-height: 1;
+  font-weight: 700;
+  font-style: italic;
+  color: #f6e3b2;
+  text-shadow: 0 2rpx 0 rgba(36, 36, 48, 0.5);
+  margin-left: -10rpx;
+}
+
+.score-value--low {
+  color: #cfcfcf;
+  text-shadow: 0 2rpx 0 rgba(0, 0, 0, 0.5);
+}
+</style>
diff --git a/src/pages/training/components/ScoreResult.vue b/src/pages/training/components/ScoreResult.vue
new file mode 100644
index 0000000..135a62f
--- /dev/null
+++ b/src/pages/training/components/ScoreResult.vue
@@ -0,0 +1,797 @@
+<script setup>
+import { ref, onMounted, computed } from "vue";
+import ScreenHint from "./ScreenHint.vue";
+import BowData from "./BowData.vue";
+import UserUpgrade from "@/components/UserUpgrade.vue";
+import { directionAdjusts } from "@/constants";
+import useStore from "@/store";
+import { storeToRefs } from "pinia";
+
+const store = useStore();
+const { user } = storeToRefs(store);
+
+const props = defineProps({
+  onClose: {
+    type: Function,
+    default: () => { },
+  },
+  onRetry: {
+    type: Function,
+    default: () => { },
+  },
+  total: {
+    type: Number,
+    default: 0,
+  },
+  rowCount: {
+    type: Number,
+    default: 0,
+  },
+  trainingType: {
+    type: String,
+    default: "",
+  },
+  difficultyLevel: {
+    type: Number,
+    default: 0,
+  },
+  hasNextDifficulty: {
+    type: Boolean,
+    default: false,
+  },
+  result: {
+    type: Object,
+    default: () => ({}),
+  },
+  tipSrc: {
+    type: String,
+    default: "",
+  },
+});
+
+const showPanel = ref(true);
+const showComment = ref(false);
+const showBowData = ref(false);
+const showUpgrade = ref(false);
+
+const closePanel = () => {
+  showPanel.value = false;
+  setTimeout(() => {
+    props.onClose();
+  }, 300);
+};
+
+const retryPractice = () => {
+  showPanel.value = false;
+  setTimeout(() => {
+    props.onRetry();
+  }, 300);
+};
+
+function onClickShare() {
+  uni.$emit("share-image");
+}
+
+const details = computed(() => props.result.details || []);
+
+const arrows = computed(() => {
+  const data = new Array(props.total).fill(null);
+  details.value.forEach((arrow, index) => {
+    data[index] = arrow;
+  });
+  return data;
+});
+
+const validArrows = computed(() => arrows.value.filter((a) => !!a?.ring).length);
+const totalRing = computed(() =>
+  details.value.reduce((last, next) => last + (Number(next.ring) || 0), 0)
+);
+
+const hasResultValue = (...keys) =>
+  keys.some((key) => {
+    const value = props.result[key];
+    return value !== undefined && value !== null && value !== "";
+  });
+
+const readResultNumber = (keys, fallback = 0) => {
+  for (const key of keys) {
+    const value = props.result[key];
+    if (value === undefined || value === null || value === "") continue;
+    const numberValue = Number(value);
+    if (Number.isFinite(numberValue)) return numberValue;
+  }
+  return fallback;
+};
+
+const beforeExp = computed(() =>
+  readResultNumber(["beforeExp", "before_exp"])
+);
+
+const currentExp = computed(() => {
+  const userScores = Number(user.value.scores);
+  return readResultNumber(
+    ["currentExp", "current_exp", "score"],
+    Number.isFinite(userScores) ? userScores : 0
+  );
+});
+
+// 新版练习结算返回练习前后累计经验，本局经验由两者相减得到。
+const gainedExp = computed(() => {
+  if (
+    hasResultValue("beforeExp", "before_exp") &&
+    hasResultValue("currentExp", "current_exp")
+  ) {
+    return Math.max(0, currentExp.value - beforeExp.value);
+  }
+  return Math.max(0, readResultNumber(["exp", "experience"]));
+});
+
+const beforeLevel = computed(() => {
+  const currentUserLevel = Number(user.value.lvl);
+  return readResultNumber(
+    ["beforeLevel", "before_level"],
+    Number.isFinite(currentUserLevel) ? currentUserLevel : 0
+  );
+});
+
+const userLevel = computed(() => {
+  const fallbackLevel = Number(user.value.lvl ?? user.value.rankLvl ?? 1);
+  const level = readResultNumber(
+    ["level", "lvl"],
+    Number.isFinite(fallbackLevel) ? fallbackLevel : 1
+  );
+  return Math.max(1, Math.trunc(level));
+});
+
+const resultDifficultyLevel = computed(() => {
+  const level = Number(props.difficultyLevel);
+  return Number.isInteger(level) && level > 0 ? level : "--";
+});
+
+const upgradeExp = computed(() =>
+  Math.max(
+    0,
+    readResultNumber(
+      ["upgradeExp", "upgrade_exp", "nextExp", "upgradeScore"],
+      100
+    )
+  )
+);
+
+const expPercent = computed(() => {
+  if (!upgradeExp.value) return 0;
+  return Math.min(
+    100,
+    Math.max(0, (currentExp.value / upgradeExp.value) * 100)
+  );
+});
+
+onMounted(() => {
+  if (userLevel.value > beforeLevel.value) {
+    showUpgrade.value = true;
+  }
+});
+
+const findValue = (...keys) => {
+  const item = keys.find((key) => props.result[key] !== undefined);
+  return item ? props.result[item] : undefined;
+};
+
+const formatDuration = (value) => {
+  const valueNumber = Number(value);
+  const seconds = Number.isFinite(valueNumber)
+    ? Math.max(0, Math.round(valueNumber))
+    : 0;
+  const minutes = Math.floor(seconds / 60);
+  const rest = seconds % 60;
+  return minutes ? `${minutes}分${rest}秒` : `${rest}秒`;
+};
+
+const formatMetricNumber = (value) => {
+  const valueNumber = Number(value);
+  if (!Number.isFinite(valueNumber)) return "0";
+  return String(Number(valueNumber.toFixed(2)));
+};
+
+const readMetricNumber = (keys, fallback = 0) => {
+  const value = findValue(...keys);
+  const valueNumber = Number(value);
+  return Number.isFinite(valueNumber) ? valueNumber : fallback;
+};
+
+const resultTrainingType = computed(
+  () => props.result.trainingType || props.trainingType || "precision"
+);
+
+const metricConfigs = {
+  base: [
+    {
+      label: "平均环数",
+      valueKeys: ["averageRing", "average_ring"],
+      unit: "环",
+      deltaKeys: ["deltaAverageRing", "delta_average_ring"],
+      deltaUnit: "环",
+    },
+    {
+      label: "稳定性",
+      valueKeys: ["stability"],
+      unit: "",
+      deltaKeys: ["deltaStability", "delta_stability"],
+      deltaUnit: "",
+    },
+  ],
+  rhythm: [
+    {
+      label: "最高连击次数",
+      valueKeys: ["maxCombo", "max_combo"],
+      unit: "连",
+      deltaKeys: ["deltaMaxCombo", "delta_max_combo"],
+      deltaUnit: "连",
+    },
+    {
+      label: "共命中环数",
+      valueKeys: ["currentRings", "current_rings"],
+      unit: "环",
+      deltaKeys: ["deltaTotalRings", "delta_total_rings"],
+      deltaUnit: "环",
+    },
+  ],
+  endurance: [
+    {
+      label: "完成箭数",
+      valueKeys: ["totalArrows", "total_arrows"],
+      unit: "支",
+      deltaKeys: ["deltaTotalArrows", "delta_total_arrows"],
+      deltaUnit: "支",
+    },
+    {
+      label: "命中环数",
+      valueKeys: ["currentRings", "current_rings"],
+      unit: "环",
+      deltaKeys: ["deltaTotalRings", "delta_total_rings"],
+      deltaUnit: "环",
+    },
+  ],
+  precision: [
+    {
+      label: "共命中目标",
+      valueKeys: ["totalHits", "total_hits"],
+      fallback: () => 0,
+      unit: "次",
+      deltaKeys: [
+        "deltaTotalHits",
+        "delta_total_hits",
+        "hitCompare",
+        "hitDiff",
+        "hitDelta",
+      ],
+      deltaUnit: "次",
+    },
+    {
+      label: "用时",
+      valueKeys: ["duration", "usedTime", "shootTime", "time"],
+      unit: "",
+      deltaKeys: [
+        "deltaDuration",
+        "delta_duration",
+        "timeCompare",
+        "timeDiff",
+        "durationDiff",
+      ],
+      deltaUnit: "",
+      duration: true,
+    },
+  ],
+};
+
+const resultRows = computed(() => {
+  const configs = metricConfigs[resultTrainingType.value] || metricConfigs.precision;
+  return configs.map((config) => {
+    const fallback = config.fallback ? config.fallback() : 0;
+    const value = readMetricNumber(config.valueKeys, fallback);
+    const delta = readMetricNumber(config.deltaKeys);
+    const formatter = config.duration ? formatDuration : formatMetricNumber;
+
+    return {
+      ...config,
+      valueText: formatter(value),
+      delta,
+      deltaText: formatter(Math.abs(delta)),
+    };
+  });
+});
+
+const advancesDifficulty = computed(() => props.hasNextDifficulty);
+const primaryText = computed(() =>
+  advancesDifficulty.value ? "下一难度" : "再来一次"
+);
+
+const handlePrimary = () => {
+  if (advancesDifficulty.value) {
+    closePanel();
+    return;
+  }
+  retryPractice();
+};
+
+const calories = computed(
+  () => formatMetricNumber(readMetricNumber(["calories", "calorie", "kcal"]))
+);
+</script>
+
+<template>
+  <view :class="['result-mask', showPanel ? 'result-mask--show' : 'result-mask--hide']">
+    <image class="hero-glow" src="https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/result-bg.png" mode="widthFix" />
+    <view class="result-title">
+      <image class="result-title-bg" src="https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/result-t-bg.png" mode="widthFix" />
+      <view class="result-title-text">Lv{{ resultDifficultyLevel }}</view>
+    </view>
+
+    <view class="result-panel">
+      <view class="line-top"></view>
+      <view class="line-bottom"></view>
+      <view class="stats">
+        <view v-for="row in resultRows" :key="row.label" class="stat-row">
+          <image class="stat-bg" src="https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/result-c-bg.png" mode="scaleToFill" />
+          <view class="stat-cell">
+            <text class="stat-label">{{ row.label }}</text>
+            <view class="stat-value">
+              <text>{{ row.valueText }}</text>
+              <text v-if="row.unit" class="stat-unit">{{ row.unit }}</text>
+            </view>
+          </view>
+          <view class="stat-divider"></view>
+          <view class="stat-cell stat-cell--compare">
+            <text class="stat-label">对比上次</text>
+            <view v-if="row.delta !== 0" class="stat-value">
+              <text>{{ row.delta > 0 ? "+" : "-" }}{{ row.deltaText }}</text>
+              <text v-if="row.deltaUnit" class="stat-unit">{{ row.deltaUnit }}</text>
+              <image class="trend-icon" :class="{ 'trend-icon--down': row.delta < 0 }"
+                src="https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/result-up.png" mode="widthFix" />
+            </view>
+            <view v-else class="stat-value">--</view>
+          </view>
+        </view>
+         <view class="stat-row">
+          <image class="stat-bg" src="https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/result-c-bg.png" mode="scaleToFill" />
+          <view class="stat-cell">
+            <text class="stat-label">消耗卡路里</text>
+            <view class="stat-value">
+              <text>{{ calories }}卡</text>
+            </view>
+          </view>
+          <text class="stat-equal">≈</text>
+          <!-- <view class="stat-divider"></view> -->
+          <view class="stat-cell stat-cell--compare">
+            <view class="stat-value">
+              <image v-for="index in 3" :key="index" class="rice-icon"
+                  src="https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/result-rice.png" mode="widthFix" />
+            </view>
+          </view>
+        </view>
+
+     
+        <view class="actions">
+          <view class="action-item" @click="() => (showBowData = true)">
+            <image class="action-icon" src="https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/result-icon-1.png" mode="widthFix" />
+            <text>查看靶纸</text>
+          </view>
+          <view class="action-item" @click="() => (showComment = true)">
+            <image class="action-icon" src="https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/result-icon-2.png" mode="widthFix" />
+            <text>教练点评</text>
+          </view>
+          <view class="action-item" @click="onClickShare">
+            <image class="action-icon" src="https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/result-icon-3.png" mode="widthFix" />
+            <text>分享成绩</text>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="oper-box">
+      <view class="exp-area">
+        <text class="exp-gain">+{{ gainedExp }}经验</text>
+        <view class="level-progress">
+          <text class="level-text">LV.{{ userLevel }}</text>
+          <view class="progress-track">
+            <view class="progress-fill" :style="{ width: `${expPercent}%` }"></view>
+          </view>
+          <text class="progress-text">{{ currentExp }} / {{ upgradeExp }}</text>
+        </view>
+      </view>
+
+      <view class="footer-actions">
+        <view class="result-btn result-btn--muted" @click="closePanel">
+          <text>完成</text>
+        </view>
+        <view class="result-btn result-btn--primary" @click="handlePrimary">
+          <text>{{ primaryText }}</text>
+        </view>
+      </view>
+    </view>
+
+    <ScreenHint :show="showComment" :onClose="() => (showComment = false)" mode="tall">
+      <view class="coach-comment">
+        <text>
+          您本次练习取得了<text class="gold-text">{{ totalRing }}</text>环的成绩，所有箭支上靶后的平均点间距离为<text class="gold-text">{{
+            Number((result.average_distance || 0).toFixed(2))
+            }}</text>，{{
+              result.spreadEvaluation === "Dispersed"
+                ? "还需要持续改进哦~"
+                : "成绩优秀。"
+            }}
+        </text>
+        <view>
+          <image src="https://static.shelingxingqiu.com/attachment/2025-11-26/deihtj15xjwcz3c1tx.png" mode="widthFix" />
+          <text class="coach-suggestion">
+            针对您本次的练习，{{
+              result.spreadEvaluation === "Dispersed"
+                ? "我们建议您充分练习推弓、靠位以及撒放动作一致性。"
+                : totalRing >= 100
+                  ? "我们建议您继续保持即可。"
+                  : `我们建议您将设备的瞄准器${directionAdjusts[result.adjustmentHint]
+                  }调整。`
+            }}
+          </text>
+        </view>
+      </view>
+    </ScreenHint>
+    <BowData :total="arrows.length" :arrows="result.details" :show="showBowData"
+      :onClose="() => (showBowData = false)" />
+    <UserUpgrade :show="showUpgrade" :onClose="() => (showUpgrade = false)" :lvl="userLevel" />
+  </view>
+</template>
+
+<style scoped lang="scss">
+.result-mask {
+  width: 100vw;
+  height: 100vh;
+  position: fixed;
+  top: 0;
+  left: 0;
+  overflow: hidden;
+  background:
+    linear-gradient(180deg,
+      rgba(24, 22, 17, 0.38) 0%,
+      rgba(24, 22, 17, 0.56) 28%,
+      rgba(17, 17, 25, 0.92) 58%),
+    rgba(0, 0, 0, 0.72);
+  z-index: 999;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+}
+
+.result-mask--show {
+  opacity: 1;
+}
+
+.result-mask--hide {
+  opacity: 0;
+  transition: opacity 0.3s ease;
+}
+
+.hero-glow {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+}
+
+.result-title {
+  position: relative;
+  width: 100%;
+  height: 264rpx;
+  z-index: 2;
+}
+
+.result-title-bg {
+  width: 100%;
+  height: 264rpx;
+  display: block;
+}
+
+.result-title-text {
+  width: 100%;
+  font-size: 28rpx;
+  color: #FBFCE6;
+  font-weight: 600;
+  line-height: 40rpx;
+  text-align: center;
+  position: absolute;
+  top: 116rpx;
+  left: 0;
+}
+
+.result-panel {
+  width: 100vw;
+  height: 634rpx;
+  padding: 144rpx 80rpx 0 80rpx;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  background: rgba(0, 0, 0, 0.8);
+  z-index: 1;
+  margin-top: -100rpx;
+  position: relative;
+}
+
+.stats {
+  width: 100%;
+  margin-top: 34rpx;
+}
+
+.line-top {
+  background: linear-gradient(45deg, rgba(205, 183, 122, 0) 0%, #CDB77A 49.92%, rgba(205, 183, 122, 0) 100%);
+  width: 100%;
+  height: 4rpx;
+  opacity: 0.9;
+  position: absolute;
+  top: 2rpx;
+  left: 0;
+}
+
+.line-bottom {
+  background: linear-gradient(45deg, rgba(205, 183, 122, 0) 0%, #CDB77A 49.92%, rgba(205, 183, 122, 0) 100%);
+  width: 100%;
+  height: 4rpx;
+  opacity: 0.9;
+  position: absolute;
+  bottom: 2rpx;
+  left: 0;
+}
+
+.stat-row {
+  width: 100%;
+  height: 62rpx;
+  position: relative;
+  display: flex;
+  align-items: center;
+  margin-bottom: 52rpx;
+  // border: 2rpx solid rgba(209, 184, 125, 0.72);
+  // border-radius: 14rpx;
+  transform: skewX(-12deg);
+  box-sizing: border-box;
+}
+
+.stat-cell {
+  flex: 1;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  transform: skewX(12deg);
+}
+
+.stat-bg {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 582rpx;
+  height: 62rpx;
+}
+
+.stat-cell--compare {
+  padding-left: 8rpx;
+  box-sizing: border-box;
+}
+
+.stat-label {
+  position: absolute;
+  top: -30rpx;
+  color: rgba(255, 255, 255, 0.7);
+  font-size: 20rpx;
+  line-height: 1;
+}
+
+.stat-value {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  min-width: 120rpx;
+  color: #F3E0B9;
+  font-size: 32rpx;
+  line-height: 1;
+  font-weight: 700;
+  font-style: italic;
+}
+
+.stat-unit {
+  margin-left: 4rpx;
+  font-size: 24rpx;
+}
+
+.stat-divider {
+  width: 2rpx;
+  height: 34rpx;
+  background: rgba(197, 160, 92, 0.64);
+  transform: skewX(12deg);
+}
+
+.stat-equal{
+  width: 30rpx;
+  height: 40rpx;
+  color: #F3E0B9;
+  font-size: 30rpx;
+  margin-left: 10rpx;
+}
+
+.trend-icon {
+  width: 28rpx;
+  height: 42rpx;
+  margin-left: 16rpx;
+}
+
+.trend-icon--down {
+  transform: rotate(180deg);
+}
+
+.stat-bg {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 582rpx;
+  height: 62rpx;
+}
+
+.rice-list {
+  width: 160rpx;
+  display: flex;
+  align-items: center;
+}
+
+.rice-icon {
+  width: 36rpx;
+  height: 34rpx;
+  margin-right: 14rpx;
+}
+
+.oper-box {
+  position: relative;
+  z-index: 1;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  width: 598rpx;
+}
+
+.actions {
+  width: 350rpx;
+  display: flex;
+  justify-content: space-between;
+  margin: 0 auto;
+  margin-top: 38rpx;
+}
+
+.action-item {
+  width: 80rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.action-icon {
+  width: 70rpx;
+  height: 68rpx;
+}
+
+.action-item>text {
+  margin-top: 4rpx;
+  color: #FAE6BC;
+  font-size: 20rpx;
+  line-height: 1;
+  white-space: nowrap;
+}
+
+.exp-area {
+  width: 100%;
+  margin-top: auto;
+  padding-top: 122rpx;
+}
+
+.exp-gain {
+  display: block;
+  margin-bottom: 14rpx;
+  color: #f6e3b2;
+  font-size: 22rpx;
+  line-height: 1;
+  text-align: center;
+}
+
+.level-progress {
+  display: flex;
+  align-items: center;
+  width: 100%;
+}
+
+.level-text,
+.progress-text {
+  color: rgba(255, 255, 255, 0.86);
+  font-size: 24rpx;
+  line-height: 1;
+}
+
+.level-text {
+  min-width: 60rpx;
+}
+
+.progress-text {
+  min-width: 72rpx;
+  text-align: right;
+}
+
+.progress-track {
+  flex: 1;
+  height: 10rpx;
+  margin: 0 14rpx;
+  border-radius: 999rpx;
+  overflow: hidden;
+  background: rgba(255, 255, 255, 0.26);
+}
+
+.progress-fill {
+  height: 100%;
+  border-radius: 999rpx;
+  background: linear-gradient(90deg, #ff940f 0%, #ffbb33 58%, #fff0a7 100%);
+}
+
+.footer-actions {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  margin-top: 70rpx;
+}
+
+.result-btn {
+  width: 234rpx;
+  height: 72rpx;
+  border-radius: 999rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin: 0 18rpx;
+}
+
+.result-btn>text {
+  font-size: 28rpx;
+  line-height: 1;
+  font-weight: 700;
+}
+
+.result-btn--muted {
+  color: #ffffff;
+  background: rgba(255, 255, 255, 0.2);
+}
+
+.result-btn--primary {
+  background: #FED847;
+  color: #151515;
+}
+
+.gold-text {
+  color: #fed847;
+}
+
+.coach-comment {
+  display: flex;
+  flex-direction: column;
+  font-size: 14px;
+}
+
+.coach-comment>view {
+  display: flex;
+}
+
+.coach-comment>view>image {
+  width: 420rpx;
+  height: 420rpx;
+  margin-right: 20rpx;
+}
+
+.coach-suggestion {
+  margin-top: 12px;
+}
+</style>
diff --git a/src/pages/training/components/ScreenHint.vue b/src/pages/training/components/ScreenHint.vue
new file mode 100644
index 0000000..9ca8cb1
--- /dev/null
+++ b/src/pages/training/components/ScreenHint.vue
@@ -0,0 +1,89 @@
+<script setup>
+import IconButton from "@/components/IconButton.vue";
+
+const props = defineProps({
+  show: {
+    type: Boolean,
+    default: false,
+  },
+  onClose: {
+    type: Function,
+    default: null,
+  },
+  mode: {
+    type: String,
+    default: "normal",
+  },
+});
+const getContentHeight = () => {
+  if (props.mode === "tall") return "50vw";
+  if (props.mode === "square") return "74vw";
+  return "36vw";
+};
+</script>
+
+<template>
+  <view class="container" :style="{ display: show ? 'flex' : 'none' }">
+    <view class="scale-in" :style="{ height: getContentHeight() }">
+      <image
+        v-if="mode === 'normal'"
+        src="https://static.shelingxingqiu.com/shootmini/static/screen-hint-bg.png"
+        mode="widthFix"
+      />
+      <image
+        v-if="mode === 'tall'"
+        src="https://static.shelingxingqiu.com/shootmini/static/coach-comment.png"
+        mode="widthFix"
+      />
+      <image
+        v-if="mode === 'square'"
+        src="https://static.shelingxingqiu.com/shootmini/static/prompt-bg-square.png"
+        mode="widthFix"
+      />
+      <image
+        v-if="mode === 'small'"
+        src="https://static.shelingxingqiu.com/shootmini/static/finish-frame.png"
+        mode="widthFix"
+      />
+      <slot />
+    </view>
+    <IconButton
+      v-if="!!onClose"
+      src="https://static.shelingxingqiu.com/shootmini/static/close-gold-outline.png"
+      :width="30"
+      :onClick="onClose"
+    />
+  </view>
+</template>
+
+<style scoped>
+.container {
+  width: 100vw;
+  height: 100vh;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background-color: rgba(0, 0, 0, 0.8);
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  z-index: 999;
+}
+.container > view:first-child {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: relative;
+  width: 70vw;
+  color: #fff;
+  margin-bottom: 15px;
+}
+.container > view:first-child > image {
+  position: absolute;
+  width: 80vw;
+  left: -7%;
+  bottom: -18vw;
+  z-index: -1;
+  transform: translateY(-75px);
+}
+</style>
diff --git a/src/pages/training/components/ShootProgress.vue b/src/pages/training/components/ShootProgress.vue
new file mode 100644
index 0000000..bba3816
--- /dev/null
+++ b/src/pages/training/components/ShootProgress.vue
@@ -0,0 +1,462 @@
+<script setup>
+import { ref, watch, onMounted, onBeforeUnmount, computed } from "vue";
+import audioManager from "@/audioManager";
+import { MESSAGETYPESV2 } from "@/constants";
+import { getDirectionText } from "@/util";
+import Avatar from "@/components/Avatar.vue";
+
+import useStore from "@/store";
+import { storeToRefs } from "pinia";
+const store = useStore();
+const { user } = storeToRefs(store);
+
+const props = defineProps({
+  show: {
+    type: Boolean,
+    default: true,
+  },
+  start: {
+    type: Boolean,
+    default: false,
+  },
+  tips: {
+    type: String,
+    default: "",
+  },
+  total: {
+    type: Number,
+    default: 120,
+  },
+  countdownEnabled: {
+    type: Boolean,
+    default: true,
+  },
+  trainingType: {
+    type: String,
+    default: "precision",
+  },
+  isVip: {
+    type: Boolean,
+    default: false,
+  },
+  isSvip: {
+    type: Boolean,
+    default: false,
+  },
+  externalShootResultAudio: {
+    type: Boolean,
+    default: false,
+  },
+  currentRound: {
+    type: Number,
+    default: 0,
+  },
+  battleId: {
+    type: String,
+    default: "",
+  },
+  melee: {
+    type: Boolean,
+    default: false,
+  },
+  onStop: {
+    type: Function,
+    default: () => {},
+  },
+});
+
+const trainingTitleIconMap = Object.freeze({
+  base:
+    "https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/text-icon-jcxl.png",
+  precision:
+    "https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/text-icon-jingzxl.png",
+  rhythm:
+    "https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/text-icon-jzxl.png",
+  endurance:
+    "https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/text-icon-nlxl.png",
+});
+const trainingTitleIcon = computed(
+  () =>
+    trainingTitleIconMap[props.trainingType] || trainingTitleIconMap.precision
+);
+
+const barColor = ref("#fed847");
+const remain = ref(props.countdownEnabled ? props.total : 0);
+const timer = ref(null);
+const sound = ref(true);
+const currentRound = ref(props.currentRound);
+const currentRoundEnded = ref(false);
+const halfTime = ref(false);
+const wait = ref(0);
+const transitionStyle = ref("all 1s linear");
+
+const progressPercent = computed(() => {
+  if (!props.countdownEnabled || !props.total) return 0;
+  return Math.max(0, Math.min(100, (remain.value / props.total) * 100));
+});
+
+const displayName = computed(() => {
+  return (
+    user.value?.nickName ||
+    user.value?.nickname ||
+    user.value?.name ||
+    "Archer"
+  );
+});
+
+const avatarSrc = computed(() => {
+  return user.value?.avatar || "/static/shooter2.png";
+});
+
+watch(
+  () => props.tips,
+  (newVal) => {
+    let key = "";
+    if (newVal.includes("红队")) key = "请红方射箭";
+    if (newVal.includes("蓝队")) key = "请蓝方射箭";
+    if (key) {
+      if (currentRoundEnded.value) {
+        currentRound.value += 1;
+        currentRoundEnded.value = false;
+        if (currentRound.value === 1) audioManager.play("第一轮");
+        if (currentRound.value === 2) audioManager.play("第二轮");
+        if (currentRound.value === 3) audioManager.play("第三轮");
+        if (currentRound.value === 4) audioManager.play("第四轮");
+        if (currentRound.value === 5) audioManager.play("第五轮");
+        setTimeout(() => {
+          audioManager.play(key);
+        }, 1000);
+      } else {
+        audioManager.play(key);
+      }
+    }
+  }
+);
+
+const clearTimer = () => {
+  if (!timer.value) return;
+  clearInterval(timer.value);
+  timer.value = null;
+};
+
+const resetTimer = (count) => {
+  clearTimer();
+  if (!props.countdownEnabled) {
+    remain.value = 0;
+    return;
+  }
+
+  const countValue = Number(count);
+  const newVal = Number.isFinite(countValue)
+    ? Math.max(0, Math.round(countValue))
+    : 0;
+
+  if (newVal >= remain.value) {
+    transitionStyle.value = "none";
+    remain.value = newVal;
+    setTimeout(() => {
+      transitionStyle.value = "all 1s linear";
+    }, 50);
+  } else {
+    remain.value = newVal;
+  }
+
+  if (remain.value > 0) {
+    timer.value = setInterval(() => {
+      if (remain.value === 0) {
+        clearTimer();
+        props.onStop();
+      }
+      if (remain.value > 0) remain.value--;
+    }, 1000);
+  }
+};
+
+watch(
+  () => [props.start, props.countdownEnabled],
+  ([started, countdownEnabled]) => {
+    if (started && countdownEnabled) {
+      resetTimer(props.total);
+    } else {
+      clearTimer();
+      remain.value = 0;
+    }
+  },
+  {
+    immediate: true,
+  }
+);
+
+const tipContent = computed(() => {
+  if (halfTime.value) {
+    return props.battleId ? "中场休息" : `中场休息(${wait.value}秒)`;
+  }
+  return props.start && remain.value === 0 ? "时间到！" : props.tips;
+});
+
+const updateSound = () => {
+  sound.value = !sound.value;
+  audioManager.setMuted(!sound.value);
+};
+
+async function onReceiveMessage(msg) {
+  if (Array.isArray(msg)) return;
+  if (msg.type === MESSAGETYPESV2.BattleStart) {
+    halfTime.value = false;
+    audioManager.play("比赛开始");
+  } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
+    audioManager.play("练习结束", false);
+  } else if (msg.type === MESSAGETYPESV2.ShootResult) {
+    // 精准训练由页面统一等待语音和飞箭结束，其他训练保持原播放链路。
+    if (props.externalShootResultAudio) return;
+    const latestDetail =
+      Array.isArray(msg.details) && msg.details.length > 0
+        ? msg.details[msg.details.length - 1]
+        : null;
+    // 语音和 ACK 优先使用同一份当前箭数据，details 仅作为兼容兜底。
+    const arrow = msg.shootData || latestDetail;
+    if (!arrow) return;
+    if (
+      arrow.playerId !== undefined &&
+      arrow.playerId !== null &&
+      String(arrow.playerId) !== String(user.value?.id)
+    ) {
+      return;
+    }
+
+    const key = [];
+    key.push(arrow.ring ? `${arrow.ringX ? "X" : arrow.ring}环` : "未上靶");
+    if (arrow.angle !== null && arrow.angle !== undefined) {
+      key.push(`向${getDirectionText(arrow.angle)}调整`);
+    }
+    if (arrow.threeConsecutive10Rings === true) {
+      key.push("tententen");
+    }
+    audioManager.play(key, false);
+  } else if (msg.type === MESSAGETYPESV2.HalfRest) {
+    halfTime.value = true;
+    audioManager.play("中场休息");
+  } else if (msg.type === MESSAGETYPESV2.InvalidShot) {
+    uni.showToast({
+      title: "距离不足，无效",
+      icon: "none",
+    });
+    audioManager.play("射击无效");
+  }
+}
+
+const playSound = (key) => {
+  audioManager.play(key);
+};
+
+onMounted(() => {
+  uni.$on("update-remain", resetTimer);
+  uni.$on("socket-inbox", onReceiveMessage);
+  uni.$on("play-sound", playSound);
+});
+
+onBeforeUnmount(() => {
+  uni.$off("update-remain", resetTimer);
+  uni.$off("socket-inbox", onReceiveMessage);
+  uni.$off("play-sound", playSound);
+  clearTimer();
+});
+</script>
+
+<template>
+  <view v-if="show" class="progress-card">
+    <view class="progress-card__header">
+      <view class="progress-card__profile">
+        <view class="progress-card__avatar-shell">
+          <Avatar
+            :src="avatarSrc"
+            :size="80"
+            size-unit="rpx"
+            image-mode="aspectFill"
+          />
+        </view>
+        <view
+          :class="[
+            'progress-card__name',
+            'member-nickname',
+            isVip && !isSvip ? 'member-nickname--vip' : '',
+            isSvip ? 'member-nickname--svip' : '',
+          ]"
+        >
+          <text class="member-nickname__text">{{ displayName }}</text>
+          <text v-if="isSvip" class="member-nickname__shine">
+            {{ displayName }}
+          </text>
+        </view>
+      </view>
+
+      <!-- <button class="progress-card__sound" hover-class="none" @click="updateSound">
+        <image
+          class="progress-card__sound-icon"
+          :src="`/static/sound${sound ? '' : '-off'}-yellow.png`"
+          mode="aspectFit"
+        />
+      </button> -->
+    </view>
+
+    <view class="progress-card__track-wrap">
+      <image
+          class="progress-card__titile"
+          :src="trainingTitleIcon"
+          mode="aspectFit"
+        />
+      <view v-if="countdownEnabled" class="progress-card__track">
+        <view
+          class="progress-card__fill"
+          :style="{
+            width: `${progressPercent}%`,
+            backgroundColor: barColor,
+            right: tips.includes('红队') ? 0 : 'unset',
+            transition: transitionStyle,
+          }"
+        />
+        <view class="progress-card__badge">
+          <text class="progress-card__badge-text">剩余{{ remain }}秒</text>
+        </view>
+      </view>
+      <!-- <text v-if="tipContent" class="progress-card__tip">{{ tipContent }}123</text> -->
+    </view>
+  </view>
+</template>
+
+<style scoped>
+.progress-card {
+  box-sizing: border-box;
+  /* padding: 50rpx 30rpx 0 30rpx; */
+  margin: 70rpx 30rpx 0 30rpx;
+}
+
+.progress-card__header {
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+}
+
+.progress-card__profile {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+}
+
+.progress-card__avatar-shell {
+  width: 86rpx;
+  height: 86rpx;
+  padding: 3rpx;
+  box-sizing: border-box;
+  border-radius: 50%;
+  background: linear-gradient(180deg, rgba(255, 209, 153, 1), rgba(162, 119, 55, 1));
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.progress-card__avatar {
+  width: 100%;
+  height: 100%;
+  display: block;
+  border-radius: 50%; 
+}
+
+.progress-card__name {
+  width: 86rpx;
+  color: #fff;
+  font-size: 18rpx;
+  line-height: 1;
+  justify-content: center;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  text-align: center;
+  margin-top: 10rpx;
+}
+
+.progress-card__sound {
+  width: 68rpx;
+  height: 68rpx;
+  margin: 0;
+  padding: 0;
+  border: none;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: rgba(28, 24, 21, 0.72);
+  box-shadow: 0 8rpx 18rpx rgba(0, 0, 0, 0.18);
+}
+
+.progress-card__sound::after {
+  border: none;
+}
+
+.progress-card__sound-icon {
+  width: 34rpx;
+  height: 34rpx;
+}
+
+.progress-card__track-wrap {
+  margin-top: -156rpx;
+  padding-left: 102rpx;
+}
+
+.progress-card__titile{
+  width: 260rpx;
+  height: 72rpx;
+  margin-left: 110rpx;
+}
+
+.progress-card__track {
+  position: relative;
+  width: 100%;
+  height: 24rpx;
+  border-radius: 18rpx;
+  overflow: hidden;
+  background: #444444;
+}
+
+.progress-card__fill {
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  border-radius: 18rpx;
+  background: linear-gradient( 133deg, #FFD19A 0%, #A17636 100%);
+}
+
+.progress-card__badge {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  min-width: 156rpx;
+  height: 40rpx;
+  padding: 0 24rpx;
+  box-sizing: border-box;
+  border-radius: 999rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  /* background: rgba(164, 117, 47, 0.94); */
+  /* box-shadow: 0 4rpx 10rpx rgba(76, 45, 7, 0.22); */
+}
+
+.progress-card__badge-text {
+  color: #fff7de;
+  font-size: 18rpx;
+  line-height: 1;
+  white-space: nowrap;
+}
+
+.progress-card__tip {
+  display: block;
+  margin-top: 16rpx;
+  color: rgba(255, 243, 216, 0.88);
+  font-size: 24rpx;
+  line-height: 1.4;
+  text-align: center;
+}
+</style>
diff --git a/src/pages/training/components/TestDistance.vue b/src/pages/training/components/TestDistance.vue
new file mode 100644
index 0000000..2c43ade
--- /dev/null
+++ b/src/pages/training/components/TestDistance.vue
@@ -0,0 +1,200 @@
+<script setup>
+import { ref, onMounted, onBeforeUnmount } from "vue";
+import Guide from "@/components/Guide.vue";
+import BowPower from "@/components/BowPower.vue";
+import Avatar from "@/components/Avatar.vue";
+import audioManager from "@/audioManager";
+import { simulShootAPI } from "@/apis";
+import { MESSAGETYPESV2 } from "@/constants";
+import useStore from "@/store";
+import { storeToRefs } from "pinia";
+const store = useStore();
+const { user, device } = storeToRefs(store);
+const props = defineProps({
+  guide: {
+    type: Boolean,
+    default: true,
+  },
+  isBattle: {
+    type: Boolean,
+    default: false,
+  },
+  count: {
+    type: Number,
+    default: 15,
+  },
+  targetType: {
+    type: [Number, String],
+    default: "",
+  },
+});
+const arrow = ref({});
+const distance = ref(0);
+const showsimul = ref(false);
+const count = ref(props.count);
+const timer = ref(null);
+
+const updateTimer = (value) => {
+  count.value = Math.round(value);
+};
+onMounted(() => {
+  audioManager.play("请射箭测试距离");
+  if (props.isBattle) {
+    timer.value = setInterval(() => {
+      count.value -= 1;
+      if (count.value < 0) clearInterval(timer.value);
+    }, 1000);
+  }
+  uni.$on("update-timer", updateTimer);
+});
+onBeforeUnmount(() => {
+  if (timer.value) clearInterval(timer.value);
+  uni.$off("update-timer", updateTimer);
+});
+
+async function onReceiveMessage(msg) {
+  if (Array.isArray(msg)) return;
+  if (msg.type === MESSAGETYPESV2.TestDistance) {
+    distance.value = Number((msg.shootData.distance / 100).toFixed(2));
+    if (distance.value >= 5) audioManager.play("距离合格");
+    else audioManager.play("距离不足");
+  }
+}
+
+const simulShoot = async () => {
+  if (device.value.deviceId) await simulShootAPI(device.value.deviceId);
+};
+
+onMounted(() => {
+  uni.$on("socket-inbox", onReceiveMessage);
+  const accountInfo = uni.getAccountInfoSync();
+  const envVersion = accountInfo.miniProgram.envVersion;
+  if (envVersion !== "release") showsimul.value = true;
+});
+
+onBeforeUnmount(() => {
+  uni.$off("socket-inbox", onReceiveMessage);
+});
+</script>
+
+<template>
+  <view class="container">
+    <view class="test-area">
+      <image
+        class="text-bg"
+        src="https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/par-bg.png"
+        mode="widthFix"
+      />
+      <button
+        class="simul"
+        @click="simulShoot"
+        hover-class="none"
+        v-if="showsimul"
+      >
+        模拟射箭
+      </button>
+      <view class="warnning-text">
+        <view class="target-tip">当前靶子为<text class="text-yellow">{{ targetType }}cm</text>全环靶,请更换靶子</view>
+        <block v-if="distance > 0">
+          <text>当前距离<text class="text-yellow">{{ distance }}</text>米</text>
+          <text v-if="distance >= 5">已达到距离要求</text>
+          <text v-else>请调整站位</text>
+        </block>
+        <block v-else>
+          <text>请射箭，测试站距</text>
+        </block>
+      </view>
+      <view class="user-row">
+        <Avatar :src="user.avatar" :size="35" />
+        <BowPower />
+      </view>
+    </view>
+    <view v-if="isBattle" class="ready-timer">
+      <image src="../../../static/test-tip.png" mode="widthFix" />
+      <view v-if="count >= 0">
+        <text>距离正式比赛还有</text>
+        <text>{{ count }}</text>
+        <text>秒</text>
+      </view>
+      <view v-else> 进入中... </view>
+    </view>
+  </view>
+</template>
+
+<style scoped>
+.container {
+  width: 100vw;
+  max-height: 70vh;
+}
+.ready-timer {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  transform: translateY(-10vw);
+}
+.ready-timer > image:first-child {
+  width: 40%;
+}
+.ready-timer > view {
+  width: 80%;
+  height: 45px;
+  background-color: #545454;
+  border-radius: 30px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  transform: translateY(-8vw);
+  color: #bebebe;
+  font-size: 15px;
+}
+.ready-timer > view > text:nth-child(2) {
+  color: #fed847;
+  font-size: 20px;
+  width: 22px;
+  text-align: center;
+}
+.test-area {
+  width: 100%;
+  height: auto;
+  position: relative;
+}
+
+.text-bg {
+  width: 100%;
+  position: relative;
+}
+.warnning-text {
+  color: #fff;
+  display: flex;
+  flex-direction: column;
+  height: 200rpx;
+  position: absolute;
+  top: 142rpx;
+  left: 0;
+  width: 100%;
+  font-size: 36rpx;
+  text-align: center;
+}
+.target-tip{
+  margin-bottom: 28rpx;
+}
+.text-yellow{
+  color: #FED847;
+}
+.simul {
+  position: absolute;
+  color: #fff;
+  right: 10px;
+  top: 30rpx;
+}
+.user-row{
+  position: absolute;
+  bottom: 34rpx;
+  left: 0rpx;
+  width: 100%;
+  padding: 0 34rpx;
+  box-sizing: border-box;
+}
+
+
+</style>
diff --git a/src/pages/training/components/TrainingDifficultyBadge.vue b/src/pages/training/components/TrainingDifficultyBadge.vue
new file mode 100644
index 0000000..5398582
--- /dev/null
+++ b/src/pages/training/components/TrainingDifficultyBadge.vue
@@ -0,0 +1,327 @@
+<script setup>
+import { computed } from "vue";
+
+const lockedBadgeBackground =
+  "https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/unlock.svg";
+const unlockedBadgeBackground =
+  "https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/lock.svg";
+
+const props = defineProps({
+  node: {
+    type: Object,
+    required: true,
+  },
+  active: {
+    type: Boolean,
+    default: false,
+  },
+  completedProgress: {
+    type: Number,
+    default: 0,
+  },
+  locked: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+const emit = defineEmits(["click"]);
+
+const badgeStyle = computed(() => {
+  const { left, top } = props.node.style || {};
+
+  return {
+    left,
+    top,
+  };
+});
+
+const progressValue = computed(() => {
+  const value = Number(props.completedProgress);
+
+  if (!Number.isFinite(value)) return 0;
+
+  return Math.max(0, Math.min(100, value));
+});
+
+const badgeStateStyle = computed(() => {
+  const label = String(props.node?.label || "");
+  const estimatedLabelWidthRpx = Math.max(36, label.length * 14);
+  const labelCircleSizeRpx = Math.max(58, estimatedLabelWidthRpx + 18);
+  const badgeSizeRpx = Math.max(
+    124,
+    Math.round(labelCircleSizeRpx / 0.4727)
+  );
+
+  return {
+    "--badge-progress": progressValue.value,
+    "--badge-size": `${badgeSizeRpx}rpx`,
+    "--badge-label-size": `${labelCircleSizeRpx}rpx`,
+    "--badge-orbit-offset": "12rpx",
+    "--badge-locked-ring-offset": "12rpx",
+  };
+});
+
+const showProgress = computed(() => {
+  return !props.locked;
+});
+
+const badgeFillSrc = computed(() => {
+  return props.locked ? lockedBadgeBackground : unlockedBadgeBackground;
+});
+
+const handleClick = () => {
+  emit("click", props.node);
+};
+</script>
+
+<template>
+  <view
+    class="difficulty-badge"
+    :class="{
+      'difficulty-badge--active': active,
+      'difficulty-badge--progress': showProgress,
+      'difficulty-badge--locked': locked,
+    }"
+    :style="[badgeStyle, badgeStateStyle]"
+    @click="handleClick"
+  >
+    <view class="difficulty-badge__fill">
+      <image class="difficulty-badge__bg" :src="badgeFillSrc" mode="aspectFit" />
+      <view v-if="active" class="difficulty-badge__active-orbit">
+        <view
+          class="difficulty-badge__active-triangle difficulty-badge__active-triangle--top"
+        ></view>
+        <view
+          class="difficulty-badge__active-triangle difficulty-badge__active-triangle--right"
+        ></view>
+        <view
+          class="difficulty-badge__active-triangle difficulty-badge__active-triangle--bottom"
+        ></view>
+        <view
+          class="difficulty-badge__active-triangle difficulty-badge__active-triangle--left"
+        ></view>
+      </view>
+      <view class="difficulty-badge__label-wrap">
+        <view class="difficulty-badge__label">{{ node.label }}</view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<style scoped>
+.difficulty-badge,
+.difficulty-badge__fill,
+.difficulty-badge__label-wrap {
+  box-sizing: border-box;
+}
+
+.difficulty-badge {
+  position: absolute;
+  transform: translate(-50%, -50%);
+  z-index: 2;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  transition: transform 0.2s ease, opacity 0.2s ease;
+}
+
+.difficulty-badge--active {
+  transform: translate(-50%, -50%) scale(1.04);
+}
+
+.difficulty-badge--active::before {
+  content: "";
+  position: absolute;
+  inset: calc(var(--badge-orbit-offset) * -1);
+  border: 4rpx solid transparent;
+  border-radius: 50%;
+  pointer-events: none;
+  box-sizing: border-box;
+}
+
+.difficulty-badge--active::after {
+  content: "";
+  position: absolute;
+  inset: -24rpx;
+  border: 4rpx solid rgba(254, 208, 152, 0.96);
+  border-radius: 50%;
+  box-shadow: inset 0 0 10rpx rgba(254, 208, 152, 0.88),
+    inset 0 0 22rpx rgba(254, 208, 152, 0.32),
+    0 0 14rpx rgba(254, 208, 152, 0.92),
+    0 0 32rpx rgba(254, 208, 152, 0.52),
+    0 0 52rpx rgba(254, 208, 152, 0.22);
+  pointer-events: none;
+  box-sizing: border-box;
+}
+
+.difficulty-badge__active-orbit {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  width: calc(100% + var(--badge-orbit-offset) * 2);
+  height: calc(100% + var(--badge-orbit-offset) * 2);
+  border-radius: 50%;
+  z-index: 3;
+  pointer-events: none;
+  transform: translate(-50%, -50%);
+  animation: badge-orbit-spin 5.4s linear infinite;
+  transform-origin: center;
+}
+
+.difficulty-badge__active-triangle {
+  position: absolute;
+  width: 0;
+  height: 0;
+  border-style: solid;
+  z-index: 2;
+  pointer-events: none;
+  opacity: 0.92;
+  filter: drop-shadow(0 0 8rpx rgba(255, 255, 255, 0.45));
+}
+
+.difficulty-badge__active-triangle--top {
+  top: -3rpx;
+  left: 50%;
+  transform: translateX(-50%);
+  border-width: 11rpx 8rpx 0 8rpx;
+  border-color: #ffffff transparent transparent transparent;
+}
+
+.difficulty-badge__active-triangle--right {
+  right: -3rpx;
+  top: 50%;
+  transform: translateY(-50%);
+  border-width: 8rpx 11rpx 8rpx 0;
+  border-color: transparent #ffffff transparent transparent;
+}
+
+.difficulty-badge__active-triangle--bottom {
+  bottom: -3rpx;
+  left: 50%;
+  transform: translateX(-50%);
+  border-width: 0 8rpx 11rpx 8rpx;
+  border-color: transparent transparent #ffffff transparent;
+}
+
+.difficulty-badge__active-triangle--left {
+  left: -3rpx;
+  top: 50%;
+  transform: translateY(-50%);
+  border-width: 8rpx 0 8rpx 11rpx;
+  border-color: transparent transparent transparent #ffffff;
+}
+
+.difficulty-badge__fill {
+  width: var(--badge-size);
+  height: var(--badge-size);
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 50%;
+}
+
+.difficulty-badge__bg {
+  position: absolute;
+  inset: 0;
+  width: 100%;
+  height: 100%;
+  display: block;
+  z-index: 1;
+}
+
+.difficulty-badge--active .difficulty-badge__fill::before,
+.difficulty-badge--active .difficulty-badge__fill::after {
+  content: none;
+}
+
+.difficulty-badge--progress .difficulty-badge__fill::before,
+.difficulty-badge--progress .difficulty-badge__fill::after {
+  content: "";
+  position: absolute;
+  inset: -12rpx;
+  padding: 6rpx;
+  border-radius: inherit;
+  -webkit-mask: linear-gradient(#fff 0 0) content-box,
+    linear-gradient(#fff 0 0);
+  -webkit-mask-composite: xor;
+  mask: linear-gradient(#fff 0 0) content-box, linear-gradient(#fff 0 0);
+  mask-composite: exclude;
+  pointer-events: none;
+}
+
+.difficulty-badge--progress .difficulty-badge__fill::before {
+  background: rgba(255, 255, 255, 0.35);
+}
+
+.difficulty-badge--progress .difficulty-badge__fill::after {
+  background: conic-gradient(
+    from -90deg,
+    rgba(254, 208, 152, 1) 0,
+    rgba(255, 229, 198, 1) calc(var(--badge-progress) * 1%),
+    transparent calc(var(--badge-progress) * 1%) 100%
+  );
+}
+
+.difficulty-badge--active .difficulty-badge__label,
+.difficulty-badge--progress .difficulty-badge__label {
+  color: #333333;
+}
+
+.difficulty-badge--locked {
+  opacity: 1;
+}
+
+.difficulty-badge--locked::before {
+  content: "";
+  position: absolute;
+  inset: calc(var(--badge-locked-ring-offset) * -1);
+  border: 2rpx solid rgba(160, 160, 160, 0.5);
+  border-radius: 50%;
+  pointer-events: none;
+  box-sizing: border-box;
+}
+
+.difficulty-badge--locked .difficulty-badge__label {
+  color: rgba(51, 51, 51, 0.54);
+}
+
+.difficulty-badge__label-wrap {
+  width: var(--badge-label-size);
+  height: var(--badge-label-size);
+  border-radius: 50%;
+  position: relative;
+  z-index: 2;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: -5rpx;
+}
+
+.difficulty-badge__label {
+  color: rgba(51, 51, 51, 0.7);
+  font-size: 24rpx;
+  max-width: 100%;
+  height: 34rpx;
+  line-height: 34rpx;
+  font-family: "PingFang SC", sans-serif;
+  font-weight: 600;
+  text-align: center;
+  white-space: nowrap;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  overflow: hidden;
+}
+
+@keyframes badge-orbit-spin {
+  from {
+    transform: translate(-50%, -50%) rotate(0deg);
+  }
+
+  to {
+    transform: translate(-50%, -50%) rotate(360deg);
+  }
+}
+</style>
diff --git a/src/pages/training/components/TrainingDifficultyPreviewCard.vue b/src/pages/training/components/TrainingDifficultyPreviewCard.vue
new file mode 100644
index 0000000..9271672
--- /dev/null
+++ b/src/pages/training/components/TrainingDifficultyPreviewCard.vue
@@ -0,0 +1,91 @@
+<script setup>
+import { computed } from "vue";
+
+const props = defineProps({
+  title: {
+    type: String,
+    default: "",
+  },
+  lines: {
+    type: Array,
+    default: () => [],
+  },
+});
+
+const previewLines = computed(() => {
+  return props.lines.map((line) => String(line || "").trim()).filter(Boolean);
+});
+</script>
+
+<template>
+  <view class="difficulty-preview">
+    <image
+      class="difficulty-preview__bg"
+      src="https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/text.png"
+      mode="widthFix"
+    />
+    <view class="difficulty-preview__content">
+      <text class="difficulty-preview__title">{{ title }}</text>
+      <view class="difficulty-preview__copy">
+        <text
+          v-for="(line, index) in previewLines"
+          :key="`${line}-${index}`"
+          class="difficulty-preview__line"
+        >
+          {{ line }}
+        </text>
+      </view>
+    </view>
+  </view>
+</template>
+
+<style scoped>
+.difficulty-preview {
+  position: relative;
+  width: 100%;
+}
+
+.difficulty-preview__bg {
+  display: block;
+  width: 100%;
+}
+
+.difficulty-preview__content {
+  position: absolute;
+  top: 0;
+  left: 40rpx;
+  box-sizing: border-box;
+  width: 486rpx;
+  height: 93%;
+  display: flex;
+  flex-direction: column;
+  align-content: center;
+  justify-content: center;
+}
+
+.difficulty-preview__title {
+  display: block;
+  color: #ffd543;
+  font-size: 24rpx;
+  line-height: 34rpx;
+  font-family: "PingFang SC", sans-serif;
+  text-align: center;
+}
+
+.difficulty-preview__copy {
+  width: 80%;
+  margin: 0 auto;
+  display: block;
+  color: #ffffff;
+  font-size: 24rpx;
+  line-height: 34rpx;
+  font-family: "PingFang SC", sans-serif;
+  text-align: center;
+}
+
+.difficulty-preview__line {
+  display: block;
+}
+
+
+</style>
diff --git a/src/pages/training/components/TrainingDifficultyStartButton.vue b/src/pages/training/components/TrainingDifficultyStartButton.vue
new file mode 100644
index 0000000..164d9b4
--- /dev/null
+++ b/src/pages/training/components/TrainingDifficultyStartButton.vue
@@ -0,0 +1,81 @@
+<script setup>
+const props = defineProps({
+  text: {
+    type: String,
+    default: "开始",
+  },
+});
+
+const emit = defineEmits(["click"]);
+
+const handleClick = () => {
+  emit("click");
+};
+</script>
+
+<template>
+  <button
+    class="difficulty-start"
+    hover-class="difficulty-start--hover"
+    @click="handleClick"
+  >
+    <image
+      class="difficulty-start__button"
+      src="https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/btn.png"
+      mode="widthFix"
+    />
+  </button>
+</template>
+
+<style scoped>
+.difficulty-start {
+  position: relative;
+  width: 302rpx;
+  height: 170rpx;
+  padding: 0;
+  border: 0;
+  background: transparent;
+  margin: 0 auto;
+}
+
+.difficulty-start::after {
+  border: 0;
+}
+
+.difficulty-start--hover {
+  transform: translateY(2rpx) scale(0.99);
+}
+
+.difficulty-start__mascot {
+  position: absolute;
+  left: 50%;
+  top: 0;
+  z-index: 1;
+  width: 112rpx;
+  transform: translateX(-50%);
+}
+
+.difficulty-start__button {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 2;
+  width: 100%;
+}
+
+.difficulty-start__text {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 58rpx;
+  z-index: 3;
+  color: #9f4d00;
+  font-size: 64rpx;
+  line-height: 76rpx;
+  text-align: center;
+  font-family: "AlimamaShuHeiTi-Bold", "PingFang SC", sans-serif;
+  font-weight: 800;
+  text-shadow: 0 3rpx 0 rgba(255, 245, 205, 0.78);
+}
+</style>
diff --git a/src/pages/training/difficulty.vue b/src/pages/training/difficulty.vue
new file mode 100644
index 0000000..fb6b9d2
--- /dev/null
+++ b/src/pages/training/difficulty.vue
@@ -0,0 +1,904 @@
+<script setup>
+import { computed, nextTick, ref } from "vue";
+import { onHide, onLoad, onShow } from "@dcloudio/uni-app";
+import Container from "@/components/Container.vue";
+import TrainingDifficultyBadge from "./components/TrainingDifficultyBadge.vue";
+import TrainingDifficultyPreviewCard from "./components/TrainingDifficultyPreviewCard.vue";
+import TrainingDifficultyStartButton from "./components/TrainingDifficultyStartButton.vue";
+import audioManager from "@/audioManager";
+import {
+  createPractiseV2API,
+  endPractiseAPI,
+  getTrainingDifficultyListAPI,
+} from "@/apis";
+
+// 难度页接口数据源：
+// 1. 接口：GET /training/difficulty/list?type=base/endurance/precision/rhythm
+// 2. 当前进度：接口 user_levels / list.completed，路由参数可覆盖选中难度
+const trainingDifficultyStorageKey = "training-selection";
+const defaultTrainingType = "precision";
+const defaultUnlockedDifficultyId = "lv1";
+const trainingTypeMetaMap = {
+  base: {
+    key: "base",
+    title: "基础训练",
+  },
+  endurance: {
+    key: "endurance",
+    title: "耐力训练",
+  },
+  precision: {
+    key: "precision",
+    title: "精准训练",
+  },
+  rhythm: {
+    key: "rhythm",
+    title: "节奏训练",
+  },
+};
+const routeModeTypeMap = {
+  basic: "base",
+  base: "base",
+  endurance: "endurance",
+  precision: "precision",
+  rhythm: "rhythm",
+};
+const defaultTargetType = 1;
+
+const resolveTrainingType = (mode) => {
+  const normalizedMode = String(mode || "").toLowerCase();
+  return routeModeTypeMap[normalizedMode] || defaultTrainingType;
+};
+
+const createDifficultyId = (level) => `lv${level}`;
+
+const toNumber = (value, fallback = 0) => {
+  const numberValue = Number(value);
+  return Number.isFinite(numberValue) ? numberValue : fallback;
+};
+
+const clampProgress = (value) => {
+  return Math.min(Math.max(value, 0), 100);
+};
+
+const getDifficultyProgress = (item = {}) => {
+  const completedCnt = toNumber(item.completed_cnt);
+  const promoteCnt = toNumber(item.promote_cnt);
+
+  if (item.completed) {
+    return 100;
+  }
+
+  if (promoteCnt <= 0) {
+    return 0;
+  }
+
+  return clampProgress(Math.round((completedCnt / promoteCnt) * 100));
+};
+
+const checkDifficultyCompleted = (item = {}) => {
+  const completedCnt = toNumber(item.completed_cnt);
+  const promoteCnt = toNumber(item.promote_cnt);
+
+  return Boolean(item.completed) || (promoteCnt > 0 && completedCnt >= promoteCnt);
+};
+
+const getDifficultyModeText = (mode) => {
+  return Number(mode) === 1 ? "随机区域+指定环数" : "随机区域命中";
+};
+
+const createEmptyModeConfig = (type = defaultTrainingType) => {
+  const meta = trainingTypeMetaMap[type] || trainingTypeMetaMap[defaultTrainingType];
+
+  return {
+    key: meta.key,
+    title: meta.title,
+    nodes: [],
+    details: {},
+    activeDifficultyId: defaultUnlockedDifficultyId,
+    progressMap: {},
+  };
+};
+
+const createDifficultySummary = (item = {}) => {
+  const desc = String(item.desc || "").trim();
+  const type = item.type;
+  const arrows = toNumber(item.arrows);
+  const timeLimit = toNumber(item.time_limit);
+  const hitReq = toNumber(item.hit_req);
+  const totalReq = toNumber(item.total_req);
+  const blocks = toNumber(item.blocks);
+  const promoteCnt = toNumber(item.promote_cnt);
+  const timeText = timeLimit > 0 ? `${timeLimit}秒内完成` : "不限时完成";
+  const promoteText = promoteCnt > 0 ? `完成${promoteCnt}次晋级` : "";
+
+  const summaryMap = {
+    base: [
+      desc || (hitReq > 0 ? `每箭命中${hitReq}环以上` : "上靶即可"),
+      [`${arrows}箭`, promoteText].filter(Boolean).join(" · "),
+    ],
+    endurance: [
+      desc || `${timeText}${arrows}箭`,
+      [`累计${totalReq}环`, promoteText].filter(Boolean).join(" · "),
+    ],
+    precision: [
+      desc || `命中${blocks}个指定区域`,
+      [
+        `${arrows}箭`,
+        timeText,
+        getDifficultyModeText(item.mode),
+        promoteText,
+      ]
+        .filter(Boolean)
+        .join(" · "),
+    ],
+    rhythm: [
+      desc || `间隔${timeLimit}秒射击`,
+      [
+        `${arrows}箭`,
+        hitReq > 0 ? `每箭${hitReq}环以上` : "上靶即可",
+        getDifficultyModeText(item.mode),
+        promoteText,
+      ]
+        .filter(Boolean)
+        .join(" · "),
+    ],
+  };
+
+  return (summaryMap[type] || [desc]).filter(Boolean);
+};
+
+const normalizeTrainingDifficultyConfig = (result, type) => {
+  const meta = trainingTypeMetaMap[type] || trainingTypeMetaMap[defaultTrainingType];
+  const list = Array.isArray(result?.list) ? result.list : [];
+  const rawItems = list.filter((item) => !item?.type || item.type === meta.key);
+  const difficultyItems = rawItems
+    .map((item) => {
+      const level = toNumber(item?.difficulty);
+
+      if (level <= 0) {
+        return null;
+      }
+
+      const id = createDifficultyId(level);
+      const label = `Lv${level}`;
+
+      return {
+        ...item,
+        recordId: item.id,
+        completedCnt: toNumber(item.completed_cnt),
+        promoteCnt: toNumber(item.promote_cnt),
+        id,
+        level,
+        label,
+        title: `${label}难度`,
+        summary: createDifficultySummary(item),
+        startText: "开始",
+        targetPaperType: "20CM全环靶",
+      };
+    })
+    .filter(Boolean)
+    .sort((first, second) => first.level - second.level);
+  const maxLevel = difficultyItems.reduce(
+    (currentMax, item) => Math.max(currentMax, item.level),
+    0
+  );
+  const completedLevelFromList = difficultyItems.reduce((currentMax, item) => {
+    return checkDifficultyCompleted(item)
+      ? Math.max(currentMax, item.level)
+      : currentMax;
+  }, 0);
+  const userCompletedLevel = toNumber(result?.user_levels?.[meta.key]);
+  const highestCompletedLevel = userCompletedLevel || completedLevelFromList;
+  const unlockedLevel = maxLevel
+    ? Math.min(Math.max(highestCompletedLevel + 1, 1), maxLevel)
+    : 1;
+
+  return {
+    key: meta.key,
+    title: meta.title,
+    nodes: difficultyItems.map((item) => ({
+      id: item.id,
+      label: item.label,
+    })),
+    details: Object.fromEntries(
+      difficultyItems.map((item) => [item.id, item])
+    ),
+    activeDifficultyId: createDifficultyId(unlockedLevel),
+    progressMap: Object.fromEntries(
+      difficultyItems.map((item) => [item.id, getDifficultyProgress(item)])
+    ),
+  };
+};
+
+// 难度轴布局参数，节点按“等级越低越靠下”的方式排列。
+const nodesLayout = {
+  viewportHeightRpx: 1020,
+  topPaddingRpx: 136,
+  bottomPaddingRpx: 144,
+  verticalGapRpx: 188,
+  anchorOffsetRpx: 796,
+  horizontalPatternRpx: [388, 232, 516, 258, 458, 304],
+  nearHorizontalDistanceRpx: 170,
+  extraGapScale: 0.5,
+};
+
+const emptyDifficulty = {
+  id: "",
+  label: "",
+  title: "",
+  summary: [],
+  startText: "开始",
+  targetPaperType: "",
+};
+
+// 页面基础状态
+const pageConfig = ref(createEmptyModeConfig(defaultTrainingType));
+const unlockedDifficultyId = ref(defaultUnlockedDifficultyId);
+const selectedDifficultyId = ref(defaultUnlockedDifficultyId);
+const nodesScrollTop = ref(0);
+const nodesScrollWithAnimation = ref(false);
+const routeOptions = ref({});
+const shouldRefreshOnShow = ref(false);
+const creatingPractice = ref(false);
+let pageStateRequestGeneration = 0;
+
+const difficultyProgressMap = computed(() => {
+  return pageConfig.value?.progressMap || {};
+});
+
+const clamp = (value, min, max) => {
+  return Math.min(Math.max(value, min), max);
+};
+
+// 从 lv1 / lv20 这类 id 中提取等级数值，统一用于排序、解锁判断和进度比较。
+const getDifficultyLevel = (difficultyId = "") => {
+  const matched = String(difficultyId).match(/\d+/);
+  return matched ? Number(matched[0]) : 0;
+};
+
+// 合并节点基础信息和难度详情，并统一按等级升序整理。
+const createDifficultyNodes = (config) => {
+  const details = config?.details || {};
+  const rawNodes = Array.isArray(config?.nodes) ? config.nodes : [];
+  const nodeMap = new Map(rawNodes.map((node) => [node.id, node]));
+  const difficultyIds = new Set([
+    ...rawNodes.map((node) => node.id),
+    ...Object.keys(details),
+  ]);
+
+  return Array.from(difficultyIds)
+    .map((difficultyId) => {
+      const level = getDifficultyLevel(difficultyId);
+      const node = nodeMap.get(difficultyId) || {};
+      const detail = details[difficultyId] || {};
+      const label = node.label || detail.label || `Lv${level || ""}`;
+
+      return {
+        ...node,
+        ...detail,
+        id: difficultyId,
+        level,
+        label,
+        title: detail.title || `${label}难度`,
+        summary: Array.isArray(detail.summary) ? detail.summary : [],
+        startText: detail.startText || "开始",
+        targetPaperType: detail.targetPaperType || "",
+      };
+    })
+    .filter((node) => node.id && node.level > 0)
+    .sort((first, second) => first.level - second.level);
+};
+
+const findValidDifficultyId = (difficultyId, nodes) => {
+  return nodes.some((node) => node.id === difficultyId) ? difficultyId : "";
+};
+
+const getNextDifficultyId = (difficultyId, nodes) => {
+  const currentLevel = getDifficultyLevel(difficultyId);
+  return (
+    nodes.find((node) => node.level === currentLevel + 1)?.id || difficultyId
+  );
+};
+
+// 统一解析当前最新已解锁难度：
+// completedDifficultyId 优先级最高，可在完成当前难度后自动推进到下一关。
+const resolveUnlockedDifficultyId = (options, config, nodes) => {
+  const completedDifficultyId = findValidDifficultyId(
+    options.completedDifficultyId,
+    nodes
+  );
+
+  if (completedDifficultyId) {
+    return getNextDifficultyId(completedDifficultyId, nodes);
+  }
+
+  return (
+    [
+      options.currentDifficultyId,
+      options.latestDifficultyId,
+      options.activeDifficultyId,
+      config.activeDifficultyId,
+      defaultUnlockedDifficultyId,
+    ].find((difficultyId) => findValidDifficultyId(difficultyId, nodes)) ||
+    nodes[0]?.id ||
+    defaultUnlockedDifficultyId
+  );
+};
+
+// 如果传入的默认选中项尚未解锁，则自动回退到当前最新已解锁难度。
+const resolveSelectedDifficultyId = (difficultyId, nodes, currentUnlockedId) => {
+  const safeDifficultyId = findValidDifficultyId(difficultyId, nodes);
+
+  if (!safeDifficultyId) {
+    return currentUnlockedId;
+  }
+
+  return getDifficultyLevel(safeDifficultyId) <=
+    getDifficultyLevel(currentUnlockedId)
+    ? safeDifficultyId
+    : currentUnlockedId;
+};
+
+// 页面渲染使用的难度节点列表，包含纵向轨道坐标。
+const difficultyNodes = computed(() => {
+  const nodes = createDifficultyNodes(pageConfig.value);
+  const leftPositions = nodes.map((_, index) => {
+    return nodesLayout.horizontalPatternRpx[
+      index % nodesLayout.horizontalPatternRpx.length
+    ];
+  });
+  const offsetsFromBottom = [];
+  let accumulatedOffsetRpx = 0;
+
+  nodes.forEach((node, index) => {
+    if (index > 0) {
+      const previousLeftRpx = leftPositions[index - 1];
+      const currentLeftRpx = leftPositions[index];
+      const horizontalDistanceRpx = Math.abs(currentLeftRpx - previousLeftRpx);
+      const extraGapRpx =
+        Math.max(
+          0,
+          nodesLayout.nearHorizontalDistanceRpx - horizontalDistanceRpx
+        ) * nodesLayout.extraGapScale;
+
+      accumulatedOffsetRpx +=
+        nodesLayout.verticalGapRpx + Math.round(extraGapRpx);
+    }
+
+    offsetsFromBottom.push(accumulatedOffsetRpx);
+  });
+
+  const contentHeightRpx = Math.max(
+    nodesLayout.viewportHeightRpx,
+    nodesLayout.topPaddingRpx +
+      nodesLayout.bottomPaddingRpx +
+      (offsetsFromBottom[offsetsFromBottom.length - 1] || 0)
+  );
+
+  return nodes.map((node, index) => {
+    const leftRpx = leftPositions[index];
+    const topRpx =
+      contentHeightRpx -
+      nodesLayout.bottomPaddingRpx -
+      offsetsFromBottom[index];
+
+    return {
+      ...node,
+      leftRpx,
+      topRpx,
+      style: {
+        left: `${leftRpx}rpx`,
+        top: `${topRpx}rpx`,
+      },
+    };
+  });
+});
+
+const difficultyConnectors = computed(() => {
+  const nodes = difficultyNodes.value;
+
+  return nodes.slice(1).map((currentNode, index) => {
+    const previousNode = nodes[index];
+    const startX = Number(previousNode?.leftRpx || 0);
+    const startY = Number(previousNode?.topRpx || 0);
+    const endX = Number(currentNode?.leftRpx || 0);
+    const endY = Number(currentNode?.topRpx || 0);
+    const midX = (startX + endX) / 2;
+    const midY = (startY + endY) / 2;
+    const angle =
+      (Math.atan2(endY - startY, endX - startX) * 180) / Math.PI + 90;
+
+    return {
+      id: `${previousNode.id}-${currentNode.id}`,
+      left: `${midX}rpx`,
+      top: `${midY}rpx`,
+      transform: `translate(-50%, -50%) rotate(${angle}deg)`,
+    };
+  });
+});
+
+const nodesTrackHeightRpx = computed(() => {
+  const bottomNode = difficultyNodes.value[0];
+
+  if (!bottomNode) {
+    return nodesLayout.viewportHeightRpx;
+  }
+
+  return Math.max(
+    nodesLayout.viewportHeightRpx,
+    bottomNode.topRpx + nodesLayout.bottomPaddingRpx
+  );
+});
+
+const nodesTrackStyle = computed(() => {
+  return {
+    height: `${nodesTrackHeightRpx.value}rpx`,
+  };
+});
+
+const selectedDifficulty = computed(() => {
+  return (
+    difficultyNodes.value.find((node) => node.id === selectedDifficultyId.value) ||
+    difficultyNodes.value[0] ||
+    emptyDifficulty
+  );
+});
+
+const targetTypeImageMap = {
+  20: "https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/20cm.png",
+  40: "https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/40cm.png",
+};
+
+// 根据接口返回的 target_type 展示当前难度使用的靶纸类型。
+const selectedTargetTypeImage = computed(() => {
+  return targetTypeImageMap[toNumber(selectedDifficulty.value?.target_type)] || "";
+});
+
+// 优先显示配置中的难度进度；没有配置时，再按已解锁等级推导完成态。
+const getCompletedDifficultyProgress = (node) => {
+  const configuredProgress = Number(difficultyProgressMap.value[node?.id]);
+
+  if (Number.isFinite(configuredProgress) && configuredProgress > 0) {
+    return configuredProgress;
+  }
+
+  return getDifficultyLevel(node?.id) < getDifficultyLevel(unlockedDifficultyId.value)
+    ? 100
+    : 0;
+};
+
+const checkDifficultyLocked = (node) => {
+  return getDifficultyLevel(node?.id) > getDifficultyLevel(unlockedDifficultyId.value);
+};
+
+// 根据目标难度计算 scroll-view 应滚动到的位置，顶部/底部会自动吸附边界。
+const scrollToDifficulty = (difficultyId, animated = false) => {
+  const node = difficultyNodes.value.find((item) => item.id === difficultyId);
+
+  if (!node) {
+    return;
+  }
+
+  const maxScrollRpx = Math.max(
+    nodesTrackHeightRpx.value - nodesLayout.viewportHeightRpx,
+    0
+  );
+  const targetScrollRpx = clamp(
+    node.topRpx - nodesLayout.anchorOffsetRpx,
+    0,
+    maxScrollRpx
+  );
+
+  nodesScrollWithAnimation.value = animated;
+  nodesScrollTop.value = uni.upx2px(targetScrollRpx);
+};
+
+// 首次进入页面需要静默定位到默认难度；
+// 定位完成后再开启滚动动画，避免第一次手动切换时丢失过渡效果。
+const initScrollPosition = () => {
+  scrollToDifficulty(selectedDifficultyId.value, false);
+
+  nextTick(() => {
+    nodesScrollWithAnimation.value = true;
+  });
+};
+
+const normalizeRouteOptions = (options = {}) => {
+  const difficultyLevel = toNumber(options.difficulty);
+  const completedDifficultyLevel = toNumber(options.completedDifficulty);
+
+  return {
+    ...options,
+    difficultyId:
+      options.difficultyId ||
+      (difficultyLevel > 0 ? createDifficultyId(difficultyLevel) : ""),
+    completedDifficultyId:
+      options.completedDifficultyId ||
+      (completedDifficultyLevel > 0
+        ? createDifficultyId(completedDifficultyLevel)
+        : ""),
+  };
+};
+
+const applyPageState = (options = {}, config) => {
+  const safeOptions = normalizeRouteOptions(options);
+  const nodes = createDifficultyNodes(config);
+  const currentUnlockedId = resolveUnlockedDifficultyId(
+    safeOptions,
+    config,
+    nodes
+  );
+
+  pageConfig.value = config;
+  unlockedDifficultyId.value = currentUnlockedId;
+  selectedDifficultyId.value = resolveSelectedDifficultyId(
+    safeOptions.difficultyId,
+    nodes,
+    currentUnlockedId
+  );
+
+  nextTick(() => {
+    initScrollPosition();
+  });
+};
+
+const initPageState = async (options = {}, refreshOptions = {}) => {
+  const requestGeneration = ++pageStateRequestGeneration;
+  const { keepCurrent = false } = refreshOptions;
+  const trainingType = resolveTrainingType(options.mode);
+  const fallbackConfig = createEmptyModeConfig(trainingType);
+
+  if (!keepCurrent) {
+    pageConfig.value = fallbackConfig;
+  }
+
+  try {
+    const result = await getTrainingDifficultyListAPI(trainingType);
+    if (requestGeneration !== pageStateRequestGeneration) {
+      return;
+    }
+
+    applyPageState(
+      options,
+      normalizeTrainingDifficultyConfig(result, trainingType)
+    );
+  } catch (error) {
+    if (requestGeneration !== pageStateRequestGeneration) {
+      return;
+    }
+
+    console.log("training difficulty load failed", error);
+    if (!keepCurrent) {
+      applyPageState(options, fallbackConfig);
+    }
+    uni.showToast({
+      title: "训练难度加载失败",
+      icon: "none",
+    });
+  }
+};
+
+const cleanQueryValue = (value) => {
+  if (value === undefined || value === null || value === "") {
+    return "";
+  }
+
+  if (typeof value === "number" && !Number.isFinite(value)) {
+    return "";
+  }
+
+  return value;
+};
+
+const createPracticeQuery = (difficulty) => {
+  const trainingType = pageConfig.value.key || defaultTrainingType;
+  const commonQuery = {
+    type: trainingType,
+    difficultyId: difficulty.id,
+    difficulty: difficulty.level,
+    recordId: difficulty.recordId,
+    arrows: toNumber(difficulty.arrows, 12),
+    target: defaultTargetType,
+  };
+  const typedQueryMap = {
+    base: {
+      hitReq: toNumber(difficulty.hit_req),
+    },
+    endurance: {
+      totalReq: toNumber(difficulty.total_req),
+    },
+    precision: {
+      blocks: toNumber(difficulty.blocks),
+      mode: toNumber(difficulty.mode),
+    },
+    rhythm: {
+      hitReq: toNumber(difficulty.hit_req),
+      mode: toNumber(difficulty.mode),
+    },
+  };
+
+  return {
+    ...commonQuery,
+    ...(typedQueryMap[trainingType] || {}),
+  };
+};
+
+const createPracticeUrl = (difficulty) => {
+  const query = Object.entries(createPracticeQuery(difficulty))
+    .map(([key, value]) => [key, cleanQueryValue(value)])
+    .filter(([, value]) => value !== "")
+    .map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`)
+    .join("&");
+
+  return `/pages/training/practise-one${query ? `?${query}` : ""}`;
+};
+
+const saveTrainingContext = (practice = {}) => {
+  const difficulty = selectedDifficulty.value;
+
+  if (!difficulty.id) {
+    return;
+  }
+
+  uni.setStorageSync(trainingDifficultyStorageKey, {
+    trainingType: pageConfig.value.key,
+    trainingTitle: pageConfig.value.title,
+    difficultyId: difficulty.id,
+    difficultyLabel: difficulty.label,
+    targetType: defaultTargetType,
+    targetPaperType: difficulty.targetPaperType,
+    practiceId: practice.id || "",
+    serverAddr: practice.serverAddr || "",
+    createdAt: practice.id ? Date.now() : 0,
+  });
+};
+
+const navigateToPractice = (url) => {
+  return new Promise((resolve, reject) => {
+    uni.navigateTo({
+      url,
+      success: resolve,
+      fail: reject,
+    });
+  });
+};
+
+const stopCreatedPractice = async (id) => {
+  if (!id) return;
+
+  try {
+    await endPractiseAPI(id);
+  } catch (error) {
+    console.error("training practice cleanup failed", error);
+  }
+};
+
+const handleSelectDifficulty = (node) => {
+  if (!node?.id) {
+    return;
+  }
+
+  if (checkDifficultyLocked(node)) {
+    uni.showToast({
+      title: "难度尚未解锁",
+      icon: "none",
+    });
+    return;
+  }
+
+  audioManager.play("点击按钮");
+
+  if (node.id === selectedDifficultyId.value) {
+    return;
+  }
+
+  selectedDifficultyId.value = node.id;
+  nextTick(() => {
+    scrollToDifficulty(node.id, true);
+  });
+};
+
+const handleStart = async () => {
+  if (!selectedDifficulty.value.id || creatingPractice.value) {
+    return;
+  }
+
+  const trainingType = pageConfig.value.key || defaultTrainingType;
+  const difficultyLevel = selectedDifficulty.value.level;
+  let createdPracticeId = "";
+
+  creatingPractice.value = true;
+
+  try {
+    // 先由业务接口创建训练和比赛服，再把连接上下文交给目标页。
+    const result = await createPractiseV2API(trainingType, difficultyLevel);
+    createdPracticeId = result?.id || "";
+
+    if (!createdPracticeId) {
+      saveTrainingContext();
+      uni.showToast({
+        title: "训练创建失败，请重试",
+        icon: "none",
+      });
+      return;
+    }
+
+    if (!String(result?.serverAddr || "").trim()) {
+      await stopCreatedPractice(createdPracticeId);
+      saveTrainingContext();
+      uni.showToast({
+        title: "练习连接信息异常，请重试",
+        icon: "none",
+      });
+      return;
+    }
+
+    saveTrainingContext(result);
+    await navigateToPractice(createPracticeUrl(selectedDifficulty.value));
+    createdPracticeId = "";
+  } catch (error) {
+    await stopCreatedPractice(createdPracticeId);
+    saveTrainingContext();
+    console.error("training practice create failed", error);
+
+    if (String(error?.errMsg || "").includes("navigateTo")) {
+      uni.showToast({
+        title: "进入训练失败，请重试",
+        icon: "none",
+      });
+    }
+  } finally {
+    creatingPractice.value = false;
+  }
+};
+
+onLoad((options = {}) => {
+  routeOptions.value = { ...options };
+  void initPageState(options);
+});
+
+onHide(() => {
+  shouldRefreshOnShow.value = true;
+});
+
+onShow(() => {
+  if (!shouldRefreshOnShow.value) return;
+
+  shouldRefreshOnShow.value = false;
+  void initPageState(routeOptions.value, {
+    keepCurrent: true,
+  });
+});
+</script>
+
+<template>
+  <Container
+    :title="pageConfig.title"
+    :bgType="8"
+    bgColor="#1c1c23"
+    :scroll="false"
+    :loading="creatingPractice"
+    loadingText="训练创建中..."
+  >
+    <view class="difficulty-page">
+      <view class="difficulty-page__nodes">
+        <scroll-view
+          class="difficulty-page__nodes-scroll"
+          scroll-y
+          enhanced
+          :scroll-top="nodesScrollTop"
+          :scroll-with-animation="nodesScrollWithAnimation"
+          :show-scrollbar="false"
+        >
+          <view class="difficulty-page__nodes-track" :style="nodesTrackStyle">
+            <image
+              v-for="connector in difficultyConnectors"
+              :key="connector.id"
+              class="difficulty-page__connector"
+              src="https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/jiantou.png"
+              mode="aspectFit"
+              :style="connector"
+            />
+            <TrainingDifficultyBadge
+              v-for="node in difficultyNodes"
+              :key="node.id"
+              :node="node"
+              :active="node.id === selectedDifficultyId"
+              :locked="checkDifficultyLocked(node)"
+              :completedProgress="getCompletedDifficultyProgress(node)"
+              @click="handleSelectDifficulty"
+            />
+          </view>
+        </scroll-view>
+      </view>
+
+      <view class="difficulty-page__preview">
+        <TrainingDifficultyPreviewCard
+          :title="selectedDifficulty.title"
+          :lines="selectedDifficulty.summary"
+        />
+        <image
+          v-if="selectedTargetTypeImage"
+          class="difficulty-page__target-type"
+          :src="selectedTargetTypeImage"
+          mode="aspectFit"
+        />
+      </view>
+
+      <view class="difficulty-page__start">
+        <TrainingDifficultyStartButton
+          :text="selectedDifficulty.startText"
+          @click="$clickSound(handleStart)"
+        />
+      </view>
+    </view>
+  </Container>
+</template>
+
+<style scoped>
+.difficulty-page {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  box-sizing: border-box;
+  padding: 18rpx 0 40rpx;
+  overflow: hidden;
+}
+
+.difficulty-page__nodes {
+  position: relative;
+  flex: 1;
+  min-height: 0;
+  z-index: 2;
+  margin-bottom: 8rpx;
+}
+
+.difficulty-page__nodes-scroll {
+  width: 100%;
+  height: 100%;
+}
+
+.difficulty-page__nodes-track {
+  position: relative;
+  width: 100%;
+  min-height: 100%;
+}
+
+.difficulty-page__connector {
+  position: absolute;
+  width: 18rpx;
+  height: 28rpx;
+  z-index: 1;
+  pointer-events: none;
+}
+
+.difficulty-page__preview {
+  position: relative;
+  flex: none;
+  z-index: 3;
+  width: 540rpx;
+  height: 172rpx;
+  margin: 0 auto;
+}
+
+.difficulty-page__target-type {
+  position: absolute;
+  top: 10rpx;
+  left: 2rpx;
+  z-index: 2;
+  width: 100rpx;
+  height: 74rpx;
+  pointer-events: none;
+}
+
+.difficulty-page__start {
+  position: relative;
+  flex: none;
+  z-index: 4;
+  width: 302rpx;
+  height: 190rpx;
+  margin: 0 auto;
+  top: -16rpx;
+}
+</style>
diff --git a/src/pages/training/index.vue b/src/pages/training/index.vue
new file mode 100644
index 0000000..3687fe0
--- /dev/null
+++ b/src/pages/training/index.vue
@@ -0,0 +1,983 @@
+<script setup>
+import { computed, nextTick, onMounted, ref } from "vue";
+import { onShow } from "@dcloudio/uni-app";
+import Container from "@/components/Container.vue";
+import TargetPicker from "@/components/TargetPicker.vue";
+import { getPersonalTrainingAPI } from "@/apis";
+
+const checkedIcon =
+  "https://static.shelingxingqiu.com/shootmini/static/training-home/done.png";
+const missedIcon =
+  "https://static.shelingxingqiu.com/shootmini/static/training-home/missed.png";
+// 后端训练项目 id 与难度页 mode 参数的映射关系。
+const trainingModeRouteMap = {
+  base: "basic",
+  endurance: "endurance",
+  precision: "precision",
+  rhythm: "rhythm",
+  strength: "power",
+};
+const unavailableTrainingIds = new Set(["rhythm", "strength"]);
+// 训练项目卡片右侧主图标。
+const trainingModeIconMap = {
+  base_bow:
+    "https://static.shelingxingqiu.com/shootmini/static/training-home/img_3.png",
+  bow: "https://static.shelingxingqiu.com/shootmini/static/training-home/img_4.png",
+  target:
+    "https://static.shelingxingqiu.com/shootmini/static/training-home/img_5.png",
+  wave: "https://static.shelingxingqiu.com/shootmini/static/training-home/img_6.png",
+  muscle:
+    "https://static.shelingxingqiu.com/shootmini/static/training-home/img_6.png",
+};
+// 训练项目卡片标题图，按接口 id 映射 CDN 资源。
+const trainingModeTitleImageMap = {
+  base:
+    "https://static.shelingxingqiu.com/shootmini/static/training-home/jichuxunlian.png",
+  endurance:
+    "https://static.shelingxingqiu.com/shootmini/static/training-home/nailixunlian.png",
+  precision:
+    "https://static.shelingxingqiu.com/shootmini/static/training-home/jingzhunxunlian.png",
+  rhythm:
+    "https://static.shelingxingqiu.com/shootmini/static/training-home/jiezouxunlian.png",
+  strength:
+    "https://static.shelingxingqiu.com/shootmini/static/training-home/liliangxulian.png",
+};
+const defaultWeekDays = ["周一", "周二", "周三", "周四", "周五", "周六", "周日"];
+const defaultRadarDimensions = [
+  { name: "基础", score: 0 },
+  { name: "精准", score: 0 },
+  { name: "力量", score: 0 },
+  { name: "节奏", score: 0 },
+  { name: "耐力", score: 0 },
+];
+const radarDimensionTrainingIdMap = Object.freeze({
+  基础: "base",
+  精准: "precision",
+  力量: "strength",
+  节奏: "rhythm",
+  耐力: "endurance",
+});
+
+// 页面始终直接消费接口字段，这里只保留一份兜底结构，避免模板访问空值。
+const createDefaultTrainingData = () => ({
+  week_days: defaultWeekDays.map((day) => ({ day, status: "cross" })),
+  stats: {
+    total_training_days: 0,
+    total_arrows: 0,
+    hit_rate: 0,
+    endurance_shoot_speed: 0,
+    total_calories: 0,
+  },
+  beat_percent: 0,
+  radar_max: 0,
+  radar: {
+    dimensions: defaultRadarDimensions,
+  },
+  training_items: [],
+});
+
+const trainingData = ref(createDefaultTrainingData());
+const recommendedTrainingId = ref("");
+const visibleTrainingItems = computed(() =>
+  Array.isArray(trainingData.value.training_items)
+    ? trainingData.value.training_items
+    : []
+);
+const pageMounted = ref(false);
+const showRoutineTargetPicker = ref(false);
+const trainingRadarCanvasId = "training-home-radar";
+const radarImageWidth = 225;
+const radarImageHeight = 224;
+const radarFigureWidthRpx = 448;
+const radarFigureHeightRpx = Math.round(
+  (radarFigureWidthRpx * radarImageHeight) / radarImageWidth
+);
+const radarCanvasPixelRatio = Math.max(
+  1,
+  Number(uni.getDeviceInfo().pixelRatio) || 1
+);
+const radarTargetWidth = uni.upx2px(radarFigureWidthRpx);
+const radarTargetHeight = uni.upx2px(radarFigureHeightRpx);
+// 画布按设备像素比直接绘制，并让显示尺寸与物理像素严格对应，避免图片二次缩放。
+const radarCanvasWidth = Math.round(radarTargetWidth * radarCanvasPixelRatio);
+const radarCanvasHeight = Math.round(radarTargetHeight * radarCanvasPixelRatio);
+const radarDisplayWidth = radarCanvasWidth / radarCanvasPixelRatio;
+const radarDisplayHeight = radarCanvasHeight / radarCanvasPixelRatio;
+const radarScaleX = radarCanvasWidth / radarImageWidth;
+const radarScaleY = radarCanvasHeight / radarImageHeight;
+const radarScale = Math.min(radarScaleX, radarScaleY);
+const radarCenterX = 112.0624 * radarScaleX;
+const radarCenterY = 111.4645 * radarScaleY;
+const radarStrokeWidth = Math.max(1, 2 * radarScale);
+const radarPointRadius = Math.max(2.5, 3.5 * radarScale);
+const radarOuterRadiusX = 110.7089 * radarScaleX;
+const radarOuterRadiusY = 110.7089 * radarScaleY;
+const radarFigureStyle = {
+  width: `${radarDisplayWidth}px`,
+  height: `${radarDisplayHeight}px`,
+};
+let radarRenderGeneration = 0;
+
+const formatValue = (value, digits = 1) => {
+  const numberValue = Number(value);
+  if (!Number.isFinite(numberValue)) return "--";
+  return String(Number(numberValue.toFixed(digits)));
+};
+
+const getLevelText = (item) => {
+  if (!item) return "";
+  const level = Number(item.current_level) || 0;
+  return `当前进度 LV${level} >`;
+};
+
+// 卡路里字段按需求做 K / W 缩写展示。
+const getCaloriesValue = (value) => {
+  const numberValue = Number(value);
+  if (!Number.isFinite(numberValue)) return "--";
+  if (numberValue >= 10000) return `${formatValue(numberValue / 10000)}W`;
+  if (numberValue >= 1000) return `${formatValue(numberValue / 1000)}K`;
+  return formatValue(numberValue, 0);
+};
+
+const getTrainingIcon = (item = {}) =>
+  trainingModeIconMap[item.icon] || trainingModeIconMap.bow;
+
+const getTrainingTitleImage = (item = {}) =>
+  trainingModeTitleImageMap[item.id] || "";
+
+const getTrainingMode = (item = {}) =>
+  trainingModeRouteMap[item.id] || item.id || "";
+
+const updateRecommendedTraining = () => {
+  recommendedTrainingId.value = "";
+
+  const radarMaxValue = Number(trainingData.value.radar_max);
+  const dimensions = trainingData.value.radar?.dimensions;
+  if (
+    !Number.isFinite(radarMaxValue) ||
+    radarMaxValue <= 0 ||
+    !Array.isArray(dimensions) ||
+    dimensions.length !== 5
+  ) {
+    return;
+  }
+
+  const visibleTrainingIds = visibleTrainingItems.value.map((item) => item.id);
+  const candidates = dimensions.reduce((result, item) => {
+    const trainingId = radarDimensionTrainingIdMap[item?.name];
+    const rawScore = item?.score;
+    if (
+      unavailableTrainingIds.has(trainingId) ||
+      !visibleTrainingIds.includes(trainingId) ||
+      rawScore === undefined ||
+      rawScore === null ||
+      rawScore === ""
+    ) {
+      return result;
+    }
+
+    const score = Number(rawScore);
+    if (!Number.isFinite(score) || score < 0) return result;
+
+    result.push({ trainingId, score });
+    return result;
+  }, []);
+  if (!candidates.length) return;
+
+  const lowestScore = Math.min(...candidates.map((item) => item.score));
+  const lowestCandidates = candidates.filter(
+    (item) => item.score === lowestScore
+  );
+  const selectedIndex = Math.floor(Math.random() * lowestCandidates.length);   //暂时先不随机，默认使用第一个
+  console.log(candidates, selectedIndex, lowestCandidates)
+  recommendedTrainingId.value =
+    lowestCandidates[0]?.trainingId || "";
+};
+
+const getRadarPoint = (centerX, centerY, radiusX, radiusY, angle) => ({
+  x: centerX + radiusX * Math.cos(angle),
+  y: centerY + radiusY * Math.sin(angle),
+});
+
+// 雷达图直接使用接口的 5 维 score，按后端 radar_max 等比映射到顶点位置。
+const drawRadar = () => {
+  const dimensions = Array.isArray(trainingData.value.radar?.dimensions)
+    ? trainingData.value.radar.dimensions.slice(0, 5)
+    : [];
+  const radarMaxValue = Number(trainingData.value.radar_max);
+
+  const ctx = uni.createCanvasContext(trainingRadarCanvasId);
+  ctx.clearRect(0, 0, radarCanvasWidth, radarCanvasHeight);
+
+  if (
+    dimensions.length !== 5 ||
+    !Number.isFinite(radarMaxValue) ||
+    radarMaxValue <= 0
+  ) {
+    ctx.draw();
+    return;
+  }
+
+  const angles = dimensions.map(
+    (_, index) => (-90 + index * 72) * (Math.PI / 180)
+  );
+
+  const points = dimensions.map((item, index) => {
+    const normalized = Math.max(
+      0,
+      Math.min(Number(item.score) || 0, radarMaxValue)
+    );
+    const progress = normalized / radarMaxValue;
+
+    return getRadarPoint(
+      radarCenterX,
+      radarCenterY,
+      radarOuterRadiusX * progress,
+      radarOuterRadiusY * progress,
+      angles[index]
+    );
+  });
+
+  ctx.beginPath();
+  points.forEach((point, index) => {
+    if (index === 0) ctx.moveTo(point.x, point.y);
+    else ctx.lineTo(point.x, point.y);
+  });
+  ctx.closePath();
+  ctx.setFillStyle("rgba(255, 209, 154, 0.26)");
+  ctx.fill();
+  ctx.setStrokeStyle("rgba(220, 162, 92, 0.92)");
+  ctx.setLineWidth(radarStrokeWidth);
+  ctx.stroke();
+
+  points.forEach((point) => {
+    ctx.beginPath();
+    ctx.arc(point.x, point.y, radarPointRadius, 0, 2 * Math.PI);
+    ctx.setFillStyle("rgba(221, 162, 90, 1)");
+    ctx.fill();
+  });
+
+  ctx.beginPath();
+  ctx.arc(radarCenterX, radarCenterY, radarPointRadius, 0, 2 * Math.PI);
+  ctx.setFillStyle("rgba(125, 107, 83, 0.65)");
+  ctx.fill();
+  ctx.draw();
+};
+
+// 小程序 Canvas 首次渲染时机不稳定，延后一帧再绘制更稳。
+const refreshRadar = async () => {
+  const generation = ++radarRenderGeneration;
+  await nextTick();
+  setTimeout(() => {
+    if (generation === radarRenderGeneration) {
+      drawRadar();
+    }
+  }, 30);
+};
+
+const loadPersonalTrainingData = async () => {
+  try {
+    const result = await getPersonalTrainingAPI();
+    trainingData.value = {
+      week_days:
+        Array.isArray(result?.week_days) && result.week_days.length
+          ? result.week_days
+          : createDefaultTrainingData().week_days,
+      stats: {
+        total_training_days: result?.stats?.total_training_days ?? 0,
+        total_arrows: result?.stats?.total_arrows ?? 0,
+        hit_rate: result?.stats?.hit_rate ?? 0,
+        endurance_shoot_speed: result?.stats?.endurance_shoot_speed ?? 0,
+        total_calories: result?.stats?.total_calories ?? 0,
+      },
+      beat_percent: result?.beat_percent ?? 0,
+      radar_max: result?.radar_max ?? 0,
+      radar: {
+        dimensions:
+          Array.isArray(result?.radar?.dimensions) &&
+          result.radar.dimensions.length === 5
+            ? result.radar.dimensions
+            : createDefaultTrainingData().radar.dimensions,
+      },
+      training_items: Array.isArray(result?.training_items)
+        ? result.training_items
+        : [],
+    };
+  } catch (error) {
+    console.log("personal training load failed", error);
+    trainingData.value = createDefaultTrainingData();
+  } finally {
+    updateRecommendedTraining();
+    await refreshRadar();
+  }
+};
+
+const openTrainingRecord = () => {
+  uni.navigateTo({
+    url: "/pages/my-growth?tab=2",
+  });
+};
+
+const openTrainingItem = (item = {}) => {
+  if (unavailableTrainingIds.has(item.id)) {
+    uni.showToast({
+      title: "功能开发中...",
+      icon: "none",
+    });
+    return;
+  }
+
+  const mode = getTrainingMode(item);
+  if (!mode) return;
+
+  uni.navigateTo({
+    url: `/pages/training/difficulty?mode=${mode}`,
+  });
+};
+
+const openRoutineTraining = () => {
+  showRoutineTargetPicker.value = true;
+};
+
+const handleRoutineTargetConfirm = (target) => {
+  showRoutineTargetPicker.value = false;
+  uni.navigateTo({
+    url: `/pages/practise-one?target=${target}`,
+  });
+};
+
+// 首次进入页面时拉取数据并完成雷达图初始化。
+onMounted(async () => {
+  await loadPersonalTrainingData();
+  pageMounted.value = true;
+});
+
+// 从其他页面返回时刷新训练数据，保持进度与推荐状态最新。
+onShow(async () => {
+  if (!pageMounted.value) return;
+  await loadPersonalTrainingData();
+});
+</script>
+
+<template>
+  <Container
+    :showBackToGame="true"
+    :bgType="7"
+    bgColor="#050b19"
+    :usePageScroll="true"
+  >
+    <view class="training-home">
+      <view class="week-grid">
+        <view
+          v-for="item in trainingData.week_days"
+          :key="item.day"
+          class="week-item"
+        >
+          <view class="week-item-bg"></view>
+          <image
+            class="week-item-icon"
+            :src="item.status === 'checked' ? checkedIcon : missedIcon"
+            mode="widthFix"
+          />
+          <text
+            class="week-item-label"
+            :class="{ 'week-item-label-active': item.status === 'checked' }"
+          >
+            {{ item.day }}
+          </text>
+        </view>
+      </view>
+
+      <view class="stats-card">
+        <view class="stats-card-bg"></view>
+        <image
+          class="stats-quote stats-quote-left"
+          src="https://static.shelingxingqiu.com/shootmini/static/training-home/img_17.png"
+          mode="widthFix"
+        />
+        <image
+          class="stats-quote stats-quote-right"
+          src="https://static.shelingxingqiu.com/shootmini/static/training-home/img_16.png"
+          mode="widthFix"
+        />
+        <view class="stats-grid">
+          <view class="stats-item">
+            <view class="stats-value-row">
+              <view class="stats-value-group">
+                <text class="stats-value">
+                  {{ formatValue(trainingData.stats.total_training_days, 0) }}
+                </text>
+                <text class="stats-unit">天</text>
+                <view class="stats-value-decoration"></view>
+              </view>
+            </view>
+            <text class="stats-label">共训练</text>
+          </view>
+
+          <view class="stats-item">
+            <view class="stats-value-row">
+              <view class="stats-value-group">
+                <text class="stats-value">
+                  {{ formatValue(trainingData.stats.total_arrows, 0) }}
+                </text>
+                <text class="stats-unit">支</text>
+                <view class="stats-value-decoration"></view>
+              </view>
+            </view>
+            <text class="stats-label">累计射箭</text>
+          </view>
+
+          <view class="stats-item">
+            <view class="stats-value-row">
+              <view class="stats-value-group">
+                <text class="stats-value">
+                  {{ formatValue(trainingData.stats.hit_rate) }}
+                </text>
+                <text class="stats-unit">%</text>
+                <view class="stats-value-decoration"></view>
+              </view>
+            </view>
+            <text class="stats-label">命中率</text>
+          </view>
+
+          <view class="stats-item">
+            <view class="stats-value-row">
+              <view class="stats-value-group">
+                <text class="stats-value">
+                  {{ formatValue(trainingData.stats.endurance_shoot_speed, 0) }}
+                </text>
+                <text class="stats-unit">支/分钟</text>
+                <view class="stats-value-decoration"></view>
+              </view>
+            </view>
+            <text class="stats-label">耐力射击</text>
+          </view>
+
+          <view class="stats-item">
+            <view class="stats-value-row">
+              <view class="stats-value-group">
+                <text class="stats-value">
+                  {{ getCaloriesValue(trainingData.stats.total_calories) }}
+                </text>
+                <text class="stats-unit">卡路里</text>
+                <view class="stats-value-decoration"></view>
+              </view>
+            </view>
+            <text class="stats-label">共消耗</text>
+          </view>
+        </view>
+      </view>
+
+      <view class="radar-section">
+        <view class="record-bubble" @click="$clickSound(openTrainingRecord)">
+          <image
+            class="record-bubble-bg"
+            src="https://static.shelingxingqiu.com/shootmini/static/training-home/img_28.png"
+            mode="widthFix"
+          />
+          <view class="record-bubble-copy">
+            <view class="record-main">
+              已超越<text class="record-main-highlight">{{ formatValue(trainingData.beat_percent) }}%</text>对手
+            </view>
+            <view class="record-sub-row">
+              <text class="record-sub-text">我的训练记录</text>
+              <image
+                class="record-arrow"
+                src="https://static.shelingxingqiu.com/shootmini/static/training-home/img_7.png"
+                mode="widthFix"
+              />
+            </view>
+          </view>
+        </view>
+
+        <view class="radar-board">
+          <text class="radar-label radar-label-top">
+            {{ trainingData.radar.dimensions[0].name }}
+          </text>
+          <text class="radar-label radar-label-right">
+            {{ trainingData.radar.dimensions[1].name }}
+          </text>
+          <text class="radar-label radar-label-bottom-right">
+            {{ trainingData.radar.dimensions[2].name }}
+          </text>
+          <text class="radar-label radar-label-bottom-left">
+            {{ trainingData.radar.dimensions[3].name }}
+          </text>
+          <text class="radar-label radar-label-left">
+            {{ trainingData.radar.dimensions[4].name }}
+          </text>
+
+          <view class="radar-figure" :style="radarFigureStyle">
+            <image
+              class="radar-grid-image"
+              :style="radarFigureStyle"
+              src="https://static.shelingxingqiu.com/shootmini/static/training-home/img_19.png"
+            />
+            <canvas
+              :canvas-id="trainingRadarCanvasId"
+              :id="trainingRadarCanvasId"
+              class="radar-canvas"
+              :style="radarFigureStyle"
+              :width="radarCanvasWidth"
+              :height="radarCanvasHeight"
+            />
+            <image
+              class="radar-mascot"
+              src="https://static.shelingxingqiu.com/shootmini/static/training-home/img_21.png"
+              mode="widthFix"
+            />
+          </view>
+        </view>
+      </view>
+
+      <view class="featured-card" @click="$clickSound(openRoutineTraining)">
+        <image
+          class="featured-card-bg"
+          src="https://static.shelingxingqiu.com/shootmini/static/training-home/img_22.png"
+          mode="widthFix"
+        />
+        <view class="featured-card-mask"></view>
+        <view class="featured-card-copy">
+          <text class="featured-card-subtitle">12箭练习</text>
+        </view>
+      </view>
+
+      <view class="mode-grid">
+        <view
+          v-for="item in visibleTrainingItems"
+          :key="item.id"
+          class="mode-card"
+          @click="$clickSound(() => openTrainingItem(item))"
+        >
+          <view v-if="item.id === recommendedTrainingId" class="mode-tag">
+            推荐
+          </view>
+          <view class="mode-card-copy">
+            <image
+              v-if="getTrainingTitleImage(item)"
+              class="mode-card-title-image"
+              :src="getTrainingTitleImage(item)"
+              mode="widthFix"
+            />
+            <text v-else class="mode-card-title">{{ item.name }}</text>
+            <text class="mode-card-progress">{{ getLevelText(item) }}</text>
+          </view>
+          <image
+            class="mode-card-icon"
+            :src="getTrainingIcon(item)"
+            mode="aspectFit"
+          />
+        </view>
+      </view>
+    </view>
+    <TargetPicker
+      :show="showRoutineTargetPicker"
+      :clickSound="true"
+      :onClose="() => (showRoutineTargetPicker = false)"
+      :onConfirm="handleRoutineTargetConfirm"
+    />
+  </Container>
+</template>
+
+<style scoped>
+.training-home {
+  position: relative;
+  overflow: hidden;
+  padding: 18rpx 20rpx 60rpx 20rpx;
+}
+
+.week-grid {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 18rpx;
+}
+
+.week-item {
+  position: relative;
+  width: 92rpx;
+  height: 96rpx;
+  border-radius: 16rpx;
+  overflow: hidden;
+}
+
+.week-item-bg {
+  width: 100%;
+  height: 100%;
+  background: linear-gradient(180deg, #2f2d2b 0%, #252831 100%);
+  opacity: 0.5;
+}
+
+.week-item-icon {
+  position: absolute;
+  left: 28rpx;
+  top: 14rpx;
+  width: 36rpx;
+}
+
+.week-item-label {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 10rpx;
+  color: rgba(255, 255, 255, 0.6);
+  font-size: 20rpx;
+  text-align: center;
+  line-height: 28rpx;
+}
+
+.week-item-label-active {
+  color: #e7ba80;
+}
+
+.stats-card {
+  position: relative;
+  margin-top: 32rpx;
+  width: 100%;
+  height: 124rpx;
+  overflow: hidden;
+  border-radius: 24rpx;
+}
+
+.stats-card-bg {
+  position: absolute;
+  inset: 0;
+  background: linear-gradient(180deg, #2f2d2b 0%, #252831 100%);
+  opacity: 0.5;
+}
+
+.stats-quote {
+  position: absolute;
+  z-index: 1;
+  width: 53rpx;
+  height: 50rpx;
+}
+
+.stats-quote-left {
+  left: 4rpx;
+  top: 4rpx;
+}
+
+.stats-quote-right {
+  right: 4rpx;
+  bottom: 4rpx;
+}
+
+.stats-grid {
+  position: absolute;
+  z-index: 1;
+  left: 36rpx;
+  right: 36rpx;
+  top: 22rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+}
+
+.stats-item {
+  min-width: 0;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  text-align: center;
+}
+
+.stats-value-row {
+  display: flex;
+  align-items: flex-end;
+  justify-content: center;
+  width: 100%;
+  height: 48rpx;
+  line-height: 48rpx;
+}
+
+.stats-value-group {
+  position: relative;
+  display: inline-flex;
+  align-items: flex-end;
+  justify-content: center;
+  min-width: 72rpx;
+  white-space: nowrap;
+}
+
+.stats-value-decoration {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 6rpx;
+  min-width: 72rpx;
+  height: 12rpx;
+  border-radius: 6rpx;
+  background: linear-gradient(133deg, #ffd19a 0%, #a17636 100%);
+  opacity: 0.5;
+}
+
+.stats-value {
+  position: relative;
+  z-index: 1;
+  color: #fff;
+  font-size: 34rpx;
+  font-family: Helvetica, Arial, sans-serif;
+  font-weight: 500;
+  line-height: 46rpx;
+}
+
+.stats-unit {
+  position: relative;
+  z-index: 1;
+  margin-left: 4rpx;
+  padding-bottom: 8rpx;
+  color: #fff;
+  font-size: 20rpx;
+  line-height: 28rpx;
+  opacity: 0.6;
+}
+
+.stats-label {
+  display: inline-block;
+  margin-top: 6rpx;
+  color: #fcce96;
+  font-size: 20rpx;
+  line-height: 28rpx;
+  opacity: 0.6;
+}
+
+.radar-section {
+  position: relative;
+  padding-top: 34rpx;
+}
+
+.record-bubble {
+  position: absolute;
+  right: 0;
+  top: 10rpx;
+  width: 202rpx;
+  height: 122rpx;
+  z-index: 3;
+}
+
+.record-bubble-bg {
+  width: 202rpx;
+}
+
+.record-bubble-copy {
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 24rpx;
+  text-align: center;
+}
+
+.record-main {
+  color: #fff;
+  font-size: 24rpx;
+  line-height: 30rpx;
+}
+
+.record-main-highlight {
+  color: #e7ba80;
+}
+
+.record-sub-row {
+  margin-top: 4rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.record-sub-text {
+  color: #ffd947;
+  font-size: 24rpx;
+  height: 30rpx;
+  line-height: 30rpx;
+}
+
+.record-arrow {
+  width: 24rpx;
+}
+
+.radar-board {
+  position: relative;
+  width: 100%;
+  height: 514rpx;
+}
+
+.radar-label {
+  position: absolute;
+  color: rgba(255, 255, 255, 0.78);
+  font-size: 28rpx;
+  line-height: 40rpx;
+}
+
+.radar-label-top {
+  left: 350rpx;
+  top: 14rpx;
+  transform: translateX(-50%);
+  opacity: 0.5;
+}
+
+.radar-label-right {
+  right: 77rpx;
+  top: 190rpx;
+  opacity: 0.5;
+}
+
+.radar-label-bottom-right {
+  right: 170rpx;
+  bottom: 18rpx;
+  opacity: 0.5;
+}
+
+.radar-label-bottom-left {
+  left: 170rpx;
+  bottom: 18rpx;
+  opacity: 0.5;
+}
+
+.radar-label-left {
+  left: 75rpx;
+  top: 180rpx;
+  opacity: 0.5;
+}
+
+.radar-figure {
+  position: relative;
+  top: 54rpx;
+  margin: 0 auto;
+  overflow: visible;
+}
+
+.radar-grid-image,
+.radar-canvas {
+  position: absolute;
+  left: 0;
+  top: 0;
+}
+
+.radar-mascot {
+  position: absolute;
+  right: 38rpx;
+  top: 0;
+  width: 92rpx;
+}
+
+.featured-card {
+  position: relative;
+  width: 100%;
+  height: 150rpx;
+  margin-top: 70rpx;
+  border-radius: 16rpx;
+  overflow: hidden;
+}
+
+.featured-card-bg {
+  width: 100%;
+}
+
+.featured-card-mask {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 278rpx;
+  height: 150rpx;
+}
+
+.featured-card-copy {
+  position: absolute;
+  left: 174rpx;
+  top: 58rpx;
+  display: flex;
+  flex-direction: column;
+}
+
+.featured-card-title {
+  display: block;
+  color: #895409;
+  font-size: 34rpx;
+  font-family: "AlimamaShuHeiTi-Bold", "PingFang SC", sans-serif;
+  font-weight: 700;
+  line-height: 42rpx;
+}
+
+.featured-card-subtitle {
+  display: block;
+  margin-top: 10rpx;
+  color: #895409;
+  font-size: 22rpx;
+  line-height: 32rpx;
+}
+
+.mode-grid {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  gap: 16rpx 18rpx;
+  margin-top: 16rpx;
+}
+
+.mode-card {
+  position: relative;
+  height: 150rpx;
+  box-shadow: inset 2rpx 2rpx 6rpx 0rpx rgba(255, 255, 255, 0.27);
+  border-radius: 16rpx;
+  border: 2rpx solid rgba(235, 184, 123, 0.5);
+  background: rgba(0, 0, 0, 0.5);
+  overflow: hidden;
+}
+
+.mode-tag {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 72rpx;
+  height: 34rpx;
+  line-height: 34rpx;
+  text-align: center;
+  font-size: 20rpx;
+  color: #000;
+  border-bottom-right-radius: 16rpx;
+  background: linear-gradient(133deg, #ffd19a 0%, #a17636 100%);
+}
+
+.mode-card-copy {
+  position: absolute;
+  left: 30rpx;
+  top: 40rpx;
+}
+
+.mode-card-title {
+  display: block;
+  background-image: linear-gradient(
+    133deg,
+    rgba(235, 184, 123, 0.8) 0%,
+    rgba(181, 140, 78, 0.8) 100%
+  );
+  color: #e7ba80;
+  font-size: 32rpx;
+  font-family: "AlimamaShuHeiTi-Bold", "PingFang SC", sans-serif;
+  font-weight: 700;
+  line-height: 38rpx;
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
+}
+
+.mode-card-title-image {
+  display: block;
+  width: 128rpx;
+}
+
+.mode-card-progress {
+  display: block;
+  margin-top: 14rpx;
+  color: #fcce96;
+  font-size: 22rpx;
+  line-height: 32rpx;
+  opacity: 0.5;
+}
+
+.mode-card-icon {
+  position: absolute;
+  right: 12rpx;
+  top: 14rpx;
+  width: 124rpx;
+  height: 124rpx;
+}
+</style>
diff --git a/src/pages/training/practise-one.vue b/src/pages/training/practise-one.vue
new file mode 100644
index 0000000..d91e292
--- /dev/null
+++ b/src/pages/training/practise-one.vue
@@ -0,0 +1,1566 @@
+<script setup>
+import { computed, ref, onMounted, onBeforeUnmount } from "vue";
+import { onHide, onLoad, onShow, onUnload } from "@dcloudio/uni-app";
+import Container from "@/components/Container.vue";
+import ShootProgress from "./components/ShootProgress.vue";
+import BowTarget from "./components/BowTarget.vue";
+import ScorePanel2 from "./components/ScorePanel2.vue";
+import ScoreResult from "./components/ScoreResult.vue";
+import Avatar from "@/components/Avatar.vue";
+import BowPower from "@/components/BowPower.vue";
+import TestDistance from "./components/TestDistance.vue";
+import BubbleTip from "./components/BubbleTip.vue";
+import audioManager from "@/audioManager";
+
+import {
+  createPractiseV2API,
+  getCurrentPractiseAPI,
+  startPractiseAPI,
+  endPractiseAPI,
+  getPractiseAPI,
+  getTrainingDifficultyListAPI,
+} from "@/apis";
+import {
+  connectMatchWebSocket,
+  closeMatchWebSocket,
+  setMatchAppHideResumable,
+  MATCH_WS_PRACTICE_SYNC_EVENT,
+  MATCH_WS_STATE_EVENT,
+} from "@/matchWebsocket";
+import { sharePractiseData } from "@/canvas";
+import { wxShare, debounce, getDirectionText } from "@/util";
+import { MESSAGETYPESV2, roundsName } from "@/constants";
+
+import useStore from "@/store";
+import { storeToRefs } from "pinia";
+const store = useStore();
+const { user } = storeToRefs(store);
+
+const sound = ref(true);
+const start = ref(false);
+const pageStages = Object.freeze({
+  DISTANCE: "distance",
+  SHOOTING: "shooting",
+  RESULT: "result",
+  LOADING: "loading",
+});
+const pageStage = ref(pageStages.LOADING);
+const scores = ref([]);
+// 只在实时 ShootResult 新增一箭时递增，避免同步快照重播飞箭特效。
+const shotEffectToken = ref(0);
+const defaultTotal = 12;
+const defaultTargetType = 1;
+const total = ref(defaultTotal);
+const practiseResult = ref({});
+const practiceEndSnapshot = ref({});
+const hasNextDifficulty = ref(false);
+const practiseId = ref("");
+const showGuide = ref(false);
+const tips = ref("");
+const targetType = ref(defaultTargetType);
+const trainingParams = ref({});
+const practiceInfo = ref({});
+// 服务端状态立即落到 practiceInfo，精准训练的目标区域单独延迟展示。
+const visiblePrecisionTarget = ref({
+  randomBlock: 0,
+  randomRingArea: 0,
+});
+const trainingDifficultyStorageKey = "training-selection";
+const useHighlightTest = ref(false);
+const highlightTestState = ref({
+  blocks: 8,
+  randomBlock: 1,
+  randomRingArea: 0,
+});
+const highlightTestTimer = ref(null);
+const serverAddr = ref("");
+const practiceEnded = ref(false);
+const stopCompleted = ref(false);
+const stopInFlight = ref(false);
+const exiting = ref(false);
+const hiddenWhileActive = ref(false);
+const resumeInFlight = ref(false);
+const foregroundResumeSyncPending = ref(false);
+const pageVisible = ref(true);
+const appHideResumable = ref(false);
+const connectionClosed = ref(true);
+let stopPracticeTask = null;
+let practiceSyncTimer = null;
+let waitingPracticeSync = false;
+let shotPresentationGeneration = 0;
+let nextDifficultyRequest = null;
+let nextDifficultyRequestGeneration = 0;
+const audioWaiters = new Set();
+const shotEffectWaiters = new Map();
+const PRACTICE_SYNC_TIMEOUT_MS = 5000;
+const SHOT_EFFECT_WAIT_TIMEOUT_MS = 1200;
+const AUDIO_TIMEOUT_BASE = 3500;
+const AUDIO_TIMEOUT_PER_KEY = 2600;
+const AUDIO_TIMEOUT_MAX = 12000;
+
+const env = computed(() => {
+  try {
+    return uni.getAccountInfoSync().miniProgram.envVersion;
+  } catch (error) {
+    return "release";
+  }
+});
+
+const isDistanceStage = computed(() => pageStage.value === pageStages.DISTANCE);
+const isShootingStage = computed(() => pageStage.value === pageStages.SHOOTING);
+const hasPractiseResult = computed(() => !!practiseResult.value?.details);
+const showResult = computed(
+  () => pageStage.value === pageStages.RESULT && hasPractiseResult.value
+);
+const isSvip = computed(() => practiceInfo.value.sVip === true);
+const isVip = computed(
+  () => practiceInfo.value.vip === true && !isSvip.value
+);
+
+const setPracticeAppHideResumable = (enabled) => {
+  const nextValue = enabled === true;
+  appHideResumable.value = nextValue;
+  setMatchAppHideResumable(nextValue);
+};
+
+const trainingType = computed(
+  () => practiceInfo.value.trainingType || trainingParams.value.type || ""
+);
+
+const getPracticeNumber = (value, fallback = 0) => {
+  if (value === undefined || value === null || value === "") return fallback;
+  const numberValue = Number(value);
+  return Number.isFinite(numberValue) ? numberValue : fallback;
+};
+
+const getPositiveInteger = (value) => {
+  const numberValue = Number(value);
+  return Number.isInteger(numberValue) && numberValue > 0 ? numberValue : 0;
+};
+
+const getPrecisionTargetSnapshot = (source = {}) => ({
+  randomBlock: getPositiveInteger(source.randomBlock),
+  randomRingArea: getPositiveInteger(source.randomRingArea),
+});
+
+const applyVisiblePrecisionTarget = (source = {}) => {
+  visiblePrecisionTarget.value = getPrecisionTargetSnapshot(source);
+};
+
+const currentDifficultyLevel = computed(
+  () =>
+    getPositiveInteger(practiseResult.value.difficultyLevel) ||
+    getPositiveInteger(practiseResult.value.difficulty_level) ||
+    getPositiveInteger(practiceInfo.value.difficultyLevel) ||
+    getPositiveInteger(trainingParams.value.difficulty)
+);
+
+const resetNextDifficultyState = () => {
+  nextDifficultyRequestGeneration += 1;
+  nextDifficultyRequest = null;
+  hasNextDifficulty.value = false;
+};
+
+const loadNextDifficultyState = (result = {}) => {
+  const requestGeneration = ++nextDifficultyRequestGeneration;
+  const currentLevel =
+    getPositiveInteger(result.difficultyLevel) ||
+    getPositiveInteger(result.difficulty_level) ||
+    currentDifficultyLevel.value;
+  const currentTrainingType = result.trainingType || trainingType.value;
+
+  hasNextDifficulty.value = false;
+  if (!currentTrainingType || !currentLevel) {
+    nextDifficultyRequest = Promise.resolve(false);
+    return nextDifficultyRequest;
+  }
+
+  nextDifficultyRequest = getTrainingDifficultyListAPI(currentTrainingType)
+    .then((difficultyResult) => {
+      const levels = Array.isArray(difficultyResult?.list)
+        ? difficultyResult.list
+            .filter(
+              (item) => !item?.type || item.type === currentTrainingType
+            )
+            .map((item) => getPositiveInteger(item?.difficulty))
+            .filter(Boolean)
+        : [];
+      const maxLevel = Math.max(0, ...levels);
+      const highestCompletedLevel = getPositiveInteger(
+        difficultyResult?.user_levels?.[currentTrainingType]
+      );
+      const latestUnlockedLevel = Math.min(
+        highestCompletedLevel + 1,
+        maxLevel
+      );
+      const canAdvance =
+        currentLevel < maxLevel && latestUnlockedLevel > currentLevel;
+
+      if (requestGeneration === nextDifficultyRequestGeneration) {
+        hasNextDifficulty.value = canAdvance;
+      }
+      return canAdvance;
+    })
+    .catch((error) => {
+      console.log("training next difficulty load failed", error);
+      if (requestGeneration === nextDifficultyRequestGeneration) {
+        hasNextDifficulty.value = false;
+      }
+      return false;
+    });
+
+  return nextDifficultyRequest;
+};
+
+// time_limit 缺失或非正数都表示整局不限时。
+const timeLimit = computed(() => getPositiveInteger(practiceInfo.value.timeLimit));
+const hasTimeLimit = computed(() => timeLimit.value > 0);
+
+const precisionBlocks = computed(() => {
+  if (useHighlightTest.value) {
+    return getPositiveInteger(highlightTestState.value.blocks);
+  }
+  if (trainingType.value !== "precision") return 0;
+
+  return (
+    getPositiveInteger(practiceInfo.value.blocks) ||
+    getPositiveInteger(trainingParams.value.blocks)
+  );
+});
+
+const precisionRandomBlock = computed(() => {
+  const block = getPositiveInteger(
+    useHighlightTest.value
+      ? highlightTestState.value.randomBlock
+      : visiblePrecisionTarget.value.randomBlock
+  );
+  return block <= precisionBlocks.value ? block : 0;
+});
+
+const precisionRandomRingArea = computed(() => {
+  const ring = getPositiveInteger(
+    useHighlightTest.value
+      ? highlightTestState.value.randomRingArea
+      : visiblePrecisionTarget.value.randomRingArea
+  );
+  return ring >= 1 && ring <= 10 ? ring : 0;
+});
+
+// 只展示后端进度，不在前端重复判断训练是否完成。
+const trainingCopy = computed(() => {
+  if (trainingType.value === "base") {
+    const hitReq = getPracticeNumber(
+      practiceInfo.value.hitReq,
+      trainingParams.value.hitReq
+    );
+    const arrowsLeft = getPracticeNumber(
+      practiceInfo.value.arrowsLeft,
+      total.value
+    );
+
+    return {
+      title: `每箭命中${hitReq}环之上`,
+      details: [
+        { text: "剩余" },
+        { text: arrowsLeft, highlight: true },
+        { text: "箭达到条件" },
+      ],
+    };
+  }
+
+  if (trainingType.value === "endurance") {
+    const targetArrows = getPracticeNumber(
+      practiceInfo.value.targetArrows,
+      total.value
+    );
+    const targetRings = getPracticeNumber(
+      practiceInfo.value.targetRings,
+      trainingParams.value.totalReq
+    );
+    const currentArrows = getPracticeNumber(practiceInfo.value.currentArrows);
+    const currentRings = getPracticeNumber(practiceInfo.value.currentRings);
+
+    return {
+      title: `完成${targetArrows}箭并累计${targetRings}环`,
+      details: [
+        { text: "已完成" },
+        { text: currentArrows, highlight: true },
+        { text: "箭，累计" },
+        { text: currentRings, highlight: true },
+        { text: "环" },
+      ],
+    };
+  }
+
+  if (trainingType.value === "precision") {
+    const block = precisionRandomBlock.value;
+    const ring = precisionRandomRingArea.value;
+    const arrowsLeft = getPracticeNumber(
+      practiceInfo.value.arrowsLeft,
+      total.value
+    );
+    const title = block
+      ? ring
+        ? `请命中区域${block}的${ring}环`
+        : `请命中区域${block}`
+      : "等待目标区域";
+
+    return {
+      title,
+      details: [
+        { text: "剩余" },
+        { text: arrowsLeft, highlight: true },
+        { text: "箭" },
+      ],
+    };
+  }
+
+  return null;
+});
+
+const toRouteNumber = (value, fallback = 0) => {
+  const numberValue = Number(value);
+  return Number.isFinite(numberValue) ? numberValue : fallback;
+};
+
+const toPositiveRouteNumber = (value, fallback) => {
+  const numberValue = toRouteNumber(value, fallback);
+  return numberValue > 0 ? numberValue : fallback;
+};
+
+const practiceInfoFields = [
+  "id",
+  "userId",
+  "status",
+  "statusText",
+  "startTime",
+  "targetType",
+  "vip",
+  "sVip",
+  "trainingType",
+  "difficultyLevel",
+  "hitReq",
+  "arrowsLeft",
+  "targetArrows",
+  "targetRings",
+  "currentArrows",
+  "currentRings",
+  "blocks",
+  "randomBlock",
+  "randomRingArea",
+  "timeLimit",
+  "completed",
+  "totalArrows",
+  "duration",
+  "averageRing",
+  "stability",
+  "maxCombo",
+  "totalHits",
+  "deltaTotalHits",
+  "deltaDuration",
+  "deltaMaxCombo",
+  "deltaTotalRings",
+  "deltaTotalArrows",
+  "deltaAverageRing",
+  "deltaStability",
+  "beforeExp",
+  "beforeLevel",
+  "currentExp",
+  "level",
+  "upgradeExp",
+  "calories",
+  "shootData",
+  "details",
+];
+
+const practiceResultFields = [
+  "trainingType",
+  "difficultyLevel",
+  "completed",
+  "totalArrows",
+  "duration",
+  "averageRing",
+  "stability",
+  "maxCombo",
+  "totalHits",
+  "currentRings",
+  "deltaTotalHits",
+  "deltaDuration",
+  "deltaMaxCombo",
+  "deltaTotalRings",
+  "deltaTotalArrows",
+  "deltaAverageRing",
+  "deltaStability",
+  "beforeExp",
+  "beforeLevel",
+  "currentExp",
+  "level",
+  "upgradeExp",
+  "calories",
+  "details",
+];
+
+const syncPracticeInfo = (message = {}) => {
+  const nextInfo = practiceInfoFields.reduce((result, field) => {
+    if (Object.prototype.hasOwnProperty.call(message, field)) {
+      result[field] = message[field];
+    }
+    return result;
+  }, {});
+
+  const isPrecisionSnapshot =
+    (message.type === MESSAGETYPESV2.BattleStart ||
+      message.type === MESSAGETYPESV2.ShootResult) &&
+    (message.trainingType === "precision" || trainingType.value === "precision");
+  if (isPrecisionSnapshot) {
+    // proto3 会省略数值 0；新快照未携带时必须清除上一箭的随机目标。
+    if (!Object.prototype.hasOwnProperty.call(message, "randomBlock")) {
+      nextInfo.randomBlock = 0;
+    }
+    if (!Object.prototype.hasOwnProperty.call(message, "randomRingArea")) {
+      nextInfo.randomRingArea = 0;
+    }
+  }
+
+  if (Object.keys(nextInfo).length === 0) return;
+  practiceInfo.value = {
+    ...practiceInfo.value,
+    ...nextInfo,
+  };
+};
+
+const buildShootResultAudioKeys = (message = {}) => {
+  const latestDetail =
+    Array.isArray(message.details) && message.details.length > 0
+      ? message.details[message.details.length - 1]
+      : null;
+  // 与原 ShootProgress 保持一致：优先使用当前箭，details 仅作兼容兜底。
+  const arrow = message.shootData || latestDetail;
+  if (!arrow) return [];
+  if (
+    arrow.playerId !== undefined &&
+    arrow.playerId !== null &&
+    String(arrow.playerId) !== String(user.value?.id)
+  ) {
+    return [];
+  }
+
+  const keys = [
+    arrow.ring ? `${arrow.ringX ? "X" : arrow.ring}环` : "未上靶",
+  ];
+  if (arrow.angle !== null && arrow.angle !== undefined) {
+    keys.push(`向${getDirectionText(arrow.angle)}调整`);
+  }
+  if (arrow.threeConsecutive10Rings === true) {
+    keys.push("tententen");
+  }
+  return keys;
+};
+
+const playAudioKeysAndWait = (keys) => {
+  const audioKeys = (Array.isArray(keys) ? keys : [keys]).filter(Boolean);
+  if (audioKeys.length === 0) return Promise.resolve();
+
+  const expectedKey = audioKeys[audioKeys.length - 1];
+  const waitTime = Math.min(
+    AUDIO_TIMEOUT_MAX,
+    Math.max(AUDIO_TIMEOUT_BASE, audioKeys.length * AUDIO_TIMEOUT_PER_KEY)
+  );
+
+  return new Promise((resolve) => {
+    let settled = false;
+    let timer = null;
+    const waiter = {
+      expectedKey,
+      done: () => {
+        if (settled) return;
+        settled = true;
+        if (timer) clearTimeout(timer);
+        audioWaiters.delete(waiter);
+        resolve();
+      },
+    };
+
+    timer = setTimeout(() => {
+      if (typeof audioManager.recoverIfStale === "function") {
+        audioManager.recoverIfStale(expectedKey);
+      }
+      waiter.done();
+    }, waitTime);
+    audioWaiters.add(waiter);
+
+    try {
+      audioManager.play(audioKeys, false);
+    } catch (error) {
+      console.error("training shoot result audio failed", error);
+      waiter.done();
+    }
+  });
+};
+
+const shouldWaitForShotEffect = (shot) => {
+  const x = Number(shot?.x);
+  const y = Number(shot?.y);
+  return (
+    isSvip.value &&
+    Number(shot?.ring) > 0 &&
+    Number.isFinite(x) &&
+    Number.isFinite(y)
+  );
+};
+
+const waitForShotEffect = (token, shouldWait) => {
+  if (!shouldWait) return Promise.resolve();
+
+  return new Promise((resolve) => {
+    let settled = false;
+    let timer = null;
+    const waiter = {
+      done: () => {
+        if (settled) return;
+        settled = true;
+        if (timer) clearTimeout(timer);
+        if (shotEffectWaiters.get(token) === waiter) {
+          shotEffectWaiters.delete(token);
+        }
+        resolve();
+      },
+    };
+
+    timer = setTimeout(waiter.done, SHOT_EFFECT_WAIT_TIMEOUT_MS);
+    shotEffectWaiters.set(token, waiter);
+  });
+};
+
+const invalidateShotPresentations = ({ resetVisible = false } = {}) => {
+  shotPresentationGeneration += 1;
+  Array.from(audioWaiters).forEach((waiter) => waiter.done());
+  Array.from(shotEffectWaiters.values()).forEach((waiter) => waiter.done());
+  if (resetVisible) {
+    applyVisiblePrecisionTarget();
+  }
+  return shotPresentationGeneration;
+};
+
+const onShotEffectComplete = (payload = {}) => {
+  const token = Number(payload?.token ?? payload);
+  if (!Number.isFinite(token)) return;
+  shotEffectWaiters.get(token)?.done();
+};
+
+const commitPrecisionTargetAfterPresentation = async ({
+  generation,
+  target,
+  audioPromise,
+  effectPromise,
+}) => {
+  await Promise.all([audioPromise, effectPromise]);
+  if (
+    generation !== shotPresentationGeneration ||
+    practiceEnded.value ||
+    !isShootingStage.value ||
+    trainingType.value !== "precision"
+  ) {
+    return;
+  }
+  visiblePrecisionTarget.value = target;
+};
+
+const createPracticeEndSnapshot = (message = {}) => {
+  const source = {
+    ...practiceInfo.value,
+    ...message,
+  };
+  const snapshot = practiceResultFields.reduce((result, field) => {
+    if (Object.prototype.hasOwnProperty.call(source, field)) {
+      result[field] = source[field];
+    }
+    return result;
+  }, {});
+
+  // proto3 会省略 false，PRACTICE_END 未携带 completed 时按未达标处理。
+  snapshot.completed = message.completed === true;
+  snapshot.trainingType = source.trainingType || trainingType.value;
+  if (Array.isArray(message.details)) {
+    snapshot.details = message.details;
+  } else if (scores.value.length > 0) {
+    snapshot.details = [...scores.value];
+  } else if (Array.isArray(practiceInfo.value.details)) {
+    snapshot.details = practiceInfo.value.details;
+  } else {
+    delete snapshot.details;
+  }
+  return snapshot;
+};
+
+const mergePracticeResult = (apiResult = {}) => {
+  const snapshot = practiceEndSnapshot.value;
+  const snapshotDetails = Array.isArray(snapshot.details)
+    ? snapshot.details
+    : null;
+  const apiDetails = Array.isArray(apiResult.details) ? apiResult.details : null;
+  const details = snapshotDetails?.length
+    ? snapshotDetails
+    : apiDetails || snapshotDetails || [...scores.value];
+
+  return {
+    ...apiResult,
+    ...snapshot,
+    details,
+  };
+};
+
+const clearPracticeSyncTimer = () => {
+  if (!practiceSyncTimer) return;
+  clearTimeout(practiceSyncTimer);
+  practiceSyncTimer = null;
+};
+
+const cancelPracticeSyncWait = () => {
+  waitingPracticeSync = false;
+  clearPracticeSyncTimer();
+};
+
+const preparePracticeSyncWait = () => {
+  cancelPracticeSyncWait();
+  waitingPracticeSync = true;
+};
+
+const startPracticeSyncTimer = () => {
+  clearPracticeSyncTimer();
+  waitingPracticeSync = true;
+  practiceSyncTimer = setTimeout(() => {
+    practiceSyncTimer = null;
+    if (!waitingPracticeSync) return;
+    waitingPracticeSync = false;
+
+    if (foregroundResumeSyncPending.value) {
+      foregroundResumeSyncPending.value = false;
+      closePracticeConnection("training-practice-resume-timeout", {
+        sendLeave: false,
+      });
+      uni.showToast({
+        title: "训练重连失败，请重试",
+        icon: "none",
+      });
+      return;
+    }
+
+    if (pageStage.value !== pageStages.LOADING) return;
+
+    uni.showToast({
+      title: "练习信息获取失败，请重试",
+      icon: "none",
+    });
+    setTimeout(() => {
+      void exitPractice();
+    }, 500);
+  }, PRACTICE_SYNC_TIMEOUT_MS);
+};
+
+const onMatchSocketState = (event = {}) => {
+  if (event.state !== "open") return;
+  if (
+    event.matchId &&
+    String(event.matchId) !== String(practiseId.value)
+  ) {
+    return;
+  }
+
+  // 管理器会在 open 事件后立即发送 5，从这里开始计算响应超时。
+  startPracticeSyncTimer();
+};
+
+const onPracticeInfoSync = (payload = {}) => {
+  const responseMatchId = String(
+    payload.matchId || payload.practiceInfo?.id || ""
+  );
+  if (!responseMatchId || responseMatchId !== String(practiseId.value)) return;
+
+  const snapshot = payload.practiceInfo;
+  if (!snapshot || typeof snapshot !== "object") return;
+
+  const shouldShowDistance =
+    waitingPracticeSync && pageStage.value === pageStages.LOADING;
+  const resumedFromForeground = foregroundResumeSyncPending.value;
+  cancelPracticeSyncWait();
+  foregroundResumeSyncPending.value = false;
+  invalidateShotPresentations();
+
+  // 14 是完整快照，先清空旧值，避免 proto3 省略的 0 沿用上一份状态。
+  practiceInfo.value = {};
+  practiceEndSnapshot.value = {};
+  syncPracticeInfo(snapshot);
+  applyVisiblePrecisionTarget(practiceInfo.value);
+  scores.value = Array.isArray(snapshot.details) ? snapshot.details : [];
+
+  if (resumedFromForeground) {
+    hiddenWhileActive.value = false;
+  }
+
+  if (shouldShowDistance) {
+    start.value = false;
+    pageStage.value = pageStages.DISTANCE;
+  }
+};
+
+// 训练在难度页创建，目标页只消费连接上下文，避免进入页面后重复创建。
+const getTrainingContext = () => {
+  const context = uni.getStorageSync(trainingDifficultyStorageKey);
+  return context && typeof context === "object" ? context : {};
+};
+
+const updateTrainingContext = (practice = {}) => {
+  const context = getTrainingContext();
+  uni.setStorageSync(trainingDifficultyStorageKey, {
+    ...context,
+    trainingType: trainingParams.value.type,
+    difficultyLevel: trainingParams.value.difficulty,
+    practiceId: practice.id || "",
+    serverAddr: practice.serverAddr || "",
+    createdAt: practice.id ? Date.now() : 0,
+  });
+};
+
+const clearPracticeRuntimeContext = () => {
+  const context = getTrainingContext();
+  if (
+    context.practiceId &&
+    practiseId.value &&
+    String(context.practiceId) !== String(practiseId.value)
+  ) {
+    return;
+  }
+
+  const {
+    practiceId: _practiceId,
+    serverAddr: _serverAddr,
+    createdAt: _createdAt,
+    ...selectionContext
+  } = context;
+  uni.setStorageSync(trainingDifficultyStorageKey, selectionContext);
+};
+
+const closePracticeConnection = (reason, { sendLeave = true } = {}) => {
+  cancelPracticeSyncWait();
+  if (connectionClosed.value) return;
+  connectionClosed.value = true;
+  closeMatchWebSocket({ reason, sendLeave });
+};
+
+const connectPracticeServer = ({
+  resumableOnAppHide = appHideResumable.value,
+} = {}) => {
+  if (!practiseId.value || !String(serverAddr.value || "").trim()) {
+    return false;
+  }
+
+  appHideResumable.value = resumableOnAppHide === true;
+  cancelPracticeSyncWait();
+  closeMatchWebSocket({ reason: "training-practice-switch" });
+  preparePracticeSyncWait();
+  connectMatchWebSocket({
+    serverAddr: serverAddr.value,
+    matchId: practiseId.value,
+    userId: user.value.id,
+    requestPracticeInfoOnOpen: true,
+    appHideResumable: appHideResumable.value,
+    practiceEndAudioKey: "练习结束",
+  });
+  connectionClosed.value = false;
+  return true;
+};
+
+// 返回、切后台和页面销毁可能连续触发，复用同一个 stop 任务避免重复请求。
+const stopCurrentPractice = () => {
+  if (
+    !practiseId.value ||
+    practiceEnded.value ||
+    stopCompleted.value
+  ) {
+    return Promise.resolve();
+  }
+  if (stopPracticeTask) return stopPracticeTask;
+
+  stopInFlight.value = true;
+  stopPracticeTask = endPractiseAPI(practiseId.value)
+    .then(() => {
+      stopCompleted.value = true;
+      clearPracticeRuntimeContext();
+    })
+    .catch((error) => {
+      console.error("training practice stop failed", error);
+    })
+    .finally(() => {
+      stopInFlight.value = false;
+      stopPracticeTask = null;
+    });
+
+  return stopPracticeTask;
+};
+
+// 当前训练不可恢复时，始终使用页面本地的练习 ID 停止。
+const stopEndedCurrentPracticeAndExit = async () => {
+  hiddenWhileActive.value = false;
+  foregroundResumeSyncPending.value = false;
+  setPracticeAppHideResumable(false);
+  exiting.value = true;
+
+  try {
+    await stopCurrentPractice();
+  } finally {
+    closePracticeConnection("training-practice-current-missing");
+    clearPracticeRuntimeContext();
+    uni.showToast({
+      title: "训练已结束，请重新进入",
+      icon: "none",
+    });
+    uni.navigateBack();
+  }
+};
+
+// 回到前台后先获取最新比赛服地址，再通过 type 5/type 14 恢复完整快照。
+const resumeCurrentPractice = async () => {
+  if (
+    resumeInFlight.value ||
+    !hiddenWhileActive.value ||
+    !appHideResumable.value ||
+    exiting.value
+  ) {
+    return;
+  }
+
+  resumeInFlight.value = true;
+  try {
+    let currentPractice;
+    try {
+      currentPractice = await getCurrentPractiseAPI();
+    } catch (error) {
+      if (!pageVisible.value || exiting.value) return;
+      console.error("get current practice failed", error);
+      await stopEndedCurrentPracticeAndExit();
+      return;
+    }
+
+    console.log(1111111111111111111111, currentPractice)
+    if (
+      !pageVisible.value ||
+      !hiddenWhileActive.value ||
+      exiting.value
+    ) {
+      return;
+    }
+
+    const latestPracticeId = currentPractice?.id;
+    const latestServerAddr = String(
+      currentPractice?.serverAddr || ""
+    ).trim();
+    if (
+      currentPractice === null ||
+      !latestPracticeId ||
+      !latestServerAddr
+    ) {
+      await stopEndedCurrentPracticeAndExit();
+      return;
+    }
+
+    practiseId.value = latestPracticeId;
+    serverAddr.value = latestServerAddr;
+    updateTrainingContext({
+      id: latestPracticeId,
+      serverAddr: latestServerAddr,
+    });
+
+    foregroundResumeSyncPending.value = true;
+    setPracticeAppHideResumable(true);
+    if (!connectPracticeServer({ resumableOnAppHide: true })) {
+      foregroundResumeSyncPending.value = false;
+      await stopEndedCurrentPracticeAndExit();
+    }
+  } catch (error) {
+    foregroundResumeSyncPending.value = false;
+    if (!pageVisible.value || exiting.value) return;
+    console.error("training practice resume failed", error);
+    uni.showToast({
+      title: "训练重连失败，请重试",
+      icon: "none",
+    });
+  } finally {
+    resumeInFlight.value = false;
+  }
+};
+
+const createPractice = async () => {
+  const trainingType = trainingParams.value.type;
+  const difficultyLevel = trainingParams.value.difficulty;
+
+  if (!trainingType || difficultyLevel <= 0) {
+    uni.showToast({
+      title: "训练参数异常，请重新选择难度",
+      icon: "none",
+    });
+    return null;
+  }
+
+  closePracticeConnection("training-practice-recreate");
+  const result = await createPractiseV2API(trainingType, difficultyLevel);
+
+  if (!result?.id || !String(result?.serverAddr || "").trim()) {
+    if (result?.id) {
+      try {
+        await endPractiseAPI(result.id);
+      } catch (error) {
+        console.error("training practice cleanup failed", error);
+      }
+    }
+    uni.showToast({
+      title: "练习连接信息异常，请重试",
+      icon: "none",
+    });
+    return null;
+  }
+
+  practiseId.value = result.id;
+  serverAddr.value = result.serverAddr;
+  practiceEnded.value = false;
+  stopCompleted.value = false;
+  stopInFlight.value = false;
+  stopPracticeTask = null;
+  updateTrainingContext(result);
+  connectPracticeServer({ resumableOnAppHide: true });
+  return result;
+};
+
+const clearHighlightTestTimer = () => {
+  if (highlightTestTimer.value) {
+    clearInterval(highlightTestTimer.value);
+    highlightTestTimer.value = null;
+  }
+};
+
+// 开发环境测试入口：依次切换 8 个顺时针区域，偶数区域只高亮指定环。
+const runHighlightTest = () => {
+  clearHighlightTestTimer();
+  useHighlightTest.value = true;
+  practiseResult.value = {};
+  pageStage.value = pageStages.SHOOTING;
+  start.value = true;
+
+  let block = 1;
+  highlightTestState.value = {
+    blocks: 8,
+    randomBlock: block,
+    randomRingArea: 0,
+  };
+
+  highlightTestTimer.value = setInterval(() => {
+    if (block >= highlightTestState.value.blocks) {
+      clearHighlightTestTimer();
+      return;
+    }
+
+    block += 1;
+    highlightTestState.value = {
+      blocks: 8,
+      randomBlock: block,
+      randomRingArea: block % 2 === 0 ? Math.min(block, 10) : 0,
+    };
+  }, 1000);
+};
+
+const resetHighlightTest = () => {
+  clearHighlightTestTimer();
+  useHighlightTest.value = false;
+  highlightTestState.value = {
+    blocks: 8,
+    randomBlock: 1,
+    randomRingArea: 0,
+  };
+  scores.value = [];
+};
+
+onLoad((options = {}) => {
+  const trainingContext = getTrainingContext();
+  targetType.value = toPositiveRouteNumber(options.target, defaultTargetType);
+  total.value = toPositiveRouteNumber(options.arrows, defaultTotal);
+  trainingParams.value = {
+    type: options.type || trainingContext.trainingType || "",
+    difficultyId: options.difficultyId || "",
+    difficulty: toRouteNumber(
+      options.difficulty,
+      toRouteNumber(trainingContext.difficultyLevel)
+    ),
+    recordId: options.recordId || "",
+    hitReq: toRouteNumber(options.hitReq),
+    totalReq: toRouteNumber(options.totalReq),
+    blocks: toRouteNumber(options.blocks),
+    mode: toRouteNumber(options.mode),
+  };
+  practiseId.value = trainingContext.practiceId || "";
+  serverAddr.value = trainingContext.serverAddr || "";
+});
+
+const onReady = async () => {
+  if (
+    !practiseId.value ||
+    practiceEnded.value ||
+    stopCompleted.value ||
+    stopInFlight.value
+  ) {
+    uni.showToast({
+      title: "训练已结束，请重新进入",
+      icon: "none",
+    });
+    return;
+  }
+
+  pageStage.value = pageStages.LOADING;
+  clearHighlightTestTimer();
+  useHighlightTest.value = false;
+  practiceEndSnapshot.value = {};
+  invalidateShotPresentations();
+  try {
+    await startPractiseAPI(practiseId.value);
+    practiseResult.value = {};
+    scores.value = [];
+    shotEffectToken.value = 0;
+    start.value = true;
+    pageStage.value = pageStages.SHOOTING;
+    setPracticeAppHideResumable(true);
+    audioManager.play("练习开始");
+  } catch (error) {
+    start.value = false;
+    pageStage.value = pageStages.DISTANCE;
+    setPracticeAppHideResumable(true);
+    throw error;
+  }
+};
+
+const onTimeLimitReached = () => {
+  if (!hasTimeLimit.value || !isShootingStage.value) return;
+  // 本地倒计时只负责停止射击展示，最终结算以 PRACTICE_END 为准。
+  start.value = false;
+  hiddenWhileActive.value = false;
+  setPracticeAppHideResumable(false);
+};
+
+const enterPracticeResult = (result = {}) => {
+  practiseResult.value = result;
+  if (!hasPractiseResult.value) return false;
+
+  // 正常结算不调用 stop，只清理上下文并断开比赛服连接。
+  practiceEnded.value = true;
+  setPracticeAppHideResumable(false);
+  invalidateShotPresentations();
+  clearPracticeRuntimeContext();
+  closePracticeConnection("training-practice-result");
+  pageStage.value = pageStages.RESULT;
+  return true;
+};
+
+const onOver = async () => {
+  if (!isShootingStage.value) return;
+
+  clearHighlightTestTimer();
+  pageStage.value = pageStages.LOADING;
+  start.value = false;
+  setPracticeAppHideResumable(false);
+
+  try {
+    const apiResult = (await getPractiseAPI(practiseId.value)) || {};
+    await (nextDifficultyRequest || loadNextDifficultyState(apiResult));
+    if (!enterPracticeResult(mergePracticeResult(apiResult))) {
+      pageStage.value = pageStages.DISTANCE;
+    }
+  } catch (error) {
+    if (Object.keys(practiceEndSnapshot.value).length > 0) {
+      await (nextDifficultyRequest || loadNextDifficultyState(practiceEndSnapshot.value));
+      enterPracticeResult(mergePracticeResult());
+      return;
+    }
+    start.value = true;
+    pageStage.value = pageStages.SHOOTING;
+    setPracticeAppHideResumable(true);
+    throw error;
+  }
+};
+
+async function onReceiveMessage(msg) {
+  const previousScoreLength = scores.value.length;
+  syncPracticeInfo(msg);
+
+  if (msg.type === MESSAGETYPESV2.BattleStart) {
+    invalidateShotPresentations();
+    applyVisiblePrecisionTarget(practiceInfo.value);
+  } else if (
+    msg.type === MESSAGETYPESV2.ShootResult &&
+    isShootingStage.value
+  ) {
+    let hasNewShot = false;
+    let latestShot = null;
+    if (Array.isArray(msg.details)) {
+      scores.value = msg.details;
+      hasNewShot = msg.details.length === previousScoreLength + 1;
+      latestShot = hasNewShot ? msg.details[msg.details.length - 1] : null;
+    }
+
+    if (trainingType.value === "precision") {
+      const generation = invalidateShotPresentations();
+      const target = getPrecisionTargetSnapshot(practiceInfo.value);
+      const nextEffectToken = hasNewShot ? shotEffectToken.value + 1 : 0;
+      const effectPromise = waitForShotEffect(
+        nextEffectToken,
+        hasNewShot && shouldWaitForShotEffect(latestShot)
+      );
+      const audioPromise = playAudioKeysAndWait(
+        buildShootResultAudioKeys(msg)
+      );
+
+      if (hasNewShot) {
+        shotEffectToken.value = nextEffectToken;
+      }
+      void commitPrecisionTargetAfterPresentation({
+        generation,
+        target,
+        audioPromise,
+        effectPromise,
+      });
+    } else if (hasNewShot) {
+      shotEffectToken.value += 1;
+    }
+  } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
+    practiceEndSnapshot.value = createPracticeEndSnapshot(msg);
+    void loadNextDifficultyState(practiceEndSnapshot.value);
+    if (
+      trainingType.value === "base" &&
+      Number(msg.status) === 3 &&
+      !Object.prototype.hasOwnProperty.call(msg, "arrowsLeft")
+    ) {
+      practiceInfo.value = {
+        ...practiceInfo.value,
+        arrowsLeft: 0,
+      };
+    }
+    practiceEnded.value = true;
+    setPracticeAppHideResumable(false);
+    invalidateShotPresentations();
+    clearPracticeRuntimeContext();
+    // setTimeout(onOver, 1500);
+  }
+}
+
+function onComplete() {
+  pageStage.value = pageStages.LOADING;
+  start.value = false;
+  practiceEnded.value = true;
+  setPracticeAppHideResumable(false);
+  invalidateShotPresentations();
+  clearPracticeRuntimeContext();
+  closePracticeConnection("training-practice-complete");
+  uni.navigateBack();
+}
+
+async function onRetry() {
+  pageStage.value = pageStages.LOADING;
+  setPracticeAppHideResumable(false);
+  clearHighlightTestTimer();
+  useHighlightTest.value = false;
+  resetNextDifficultyState();
+  practiseId.value = "";
+  serverAddr.value = "";
+  practiseResult.value = {};
+  practiceEndSnapshot.value = {};
+  practiceInfo.value = {};
+  invalidateShotPresentations({ resetVisible: true });
+  start.value = false;
+  scores.value = [];
+  shotEffectToken.value = 0;
+  try {
+    const practice = await createPractice();
+    if (!practice) pageStage.value = pageStages.DISTANCE;
+  } catch (error) {
+    console.error("training practice retry failed", error);
+    pageStage.value = pageStages.DISTANCE;
+  }
+}
+
+const onClickShare = debounce(async () => {
+  await sharePractiseData("shareCanvas", 2, user.value, practiseResult.value);
+  await wxShare("shareCanvas");
+});
+
+function onAudioEnded(key) {
+  Array.from(audioWaiters).forEach((waiter) => {
+    if (waiter.expectedKey === key) waiter.done();
+  });
+  if (["比赛结束", "练习结束"].includes(String(key || ""))) {
+    void onOver();
+  }
+}
+
+const updateSound = () => {
+  sound.value = !sound.value;
+  audioManager.setMuted(!sound.value);
+};
+
+const exitPractice = async () => {
+  if (exiting.value) return;
+  exiting.value = true;
+  setPracticeAppHideResumable(false);
+  invalidateShotPresentations();
+
+  try {
+    await stopCurrentPractice();
+  } finally {
+    closePracticeConnection("training-practice-exit");
+    clearPracticeRuntimeContext();
+    uni.navigateBack();
+  }
+};
+
+onHide(() => {
+  pageVisible.value = false;
+  if (
+    !appHideResumable.value ||
+    exiting.value ||
+    !practiseId.value ||
+    practiceEnded.value ||
+    stopCompleted.value
+  ) {
+    return;
+  }
+
+  hiddenWhileActive.value = true;
+  invalidateShotPresentations();
+});
+
+onShow(async () => {
+  pageVisible.value = true;
+  await resumeCurrentPractice();
+});
+
+onUnload(() => {
+  setPracticeAppHideResumable(false);
+  invalidateShotPresentations();
+  clearPracticeRuntimeContext();
+  void stopCurrentPractice();
+  closePracticeConnection("training-practice-unload");
+});
+
+onMounted(() => {
+  // audioManager.play("第一轮");
+  uni.setKeepScreenOn({
+    keepScreenOn: true,
+  });
+  uni.$on("socket-inbox", onReceiveMessage);
+  uni.$on(MATCH_WS_PRACTICE_SYNC_EVENT, onPracticeInfoSync);
+  uni.$on(MATCH_WS_STATE_EVENT, onMatchSocketState);
+  uni.$on("share-image", onClickShare);
+  uni.$on("audioEnded", onAudioEnded);
+  if (!connectPracticeServer({ resumableOnAppHide: true })) {
+    uni.showToast({
+      title: "练习连接信息异常，请重试",
+      icon: "none",
+    });
+    setTimeout(() => {
+      void exitPractice();
+    }, 500);
+  }
+});
+
+onBeforeUnmount(() => {
+  setPracticeAppHideResumable(false);
+  invalidateShotPresentations();
+  clearPracticeRuntimeContext();
+  void stopCurrentPractice();
+  uni.setKeepScreenOn({
+    keepScreenOn: false,
+  });
+  uni.$off("socket-inbox", onReceiveMessage);
+  uni.$off(MATCH_WS_PRACTICE_SYNC_EVENT, onPracticeInfoSync);
+  uni.$off(MATCH_WS_STATE_EVENT, onMatchSocketState);
+  uni.$off("share-image", onClickShare);
+  uni.$off("audioEnded", onAudioEnded);
+  audioManager.stopAll();
+  clearHighlightTestTimer();
+  closePracticeConnection("training-practice-unmount");
+});
+</script>
+
+<template>
+  <Container
+    :bgType="isDistanceStage ? 9 : 11"
+    :showBottom="isDistanceStage"
+    :scroll="!isShootingStage"
+    :onBack="exitPractice"
+  >
+    <view class="practise-content">
+      <TestDistance
+        v-if="isDistanceStage"
+        :targetType="practiceInfo.targetType"
+      />
+      <view v-else-if="isShootingStage" class="shooting-layout">
+        <view class="shooting-fixed">
+          <ShootProgress
+            :start="start"
+            :total="timeLimit"
+            :countdownEnabled="hasTimeLimit"
+            :trainingType="trainingType"
+            :isVip="isVip"
+            :isSvip="isSvip"
+            :externalShootResultAudio="trainingType === 'precision'"
+            :onStop="onTimeLimitReached"
+          />
+          <view class="user-row">
+            <!-- <Avatar :src="user.avatar" :size="35" /> -->
+            <BubbleTip v-if="showGuide" type="normal2">
+              <text>还有两场，坚持</text>
+              <text>就是胜利！💪</text>
+            </BubbleTip>
+            <!-- <BowPower /> -->
+          </view>
+          <BowTarget
+            :totalRound="start ? total / 4 : 0"
+            :currentRound="scores.length % 3"
+            :scores="scores"
+            :isSvip="isSvip"
+            :shotEffectToken="shotEffectToken"
+            :showCrosshair="false"
+            :sectorCount="precisionBlocks"
+            :activeSector="precisionRandomBlock"
+            :activeRing="precisionRandomRingArea"
+            :showSectorLabels="precisionBlocks > 0"
+            stable-shot-effect
+            @shot-effect-complete="onShotEffectComplete"
+          />
+          <!-- <view v-if="env !== 'release'" class="highlight-test-actions">
+            <button
+              class="highlight-test-btn"
+              hover-class="none"
+              @click="runHighlightTest"
+            >
+              扇区测试
+            </button>
+            <button
+              class="highlight-test-btn"
+              hover-class="none"
+              @click="resetHighlightTest"
+            >
+              重置高亮
+            </button>
+          </view> -->
+          <view class="sound-text-box">
+            <button class="sound-btn" hover-class="none" @click="updateSound">
+              <image
+                class="sound-icon"
+                :src="`/static/sound${sound ? '' : '-off'}-yellow.png`"
+                mode="aspectFit"
+              />
+            </button>
+            <view class="bat-text-big-box">
+              <image
+                class="dao-icon"
+                src="https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/dao-icon.png"
+                mode="widthFix"
+              />
+              <view v-if="trainingCopy" class="bat-text-box">
+                <view class="bat-text-small-box">
+                  <view class="text-round-box">
+                    <view class="text1">{{ trainingCopy.title }}</view>
+                    <view class="text2">
+                      <text
+                        v-for="(part, index) in trainingCopy.details"
+                        :key="index"
+                        :class="{ 'text2-yellow': part.highlight }"
+                      >{{ part.text }}</text>
+                    </view>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+        <scroll-view
+          class="score-scroll"
+          scroll-y
+          :enhanced="true"
+          :show-scrollbar="false"
+        >
+          <ScorePanel2 :arrows="scores" :total="total" />
+        </scroll-view>
+      </view>
+      <ScoreResult
+        v-else-if="showResult"
+        :rowCount="6"
+        :total="total"
+        :onClose="onComplete"
+        :onRetry="onRetry"
+        :trainingType="trainingType"
+        :difficultyLevel="currentDifficultyLevel"
+        :hasNextDifficulty="hasNextDifficulty"
+        :result="practiseResult"
+      />
+      <canvas class="share-canvas" id="shareCanvas" type="2d"></canvas>
+    </view>
+    <template #bottom>
+      <view class="btn-box">
+        <image
+          class="btn-box-bg"
+          src="https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/par-star.png"
+          mode="widthFix"
+        />
+        <button class="btn" @click="onReady">准备好了，开始练习</button>
+      </view>
+    </template>
+  </Container>
+</template>
+
+<style scoped>
+.practise-content {
+  height: 100%;
+  min-height: 0;
+}
+
+.shooting-layout {
+  height: 100%;
+  min-height: 0;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+}
+
+.shooting-fixed {
+  flex-shrink: 0;
+}
+
+.score-scroll {
+  flex: 1;
+  height: 0;
+  min-height: 0;
+  overflow: hidden;
+}
+
+.btn-box{
+  width: 488rpx;
+  height: 234rpx;
+  position: fixed;
+  bottom: 130rpx;
+  left: 50%;
+  transform: translateX(-50%);
+}
+.btn-box-bg{
+  width: 100%;
+}
+.btn{
+  width: 330rpx;
+  height: 70rpx;
+  line-height: 70rpx;
+  background: #FED847;
+  border-radius: 44rpx;
+  text-align: center;
+  color: #000000;
+  font-size: 28rpx;
+  font-weight: 500;
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  bottom: -36rpx;
+}
+
+.highlight-test-actions {
+  display: flex;
+  justify-content: center;
+  margin-top: -24rpx;
+  position: relative;
+  z-index: 10;
+}
+
+.highlight-test-btn {
+  width: 150rpx;
+  height: 48rpx;
+  line-height: 48rpx;
+  padding: 0;
+  border-radius: 24rpx;
+  background: rgba(0, 0, 0, 0.48);
+  color: #fed847;
+  font-size: 22rpx;
+}
+
+.highlight-test-btn::after {
+  border: none;
+}
+
+.highlight-test-btn + .highlight-test-btn {
+  margin-left: 16rpx;
+}
+
+.sound-text-box{
+  height: 125rpx;
+  padding: 0 56rpx;
+  display: flex;
+  align-items: flex-end;
+}
+.sound-btn {
+  width: 76rpx;
+  height: 70rpx;
+  border: none;
+}
+
+.sound-btn::after {
+  border: none;
+}
+
+.sound-icon {
+  width: 76rpx;
+  height: 70rpx;
+}
+.bat-text-big-box{
+  flex: 1;
+  position: relative;
+}
+.dao-icon{
+  width: 160rpx;
+  height: 125rpx;
+  position: absolute;
+  left: 0;
+  bottom: 0;
+}
+.text-round-box{
+  width: 100%;
+}
+.bat-text-box{
+  display: flex;
+}
+.bat-text-small-box{
+  background: rgba(0, 0, 0, 0.5);
+  width: auto;
+  min-width: 100rpx;
+  border-radius: 16rpx 60rpx 60rpx 16rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  padding-left: 176rpx;
+  height: 112rpx;
+  padding-right: 30rpx;
+  font-size: 30rpx;
+  color: #E7BA80;
+}
+.text1{
+  font-size: 30rpx;
+  font-weight: 400;
+  color: #E7BA80;
+  line-height: 42rpx;
+}
+.text2{
+  color: #FFFFFF;
+  font-size: 26rpx;
+  font-weight: 400;
+  line-height: 36rpx;
+}
+.text2-yellow{
+  font-size: 30rpx;
+  color: #FFD947;
+  font-weight: 500;
+  margin: 0 4rpx;
+}
+</style>
diff --git a/src/pages/user.vue b/src/pages/user.vue
index e123964..9589d27 100644
--- a/src/pages/user.vue
+++ b/src/pages/user.vue
@@ -77,7 +77,7 @@ const buildVersion = typeof __BUILD_TIME__ !== 'undefined' ? __BUILD_TIME__ : ''
 <template>
   <Container title="用户信息">
     <view :style="{ width: '100%', height: '100%' }">
-      <UserHeader />
+      <UserHeader fullNickname />
       <scroll-view
         scroll-y
         :show-scrollbar="false"
@@ -104,7 +104,20 @@ const buildVersion = typeof __BUILD_TIME__ !== 'undefined' ? __BUILD_TIME__ : ''
           <text v-else :style="{ color: '#CC311F' }">未完成</text>
         </UserItem>
         <UserItem title="会员" :onClick="toBeVipPage">
-          已赠送6个月会员
+          <view
+            v-if="user.sVip === true"
+            class="member-nickname member-nickname--svip"
+          >
+            <text class="member-nickname__text">已开通SVIP</text>
+            <text class="member-nickname__shine">已开通SVIP</text>
+          </view>
+          <view
+            v-else-if="user.vip === true"
+            class="member-nickname member-nickname--vip"
+          >
+            <text class="member-nickname__text">已开通VIP</text>
+          </view>
+          <text v-else>未开通</text>
         </UserItem>
         <UserItem title="等级介绍" :onClick="toGradeIntroPage">
           <text :style="{ color: '#4C76FF' }">Lv{{ user.lvl }}</text>
@@ -115,7 +128,7 @@ const buildVersion = typeof __BUILD_TIME__ !== 'undefined' ? __BUILD_TIME__ : ''
             }"
             >{{ user.lvlPoints }}</text
           >
-          <text>点</text>
+          <text>经验</text>
         </UserItem>
         <UserItem
           title="段位介绍"
@@ -124,15 +137,16 @@ const buildVersion = typeof __BUILD_TIME__ !== 'undefined' ? __BUILD_TIME__ : ''
           }"
           :onClick="toRankIntroPage"
         >
-          <text :style="{ color: '#8E53EA' }">{{ user.lvlName }}</text>
-          <text
-            :style="{
-              color: '#FF7900',
-              marginLeft: '5px',
-            }"
-            >{{ user.scores }}</text
-          >
-          <text>点</text>
+          <view v-if="user.rankIcon || user.rankName" class="rank-info">
+            <image
+              v-if="user.rankIcon"
+              class="rank-info__frame"
+              :src="user.rankIcon"
+              mode="aspectFit"
+            />
+            <text>{{ user.rankName || "暂无段位" }}</text>
+          </view>
+          <text v-else>暂无段位</text>
         </UserItem>
         <view class="my-grow" @click="toMyGrowthPage">
           <image src="https://static.shelingxingqiu.com/shootmini/static/my-grow.png" mode="widthFix" />
@@ -170,4 +184,13 @@ const buildVersion = typeof __BUILD_TIME__ !== 'undefined' ? __BUILD_TIME__ : ''
 .my-grow > image {
   width: 100%;
 }
+.rank-info {
+  display: flex;
+  align-items: center;
+}
+.rank-info__frame {
+  width: 64rpx;
+  height: 64rpx;
+  margin-right: 8rpx;
+}
 </style>
diff --git a/src/static/training-difficulty-design/20cm.png b/src/static/training-difficulty-design/20cm.png
new file mode 100644
index 0000000..828974d
Binary files /dev/null and b/src/static/training-difficulty-design/20cm.png differ
diff --git a/src/static/training-difficulty-design/40cm.png b/src/static/training-difficulty-design/40cm.png
new file mode 100644
index 0000000..11586d9
Binary files /dev/null and b/src/static/training-difficulty-design/40cm.png differ
diff --git a/src/static/training-difficulty-design/block-gold.png b/src/static/training-difficulty-design/block-gold.png
new file mode 100644
index 0000000..9d70a59
Binary files /dev/null and b/src/static/training-difficulty-design/block-gold.png differ
diff --git a/src/static/training-difficulty-design/block-gray.png b/src/static/training-difficulty-design/block-gray.png
new file mode 100644
index 0000000..e397dd2
Binary files /dev/null and b/src/static/training-difficulty-design/block-gray.png differ
diff --git a/src/static/training-difficulty-design/btn.png b/src/static/training-difficulty-design/btn.png
new file mode 100644
index 0000000..8b7c04a
Binary files /dev/null and b/src/static/training-difficulty-design/btn.png differ
diff --git a/src/static/training-difficulty-design/cha.png b/src/static/training-difficulty-design/cha.png
new file mode 100644
index 0000000..31f1cfc
Binary files /dev/null and b/src/static/training-difficulty-design/cha.png differ
diff --git a/src/static/training-difficulty-design/dao-icon.png b/src/static/training-difficulty-design/dao-icon.png
new file mode 100644
index 0000000..428e8fc
Binary files /dev/null and b/src/static/training-difficulty-design/dao-icon.png differ
diff --git a/src/static/training-difficulty-design/gou.png b/src/static/training-difficulty-design/gou.png
new file mode 100644
index 0000000..e108513
Binary files /dev/null and b/src/static/training-difficulty-design/gou.png differ
diff --git a/src/static/training-difficulty-design/jiantou.png b/src/static/training-difficulty-design/jiantou.png
new file mode 100644
index 0000000..a232722
Binary files /dev/null and b/src/static/training-difficulty-design/jiantou.png differ
diff --git a/src/static/training-difficulty-design/lock.svg b/src/static/training-difficulty-design/lock.svg
new file mode 100644
index 0000000..7d77123
--- /dev/null
+++ b/src/static/training-difficulty-design/lock.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="55px" height="55px" viewBox="0 0 55 55" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 11</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="训练难度展示" transform="translate(-160.000000, -478.000000)">
+            <g id="编组-2备份" transform="translate(154.000000, 472.000000)">
+                <g id="编组-11" transform="translate(6.000000, 6.000000)">
+                    <circle id="椭圆形" fill="#CACACA" cx="27.5" cy="27.5" r="27.5"></circle>
+                    <circle id="椭圆形" fill="#FFFFFF" cx="27.5" cy="26" r="25"></circle>
+                    <circle id="椭圆形" fill="#5E5E5E" cx="27.5" cy="26" r="22"></circle>
+                    <circle id="椭圆形" fill="#17B6F2" cx="27.5" cy="26" r="19.5"></circle>
+                    <circle id="椭圆形" fill="#FFC2C2" cx="27.5" cy="26" r="17"></circle>
+                    <circle id="椭圆形" fill="#FF1F33" opacity="0.800000012" cx="27.5" cy="26" r="14.5"></circle>
+                    <circle id="椭圆形" fill="#FED847" cx="27.5" cy="26" r="13"></circle>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/static/training-difficulty-design/par-bg.png b/src/static/training-difficulty-design/par-bg.png
new file mode 100644
index 0000000..ff05d28
Binary files /dev/null and b/src/static/training-difficulty-design/par-bg.png differ
diff --git a/src/static/training-difficulty-design/par-star.png b/src/static/training-difficulty-design/par-star.png
new file mode 100644
index 0000000..9d1b80f
Binary files /dev/null and b/src/static/training-difficulty-design/par-star.png differ
diff --git a/src/static/training-difficulty-design/result-bg.png b/src/static/training-difficulty-design/result-bg.png
new file mode 100644
index 0000000..0eeb83d
Binary files /dev/null and b/src/static/training-difficulty-design/result-bg.png differ
diff --git a/src/static/training-difficulty-design/result-c-bg.png b/src/static/training-difficulty-design/result-c-bg.png
new file mode 100644
index 0000000..8fce567
Binary files /dev/null and b/src/static/training-difficulty-design/result-c-bg.png differ
diff --git a/src/static/training-difficulty-design/result-icon-1.png b/src/static/training-difficulty-design/result-icon-1.png
new file mode 100644
index 0000000..3d61cfa
Binary files /dev/null and b/src/static/training-difficulty-design/result-icon-1.png differ
diff --git a/src/static/training-difficulty-design/result-icon-2.png b/src/static/training-difficulty-design/result-icon-2.png
new file mode 100644
index 0000000..9bd76b5
Binary files /dev/null and b/src/static/training-difficulty-design/result-icon-2.png differ
diff --git a/src/static/training-difficulty-design/result-icon-3.png b/src/static/training-difficulty-design/result-icon-3.png
new file mode 100644
index 0000000..5f9dd86
Binary files /dev/null and b/src/static/training-difficulty-design/result-icon-3.png differ
diff --git a/src/static/training-difficulty-design/result-rice.png b/src/static/training-difficulty-design/result-rice.png
new file mode 100644
index 0000000..c77f776
Binary files /dev/null and b/src/static/training-difficulty-design/result-rice.png differ
diff --git a/src/static/training-difficulty-design/result-t-bg.png b/src/static/training-difficulty-design/result-t-bg.png
new file mode 100644
index 0000000..00616ef
Binary files /dev/null and b/src/static/training-difficulty-design/result-t-bg.png differ
diff --git a/src/static/training-difficulty-design/result-up.png b/src/static/training-difficulty-design/result-up.png
new file mode 100644
index 0000000..66cd43f
Binary files /dev/null and b/src/static/training-difficulty-design/result-up.png differ
diff --git a/src/static/training-difficulty-design/text-icon-jcxl.png b/src/static/training-difficulty-design/text-icon-jcxl.png
new file mode 100644
index 0000000..0ae6cfd
Binary files /dev/null and b/src/static/training-difficulty-design/text-icon-jcxl.png differ
diff --git a/src/static/training-difficulty-design/text-icon-jingzxl.png b/src/static/training-difficulty-design/text-icon-jingzxl.png
new file mode 100644
index 0000000..74a3b20
Binary files /dev/null and b/src/static/training-difficulty-design/text-icon-jingzxl.png differ
diff --git a/src/static/training-difficulty-design/text-icon-jzxl.png b/src/static/training-difficulty-design/text-icon-jzxl.png
new file mode 100644
index 0000000..ab04fb0
Binary files /dev/null and b/src/static/training-difficulty-design/text-icon-jzxl.png differ
diff --git a/src/static/training-difficulty-design/text-icon-nlxl.png b/src/static/training-difficulty-design/text-icon-nlxl.png
new file mode 100644
index 0000000..72a7e09
Binary files /dev/null and b/src/static/training-difficulty-design/text-icon-nlxl.png differ
diff --git a/src/static/training-difficulty-design/text.png b/src/static/training-difficulty-design/text.png
new file mode 100644
index 0000000..e71442c
Binary files /dev/null and b/src/static/training-difficulty-design/text.png differ
diff --git a/src/static/training-difficulty-design/unlock.svg b/src/static/training-difficulty-design/unlock.svg
new file mode 100644
index 0000000..348bea1
--- /dev/null
+++ b/src/static/training-difficulty-design/unlock.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="56px" height="55px" viewBox="0 0 56 55" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 9</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="训练难度展示" transform="translate(-60.000000, -313.000000)">
+            <g id="编组-2备份" transform="translate(54.500000, 307.000000)">
+                <g id="编组-9" transform="translate(5.500000, 6.000000)">
+                    <circle id="椭圆形" fill="#CACACA" cx="28" cy="27.5" r="27.5"></circle>
+                    <circle id="椭圆形" fill="#FFFFFF" cx="28" cy="26" r="25"></circle>
+                    <circle id="椭圆形" fill="#5E5E5E" cx="28" cy="26" r="22"></circle>
+                    <circle id="椭圆形" fill="#808080" cx="28" cy="26" r="19.5"></circle>
+                    <circle id="椭圆形" fill="#FFFFFF" cx="28" cy="26" r="17"></circle>
+                    <circle id="椭圆形" fill="#8C8C8C" cx="28" cy="26" r="14.5"></circle>
+                    <circle id="椭圆形" fill="#DBDBDB" cx="28" cy="26" r="13"></circle>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/src/static/training-home/done.png b/src/static/training-home/done.png
new file mode 100644
index 0000000..118e769
Binary files /dev/null and b/src/static/training-home/done.png differ
diff --git a/src/static/training-home/img_16.png b/src/static/training-home/img_16.png
new file mode 100644
index 0000000..ac2142d
Binary files /dev/null and b/src/static/training-home/img_16.png differ
diff --git a/src/static/training-home/img_17.png b/src/static/training-home/img_17.png
new file mode 100644
index 0000000..691dda7
Binary files /dev/null and b/src/static/training-home/img_17.png differ
diff --git a/src/static/training-home/img_19.png b/src/static/training-home/img_19.png
new file mode 100644
index 0000000..dd55d9b
Binary files /dev/null and b/src/static/training-home/img_19.png differ
diff --git a/src/static/training-home/img_20.png b/src/static/training-home/img_20.png
new file mode 100644
index 0000000..c4aff5a
Binary files /dev/null and b/src/static/training-home/img_20.png differ
diff --git a/src/static/training-home/img_21.png b/src/static/training-home/img_21.png
new file mode 100644
index 0000000..2a91b81
Binary files /dev/null and b/src/static/training-home/img_21.png differ
diff --git a/src/static/training-home/img_22.png b/src/static/training-home/img_22.png
new file mode 100644
index 0000000..5caeef0
Binary files /dev/null and b/src/static/training-home/img_22.png differ
diff --git a/src/static/training-home/img_28.png b/src/static/training-home/img_28.png
new file mode 100644
index 0000000..3c1fc81
Binary files /dev/null and b/src/static/training-home/img_28.png differ
diff --git a/src/static/training-home/img_3.png b/src/static/training-home/img_3.png
new file mode 100644
index 0000000..1a7833b
Binary files /dev/null and b/src/static/training-home/img_3.png differ
diff --git a/src/static/training-home/img_4.png b/src/static/training-home/img_4.png
new file mode 100644
index 0000000..a9f5fa6
Binary files /dev/null and b/src/static/training-home/img_4.png differ
diff --git a/src/static/training-home/img_5.png b/src/static/training-home/img_5.png
new file mode 100644
index 0000000..3c9a87d
Binary files /dev/null and b/src/static/training-home/img_5.png differ
diff --git a/src/static/training-home/img_6.png b/src/static/training-home/img_6.png
new file mode 100644
index 0000000..59bee8b
Binary files /dev/null and b/src/static/training-home/img_6.png differ
diff --git a/src/static/training-home/img_7.png b/src/static/training-home/img_7.png
new file mode 100644
index 0000000..c281676
Binary files /dev/null and b/src/static/training-home/img_7.png differ
diff --git a/src/static/training-home/jichuxunlian.png b/src/static/training-home/jichuxunlian.png
new file mode 100644
index 0000000..eda4ea8
Binary files /dev/null and b/src/static/training-home/jichuxunlian.png differ
diff --git a/src/static/training-home/jiezouxunlian.png b/src/static/training-home/jiezouxunlian.png
new file mode 100644
index 0000000..45ff66e
Binary files /dev/null and b/src/static/training-home/jiezouxunlian.png differ
diff --git a/src/static/training-home/jingzhunxunlian.png b/src/static/training-home/jingzhunxunlian.png
new file mode 100644
index 0000000..40b7e69
Binary files /dev/null and b/src/static/training-home/jingzhunxunlian.png differ
diff --git a/src/static/training-home/liliangxulian.png b/src/static/training-home/liliangxulian.png
new file mode 100644
index 0000000..61af0d4
Binary files /dev/null and b/src/static/training-home/liliangxulian.png differ
diff --git a/src/static/training-home/missed.png b/src/static/training-home/missed.png
new file mode 100644
index 0000000..a0e965c
Binary files /dev/null and b/src/static/training-home/missed.png differ
diff --git a/src/static/training-home/nailixunlian.png b/src/static/training-home/nailixunlian.png
new file mode 100644
index 0000000..a0b580c
Binary files /dev/null and b/src/static/training-home/nailixunlian.png differ
diff --git a/src/store.js b/src/store.js
index 45a4510..92f2f32 100644
--- a/src/store.js
+++ b/src/store.js
@@ -38,17 +38,15 @@ const getDefaultDailyCount = () => ({
 });
 
 const getLvlName = (rankLvl, rankList = []) => {
-  if (!rankList) return;
-  let lvlName = "";
-  rankList.some((r, index) => {
-    lvlName = rankList[index].name;
-    if (r.rank_id === rankLvl) {
-      lvlName = rankList[index].name;
-      return true;
-    }
-    return false;
-  });
-  return lvlName;
+  if (!Array.isArray(rankList) || rankLvl === undefined || rankLvl === null) {
+    return "";
+  }
+
+  // 仅返回真正匹配的段位，避免未加载时误取列表最后一项。
+  const rankInfo = rankList.find(
+    (item) => String(item.rank_id) === String(rankLvl)
+  );
+  return rankInfo?.name || "";
 };
 
 const getLvlNameByScore = (score, rankList = []) => {
diff --git a/src/utils/match.min.js b/src/utils/match.min.js
index 03f4d1c..4803dfe 100644
--- a/src/utils/match.min.js
+++ b/src/utils/match.min.js
@@ -1,4 +1,4 @@
 /* eslint-disable */
 import * as $protobuf from "protobufjs";
-const $root=$protobuf.Root.create({nested:{rpc:{ServerMessageType:{SERVER_MSG_UNKNOWN:0,SERVER_MSG_MATCH_READY:1,SERVER_MSG_MATCH_START:2,SERVER_MSG_NOW_YOU:3,SERVER_MSG_SHOT:4,SERVER_MSG_NEW_ROUND:5,SERVER_MSG_MATCH_END:6,SERVER_MSG_TIMEOUT:7,SERVER_MSG_CHECK:8,SERVER_MSG_RAND:9,SERVER_MSG_NOT_ENOUGH_DISTANCE:10,SERVER_MSG_PLAYER_LEFT:11,SERVER_MSG_HEARTBEAT:12,SERVER_MSG_PRACTICE_END:13},ClientMessageType:{CLIENT_MSG_UNKNOWN:0,CLIENT_MSG_HEARTBEAT_ACK:1,CLIENT_MSG_SHOOT_DATA:2,CLIENT_MSG_ACK:3,CLIENT_MSG_LEAVE:4},MatchStatus:{MATCH_STATUS_READY:0,MATCH_STATUS_STARTED:1,MATCH_STATUS_END:2,MATCH_STATUS_TIMEOUT:3,MATCH_STATUS_UNEXPECTEDLY:4},MatchPlayerStatus:{MATCH_PLAYER_STATUS_READY:0,MATCH_PLAYER_STATUS_STARTED:1,MATCH_PLAYER_STATUS_END:2},MatchShoot:{fields:{player_id:{type:"int64",id:1},status:{type:"int32",id:2},x:{type:"float",id:3},y:{type:"float",id:4},ring:{type:"int32",id:5},ring_x:{type:"bool",id:6},angle:{type:"float",id:7},distance:{type:"float",id:8},three_consecutive_10_rings:{type:"bool",id:9}}},MatchShootList:{fields:{items:{rule:"repeated",type:"MatchShoot",id:1}}},RoundScore:{fields:{total_ring:{type:"int32",id:1},score:{type:"int32",id:2},if_win:{type:"bool",id:3}}},MatchRound:{fields:{shoots:{rule:"map",type:"MatchShootList",id:1,keytype:"int64"},scores:{rule:"map",type:"RoundScore",id:2,keytype:"int32"},round:{type:"int32",id:3},if_gold:{type:"bool",id:4},status:{type:"int32",id:5},gold_round:{type:"int32",id:6}}},PlayerMatchResult:{fields:{total_ring:{type:"int32",id:1},user_id:{type:"int64",id:2},ten_ring_count:{type:"int32",id:3},average_ring:{type:"float",id:4}}},PlayerFull:{fields:{id:{type:"int64",id:1},name:{type:"string",id:2},avatar:{type:"string",id:3},exp:{type:"int32",id:4},score:{type:"int32",id:5},level:{type:"int32",id:6},before_level:{type:"int32",id:7},before_exp:{type:"int32",id:8},current_exp:{type:"int32",id:9},upgrade_exp:{type:"int32",id:10},active:{type:"int32",id:11},device_id:{type:"string",id:12},s_vip:{type:"bool",id:13},vip:{type:"bool",id:14},player_match_result:{type:"PlayerMatchResult",id:15}}},TeamInfo:{fields:{players:{rule:"repeated",type:"PlayerFull",id:1},id:{type:"int32",id:2},name:{type:"string",id:3},score:{type:"int32",id:4}}},CurrentShoot:{fields:{round:{type:"int32",id:1},round_id:{type:"int64",id:2},index:{type:"int32",id:3},start_time:{type:"int64",id:4},player_id:{type:"int64",id:5},gold_round:{type:"bool",id:6},start_time_text:{type:"string",id:7},my_index:{type:"int32",id:8},index_map:{rule:"map",type:"int32",id:9,keytype:"int64"},ack_time:{type:"int64",id:10}}},ShootData:{fields:{x:{type:"float",id:1},y:{type:"float",id:2},r:{type:"float",id:3},dst:{type:"float",id:4},m:{type:"string",id:5},adc:{type:"float",id:6},device_id:{type:"string",id:7},shoot_id:{type:"string",id:8},three_consecutive_10_rings:{type:"bool",id:9}}},PracticeInfo:{fields:{id:{type:"int64",id:1},user_id:{type:"int64",id:2},status:{type:"int32",id:3},status_text:{type:"string",id:4},start_time:{type:"int64",id:5},target_type:{type:"int32",id:6},vip:{type:"bool",id:7},s_vip:{type:"bool",id:8},device_id:{type:"string",id:9},shoot_data:{type:"MatchShoot",id:10},details:{rule:"repeated",type:"MatchShoot",id:11}}},MatchInfo:{fields:{match_id:{type:"string",id:1},create_time:{type:"int64",id:2},start_time:{type:"int64",id:3},server_time:{type:"int64",id:4},shoot_time:{type:"int32",id:5},shoot_number:{type:"int32",id:6},ready_time:{type:"int32",id:7},way:{type:"int32",id:8},mode:{type:"int32",id:9},status:{type:"MatchStatus",id:10},status_text:{type:"string",id:11},rounds:{rule:"repeated",type:"MatchRound",id:12},teams:{rule:"map",type:"TeamInfo",id:13,keytype:"int32"},current:{type:"CurrentShoot",id:14},next:{type:"CurrentShoot",id:15},shoot_data:{type:"MatchShoot",id:16},win_team:{type:"int32",id:17},mvp:{type:"PlayerFull",id:18},room_id:{type:"string",id:19},result_list:{rule:"repeated",type:"PlayerMatchResult",id:20},timeout_time:{type:"int64",id:21},target_type:{type:"int32",id:22},event_type:{type:"int32",id:23},timeout:{type:"int32",id:24},server_addr:{type:"string",id:25},countdown_start_time:{type:"int64",id:26}}},ServerMessage:{fields:{type:{type:"ServerMessageType",id:1},match_id:{type:"string",id:2},timestamp:{type:"int64",id:3},match_info:{type:"MatchInfo",id:4,oneof:"payload"},shoot_data:{type:"ShootData",id:5,oneof:"payload"},practice_info:{type:"PracticeInfo",id:6,oneof:"payload"},sequence:{type:"int64",id:7}}},ClientMessage:{fields:{type:{type:"ClientMessageType",id:1},match_id:{type:"string",id:2},user_id:{type:"int64",id:3},sequence:{type:"int64",id:4},data:{type:"bytes",id:5}}}}}});
+const $root=$protobuf.Root.create({"nested":{"rpc":{"nested":{"ServerMessageType":{"SERVER_MSG_UNKNOWN":0,"SERVER_MSG_MATCH_READY":1,"SERVER_MSG_MATCH_START":2,"SERVER_MSG_NOW_YOU":3,"SERVER_MSG_SHOT":4,"SERVER_MSG_NEW_ROUND":5,"SERVER_MSG_MATCH_END":6,"SERVER_MSG_TIMEOUT":7,"SERVER_MSG_CHECK":8,"SERVER_MSG_RAND":9,"SERVER_MSG_NOT_ENOUGH_DISTANCE":10,"SERVER_MSG_PLAYER_LEFT":11,"SERVER_MSG_HEARTBEAT":12,"SERVER_MSG_PRACTICE_END":13,"SERVER_MSG_SYNC_PRACTICE_INFO":14,"SERVER_MSG_SYNC_MATCH_INFO":15},"ClientMessageType":{"CLIENT_MSG_UNKNOWN":0,"CLIENT_MSG_HEARTBEAT_ACK":1,"CLIENT_MSG_SHOOT_DATA":2,"CLIENT_MSG_ACK":3,"CLIENT_MSG_LEAVE":4,"CLIENT_MSG_SYNC_PRACTICE_INFO":5,"CLIENT_MSG_SYNC_MATCH_INFO":6},"MatchStatus":{"MATCH_STATUS_READY":0,"MATCH_STATUS_STARTED":1,"MATCH_STATUS_END":2,"MATCH_STATUS_TIMEOUT":3,"MATCH_STATUS_UNEXPECTEDLY":4},"MatchPlayerStatus":{"MATCH_PLAYER_STATUS_READY":0,"MATCH_PLAYER_STATUS_STARTED":1,"MATCH_PLAYER_STATUS_END":2},"MatchShoot":{"fields":{"playerId":{"type":"int64","id":1,"protoName":"player_id"},"status":{"type":"int32","id":2},"x":{"type":"float","id":3},"y":{"type":"float","id":4},"ring":{"type":"int32","id":5},"ringX":{"type":"bool","id":6,"protoName":"ring_x"},"angle":{"type":"float","id":7},"distance":{"type":"float","id":8},"threeConsecutive_10Rings":{"type":"bool","id":9,"protoName":"three_consecutive_10_rings"}}},"MatchShootList":{"fields":{"items":{"type":"MatchShoot","id":1,"rule":"repeated"}}},"RoundScore":{"fields":{"totalRing":{"type":"int32","id":1,"protoName":"total_ring"},"score":{"type":"int32","id":2},"ifWin":{"type":"bool","id":3,"protoName":"if_win"}}},"MatchRound":{"fields":{"shoots":{"type":"MatchShootList","id":1,"keyType":"int64"},"scores":{"type":"RoundScore","id":2,"keyType":"int32"},"round":{"type":"int32","id":3},"ifGold":{"type":"bool","id":4,"protoName":"if_gold"},"status":{"type":"int32","id":5},"goldRound":{"type":"int32","id":6,"protoName":"gold_round"}}},"PlayerMatchResult":{"fields":{"totalRing":{"type":"int32","id":1,"protoName":"total_ring"},"userId":{"type":"int64","id":2,"protoName":"user_id"},"tenRingCount":{"type":"int32","id":3,"protoName":"ten_ring_count"},"averageRing":{"type":"float","id":4,"protoName":"average_ring"}}},"PlayerFull":{"fields":{"id":{"type":"int64","id":1},"name":{"type":"string","id":2},"avatar":{"type":"string","id":3},"exp":{"type":"int32","id":4},"score":{"type":"int32","id":5},"level":{"type":"int32","id":6},"beforeLevel":{"type":"int32","id":7,"protoName":"before_level"},"beforeExp":{"type":"int32","id":8,"protoName":"before_exp"},"currentExp":{"type":"int32","id":9,"protoName":"current_exp"},"upgradeExp":{"type":"int32","id":10,"protoName":"upgrade_exp"},"active":{"type":"int32","id":11},"deviceId":{"type":"string","id":12,"protoName":"device_id"},"sVip":{"type":"bool","id":13,"protoName":"s_vip"},"vip":{"type":"bool","id":14},"playerMatchResult":{"type":"PlayerMatchResult","id":15,"protoName":"player_match_result"}}},"TeamInfo":{"fields":{"players":{"type":"PlayerFull","id":1,"rule":"repeated"},"id":{"type":"int32","id":2},"name":{"type":"string","id":3},"score":{"type":"int32","id":4}}},"CurrentShoot":{"fields":{"round":{"type":"int32","id":1},"roundId":{"type":"int64","id":2,"protoName":"round_id"},"index":{"type":"int32","id":3},"startTime":{"type":"int64","id":4,"protoName":"start_time"},"playerId":{"type":"int64","id":5,"protoName":"player_id"},"goldRound":{"type":"bool","id":6,"protoName":"gold_round"},"startTimeText":{"type":"string","id":7,"protoName":"start_time_text"},"myIndex":{"type":"int32","id":8,"protoName":"my_index"},"indexMap":{"type":"int32","id":9,"keyType":"int64","protoName":"index_map"},"ackTime":{"type":"int64","id":10,"protoName":"ack_time"}}},"ShootData":{"fields":{"x":{"type":"float","id":1},"y":{"type":"float","id":2},"r":{"type":"float","id":3},"dst":{"type":"float","id":4},"m":{"type":"string","id":5},"adc":{"type":"float","id":6},"deviceId":{"type":"string","id":7,"protoName":"device_id"},"shootId":{"type":"string","id":8,"protoName":"shoot_id"},"threeConsecutive_10Rings":{"type":"bool","id":9,"protoName":"three_consecutive_10_rings"}}},"PracticeInfo":{"fields":{"id":{"type":"int64","id":1},"userId":{"type":"int64","id":2,"protoName":"user_id"},"status":{"type":"int32","id":3},"statusText":{"type":"string","id":4,"protoName":"status_text"},"startTime":{"type":"int64","id":5,"protoName":"start_time"},"targetType":{"type":"int32","id":6,"protoName":"target_type"},"vip":{"type":"bool","id":7},"sVip":{"type":"bool","id":8,"protoName":"s_vip"},"deviceId":{"type":"string","id":9,"protoName":"device_id"},"shootData":{"type":"MatchShoot","id":10,"protoName":"shoot_data"},"details":{"type":"MatchShoot","id":11,"rule":"repeated"},"trainingType":{"type":"string","id":12,"protoName":"training_type"},"difficultyLevel":{"type":"int32","id":13,"protoName":"difficulty_level"},"hitReq":{"type":"int32","id":14,"protoName":"hit_req"},"arrowsLeft":{"type":"int32","id":15,"protoName":"arrows_left"},"targetArrows":{"type":"int32","id":16,"protoName":"target_arrows"},"targetRings":{"type":"int32","id":17,"protoName":"target_rings"},"currentArrows":{"type":"int32","id":18,"protoName":"current_arrows"},"currentRings":{"type":"int32","id":19,"protoName":"current_rings"},"blocks":{"type":"int32","id":20},"randomBlock":{"type":"int32","id":21,"protoName":"random_block"},"randomRingArea":{"type":"int32","id":22,"protoName":"random_ring_area"},"timeLimit":{"type":"int32","id":23,"protoName":"time_limit"},"completed":{"type":"bool","id":24},"totalArrows":{"type":"int32","id":25,"protoName":"total_arrows"},"duration":{"type":"int32","id":26},"averageRing":{"type":"float","id":27,"protoName":"average_ring"},"stability":{"type":"float","id":28},"maxCombo":{"type":"int32","id":29,"protoName":"max_combo"},"totalHits":{"type":"int32","id":30,"protoName":"total_hits"},"deltaTotalHits":{"type":"int32","id":31,"protoName":"delta_total_hits"},"deltaDuration":{"type":"int32","id":32,"protoName":"delta_duration"},"deltaMaxCombo":{"type":"int32","id":33,"protoName":"delta_max_combo"},"deltaTotalRings":{"type":"int32","id":34,"protoName":"delta_total_rings"},"deltaTotalArrows":{"type":"int32","id":35,"protoName":"delta_total_arrows"},"deltaAverageRing":{"type":"float","id":36,"protoName":"delta_average_ring"},"deltaStability":{"type":"float","id":37,"protoName":"delta_stability"},"beforeExp":{"type":"int32","id":38,"protoName":"before_exp"},"beforeLevel":{"type":"int32","id":39,"protoName":"before_level"},"currentExp":{"type":"int32","id":40,"protoName":"current_exp"},"level":{"type":"int32","id":41},"upgradeExp":{"type":"int32","id":42,"protoName":"upgrade_exp"},"calories":{"type":"double","id":43}}},"MatchInfo":{"fields":{"matchId":{"type":"string","id":1,"protoName":"match_id"},"createTime":{"type":"int64","id":2,"protoName":"create_time"},"startTime":{"type":"int64","id":3,"protoName":"start_time"},"serverTime":{"type":"int64","id":4,"protoName":"server_time"},"shootTime":{"type":"int32","id":5,"protoName":"shoot_time"},"shootNumber":{"type":"int32","id":6,"protoName":"shoot_number"},"readyTime":{"type":"int32","id":7,"protoName":"ready_time"},"way":{"type":"int32","id":8},"mode":{"type":"int32","id":9},"status":{"type":"MatchStatus","id":10},"statusText":{"type":"string","id":11,"protoName":"status_text"},"rounds":{"type":"MatchRound","id":12,"rule":"repeated"},"teams":{"type":"TeamInfo","id":13,"keyType":"int32"},"current":{"type":"CurrentShoot","id":14},"next":{"type":"CurrentShoot","id":15},"shootData":{"type":"MatchShoot","id":16,"protoName":"shoot_data"},"winTeam":{"type":"int32","id":17,"protoName":"win_team"},"mvp":{"type":"PlayerFull","id":18},"roomId":{"type":"string","id":19,"protoName":"room_id"},"resultList":{"type":"PlayerMatchResult","id":20,"rule":"repeated","protoName":"result_list"},"timeoutTime":{"type":"int64","id":21,"protoName":"timeout_time"},"targetType":{"type":"int32","id":22,"protoName":"target_type"},"eventType":{"type":"int32","id":23,"protoName":"event_type"},"timeout":{"type":"int32","id":24},"serverAddr":{"type":"string","id":25,"protoName":"server_addr"},"countdownStartTime":{"type":"int64","id":26,"protoName":"countdown_start_time"}}},"ServerMessage":{"fields":{"type":{"type":"ServerMessageType","id":1},"matchId":{"type":"string","id":2,"protoName":"match_id"},"timestamp":{"type":"int64","id":3},"matchInfo":{"type":"MatchInfo","id":4,"protoName":"match_info"},"shootData":{"type":"ShootData","id":5,"protoName":"shoot_data"},"practiceInfo":{"type":"PracticeInfo","id":6,"protoName":"practice_info"},"sequence":{"type":"int64","id":7}}},"ClientMessage":{"fields":{"type":{"type":"ClientMessageType","id":1},"matchId":{"type":"string","id":2,"protoName":"match_id"},"userId":{"type":"int64","id":3,"protoName":"user_id"},"sequence":{"type":"int64","id":4},"data":{"type":"bytes","id":5}}}}}}});
 export default $root;
diff --git a/src/utils/matchProtocol.js b/src/utils/matchProtocol.js
index 27c70fa..c6134a4 100644
--- a/src/utils/matchProtocol.js
+++ b/src/utils/matchProtocol.js
@@ -5,6 +5,11 @@ const { Reader, Writer } = protobuf;
 // 比赛服 protobuf 协议适配层：
 // 小程序环境不支持 protobufjs 反射模式里的动态 Function codegen，
 // 所以这里使用 minimal Reader/Writer 做静态字段解码和客户端消息编码。
+// <match-schema-generated>
+// 此区块由 scripts/generate-match-schema.mjs 自动生成，请勿手动修改。
+// 来源：src/utils/match.min.js（sha256: b4f272aad40fb951）
+// 协议命名空间：rpc；消息数：12；字段数：137
+
 export const ServerMessageType = {
   SERVER_MSG_UNKNOWN: 0,
   SERVER_MSG_MATCH_READY: 1,
@@ -20,6 +25,8 @@ export const ServerMessageType = {
   SERVER_MSG_PLAYER_LEFT: 11,
   SERVER_MSG_HEARTBEAT: 12,
   SERVER_MSG_PRACTICE_END: 13,
+  SERVER_MSG_SYNC_PRACTICE_INFO: 14,
+  SERVER_MSG_SYNC_MATCH_INFO: 15,
 };
 
 export const ClientMessageType = {
@@ -28,18 +35,10 @@ export const ClientMessageType = {
   CLIENT_MSG_SHOOT_DATA: 2,
   CLIENT_MSG_ACK: 3,
   CLIENT_MSG_LEAVE: 4,
+  CLIENT_MSG_SYNC_PRACTICE_INFO: 5,
+  CLIENT_MSG_SYNC_MATCH_INFO: 6,
 };
 
-// protobufjs 的 enum 默认是 name -> value，这里反转成 value -> name 用于日志打印。
-const ServerMessageTypeNameByValue = Object.keys(ServerMessageType).reduce(
-  (result, name) => {
-    result[ServerMessageType[name]] = name;
-    return result;
-  },
-  {}
-);
-
-// 当前只需要解码比赛服下发的字段并打印，字段表按后端 proto 定义维护。
 const SCHEMAS = {
   MatchShoot: {
     1: { name: "player_id", kind: "int64" },
@@ -149,6 +148,38 @@ const SCHEMAS = {
     9: { name: "device_id", kind: "string" },
     10: { name: "shoot_data", kind: "message", type: "MatchShoot" },
     11: { name: "details", kind: "message", type: "MatchShoot", repeated: true },
+    12: { name: "training_type", kind: "string" },
+    13: { name: "difficulty_level", kind: "int32" },
+    14: { name: "hit_req", kind: "int32" },
+    15: { name: "arrows_left", kind: "int32" },
+    16: { name: "target_arrows", kind: "int32" },
+    17: { name: "target_rings", kind: "int32" },
+    18: { name: "current_arrows", kind: "int32" },
+    19: { name: "current_rings", kind: "int32" },
+    20: { name: "blocks", kind: "int32" },
+    21: { name: "random_block", kind: "int32" },
+    22: { name: "random_ring_area", kind: "int32" },
+    23: { name: "time_limit", kind: "int32" },
+    24: { name: "completed", kind: "bool" },
+    25: { name: "total_arrows", kind: "int32" },
+    26: { name: "duration", kind: "int32" },
+    27: { name: "average_ring", kind: "float" },
+    28: { name: "stability", kind: "float" },
+    29: { name: "max_combo", kind: "int32" },
+    30: { name: "total_hits", kind: "int32" },
+    31: { name: "delta_total_hits", kind: "int32" },
+    32: { name: "delta_duration", kind: "int32" },
+    33: { name: "delta_max_combo", kind: "int32" },
+    34: { name: "delta_total_rings", kind: "int32" },
+    35: { name: "delta_total_arrows", kind: "int32" },
+    36: { name: "delta_average_ring", kind: "float" },
+    37: { name: "delta_stability", kind: "float" },
+    38: { name: "before_exp", kind: "int32" },
+    39: { name: "before_level", kind: "int32" },
+    40: { name: "current_exp", kind: "int32" },
+    41: { name: "level", kind: "int32" },
+    42: { name: "upgrade_exp", kind: "int32" },
+    43: { name: "calories", kind: "double" },
   },
   MatchInfo: {
     1: { name: "match_id", kind: "string" },
@@ -176,12 +207,7 @@ const SCHEMAS = {
     17: { name: "win_team", kind: "int32" },
     18: { name: "mvp", kind: "message", type: "PlayerFull" },
     19: { name: "room_id", kind: "string" },
-    20: {
-      name: "result_list",
-      kind: "message",
-      type: "PlayerMatchResult",
-      repeated: true,
-    },
+    20: { name: "result_list", kind: "message", type: "PlayerMatchResult", repeated: true },
     21: { name: "timeout_time", kind: "int64" },
     22: { name: "target_type", kind: "int32" },
     23: { name: "event_type", kind: "int32" },
@@ -199,6 +225,16 @@ const SCHEMAS = {
     7: { name: "sequence", kind: "int64" },
   },
 };
+// </match-schema-generated>
+
+// protobufjs 的 enum 默认是 name -> value，这里反转成 value -> name 用于日志打印。
+const ServerMessageTypeNameByValue = Object.keys(ServerMessageType).reduce(
+  (result, name) => {
+    result[ServerMessageType[name]] = name;
+    return result;
+  },
+  {}
+);
 
 // 小程序 websocket 收到的 data 可能是 ArrayBuffer、TypedArray 或字符串，这里统一成 Uint8Array。
 function toUint8Array(data) {
@@ -233,6 +269,8 @@ function readScalar(reader, kind) {
       return reader.int64().toString();
     case "float":
       return reader.float();
+    case "double":
+      return reader.double();
     case "bool":
       return reader.bool();
     case "string":
@@ -355,6 +393,15 @@ export function createHeartbeatAckMessage() {
   });
 }
 
+export function createSyncPracticeInfoMessage({ matchId, userId }) {
+  // 新版个人训练页连接成功后主动请求完整练习信息。
+  return encodeClientMessage({
+    type: ClientMessageType.CLIENT_MSG_SYNC_PRACTICE_INFO,
+    match_id: matchId,
+    user_id: userId,
+  });
+}
+
 export function createAckMessage({ matchId, sequence }) {
   // 普通消息 ACK 仍携带 sequence，但前端不做 sequence 补发或排序。
   return encodeClientMessage({
diff --git a/src/utils/matchReturn.js b/src/utils/matchReturn.js
index fa771c1..242fd84 100644
--- a/src/utils/matchReturn.js
+++ b/src/utils/matchReturn.js
@@ -4,10 +4,12 @@ function getMatchId(battleInfo) {
   return battleInfo?.matchId || battleInfo?.id || "";
 }
 
-function getBattlePageUrl(battleInfo) {
-  return Number(battleInfo?.mode) <= 3
-    ? "/pages/team-battle/index?fromReturn=1"
-    : "/pages/melee-battle?fromReturn=1";
+function getBattlePageUrl(battleInfo, matchId) {
+  const page =
+    Number(battleInfo?.mode) <= 3
+      ? "/pages/team-battle/index"
+      : "/pages/melee-battle";
+  return `${page}?fromReturn=1&battleId=${encodeURIComponent(String(matchId))}`;
 }
 
 export function takeMatchReturnSnapshot() {
@@ -27,6 +29,6 @@ export async function returnToBattle(battleInfo, navigate) {
   }
 
   uni.setStorageSync(MATCH_RETURN_SNAPSHOT_KEY, battleInfo);
-  await navigate(getBattlePageUrl(battleInfo));
+  await navigate(getBattlePageUrl(battleInfo, matchId));
   return true;
 }