更新音频

src/components/HeaderProgress.vue

@@ -12,12 +12,13 @@ const melee = ref(false);
 const timer = ref(null);
 const sound = ref(true);
 const currentSound = ref("");
-const currentRound = ref(1);
+const currentRound = ref(0);
 const currentRoundEnded = ref(false);
 const ended = ref(false);
 const halfTime = ref(false);
 const currentShot = ref(0);
 const totalShot = ref(0);
+const yourTurn = ref(false);
 
 watch(
   () => tips.value,
@@ -25,21 +26,27 @@ watch(
     let key = "";
     if (newVal.includes("红队")) key = "请红方射箭";
     if (newVal.includes("蓝队")) key = "请蓝方射箭";
-    if (key && sound.value) {
-      if (currentRoundEnded.value) {
-        currentRoundEnded.value = false;
-        if (currentRound.value === 1) audioManager.play("第一轮");
-        if (currentRound.value === 2) audioManager.play("第二轮");
-        if (currentRound.value === 3) audioManager.play("第三轮");
-        if (currentRound.value === 4) audioManager.play("第四轮");
-        if (currentRound.value === 5) audioManager.play("第五轮");
-        setTimeout(() => {
-          audioManager.play(key);
-        }, 1000);
-      } else {
-        audioManager.play(key);
-      }
+    if (!sound.value) return;
+    if (currentRoundEnded.value) {
+      currentRound.value += 1;
+      console.log(11111, currentRound.value);
+      // 播放当前轮次语音
+      audioManager.play(
+        `第${["一", "二", "三", "四", "五"][currentRound.value - 1]}轮`
+      );
     }
+    // 延迟播放队伍提示音
+    setTimeout(
+      () => {
+        if (key) {
+          if (!yourTurn.value) audioManager.play(key);
+          else audioManager.play("轮到你了");
+        }
+        currentRoundEnded.value = false;
+        yourTurn.value = false;
+      },
+      currentRoundEnded.value ? 1000 : 0
+    );
   }
 );
 
@@ -60,6 +67,8 @@ 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({
@@ -82,7 +91,7 @@ async function onReceiveMessage(messages = []) {
     } else if (msg.constructor === MESSAGETYPES.CurrentRoundEnded) {
       currentShot.value = 0;
       if (msg.preRoundResult && msg.preRoundResult.currentRound) {
-        currentRound.value = msg.preRoundResult.currentRound + 1;
+        currentRound.value = msg.preRoundResult.currentRound;
         currentRoundEnded.value = true;
       }
     } else if (msg.constructor === MESSAGETYPES.HalfTimeOver) {