update:优化文字

scripts/generate-match-schema.mjs

@@ -400,7 +400,8 @@ function main() {
     throw new Error(`未知参数：${unknownArgs.join(", ")}`);
   }
 
-  const source = readFileSync(sourcePath, "utf8");
+  // 统一换行符，避免 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);

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.5:8000/api/shoot";
+            // BASE_URL = "http://192.168.1.30:8000/api/shoot";
             BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
             break;
         case "trial": // 体验版
@@ -186,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 = () => {
@@ -269,6 +280,10 @@ export const createPractiseV2API = (trainingType, difficultyLevel) => {
     });
 };
 
+export const getCurrentPractiseAPI = () => {
+    return request("GET", "/user/practice/current");
+};
+
 export const startPractiseAPI = (id) => {
     return request("POST", "/user/practice/begin", { id });
 };
@@ -498,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/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/matchWebsocket.js

@@ -349,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"];
 }
 
@@ -373,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:
@@ -849,6 +850,8 @@ export function connectMatchWebSocket(options = {}) {
     token,
     mode,
     requestPracticeInfoOnOpen = false,
+    appHideResumable = false,
+    practiceEndAudioKey = "",
     force = false,
     reconnecting = false,
     reconnectReason = "",
@@ -920,6 +923,8 @@ export function connectMatchWebSocket(options = {}) {
     isMelee:
       Number.isFinite(normalizedMode) ? normalizedMode > 3 : undefined,
     requestPracticeInfoOnOpen: requestPracticeInfoOnOpen === true,
+    appHideResumable: appHideResumable === true,
+    practiceEndAudioKey: String(practiceEndAudioKey || "").trim(),
     meleeHalfRest: isSameContext
       ? currentContext?.meleeHalfRest === true
       : false,
@@ -1016,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();
@@ -1051,6 +1069,7 @@ export default {
   ServerMessageType,
   connectMatchWebSocket,
   connectMatchWebSocketFromNotice,
+  setMatchAppHideResumable,
   closeMatchWebSocket,
   forceReconnectMatchWebSocket,
   handleMatchNetworkStatusChange,

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,8 +38,20 @@ const props = defineProps({
       <view>
         <Avatar :src="user.avatar" :rankLvl="user.rankLvl" :size="45" />
         <view>
-          <text>{{ user.nickName }}</text>
-          <!-- <text>{{ user.lvlName }}</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>
       <view @click="onClose">
@@ -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

@@ -13,7 +13,7 @@ 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();
@@ -84,8 +84,14 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  stableShotEffect: {
+    type: Boolean,
+    default: false,
+  },
 });
 
+const emit = defineEmits(["shot-effect-complete"]);
+
 const pMode = ref(true);
 const latestOne = ref(null);
 const bluelatestOne = ref(null);
@@ -96,11 +102,13 @@ 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 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;
 
@@ -243,25 +251,59 @@ function buildShotEffectKey(shot, index) {
   ].join("-");
 }
 
-function triggerShotEffect(shot, index) {
+function triggerShotEffect(shot, index, viewportMode = false) {
   const key = buildShotEffectKey(shot, index);
   clearTipTimer();
   latestOne.value = null;
   hiddenLatestKey.value = key;
-  shotEffect.value = { key, shot };
+  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 shot = shotEffect.value.shot;
+  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 && index === props.scores.length - 1;
+  return (
+    (!!hiddenLatestKey.value || !!pendingShotEffect.value) &&
+    index === props.scores.length - 1
+  );
 }
 
 function shakeTarget() {
@@ -280,27 +322,53 @@ 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();
 }
 
 watch(
@@ -309,6 +377,8 @@ watch(
     if (newVal.length - prevScores.value.length === 1) {
       showShotTip(newVal[newVal.length - 1]);
     } else if (newVal.length < prevScores.value.length) {
+      shotEffectRequestGeneration += 1;
+      pendingShotEffect.value = null;
       clearTipTimer();
       latestOne.value = null;
       hiddenLatestKey.value = "";
@@ -329,7 +399,10 @@ watch(
     const latestIndex = props.scores.length - 1;
     const latestShot = props.scores[latestIndex];
     if (shouldPlayShotEffect(latestShot)) {
-      triggerShotEffect(latestShot, latestIndex);
+      void prepareShotEffect(latestShot, latestIndex);
+    } else {
+      shotEffectRequestGeneration += 1;
+      pendingShotEffect.value = null;
     }
   }
 );
@@ -361,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;
@@ -403,11 +484,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;
   clearTipTimer();
   if (dirTimer.value) {
     clearTimeout(dirTimer.value);
@@ -527,16 +610,33 @@ 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"
       />
     </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)"
@@ -546,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>

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

src/pages/training/components/ScoreResult.vue

@@ -35,6 +35,10 @@ const props = defineProps({
     type: Number,
     default: 0,
   },
+  hasNextDifficulty: {
+    type: Boolean,
+    default: false,
+  },
   result: {
     type: Object,
     default: () => ({}),
@@ -297,9 +301,7 @@ const resultRows = computed(() => {
   });
 });
 
-const advancesDifficulty = computed(() =>
-  ["base", "endurance"].includes(resultTrainingType.value)
-);
+const advancesDifficulty = computed(() => props.hasNextDifficulty);
 const primaryText = computed(() =>
   advancesDifficulty.value ? "下一难度" : "再来一次"
 );

src/pages/training/components/ShootProgress.vue

@@ -35,6 +35,18 @@ const props = defineProps({
     type: String,
     default: "precision",
   },
+  isVip: {
+    type: Boolean,
+    default: false,
+  },
+  isSvip: {
+    type: Boolean,
+    default: false,
+  },
+  externalShootResultAudio: {
+    type: Boolean,
+    default: false,
+  },
   currentRound: {
     type: Number,
     default: 0,
@@ -193,8 +205,10 @@ 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) {
+    // 精准训练由页面统一等待语音和飞箭结束，其他训练保持原播放链路。
+    if (props.externalShootResultAudio) return;
     const latestDetail =
       Array.isArray(msg.details) && msg.details.length > 0
         ? msg.details[msg.details.length - 1]
@@ -261,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">
@@ -338,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

@@ -112,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/TrainingDifficultyPreviewCard.vue

@@ -53,7 +53,7 @@ const previewLines = computed(() => {
 .difficulty-preview__content {
   position: absolute;
   top: 0;
-  left: 30rpx;
+  left: 40rpx;
   box-sizing: border-box;
   width: 486rpx;
   height: 93%;

src/pages/training/difficulty.vue

@@ -1,10 +1,11 @@
 <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 audioManager from "@/audioManager";
 import {
   createPractiseV2API,
   endPractiseAPI,
@@ -15,7 +16,6 @@ import {
 // 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 = {
@@ -239,8 +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 || {};
@@ -444,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]);
@@ -533,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);
@@ -543,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);
@@ -667,6 +687,8 @@ const handleSelectDifficulty = (node) => {
     return;
   }
 
+  audioManager.play("点击按钮");
+
   if (node.id === selectedDifficultyId.value) {
     return;
   }
@@ -687,10 +709,6 @@ const handleStart = async () => {
   let createdPracticeId = "";
 
   creatingPractice.value = true;
-  uni.showLoading({
-    title: "训练创建中",
-    mask: true,
-  });
 
   try {
     // 先由业务接口创建训练和比赛服，再把连接上下文交给目标页。
@@ -731,35 +749,27 @@ const handleStart = async () => {
       });
     }
   } finally {
-    uni.hideLoading();
     creatingPractice.value = false;
   }
 };
 
-const markProgressRefresh = () => {
-  needRefreshProgress.value = true;
-};
-
 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>
@@ -768,6 +778,8 @@ onUnload(() => {
     :bgType="8"
     bgColor="#1c1c23"
     :scroll="false"
+    :loading="creatingPractice"
+    loadingText="训练创建中..."
   >
     <view class="difficulty-page">
       <view class="difficulty-page__nodes">
@@ -806,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>
@@ -864,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

@@ -17,19 +17,22 @@ const trainingModeRouteMap = {
   rhythm: "rhythm",
   strength: "power",
 };
+const unavailableTrainingIds = new Set(["rhythm", "strength"]);
 // 训练项目卡片右侧主图标。
 const trainingModeIconMap = {
   base_bow:
-    "https://static.shelingxingqiu.com/shootmini/static/training-home/img_22.png",
-  bow: "https://static.shelingxingqiu.com/shootmini/static/training-home/img_3.png",
+    "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_4.png",
-  wave: "https://static.shelingxingqiu.com/shootmini/static/training-home/img_5.png",
+    "https://static.shelingxingqiu.com/shootmini/static/training-home/img_5.png",
+  wave: "https://static.shelingxingqiu.com/shootmini/static/training-home/img_6.png",
   muscle:
     "https://static.shelingxingqiu.com/shootmini/static/training-home/img_6.png",
 };
 // 训练项目卡片标题图，按接口 id 映射 CDN 资源。
 const trainingModeTitleImageMap = {
+  base:
+    "https://static.shelingxingqiu.com/shootmini/static/training-home/jichuxunlian.png",
   endurance:
     "https://static.shelingxingqiu.com/shootmini/static/training-home/nailixunlian.png",
   precision:
@@ -64,8 +67,8 @@ const createDefaultTrainingData = () => ({
     hit_rate: 0,
     endurance_shoot_speed: 0,
     total_calories: 0,
-    overtake_rate: 0,
   },
+  beat_percent: 0,
   radar_max: 0,
   radar: {
     dimensions: defaultRadarDimensions,
@@ -77,7 +80,7 @@ const trainingData = ref(createDefaultTrainingData());
 const recommendedTrainingId = ref("");
 const visibleTrainingItems = computed(() =>
   Array.isArray(trainingData.value.training_items)
-    ? trainingData.value.training_items.filter((item) => item.id !== "strength")
+    ? trainingData.value.training_items
     : []
 );
 const pageMounted = ref(false);
@@ -89,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);
@@ -101,9 +113,10 @@ const radarPointRadius = Math.max(2.5, 3.5 * radarScale);
 const radarOuterRadiusX = 110.7089 * radarScaleX;
 const radarOuterRadiusY = 110.7089 * radarScaleY;
 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);
@@ -114,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 缩写展示。
@@ -154,6 +167,7 @@ const updateRecommendedTraining = () => {
     const trainingId = radarDimensionTrainingIdMap[item?.name];
     const rawScore = item?.score;
     if (
+      unavailableTrainingIds.has(trainingId) ||
       !visibleTrainingIds.includes(trainingId) ||
       rawScore === undefined ||
       rawScore === null ||
@@ -174,9 +188,10 @@ const updateRecommendedTraining = () => {
   const lowestCandidates = candidates.filter(
     (item) => item.score === lowestScore
   );
-  const selectedIndex = Math.floor(Math.random() * lowestCandidates.length);
+  const selectedIndex = Math.floor(Math.random() * lowestCandidates.length);   //暂时先不随机，默认使用第一个
+  console.log(candidates, selectedIndex, lowestCandidates)
   recommendedTrainingId.value =
-    lowestCandidates[selectedIndex]?.trainingId || "";
+    lowestCandidates[0]?.trainingId || "";
 };
 
 const getRadarPoint = (centerX, centerY, radiusX, radiusY, angle) => ({
@@ -249,11 +264,14 @@ const drawRadar = () => {
   ctx.draw();
 };
 
-// 小程序 canvas 首次渲染时机不稳定，延后一帧再绘制更稳。
+// 小程序 Canvas 首次渲染时机不稳定，延后一帧再绘制更稳。
 const refreshRadar = async () => {
+  const generation = ++radarRenderGeneration;
   await nextTick();
   setTimeout(() => {
-    drawRadar();
+    if (generation === radarRenderGeneration) {
+      drawRadar();
+    }
   }, 30);
 };
 
@@ -271,8 +289,8 @@ 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:
@@ -301,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}`,
   });
@@ -342,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
@@ -446,7 +469,7 @@ 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="https://static.shelingxingqiu.com/shootmini/static/training-home/img_28.png"
@@ -454,7 +477,7 @@ onShow(async () => {
           />
           <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>
@@ -507,7 +530,7 @@ onShow(async () => {
         </view>
       </view>
 
-      <view class="featured-card" @click="openRoutineTraining">
+      <view class="featured-card" @click="$clickSound(openRoutineTraining)">
         <image
           class="featured-card-bg"
           src="https://static.shelingxingqiu.com/shootmini/static/training-home/img_22.png"
@@ -515,7 +538,6 @@ onShow(async () => {
         />
         <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>
@@ -525,7 +547,7 @@ onShow(async () => {
           v-for="item in visibleTrainingItems"
           :key="item.id"
           class="mode-card"
-          @click="openTrainingItem(item)"
+          @click="$clickSound(() => openTrainingItem(item))"
         >
           <view v-if="item.id === recommendedTrainingId" class="mode-tag">
             推荐
@@ -550,6 +572,7 @@ onShow(async () => {
     </view>
     <TargetPicker
       :show="showRoutineTargetPicker"
+      :clickSound="true"
       :onClose="() => (showRoutineTargetPicker = false)"
       :onConfirm="handleRoutineTargetConfirm"
     />
@@ -817,10 +840,9 @@ onShow(async () => {
 }
 
 .radar-figure {
-  position: absolute;
-  left: 50%;
+  position: relative;
   top: 54rpx;
-  transform: translateX(-50%);
+  margin: 0 auto;
   overflow: visible;
 }
 
@@ -857,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;
 }
@@ -883,7 +904,6 @@ onShow(async () => {
   color: #895409;
   font-size: 22rpx;
   line-height: 32rpx;
-  opacity: 0.72;
 }
 
 .mode-grid {

src/pages/training/practise-one.vue

@@ -14,18 +14,21 @@ import audioManager from "@/audioManager";
 
 import {
   createPractiseV2API,
+  getCurrentPractiseAPI,
   startPractiseAPI,
   endPractiseAPI,
   getPractiseAPI,
+  getTrainingDifficultyListAPI,
 } from "@/apis";
 import {
   connectMatchWebSocket,
   closeMatchWebSocket,
+  setMatchAppHideResumable,
   MATCH_WS_PRACTICE_SYNC_EVENT,
   MATCH_WS_STATE_EVENT,
 } from "@/matchWebsocket";
 import { sharePractiseData } from "@/canvas";
-import { wxShare, debounce } from "@/util";
+import { wxShare, debounce, getDirectionText } from "@/util";
 import { MESSAGETYPESV2, roundsName } from "@/constants";
 
 import useStore from "@/store";
@@ -50,14 +53,19 @@ const defaultTargetType = 1;
 const total = ref(defaultTotal);
 const practiseResult = ref({});
 const practiceEndSnapshot = ref({});
+const hasNextDifficulty = ref(false);
 const practiseId = ref("");
 const showGuide = ref(false);
 const tips = ref("");
 const targetType = ref(defaultTargetType);
 const trainingParams = ref({});
 const practiceInfo = ref({});
+// 服务端状态立即落到 practiceInfo，精准训练的目标区域单独延迟展示。
+const visiblePrecisionTarget = ref({
+  randomBlock: 0,
+  randomRingArea: 0,
+});
 const trainingDifficultyStorageKey = "training-selection";
-const trainingDifficultyRefreshEvent = "training-difficulty-refresh";
 const useHighlightTest = ref(false);
 const highlightTestState = ref({
   blocks: 8,
@@ -71,11 +79,24 @@ const stopCompleted = ref(false);
 const stopInFlight = ref(false);
 const exiting = ref(false);
 const hiddenWhileActive = ref(false);
+const resumeInFlight = ref(false);
+const foregroundResumeSyncPending = ref(false);
+const pageVisible = ref(true);
+const appHideResumable = ref(false);
 const connectionClosed = ref(true);
 let stopPracticeTask = null;
 let practiceSyncTimer = null;
 let waitingPracticeSync = false;
+let shotPresentationGeneration = 0;
+let nextDifficultyRequest = null;
+let nextDifficultyRequestGeneration = 0;
+const audioWaiters = new Set();
+const shotEffectWaiters = new Map();
 const PRACTICE_SYNC_TIMEOUT_MS = 5000;
+const SHOT_EFFECT_WAIT_TIMEOUT_MS = 1200;
+const AUDIO_TIMEOUT_BASE = 3500;
+const AUDIO_TIMEOUT_PER_KEY = 2600;
+const AUDIO_TIMEOUT_MAX = 12000;
 
 const env = computed(() => {
   try {
@@ -92,6 +113,15 @@ const showResult = computed(
   () => pageStage.value === pageStages.RESULT && hasPractiseResult.value
 );
 const isSvip = computed(() => practiceInfo.value.sVip === true);
+const isVip = computed(
+  () => practiceInfo.value.vip === true && !isSvip.value
+);
+
+const setPracticeAppHideResumable = (enabled) => {
+  const nextValue = enabled === true;
+  appHideResumable.value = nextValue;
+  setMatchAppHideResumable(nextValue);
+};
 
 const trainingType = computed(
   () => practiceInfo.value.trainingType || trainingParams.value.type || ""
@@ -108,6 +138,15 @@ const getPositiveInteger = (value) => {
   return Number.isInteger(numberValue) && numberValue > 0 ? numberValue : 0;
 };
 
+const getPrecisionTargetSnapshot = (source = {}) => ({
+  randomBlock: getPositiveInteger(source.randomBlock),
+  randomRingArea: getPositiveInteger(source.randomRingArea),
+});
+
+const applyVisiblePrecisionTarget = (source = {}) => {
+  visiblePrecisionTarget.value = getPrecisionTargetSnapshot(source);
+};
+
 const currentDifficultyLevel = computed(
   () =>
     getPositiveInteger(practiseResult.value.difficultyLevel) ||
@@ -116,6 +155,63 @@ const currentDifficultyLevel = computed(
     getPositiveInteger(trainingParams.value.difficulty)
 );
 
+const resetNextDifficultyState = () => {
+  nextDifficultyRequestGeneration += 1;
+  nextDifficultyRequest = null;
+  hasNextDifficulty.value = false;
+};
+
+const loadNextDifficultyState = (result = {}) => {
+  const requestGeneration = ++nextDifficultyRequestGeneration;
+  const currentLevel =
+    getPositiveInteger(result.difficultyLevel) ||
+    getPositiveInteger(result.difficulty_level) ||
+    currentDifficultyLevel.value;
+  const currentTrainingType = result.trainingType || trainingType.value;
+
+  hasNextDifficulty.value = false;
+  if (!currentTrainingType || !currentLevel) {
+    nextDifficultyRequest = Promise.resolve(false);
+    return nextDifficultyRequest;
+  }
+
+  nextDifficultyRequest = getTrainingDifficultyListAPI(currentTrainingType)
+    .then((difficultyResult) => {
+      const levels = Array.isArray(difficultyResult?.list)
+        ? difficultyResult.list
+            .filter(
+              (item) => !item?.type || item.type === currentTrainingType
+            )
+            .map((item) => getPositiveInteger(item?.difficulty))
+            .filter(Boolean)
+        : [];
+      const maxLevel = Math.max(0, ...levels);
+      const highestCompletedLevel = getPositiveInteger(
+        difficultyResult?.user_levels?.[currentTrainingType]
+      );
+      const latestUnlockedLevel = Math.min(
+        highestCompletedLevel + 1,
+        maxLevel
+      );
+      const canAdvance =
+        currentLevel < maxLevel && latestUnlockedLevel > currentLevel;
+
+      if (requestGeneration === nextDifficultyRequestGeneration) {
+        hasNextDifficulty.value = canAdvance;
+      }
+      return canAdvance;
+    })
+    .catch((error) => {
+      console.log("training next difficulty load failed", error);
+      if (requestGeneration === nextDifficultyRequestGeneration) {
+        hasNextDifficulty.value = false;
+      }
+      return false;
+    });
+
+  return nextDifficultyRequest;
+};
+
 // time_limit 缺失或非正数都表示整局不限时。
 const timeLimit = computed(() => getPositiveInteger(practiceInfo.value.timeLimit));
 const hasTimeLimit = computed(() => timeLimit.value > 0);
@@ -136,7 +232,7 @@ const precisionRandomBlock = computed(() => {
   const block = getPositiveInteger(
     useHighlightTest.value
       ? highlightTestState.value.randomBlock
-      : practiceInfo.value.randomBlock
+      : visiblePrecisionTarget.value.randomBlock
   );
   return block <= precisionBlocks.value ? block : 0;
 });
@@ -145,7 +241,7 @@ const precisionRandomRingArea = computed(() => {
   const ring = getPositiveInteger(
     useHighlightTest.value
       ? highlightTestState.value.randomRingArea
-      : practiceInfo.value.randomRingArea
+      : visiblePrecisionTarget.value.randomRingArea
   );
   return ring >= 1 && ring <= 10 ? ring : 0;
 });
@@ -239,6 +335,7 @@ const practiceInfoFields = [
   "statusText",
   "startTime",
   "targetType",
+  "vip",
   "sVip",
   "trainingType",
   "difficultyLevel",
@@ -332,6 +429,143 @@ const syncPracticeInfo = (message = {}) => {
   };
 };
 
+const buildShootResultAudioKeys = (message = {}) => {
+  const latestDetail =
+    Array.isArray(message.details) && message.details.length > 0
+      ? message.details[message.details.length - 1]
+      : null;
+  // 与原 ShootProgress 保持一致：优先使用当前箭，details 仅作兼容兜底。
+  const arrow = message.shootData || latestDetail;
+  if (!arrow) return [];
+  if (
+    arrow.playerId !== undefined &&
+    arrow.playerId !== null &&
+    String(arrow.playerId) !== String(user.value?.id)
+  ) {
+    return [];
+  }
+
+  const keys = [
+    arrow.ring ? `${arrow.ringX ? "X" : arrow.ring}环` : "未上靶",
+  ];
+  if (arrow.angle !== null && arrow.angle !== undefined) {
+    keys.push(`向${getDirectionText(arrow.angle)}调整`);
+  }
+  if (arrow.threeConsecutive10Rings === true) {
+    keys.push("tententen");
+  }
+  return keys;
+};
+
+const playAudioKeysAndWait = (keys) => {
+  const audioKeys = (Array.isArray(keys) ? keys : [keys]).filter(Boolean);
+  if (audioKeys.length === 0) return Promise.resolve();
+
+  const expectedKey = audioKeys[audioKeys.length - 1];
+  const waitTime = Math.min(
+    AUDIO_TIMEOUT_MAX,
+    Math.max(AUDIO_TIMEOUT_BASE, audioKeys.length * AUDIO_TIMEOUT_PER_KEY)
+  );
+
+  return new Promise((resolve) => {
+    let settled = false;
+    let timer = null;
+    const waiter = {
+      expectedKey,
+      done: () => {
+        if (settled) return;
+        settled = true;
+        if (timer) clearTimeout(timer);
+        audioWaiters.delete(waiter);
+        resolve();
+      },
+    };
+
+    timer = setTimeout(() => {
+      if (typeof audioManager.recoverIfStale === "function") {
+        audioManager.recoverIfStale(expectedKey);
+      }
+      waiter.done();
+    }, waitTime);
+    audioWaiters.add(waiter);
+
+    try {
+      audioManager.play(audioKeys, false);
+    } catch (error) {
+      console.error("training shoot result audio failed", error);
+      waiter.done();
+    }
+  });
+};
+
+const shouldWaitForShotEffect = (shot) => {
+  const x = Number(shot?.x);
+  const y = Number(shot?.y);
+  return (
+    isSvip.value &&
+    Number(shot?.ring) > 0 &&
+    Number.isFinite(x) &&
+    Number.isFinite(y)
+  );
+};
+
+const waitForShotEffect = (token, shouldWait) => {
+  if (!shouldWait) return Promise.resolve();
+
+  return new Promise((resolve) => {
+    let settled = false;
+    let timer = null;
+    const waiter = {
+      done: () => {
+        if (settled) return;
+        settled = true;
+        if (timer) clearTimeout(timer);
+        if (shotEffectWaiters.get(token) === waiter) {
+          shotEffectWaiters.delete(token);
+        }
+        resolve();
+      },
+    };
+
+    timer = setTimeout(waiter.done, SHOT_EFFECT_WAIT_TIMEOUT_MS);
+    shotEffectWaiters.set(token, waiter);
+  });
+};
+
+const invalidateShotPresentations = ({ resetVisible = false } = {}) => {
+  shotPresentationGeneration += 1;
+  Array.from(audioWaiters).forEach((waiter) => waiter.done());
+  Array.from(shotEffectWaiters.values()).forEach((waiter) => waiter.done());
+  if (resetVisible) {
+    applyVisiblePrecisionTarget();
+  }
+  return shotPresentationGeneration;
+};
+
+const onShotEffectComplete = (payload = {}) => {
+  const token = Number(payload?.token ?? payload);
+  if (!Number.isFinite(token)) return;
+  shotEffectWaiters.get(token)?.done();
+};
+
+const commitPrecisionTargetAfterPresentation = async ({
+  generation,
+  target,
+  audioPromise,
+  effectPromise,
+}) => {
+  await Promise.all([audioPromise, effectPromise]);
+  if (
+    generation !== shotPresentationGeneration ||
+    practiceEnded.value ||
+    !isShootingStage.value ||
+    trainingType.value !== "precision"
+  ) {
+    return;
+  }
+  visiblePrecisionTarget.value = target;
+};
+
 const createPracticeEndSnapshot = (message = {}) => {
   const source = {
     ...practiceInfo.value,
@@ -399,6 +633,19 @@ const startPracticeSyncTimer = () => {
     practiceSyncTimer = null;
     if (!waitingPracticeSync) return;
     waitingPracticeSync = false;
+
+    if (foregroundResumeSyncPending.value) {
+      foregroundResumeSyncPending.value = false;
+      closePracticeConnection("training-practice-resume-timeout", {
+        sendLeave: false,
+      });
+      uni.showToast({
+        title: "训练重连失败，请重试",
+        icon: "none",
+      });
+      return;
+    }
+
     if (pageStage.value !== pageStages.LOADING) return;
 
     uni.showToast({
@@ -435,14 +682,22 @@ const onPracticeInfoSync = (payload = {}) => {
 
   const shouldShowDistance =
     waitingPracticeSync && pageStage.value === pageStages.LOADING;
+  const resumedFromForeground = foregroundResumeSyncPending.value;
   cancelPracticeSyncWait();
+  foregroundResumeSyncPending.value = false;
+  invalidateShotPresentations();
 
   // 14 是完整快照，先清空旧值，避免 proto3 省略的 0 沿用上一份状态。
   practiceInfo.value = {};
   practiceEndSnapshot.value = {};
   syncPracticeInfo(snapshot);
+  applyVisiblePrecisionTarget(practiceInfo.value);
   scores.value = Array.isArray(snapshot.details) ? snapshot.details : [];
 
+  if (resumedFromForeground) {
+    hiddenWhileActive.value = false;
+  }
+
   if (shouldShowDistance) {
     start.value = false;
     pageStage.value = pageStages.DISTANCE;
@@ -486,18 +741,21 @@ const clearPracticeRuntimeContext = () => {
   uni.setStorageSync(trainingDifficultyStorageKey, selectionContext);
 };
 
-const closePracticeConnection = (reason) => {
+const closePracticeConnection = (reason, { sendLeave = true } = {}) => {
   cancelPracticeSyncWait();
   if (connectionClosed.value) return;
   connectionClosed.value = true;
-  closeMatchWebSocket({ reason });
+  closeMatchWebSocket({ reason, sendLeave });
 };
 
-const connectPracticeServer = () => {
+const connectPracticeServer = ({
+  resumableOnAppHide = appHideResumable.value,
+} = {}) => {
   if (!practiseId.value || !String(serverAddr.value || "").trim()) {
     return false;
   }
 
+  appHideResumable.value = resumableOnAppHide === true;
   cancelPracticeSyncWait();
   closeMatchWebSocket({ reason: "training-practice-switch" });
   preparePracticeSyncWait();
@@ -506,6 +764,8 @@ const connectPracticeServer = () => {
     matchId: practiseId.value,
     userId: user.value.id,
     requestPracticeInfoOnOpen: true,
+    appHideResumable: appHideResumable.value,
+    practiceEndAudioKey: "练习结束",
   });
   connectionClosed.value = false;
   return true;
@@ -539,6 +799,97 @@ const stopCurrentPractice = () => {
   return stopPracticeTask;
 };
 
+// 当前训练不可恢复时，始终使用页面本地的练习 ID 停止。
+const stopEndedCurrentPracticeAndExit = async () => {
+  hiddenWhileActive.value = false;
+  foregroundResumeSyncPending.value = false;
+  setPracticeAppHideResumable(false);
+  exiting.value = true;
+
+  try {
+    await stopCurrentPractice();
+  } finally {
+    closePracticeConnection("training-practice-current-missing");
+    clearPracticeRuntimeContext();
+    uni.showToast({
+      title: "训练已结束，请重新进入",
+      icon: "none",
+    });
+    uni.navigateBack();
+  }
+};
+
+// 回到前台后先获取最新比赛服地址，再通过 type 5/type 14 恢复完整快照。
+const resumeCurrentPractice = async () => {
+  if (
+    resumeInFlight.value ||
+    !hiddenWhileActive.value ||
+    !appHideResumable.value ||
+    exiting.value
+  ) {
+    return;
+  }
+
+  resumeInFlight.value = true;
+  try {
+    let currentPractice;
+    try {
+      currentPractice = await getCurrentPractiseAPI();
+    } catch (error) {
+      if (!pageVisible.value || exiting.value) return;
+      console.error("get current practice failed", error);
+      await stopEndedCurrentPracticeAndExit();
+      return;
+    }
+
+    console.log(1111111111111111111111, currentPractice)
+    if (
+      !pageVisible.value ||
+      !hiddenWhileActive.value ||
+      exiting.value
+    ) {
+      return;
+    }
+
+    const latestPracticeId = currentPractice?.id;
+    const latestServerAddr = String(
+      currentPractice?.serverAddr || ""
+    ).trim();
+    if (
+      currentPractice === null ||
+      !latestPracticeId ||
+      !latestServerAddr
+    ) {
+      await stopEndedCurrentPracticeAndExit();
+      return;
+    }
+
+    practiseId.value = latestPracticeId;
+    serverAddr.value = latestServerAddr;
+    updateTrainingContext({
+      id: latestPracticeId,
+      serverAddr: latestServerAddr,
+    });
+
+    foregroundResumeSyncPending.value = true;
+    setPracticeAppHideResumable(true);
+    if (!connectPracticeServer({ resumableOnAppHide: true })) {
+      foregroundResumeSyncPending.value = false;
+      await stopEndedCurrentPracticeAndExit();
+    }
+  } catch (error) {
+    foregroundResumeSyncPending.value = false;
+    if (!pageVisible.value || exiting.value) return;
+    console.error("training practice resume failed", error);
+    uni.showToast({
+      title: "训练重连失败，请重试",
+      icon: "none",
+    });
+  } finally {
+    resumeInFlight.value = false;
+  }
+};
+
 const createPractice = async () => {
   const trainingType = trainingParams.value.type;
   const difficultyLevel = trainingParams.value.difficulty;
@@ -576,7 +927,7 @@ const createPractice = async () => {
   stopInFlight.value = false;
   stopPracticeTask = null;
   updateTrainingContext(result);
-  connectPracticeServer();
+  connectPracticeServer({ resumableOnAppHide: true });
   return result;
 };
 
@@ -667,6 +1018,7 @@ const onReady = async () => {
   clearHighlightTestTimer();
   useHighlightTest.value = false;
   practiceEndSnapshot.value = {};
+  invalidateShotPresentations();
   try {
     await startPractiseAPI(practiseId.value);
     practiseResult.value = {};
@@ -674,10 +1026,12 @@ const onReady = async () => {
     shotEffectToken.value = 0;
     start.value = true;
     pageStage.value = pageStages.SHOOTING;
+    setPracticeAppHideResumable(true);
     audioManager.play("练习开始");
   } catch (error) {
     start.value = false;
     pageStage.value = pageStages.DISTANCE;
+    setPracticeAppHideResumable(true);
     throw error;
   }
 };
@@ -686,6 +1040,8 @@ const onTimeLimitReached = () => {
   if (!hasTimeLimit.value || !isShootingStage.value) return;
   // 本地倒计时只负责停止射击展示，最终结算以 PRACTICE_END 为准。
   start.value = false;
+  hiddenWhileActive.value = false;
+  setPracticeAppHideResumable(false);
 };
 
 const enterPracticeResult = (result = {}) => {
@@ -694,6 +1050,8 @@ const enterPracticeResult = (result = {}) => {
 
   // 正常结算不调用 stop，只清理上下文并断开比赛服连接。
   practiceEnded.value = true;
+  setPracticeAppHideResumable(false);
+  invalidateShotPresentations();
   clearPracticeRuntimeContext();
   closePracticeConnection("training-practice-result");
   pageStage.value = pageStages.RESULT;
@@ -706,36 +1064,73 @@ const onOver = async () => {
   clearHighlightTestTimer();
   pageStage.value = pageStages.LOADING;
   start.value = false;
+  setPracticeAppHideResumable(false);
 
   try {
     const apiResult = (await getPractiseAPI(practiseId.value)) || {};
+    await (nextDifficultyRequest || loadNextDifficultyState(apiResult));
     if (!enterPracticeResult(mergePracticeResult(apiResult))) {
       pageStage.value = pageStages.DISTANCE;
     }
   } catch (error) {
     if (Object.keys(practiceEndSnapshot.value).length > 0) {
+      await (nextDifficultyRequest || loadNextDifficultyState(practiceEndSnapshot.value));
       enterPracticeResult(mergePracticeResult());
       return;
     }
     start.value = true;
     pageStage.value = pageStages.SHOOTING;
+    setPracticeAppHideResumable(true);
     throw error;
   }
 };
 
 async function onReceiveMessage(msg) {
+  const previousScoreLength = scores.value.length;
   syncPracticeInfo(msg);
 
-  if (msg.type === MESSAGETYPESV2.ShootResult && isShootingStage.value) {
+  if (msg.type === MESSAGETYPESV2.BattleStart) {
+    invalidateShotPresentations();
+    applyVisiblePrecisionTarget(practiceInfo.value);
+  } else if (
+    msg.type === MESSAGETYPESV2.ShootResult &&
+    isShootingStage.value
+  ) {
+    let hasNewShot = false;
+    let latestShot = null;
     if (Array.isArray(msg.details)) {
-      const previousScoreLength = scores.value.length;
       scores.value = msg.details;
-      if (msg.details.length === previousScoreLength + 1) {
-        shotEffectToken.value += 1;
+      hasNewShot = msg.details.length === previousScoreLength + 1;
+      latestShot = hasNewShot ? msg.details[msg.details.length - 1] : null;
+    }
+
+    if (trainingType.value === "precision") {
+      const generation = invalidateShotPresentations();
+      const target = getPrecisionTargetSnapshot(practiceInfo.value);
+      const nextEffectToken = hasNewShot ? shotEffectToken.value + 1 : 0;
+      const effectPromise = waitForShotEffect(
+        nextEffectToken,
+        hasNewShot && shouldWaitForShotEffect(latestShot)
+      );
+      const audioPromise = playAudioKeysAndWait(
+        buildShootResultAudioKeys(msg)
+      );
+
+      if (hasNewShot) {
+        shotEffectToken.value = nextEffectToken;
       }
+      void commitPrecisionTargetAfterPresentation({
+        generation,
+        target,
+        audioPromise,
+        effectPromise,
+      });
+    } else if (hasNewShot) {
+      shotEffectToken.value += 1;
     }
   } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
     practiceEndSnapshot.value = createPracticeEndSnapshot(msg);
+    void loadNextDifficultyState(practiceEndSnapshot.value);
     if (
       trainingType.value === "base" &&
       Number(msg.status) === 3 &&
@@ -747,6 +1142,8 @@ async function onReceiveMessage(msg) {
       };
     }
     practiceEnded.value = true;
+    setPracticeAppHideResumable(false);
+    invalidateShotPresentations();
     clearPracticeRuntimeContext();
     // setTimeout(onOver, 1500);
   }
@@ -756,21 +1153,25 @@ function onComplete() {
   pageStage.value = pageStages.LOADING;
   start.value = false;
   practiceEnded.value = true;
+  setPracticeAppHideResumable(false);
+  invalidateShotPresentations();
   clearPracticeRuntimeContext();
   closePracticeConnection("training-practice-complete");
-  uni.$emit(trainingDifficultyRefreshEvent);
   uni.navigateBack();
 }
 
 async function onRetry() {
   pageStage.value = pageStages.LOADING;
+  setPracticeAppHideResumable(false);
   clearHighlightTestTimer();
   useHighlightTest.value = false;
+  resetNextDifficultyState();
   practiseId.value = "";
   serverAddr.value = "";
   practiseResult.value = {};
   practiceEndSnapshot.value = {};
   practiceInfo.value = {};
+  invalidateShotPresentations({ resetVisible: true });
   start.value = false;
   scores.value = [];
   shotEffectToken.value = 0;
@@ -788,9 +1189,12 @@ const onClickShare = debounce(async () => {
   await wxShare("shareCanvas");
 });
 
-function onAudioEnded(s) {
-  if (s.indexOf("比赛结束") >= 0) {
-    onOver()
+function onAudioEnded(key) {
+  Array.from(audioWaiters).forEach((waiter) => {
+    if (waiter.expectedKey === key) waiter.done();
+  });
+  if (["比赛结束", "练习结束"].includes(String(key || ""))) {
+    void onOver();
   }
 }
 
@@ -802,6 +1206,8 @@ const updateSound = () => {
 const exitPractice = async () => {
   if (exiting.value) return;
   exiting.value = true;
+  setPracticeAppHideResumable(false);
+  invalidateShotPresentations();
 
   try {
     await stopCurrentPractice();
@@ -813,35 +1219,29 @@ const exitPractice = async () => {
 };
 
 onHide(() => {
-  // 小程序被切到后台时尽早通知后端，作为杀进程前的尽力兜底。
+  pageVisible.value = false;
   if (
-    !exiting.value &&
-    practiseId.value &&
-    !practiceEnded.value &&
-    !stopCompleted.value
+    !appHideResumable.value ||
+    exiting.value ||
+    !practiseId.value ||
+    practiceEnded.value ||
+    stopCompleted.value
   ) {
-    hiddenWhileActive.value = true;
-    clearPracticeRuntimeContext();
-    void stopCurrentPractice();
+    return;
   }
-  closePracticeConnection("training-practice-hide");
+
+  hiddenWhileActive.value = true;
+  invalidateShotPresentations();
 });
 
 onShow(async () => {
-  if (!hiddenWhileActive.value || exiting.value) return;
-
-  hiddenWhileActive.value = false;
-  await stopCurrentPractice();
-  clearPracticeRuntimeContext();
-  exiting.value = true;
-  uni.showToast({
-    title: "训练已结束，请重新进入",
-    icon: "none",
-  });
-  uni.navigateBack();
+  pageVisible.value = true;
+  await resumeCurrentPractice();
 });
 
 onUnload(() => {
+  setPracticeAppHideResumable(false);
+  invalidateShotPresentations();
   clearPracticeRuntimeContext();
   void stopCurrentPractice();
   closePracticeConnection("training-practice-unload");
@@ -857,7 +1257,7 @@ onMounted(() => {
   uni.$on(MATCH_WS_STATE_EVENT, onMatchSocketState);
   uni.$on("share-image", onClickShare);
   uni.$on("audioEnded", onAudioEnded);
-  if (!connectPracticeServer()) {
+  if (!connectPracticeServer({ resumableOnAppHide: true })) {
     uni.showToast({
       title: "练习连接信息异常，请重试",
       icon: "none",
@@ -869,6 +1269,8 @@ onMounted(() => {
 });
 
 onBeforeUnmount(() => {
+  setPracticeAppHideResumable(false);
+  invalidateShotPresentations();
   clearPracticeRuntimeContext();
   void stopCurrentPractice();
   uni.setKeepScreenOn({
@@ -904,6 +1306,9 @@ onBeforeUnmount(() => {
             :total="timeLimit"
             :countdownEnabled="hasTimeLimit"
             :trainingType="trainingType"
+            :isVip="isVip"
+            :isSvip="isSvip"
+            :externalShootResultAudio="trainingType === 'precision'"
             :onStop="onTimeLimitReached"
           />
           <view class="user-row">
@@ -925,8 +1330,10 @@ onBeforeUnmount(() => {
             :activeSector="precisionRandomBlock"
             :activeRing="precisionRandomRingArea"
             :showSectorLabels="precisionBlocks > 0"
+            stable-shot-effect
+            @shot-effect-complete="onShotEffectComplete"
           />
-          <view v-if="env !== 'release'" class="highlight-test-actions">
+          <!-- <view v-if="env !== 'release'" class="highlight-test-actions">
             <button
               class="highlight-test-btn"
               hover-class="none"
@@ -941,7 +1348,7 @@ onBeforeUnmount(() => {
             >
               重置高亮
             </button>
-          </view>
+          </view> -->
           <view class="sound-text-box">
             <button class="sound-btn" hover-class="none" @click="updateSound">
               <image
@@ -990,6 +1397,7 @@ onBeforeUnmount(() => {
         :onRetry="onRetry"
         :trainingType="trainingType"
         :difficultyLevel="currentDifficultyLevel"
+        :hasNextDifficulty="hasNextDifficulty"
         :result="practiseResult"
       />
       <canvas class="share-canvas" id="shareCanvas" type="2d"></canvas>

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/static/training-difficulty-design/lock.svg

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="55px" height="55px" viewBox="0 0 55 55" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 11</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="训练难度展示" transform="translate(-160.000000, -478.000000)">
+            <g id="编组-2备份" transform="translate(154.000000, 472.000000)">
+                <g id="编组-11" transform="translate(6.000000, 6.000000)">
+                    <circle id="椭圆形" fill="#CACACA" cx="27.5" cy="27.5" r="27.5"></circle>
+                    <circle id="椭圆形" fill="#FFFFFF" cx="27.5" cy="26" r="25"></circle>
+                    <circle id="椭圆形" fill="#5E5E5E" cx="27.5" cy="26" r="22"></circle>
+                    <circle id="椭圆形" fill="#17B6F2" cx="27.5" cy="26" r="19.5"></circle>
+                    <circle id="椭圆形" fill="#FFC2C2" cx="27.5" cy="26" r="17"></circle>
+                    <circle id="椭圆形" fill="#FF1F33" opacity="0.800000012" cx="27.5" cy="26" r="14.5"></circle>
+                    <circle id="椭圆形" fill="#FED847" cx="27.5" cy="26" r="13"></circle>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

src/static/training-difficulty-design/unlock.svg

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="56px" height="55px" viewBox="0 0 56 55" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组 9</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="训练难度展示" transform="translate(-60.000000, -313.000000)">
+            <g id="编组-2备份" transform="translate(54.500000, 307.000000)">
+                <g id="编组-9" transform="translate(5.500000, 6.000000)">
+                    <circle id="椭圆形" fill="#CACACA" cx="28" cy="27.5" r="27.5"></circle>
+                    <circle id="椭圆形" fill="#FFFFFF" cx="28" cy="26" r="25"></circle>
+                    <circle id="椭圆形" fill="#5E5E5E" cx="28" cy="26" r="22"></circle>
+                    <circle id="椭圆形" fill="#808080" cx="28" cy="26" r="19.5"></circle>
+                    <circle id="椭圆形" fill="#FFFFFF" cx="28" cy="26" r="17"></circle>
+                    <circle id="椭圆形" fill="#8C8C8C" cx="28" cy="26" r="14.5"></circle>
+                    <circle id="椭圆形" fill="#DBDBDB" cx="28" cy="26" r="13"></circle>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

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/websocket.js

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