From 4352fffde7a458592b7a280ce970168ab83f1614 Mon Sep 17 00:00:00 2001
From: chenlimao <web_wei_328@163.com>
Date: Tue, 19 May 2026 18:11:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9A=E5=A4=A7=E4=B9=B1=E6=96=97?=
 =?UTF-8?q?=E8=BF=9E=E7=BB=AD=E4=B8=89=E7=AE=ADx=E7=8E=AF=E6=92=AD?=
 =?UTF-8?q?=E6=94=BE=E9=9F=B3=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/audioManager.js        |  1 +
 src/pages/melee-battle.vue | 47 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/src/audioManager.js b/src/audioManager.js
index 9e56ed5..44fe3a5 100644
--- a/src/audioManager.js
+++ b/src/audioManager.js
@@ -1,4 +1,5 @@
 export const audioFils = {
+  tententen: "https://static.shelingxingqiu.com/shootmini/static/audio/tententen.mp3",
   点击按钮: "https://static.shelingxingqiu.com/shootmini/static/audio/%E7%82%B9%E5%87%BB%E6%8C%89%E9%92%AE.mp3",
   "20CM全环靶": "https://static.shelingxingqiu.com/shootmini/static/audio/20CM%E5%85%A8%E7%8E%AF%E9%9D%B6-%E6%97%A0%E6%95%88.mp3",
   "40CM全环靶": "https://static.shelingxingqiu.com/shootmini/static/audio/40CM%E5%85%A8%E7%8E%AF%E9%9D%B6-%E6%97%A0%E6%95%88.mp3",
diff --git a/src/pages/melee-battle.vue b/src/pages/melee-battle.vue
index be2ca74..94e3ccf 100644
--- a/src/pages/melee-battle.vue
+++ b/src/pages/melee-battle.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, onBeforeUnmount, watch } from "vue";
+import { ref, onMounted, onBeforeUnmount, watch, nextTick } from "vue";
 import { onLoad, onShow, onHide } from "@dcloudio/uni-app";
 import Container from "@/components/Container.vue";
 import BowTarget from "@/components/BowTarget.vue";
@@ -32,6 +32,8 @@ const halfTimeTip = ref(false);
 const halfRest = ref(false);
 /** 控制设备离线提示弹窗的显示状态 */
 const showOfflineModal = ref(false);
+/** 记录每位玩家当前半场连续 X 环数，key 为 playerId，用于触发 tententen 音效 */
+const xRingStreaks = ref({});
 
 /**
  * 监听设备在线状态，大乱斗比赛进行中设备离线时弹窗提示用户
@@ -120,6 +122,28 @@ onLoad(async (options) => {
   // });
 });
 
+/**
+ * 检测指定玩家连续 X 环是否达到 3 箭，达到则在环数播报入队后追加 tententen 音效
+ * @param {number|string} playerId - 本次射手的 ID（大乱斗中 ShootResult 保留 playerId）
+ * @param {boolean} isXRing - 本次射击是否为 X 环
+ */
+function checkAndPlayTententen(playerId, isXRing) {
+  if (!playerId) return;
+  const id = parseInt(playerId);
+  if (isXRing) {
+    xRingStreaks.value[id] = (xRingStreaks.value[id] || 0) + 1;
+    // 同一玩家连续 3 箭均为 X 环，追加到环数音效队列尾部播放
+    if (xRingStreaks.value[id] >= 3) {
+      xRingStreaks.value[id] = 0;
+      // nextTick 确保 HeaderProgress 的环数播报已入队后再追加 tententen，避免播放顺序颠倒
+      nextTick(() => audioManager.play("tententen", false));
+    }
+  } else {
+    // 非 X 环则重置该玩家的连续计数
+    xRingStreaks.value[id] = 0;
+  }
+}
+
 async function onReceiveMessage(msg) {
   if (Array.isArray(msg)) return;
   if (msg.type === MESSAGETYPESV2.BattleStart) {
@@ -127,7 +151,28 @@ async function onReceiveMessage(msg) {
     halfRest.value = false;
     recoverData(msg);
   } else if (msg.type === MESSAGETYPESV2.ShootResult) {
+    // 更新前快照各玩家本轮已射箭数，用于事后识别本次射手
+    const curRound = playersScores.value[playersScores.value.length - 1] || {};
+    const prevCounts = {};
+    for (const pid of Object.keys(curRound)) {
+      prevCounts[pid] = (curRound[pid] || []).length;
+    }
     recoverData(msg);
+    // 对比更新后数据找出箭数增加的玩家（即本次射手），并读取其最新箭的 ring 数据
+    const newRound = playersScores.value[playersScores.value.length - 1] || {};
+    let shooterId = null;
+    let isXRing = false;
+    for (const pid of Object.keys(newRound)) {
+      const newLen = (newRound[pid] || []).length;
+      if (newLen > (prevCounts[pid] || 0)) {
+        shooterId = parseInt(pid);
+        const shot = newRound[pid][newLen - 1];
+        isXRing = !!(shot?.ringX && shot?.ring);
+        break;
+      }
+    }
+    // 检测同一玩家三箭全 X 环，触发 tententen 音效
+    checkAndPlayTententen(shooterId, isXRing);
   } else if (msg.type === MESSAGETYPESV2.HalfRest) {
     halfTimeTip.value = true;
     halfRest.value = true;

From a151f2f2937fce272eeccd2c38ffc782aff6a1fc Mon Sep 17 00:00:00 2001
From: chenlimao <web_wei_328@163.com>
Date: Tue, 19 May 2026 18:16:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9A=E5=AF=B9=E6=8A=97=E8=B5=9B?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E4=B8=89=E7=AE=ADx=E7=8E=AF=E9=9F=B3?=
 =?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/team-battle.vue | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/src/pages/team-battle.vue b/src/pages/team-battle.vue
index 1a0b832..466319d 100644
--- a/src/pages/team-battle.vue
+++ b/src/pages/team-battle.vue
@@ -49,6 +49,8 @@ const battleWay = ref(0);
 const lastToSomeoneShootKey = ref("");
 /** 控制设备离线提示弹窗的显示状态 */
 const showOfflineModal = ref(false);
+/** 记录每位玩家当前轮连续 X 环数，key 为 playerId，用于触发 tententen 音效 */
+const xRingStreaks = ref({});
 
 /**
  * 监听设备在线状态，比赛进行中设备离线时弹窗提示用户
@@ -231,6 +233,27 @@ function onNewRound(msg, prevRound) {
   }
 }
 
+/**
+ * 检测指定射手连续 X 环是否达到 3 箭，达到则在环数播报入队后追加 tententen 音效
+ * @param {number} shooterId - 本次射手的 ID（取自 currentShooterId.value）
+ * @param {boolean} isXRing - 本次射击是否为 X 环
+ */
+function checkAndPlayTententen(shooterId, isXRing) {
+  if (!shooterId) return;
+  if (isXRing) {
+    xRingStreaks.value[shooterId] = (xRingStreaks.value[shooterId] || 0) + 1;
+    // 同一玩家连续 3 箭均为 X 环，追加到环数音效队列尾部播放
+    if (xRingStreaks.value[shooterId] >= 3) {
+      xRingStreaks.value[shooterId] = 0;
+      // nextTick 确保 HeaderProgress 的环数播报已入队后再追加 tententen，避免播放顺序颠倒
+      nextTick(() => audioManager.play("tententen", false));
+    }
+  } else {
+    // 非 X 环则重置该玩家的连续计数
+    xRingStreaks.value[shooterId] = 0;
+  }
+}
+
 async function onReceiveMessage(msg) {
   if (Array.isArray(msg)) return;
   if (msg.type === MESSAGETYPESV2.BattleStart) {
@@ -245,6 +268,9 @@ async function onReceiveMessage(msg) {
   } else if (msg.type === MESSAGETYPESV2.ShootResult) {
     showRoundTip.value = false;
     recoverData(msg, {arrowOnly: true});
+    // 检测同一玩家三箭全 X 环，触发 tententen 音效
+    // currentShooterId 在 ToSomeoneShoot 时写入，ShootResult 不会覆盖，可靠识别本次射手
+    checkAndPlayTententen(currentShooterId.value, !!(msg.shootData?.ringX && msg.shootData?.ring));
   } else if (msg.type === MESSAGETYPESV2.NewRound) {
     // 在进入延迟前先捕获当前轮次，供 onNewRound 使用，防止 800ms 内 ToSomeoneShoot 提前更新 currentRound 造成 Tip 展示错轮
     const prevRound = currentRound.value;