From 2cf55dcddeeb69dc678e5950b6ccbf12c0711d8f Mon Sep 17 00:00:00 2001
From: kron <kai_hong@126.com>
Date: Mon, 10 Nov 2025 09:26:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/HeaderProgress.vue | 3 ++-
 src/pages/team-battle.vue         | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/HeaderProgress.vue b/src/components/HeaderProgress.vue
index 551b0df..1bc7e44 100644
--- a/src/components/HeaderProgress.vue
+++ b/src/components/HeaderProgress.vue
@@ -23,6 +23,7 @@ watch(
   () => tips.value,
   (newVal) => {
     let key = "";
+    if (newVal.includes("重回")) return;
     if (newVal.includes("红队")) key = "请红方射箭";
     if (newVal.includes("蓝队")) key = "请蓝方射箭";
     if (!sound.value) return;
@@ -155,7 +156,7 @@ onBeforeUnmount(() => {
 
 <template>
   <view class="container">
-    <text>{{ (tips || "").replace(/你/g, "") }}</text>
+    <text>{{ (tips || "").replace(/你/g, "").replace(/重回/g, "") }}</text>
     <text v-if="totalShot > 0"> ({{ currentShot }}/{{ totalShot }}) </text>
     <button v-if="!!tips" hover-class="none" @click="updateSound">
       <image
diff --git a/src/pages/team-battle.vue b/src/pages/team-battle.vue
index c30d746..3946076 100644
--- a/src/pages/team-battle.vue
+++ b/src/pages/team-battle.vue
@@ -171,7 +171,8 @@ function recoverData(battleInfo) {
         (item) => item.id === currentShooterId.value
       );
       let nextTips = redPlayer ? "请红队射箭" : "请蓝队射箭";
-      if (battleInfo.firePlayerIndex === user.value.id) nextTips += "你";
+      nextTips += "重回";
+      // if (battleInfo.firePlayerIndex === user.value.id) nextTips += "你";
       tips.value = nextTips;
       uni.$emit("update-tips", nextTips);
     }
@@ -199,8 +200,11 @@ async function onReceiveMessage(messages = []) {
         const redPlayer = redTeam.value.find(
           (item) => item.id === currentShooterId.value
         );
+
         let nextTips = redPlayer ? "请红队射箭" : "请蓝队射箭";
-        if (msg.userId === user.value.id) nextTips += "你";
+        if (msg.userId === user.value.id && redTeam.value.length > 1) {
+          nextTips += "你";
+        }
         if (nextTips !== tips.value) {
           tips.value = nextTips;
           uni.$emit("update-tips", tips.value);