Merge branch 'new-race-mode' into test

This commit is contained in:
2026-05-12 17:36:57 +08:00
2 changed files with 11 additions and 2 deletions

View File

@@ -41,6 +41,17 @@ const playersSorted = ref([]);
const playersScores = ref([]); const playersScores = ref([]);
const halfTimeTip = ref(false); const halfTimeTip = ref(false);
const halfRest = ref(false); const halfRest = ref(false);
/** 控制设备离线提示弹窗的显示状态 */
const showOfflineModal = ref(false);
/**
* 监听设备在线状态,大乱斗比赛进行中设备离线时弹窗提示用户
*/
watch(online, (newVal, oldVal) => {
if (!newVal && oldVal && start.value === true) {
showOfflineModal.value = true;
}
});
function recoverData(battleInfo, { force = false } = {}) { function recoverData(battleInfo, { force = false } = {}) {
if (!battleInfo) return; if (!battleInfo) return;
@@ -213,7 +224,6 @@ onShow(async () => {
<ScreenHint <ScreenHint
:show="halfTimeTip" :show="halfTimeTip"
mode="small" mode="small"
:onClose="() => (halfTimeTip = false)"
> >
<view class="half-time-tip"> <view class="half-time-tip">
<text>上半场结束休息一下吧:</text> <text>上半场结束休息一下吧:</text>

View File

@@ -311,7 +311,6 @@ onShow(async () => {
/> />
<ScreenHint <ScreenHint
:show="showRoundTip" :show="showRoundTip"
:onClose="() => (showRoundTip = false)"
:mode="isFinalShoot ? 'tall' : 'normal'" :mode="isFinalShoot ? 'tall' : 'normal'"
> >
<RoundEndTip <RoundEndTip