pref: 比赛结束

src/App.vue

@@ -52,7 +52,7 @@
 	}
 
 	function onDeviceShoot() {
-		audioManager.play("射箭声音")
+		// audioManager.play("射箭声音")
 	}
 
 	function onShootWsMsg(content) {

src/components/HeaderProgress.vue

@@ -56,7 +56,7 @@ async function onReceiveMessage(message) {
     currentRoundEnded.value = true;
     audioManager.play("比赛开始");
   } else if (type === MESSAGETYPESV2.BattleEnd) {
-    audioManager.play("比赛结束");
+    audioManager.play("比赛结束", false);
   } else if (type === MESSAGETYPESV2.ShootResult) {
     if (melee.value && current.playerId !== user.value.id) return;
     if (current.playerId === user.value.id) currentShot.value++;

src/pages/melee-battle.vue

@@ -28,6 +28,10 @@ const playersScores = ref([]);
 const halfTimeTip = ref(false);
 const halfRest = ref(false);
 
+const navigateToResult = () => {
+  uni.redirectTo({ url: `/pages/battle-result?battleId=${battleId.value}` });
+};
+
 function recoverData(battleInfo, { force = false } = {}) {
   if (!battleInfo) return;
   try {

src/pages/team-battle.vue

@@ -35,6 +35,7 @@ const redPoints = ref(0);
 const bluePoints = ref(0);
 const showRoundTip = ref(false);
 const isFinalShoot = ref(false);
+const matchStatus = ref(undefined);
 
 const recoverData = (battleInfo, { force = false, arrowOnly = false } = {}) => {
   try {
@@ -110,6 +111,15 @@ const recoverData = (battleInfo, { force = false, arrowOnly = false } = {}) => {
   }
 };
 
+function onBattleEnd(){
+  showRoundTip.value = false
+  console.log("onBattleEnd ended...")
+  if (matchStatus.value === 2) {
+    uni.redirectTo({
+      url: `/pages/battle-result?battleId=${battleId.value}`,
+    });
+  }
+}
 async function onReceiveMessage(msg) {
   if (Array.isArray(msg)) return;
   if (msg.type === MESSAGETYPESV2.BattleStart) {
@@ -133,6 +143,7 @@ async function onReceiveMessage(msg) {
       }
     }
   } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
+    matchStatus.value = msg.status;
     if (msg.status === 4) {
       showRoundTip.value = true;
       currentBluePoint.value = 0;
@@ -140,13 +151,7 @@ async function onReceiveMessage(msg) {
       setTimeout(() => {
         uni.navigateBack();
       }, 2000);
-      return;
     }
-    setTimeout(() => {
-      uni.redirectTo({
-        url: "/pages/battle-result?battleId=" + msg.matchId,
-      });
-    }, 1000);
   }
 }
 
@@ -243,7 +248,7 @@ onShow(async () => {
           :roundData="
             roundResults[currentRound - 1] ? roundResults[currentRound - 1] : []
           "
-          :onAutoClose="() => (showRoundTip = false)"
+          :onAutoClose="onBattleEnd"
         />
       </ScreenHint>
     </view>