From 31e89144ec99d9bba4b7cd62633a7191c1f37411 Mon Sep 17 00:00:00 2001
From: kron <kai_hong@126.com>
Date: Sat, 19 Jul 2025 16:16:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=A7=E4=B9=B1=E6=96=97?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=B8=B8=E6=88=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ShootProgress.vue |  6 +++++-
 src/pages/battle-room.vue        | 35 +++++++++++---------------------
 src/pages/melee-match.vue        | 32 +++++++++++++----------------
 3 files changed, 31 insertions(+), 42 deletions(-)

diff --git a/src/components/ShootProgress.vue b/src/components/ShootProgress.vue
index 7ca1ed9..78a1e1a 100644
--- a/src/components/ShootProgress.vue
+++ b/src/components/ShootProgress.vue
@@ -7,6 +7,10 @@ import { storeToRefs } from "pinia";
 const store = useStore();
 const { user } = storeToRefs(store);
 const props = defineProps({
+  show: {
+    type: Boolean,
+    default: true,
+  },
   start: {
     type: Boolean,
     default: false,
@@ -182,7 +186,7 @@ onUnmounted(() => {
 </script>
 
 <template>
-  <view class="container">
+  <view class="container" :style="{ display: show ? 'block' : 'none' }">
     <view>
       <image src="../static/shooter.png" mode="widthFix" />
       <text>{{ start && remain === 0 ? "时间到！" : tips }}</text>
diff --git a/src/pages/battle-room.vue b/src/pages/battle-room.vue
index f75037e..98332fb 100644
--- a/src/pages/battle-room.vue
+++ b/src/pages/battle-room.vue
@@ -150,38 +150,27 @@ onLoad(async (options) => {
         }
       } else if (battleInfo.config.mode === 2) {
         players.value = [...battleInfo.blueTeam, ...battleInfo.redTeam];
-        players.value.forEach((p) => {
-          playersScores.value[p.id] = [];
-        });
         if (battleInfo.startTime < 0) return;
         start.value = true;
         step.value = 3;
         players.value.forEach((p) => {
-          playersScores.value[p.id] = p.arrows;
+          playersScores.value[p.id] = [...p.arrows];
           if (p.id === user.value.id) {
-            scores.value = p.arrows;
+            scores.value = [...p.arrows];
           }
         });
-        tips.value = `${
-          scores.value.length ? "下半场-" : "上半场-"
-        }请连续射6箭`;
         const remain = Date.now() / 1000 - battleInfo.startTime;
-        console.log(`当前局剩余${remain}秒`);
-        if (remain <= 90) {
+        console.log(`当前局已进行${remain}秒`);
+        if (battleInfo.status === 2) {
+          tips.value = `${
+            battleInfo.halfGame ? "下半场-" : "上半场-"
+          }请连续射6箭`;
           setTimeout(() => {
-            uni.$emit("update-ramain", remain);
+            uni.$emit("update-ramain", 90 - remain);
           }, 300);
-        } else if (remain > 90 && remain <= 110) {
-          halfTimeTip.value = true;
-          total.value = 20;
+        } else if (battleInfo.status === 9) {
+          startCount.value = false;
           tips.value = "准备下半场";
-          setTimeout(() => {
-            uni.$emit("update-ramain", 110 - remain);
-          }, 300);
-        } else if (remain > 110) {
-          setTimeout(() => {
-            uni.$emit("update-ramain", remain - 110);
-          }, 300);
         }
       }
     }
@@ -405,11 +394,11 @@ async function onReceiveMessage(messages = []) {
           }
         }
         if (battleType.value === 2 && msg.userId === user.value.id) {
-          scores.value.push(msg.target);
+          scores.value.push({ ...msg.target });
           power.value = msg.target.battery;
         }
         if (playersScores.value[msg.userId])
-          playersScores.value[msg.userId].push(msg.target);
+          playersScores.value[msg.userId].push({ ...msg.target });
       }
       if (msg.constructor === MESSAGETYPES.CurrentRoundEnded) {
         if (battleType.value === 1) {
diff --git a/src/pages/melee-match.vue b/src/pages/melee-match.vue
index f0c2f49..10da53a 100644
--- a/src/pages/melee-match.vue
+++ b/src/pages/melee-match.vue
@@ -58,31 +58,27 @@ onLoad(async (options) => {
     if (battleInfo) {
       battleId.value = battleInfo.id;
       players.value = [...battleInfo.blueTeam, ...battleInfo.redTeam];
-      players.value.forEach((p) => {
-        playersScores.value[p.id] = [];
-      });
       if (battleInfo.startTime <= 0) return;
       start.value = true;
       players.value.forEach((p) => {
-        playersScores.value[p.id] = p.arrows;
+        playersScores.value[p.id] = [...p.arrows];
         if (p.id === user.value.id) {
-          scores.value = p.arrows;
+          scores.value = [...p.arrows];
         }
       });
-      tips.value = `${scores.value.length ? "下半场-" : "上半场-"}请连续射6箭`;
       const remain = Date.now() / 1000 - battleInfo.startTime;
-      console.log(`当前局剩余${remain}秒`);
-      if (remain <= 90) {
+      // 这里的开始时间不是游戏开始时间，而是上半场或者下半场或者中场的开始时间，还要根据状态来判断
+      console.log(`当前局已进行${remain}秒`);
+      if (battleInfo.status === 2) {
+        tips.value = `${
+          battleInfo.halfGame ? "下半场-" : "上半场-"
+        }请连续射6箭`;
         setTimeout(() => {
-          uni.$emit("update-ramain", remain);
+          uni.$emit("update-ramain", 90 - remain);
         }, 300);
-      } else if (remain > 90 && remain <= 110) {
+      } else if (battleInfo.status === 9) {
         startCount.value = false;
         tips.value = "准备下半场";
-      } else if (remain > 110) {
-        setTimeout(() => {
-          uni.$emit("update-ramain", remain - 110);
-        }, 300);
       }
     }
   } else {
@@ -140,10 +136,10 @@ async function onReceiveMessage(messages = []) {
     }
     if (msg.constructor === MESSAGETYPES.ShootResult) {
       if (msg.userId === user.value.id) {
-        scores.value.push(msg.target);
+        scores.value.push({ ...msg.target });
         power.value = msg.target.battery;
       }
-      playersScores.value[msg.userId].push(msg.target);
+      playersScores.value[msg.userId].push({ ...msg.target });
     }
     if (msg.constructor === MESSAGETYPES.HalfTimeOver) {
       uni.$emit("update-ramain", 0);
@@ -190,7 +186,7 @@ onUnmounted(() => {
     keepScreenOn: false,
   });
   uni.$off("socket-inbox", onReceiveMessage);
-  if (gameType.value && teamSize.value) {
+  if (gameType.value && teamSize.value && !battleId.value) {
     matchGameAPI(false, gameType.value, teamSize.value);
   }
 });
@@ -207,7 +203,7 @@ onUnmounted(() => {
         <BattleHeader v-if="!start" :players="players" />
         <TestDistance v-if="!start" :guide="false" />
         <ShootProgress
-          v-if="start"
+          :show="start"
           :seq="seq"
           :start="start && startCount"
           :tips="tips"