fix：练习赛三箭x环播放音效

fix：对抗赛实现三箭x环音效
fix：大乱斗连续三箭x环播放音效
2026-05-19 18:27:28 +08:00 · 2026-05-19 18:16:40 +08:00 · 2026-05-19 18:11:47 +08:00
10 changed files with 213 additions and 169 deletions
--- a/src/App.vue
+++ b/src/App.vue
@@ -21,10 +21,7 @@
 	} = storeToRefs(store);
 	const {
 		updateUser,
-		updateOnline,
-		updateDevice,
-		updateGame,
-		updateRoomNumber
+		updateOnline
 	} = store;

 	watch(
@@ -49,22 +46,6 @@
 		updateUser(value);
 	}

-	function onSessionKickedOut() {
-		uni.removeStorageSync(
-			`${uni.getAccountInfoSync().miniProgram.envVersion}_token`
-		);
-		updateUser();
-		updateDevice("", "");
-		updateOnline(false);
-		updateGame(false, "");
-		updateRoomNumber("");
-		uni.showModal({
-			title: "提示",
-			content: "账号已在其他设备登录",
-			showCancel: false,
-		});
-	}
-
 	async function emitUpdateOnline() {
 		const data = await getDeviceBatteryAPI();
 		updateOnline(data.online);
@@ -84,7 +65,6 @@
 	onShow(() => {
 		uni.$on("update-user", emitUpdateUser);
 		uni.$on("update-online", emitUpdateOnline);
-		uni.$on("session-kicked-out", onSessionKickedOut);
 		const token = uni.getStorageSync(
 			`${uni.getAccountInfoSync().miniProgram.envVersion}_token`
 		);
@@ -97,7 +77,6 @@
 	onHide(() => {
 		uni.$off("update-user", emitUpdateUser);
 		uni.$off("update-online", emitUpdateOnline);
-		uni.$off("session-kicked-out", onSessionKickedOut);
 		websocket.closeWebSocket();
 	});
 </script>
--- a/src/apis.js
+++ b/src/apis.js
@@ -46,8 +46,6 @@ function request(method, url, data = {}) {
                                `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
                            );
                            uni.$emit("update-user");
-                            reject({ type: "AUTH_INVALID", message });
-                            return;
                        }
                        if (message === "ROOM_FULL") {
                            resolve({full: true});
--- a/src/audioManager.js
+++ b/src/audioManager.js
@@ -1,4 +1,5 @@
 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",
  "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",
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -68,29 +68,28 @@ onShow(async () => {
  const token = uni.getStorageSync(`${env}_token`);

  if (!user.value.id && !token) {
-    // showModal.value = true;
-    // try {
-    //   const wxResult = await uni.login({provider: "weixin"});
-    //   const bindResult = await checkUserBindAPI(wxResult.code);
-    //   if (bindResult.binded) {
-    //     const newResult = await uni.login({provider: "weixin"});
-    //     const silentResult = await silentLoginAPI(newResult.code);
-    //     if (silentResult.user) updateUser(silentResult.user);
-    //     const devices = await getMyDevicesAPI();
-    //     if (devices.bindings && devices.bindings.length) {
-    //       updateDevice(
-    //           devices.bindings[0].deviceId,
-    //           devices.bindings[0].deviceName
-    //       );
-    //       const data = await getDeviceBatteryAPI();
-    //       updateOnline(data.online);
-    //     }
-    //   } else {
-    //     showModal.value = true;
-    //   }
-    // } catch (e) {
-    //   console.log("检查绑定状态失败", e);
-    // }
+    try {
+      const wxResult = await uni.login({provider: "weixin"});
+      const bindResult = await checkUserBindAPI(wxResult.code);
+      if (bindResult.binded) {
+        const newResult = await uni.login({provider: "weixin"});
+        const silentResult = await silentLoginAPI(newResult.code);
+        if (silentResult.user) updateUser(silentResult.user);
+        const devices = await getMyDevicesAPI();
+        if (devices.bindings && devices.bindings.length) {
+          updateDevice(
+              devices.bindings[0].deviceId,
+              devices.bindings[0].deviceName
+          );
+          const data = await getDeviceBatteryAPI();
+          updateOnline(data.online);
+        }
+      } else {
+        showModal.value = true;
+      }
+    } catch (e) {
+      console.log("检查绑定状态失败", e);
+    }
  }

  const promises = [getScoreRankList(undefined, 1, 10)];
@@ -476,7 +475,7 @@ onShareTimeline(() => {

 .top-theme {
  position: absolute;
-  display: none;
+  display: flex;
  align-items: center;
  justify-content: center;
  width: 100%;
--- a/src/pages/melee-battle.vue
+++ b/src/pages/melee-battle.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, onBeforeUnmount, watch } from "vue";
+import { ref, onMounted, onBeforeUnmount, watch, nextTick } from "vue";
 import { onLoad, onShow, onHide } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import BowTarget from "@/components/BowTarget.vue";
@@ -32,6 +32,8 @@ const halfTimeTip = ref(false);
 const halfRest = ref(false);
 /** 控制设备离线提示弹窗的显示状态 */
 const showOfflineModal = ref(false);
+/** 记录每位玩家当前半场连续 X 环数，key 为 playerId，用于触发 tententen 音效 */
+const xRingStreaks = ref({});

 /**
 * 监听设备在线状态，大乱斗比赛进行中设备离线时弹窗提示用户
@@ -120,6 +122,28 @@ onLoad(async (options) => {
  // });
 });

+/**
+ * 检测指定玩家连续 X 环是否达到 3 箭，达到则在环数播报入队后追加 tententen 音效
+ * @param {number|string} playerId - 本次射手的 ID（大乱斗中 ShootResult 保留 playerId）
+ * @param {boolean} isXRing - 本次射击是否为 X 环
+ */
+function checkAndPlayTententen(playerId, isXRing) {
+  if (!playerId) return;
+  const id = parseInt(playerId);
+  if (isXRing) {
+    xRingStreaks.value[id] = (xRingStreaks.value[id] || 0) + 1;
+    // 同一玩家连续 3 箭均为 X 环，追加到环数音效队列尾部播放
+    if (xRingStreaks.value[id] >= 3) {
+      xRingStreaks.value[id] = 0;
+      // nextTick 确保 HeaderProgress 的环数播报已入队后再追加 tententen，避免播放顺序颠倒
+      nextTick(() => audioManager.play("tententen", false));
+    }
+  } else {
+    // 非 X 环则重置该玩家的连续计数
+    xRingStreaks.value[id] = 0;
+  }
+}
+
 async function onReceiveMessage(msg) {
  if (Array.isArray(msg)) return;
  if (msg.type === MESSAGETYPESV2.BattleStart) {
@@ -127,7 +151,28 @@ async function onReceiveMessage(msg) {
    halfRest.value = false;
    recoverData(msg);
  } else if (msg.type === MESSAGETYPESV2.ShootResult) {
+    // 更新前快照各玩家本轮已射箭数，用于事后识别本次射手
+    const curRound = playersScores.value[playersScores.value.length - 1] || {};
+    const prevCounts = {};
+    for (const pid of Object.keys(curRound)) {
+      prevCounts[pid] = (curRound[pid] || []).length;
+    }
    recoverData(msg);
+    // 对比更新后数据找出箭数增加的玩家（即本次射手），并读取其最新箭的 ring 数据
+    const newRound = playersScores.value[playersScores.value.length - 1] || {};
+    let shooterId = null;
+    let isXRing = false;
+    for (const pid of Object.keys(newRound)) {
+      const newLen = (newRound[pid] || []).length;
+      if (newLen > (prevCounts[pid] || 0)) {
+        shooterId = parseInt(pid);
+        const shot = newRound[pid][newLen - 1];
+        isXRing = !!(shot?.ringX && shot?.ring);
+        break;
+      }
+    }
+    // 检测同一玩家三箭全 X 环，触发 tententen 音效
+    checkAndPlayTententen(shooterId, isXRing);
  } else if (msg.type === MESSAGETYPESV2.HalfRest) {
    halfTimeTip.value = true;
    halfRest.value = true;
--- a/src/pages/practise-one.vue
+++ b/src/pages/practise-one.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, onBeforeUnmount } from "vue";
+import { ref, onMounted, onBeforeUnmount, nextTick } from "vue";
 import { onLoad } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import ShootProgress from "@/components/ShootProgress.vue";
@@ -31,6 +31,8 @@ const { user } = storeToRefs(store);
 const start = ref(false);
 const scores = ref([]);
 const total = 12;
+/** 当前练习中连续 X 环计数，用于触发 tententen 音效 */
+const xRingStreak = ref(0);
 const practiseResult = ref({});
 const practiseId = ref("");
 const showGuide = ref(false);
@@ -46,6 +48,7 @@ onLoad((options) => {
 const onReady = async () => {
  await startPractiseAPI();
  scores.value = [];
+  xRingStreak.value = 0; // 新一局开始，重置 X 环连续计数
  start.value = true;
  audioManager.play("练习开始");
 };
@@ -55,9 +58,33 @@ const onOver = async () => {
  start.value = false;
 };

+/**
+ * 检测连续 X 环是否达到 3 箭，达到则播放 tententen 音效
+ * @param {boolean} isXRing - 本次射击是否为 X 环
+ */
+function checkAndPlayTententen(isXRing) {
+  if (isXRing) {
+    xRingStreak.value += 1;
+    // 连续 3 箭均为 X 环，在环数播报入队后追加 tententen，避免播放顺序颠倒
+    if (xRingStreak.value >= 3) {
+      xRingStreak.value = 0;
+      nextTick(() => audioManager.play("tententen", false));
+    }
+  } else {
+    // 非 X 环则重置连续计数
+    xRingStreak.value = 0;
+  }
+}
+
 async function onReceiveMessage(msg) {
  if (msg.type === MESSAGETYPESV2.ShootResult) {
+    const prevLen = scores.value.length;
    scores.value = msg.details;
+    // 有新箭时取最后一箭判断是否 X 环并检测连续计数
+    if (scores.value.length > prevLen) {
+      const latestArrow = scores.value[scores.value.length - 1];
+      checkAndPlayTententen(!!(latestArrow?.ringX && latestArrow?.ring));
+    }
  } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
    // setTimeout(onOver, 1500);
  }
@@ -74,6 +101,7 @@ async function onComplete() {
    practiseResult.value = {};
    start.value = false;
    scores.value = [];
+    xRingStreak.value = 0; // 重新开始练习，重置 X 环连续计数
    const result = await createPractiseAPI(total, 120);
    if (result) practiseId.value = result.id;
  }
--- a/src/pages/practise-two.vue
+++ b/src/pages/practise-two.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, onBeforeUnmount } from "vue";
+import { ref, onMounted, onBeforeUnmount, nextTick } from "vue";
 import Container from "@/components/Container.vue";
 import ShootProgress from "@/components/ShootProgress.vue";
 import BowTarget from "@/components/BowTarget.vue";
@@ -31,6 +31,8 @@ const { user } = storeToRefs(store);
 const start = ref(false);
 const scores = ref([]);
 const total = 36;
+/** 当前练习中连续 X 环计数，用于触发 tententen 音效 */
+const xRingStreak = ref(0);
 const practiseResult = ref({});
 const practiseId = ref("");
 const showGuide = ref(false);
@@ -45,6 +47,7 @@ onLoad((options) => {
 const onReady = async () => {
  await startPractiseAPI();
  scores.value = [];
+  xRingStreak.value = 0; // 新一局开始，重置 X 环连续计数
  start.value = true;
  audioManager.play("练习开始");
 };
@@ -54,9 +57,33 @@ const onOver = async () => {
  start.value = false;
 };

+/**
+ * 检测连续 X 环是否达到 3 箭，达到则播放 tententen 音效
+ * @param {boolean} isXRing - 本次射击是否为 X 环
+ */
+function checkAndPlayTententen(isXRing) {
+  if (isXRing) {
+    xRingStreak.value += 1;
+    // 连续 3 箭均为 X 环，在环数播报入队后追加 tententen，避免播放顺序颠倒
+    if (xRingStreak.value >= 3) {
+      xRingStreak.value = 0;
+      nextTick(() => audioManager.play("tententen", false));
+    }
+  } else {
+    // 非 X 环则重置连续计数
+    xRingStreak.value = 0;
+  }
+}
+
 async function onReceiveMessage(msg) {
  if (msg.type === MESSAGETYPESV2.ShootResult) {
+    const prevLen = scores.value.length;
    scores.value = msg.details;
+    // 有新箭时取最后一箭判断是否 X 环并检测连续计数
+    if (scores.value.length > prevLen) {
+      const latestArrow = scores.value[scores.value.length - 1];
+      checkAndPlayTententen(!!(latestArrow?.ringX && latestArrow?.ring));
+    }
  } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
    setTimeout(onOver, 1500);
  }
@@ -89,7 +116,8 @@ async function onComplete() {
    practiseResult.value = {};
    start.value = false;
    scores.value = [];
-    const result = await createPractiseAPI(total, 3600);
+    xRingStreak.value = 0; // 重新开始练习，重置 X 环连续计数
+    const result = await createPractiseAPI(total, 360);
    if (result) practiseId.value = result.id;
  }
 }
@@ -105,7 +133,7 @@ onMounted(async () => {
  });
  uni.$on("socket-inbox", onReceiveMessage);
  uni.$on("share-image", onClickShare);
-  const result = await createPractiseAPI(total, 3600, targetType.value);
+  const result = await createPractiseAPI(total, 360, targetType.value);
  if (result) practiseId.value = result.id;
 });

@@ -132,7 +160,7 @@ onBeforeUnmount(() => {
        <ShootProgress
          :tips="`请连续射${total}支箭`"
          :start="start"
-          :total="3600"
+          :total="360"
          :onStop="onOver"
        />
        <view class="user-row">
--- a/src/pages/ranking.vue
+++ b/src/pages/ranking.vue
@@ -323,7 +323,6 @@ onShow(async () => {
          >
            <text>{{ seasonName }}</text>
            <image
-              class="triangle-icon"
              v-show="seasonData.length > 1"
              src="../static/rank/triangle.png"
              mode="widthFix"
@@ -593,7 +592,6 @@ onShow(async () => {
 .ranking-season > image {
  width: 12px;
  height: 12px;
-  transform: rotateX(180deg);
 }

 .ranking-season > text {
@@ -809,18 +807,18 @@ onShow(async () => {
 }

 .season-list {
-  background-color: rgba(0, 0, 0, 0.8);
+  background-color: #000c;
  border-radius: 15px;
  color: #fff;
  font-size: 12px;
-  padding: 12px 0;
+  padding: 5px 0;
  position: absolute;
  width: 220rpx;
  height: auto;
  max-height: 400rpx;
  overflow: hidden;
  overflow-y: auto;
-  top: -42rpx;
+  top: -44rpx;
  right: -30rpx;
  letter-spacing: 2px;
  z-index: 10;
@@ -831,7 +829,7 @@ onShow(async () => {
  display: flex;
  align-items: center;
  word-break: keep-all;
-  padding: 20rpx 10rpx;
+  padding: 20rpx 0;
 }

 .season-list > view > text {
--- a/src/pages/team-battle.vue
+++ b/src/pages/team-battle.vue
@@ -49,6 +49,8 @@ const battleWay = ref(0);
 const lastToSomeoneShootKey = ref("");
 /** 控制设备离线提示弹窗的显示状态 */
 const showOfflineModal = ref(false);
+/** 记录每位玩家当前轮连续 X 环数，key 为 playerId，用于触发 tententen 音效 */
+const xRingStreaks = ref({});

 /**
 * 监听设备在线状态，比赛进行中设备离线时弹窗提示用户
@@ -231,6 +233,27 @@ function onNewRound(msg, prevRound) {
  }
 }

+/**
+ * 检测指定射手连续 X 环是否达到 3 箭，达到则在环数播报入队后追加 tententen 音效
+ * @param {number} shooterId - 本次射手的 ID（取自 currentShooterId.value）
+ * @param {boolean} isXRing - 本次射击是否为 X 环
+ */
+function checkAndPlayTententen(shooterId, isXRing) {
+  if (!shooterId) return;
+  if (isXRing) {
+    xRingStreaks.value[shooterId] = (xRingStreaks.value[shooterId] || 0) + 1;
+    // 同一玩家连续 3 箭均为 X 环，追加到环数音效队列尾部播放
+    if (xRingStreaks.value[shooterId] >= 3) {
+      xRingStreaks.value[shooterId] = 0;
+      // nextTick 确保 HeaderProgress 的环数播报已入队后再追加 tententen，避免播放顺序颠倒
+      nextTick(() => audioManager.play("tententen", false));
+    }
+  } else {
+    // 非 X 环则重置该玩家的连续计数
+    xRingStreaks.value[shooterId] = 0;
+  }
+}
+
 async function onReceiveMessage(msg) {
  if (Array.isArray(msg)) return;
  if (msg.type === MESSAGETYPESV2.BattleStart) {
@@ -245,6 +268,9 @@ async function onReceiveMessage(msg) {
  } else if (msg.type === MESSAGETYPESV2.ShootResult) {
    showRoundTip.value = false;
    recoverData(msg, {arrowOnly: true});
+    // 检测同一玩家三箭全 X 环，触发 tententen 音效
+    // currentShooterId 在 ToSomeoneShoot 时写入，ShootResult 不会覆盖，可靠识别本次射手
+    checkAndPlayTententen(currentShooterId.value, !!(msg.shootData?.ringX && msg.shootData?.ring));
  } else if (msg.type === MESSAGETYPESV2.NewRound) {
    // 在进入延迟前先捕获当前轮次，供 onNewRound 使用，防止 800ms 内 ToSomeoneShoot 提前更新 currentRound 造成 Tip 展示错轮
    const prevRound = currentRound.value;
--- a/src/websocket.js
+++ b/src/websocket.js
@@ -1,22 +1,12 @@
 import { MESSAGETYPES, getMessageTypeName } from "@/constants";
-import { getUserGameState } from "@/apis";
-
 let socket = null;
 let heartbeatInterval = null;
 let reconnectTimer = null;
-let manualClose = false;
-let checkingSession = false;
-let kickedOut = false;
-let isConnecting = false;

+/**
+ * 建立 WebSocket 连接
+ */
 function createWebSocket(token, onMessage) {
-  if (!token) return;
-  if (kickedOut) kickedOut = false;
-  if (socket || isConnecting) return;
-
-  manualClose = false;
-  isConnecting = true;
-
  let url = "wss://api.shelingxingqiu.com/socket";
  try {
    const accountInfo = uni.getAccountInfoSync();
@@ -30,65 +20,42 @@ function createWebSocket(token, onMessage) {
      case "trial": // 体验版
        url = "wss://apitest.shelingxingqiu.com/socket";
        break;
-      case "trial":
-        url = "wss://apitest.shelingxingqiu.com/socket";
-        break;
-      case "release":
+      case "release": // 正式版
        url = "wss://api.shelingxingqiu.com/socket";
        break;
      default:
+        // 保持默认值
        break;
    }
  } catch (e) {
-    console.error("获取 WebSocket 环境信息失败，使用默认正式环境", e);
+    console.error("获取环境信息失败，使用默认正式环境", e);
  }
-
  url += `?authorization=${token}`;
-  const socketTask = uni.connectSocket({
+  socket = uni.connectSocket({
    url,
    success: () => {
-      console.log("WebSocket 已发起连接");
+      console.log("websocket 连接成功");
+      // 启动心跳
+      startHeartbeat(onMessage);
    },
-    fail: (err) => {
-      if (socket !== socketTask) return;
-      console.error("WebSocket 连接失败", err);
-      socket = null;
-      isConnecting = false;
+    fail: () => {
      reconnect(onMessage);
    },
  });

-  socket = socketTask;
-
-  socketTask.onOpen(() => {
-    if (socket !== socketTask) return;
-    console.log("WebSocket 连接成功");
-    isConnecting = false;
-    startHeartbeat(onMessage);
-  });
-
-  socketTask.onMessage((res) => {
-    if (socket !== socketTask) return;
-
+  // 接收消息
+  uni.onSocketMessage((res) => {
    const { data, event } = JSON.parse(res.data);
    if (event === "pong") return;
    if (data.type) {
-      console.log(
-        "收到 WebSocket 消息",
-        getMessageTypeName(data.type),
-        data.data
-      );
+      console.log("收到消息：", getMessageTypeName(data.type), data.data);
      if (onMessage) onMessage({ ...(data.data || {}), type: data.type });
      return;
    }
    if (onMessage && data.updates) onMessage(data.updates);
    const msg = data.updates[0];
    if (msg) {
-      console.log(
-        "收到 WebSocket 更新",
-        getMessageTypeName(msg.constructor),
-        msg
-      );
+      console.log("收到消息：", getMessageTypeName(msg.constructor), msg);
      if (msg.constructor === MESSAGETYPES.RankUpdate) {
        uni.setStorageSync("latestRank", msg.lvl);
      } else if (msg.constructor === MESSAGETYPES.LvlUpdate) {
@@ -101,109 +68,84 @@ function createWebSocket(token, onMessage) {
    }
  });

-  socketTask.onError((err) => {
-    if (socket !== socketTask) return;
+  // 错误处理
+  uni.onSocketError((err) => {
    console.error("WebSocket 错误", err);
+    reconnect(onMessage);
  });

-  socketTask.onClose(async (result) => {
-    if (socket !== socketTask) return;
+  uni.onSocketClose((result) => {
    console.log("WebSocket 已关闭", result);
    stopHeartbeat();
-    socket = null;
-    isConnecting = false;
-
-    if (manualClose || kickedOut) return;
-    await handleUnexpectedClose(onMessage);
+    reconnect(onMessage);
  });
 }

-async function handleUnexpectedClose(onMessage) {
-  if (checkingSession || manualClose || kickedOut) return;
+/**
+ * 重连机制
+ */
+function reconnect(onMessage) {
+  reconnectTimer && clearTimeout(reconnectTimer);
+  closeWebSocket(); // 确保关闭旧连接

  const token = uni.getStorageSync(
    `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
  );
  if (!token) return;

-  checkingSession = true;
-  try {
-    await getUserGameState();
-    if (!manualClose && !kickedOut) reconnect(onMessage);
-  } catch (err) {
-    if (err?.type === "AUTH_INVALID") {
-      kickedOut = true;
-      manualClose = true;
-      reconnectTimer && clearTimeout(reconnectTimer);
-      uni.$emit("session-kicked-out");
-      return;
-    }
-    if (!manualClose && !kickedOut) reconnect(onMessage);
-  } finally {
-    checkingSession = false;
-  }
-}
-
-function reconnect(onMessage) {
-  reconnectTimer && clearTimeout(reconnectTimer);
-
-  const token = uni.getStorageSync(
-    `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
-  );
-  if (!token || manualClose || kickedOut || socket || isConnecting) return;
-
  reconnectTimer = setTimeout(() => {
-    if (manualClose || kickedOut || socket || isConnecting) return;
-    console.log("WebSocket 正在重连...");
+    console.log("reconnecting...");
    createWebSocket(token, onMessage);
  }, 1000);
 }

-function closeWebSocket(isManual = true) {
-  manualClose = isManual;
+function closeWebSocket() {
+  if (socket) {
    reconnectTimer && clearTimeout(reconnectTimer);
    stopHeartbeat();
-  isConnecting = false;
-
-  if (socket) {
-    const currentSocket = socket;
-    socket = null;

    try {
-      currentSocket.close();
+      socket.close();
    } catch (err) {
-      console.error("关闭 WebSocket 失败", err);
+      console.error("关闭WebSocket连接失败", err);
    }
+
+    socket = null; // 清除socket引用
  }
 }

 function sendHeartbeat(onMessage) {
-  if (!socket) return;
-
-  const currentSocket = socket;
-  currentSocket.send({
+  uni.sendSocketMessage({
    data: JSON.stringify({ event: "ping", data: {} }),
-    success: () => {},
+    success: () => {
+      // console.log("发送心跳成功");
+    },
    fail: (err) => {
-      if (socket !== currentSocket) return;
-      console.error("心跳发送失败", err);
+      console.error("发送心跳失败", err);
      stopHeartbeat();
-      closeWebSocket(false);
-      reconnect(onMessage);
+      closeWebSocket(); // 关闭失效的连接
+      reconnect(onMessage); // 触发重连
    },
  });
 }

+/**
+ * 启动心跳
+ */
 function startHeartbeat(onMessage) {
-  stopHeartbeat();
+  stopHeartbeat(); // 防止重复启动

  heartbeatInterval = setInterval(() => {
-    if (socket) {
+    if (socket && socket.readyState === 1) {
+      // 检查连接状态
      sendHeartbeat(onMessage);
    }
  }, 10000);
 }

+/**
+ * 停止心跳
+ */
 function stopHeartbeat() {
  if (heartbeatInterval) {
    clearInterval(heartbeatInterval);
Author	SHA1	Message	Date
chenlimao	8c0a24fd44	fix：练习赛三箭x环播放音效	2026-05-19 18:27:28 +08:00
chenlimao	a151f2f293	fix：对抗赛实现三箭x环音效	2026-05-19 18:16:40 +08:00
chenlimao	4352fffde7	fix：大乱斗连续三箭x环播放音效	2026-05-19 18:11:47 +08:00