Merge branch 'new-race-mode' into test

src/App.vue

@@ -21,7 +21,10 @@
 	} = storeToRefs(store);
 	const {
 		updateUser,
-		updateOnline
+		updateOnline,
+		updateDevice,
+		updateGame,
+		updateRoomNumber
 	} = store;
 
 	watch(
@@ -46,6 +49,22 @@
 		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);
@@ -65,6 +84,7 @@
 	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`
 		);
@@ -77,6 +97,7 @@
 	onHide(() => {
 		uni.$off("update-user", emitUpdateUser);
 		uni.$off("update-online", emitUpdateOnline);
+		uni.$off("session-kicked-out", onSessionKickedOut);
 		websocket.closeWebSocket();
 	});
 </script>

src/apis.js

@@ -46,6 +46,8 @@ 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});

src/audioManager.js

@@ -1,6 +1,4 @@
 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",
   // 激光已校准:

src/components/AppFooter.vue

@@ -31,7 +31,7 @@ function handleTabClick(index) {
       v-for="(tab, index) in tabs"
       :key="index"
       class="tab-item"
-      @click="$clickSound(() => handleTabClick(index))"
+      @click="handleTabClick(index)"
       :style="{
         width: index === 1 ? '36%' : '20%',
       }"

src/components/Container.vue

@@ -206,7 +206,7 @@ const goCalibration = async () => {
           <button hover-class="none" @click="() => (showHint = false)">
             取消
           </button>
-          <button hover-class="none" @click="$clickSound(cancelMatching)">确认</button>
+          <button hover-class="none" @click="cancelMatching">确认</button>
         </view>
       </view>
       <view v-if="hintType === 4" class="tip-content">

src/components/CreateRoom.vue

@@ -112,7 +112,7 @@ const createRoom = debounce(async () => {
         <text>40厘米全环靶</text>
       </view>
     </view>
-    <SButton :onClick="() => $clickSound(createRoom)">创建房间</SButton>
+    <SButton :onClick="createRoom">创建房间</SButton>
   </view>
 </template>
 

src/components/Matching.vue

@@ -123,7 +123,7 @@ onBeforeUnmount(() => {
         </text>
       </view>
     </view>
-    <button hover-class="none" @click="$clickSound(stopMatch)">取消匹配</button>
+    <button hover-class="none" @click="stopMatch">取消匹配</button>
   </view>
 </template>
 

src/main.js

@@ -2,25 +2,12 @@ import { createSSRApp } from 'vue'
 import { createPinia } from 'pinia'
 import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
 import App from './App.vue'
-import audioManager from './audioManager'
 
 export function createApp() {
   const app = createSSRApp(App)
   const pinia = createPinia()
   pinia.use(piniaPluginPersistedstate)
   app.use(pinia)
-
-  /**
-   * 全局点击音效工具函数，用于在任意按钮/元素点击时自动播放音效。
-   * 用法：@click="$clickSound(handler)" 或 @click="$clickSound(() => doSomething())"
-   * @param {Function} handler - 原始点击回调函数（可选，点击时直接调用）
-   * @param {string} [soundKey='点击按钮'] - audioManager 中的音效 key
-   */
-  app.config.globalProperties.$clickSound = (handler, soundKey = '点击按钮') => {
-    audioManager.play(soundKey);
-    if (typeof handler === 'function') handler();
-  };
-
   return {
     app
   }

src/pages/battle-room.vue

@@ -443,7 +443,7 @@ onBeforeUnmount(() => {
       <PlayerSeats v-if="room.battleType === 2" :total="room.count || 10" :players="players"
         :removePlayer="removePlayer" :isOwner="owner.id === user.id" />
       <view>
-        <SButton :disabled="!canClick" :onClick="() => $clickSound(getReady)">
+        <SButton :disabled="!canClick" :onClick="getReady">
           {{
             allReady.value
               ? "即将进入对局..."

src/pages/friend-battle.vue

@@ -141,7 +141,7 @@ onLoad(async (options) => {
         <image src="../static/founded-room.png" mode="widthFix" />
         <view>
           <input placeholder="输入房间号" v-model="roomNumber" placeholder-style="color: #ccc" />
-          <view @click="$clickSound(() => enterRoom(roomNumber))">进入房间</view>
+          <view @click="enterRoom(roomNumber)">进入房间</view>
         </view>
       </view>
       <view class="create-room">
@@ -155,7 +155,7 @@ onLoad(async (options) => {
           </view>
         </view>
         <view>
-          <SButton width="80%" :rounded="30" :onClick="() => $clickSound(onCreateRoom)">
+          <SButton width="80%" :rounded="30" :onClick="onCreateRoom">
             创建约战房
           </SButton>
         </view>

src/pages/index.vue

@@ -68,28 +68,29 @@ onShow(async () => {
   const token = uni.getStorageSync(`${env}_token`);
 
   if (!user.value.id && !token) {
-    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);
-    }
+    // 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);
+    // }
   }
 
   const promises = [getScoreRankList(undefined, 1, 10)];
@@ -178,7 +179,7 @@ onShareTimeline(() => {
                 v-else
                 src="https://static.shelingxingqiu.com/attachment/2026-01-04/dffohwtk1gwh0xfa6h.png"
                 mode="widthFix"
-                @click="$clickSound(() => toPage('/pages/my-device'))"
+                @click="() => toPage('/pages/my-device')"
             />
             <block v-if="user.id">
               <text v-if="!device.deviceId">绑定我的智能弓</text>
@@ -196,10 +197,10 @@ onShareTimeline(() => {
             </BubbleTip>
           </view>
           <view class="play-card">
-            <view @click="$clickSound(() => toPage('/pages/practise'))">
+            <view @click="() => toPage('/pages/practise')">
               <image src="../static/my-practise.png" mode="widthFix"/>
             </view>
-            <view @click="$clickSound(() => toPage('/pages/friend-battle'))">
+            <view @click="() => toPage('/pages/friend-battle')">
               <image src="../static/friend-battle.png" mode="widthFix"/>
             </view>
           </view>
@@ -211,7 +212,7 @@ onShareTimeline(() => {
           />
           <button
               class="into-btn"
-              @click="$clickSound(() => toPage('/pages/ranking'))"
+              @click="() => toPage('/pages/ranking')"
               hover-class="none"
           ></button>
           <view class="ranking-players" @click="toRankListPage">
@@ -475,7 +476,7 @@ onShareTimeline(() => {
 
 .top-theme {
   position: absolute;
-  display: flex;
+  display: none;
   align-items: center;
   justify-content: center;
   width: 100%;

src/pages/melee-battle.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, onBeforeUnmount, watch, nextTick } from "vue";
+import { ref, onMounted, onBeforeUnmount, watch } from "vue";
 import { onLoad, onShow, onHide } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import BowTarget from "@/components/BowTarget.vue";
@@ -32,8 +32,6 @@ const halfTimeTip = ref(false);
 const halfRest = ref(false);
 /** 控制设备离线提示弹窗的显示状态 */
 const showOfflineModal = ref(false);
-/** 记录每位玩家当前半场连续 X 环数，key 为 playerId，用于触发 tententen 音效 */
-const xRingStreaks = ref({});
 
 /**
  * 监听设备在线状态，大乱斗比赛进行中设备离线时弹窗提示用户
@@ -122,28 +120,6 @@ 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) {
@@ -151,28 +127,7 @@ 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;

src/pages/my-device.vue

@@ -130,7 +130,7 @@ onShow(() => {
 <template>
   <Container title="弓箭绑定">
     <view v-if="!device.deviceId" class="scan-code">
-      <button hover-class="none" @click="$clickSound(handleScan)">
+      <button hover-class="none" @click="handleScan">
         <image src="../static/scan.png" mode="widthFix" />
       </button>
       <button hover-class="none" @click="showTip = true">
@@ -269,7 +269,7 @@ onShow(() => {
         </view>
       </view>
       <view :style="{ marginTop: '240rpx' }">
-        <SButton :onClick="() => $clickSound(unbindDevice)" width="80vw" :rounded="40"
+        <SButton :onClick="unbindDevice" width="80vw" :rounded="40"
           >解绑</SButton
         >
       </view>

src/pages/point-book-create.vue

@@ -114,7 +114,7 @@ onMounted(async () => {
       />
     </view>
     <template #bottom>
-      <SButton :rounded="50" :onClick="() => $clickSound(toEditPage)">下一步</SButton>
+      <SButton :rounded="50" :onClick="toEditPage">下一步</SButton>
     </template>
   </Container>
 </template>

src/pages/point-book-edit.vue

@@ -198,7 +198,7 @@ onLoad((options) => {
       </ScreenHint2>
     </view>
     <template #bottom>
-      <SButton :rounded="50" :onClick="() => $clickSound(onSubmit)">
+      <SButton :rounded="50" :onClick="onSubmit">
         {{ currentGroup === groups ? "保存并查看分析" : "下一组" }}
       </SButton>
     </template>

src/pages/point-book.vue

@@ -329,10 +329,10 @@ onShareTimeline(() => {
             </view>
           </view>
           <view>
-            <button hover-class="none" @click="$clickSound(toRecordPage)" class="image-btn">
+            <button hover-class="none" @click="toRecordPage" class="image-btn">
               <image src="../static/record-btn.png" mode="widthFix" />
             </button>
-            <button hover-class="none" @click="$clickSound(startScoring)" class="image-btn">
+            <button hover-class="none" @click="startScoring" class="image-btn">
               <image src="../static/start-scoring.png" mode="widthFix" />
             </button>
           </view>

src/pages/practise-one.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, onBeforeUnmount, nextTick } from "vue";
+import { ref, onMounted, onBeforeUnmount } from "vue";
 import { onLoad } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import ShootProgress from "@/components/ShootProgress.vue";
@@ -31,8 +31,6 @@ 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);
@@ -48,7 +46,6 @@ onLoad((options) => {
 const onReady = async () => {
   await startPractiseAPI();
   scores.value = [];
-  xRingStreak.value = 0; // 新一局开始，重置 X 环连续计数
   start.value = true;
   audioManager.play("练习开始");
 };
@@ -58,33 +55,9 @@ 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);
   }
@@ -101,7 +74,6 @@ 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;
   }

src/pages/practise-two.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, onBeforeUnmount, nextTick } from "vue";
+import { ref, onMounted, onBeforeUnmount } from "vue";
 import Container from "@/components/Container.vue";
 import ShootProgress from "@/components/ShootProgress.vue";
 import BowTarget from "@/components/BowTarget.vue";
@@ -31,8 +31,6 @@ 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);
@@ -47,7 +45,6 @@ onLoad((options) => {
 const onReady = async () => {
   await startPractiseAPI();
   scores.value = [];
-  xRingStreak.value = 0; // 新一局开始，重置 X 环连续计数
   start.value = true;
   audioManager.play("练习开始");
 };
@@ -57,33 +54,9 @@ 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);
   }
@@ -116,8 +89,7 @@ async function onComplete() {
     practiseResult.value = {};
     start.value = false;
     scores.value = [];
-    xRingStreak.value = 0; // 重新开始练习，重置 X 环连续计数
-    const result = await createPractiseAPI(total, 360);
+    const result = await createPractiseAPI(total, 3600);
     if (result) practiseId.value = result.id;
   }
 }
@@ -133,7 +105,7 @@ onMounted(async () => {
   });
   uni.$on("socket-inbox", onReceiveMessage);
   uni.$on("share-image", onClickShare);
-  const result = await createPractiseAPI(total, 360, targetType.value);
+  const result = await createPractiseAPI(total, 3600, targetType.value);
   if (result) practiseId.value = result.id;
 });
 
@@ -160,7 +132,7 @@ onBeforeUnmount(() => {
         <ShootProgress
           :tips="`请连续射${total}支箭`"
           :start="start"
-          :total="360"
+          :total="3600"
           :onStop="onOver"
         />
         <view class="user-row">

src/pages/ranking.vue

@@ -281,27 +281,27 @@ onShow(async () => {
         <image
           src="../static/rank/battle1v1.svg"
           mode="widthFix"
-          @click.stop="$clickSound(() => toMatchPage(1, 2))"
+          @click.stop="() => toMatchPage(1, 2)"
         />
         <image
           src="../static/rank/battle2v2.svg"
           mode="widthFix"
-          @click.stop="$clickSound(() => toMatchPage(2, 4))"
+          @click.stop="() => toMatchPage(2, 4)"
         />
         <image
           src="../static/rank/battle3v3.svg"
           mode="widthFix"
-          @click.stop="$clickSound(() => toMatchPage(3, 6))"
+          @click.stop="() => toMatchPage(3, 6)"
         />
         <image
           src="../static/rank/battle5.svg"
           mode="widthFix"
-          @click.stop="$clickSound(() => toMatchPage(4, 5))"
+          @click.stop="() => toMatchPage(4, 5)"
         />
         <image
           src="../static/rank/battle10.svg"
           mode="widthFix"
-          @click.stop="$clickSound(() => toMatchPage(5, 10))"
+          @click.stop="() => toMatchPage(5, 10)"
         />
       </view>
     </view>
@@ -323,6 +323,7 @@ onShow(async () => {
           >
             <text>{{ seasonName }}</text>
             <image
+              class="triangle-icon"
               v-show="seasonData.length > 1"
               src="../static/rank/triangle.png"
               mode="widthFix"
@@ -592,6 +593,7 @@ onShow(async () => {
 .ranking-season > image {
   width: 12px;
   height: 12px;
+  transform: rotateX(180deg);
 }
 
 .ranking-season > text {
@@ -807,18 +809,18 @@ onShow(async () => {
 }
 
 .season-list {
-  background-color: #000c;
+  background-color: rgba(0, 0, 0, 0.8);
   border-radius: 15px;
   color: #fff;
   font-size: 12px;
-  padding: 5px 0;
+  padding: 12px 0;
   position: absolute;
   width: 220rpx;
   height: auto;
   max-height: 400rpx;
   overflow: hidden;
   overflow-y: auto;
-  top: -44rpx;
+  top: -42rpx;
   right: -30rpx;
   letter-spacing: 2px;
   z-index: 10;
@@ -829,7 +831,7 @@ onShow(async () => {
   display: flex;
   align-items: center;
   word-break: keep-all;
-  padding: 20rpx 0;
+  padding: 20rpx 10rpx;
 }
 
 .season-list > view > text {

src/pages/team-battle.vue

@@ -49,8 +49,6 @@ const battleWay = ref(0);
 const lastToSomeoneShootKey = ref("");
 /** 控制设备离线提示弹窗的显示状态 */
 const showOfflineModal = ref(false);
-/** 记录每位玩家当前轮连续 X 环数，key 为 playerId，用于触发 tententen 音效 */
-const xRingStreaks = ref({});
 
 /**
  * 监听设备在线状态，比赛进行中设备离线时弹窗提示用户
@@ -233,27 +231,6 @@ 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) {
@@ -268,9 +245,6 @@ 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;

src/websocket.js

@@ -1,12 +1,22 @@
 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();
@@ -20,42 +30,65 @@ function createWebSocket(token, onMessage) {
       case "trial": // 体验版
         url = "wss://apitest.shelingxingqiu.com/socket";
         break;
-      case "release": // 正式版
+      case "trial":
+        url = "wss://apitest.shelingxingqiu.com/socket";
+        break;
+      case "release":
         url = "wss://api.shelingxingqiu.com/socket";
         break;
       default:
-        // 保持默认值
         break;
     }
   } catch (e) {
-    console.error("获取环境信息失败，使用默认正式环境", e);
+    console.error("获取 WebSocket 环境信息失败，使用默认正式环境", e);
   }
+
   url += `?authorization=${token}`;
-  socket = uni.connectSocket({
+  const socketTask = uni.connectSocket({
     url,
     success: () => {
-      console.log("websocket 连接成功");
-      // 启动心跳
-      startHeartbeat(onMessage);
+      console.log("WebSocket 已发起连接");
     },
-    fail: () => {
+    fail: (err) => {
+      if (socket !== socketTask) return;
+      console.error("WebSocket 连接失败", err);
+      socket = null;
+      isConnecting = false;
       reconnect(onMessage);
     },
   });
 
-  // 接收消息
-  uni.onSocketMessage((res) => {
+  socket = socketTask;
+
+  socketTask.onOpen(() => {
+    if (socket !== socketTask) return;
+    console.log("WebSocket 连接成功");
+    isConnecting = false;
+    startHeartbeat(onMessage);
+  });
+
+  socketTask.onMessage((res) => {
+    if (socket !== socketTask) return;
+
     const { data, event } = JSON.parse(res.data);
     if (event === "pong") return;
     if (data.type) {
-      console.log("收到消息：", getMessageTypeName(data.type), data.data);
+      console.log(
+        "收到 WebSocket 消息",
+        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("收到消息：", getMessageTypeName(msg.constructor), msg);
+      console.log(
+        "收到 WebSocket 更新",
+        getMessageTypeName(msg.constructor),
+        msg
+      );
       if (msg.constructor === MESSAGETYPES.RankUpdate) {
         uni.setStorageSync("latestRank", msg.lvl);
       } else if (msg.constructor === MESSAGETYPES.LvlUpdate) {
@@ -68,84 +101,109 @@ function createWebSocket(token, onMessage) {
     }
   });
 
-  // 错误处理
-  uni.onSocketError((err) => {
+  socketTask.onError((err) => {
+    if (socket !== socketTask) return;
     console.error("WebSocket 错误", err);
-    reconnect(onMessage);
   });
 
-  uni.onSocketClose((result) => {
+  socketTask.onClose(async (result) => {
+    if (socket !== socketTask) return;
     console.log("WebSocket 已关闭", result);
     stopHeartbeat();
-    reconnect(onMessage);
+    socket = null;
+    isConnecting = false;
+
+    if (manualClose || kickedOut) return;
+    await handleUnexpectedClose(onMessage);
   });
 }
 
-/**
- * 重连机制
- */
-function reconnect(onMessage) {
-  reconnectTimer && clearTimeout(reconnectTimer);
-  closeWebSocket(); // 确保关闭旧连接
+async function handleUnexpectedClose(onMessage) {
+  if (checkingSession || manualClose || kickedOut) return;
 
   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(() => {
-    console.log("reconnecting...");
+    if (manualClose || kickedOut || socket || isConnecting) return;
+    console.log("WebSocket 正在重连...");
     createWebSocket(token, onMessage);
   }, 1000);
 }
 
-function closeWebSocket() {
-  if (socket) {
+function closeWebSocket(isManual = true) {
+  manualClose = isManual;
   reconnectTimer && clearTimeout(reconnectTimer);
   stopHeartbeat();
+  isConnecting = false;
+
+  if (socket) {
+    const currentSocket = socket;
+    socket = null;
 
     try {
-      socket.close();
+      currentSocket.close();
     } catch (err) {
-      console.error("关闭WebSocket连接失败", err);
+      console.error("关闭 WebSocket 失败", err);
     }
-
-    socket = null; // 清除socket引用
   }
 }
 
 function sendHeartbeat(onMessage) {
-  uni.sendSocketMessage({
+  if (!socket) return;
+
+  const currentSocket = socket;
+  currentSocket.send({
     data: JSON.stringify({ event: "ping", data: {} }),
-    success: () => {
-      // console.log("发送心跳成功");
-    },
+    success: () => {},
     fail: (err) => {
-      console.error("发送心跳失败", err);
+      if (socket !== currentSocket) return;
+      console.error("心跳发送失败", err);
       stopHeartbeat();
-      closeWebSocket(); // 关闭失效的连接
-      reconnect(onMessage); // 触发重连
+      closeWebSocket(false);
+      reconnect(onMessage);
     },
   });
 }
 
-/**
- * 启动心跳
- */
 function startHeartbeat(onMessage) {
-  stopHeartbeat(); // 防止重复启动
+  stopHeartbeat();
 
   heartbeatInterval = setInterval(() => {
-    if (socket && socket.readyState === 1) {
-      // 检查连接状态
+    if (socket) {
       sendHeartbeat(onMessage);
     }
   }, 10000);
 }
 
-/**
- * 停止心跳
- */
 function stopHeartbeat() {
   if (heartbeatInterval) {
     clearInterval(heartbeatInterval);