update:优化文字

doc.md

@@ -114,3 +114,133 @@ git push origin test
 3. **体验版发布前确认代码已提交**，避免遗漏
 4. **开发分支命名建议**：`feature/姓名-功能名`，如 `feature/zhangsan-login`
 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. 微信开发者工具中的主包、分包体积符合上传限制。

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": {

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": []

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;
+}

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() {

src/apis.js

@@ -8,7 +8,7 @@ try {
 
     switch (envVersion) {
         case "develop": // 开发版
-            // BASE_URL = "http://192.168.1.2:8000/api/shoot";
+            // BASE_URL = "http://192.168.1.30:8000/api/shoot";
             BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
             break;
         case "trial": // 体验版
@@ -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 = () => {
@@ -264,13 +273,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) => {
@@ -502,6 +513,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");
 };

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环",
 ];

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);

src/components/AppBackground.vue

@@ -60,25 +60,25 @@ const props = defineProps({
   <image
       class="bg-image"
       v-if="type === 7"
-      src="@/static/app-bg6.png"
+      src="https://static.shelingxingqiu.com/shootmini/static/app-bg6.png"
       mode="widthFix"
     />
     <image
       class="bg-image"
       v-if="type === 8"
-      src="@/static/app-bg7.png"
+      src="https://static.shelingxingqiu.com/shootmini/static/app-bg7.png"
       mode="widthFix"
     />
     <image
       class="bg-image"
       v-if="type === 9"
-      src="@/static/app-bg8.png"
+      src="https://static.shelingxingqiu.com/shootmini/static/app-bg8.png"
       mode="widthFix"
     />
     <image
       class="bg-image"
       v-if="type === 11"
-      src="@/static/app-bg9.png"
+      src="https://static.shelingxingqiu.com/shootmini/static/app-bg9.png"
       mode="widthFix"
     />
   <image

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;

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
@@ -158,7 +158,7 @@ const isMember = (player = {}) => player.vip === true || player.sVip === true;
 .container > image:first-child {
   position: absolute;
   width: 100%;
-  top: -5px;
+  /* top: -5px; */
   z-index: 1;
   pointer-events: none;
 }

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;

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>

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,
@@ -53,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);
@@ -125,9 +137,22 @@ const goCalibration = async () => {
       :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"
@@ -189,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>
 
@@ -230,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>

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>

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;

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)) {

src/components/TargetCanvas.vue

@@ -21,34 +21,29 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
-  // 是否显示象限文字。
-  showQuadrantLabels: {
-    type: Boolean,
-    default: false,
-  },
   // 是否显示环数文字。
   showRingLabels: {
     type: Boolean,
     default: true,
   },
-  // 象限文字配置，key 为 1/2/3/4。
-  quadrantLabels: {
-    type: Object,
-    default: () => ({
-      1: "1",
-      2: "2",
-      3: "3",
-      4: "4",
-    }),
+  // 从正上方开始顺时针等分的区域数量。
+  sectorCount: {
+    type: Number,
+    default: 0,
   },
-  // 高亮区域数组。
-  // quadrant: 1/2/3/4，表示第几个象限。
-  // rings: "all" 或环数数组，例如 [7, 8, 9, 10]。
-  // scope: "box" 表示整象限矩形，"sector" 表示环形扇区。
-  // style: 可覆盖高亮填充色、描边色、线宽比例。
-  highlightAreas: {
-    type: Array,
-    default: () => [],
+  // 当前高亮区域，范围为 1 到 sectorCount。
+  activeSector: {
+    type: Number,
+    default: 0,
+  },
+  // 指定环数，1 到 10；无效值表示高亮整个区域。
+  activeRing: {
+    type: Number,
+    default: 0,
+  },
+  showSectorLabels: {
+    type: Boolean,
+    default: false,
   },
   // 只绘制透明高亮层，不绘制完整靶纸；用于叠加在靶纸图片上。
   highlightOnly: {
@@ -74,8 +69,18 @@ const props = defineProps({
     type: Object,
     default: () => ({}),
   },
-  // 象限文字样式覆盖配置。
-  quadrantLabelStyle: {
+  // 区域分割线样式覆盖配置。
+  sectorStyle: {
+    type: Object,
+    default: () => ({}),
+  },
+  // 区域数字样式覆盖配置。
+  sectorLabelStyle: {
+    type: Object,
+    default: () => ({}),
+  },
+  // 高亮样式覆盖配置。
+  highlightStyle: {
     type: Object,
     default: () => ({}),
   },
@@ -120,16 +125,24 @@ const defaultCrosshairStyle = {
   lineWidthRatio: 0.0025,
 };
 
-// 象限文字默认样式。
-const defaultQuadrantLabelStyle = {
+// 顺时针等分线默认样式。
+const defaultSectorStyle = {
+  color: "rgba(255, 255, 255, 0.82)",
+  lineWidthRatio: 0.004,
+};
+
+// 区域数字默认样式。
+const defaultSectorLabelStyle = {
   color: "#ffffff",
-  fontSizeRatio: 0.045,
-  offsetRatio: 0.78,
+  backgroundColor: "rgba(0, 0, 0, 0.62)",
+  fontSizeRatio: 0.075,
+  radiusRatio: 0.76,
+  badgeRadiusRatio: 0.07,
 };
 
 // 高亮区域默认样式。
 const defaultHighlightStyle = {
-  color: "rgba(254, 216, 71, 0.34)",
+  color: "rgba(255, 228, 0, 0.6)",
   strokeColor: "rgba(254, 216, 71, 0.82)",
   lineWidthRatio: 0.003,
 };
@@ -155,40 +168,24 @@ const getRingColor = (ring, config) => {
   return config.ringColors?.[ring] || config.ringColors?.[String(ring)] || "#ffffff";
 };
 
-// 规范化高亮环数配置；"all" 表示全部环，数组或单值会过滤非法环数。
-const normalizeRings = (rings, ringCount) => {
-  if (rings === "all") {
-    return "all";
-  }
-
-  const rawRings = Array.isArray(rings) ? rings : [rings];
-  return rawRings
-    .map((ring) => Number(ring))
-    .filter((ring) => Number.isInteger(ring) && ring >= 1 && ring <= ringCount);
+const getPositiveInteger = (value) => {
+  const numberValue = Number(value);
+  return Number.isInteger(numberValue) && numberValue > 0 ? numberValue : 0;
 };
 
-// 获取象限对应的扇形弧度范围。
-const getQuadrantAngles = (quadrant) => {
-  const angleMap = {
-    1: [Math.PI, Math.PI * 1.5],
-    2: [Math.PI * 1.5, Math.PI * 2],
-    3: [Math.PI * 0.5, Math.PI],
-    4: [0, Math.PI * 0.5],
+// 正上方作为第一区起始边界，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,
   };
-
-  return angleMap[Number(quadrant)] || null;
-};
-
-// 获取象限对应的矩形区域，用于整象限高亮。
-const getQuadrantBox = (quadrant, centerX, centerY, radius) => {
-  const boxMap = {
-    1: [centerX - radius, centerY - radius, radius, radius],
-    2: [centerX, centerY - radius, radius, radius],
-    3: [centerX - radius, centerY, radius, radius],
-    4: [centerX, centerY, radius, radius],
-  };
-
-  return boxMap[Number(quadrant)] || null;
 };
 
 // 绘制实心圆，靶纸环区和中心点都会用到。
@@ -240,58 +237,61 @@ const drawTargetRings = (ctx, centerX, centerY, targetRadius, config) => {
   }
 };
 
-// 绘制所有高亮区域，支持整象限矩形高亮和指定环数扇区高亮。
-const drawHighlights = (ctx, centerX, centerY, targetRadius, config) => {
-  props.highlightAreas.forEach((area = {}) => {
-    const angles = getQuadrantAngles(area.quadrant);
+// 高亮后端指定区域；activeRing 有效时只高亮该区域内的单个环。
+const drawSectorHighlight = (ctx, centerX, centerY, targetRadius, config) => {
+  const angles = getSectorAngles(props.activeSector, props.sectorCount);
+  if (!angles) return;
 
-    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,
+  };
 
-    const highlightStyle = {
-      ...defaultHighlightStyle,
-      ...(area.style || {}),
-    };
-    const highlightLineWidth = Math.max(1, targetRadius * highlightStyle.lineWidthRatio);
-    const rings = normalizeRings(area.rings || "all", config.ringCount);
-    const scope = area.scope || (rings === "all" ? "box" : "sector");
+  drawAnnularSector(
+    ctx,
+    centerX,
+    centerY,
+    innerRadius,
+    outerRadius,
+    angles.startAngle,
+    angles.endAngle,
+    style.color,
+    style.strokeColor,
+    Math.max(1, targetRadius * style.lineWidthRatio)
+  );
+};
 
-    // 整象限默认画成矩形高亮，便于对应 1/2/3/4 号框训练提示。
-    if (rings === "all" && scope === "box") {
-      const box = getQuadrantBox(area.quadrant, centerX, centerY, targetRadius);
-      if (!box) return;
-      ctx.beginPath();
-      ctx.rect(...box);
-      ctx.setFillStyle(highlightStyle.color);
-      ctx.fill();
-      ctx.setStrokeStyle(highlightStyle.strokeColor);
-      ctx.setLineWidth(highlightLineWidth);
-      ctx.stroke();
-      return;
-    }
+// 从正上方开始顺时针绘制所有区域边界。
+const drawSectorLines = (ctx, centerX, centerY, targetRadius) => {
+  const count = getPositiveInteger(props.sectorCount);
+  if (!count) return;
 
-    const targetRings = rings === "all"
-      ? Array.from({ length: config.ringCount }, (_, index) => index + 1)
-      : rings;
+  const style = {
+    ...defaultSectorStyle,
+    ...props.sectorStyle,
+  };
+  const step = (Math.PI * 2) / count;
 
-    targetRings.forEach((ring) => {
-      const innerRadius = targetRadius * ((config.ringCount - ring) / config.ringCount);
-      const outerRadius = targetRadius * ((config.ringCount + 1 - ring) / config.ringCount);
-      drawAnnularSector(
-        ctx,
-        centerX,
-        centerY,
-        innerRadius,
-        outerRadius,
-        angles[0],
-        angles[1],
-        highlightStyle.color,
-        highlightStyle.strokeColor,
-        highlightLineWidth
-      );
-    });
-  });
+  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();
 };
 
 // 绘制各环之间的分割线。
@@ -351,44 +351,30 @@ const drawRingLabels = (ctx, centerX, centerY, targetRadius, config) => {
   }
 };
 
-// 绘制象限文字。
-const drawQuadrantLabels = (ctx, centerX, centerY, targetRadius) => {
-  if (!props.showQuadrantLabels) {
-    return;
-  }
+// 在每个区域中线位置绘制编号，编号层始终位于高亮和分割线之上。
+const drawSectorLabels = (ctx, centerX, centerY, targetRadius) => {
+  const count = getPositiveInteger(props.sectorCount);
+  if (!props.showSectorLabels || !count) return;
 
   const style = {
-    ...defaultQuadrantLabelStyle,
-    ...props.quadrantLabelStyle,
-  };
-  const offset = targetRadius * style.offsetRatio;
-  const positions = {
-    1: [centerX - offset, centerY - offset],
-    2: [centerX + offset, centerY - offset],
-    3: [centerX - offset, centerY + offset],
-    4: [centerX + offset, centerY + offset],
+    ...defaultSectorLabelStyle,
+    ...props.sectorLabelStyle,
   };
+  const labelRadius = targetRadius * style.radiusRatio;
+  const badgeRadius = Math.max(10, targetRadius * style.badgeRadiusRatio);
 
-  ctx.setFontSize(Math.max(12, targetRadius * style.fontSizeRatio));
+  ctx.setFontSize(Math.max(11, targetRadius * style.fontSizeRatio));
   ctx.setTextAlign("center");
   ctx.setTextBaseline("middle");
-  ctx.setFillStyle(style.color);
 
-  Object.entries(positions).forEach(([key, position]) => {
-    const label = props.quadrantLabels?.[key] || props.quadrantLabels?.[Number(key)];
-    if (label === undefined || label === null || label === "") return;
-    ctx.fillText(String(label), position[0], position[1]);
-  });
-};
-
-// 生成高亮区域的绘制 key，只保留真正影响画面的字段。
-const getHighlightDrawKeyAreas = () => {
-  return props.highlightAreas.map((area = {}) => ({
-    quadrant: area.quadrant,
-    rings: area.rings,
-    scope: area.scope,
-    style: area.style,
-  }));
+  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。
@@ -398,12 +384,16 @@ const getDrawKey = (width, height) => {
     height,
     coordinateRadius: props.coordinateRadius,
     showCrosshair: props.showCrosshair,
-    showQuadrantLabels: props.showQuadrantLabels,
     showRingLabels: props.showRingLabels,
-    highlightAreas: getHighlightDrawKeyAreas(),
+    sectorCount: props.sectorCount,
+    activeSector: props.activeSector,
+    activeRing: props.activeRing,
+    showSectorLabels: props.showSectorLabels,
     targetStyleConfig: props.targetStyleConfig,
     crosshairStyle: props.crosshairStyle,
-    quadrantLabelStyle: props.quadrantLabelStyle,
+    sectorStyle: props.sectorStyle,
+    sectorLabelStyle: props.sectorLabelStyle,
+    highlightStyle: props.highlightStyle,
     highlightOnly: props.highlightOnly,
   });
 };
@@ -431,7 +421,7 @@ const drawTarget = () => {
     drawTargetRings(ctx, centerX, centerY, targetRadius, config);
   }
 
-  drawHighlights(ctx, centerX, centerY, targetRadius, config);
+  drawSectorHighlight(ctx, centerX, centerY, targetRadius, config);
 
   if (!props.highlightOnly) {
     drawRingLines(ctx, centerX, centerY, targetRadius, config);
@@ -444,9 +434,12 @@ const drawTarget = () => {
     );
     drawCrosshair(ctx, centerX, centerY, targetRadius);
     drawRingLabels(ctx, centerX, centerY, targetRadius, config);
-    drawQuadrantLabels(ctx, centerX, centerY, targetRadius);
   }
 
+  // 高亮先画，等分线和编号后画，避免高亮覆盖区域边界。
+  drawSectorLines(ctx, centerX, centerY, targetRadius);
+  drawSectorLabels(ctx, centerX, centerY, targetRadius);
+
   ctx.draw();
   lastDrawKey.value = drawKey;
 };
@@ -494,16 +487,19 @@ watch(
   () => [
     props.coordinateRadius,
     props.showCrosshair,
-    props.showQuadrantLabels,
     props.showRingLabels,
-    props.highlightAreas,
+    props.sectorCount,
+    props.activeSector,
+    props.activeRing,
+    props.showSectorLabels,
     props.highlightOnly,
     props.canvasWidth,
     props.canvasHeight,
-    props.quadrantLabels,
     props.targetStyleConfig,
     props.crosshairStyle,
-    props.quadrantLabelStyle,
+    props.sectorStyle,
+    props.sectorLabelStyle,
+    props.highlightStyle,
   ],
   scheduleDraw,
   {

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>

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>

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;

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,

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)}`;
 }
@@ -331,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"];
 }
 
@@ -355,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:
@@ -611,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;
@@ -682,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
     );
@@ -715,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
@@ -724,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
@@ -741,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;
@@ -754,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;
@@ -788,6 +849,9 @@ export function connectMatchWebSocket(options = {}) {
     userId,
     token,
     mode,
+    requestPracticeInfoOnOpen = false,
+    appHideResumable = false,
+    practiceEndAudioKey = "",
     force = false,
     reconnecting = false,
     reconnectReason = "",
@@ -858,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,
@@ -911,6 +978,9 @@ export function connectMatchWebSocket(options = {}) {
       reason: reconnectReason,
       reconnected: wasReconnected,
     });
+    if (currentContext?.requestPracticeInfoOnOpen) {
+      sendPracticeInfoSync();
+    }
   });
 
   socketTask.onMessage((res) => {
@@ -951,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();
@@ -986,6 +1069,7 @@ export default {
   ServerMessageType,
   connectMatchWebSocket,
   connectMatchWebSocketFromNotice,
+  setMatchAppHideResumable,
   closeMatchWebSocket,
   forceReconnectMatchWebSocket,
   handleMatchNetworkStatusChange,

src/mock/index.js

@@ -4,43 +4,43 @@ export const trainingHomeWeekSchedule = [
     key: "mon",
     label: "周一",
     status: "done",
-    icon: "../../static/training-home/done.png",
+    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/done.png",
   },
   {
     key: "tue",
     label: "周二",
     status: "done",
-    icon: "../../static/training-home/done.png",
+    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/done.png",
   },
   {
     key: "wed",
     label: "周三",
     status: "missed",
-    icon: "../../static/training-home/missed.png",
+    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/missed.png",
   },
   {
     key: "thu",
     label: "周四",
     status: "missed",
-    icon: "../../static/training-home/missed.png",
+    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/missed.png",
   },
   {
     key: "fri",
     label: "周五",
     status: "done",
-    icon: "../../static/training-home/done.png",
+    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/done.png",
   },
   {
     key: "sat",
     label: "周六",
     status: "done",
-    icon: "../../static/training-home/done.png",
+    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/done.png",
   },
   {
     key: "sun",
     label: "周日",
     status: "missed",
-    icon: "../../static/training-home/missed.png",
+    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/missed.png",
   },
 ];
 
@@ -73,7 +73,7 @@ export const trainingHomeModes = [
     key: "endurance",
     title: "耐力训练",
     progressText: "当前进度 LV5 >",
-    icon: "../../static/training-home/img_3.png",
+    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/img_3.png",
     recommended: true,
     disabled: false,
   },
@@ -81,7 +81,7 @@ export const trainingHomeModes = [
     key: "precision",
     title: "精准训练",
     progressText: "当前进度 LV3 >",
-    icon: "../../static/training-home/img_4.png",
+    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/img_4.png",
     recommended: false,
     disabled: false,
   },
@@ -89,7 +89,7 @@ export const trainingHomeModes = [
     key: "rhythm",
     title: "节奏训练",
     progressText: "当前进度 LV6 >",
-    icon: "../../static/training-home/img_5.png",
+    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/img_5.png",
     recommended: false,
     disabled: false,
   },
@@ -97,7 +97,7 @@ export const trainingHomeModes = [
     key: "power",
     title: "力量训练",
     progressText: "Coming!  LV10",
-    icon: "../../static/training-home/img_6.png",
+    icon: "https://static.shelingxingqiu.com/shootmini/static/training-home/img_6.png",
     recommended: false,
     disabled: true,
   },

src/pages.json

@@ -105,15 +105,6 @@
     {
       "path": "pages/mine-bow-data"
     },
-    {
-      "path": "pages/training/difficulty"
-    },
-    {
-      "path": "pages/training/index"
-    },
-    {
-      "path": "pages/training/practise-one"
-    },
     {
       "path": "pages/ota-wifi",
       "style": {
@@ -169,6 +160,20 @@
           "path": "team-bow-data"
         }
       ]
+    },
+    {
+      "root": "pages/training",
+      "pages": [
+        {
+          "path": "index"
+        },
+        {
+          "path": "difficulty"
+        },
+        {
+          "path": "practise-one"
+        }
+      ]
     }
   ]
 }

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>
 

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;

src/pages/index.vue

@@ -511,6 +511,7 @@ onShareTimeline(() => {
       </view>
       <Signin :show="showModal" :onClose="() => (showModal = false)"/>
     </view>
+    <view class="foot-space"></view>
     <AppFooter/>
   </Container>
 </template>
@@ -518,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;
@@ -680,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;

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;

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

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" },

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>

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

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"

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>

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>

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>

src/pages/team-battle/index.vue

@@ -1417,6 +1417,7 @@ onShow(() => {
           :latestShotFlash="latestShotFlash"
           :redTeam="redTeam"
           :blueTeam="blueTeam"
+          stable-shot-effect
       />
       <BattleFooter
           v-if="start"

src/pages/training/components/BowData.vue

@@ -1,4 +1,5 @@
 <script setup>
+import { computed } from "vue";
 import AppBackground from "@/components/AppBackground.vue";
 import Avatar from "@/components/Avatar.vue";
 import BowTarget from "./BowTarget.vue";
@@ -7,6 +8,8 @@ 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: {
@@ -35,7 +38,19 @@ const props = defineProps({
       <view>
         <Avatar :src="user.avatar" :rankLvl="user.rankLvl" :size="45" />
         <view>
-          <text>{{ user.nickName }}</text>
+          <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>
@@ -44,7 +59,7 @@ const props = defineProps({
       </view>
     </view>
     <view :style="{ width: '100%', marginBottom: '20px' }">
-      <BowTarget :scores="arrows" />
+      <BowTarget :scores="arrows" :isSvip="isSvip" />
     </view>
     <view class="desc">
       <text>{{ arrows.length }}</text>
@@ -95,6 +110,9 @@ const props = defineProps({
   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;

src/pages/training/components/BowTarget.vue

@@ -1,16 +1,19 @@
 <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 } from "@/apis";
+import { simulShootAPI, laserAimAPI, laserCloseAPI } from "@/apis";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const store = useStore();
@@ -33,6 +36,14 @@ const props = defineProps({
     type: Array,
     default: () => [],
   },
+  isSvip: {
+    type: Boolean,
+    default: false,
+  },
+  shotEffectToken: {
+    type: Number,
+    default: 0,
+  },
   mode: {
     type: String,
     default: "solo", // solo 单排，team 双排
@@ -57,25 +68,30 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
-  showQuadrantLabels: {
+  sectorCount: {
+    type: Number,
+    default: 0,
+  },
+  activeSector: {
+    type: Number,
+    default: 0,
+  },
+  activeRing: {
+    type: Number,
+    default: 0,
+  },
+  showSectorLabels: {
     type: Boolean,
     default: false,
   },
-  quadrantLabels: {
-    type: Object,
-    default: () => ({
-      1: "1",
-      2: "2",
-      3: "3",
-      4: "4",
-    }),
-  },
-  highlightAreas: {
-    type: Array,
-    default: () => [],
+  stableShotEffect: {
+    type: Boolean,
+    default: false,
   },
 });
 
+const emit = defineEmits(["shot-effect-complete"]);
+
 const pMode = ref(true);
 const latestOne = ref(null);
 const bluelatestOne = ref(null);
@@ -85,6 +101,14 @@ 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;
 
@@ -162,6 +186,13 @@ function getHitStyle(shot) {
   };
 }
 
+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(
@@ -180,15 +211,178 @@ function getExperienceTipStyle(shot) {
   );
 }
 
+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) {
-      latestOne.value = newVal[newVal.length - 1];
-      if (timer.value) clearTimeout(timer.value);
-      timer.value = setTimeout(() => {
-        latestOne.value = null;
-      }, 1000);
+      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];
   },
@@ -197,6 +391,22 @@ watch(
   }
 );
 
+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) => {
@@ -224,6 +434,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;
@@ -237,42 +455,9 @@ const arrowStyle = computed(() => {
   };
 });
 
-const currentArrowIndex = computed(() => {
-  return props.scores.length + props.blueScores.length + 1;
-});
-
-const getHighlightArrowIndex = (area = {}) => {
-  const arrowIndex = Number(area.arrowIndex ?? area.arrowNo ?? area.arrow);
-  return Number.isInteger(arrowIndex) && arrowIndex > 0 ? arrowIndex : null;
-};
-
-const currentHighlightAreas = computed(() => {
-  if (!Array.isArray(props.highlightAreas) || props.highlightAreas.length === 0) {
-    return [];
-  }
-
-  const hasExplicitArrowIndex = props.highlightAreas.some((area = {}) => {
-    return getHighlightArrowIndex(area) !== null;
-  });
-
-  const matchedAreas = props.highlightAreas.filter((area = {}) => {
-    return getHighlightArrowIndex(area) === currentArrowIndex.value;
-  });
-
-  if (hasExplicitArrowIndex) {
-    return matchedAreas;
-  }
-
-  if (props.highlightAreas.length === 1) {
-    return props.highlightAreas.slice(0, 1);
-  }
-
-  const currentArea = props.highlightAreas[currentArrowIndex.value - 1];
-  return currentArea ? [currentArea] : [];
-});
-
-const showHighlightCanvas = computed(() => {
-  return props.totalRound > 0 && currentHighlightAreas.value.length > 0;
+const showSectorCanvas = computed(() => {
+  const count = Number(props.sectorCount);
+  return props.totalRound > 0 && Number.isInteger(count) && count > 0;
 });
 
 async function onReceiveMessage(message) {
@@ -299,23 +484,29 @@ async function onReceiveMessage(message) {
 
 onMounted(() => {
   uni.$on("socket-inbox", onReceiveMessage);
+  void updateTargetRect();
+  if (uni.onWindowResize) uni.onWindowResize(handleWindowResize);
 });
 
 onBeforeUnmount(() => {
-  if (timer.value) {
-    clearTimeout(timer.value);
-    timer.value = null;
-  }
+  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">
+  <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) +
@@ -323,37 +514,44 @@ onBeforeUnmount(() => {
         totalRound
       }}</text>
     </view> -->
-    <view class="target">
+    <view :class="['target', { 'target--shake': targetShaking }]">
       <image
         class="target-image"
-        src="../../../static/bow-target.png"
+        src="https://static.shelingxingqiu.com/shootmini/static/bow-target.png"
         mode="aspectFit"
       />
       <TargetCanvas
-        v-if="showHighlightCanvas"
+        v-if="showSectorCanvas"
         class="target-highlight-layer"
         :coordinateRadius="coordinateRadius"
         :showCrosshair="false"
-        :showQuadrantLabels="false"
         :showRingLabels="false"
         :highlightOnly="true"
-        :highlightAreas="currentHighlightAreas"
+        :sectorCount="sectorCount"
+        :activeSector="activeSector"
+        :activeRing="activeRing"
+        :showSectorLabels="showSectorLabels"
       />
       <view v-if="angle !== null" class="arrow-dir" :style="arrowStyle">
         <view :style="{ background: circleColor }">
-          <image src="../../../static/dot-circle.png" mode="widthFix" />
+          <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="latestOne && latestOne.ring && user.id === latestOne.playerId"
+        v-if="
+          !shotEffect &&
+          latestOne &&
+          latestOne.ring &&
+          user.id === latestOne.playerId
+        "
         class="e-value fade-in-out"
         :style="getExperienceTipStyle(latestOne)"
       >
         经验 +1
       </view>
       <view
-        v-if="latestOne"
+        v-if="!shotEffect && latestOne"
         class="round-tip fade-in-out"
         :style="getRoundTipStyle(latestOne)"
         >{{ latestOne.ringX ? "X" : latestOne.ring || "未上靶"
@@ -378,8 +576,15 @@ onBeforeUnmount(() => {
         }}<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"
+          v-if="bow.ring > 0 && !shouldHideLatestHit(index)"
           :class="`hit ${pMode ? 'b' : 's'}-point ${
             index === scores.length - 1 && latestOne ? 'pump-in' : ''
           }`"
@@ -404,7 +609,34 @@ onBeforeUnmount(() => {
           <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)"
@@ -414,6 +646,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>
@@ -424,13 +658,22 @@ onBeforeUnmount(() => {
   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: 0;
+  z-index: 1;
+  pointer-events: none;
+  transform-origin: center center;
+}
+.target--shake {
+  animation: target-shake 0.26s ease-out;
 }
 .target-image {
   position: absolute;
@@ -499,6 +742,15 @@ onBeforeUnmount(() => {
 .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%;
@@ -527,6 +779,20 @@ onBeforeUnmount(() => {
   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);
@@ -536,6 +802,29 @@ onBeforeUnmount(() => {
     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;

src/pages/training/components/ScorePanel.vue

@@ -85,8 +85,8 @@ onBeforeUnmount(() => {
         class="score-item-bg"
         :src="
           isLowScore(arrows[index])
-            ? '/static/training-difficulty-design/block-gray.png'
-            : '/static/training-difficulty-design/block-gold.png'
+            ? '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

src/pages/training/components/ScorePanel2.vue

@@ -14,7 +14,7 @@ const props = defineProps({
 
 const getDisplayText = (arrow = {}) => {
   if (!arrow) return "";
-  if (!arrow.ring) return "-";
+  if (!arrow.ring) return "0";
   return arrow.ringX ? "X" : String(arrow.ring);
 };
 
@@ -25,9 +25,8 @@ const isLowScore = (arrow = {}) => {
 
 const displayArrows = computed(() => {
   const list = [...props.arrows];
-  if (props.total > 0 && list.length < props.total) {
-    list.push(null);
-  }
+  // total 是达标箭数，不是实际射箭上限；训练中始终预留下一箭空框。
+  list.push(null);
   return list;
 });
 </script>
@@ -40,7 +39,7 @@ const displayArrows = computed(() => {
         :key="index"
         class="score-card"
       >
-        <image class="score-card-bg" :src="isLowScore(arrow)?'/static/training-difficulty-design/block-gray.png':'/static/training-difficulty-design/block-gold.png'"></image>
+        <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) }"

src/pages/training/components/ScoreResult.vue

@@ -27,6 +27,18 @@ const props = defineProps({
     type: Number,
     default: 0,
   },
+  trainingType: {
+    type: String,
+    default: "",
+  },
+  difficultyLevel: {
+    type: Number,
+    default: 0,
+  },
+  hasNextDifficulty: {
+    type: Boolean,
+    default: false,
+  },
   result: {
     type: Object,
     default: () => ({}),
@@ -60,12 +72,6 @@ function onClickShare() {
   uni.$emit("share-image");
 }
 
-onMounted(() => {
-  if (props.result.lvl > user.value.lvl) {
-    showUpgrade.value = true;
-  }
-});
-
 const details = computed(() => props.result.details || []);
 
 const arrows = computed(() => {
@@ -81,25 +87,89 @@ const totalRing = computed(() =>
   details.value.reduce((last, next) => last + (Number(next.ring) || 0), 0)
 );
 
-const gainedExp = computed(
-  () => props.result.exp || props.result.experience || validArrows.value
+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 currentLevel = computed(
-  () => props.result.lvl || user.value.lvl || user.value.rankLvl || 1
-);
+const currentExp = computed(() => {
+  const userScores = Number(user.value.scores);
+  return readResultNumber(
+    ["currentExp", "current_exp", "score"],
+    Number.isFinite(userScores) ? userScores : 0
+  );
+});
 
-const currentExp = computed(
-  () => props.result.currentExp || props.result.score || user.value.scores || 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 nextExp = computed(
-  () => props.result.nextExp || props.result.upgradeScore || 100
+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 (!nextExp.value) return 0;
-  return Math.min(100, Math.max(0, (currentExp.value / nextExp.value) * 100));
+  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) => {
@@ -108,83 +178,182 @@ const findValue = (...keys) => {
 };
 
 const formatDuration = (value) => {
-  const seconds = Number(value || 0);
-  if (!seconds) return "--";
+  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 usedTime = computed(() =>
-  findValue("duration", "usedTime", "shootTime", "time")
+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 hitCompare = computed(
-  () => Number(findValue("hitCompare", "hitDiff", "hitDelta") || 0)
+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 timeCompare = computed(
-  () => Number(findValue("timeCompare", "timeDiff", "durationDiff") || 0)
-);
+const handlePrimary = () => {
+  if (advancesDifficulty.value) {
+    closePanel();
+    return;
+  }
+  retryPractice();
+};
 
 const calories = computed(
-  () => Number(findValue("calories", "calorie", "kcal") || 0)
+  () => formatMetricNumber(readMetricNumber(["calories", "calorie", "kcal"]))
 );
 </script>
 
 <template>
   <view :class="['result-mask', showPanel ? 'result-mask--show' : 'result-mask--hide']">
-    <image class="hero-glow" src="/static/training-difficulty-design/result-bg.png" mode="widthFix" />
+    <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="/static/training-difficulty-design/result-t-bg.png" mode="widthFix" />
-      <view class="result-title-text">Lv{{ currentLevel }}</view>
+      <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 class="stat-row">
-          <image class="stat-bg" src="/static/training-difficulty-design/result-c-bg.png" mode="scaleToFill" />
+        <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">共命中目标</text>
+            <text class="stat-label">{{ row.label }}</text>
             <view class="stat-value">
-              <text>{{ validArrows }}</text>
-              <text class="stat-unit">次</text>
+              <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 class="stat-value">
-              <text>{{ Math.abs(hitCompare) }}</text>
-              <text class="stat-unit">次</text>
-              <image class="trend-icon" :class="{ 'trend-icon--down': hitCompare < 0 }"
-                src="/static/training-difficulty-design/result-up.png" mode="widthFix" />
-            </view>
-          </view>
-        </view>
-
-        <view class="stat-row">
-          <image class="stat-bg" src="/static/training-difficulty-design/result-c-bg.png" mode="scaleToFill" />
-          <view class="stat-cell">
-            <text class="stat-label">用时</text>
-            <view class="stat-value">
-              <text>{{ formatDuration(usedTime) }}</text>
-            </view>
-          </view>
-          <view class="stat-divider"></view>
-          <view class="stat-cell stat-cell--compare">
-            <text class="stat-label">对比上次</text>
-            <view class="stat-value">
-              <text>{{ formatDuration(Math.abs(timeCompare)) }}</text>
-              <image class="trend-icon" :class="{ 'trend-icon--down': timeCompare <= 0 }"
-                src="/static/training-difficulty-design/result-up.png" mode="widthFix" />
+            <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="/static/training-difficulty-design/result-c-bg.png" mode="scaleToFill" />
+          <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">
@@ -196,7 +365,7 @@ const calories = computed(
           <view class="stat-cell stat-cell--compare">
             <view class="stat-value">
               <image v-for="index in 3" :key="index" class="rice-icon"
-                  src="/static/training-difficulty-design/result-rice.png" mode="widthFix" />
+                  src="https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/result-rice.png" mode="widthFix" />
             </view>
           </view>
         </view>
@@ -204,15 +373,15 @@ const calories = computed(
      
         <view class="actions">
           <view class="action-item" @click="() => (showBowData = true)">
-            <image class="action-icon" src="/static/training-difficulty-design/result-icon-1.png" mode="widthFix" />
+            <image class="action-icon" src="https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/result-icon-1.png" mode="widthFix" />
             <text>查看靶纸</text>
           </view>
-          <view v-if="validArrows === total" class="action-item" @click="() => (showComment = true)">
-            <image class="action-icon" src="/static/training-difficulty-design/result-icon-2.png" mode="widthFix" />
+          <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 v-if="validArrows === total" class="action-item" @click="onClickShare">
-            <image class="action-icon" src="/static/training-difficulty-design/result-icon-3.png" mode="widthFix" />
+          <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>
@@ -222,20 +391,20 @@ const calories = computed(
       <view class="exp-area">
         <text class="exp-gain">+{{ gainedExp }}经验</text>
         <view class="level-progress">
-          <text class="level-text">LV.{{ currentLevel }}</text>
+          <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 }} / {{ nextExp }}</text>
+          <text class="progress-text">{{ currentExp }} / {{ upgradeExp }}</text>
         </view>
       </view>
 
       <view class="footer-actions">
         <view class="result-btn result-btn--muted" @click="closePanel">
-          <text>{{ validArrows === total ? "完成" : "返回" }}</text>
+          <text>完成</text>
         </view>
-        <view class="result-btn result-btn--primary" @click="retryPractice">
-          <text>再来一次</text>
+        <view class="result-btn result-btn--primary" @click="handlePrimary">
+          <text>{{ primaryText }}</text>
         </view>
       </view>
     </view>
@@ -268,7 +437,7 @@ const calories = computed(
     </ScreenHint>
     <BowData :total="arrows.length" :arrows="result.details" :show="showBowData"
       :onClose="() => (showBowData = false)" />
-    <UserUpgrade :show="showUpgrade" :onClose="() => (showUpgrade = false)" :lvl="result.lvl" />
+    <UserUpgrade :show="showUpgrade" :onClose="() => (showUpgrade = false)" :lvl="userLevel" />
   </view>
 </template>
 

src/pages/training/components/ScreenHint.vue

@@ -27,29 +27,29 @@ const getContentHeight = () => {
     <view class="scale-in" :style="{ height: getContentHeight() }">
       <image
         v-if="mode === 'normal'"
-        src="/static/screen-hint-bg.png"
+        src="https://static.shelingxingqiu.com/shootmini/static/screen-hint-bg.png"
         mode="widthFix"
       />
       <image
         v-if="mode === 'tall'"
-        src="/static/coach-comment.png"
+        src="https://static.shelingxingqiu.com/shootmini/static/coach-comment.png"
         mode="widthFix"
       />
       <image
         v-if="mode === 'square'"
-        src="/static/prompt-bg-square.png"
+        src="https://static.shelingxingqiu.com/shootmini/static/prompt-bg-square.png"
         mode="widthFix"
       />
       <image
         v-if="mode === 'small'"
-        src="/static/finish-frame.png"
+        src="https://static.shelingxingqiu.com/shootmini/static/finish-frame.png"
         mode="widthFix"
       />
       <slot />
     </view>
     <IconButton
       v-if="!!onClose"
-      src="/static/close-gold-outline.png"
+      src="https://static.shelingxingqiu.com/shootmini/static/close-gold-outline.png"
       :width="30"
       :onClick="onClose"
     />

src/pages/training/components/ShootProgress.vue

@@ -27,6 +27,26 @@ const props = defineProps({
     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,
@@ -45,8 +65,23 @@ const props = defineProps({
   },
 });
 
+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.total);
+const remain = ref(props.countdownEnabled ? props.total : 0);
 const timer = ref(null);
 const sound = ref(true);
 const currentRound = ref(props.currentRound);
@@ -56,7 +91,7 @@ const wait = ref(0);
 const transitionStyle = ref("all 1s linear");
 
 const progressPercent = computed(() => {
-  if (!props.total) return 0;
+  if (!props.countdownEnabled || !props.total) return 0;
   return Math.max(0, Math.min(100, (remain.value / props.total) * 100));
 });
 
@@ -98,9 +133,23 @@ watch(
   }
 );
 
+const clearTimer = () => {
+  if (!timer.value) return;
+  clearInterval(timer.value);
+  timer.value = null;
+};
+
 const resetTimer = (count) => {
-  if (timer.value) clearInterval(timer.value);
-  const newVal = Math.round(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";
@@ -115,7 +164,7 @@ const resetTimer = (count) => {
   if (remain.value > 0) {
     timer.value = setInterval(() => {
       if (remain.value === 0) {
-        clearInterval(timer.value);
+        clearTimer();
         props.onStop();
       }
       if (remain.value > 0) remain.value--;
@@ -124,13 +173,13 @@ const resetTimer = (count) => {
 };
 
 watch(
-  () => props.start,
-  (newVal) => {
-    if (newVal) {
+  () => [props.start, props.countdownEnabled],
+  ([started, countdownEnabled]) => {
+    if (started && countdownEnabled) {
       resetTimer(props.total);
     } else {
+      clearTimer();
       remain.value = 0;
-      clearInterval(timer.value);
     }
   },
   {
@@ -156,20 +205,33 @@ async function onReceiveMessage(msg) {
     halfTime.value = false;
     audioManager.play("比赛开始");
   } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
-    audioManager.play("比赛结束", false);
+    audioManager.play("练习结束", false);
   } else if (msg.type === MESSAGETYPESV2.ShootResult) {
-    let arrow = {};
-    if (msg.details && Array.isArray(msg.details)) {
-      arrow = msg.details[msg.details.length - 1];
-    } else {
-      if (msg.shootData.playerId !== user.value.id) return;
-      if (msg.shootData) arrow = msg.shootData;
+    // 精准训练由页面统一等待语音和飞箭结束，其他训练保持原播放链路。
+    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;
     }
-    let key = [];
+
+    const key = [];
     key.push(arrow.ring ? `${arrow.ringX ? "X" : arrow.ring}环` : "未上靶");
-    if (arrow.angle !== null) {
+    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;
@@ -197,7 +259,7 @@ onBeforeUnmount(() => {
   uni.$off("update-remain", resetTimer);
   uni.$off("socket-inbox", onReceiveMessage);
   uni.$off("play-sound", playSound);
-  if (timer.value) clearInterval(timer.value);
+  clearTimer();
 });
 </script>
 
@@ -213,7 +275,19 @@ onBeforeUnmount(() => {
             image-mode="aspectFill"
           />
         </view>
-        <text class="progress-card__name">{{ displayName }}</text>
+        <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">
@@ -228,10 +302,10 @@ onBeforeUnmount(() => {
     <view class="progress-card__track-wrap">
       <image
           class="progress-card__titile"
-          src="../../../static/training-difficulty-design/text-icon-cgxl.png"
+          :src="trainingTitleIcon"
           mode="aspectFit"
         />
-      <view class="progress-card__track">
+      <view v-if="countdownEnabled" class="progress-card__track">
         <view
           class="progress-card__fill"
           :style="{
@@ -290,9 +364,10 @@ onBeforeUnmount(() => {
 
 .progress-card__name {
   width: 86rpx;
-  color: #E7BA80;
+  color: #fff;
   font-size: 18rpx;
   line-height: 1;
+  justify-content: center;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;

src/pages/training/components/TestDistance.vue

@@ -23,6 +23,10 @@ const props = defineProps({
     type: Number,
     default: 15,
   },
+  targetType: {
+    type: [Number, String],
+    default: "",
+  },
 });
 const arrow = ref({});
 const distance = ref(0);
@@ -78,7 +82,7 @@ onBeforeUnmount(() => {
     <view class="test-area">
       <image
         class="text-bg"
-        src="../../../static/training-difficulty-design/par-bg.png"
+        src="https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/par-bg.png"
         mode="widthFix"
       />
       <button
@@ -90,7 +94,7 @@ onBeforeUnmount(() => {
         模拟射箭
       </button>
       <view class="warnning-text">
-        <view class="target-tip">当前靶子为<text class="text-yellow">20cm</text>全环靶,请更换靶子</view>
+        <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>
@@ -108,7 +112,7 @@ onBeforeUnmount(() => {
     <view v-if="isBattle" class="ready-timer">
       <image src="../../../static/test-tip.png" mode="widthFix" />
       <view v-if="count >= 0">
-        <text>具体正式比赛还有</text>
+        <text>距离正式比赛还有</text>
         <text>{{ count }}</text>
         <text>秒</text>
       </view>

src/pages/training/components/TrainingDifficultyBadge.vue

@@ -2,9 +2,9 @@
 import { computed } from "vue";
 
 const lockedBadgeBackground =
-  "/static/training-difficulty-design/unlock.svg";
+  "https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/unlock.svg";
 const unlockedBadgeBackground =
-  "/static/training-difficulty-design/lock.svg";
+  "https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/lock.svg";
 
 const props = defineProps({
   node: {

src/pages/training/components/TrainingDifficultyPreviewCard.vue

@@ -21,7 +21,7 @@ const previewLines = computed(() => {
   <view class="difficulty-preview">
     <image
       class="difficulty-preview__bg"
-      src="/static/training-difficulty-design/text.png"
+      src="https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/text.png"
       mode="widthFix"
     />
     <view class="difficulty-preview__content">
@@ -52,10 +52,15 @@ const previewLines = computed(() => {
 
 .difficulty-preview__content {
   position: absolute;
-  top: 28rpx;
-  left: 30rpx;
+  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 {

src/pages/training/components/TrainingDifficultyStartButton.vue

@@ -21,7 +21,7 @@ const handleClick = () => {
   >
     <image
       class="difficulty-start__button"
-      src="/static/training-difficulty-design/btn.png"
+      src="https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/btn.png"
       mode="widthFix"
     />
   </button>

src/pages/training/difficulty.vue

@@ -1,17 +1,21 @@
 <script setup>
 import { computed, nextTick, ref } from "vue";
-import { onLoad, onShow, onUnload } from "@dcloudio/uni-app";
+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 { getTrainingDifficultyListAPI } from "@/apis";
+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 trainingDifficultyRefreshEvent = "training-difficulty-refresh";
 const defaultTrainingType = "precision";
 const defaultUnlockedDifficultyId = "lv1";
 const trainingTypeMetaMap = {
@@ -235,7 +239,9 @@ const selectedDifficultyId = ref(defaultUnlockedDifficultyId);
 const nodesScrollTop = ref(0);
 const nodesScrollWithAnimation = ref(false);
 const routeOptions = ref({});
-const needRefreshProgress = ref(false);
+const shouldRefreshOnShow = ref(false);
+const creatingPractice = ref(false);
+let pageStateRequestGeneration = 0;
 
 const difficultyProgressMap = computed(() => {
   return pageConfig.value?.progressMap || {};
@@ -439,6 +445,16 @@ const selectedDifficulty = computed(() => {
   );
 });
 
+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]);
@@ -528,6 +544,7 @@ const applyPageState = (options = {}, config) => {
 };
 
 const initPageState = async (options = {}, refreshOptions = {}) => {
+  const requestGeneration = ++pageStateRequestGeneration;
   const { keepCurrent = false } = refreshOptions;
   const trainingType = resolveTrainingType(options.mode);
   const fallbackConfig = createEmptyModeConfig(trainingType);
@@ -538,11 +555,19 @@ const initPageState = async (options = {}, refreshOptions = {}) => {
 
   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);
@@ -574,7 +599,6 @@ const createPracticeQuery = (difficulty) => {
     difficulty: difficulty.level,
     recordId: difficulty.recordId,
     arrows: toNumber(difficulty.arrows, 12),
-    time: toNumber(difficulty.time_limit, 120) || 120,
     target: defaultTargetType,
   };
   const typedQueryMap = {
@@ -610,7 +634,7 @@ const createPracticeUrl = (difficulty) => {
   return `/pages/training/practise-one${query ? `?${query}` : ""}`;
 };
 
-const saveTrainingContext = () => {
+const saveTrainingContext = (practice = {}) => {
   const difficulty = selectedDifficulty.value;
 
   if (!difficulty.id) {
@@ -624,9 +648,32 @@ const saveTrainingContext = () => {
     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;
@@ -640,6 +687,8 @@ const handleSelectDifficulty = (node) => {
     return;
   }
 
+  audioManager.play("点击按钮");
+
   if (node.id === selectedDifficultyId.value) {
     return;
   }
@@ -650,41 +699,77 @@ const handleSelectDifficulty = (node) => {
   });
 };
 
-const handleStart = () => {
-  if (!selectedDifficulty.value.id) {
+const handleStart = async () => {
+  if (!selectedDifficulty.value.id || creatingPractice.value) {
     return;
   }
 
-  saveTrainingContext();
-  uni.navigateTo({
-    url: createPracticeUrl(selectedDifficulty.value),
-  });
-};
+  const trainingType = pageConfig.value.key || defaultTrainingType;
+  const difficultyLevel = selectedDifficulty.value.level;
+  let createdPracticeId = "";
 
-const markProgressRefresh = () => {
-  needRefreshProgress.value = true;
+  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 };
-  uni.$on(trainingDifficultyRefreshEvent, markProgressRefresh);
-  initPageState(options);
+  void initPageState(options);
+});
+
+onHide(() => {
+  shouldRefreshOnShow.value = true;
 });
 
 onShow(() => {
-  if (!needRefreshProgress.value) {
-    return;
-  }
+  if (!shouldRefreshOnShow.value) return;
 
-  needRefreshProgress.value = false;
-  initPageState(routeOptions.value, {
+  shouldRefreshOnShow.value = false;
+  void initPageState(routeOptions.value, {
     keepCurrent: true,
   });
 });
-
-onUnload(() => {
-  uni.$off(trainingDifficultyRefreshEvent, markProgressRefresh);
-});
 </script>
 
 <template>
@@ -693,6 +778,8 @@ onUnload(() => {
     :bgType="8"
     bgColor="#1c1c23"
     :scroll="false"
+    :loading="creatingPractice"
+    loadingText="训练创建中..."
   >
     <view class="difficulty-page">
       <view class="difficulty-page__nodes">
@@ -709,7 +796,7 @@ onUnload(() => {
               v-for="connector in difficultyConnectors"
               :key="connector.id"
               class="difficulty-page__connector"
-              src="../../static/training-difficulty-design/jiantou.png"
+              src="https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/jiantou.png"
               mode="aspectFit"
               :style="connector"
             />
@@ -731,12 +818,18 @@ onUnload(() => {
           :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="handleStart"
+          @click="$clickSound(handleStart)"
         />
       </view>
     </view>
@@ -789,6 +882,16 @@ onUnload(() => {
   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;

src/pages/training/index.vue

@@ -1,12 +1,14 @@
 <script setup>
-import { nextTick, onMounted, ref } from "vue";
+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 = "../../static/training-home/done.png";
-const missedIcon = "../../static/training-home/missed.png";
+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",
@@ -15,20 +17,30 @@ const trainingModeRouteMap = {
   rhythm: "rhythm",
   strength: "power",
 };
+const unavailableTrainingIds = new Set(["rhythm", "strength"]);
 // 训练项目卡片右侧主图标。
 const trainingModeIconMap = {
-  base_bow: "../../static/training-home/img_22.png",
-  bow: "../../static/training-home/img_3.png",
-  target: "../../static/training-home/img_4.png",
-  wave: "../../static/training-home/img_5.png",
-  muscle: "../../static/training-home/img_6.png",
+  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 映射本地资源。
+// 训练项目卡片标题图，按接口 id 映射 CDN 资源。
 const trainingModeTitleImageMap = {
-  endurance: "../../static/training-home/nailixunlian.png",
-  precision: "../../static/training-home/jingzhunxunlian.png",
-  rhythm: "../../static/training-home/jiezouxunlian.png",
-  strength: "../../static/training-home/liliangxulian.png",
+  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 = [
@@ -38,6 +50,13 @@ const defaultRadarDimensions = [
   { name: "节奏", score: 0 },
   { name: "耐力", score: 0 },
 ];
+const radarDimensionTrainingIdMap = Object.freeze({
+  基础: "base",
+  精准: "precision",
+  力量: "strength",
+  节奏: "rhythm",
+  耐力: "endurance",
+});
 
 // 页面始终直接消费接口字段，这里只保留一份兜底结构，避免模板访问空值。
 const createDefaultTrainingData = () => ({
@@ -48,8 +67,9 @@ const createDefaultTrainingData = () => ({
     hit_rate: 0,
     endurance_shoot_speed: 0,
     total_calories: 0,
-    overtake_rate: 0,
   },
+  beat_percent: 0,
+  radar_max: 0,
   radar: {
     dimensions: defaultRadarDimensions,
   },
@@ -57,6 +77,12 @@ const createDefaultTrainingData = () => ({
 });
 
 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";
@@ -66,8 +92,17 @@ const radarFigureWidthRpx = 448;
 const radarFigureHeightRpx = Math.round(
   (radarFigureWidthRpx * radarImageHeight) / radarImageWidth
 );
-const radarCanvasWidth = Math.round(uni.upx2px(radarFigureWidthRpx));
-const radarCanvasHeight = Math.round(uni.upx2px(radarFigureHeightRpx));
+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);
@@ -77,11 +112,11 @@ 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 radarMaxValue = 100;
 const radarFigureStyle = {
-  width: `${radarFigureWidthRpx}rpx`,
-  height: `${radarFigureHeightRpx}rpx`,
+  width: `${radarDisplayWidth}px`,
+  height: `${radarDisplayHeight}px`,
 };
+let radarRenderGeneration = 0;
 
 const formatValue = (value, digits = 1) => {
   const numberValue = Number(value);
@@ -92,7 +127,7 @@ const formatValue = (value, digits = 1) => {
 const getLevelText = (item) => {
   if (!item) return "";
   const level = Number(item.current_level) || 0;
-  return item.is_locked ? `Coming! LV${level}` : `当前进度 LV${level} >`;
+  return `当前进度 LV${level} >`;
 };
 
 // 卡路里字段按需求做 K / W 缩写展示。
@@ -113,26 +148,80 @@ const getTrainingTitleImage = (item = {}) =>
 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，按 0-100 等比映射到顶点位置。
+// 雷达图直接使用接口的 5 维 score，按后端 radar_max 等比映射到顶点位置。
 const drawRadar = () => {
   const dimensions = Array.isArray(trainingData.value.radar?.dimensions)
     ? trainingData.value.radar.dimensions.slice(0, 5)
     : [];
-
-  if (dimensions.length !== 5) return;
+  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)
   );
 
-  ctx.clearRect(0, 0, radarCanvasWidth, radarCanvasHeight);
-
   const points = dimensions.map((item, index) => {
     const normalized = Math.max(
       0,
@@ -175,11 +264,14 @@ const drawRadar = () => {
   ctx.draw();
 };
 
-// 小程序 canvas 首次渲染时机不稳定，延后一帧再绘制更稳。
+// 小程序 Canvas 首次渲染时机不稳定，延后一帧再绘制更稳。
 const refreshRadar = async () => {
+  const generation = ++radarRenderGeneration;
   await nextTick();
   setTimeout(() => {
-    drawRadar();
+    if (generation === radarRenderGeneration) {
+      drawRadar();
+    }
   }, 30);
 };
 
@@ -197,8 +289,9 @@ const loadPersonalTrainingData = async () => {
         hit_rate: result?.stats?.hit_rate ?? 0,
         endurance_shoot_speed: result?.stats?.endurance_shoot_speed ?? 0,
         total_calories: result?.stats?.total_calories ?? 0,
-        overtake_rate: result?.stats?.overtake_rate ?? 0,
       },
+      beat_percent: result?.beat_percent ?? 0,
+      radar_max: result?.radar_max ?? 0,
       radar: {
         dimensions:
           Array.isArray(result?.radar?.dimensions) &&
@@ -214,6 +307,7 @@ const loadPersonalTrainingData = async () => {
     console.log("personal training load failed", error);
     trainingData.value = createDefaultTrainingData();
   } finally {
+    updateRecommendedTraining();
     await refreshRadar();
   }
 };
@@ -225,17 +319,17 @@ const openTrainingRecord = () => {
 };
 
 const openTrainingItem = (item = {}) => {
-  const mode = getTrainingMode(item);
-  if (!mode) return;
-
-  if (item.is_locked) {
+  if (unavailableTrainingIds.has(item.id)) {
     uni.showToast({
-      title: `${item.name || "训练"} 暂未开放`,
+      title: "功能开发中...",
       icon: "none",
     });
     return;
   }
 
+  const mode = getTrainingMode(item);
+  if (!mode) return;
+
   uni.navigateTo({
     url: `/pages/training/difficulty?mode=${mode}`,
   });
@@ -266,7 +360,12 @@ onShow(async () => {
 </script>
 
 <template>
-  <Container :showBackToGame="true" :bgType="7" bgColor="#050b19">
+  <Container
+    :showBackToGame="true"
+    :bgType="7"
+    bgColor="#050b19"
+    :usePageScroll="true"
+  >
     <view class="training-home">
       <view class="week-grid">
         <view
@@ -293,12 +392,12 @@ onShow(async () => {
         <view class="stats-card-bg"></view>
         <image
           class="stats-quote stats-quote-left"
-          src="../../static/training-home/img_17.png"
+          src="https://static.shelingxingqiu.com/shootmini/static/training-home/img_17.png"
           mode="widthFix"
         />
         <image
           class="stats-quote stats-quote-right"
-          src="../../static/training-home/img_16.png"
+          src="https://static.shelingxingqiu.com/shootmini/static/training-home/img_16.png"
           mode="widthFix"
         />
         <view class="stats-grid">
@@ -370,21 +469,21 @@ onShow(async () => {
       </view>
 
       <view class="radar-section">
-        <view class="record-bubble" @click="openTrainingRecord">
+        <view class="record-bubble" @click="$clickSound(openTrainingRecord)">
           <image
             class="record-bubble-bg"
-            src="../../static/training-home/img_28.png"
+            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.stats.overtake_rate) }}%</text>对手
+              已超越<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="../../static/training-home/img_7.png"
+                src="https://static.shelingxingqiu.com/shootmini/static/training-home/img_7.png"
                 mode="widthFix"
               />
             </view>
@@ -412,7 +511,7 @@ onShow(async () => {
             <image
               class="radar-grid-image"
               :style="radarFigureStyle"
-              src="../../static/training-home/img_19.png"
+              src="https://static.shelingxingqiu.com/shootmini/static/training-home/img_19.png"
             />
             <canvas
               :canvas-id="trainingRadarCanvasId"
@@ -424,34 +523,35 @@ onShow(async () => {
             />
             <image
               class="radar-mascot"
-              src="../../static/training-home/img_21.png"
+              src="https://static.shelingxingqiu.com/shootmini/static/training-home/img_21.png"
               mode="widthFix"
             />
           </view>
         </view>
       </view>
 
-      <view class="featured-card" @click="openRoutineTraining">
+      <view class="featured-card" @click="$clickSound(openRoutineTraining)">
         <image
           class="featured-card-bg"
-          src="../../static/training-home/img_22.png"
+          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-title">常规训练</text>
           <text class="featured-card-subtitle">12箭练习</text>
         </view>
       </view>
 
       <view class="mode-grid">
         <view
-          v-for="item in trainingData.training_items.filter((item) => item.id !== 'strength')"
+          v-for="item in visibleTrainingItems"
           :key="item.id"
           class="mode-card"
-          @click="openTrainingItem(item)"
+          @click="$clickSound(() => openTrainingItem(item))"
         >
-          <view v-if="item.is_recommended" class="mode-tag">推荐</view>
+          <view v-if="item.id === recommendedTrainingId" class="mode-tag">
+            推荐
+          </view>
           <view class="mode-card-copy">
             <image
               v-if="getTrainingTitleImage(item)"
@@ -472,6 +572,7 @@ onShow(async () => {
     </view>
     <TargetPicker
       :show="showRoutineTargetPicker"
+      :clickSound="true"
       :onClose="() => (showRoutineTargetPicker = false)"
       :onConfirm="handleRoutineTargetConfirm"
     />
@@ -739,10 +840,9 @@ onShow(async () => {
 }
 
 .radar-figure {
-  position: absolute;
-  left: 50%;
+  position: relative;
   top: 54rpx;
-  transform: translateX(-50%);
+  margin: 0 auto;
   overflow: visible;
 }
 
@@ -779,13 +879,12 @@ onShow(async () => {
   top: 0;
   width: 278rpx;
   height: 150rpx;
-  background: linear-gradient(90deg, #ffdaa0 0%, #f5c580 74%, rgba(245, 197, 128, 0) 100%);
 }
 
 .featured-card-copy {
   position: absolute;
-  left: 30rpx;
-  top: 34rpx;
+  left: 174rpx;
+  top: 58rpx;
   display: flex;
   flex-direction: column;
 }
@@ -805,7 +904,6 @@ onShow(async () => {
   color: #895409;
   font-size: 22rpx;
   line-height: 32rpx;
-  opacity: 0.72;
 }
 
 .mode-grid {

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>

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 = []) => {

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({

src/websocket.js

@@ -24,7 +24,7 @@ function createWebSocket(token, onMessage) {
 
     switch (envVersion) {
       case "develop": // 开发版
-        // url = "ws://192.168.1.2:8000/socket";
+        // url = "ws://192.168.1.30:8000/socket";
         url = "wss://apitest.shelingxingqiu.com/socket";
         break;
       case "trial": // 体验版