5 Commits

18 changed files with 169 additions and 25 deletions

View File

@@ -1,4 +1,6 @@
export const audioFils = { 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", "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", "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",
// 激光已校准: // 激光已校准:

View File

@@ -31,7 +31,7 @@ function handleTabClick(index) {
v-for="(tab, index) in tabs" v-for="(tab, index) in tabs"
:key="index" :key="index"
class="tab-item" class="tab-item"
@click="handleTabClick(index)" @click="$clickSound(() => handleTabClick(index))"
:style="{ :style="{
width: index === 1 ? '36%' : '20%', width: index === 1 ? '36%' : '20%',
}" }"

View File

@@ -206,7 +206,7 @@ const goCalibration = async () => {
<button hover-class="none" @click="() => (showHint = false)"> <button hover-class="none" @click="() => (showHint = false)">
取消 取消
</button> </button>
<button hover-class="none" @click="cancelMatching">确认</button> <button hover-class="none" @click="$clickSound(cancelMatching)">确认</button>
</view> </view>
</view> </view>
<view v-if="hintType === 4" class="tip-content"> <view v-if="hintType === 4" class="tip-content">

View File

@@ -112,7 +112,7 @@ const createRoom = debounce(async () => {
<text>40厘米全环靶</text> <text>40厘米全环靶</text>
</view> </view>
</view> </view>
<SButton :onClick="createRoom">创建房间</SButton> <SButton :onClick="() => $clickSound(createRoom)">创建房间</SButton>
</view> </view>
</template> </template>

View File

@@ -123,7 +123,7 @@ onBeforeUnmount(() => {
</text> </text>
</view> </view>
</view> </view>
<button hover-class="none" @click="stopMatch">取消匹配</button> <button hover-class="none" @click="$clickSound(stopMatch)">取消匹配</button>
</view> </view>
</template> </template>

View File

@@ -2,12 +2,25 @@ import { createSSRApp } from 'vue'
import { createPinia } from 'pinia' import { createPinia } from 'pinia'
import piniaPluginPersistedstate from 'pinia-plugin-persistedstate' import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
import App from './App.vue' import App from './App.vue'
import audioManager from './audioManager'
export function createApp() { export function createApp() {
const app = createSSRApp(App) const app = createSSRApp(App)
const pinia = createPinia() const pinia = createPinia()
pinia.use(piniaPluginPersistedstate) pinia.use(piniaPluginPersistedstate)
app.use(pinia) app.use(pinia)
/**
* 全局点击音效工具函数,用于在任意按钮/元素点击时自动播放音效。
* 用法:@click="$clickSound(handler)" 或 @click="$clickSound(() => doSomething())"
* @param {Function} handler - 原始点击回调函数(可选,点击时直接调用)
* @param {string} [soundKey='点击按钮'] - audioManager 中的音效 key
*/
app.config.globalProperties.$clickSound = (handler, soundKey = '点击按钮') => {
audioManager.play(soundKey);
if (typeof handler === 'function') handler();
};
return { return {
app app
} }

View File

@@ -443,7 +443,7 @@ onBeforeUnmount(() => {
<PlayerSeats v-if="room.battleType === 2" :total="room.count || 10" :players="players" <PlayerSeats v-if="room.battleType === 2" :total="room.count || 10" :players="players"
:removePlayer="removePlayer" :isOwner="owner.id === user.id" /> :removePlayer="removePlayer" :isOwner="owner.id === user.id" />
<view> <view>
<SButton :disabled="!canClick" :onClick="getReady"> <SButton :disabled="!canClick" :onClick="() => $clickSound(getReady)">
{{ {{
allReady.value allReady.value
? "即将进入对局..." ? "即将进入对局..."

View File

@@ -141,7 +141,7 @@ onLoad(async (options) => {
<image src="../static/founded-room.png" mode="widthFix" /> <image src="../static/founded-room.png" mode="widthFix" />
<view> <view>
<input placeholder="输入房间号" v-model="roomNumber" placeholder-style="color: #ccc" /> <input placeholder="输入房间号" v-model="roomNumber" placeholder-style="color: #ccc" />
<view @click="enterRoom(roomNumber)">进入房间</view> <view @click="$clickSound(() => enterRoom(roomNumber))">进入房间</view>
</view> </view>
</view> </view>
<view class="create-room"> <view class="create-room">
@@ -155,7 +155,7 @@ onLoad(async (options) => {
</view> </view>
</view> </view>
<view> <view>
<SButton width="80%" :rounded="30" :onClick="onCreateRoom"> <SButton width="80%" :rounded="30" :onClick="() => $clickSound(onCreateRoom)">
创建约战房 创建约战房
</SButton> </SButton>
</view> </view>

View File

@@ -178,7 +178,7 @@ onShareTimeline(() => {
v-else v-else
src="https://static.shelingxingqiu.com/attachment/2026-01-04/dffohwtk1gwh0xfa6h.png" src="https://static.shelingxingqiu.com/attachment/2026-01-04/dffohwtk1gwh0xfa6h.png"
mode="widthFix" mode="widthFix"
@click="() => toPage('/pages/my-device')" @click="$clickSound(() => toPage('/pages/my-device'))"
/> />
<block v-if="user.id"> <block v-if="user.id">
<text v-if="!device.deviceId">绑定我的智能弓</text> <text v-if="!device.deviceId">绑定我的智能弓</text>
@@ -196,10 +196,10 @@ onShareTimeline(() => {
</BubbleTip> </BubbleTip>
</view> </view>
<view class="play-card"> <view class="play-card">
<view @click="() => toPage('/pages/practise')"> <view @click="$clickSound(() => toPage('/pages/practise'))">
<image src="../static/my-practise.png" mode="widthFix"/> <image src="../static/my-practise.png" mode="widthFix"/>
</view> </view>
<view @click="() => toPage('/pages/friend-battle')"> <view @click="$clickSound(() => toPage('/pages/friend-battle'))">
<image src="../static/friend-battle.png" mode="widthFix"/> <image src="../static/friend-battle.png" mode="widthFix"/>
</view> </view>
</view> </view>
@@ -211,7 +211,7 @@ onShareTimeline(() => {
/> />
<button <button
class="into-btn" class="into-btn"
@click="() => toPage('/pages/ranking')" @click="$clickSound(() => toPage('/pages/ranking'))"
hover-class="none" hover-class="none"
></button> ></button>
<view class="ranking-players" @click="toRankListPage"> <view class="ranking-players" @click="toRankListPage">

View File

@@ -1,5 +1,5 @@
<script setup> <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 { onLoad, onShow, onHide } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue"; import Container from "@/components/Container.vue";
import BowTarget from "@/components/BowTarget.vue"; import BowTarget from "@/components/BowTarget.vue";
@@ -32,6 +32,8 @@ const halfTimeTip = ref(false);
const halfRest = ref(false); const halfRest = ref(false);
/** 控制设备离线提示弹窗的显示状态 */ /** 控制设备离线提示弹窗的显示状态 */
const showOfflineModal = 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) { async function onReceiveMessage(msg) {
if (Array.isArray(msg)) return; if (Array.isArray(msg)) return;
if (msg.type === MESSAGETYPESV2.BattleStart) { if (msg.type === MESSAGETYPESV2.BattleStart) {
@@ -127,7 +151,28 @@ async function onReceiveMessage(msg) {
halfRest.value = false; halfRest.value = false;
recoverData(msg); recoverData(msg);
} else if (msg.type === MESSAGETYPESV2.ShootResult) { } 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); 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) { } else if (msg.type === MESSAGETYPESV2.HalfRest) {
halfTimeTip.value = true; halfTimeTip.value = true;
halfRest.value = true; halfRest.value = true;

View File

@@ -130,7 +130,7 @@ onShow(() => {
<template> <template>
<Container title="弓箭绑定"> <Container title="弓箭绑定">
<view v-if="!device.deviceId" class="scan-code"> <view v-if="!device.deviceId" class="scan-code">
<button hover-class="none" @click="handleScan"> <button hover-class="none" @click="$clickSound(handleScan)">
<image src="../static/scan.png" mode="widthFix" /> <image src="../static/scan.png" mode="widthFix" />
</button> </button>
<button hover-class="none" @click="showTip = true"> <button hover-class="none" @click="showTip = true">
@@ -269,7 +269,7 @@ onShow(() => {
</view> </view>
</view> </view>
<view :style="{ marginTop: '240rpx' }"> <view :style="{ marginTop: '240rpx' }">
<SButton :onClick="unbindDevice" width="80vw" :rounded="40" <SButton :onClick="() => $clickSound(unbindDevice)" width="80vw" :rounded="40"
>解绑</SButton >解绑</SButton
> >
</view> </view>

View File

@@ -114,7 +114,7 @@ onMounted(async () => {
/> />
</view> </view>
<template #bottom> <template #bottom>
<SButton :rounded="50" :onClick="toEditPage">下一步</SButton> <SButton :rounded="50" :onClick="() => $clickSound(toEditPage)">下一步</SButton>
</template> </template>
</Container> </Container>
</template> </template>

View File

@@ -198,7 +198,7 @@ onLoad((options) => {
</ScreenHint2> </ScreenHint2>
</view> </view>
<template #bottom> <template #bottom>
<SButton :rounded="50" :onClick="onSubmit"> <SButton :rounded="50" :onClick="() => $clickSound(onSubmit)">
{{ currentGroup === groups ? "保存并查看分析" : "下一组" }} {{ currentGroup === groups ? "保存并查看分析" : "下一组" }}
</SButton> </SButton>
</template> </template>

View File

@@ -329,10 +329,10 @@ onShareTimeline(() => {
</view> </view>
</view> </view>
<view> <view>
<button hover-class="none" @click="toRecordPage" class="image-btn"> <button hover-class="none" @click="$clickSound(toRecordPage)" class="image-btn">
<image src="../static/record-btn.png" mode="widthFix" /> <image src="../static/record-btn.png" mode="widthFix" />
</button> </button>
<button hover-class="none" @click="startScoring" class="image-btn"> <button hover-class="none" @click="$clickSound(startScoring)" class="image-btn">
<image src="../static/start-scoring.png" mode="widthFix" /> <image src="../static/start-scoring.png" mode="widthFix" />
</button> </button>
</view> </view>

View File

@@ -1,5 +1,5 @@
<script setup> <script setup>
import { ref, onMounted, onBeforeUnmount } from "vue"; import { ref, onMounted, onBeforeUnmount, nextTick } from "vue";
import { onLoad } from "@dcloudio/uni-app"; import { onLoad } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue"; import Container from "@/components/Container.vue";
import ShootProgress from "@/components/ShootProgress.vue"; import ShootProgress from "@/components/ShootProgress.vue";
@@ -31,6 +31,8 @@ const { user } = storeToRefs(store);
const start = ref(false); const start = ref(false);
const scores = ref([]); const scores = ref([]);
const total = 12; const total = 12;
/** 当前练习中连续 X 环计数,用于触发 tententen 音效 */
const xRingStreak = ref(0);
const practiseResult = ref({}); const practiseResult = ref({});
const practiseId = ref(""); const practiseId = ref("");
const showGuide = ref(false); const showGuide = ref(false);
@@ -46,6 +48,7 @@ onLoad((options) => {
const onReady = async () => { const onReady = async () => {
await startPractiseAPI(); await startPractiseAPI();
scores.value = []; scores.value = [];
xRingStreak.value = 0; // 新一局开始,重置 X 环连续计数
start.value = true; start.value = true;
audioManager.play("练习开始"); audioManager.play("练习开始");
}; };
@@ -55,9 +58,33 @@ const onOver = async () => {
start.value = false; start.value = false;
}; };
/**
* 检测连续 X 环是否达到 3 箭,达到则播放 tententen 音效
* @param {boolean} isXRing - 本次射击是否为 X 环
*/
function checkAndPlayTententen(isXRing) {
if (isXRing) {
xRingStreak.value += 1;
// 连续 3 箭均为 X 环,在环数播报入队后追加 tententen避免播放顺序颠倒
if (xRingStreak.value >= 3) {
xRingStreak.value = 0;
nextTick(() => audioManager.play("tententen", false));
}
} else {
// 非 X 环则重置连续计数
xRingStreak.value = 0;
}
}
async function onReceiveMessage(msg) { async function onReceiveMessage(msg) {
if (msg.type === MESSAGETYPESV2.ShootResult) { if (msg.type === MESSAGETYPESV2.ShootResult) {
const prevLen = scores.value.length;
scores.value = msg.details; scores.value = msg.details;
// 有新箭时取最后一箭判断是否 X 环并检测连续计数
if (scores.value.length > prevLen) {
const latestArrow = scores.value[scores.value.length - 1];
checkAndPlayTententen(!!(latestArrow?.ringX && latestArrow?.ring));
}
} else if (msg.type === MESSAGETYPESV2.BattleEnd) { } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
// setTimeout(onOver, 1500); // setTimeout(onOver, 1500);
} }
@@ -74,6 +101,7 @@ async function onComplete() {
practiseResult.value = {}; practiseResult.value = {};
start.value = false; start.value = false;
scores.value = []; scores.value = [];
xRingStreak.value = 0; // 重新开始练习,重置 X 环连续计数
const result = await createPractiseAPI(total, 120); const result = await createPractiseAPI(total, 120);
if (result) practiseId.value = result.id; if (result) practiseId.value = result.id;
} }

View File

@@ -1,5 +1,5 @@
<script setup> <script setup>
import { ref, onMounted, onBeforeUnmount } from "vue"; import { ref, onMounted, onBeforeUnmount, nextTick } from "vue";
import Container from "@/components/Container.vue"; import Container from "@/components/Container.vue";
import ShootProgress from "@/components/ShootProgress.vue"; import ShootProgress from "@/components/ShootProgress.vue";
import BowTarget from "@/components/BowTarget.vue"; import BowTarget from "@/components/BowTarget.vue";
@@ -31,6 +31,8 @@ const { user } = storeToRefs(store);
const start = ref(false); const start = ref(false);
const scores = ref([]); const scores = ref([]);
const total = 36; const total = 36;
/** 当前练习中连续 X 环计数,用于触发 tententen 音效 */
const xRingStreak = ref(0);
const practiseResult = ref({}); const practiseResult = ref({});
const practiseId = ref(""); const practiseId = ref("");
const showGuide = ref(false); const showGuide = ref(false);
@@ -45,6 +47,7 @@ onLoad((options) => {
const onReady = async () => { const onReady = async () => {
await startPractiseAPI(); await startPractiseAPI();
scores.value = []; scores.value = [];
xRingStreak.value = 0; // 新一局开始,重置 X 环连续计数
start.value = true; start.value = true;
audioManager.play("练习开始"); audioManager.play("练习开始");
}; };
@@ -54,9 +57,33 @@ const onOver = async () => {
start.value = false; start.value = false;
}; };
/**
* 检测连续 X 环是否达到 3 箭,达到则播放 tententen 音效
* @param {boolean} isXRing - 本次射击是否为 X 环
*/
function checkAndPlayTententen(isXRing) {
if (isXRing) {
xRingStreak.value += 1;
// 连续 3 箭均为 X 环,在环数播报入队后追加 tententen避免播放顺序颠倒
if (xRingStreak.value >= 3) {
xRingStreak.value = 0;
nextTick(() => audioManager.play("tententen", false));
}
} else {
// 非 X 环则重置连续计数
xRingStreak.value = 0;
}
}
async function onReceiveMessage(msg) { async function onReceiveMessage(msg) {
if (msg.type === MESSAGETYPESV2.ShootResult) { if (msg.type === MESSAGETYPESV2.ShootResult) {
const prevLen = scores.value.length;
scores.value = msg.details; scores.value = msg.details;
// 有新箭时取最后一箭判断是否 X 环并检测连续计数
if (scores.value.length > prevLen) {
const latestArrow = scores.value[scores.value.length - 1];
checkAndPlayTententen(!!(latestArrow?.ringX && latestArrow?.ring));
}
} else if (msg.type === MESSAGETYPESV2.BattleEnd) { } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
setTimeout(onOver, 1500); setTimeout(onOver, 1500);
} }
@@ -89,6 +116,7 @@ async function onComplete() {
practiseResult.value = {}; practiseResult.value = {};
start.value = false; start.value = false;
scores.value = []; scores.value = [];
xRingStreak.value = 0; // 重新开始练习,重置 X 环连续计数
const result = await createPractiseAPI(total, 360); const result = await createPractiseAPI(total, 360);
if (result) practiseId.value = result.id; if (result) practiseId.value = result.id;
} }

View File

@@ -281,27 +281,27 @@ onShow(async () => {
<image <image
src="../static/rank/battle1v1.svg" src="../static/rank/battle1v1.svg"
mode="widthFix" mode="widthFix"
@click.stop="() => toMatchPage(1, 2)" @click.stop="$clickSound(() => toMatchPage(1, 2))"
/> />
<image <image
src="../static/rank/battle2v2.svg" src="../static/rank/battle2v2.svg"
mode="widthFix" mode="widthFix"
@click.stop="() => toMatchPage(2, 4)" @click.stop="$clickSound(() => toMatchPage(2, 4))"
/> />
<image <image
src="../static/rank/battle3v3.svg" src="../static/rank/battle3v3.svg"
mode="widthFix" mode="widthFix"
@click.stop="() => toMatchPage(3, 6)" @click.stop="$clickSound(() => toMatchPage(3, 6))"
/> />
<image <image
src="../static/rank/battle5.svg" src="../static/rank/battle5.svg"
mode="widthFix" mode="widthFix"
@click.stop="() => toMatchPage(4, 5)" @click.stop="$clickSound(() => toMatchPage(4, 5))"
/> />
<image <image
src="../static/rank/battle10.svg" src="../static/rank/battle10.svg"
mode="widthFix" mode="widthFix"
@click.stop="() => toMatchPage(5, 10)" @click.stop="$clickSound(() => toMatchPage(5, 10))"
/> />
</view> </view>
</view> </view>

View File

@@ -49,6 +49,8 @@ const battleWay = ref(0);
const lastToSomeoneShootKey = ref(""); const lastToSomeoneShootKey = ref("");
/** 控制设备离线提示弹窗的显示状态 */ /** 控制设备离线提示弹窗的显示状态 */
const showOfflineModal = ref(false); 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) { async function onReceiveMessage(msg) {
if (Array.isArray(msg)) return; if (Array.isArray(msg)) return;
if (msg.type === MESSAGETYPESV2.BattleStart) { if (msg.type === MESSAGETYPESV2.BattleStart) {
@@ -245,6 +268,9 @@ async function onReceiveMessage(msg) {
} else if (msg.type === MESSAGETYPESV2.ShootResult) { } else if (msg.type === MESSAGETYPESV2.ShootResult) {
showRoundTip.value = false; showRoundTip.value = false;
recoverData(msg, {arrowOnly: true}); recoverData(msg, {arrowOnly: true});
// 检测同一玩家三箭全 X 环,触发 tententen 音效
// currentShooterId 在 ToSomeoneShoot 时写入ShootResult 不会覆盖,可靠识别本次射手
checkAndPlayTententen(currentShooterId.value, !!(msg.shootData?.ringX && msg.shootData?.ring));
} else if (msg.type === MESSAGETYPESV2.NewRound) { } else if (msg.type === MESSAGETYPESV2.NewRound) {
// 在进入延迟前先捕获当前轮次,供 onNewRound 使用,防止 800ms 内 ToSomeoneShoot 提前更新 currentRound 造成 Tip 展示错轮 // 在进入延迟前先捕获当前轮次,供 onNewRound 使用,防止 800ms 内 ToSomeoneShoot 提前更新 currentRound 造成 Tip 展示错轮
const prevRound = currentRound.value; const prevRound = currentRound.value;
@@ -296,6 +322,8 @@ onBeforeUnmount(() => {
const refreshTimer = ref(null); const refreshTimer = ref(null);
onShow(async () => { onShow(async () => {
if (battleId.value) { if (battleId.value) {
// 延迟 300ms 等待网络恢复,避免小程序从后台切回时网络尚未就绪导致请求失败报错
await new Promise(resolve => setTimeout(resolve, 300));
const result = await getBattleAPI(battleId.value); const result = await getBattleAPI(battleId.value);
if (!result) return; if (!result) return;
if (result.status === 2) { if (result.status === 2) {