diff --git a/src/pages/battle-room.vue b/src/pages/battle-room.vue index 72d8be6..253abab 100644 --- a/src/pages/battle-room.vue +++ b/src/pages/battle-room.vue @@ -168,9 +168,7 @@ function recoverData(battleInfo) { players.value = [...battleInfo.blueTeam, ...battleInfo.redTeam]; players.value.forEach((p) => { playersScores.value[p.id] = [...p.arrows]; - if (p.id === user.value.id) { - scores.value = [...p.arrows]; - } + if (p.id === user.value.id) scores.value = [...p.arrows]; }); if (battleInfo.status === 2) { startCount.value = true; @@ -451,8 +449,8 @@ async function onReceiveMessage(messages = []) { ...msg.groupUserStatus.redTeam, ...msg.groupUserStatus.blueTeam, ].forEach((player) => { - playersScores.value[player.id] = player.arrows; - if (p.id === user.value.id) scores.value = [...p.arrows]; + playersScores.value[player.id] = [...player.arrows]; + if (player.id === user.value.id) scores.value = [...player.arrows]; }); startCount.value = false; halfTimeTip.value = true; diff --git a/src/pages/melee-match.vue b/src/pages/melee-match.vue index 77582d1..c4bde15 100644 --- a/src/pages/melee-match.vue +++ b/src/pages/melee-match.vue @@ -57,9 +57,7 @@ function recoverData(battleInfo) { players.value = [...battleInfo.blueTeam, ...battleInfo.redTeam]; players.value.forEach((p) => { playersScores.value[p.id] = [...p.arrows]; - if (p.id === user.value.id) { - scores.value = [...p.arrows]; - } + if (p.id === user.value.id) scores.value = [...p.arrows]; }); const remain = Date.now() / 1000 - battleInfo.startTime; console.log(`当前局已进行${remain}秒`); @@ -95,7 +93,6 @@ onLoad(async (options) => { const battleInfo = uni.getStorageSync("current-battle"); if (battleInfo) { recoverData(battleInfo); - console.log("remove last time"); uni.removeStorageSync("last-awake-time"); } } else { @@ -145,6 +142,7 @@ async function onReceiveMessage(messages = []) { halfTimeTip.value = false; } if (msg.constructor === MESSAGETYPES.ShootResult) { + if (!start.value) getCurrentGameAPI(); if (msg.userId === user.value.id) { scores.value.push({ ...msg.target }); power.value = msg.target.battery; @@ -155,8 +153,8 @@ async function onReceiveMessage(messages = []) { uni.$emit("update-ramain", 0); [...msg.groupUserStatus.redTeam, ...msg.groupUserStatus.blueTeam].forEach( (player) => { - playersScores.value[player.id] = player.arrows; - if (p.id === user.value.id) scores.value = [...p.arrows]; + playersScores.value[player.id] = [...player.arrows]; + if (player.id === user.value.id) scores.value = [...player.arrows]; } ); startCount.value = false; @@ -211,7 +209,7 @@ onShow(async () => { if (battleId.value) { if (!isEnded.value && (await isGameEnded())) return; const lastAwakeTime = uni.getStorageSync("last-awake-time"); - if (lastAwakeTime) await getCurrentGameAPI(); + if (lastAwakeTime) getCurrentGameAPI(); } }); onHide(() => {