update：大乱斗优化

src/components/PlayerScore.vue

@@ -15,6 +15,12 @@ const props = defineProps({
 });
 
 const rowCount = new Array(6).fill(0);
+
+const getRingText = (arrow) => {
+  if (!arrow) return "-";
+  if (arrow.ringX && arrow.ring) return "X环";
+  return arrow.ring ? `${arrow.ring}环` : "-";
+};
 </script>
 
 <template>
@@ -35,23 +41,19 @@ const rowCount = new Array(6).fill(0);
     <view>
       <view>
         <view v-for="(_, index) in rowCount" :key="index">
-          <text>{{
-            scores[0] && scores[0][index] ? `${scores[0][index].ring}环` : "-"
-          }}</text>
+          <text>{{ getRingText(scores[0]?.[index]) }}</text>
         </view>
       </view>
       <view>
         <view v-for="(_, index) in rowCount" :key="index">
-          <text>{{
-            scores[1] && scores[1][index] ? `${scores[1][index].ring}环` : "-"
-          }}</text>
+          <text>{{ getRingText(scores[1]?.[index]) }}</text>
         </view>
       </view>
     </view>
     <text
       >{{
         scores
-          .map((s) => s.reduce((last, next) => last + next.ring, 0))
+          .map((s) => (s || []).reduce((last, next) => last + next.ring, 0))
           .reduce((last, next) => last + next, 0)
       }}环</text
     >

src/pages/melee-battle.vue

@@ -30,11 +30,65 @@ const playersSorted = ref([]);
 const playersScores = ref([]);
 const halfTimeTip = ref(false);
 const halfRest = ref(false);
+const HALF_REST_SECONDS = 20;
+const halfRestRemain = ref(HALF_REST_SECONDS);
+let halfRestTimer = null;
 /** 控制设备离线提示弹窗的显示状态 */
 const showOfflineModal = ref(false);
 /** 记录每位玩家当前半场连续 X 环数，key 为 playerId，用于触发 tententen 音效 */
 const xRingStreaks = ref({});
 
+function clearHalfRestCountdown() {
+  if (halfRestTimer) {
+    clearInterval(halfRestTimer);
+    halfRestTimer = null;
+  }
+}
+
+function getHalfRestSeconds(battleInfo) {
+  const remainCandidates = [
+    battleInfo?.halfRestRemain,
+    battleInfo?.halfRestRemainSeconds,
+    battleInfo?.restRemain,
+    battleInfo?.restRemainSeconds,
+  ];
+
+  for (const item of remainCandidates) {
+    const remain = Number(item);
+    if (Number.isFinite(remain) && remain > 0 && remain <= HALF_REST_SECONDS) {
+      return Math.ceil(remain);
+    }
+  }
+
+  const endTime = Number(battleInfo?.halfRestEndTime ?? battleInfo?.restEndTime);
+  if (!Number.isFinite(endTime) || endTime <= 0) return HALF_REST_SECONDS;
+
+  const timestamp = endTime < 1e12 ? endTime * 1000 : endTime;
+  const diffSeconds = (timestamp - Date.now()) / 1000;
+  if (diffSeconds > 0 && diffSeconds <= HALF_REST_SECONDS) {
+    return Math.ceil(diffSeconds);
+  }
+
+  return HALF_REST_SECONDS;
+}
+
+function startHalfRestCountdown(seconds = HALF_REST_SECONDS) {
+  clearHalfRestCountdown();
+  halfRestRemain.value = Math.max(0, Math.ceil(Number(seconds) || HALF_REST_SECONDS));
+
+  if (halfRestRemain.value <= 0) return;
+
+  halfRestTimer = setInterval(() => {
+    if (halfRestRemain.value <= 1) {
+      halfRestRemain.value = 0;
+      clearHalfRestCountdown();
+      return;
+    }
+
+    halfRestRemain.value -= 1;
+  }, 1000);
+}
+
 /**
  * 监听设备在线状态，大乱斗比赛进行中设备离线时弹窗提示用户
  */
@@ -91,8 +145,7 @@ function recoverData(battleInfo, { force = false } = {}) {
       halfTimeTip.value = true;
       halfRest.value = true;
       tips.value = "准备下半场";
-      // 剩余休息时间
-      // const remain = (Date.now() - battleInfo.timeoutTime) / 1000;
+      startHalfRestCountdown(getHalfRestSeconds(battleInfo));
       setTimeout(() => {
         uni.$emit("update-remain", 0);
       }, 200);
@@ -147,6 +200,7 @@ function checkAndPlayTententen(playerId, isXRing) {
 async function onReceiveMessage(msg) {
   if (Array.isArray(msg)) return;
   if (msg.type === MESSAGETYPESV2.BattleStart) {
+    clearHalfRestCountdown();
     halfTimeTip.value = false;
     halfRest.value = false;
     recoverData(msg);
@@ -177,6 +231,7 @@ async function onReceiveMessage(msg) {
     halfTimeTip.value = true;
     halfRest.value = true;
     tips.value = "准备下半场";
+    startHalfRestCountdown();
   } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
     setTimeout(() => {
       // 全部跳转到新结算页
@@ -197,6 +252,7 @@ onBeforeUnmount(() => {
   uni.setKeepScreenOn({
     keepScreenOn: false,
   });
+  clearHalfRestCountdown();
   uni.$off("socket-inbox", onReceiveMessage);
   audioManager.stopAll();
 });
@@ -261,7 +317,7 @@ onShow(async () => {
       >
         <view class="half-time-tip">
           <text>上半场结束，休息一下吧:）</text>
-          <text>20秒后开始下半场</text>
+          <text>{{ halfRestRemain }}秒后开始下半场</text>
         </view>
       </ScreenHint>
       <!-- 设备离线提示弹窗 -->