laoma/shoot-miniprograms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

细节完善

Browse Source
This commit is contained in:
kron
2025-07-25 16:47:07 +08:00
parent 10af25c254
commit caef627ce4
3 changed files with 63 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/RoundEndTip.vue
View File

@@ -77,7 +77,7 @@ onUnmounted(() => {
v-if="bluePoint === 0 && redPoint === 0" v-if="bluePoint === 0 && redPoint === 0"
:style="{ marginTop: '20px' }" :style="{ marginTop: '20px' }"
> >
连续3个来回无人射箭，比赛被取消 连续3个来回双方均无人射箭，比赛取消。
</text> </text>
<text v-if="bluePoint !== 0 && bluePoint === redPoint"> <text v-if="bluePoint !== 0 && bluePoint === redPoint">
红队、蓝队各得<text :style="{ color: '#fed847', margin: '0 5px' }">{{ 红队、蓝队各得<text :style="{ color: '#fed847', margin: '0 5px' }">{{

2
src/components/TestDistance.vue
View File

@@ -82,7 +82,7 @@ onUnmounted(() => {
<text>大人，请射箭</text> <text>大人，请射箭</text>
</block> </block>
</view> </view>
<view class="debug-text">{{ debugInfo }}</view> <!-- <view class="debug-text">{{ debugInfo }}</view> -->
<view> <view>
<view class="simul" @click="simulShoot" :style="{ color: '#fff' }"> <view class="simul" @click="simulShoot" :style="{ color: '#fff' }">
模拟射箭 模拟射箭

30
src/pages/battle-room.vue
View File

@@ -218,15 +218,9 @@ function recoverData(battleInfo) {
} }
} }
onLoad(async (options) => { async function refreshRoomData() {
if (options.battleId) { if (!roomNumber.value) return;
const battleInfo = uni.getStorageSync("current-battle"); const result = await getRoomAPI(roomNumber.value);
if (battleInfo) recoverData(battleInfo);
setTimeout(getCurrentGameAPI, 2000);
}
if (options.roomNumber) {
roomNumber.value = options.roomNumber;
const result = await getRoomAPI(options.roomNumber);
room.value = result; room.value = result;
battleType.value = result.battleType; battleType.value = result.battleType;
result.members.some((m) => { result.members.some((m) => {
@@ -273,8 +267,7 @@ onLoad(async (options) => {
if (ownerIndex !== index) players.value.push(m.userInfo); if (ownerIndex !== index) players.value.push(m.userInfo);
}); });
} }
} }
});
const startGame = async () => { const startGame = async () => {
const result = await startRoomAPI(room.value.number); const result = await startRoomAPI(room.value.number);
@@ -531,6 +524,17 @@ const onBack = () => {
} }
}; };
onLoad(async (options) => {
if (options.battleId) {
const battleInfo = uni.getStorageSync("current-battle");
if (battleInfo) recoverData(battleInfo);
setTimeout(getCurrentGameAPI, 2000);
} else if (options.roomNumber) {
roomNumber.value = options.roomNumber;
refreshRoomData();
}
});
onMounted(() => { onMounted(() => {
uni.setKeepScreenOn({ uni.setKeepScreenOn({
keepScreenOn: true, keepScreenOn: true,
@@ -562,6 +566,8 @@ onShow(async () => {
} }
}; };
refreshTimer.value = setInterval(refreshData, 2000); refreshTimer.value = setInterval(refreshData, 2000);
} else {
refreshRoomData();
} }
}); });
onHide(() => { onHide(() => {
@@ -572,7 +578,7 @@ onHide(() => {
<template> <template>
<Container <Container
:title="`好友约战 - ${roomNumber}`" :title="`好友约战 ${battleId ? '' : '- ' + roomNumber}`"
:onBack="onBack" :onBack="onBack"
:bgType="battleId ? 1 : 0" :bgType="battleId ? 1 : 0"
> >