diff --git a/src/pages/battle-room.vue b/src/pages/battle-room.vue index 307cf35..0d2ba5c 100644 --- a/src/pages/battle-room.vue +++ b/src/pages/battle-room.vue @@ -417,8 +417,14 @@ async function onReceiveMessage(messages = []) { } } if (msg.constructor === MESSAGETYPES.HalfTimeOver) { + playersScores.value = {}; + [ + ...msg.groupUserStatus.redTeam, + ...msg.groupUserStatus.blueTeam, + ].forEach((player) => { + playersScores.value[player.id] = player.arrows; + }); startCount.value = false; - total.value = 20; halfTimeTip.value = true; tips.value = "准备下半场"; } diff --git a/src/pages/melee-match.vue b/src/pages/melee-match.vue index bfcfa64..c60e014 100644 --- a/src/pages/melee-match.vue +++ b/src/pages/melee-match.vue @@ -35,7 +35,6 @@ const playersSorted = ref([]); const playersScores = ref({}); const halfTimeTip = ref(false); const onComplete = ref(null); -const total = ref(90); watch( () => [players.value, playersScores.value], @@ -145,6 +144,12 @@ async function onReceiveMessage(messages = []) { playersScores.value[msg.userId].push(msg.target); } if (msg.constructor === MESSAGETYPES.HalfTimeOver) { + playersScores.value = {}; + [...msg.groupUserStatus.redTeam, ...msg.groupUserStatus.blueTeam].forEach( + (player) => { + playersScores.value[player.id] = player.arrows; + } + ); startCount.value = false; halfTimeTip.value = true; tips.value = "准备下半场"; @@ -203,8 +208,9 @@ onUnmounted(() => { :seq="seq" :start="start && startCount" :tips="tips" - :total="total" + :total="90" :melee="true" + :battleId="battleId" />