update：优化比赛

src/pages/melee-battle.vue

@@ -13,8 +13,9 @@ import TestDistance from "@/components/TestDistance.vue";
 import SModal from "@/components/SModal.vue";
 import audioManager from "@/audioManager";
 import { getBattleAPI, laserCloseAPI } from "@/apis";
-import { connectMatchWebSocket } from "@/matchWebsocket";
+import { closeMatchWebSocket, connectMatchWebSocket } from "@/matchWebsocket";
 import { MESSAGETYPESV2 } from "@/constants";
+import { takeMatchReturnSnapshot } from "@/utils/matchReturn";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
 const store = useStore();
@@ -46,6 +47,8 @@ let halfRestTimer = null;
 const showOfflineModal = ref(false);
 /** 记录每位玩家当前半场连续 10 环及以上次数，key 为 playerId，用于触发 tententen 音效 */
 const xRingStreaks = ref({});
+let battleEnded = false;
+let skipNextRestoreOnShow = false;
 
 function clearHalfRestCountdown() {
   if (halfRestTimer) {
@@ -164,6 +167,11 @@ function reconnectMatchServer(battleInfo) {
   });
 }
 
+function closeBattleServer(reason) {
+  if (battleEnded) return;
+  closeMatchWebSocket({ reason });
+}
+
 /**
  * 监听设备在线状态，大乱斗比赛进行中设备离线时弹窗提示用户
  */
@@ -176,6 +184,9 @@ watch(online, (newVal, oldVal) => {
 function recoverData(battleInfo, { force = false } = {}) {
   battleInfo = normalizeBattleInfo(battleInfo);
   if (!battleInfo) return;
+  if (battleInfo.status !== undefined) {
+    battleEnded = [2, 4].includes(Number(battleInfo.status));
+  }
   try {
     if (battleInfo.way === 1) title.value = "好友约战 - 大乱斗";
     if (battleInfo.way === 2) title.value = "排位赛 - 大乱斗";
@@ -250,7 +261,16 @@ function recoverData(battleInfo, { force = false } = {}) {
 }
 
 onLoad(async (options) => {
-  if (options.battleId) battleId.value = options.battleId;
+  const returnSnapshot = options.fromReturn ? takeMatchReturnSnapshot() : null;
+  skipNextRestoreOnShow = false;
+  if (returnSnapshot?.matchId) battleId.value = returnSnapshot.matchId;
+  else if (options.battleId) battleId.value = options.battleId;
+  if (returnSnapshot) {
+    skipNextRestoreOnShow = true;
+    reconnectMatchServer(returnSnapshot);
+    recoverData(returnSnapshot, { force: true });
+    return;
+  }
   const readySnapshot = takeReadySnapshot(battleId.value);
   if (readySnapshot?.status === 0) recoverData(readySnapshot);
   // uni.enableAlertBeforeUnload({
@@ -325,6 +345,7 @@ async function onReceiveMessage(msg) {
     tips.value = "准备下半场";
     startHalfRestCountdown();
   } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
+    battleEnded = true;
     setTimeout(() => {
       // 全部跳转到新结算页
       uni.redirectTo({
@@ -346,14 +367,24 @@ onBeforeUnmount(() => {
   });
   clearHalfRestCountdown();
   uni.$off("socket-inbox", onReceiveMessage);
+  closeBattleServer("melee-battle-unmount");
   audioManager.stopAll();
 });
 
+onHide(() => {
+  closeBattleServer("melee-battle-hide");
+});
+
 onShow(async () => {
+  if (skipNextRestoreOnShow) {
+    skipNextRestoreOnShow = false;
+    return;
+  }
   if (battleId.value) {
     const result = normalizeBattleInfo(await getBattleAPI(battleId.value));
     if (!result) return;
     if (result.status === 2) {
+      battleEnded = true;
       uni.showToast({
         title: "比赛已结束",
         icon: "none",