From b0a4c7bea58e57839427faa2fe57e626589b2f1a Mon Sep 17 00:00:00 2001
From: kron <kai_hong@126.com>
Date: Sat, 8 Nov 2025 11:33:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BD=AE=E5=88=B0=E4=BD=A0?=
 =?UTF-8?q?=E4=BA=86=E5=A3=B0=E9=9F=B3=E6=92=AD=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/HeaderProgress.vue |  8 ++------
 src/components/ShootProgress2.vue | 10 ++++++++--
 src/pages/team-battle.vue         | 33 +++++++------------------------
 3 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/src/components/HeaderProgress.vue b/src/components/HeaderProgress.vue
index 0686f9d..551b0df 100644
--- a/src/components/HeaderProgress.vue
+++ b/src/components/HeaderProgress.vue
@@ -18,7 +18,6 @@ const ended = ref(false);
 const halfTime = ref(false);
 const currentShot = ref(0);
 const totalShot = ref(0);
-const yourTurn = ref(false);
 
 watch(
   () => tips.value,
@@ -37,9 +36,8 @@ watch(
     // 延迟播放队伍提示音
     setTimeout(
       () => {
-        if (key && !yourTurn.value) audioManager.play(key);
+        if (key) audioManager.play(newVal.includes("你") ? "轮到你了" : key);
         currentRoundEnded.value = false;
-        yourTurn.value = false;
       },
       currentRoundEnded.value ? 1000 : 0
     );
@@ -81,8 +79,6 @@ async function onReceiveMessage(messages = []) {
           : "未上靶";
         audioManager.play(currentSound.value);
       }
-    } else if (msg.constructor === MESSAGETYPES.ToSomeoneShoot) {
-      yourTurn.value = user.value.id === msg.userId;
     } else if (msg.constructor === MESSAGETYPES.InvalidShot) {
       if (msg.userId === user.value.id) {
         uni.showToast({
@@ -159,7 +155,7 @@ onBeforeUnmount(() => {
 
 <template>
   <view class="container">
-    <text>{{ tips }}</text>
+    <text>{{ (tips || "").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/components/ShootProgress2.vue b/src/components/ShootProgress2.vue
index 2becd8b..9caa6a0 100644
--- a/src/components/ShootProgress2.vue
+++ b/src/components/ShootProgress2.vue
@@ -61,7 +61,11 @@ onBeforeUnmount(() => {
 <template>
   <view class="container">
     <image :src="RoundGoldImages[props.currentRound]" mode="widthFix" />
-    <view>
+    <view
+      :style="{
+        justifyContent: tips.includes('红队') ? 'flex-end' : 'flex-start',
+      }"
+    >
       <view
         :style="{
           width: `${(remain / total) * 100}%`,
@@ -85,7 +89,7 @@ onBeforeUnmount(() => {
 .container > image {
   width: 360rpx;
   height: 80rpx;
-  transform: translateY(24rpx);
+  transform: translateY(20rpx);
 }
 .container > view:last-child {
   width: 100%;
@@ -95,6 +99,8 @@ onBeforeUnmount(() => {
   height: 24rpx;
   position: relative;
   overflow: hidden;
+  display: flex;
+  align-items: center;
 }
 .container > view:last-child > view {
   height: 24rpx;
diff --git a/src/pages/team-battle.vue b/src/pages/team-battle.vue
index ed94c47..c30d746 100644
--- a/src/pages/team-battle.vue
+++ b/src/pages/team-battle.vue
@@ -165,14 +165,15 @@ function recoverData(battleInfo) {
         .filter((item) => !!item.playerId)
         .sort((a, b) => a.shotTimeUnix - b.shotTimeUnix);
     }
-    // if (battleInfo.status !== 11) return;
     if (battleInfo.firePlayerIndex) {
       currentShooterId.value = battleInfo.firePlayerIndex;
       const redPlayer = redTeam.value.find(
         (item) => item.id === currentShooterId.value
       );
-      tips.value = redPlayer ? "请红队射箭" : "请蓝队射箭";
-      uni.$emit("update-tips", tips.value);
+      let nextTips = redPlayer ? "请红队射箭" : "请蓝队射箭";
+      if (battleInfo.firePlayerIndex === user.value.id) nextTips += "你";
+      tips.value = nextTips;
+      uni.$emit("update-tips", nextTips);
     }
     if (battleInfo.fireTime > 0) {
       const remain = Date.now() / 1000 - battleInfo.fireTime;
@@ -198,8 +199,8 @@ async function onReceiveMessage(messages = []) {
         const redPlayer = redTeam.value.find(
           (item) => item.id === currentShooterId.value
         );
-        if (msg.userId === user.value.id) audioManager.play("轮到你了");
-        const nextTips = redPlayer ? "请红队射箭" : "请蓝队射箭";
+        let nextTips = redPlayer ? "请红队射箭" : "请蓝队射箭";
+        if (msg.userId === user.value.id) nextTips += "你";
         if (nextTips !== tips.value) {
           tips.value = nextTips;
           uni.$emit("update-tips", tips.value);
@@ -209,27 +210,7 @@ async function onReceiveMessage(messages = []) {
       }
     }
     if (msg.constructor === MESSAGETYPES.ShootResult) {
-      // if (currentShooterId.value !== msg.userId) return;
-      // const isRed = redTeam.value.find((item) => item.id === msg.userId);
-      // if (isRed) scores.value.push({ ...msg.target });
-      // else blueScores.value.push({ ...msg.target });
-      // // 下标从0开始的，要减1
-      // if (!roundResults.value[currentRound.value - 1]) {
-      //   roundResults.value.push({
-      //     redArrows: [],
-      //     blueArrows: [],
-      //     gold: goldenRound.value > 0,
-      //   });
-      // }
-      // roundResults.value[currentRound.value - 1][
-      //   isRed ? "redArrows" : "blueArrows"
-      // ].push({ ...msg.target });
-      if (msg.battleInfo) {
-        recoverData(msg.battleInfo);
-        // if (isFinalShoot.value) {
-        //   uni.setStorageSync(`current-battle-${Date.now()}`, msg.battleInfo);
-        // }
-      }
+      if (msg.battleInfo) recoverData(msg.battleInfo);
     }
     if (msg.constructor === MESSAGETYPES.CurrentRoundEnded) {
       const result = msg.preRoundResult;