update:优化文字

src/apis.js

@@ -8,7 +8,7 @@ try {
 
     switch (envVersion) {
         case "develop": // 开发版
-            // BASE_URL = "http://192.168.1.2:8000/api/shoot";
+            // BASE_URL = "http://192.168.1.30:8000/api/shoot";
             BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot";
             break;
         case "trial": // 体验版
@@ -186,8 +186,19 @@ export const getDailyCountAPI = () => {
     return request("GET", "/index/dailyCount", {}, ADDONS_BASE_URL);
 };
 
-export const getHomeData = (seasonId) => {
+export const getHomeData = async (seasonId) => {
-    return request("GET", `/user/myHome?seasonId=${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 = () => {
@@ -502,6 +513,25 @@ export const laserAimAPI = async () => {
     return request("POST", "/user/device/laserAim");
 };
 
+// 调瞄续期只负责发送请求，不等待或处理响应，避免阻塞下一次续期。
+export const aimRenewAPI = () => {
+    const token = uni.getStorageSync(
+        `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
+    );
+    const header = {};
+    if (token) header.Authorization = `Bearer ${token}`;
+
+    uni.request({
+        url: `${BASE_URL}/user/device/aimRenew`,
+        method: "POST",
+        header,
+        data: {},
+        timeout: 10000,
+        success: () => {},
+        fail: () => {},
+    });
+};
+
 export const laserCloseAPI = async () => {
     return request("POST", "/user/device/closeAim");
 };

src/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/BowShotEffect.vue

@@ -34,6 +34,10 @@ const props = defineProps({
     type: Number,
     default: 0,
   },
+  viewportMode: {
+    type: Boolean,
+    default: false,
+  },
 });
 
 const emit = defineEmits(["complete", "impact"]);
@@ -43,6 +47,7 @@ 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");
@@ -93,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);
@@ -137,8 +153,40 @@ const hitPercent = computed(() => {
 });
 
 const flightPath = computed(() => {
-  const size = safeTargetSize.value;
+  const size = effectiveTargetSize.value;
-  const windowSize = getWindowSize();
+  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 hasScreenCoordinates =
     size.width > 0 &&
@@ -161,6 +209,8 @@ const flightPath = computed(() => {
   return {
     startX,
     startY,
+    endX,
+    endY,
     translateX: dx,
     translateY: dy,
     angle: Math.atan2(dx, -dy) * (180 / Math.PI),
@@ -178,10 +228,19 @@ function formatTargetPosition(percent, offset) {
   return pxOffset ? `calc(${percent}%${pxOffset})` : `${percent}%`;
 }
 
-const crackStyle = computed(() => ({
+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);
@@ -190,19 +249,21 @@ 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) {
+  if (isViewportMode.value || (size.width && size.height)) {
     x = `${path.translateX}px`;
     y = `${path.translateY}px`;
   }
 
   return {
-    "--shot-start-x": size.width ? `${path.startX}px` : "50%",
+    "--shot-start-x":
-    "--shot-start-y": size.height ? `${path.startY}px` : "114%",
+      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": `${path.angle}deg`,
@@ -231,6 +292,7 @@ function finish(playKey) {
   phase.value = "idle";
   activePlayKey.value = "";
   activeShot.value = null;
+  activeLayout.value = null;
   emit("complete", playKey);
 }
 
@@ -244,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(() => {
@@ -278,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
@@ -326,6 +397,12 @@ onBeforeUnmount(() => {
   transform: translateZ(0);
 }
 
+.shot-effect--viewport {
+  position: fixed;
+  width: 100vw;
+  height: 100vh;
+}
+
 .shot-arrow-track {
   position: absolute;
   left: var(--shot-start-x);

src/components/BowTarget.vue

@@ -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 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,44 +206,67 @@ function shakeTarget() {
   });
 }
 
-function updateTargetRect() {
+function hasValidTargetRect(rect = targetRect.value) {
-  nextTick(() => {
+  return (
+    Number.isFinite(Number(rect?.left)) &&
+    Number.isFinite(Number(rect?.top)) &&
+    Number(rect?.width) > 0 &&
+    Number(rect?.height) > 0
+  );
+}
+
+async function updateTargetRect() {
+  await nextTick();
+
+  return new Promise((resolve) => {
+    let settled = false;
+    const finish = (rect) => {
+      if (settled) return;
+      settled = true;
+
+      const isValid = hasValidTargetRect(rect);
+      if (isValid) {
+        targetRect.value = {
+          left: Number(rect.left),
+          top: Number(rect.top),
+          width: Number(rect.width),
+          height: Number(rect.height),
+        };
+      }
+      resolve(isValid);
+    };
+
+    try {
       const query = instance?.proxy
         ? uni.createSelectorQuery().in(instance.proxy)
         : uni.createSelectorQuery();
 
       query
         .select(".target")
-      .boundingClientRect((rect) => {
+        .boundingClientRect()
-        const left = Number(rect?.left);
+        .exec((result) => finish(Array.isArray(result) ? result[0] : null));
-        const top = Number(rect?.top);
+    } catch {
-        const width = Number(rect?.width);
+      finish(null);
-        const height = Number(rect?.height);
-        if (
-          !Number.isFinite(left) ||
-          !Number.isFinite(top) ||
-          !Number.isFinite(width) ||
-          !Number.isFinite(height)
-        ) {
-          return;
     }
-        if (width <= 0 || height <= 0) return;
-        targetRect.value = { left, top, width, height };
-      })
-      .exec();
   });
 }
 
 function handleWindowResize() {
-  updateTargetRect();
+  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(
@@ -224,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;
@@ -245,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;
@@ -411,11 +470,13 @@ async function onReceiveMessage(message) {
 
 onMounted(() => {
   uni.$on("socket-inbox", onReceiveMessage);
-  updateTargetRect();
+  void updateTargetRect();
   if (uni.onWindowResize) uni.onWindowResize(handleWindowResize);
 });
 
 onBeforeUnmount(() => {
+  shotEffectRequestGeneration += 1;
+  pendingShotEffect.value = null;
   if (timer.value) {
     clearTimeout(timer.value);
     timer.value = null;
@@ -521,6 +582,7 @@ onBeforeUnmount(() => {
         </view>
       </block>
       <BowShotEffect
+        v-if="!shotEffect || !shotEffect.viewportMode"
         :shot="shotEffect && shotEffect.shot"
         :playKey="shotEffect ? shotEffect.key : ''"
         :targetRadius="safeTargetRadius"
@@ -534,6 +596,20 @@ onBeforeUnmount(() => {
       />
       <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)"

src/components/TestDistance.vue

@@ -118,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/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 () => {
+onShow(() => {
-  uni.$on("socket-inbox", onReceiveMessage);
+  pageVisible = true;
-  await laserAimAPI();
+  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/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/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

@@ -466,6 +466,7 @@ onBeforeUnmount(() => {
           :currentRound="scores.length % 3"
           :scores="scores"
           :isSvip="isSvip"
+          stable-shot-effect
         />
         <ScorePanel2 :arrows="scores" />
         <ScoreResult

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-mode">
+              <view class="rule-mode-title">1V1、2V2、3V3对抗模式：</view>
               <view class="rule-item">
-              <text class="rule-label">重一局：</text>
+                <text class="rule-bullet">●</text>
-              <text class="rule-value">+100积分</text>
+                <text class="rule-content"
+                  >每胜一局，胜方每人+100积分；每负一局，负方每人-100积分</text
+                >
               </view>
               <view class="rule-item">
-              <text class="rule-label">输一局：</text>
+                <text class="rule-bullet">●</text>
-              <text class="rule-value">-100积分</text>
+                <text class="rule-content"
+                  >2V2模式：胜方队伍中，总成绩最高且箭均成绩≥7环者，为本局MVP，额外获得40积分。</text
+                >
               </view>
               <view class="rule-item">
-              <text class="rule-label">全场MVP（2v2）：</text>
+                <text class="rule-bullet">●</text>
-              <text class="rule-value">额外+40积分</text>
+                <text class="rule-content"
+                  >3V3模式：胜方队伍中，总成绩最高且箭均成绩≥7环者，为本局MVP，额外获得60积分。</text
+                >
               </view>
               <view class="rule-item">
-              <text class="rule-label">全场MVP（3v3）：</text>
+                <text class="rule-bullet">●</text>
-              <text class="rule-value">额外+60积分</text>
+                <text class="rule-content"
+                  >在1V1/2V2/3V3三种模式中，连续获得五连胜（三类模式一起算），则从第五场开始，每场胜利可额外再加15分，直至结束连胜。（仅限对抗模式，不含大乱斗模式。）</text
+                >
+              </view>
+            </view>
+
+            <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 class="rule-item">
-              <text class="rule-label">五连胜：</text>
-              <text class="rule-value">每局额外+15积分</text>
             </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">
+            <view class="table-row table-header">
-              <text>大段位</text>
+              <text class="table-cell major-column">大段位</text>
-              <text>小段位</text>
+              <text class="table-cell minor-column">小段位</text>
-              <text>积分（100积分=1星）</text>
+              <text class="table-cell score-column">积分（100积分=1星）</text>
             </view>
-            <view class="table-row">
+
-              <text>倔强青铜</text>
+            <view
-              <view>
+              v-for="rank in rankRows"
-                <text>青铜1</text>
+              :key="rank.name"
-                <text>青铜2</text>
+              class="table-row rank-group-row"
-                <text>青铜3</text>
+            >
+              <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 class="minor-column minor-rank-cell">
+                <text
+                  v-for="level in rank.levels"
+                  :key="level"
+                  class="table-cell minor-rank-item"
+                >
+                  {{ level }}
+                </text>
               </view>
-            <view class="table-row">
+
-              <text>秩序白银</text>
+              <text class="table-cell score-column score-text">
-              <view>
+                {{ rank.score }}
-                <text>白铜1</text>
+              </text>
-                <text>白铜2</text>
-                <text>白铜3</text>
             </view>
-              <text>每个小段位需要满 3颗星才能晋升到下一个段位，共9颗星。</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>
-            <view class="table-row">
+              <text class="table-cell king-score-cell">{{ rank.score }}</text>
-              <text>荣耀黄金</text>
-              <view>
-                <text>黄金1</text>
-                <text>黄金2</text>
-                <text>黄金3</text>
-                <text>黄金4</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>
             </view>
           </view>
         </view>
@@ -181,17 +281,103 @@ import Container from "@/components/Container.vue";
 
 .rule-item {
   display: flex;
-  margin-bottom: 8px;
+  align-items: flex-start;
-}
+  margin-bottom: 16rpx;
-
+  font-size: 28rpx;
-.rule-label {
-  font-size: 14px;
   color: #666666;
+  line-height: 1.7;
 }
 
-.rule-value {
+.rule-mode {
-  font-size: 14px;
+  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 {
+.table-cell {
-  margin-left: -1rpx;
-}
-
-.rank-table text {
   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 {
+.king-rank-cell {
-  width: 50%;
+  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

@@ -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 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,49 +208,74 @@ function shakeTarget() {
   });
 }
 
-function updateTargetRect() {
+function hasValidTargetRect(rect = targetRect.value) {
-  nextTick(() => {
+  return (
+    Number.isFinite(Number(rect?.left)) &&
+    Number.isFinite(Number(rect?.top)) &&
+    Number(rect?.width) > 0 &&
+    Number(rect?.height) > 0
+  );
+}
+
+async function updateTargetRect() {
+  await nextTick();
+
+  return new Promise((resolve) => {
+    let settled = false;
+    const finish = (rect) => {
+      if (settled) return;
+      settled = true;
+
+      const isValid = hasValidTargetRect(rect);
+      if (isValid) {
+        targetRect.value = {
+          left: Number(rect.left),
+          top: Number(rect.top),
+          width: Number(rect.width),
+          height: Number(rect.height),
+        };
+      }
+      resolve(isValid);
+    };
+
+    try {
       const query = instance?.proxy
         ? uni.createSelectorQuery().in(instance.proxy)
         : uni.createSelectorQuery();
 
       query
         .select(".target")
-      .boundingClientRect((rect) => {
+        .boundingClientRect()
-        const left = Number(rect?.left);
+        .exec((result) => finish(Array.isArray(result) ? result[0] : null));
-        const top = Number(rect?.top);
+    } catch {
-        const width = Number(rect?.width);
+      finish(null);
-        const height = Number(rect?.height);
-        if (
-          !Number.isFinite(left) ||
-          !Number.isFinite(top) ||
-          !Number.isFinite(width) ||
-          !Number.isFinite(height)
-        ) {
-          return;
     }
-        if (width <= 0 || height <= 0) return;
-        targetRect.value = { left, top, width, height };
-      })
-      .exec();
   });
 }
 
 function handleWindowResize() {
-  updateTargetRect();
+  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;
@@ -231,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);
 }
 
@@ -250,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;
@@ -260,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;
@@ -417,11 +476,13 @@ async function onReceiveMessage(message) {
 
 onMounted(() => {
   uni.$on("socket-inbox", onReceiveMessage);
-  updateTargetRect();
+  void updateTargetRect();
   if (uni.onWindowResize) uni.onWindowResize(handleWindowResize);
 });
 
 onBeforeUnmount(() => {
+  shotEffectRequestGeneration += 1;
+  pendingShotEffect.value = null;
   if (timer.value) {
     clearTimeout(timer.value);
     timer.value = null;
@@ -539,6 +600,7 @@ onBeforeUnmount(() => {
         </view>
       </block>
       <BowShotEffect
+        v-if="!shotEffect || !shotEffect.viewportMode"
         :shot="shotEffect && shotEffect.shot"
         :playKey="shotEffect ? shotEffect.key : ''"
         :targetRadius="safeTargetRadius"
@@ -552,6 +614,20 @@ onBeforeUnmount(() => {
       />
       <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)"

src/pages/team-battle/components/TestDistance.vue

@@ -118,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/BowTarget.vue

@@ -84,6 +84,10 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  stableShotEffect: {
+    type: Boolean,
+    default: false,
+  },
 });
 
 const emit = defineEmits(["shot-effect-complete"]);
@@ -98,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 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;
 
@@ -245,7 +251,7 @@ function buildShotEffectKey(shot, index) {
   ].join("-");
 }
 
-function triggerShotEffect(shot, index) {
+function triggerShotEffect(shot, index, viewportMode = false) {
   const key = buildShotEffectKey(shot, index);
   clearTipTimer();
   latestOne.value = null;
@@ -254,9 +260,31 @@ function triggerShotEffect(shot, index) {
     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;
 
@@ -272,7 +300,10 @@ function completeShotEffect(key) {
 }
 
 function shouldHideLatestHit(index) {
-  return !!hiddenLatestKey.value && index === props.scores.length - 1;
+  return (
+    (!!hiddenLatestKey.value || !!pendingShotEffect.value) &&
+    index === props.scores.length - 1
+  );
 }
 
 function shakeTarget() {
@@ -291,36 +322,53 @@ function shakeTarget() {
   });
 }
 
-function updateTargetRect() {
+function hasValidTargetRect(rect = targetRect.value) {
-  nextTick(() => {
+  return (
+    Number.isFinite(Number(rect?.left)) &&
+    Number.isFinite(Number(rect?.top)) &&
+    Number(rect?.width) > 0 &&
+    Number(rect?.height) > 0
+  );
+}
+
+async function updateTargetRect() {
+  await nextTick();
+
+  return new Promise((resolve) => {
+    let settled = false;
+    const finish = (rect) => {
+      if (settled) return;
+      settled = true;
+
+      const isValid = hasValidTargetRect(rect);
+      if (isValid) {
+        targetRect.value = {
+          left: Number(rect.left),
+          top: Number(rect.top),
+          width: Number(rect.width),
+          height: Number(rect.height),
+        };
+      }
+      resolve(isValid);
+    };
+
+    try {
       const query = instance?.proxy
         ? uni.createSelectorQuery().in(instance.proxy)
         : uni.createSelectorQuery();
 
       query
         .select(".target")
-      .boundingClientRect((rect) => {
+        .boundingClientRect()
-        const left = Number(rect?.left);
+        .exec((result) => finish(Array.isArray(result) ? result[0] : null));
-        const top = Number(rect?.top);
+    } catch {
-        const width = Number(rect?.width);
+      finish(null);
-        const height = Number(rect?.height);
-        if (
-          !Number.isFinite(left) ||
-          !Number.isFinite(top) ||
-          !Number.isFinite(width) ||
-          !Number.isFinite(height)
-        ) {
-          return;
     }
-        if (width <= 0 || height <= 0) return;
-        targetRect.value = { left, top, width, height };
-      })
-      .exec();
   });
 }
 
 function handleWindowResize() {
-  updateTargetRect();
+  void updateTargetRect();
 }
 
 watch(
@@ -329,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 = "";
@@ -349,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;
     }
   }
 );
@@ -431,11 +484,13 @@ async function onReceiveMessage(message) {
 
 onMounted(() => {
   uni.$on("socket-inbox", onReceiveMessage);
-  updateTargetRect();
+  void updateTargetRect();
   if (uni.onWindowResize) uni.onWindowResize(handleWindowResize);
 });
 
 onBeforeUnmount(() => {
+  shotEffectRequestGeneration += 1;
+  pendingShotEffect.value = null;
   clearTipTimer();
   if (dirTimer.value) {
     clearTimeout(dirTimer.value);
@@ -555,6 +610,7 @@ onBeforeUnmount(() => {
         </view>
       </block>
       <BowShotEffect
+        v-if="!shotEffect || !shotEffect.viewportMode"
         :shot="shotEffect && shotEffect.shot"
         :playKey="shotEffect ? shotEffect.key : ''"
         :targetRadius="safeTargetRadius"
@@ -567,6 +623,20 @@ onBeforeUnmount(() => {
         @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)"

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/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

@@ -445,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]);
@@ -808,6 +818,12 @@ onShow(() => {
           :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">
@@ -866,6 +882,16 @@ onShow(() => {
   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/practise-one.vue

@@ -1330,6 +1330,7 @@ onBeforeUnmount(() => {
             :activeSector="precisionRandomBlock"
             :activeRing="precisionRandomRingArea"
             :showSectorLabels="precisionBlocks > 0"
+            stable-shot-effect
             @shot-effect-complete="onShotEffectComplete"
           />
           <!-- <view v-if="env !== 'release'" class="highlight-test-actions">

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>
+          <view v-if="user.rankIcon || user.rankName" class="rank-info">
-          <text
+            <image
-            :style="{
+              v-if="user.rankIcon"
-              color: '#FF7900',
+              class="rank-info__frame"
-              marginLeft: '5px',
+              :src="user.rankIcon"
-            }"
+              mode="aspectFit"
-            >{{ user.scores }}</text
+            />
-          >
+            <text>{{ user.rankName || "暂无段位" }}</text>
-          <text>点</text>
+          </view>
+          <text v-else>暂无段位</text>
         </UserItem>
         <view class="my-grow" @click="toMyGrowthPage">
           <image src="https://static.shelingxingqiu.com/shootmini/static/my-grow.png" mode="widthFix" />
@@ -170,4 +184,13 @@ const buildVersion = typeof __BUILD_TIME__ !== 'undefined' ? __BUILD_TIME__ : ''
 .my-grow > image {
   width: 100%;
 }
+.rank-info {
+  display: flex;
+  align-items: center;
+}
+.rank-info__frame {
+  width: 64rpx;
+  height: 64rpx;
+  margin-right: 8rpx;
+}
 </style>

src/store.js

@@ -38,17 +38,15 @@ const getDefaultDailyCount = () => ({
 });
 
 const getLvlName = (rankLvl, rankList = []) => {
-  if (!rankList) return;
+  if (!Array.isArray(rankList) || rankLvl === undefined || rankLvl === null) {
-  let lvlName = "";
+    return "";
-  rankList.some((r, index) => {
-    lvlName = rankList[index].name;
-    if (r.rank_id === rankLvl) {
-      lvlName = rankList[index].name;
-      return true;
   }
-    return false;
+
-  });
+  // 仅返回真正匹配的段位，避免未加载时误取列表最后一项。
-  return lvlName;
+  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.2:8000/socket";
+        // url = "ws://192.168.1.30:8000/socket";
         url = "wss://apitest.shelingxingqiu.com/socket";
         break;
       case "trial": // 体验版