diff --git a/src/components/BowTarget.vue b/src/components/BowTarget.vue
index fdfc48c..f3d07b9 100644
--- a/src/components/BowTarget.vue
+++ b/src/components/BowTarget.vue
@@ -25,10 +25,6 @@ const props = defineProps({
type: Number,
default: 0,
},
- tips: {
- type: String,
- default: "",
- },
scores: {
type: Array,
default: () => [],
@@ -183,7 +179,6 @@ const simulShoot = async () => {
- {{ tips }}
模拟射箭
@@ -263,13 +258,6 @@ const simulShoot = async () => {
border-radius: 50%;
border: 1px solid #fff;
}
-.container > text {
- width: 100%;
- color: #fed847;
- text-align: center;
- line-height: 40px;
- display: block;
-}
.simul {
position: absolute;
bottom: 20px;
diff --git a/src/components/ShootProgress.vue b/src/components/ShootProgress.vue
index cc0079e..6ea8372 100644
--- a/src/components/ShootProgress.vue
+++ b/src/components/ShootProgress.vue
@@ -56,11 +56,10 @@ watch(
(newVal, oldVal) => {
if (newVal === false) {
if (timer.value) clearInterval(timer.value);
- remain.value = props.total;
}
if (!oldVal && newVal === true) {
+ remain.value = props.total;
setTimeout(() => {
- remain.value = props.total;
timer.value = setInterval(() => {
if (remain.value > 0) {
remain.value--;
diff --git a/src/components/StartCountdown.vue b/src/components/StartCountdown.vue
index e3998a6..f3e3806 100644
--- a/src/components/StartCountdown.vue
+++ b/src/components/StartCountdown.vue
@@ -38,7 +38,7 @@ onUnmounted(() => {
-
+
3
2
1
diff --git a/src/components/TestDistance.vue b/src/components/TestDistance.vue
new file mode 100644
index 0000000..dd55b7f
--- /dev/null
+++ b/src/components/TestDistance.vue
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+
+ 请预先射几箭测试
+ 请确保射击距离只有5米
+
+
+
+
+
+
+ 当前距离{{ distance }}米
+ 已达到距离要求
+ 请调整站位
+
+ {{ debugInfo }}
+
+
+
+ 模拟射箭
+
+
+
+
+
+
diff --git a/src/pages/battle-room.vue b/src/pages/battle-room.vue
index be6ed8f..8fb285e 100644
--- a/src/pages/battle-room.vue
+++ b/src/pages/battle-room.vue
@@ -15,8 +15,8 @@ import PlayersRow from "@/components/PlayersRow.vue";
import SModal from "@/components/SModal.vue";
import ScreenHint from "@/components/ScreenHint.vue";
import RoundEndTip from "@/components/RoundEndTip.vue";
+import TestDistance from "@/components/TestDistance.vue";
import { getRoomAPI, destroyRoomAPI, exitRoomAPI, startRoomAPI } from "@/apis";
-import { checkConnection } from "@/util";
import { MESSAGETYPES, roundsName, getMessageTypeName } from "@/constants";
import useStore from "@/store";
import { storeToRefs } from "pinia";
@@ -127,10 +127,6 @@ async function onReceiveMessage(messages = []) {
) {
console.log("收到消息:", getMessageTypeName(msg.constructor), msg);
}
- if (!start.value && msg.constructor === MESSAGETYPES.ShootSyncMeArrowID) {
- scores.value.push(msg.target);
- power.value = msg.target.battery;
- }
if (msg.constructor === MESSAGETYPES.WaitForAllReady) {
// 这里会掉多次;
timerSeq.value += 1;
@@ -288,7 +284,6 @@ const exitRoom = async () => {
};
onMounted(() => {
- checkConnection();
uni.$on("socket-inbox", onReceiveMessage);
});
@@ -358,25 +353,7 @@ onUnmounted(() => {
:redTeam="redTeam"
:players="players"
/>
-
-
-
- 请预先射几箭测试
- 请确保射击距离只有5米
-
-
-
-
-
+
{
@@ -47,9 +48,9 @@ async function onReceiveMessage(messages = []) {
scores.value.push(msg.target);
power.value = msg.target.battery;
// if (step.value === 2 && msg.target.dst / 100 > 5) {
- if (step.value === 2 && msg.target.dst > 5) {
- btnDisabled.value = false;
- }
+ // if (step.value === 2 && msg.target.dst > 5) {
+ // btnDisabled.value = false;
+ // }
}
if (msg.constructor === MESSAGETYPES.ShootSyncMePracticeID) {
if (practiseId.value && practiseId.value === msg.practice.id) {
@@ -72,7 +73,6 @@ async function onReceiveMessage(messages = []) {
}
onMounted(() => {
- checkConnection();
uni.$on("socket-inbox", onReceiveMessage);
});
@@ -85,7 +85,7 @@ const nextStep = async () => {
step.value = 1;
title.value = "凹造型";
} else if (step.value === 1) {
- btnDisabled.value = true;
+ // btnDisabled.value = true;
step.value = 2;
title.value = "感知距离";
} else if (step.value === 2) {
@@ -201,29 +201,20 @@ const onClose = () => {
:total="100"
:start="start"
/>
+
- 大人,请射箭
-
+
{
- {{
+ {{
stepButtonTexts[step]
}}
diff --git a/src/pages/melee-match.vue b/src/pages/melee-match.vue
index 2ae4a8b..1178f1c 100644
--- a/src/pages/melee-match.vue
+++ b/src/pages/melee-match.vue
@@ -13,6 +13,7 @@ import Avatar from "@/components/Avatar.vue";
import ScreenHint from "@/components/ScreenHint.vue";
import Matching from "@/components/Matching.vue";
import SModal from "@/components/SModal.vue";
+import TestDistance from "@/components/TestDistance.vue";
import { matchGameAPI, readyGameAPI } from "@/apis";
import { MESSAGETYPES, getMessageTypeName } from "@/constants";
import useStore from "@/store";
@@ -79,10 +80,6 @@ async function onReceiveMessage(messages = []) {
});
};
}
- if (!start.value && msg.constructor === MESSAGETYPES.ShootSyncMeArrowID) {
- scores.value.push(msg.target);
- power.value = msg.target.battery;
- }
if (msg.id !== battleId.value) return;
if (msg.constructor === MESSAGETYPES.MeleeAllReady) {
start.value = true;
@@ -140,16 +137,8 @@ onUnmounted(() => {
>
-
-
-
-
- 请预先射几箭测试
- 请确保射击距离只有5米
-
-
-
-
+
+
{
{
- checkConnection();
uni.$on("socket-inbox", onReceiveMessage);
});
@@ -82,44 +82,42 @@ onUnmounted(() => {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
准备好了,直接开始
diff --git a/src/pages/practise-two.vue b/src/pages/practise-two.vue
index f2247b6..a3547b7 100644
--- a/src/pages/practise-two.vue
+++ b/src/pages/practise-two.vue
@@ -8,8 +8,9 @@ import ScoreResult from "@/components/ScoreResult.vue";
import SButton from "@/components/SButton.vue";
import Avatar from "@/components/Avatar.vue";
import BowPower from "@/components/BowPower.vue";
+import TestDistance from "@/components/TestDistance.vue";
import { createPractiseAPI, getHomeData } from "@/apis";
-import { generateCanvasImage, checkConnection } from "@/util";
+import { generateCanvasImage } from "@/util";
import { MESSAGETYPES } from "@/constants";
import useStore from "@/store";
import { storeToRefs } from "pinia";
@@ -74,7 +75,6 @@ async function onComplete() {
}
onMounted(() => {
- checkConnection();
uni.$on("socket-inbox", onReceiveMessage);
});
@@ -86,47 +86,43 @@ onUnmounted(() => {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
准备好了,直接开始
diff --git a/src/pages/team-match.vue b/src/pages/team-match.vue
index 6547a7d..98fa972 100644
--- a/src/pages/team-match.vue
+++ b/src/pages/team-match.vue
@@ -14,6 +14,7 @@ import SButton from "@/components/SButton.vue";
import Matching from "@/components/Matching.vue";
import SModal from "@/components/SModal.vue";
import RoundEndTip from "@/components/RoundEndTip.vue";
+import TestDistance from "@/components/TestDistance.vue";
import { matchGameAPI, readyGameAPI } from "@/apis";
import { MESSAGETYPES, roundsName, getMessageTypeName } from "@/constants";
import useStore from "@/store";
@@ -71,10 +72,6 @@ async function onReceiveMessage(messages = []) {
) {
console.log("收到消息:", getMessageTypeName(msg.constructor), msg);
}
- if (!start.value && msg.constructor === MESSAGETYPES.ShootSyncMeArrowID) {
- scores.value.push(msg.target);
- power.value = msg.target.battery;
- }
if (msg.constructor === MESSAGETYPES.WaitForAllReady) {
// 这里会掉多次;
onComplete.value = () => {
@@ -167,15 +164,7 @@ onUnmounted(() => {
:redTeam="redTeam"
:blueTeam="blueTeam"
/>
-
-
-
- 请预先射几箭测试
- 请确保射击距离只有5米
-
-
-
-
+
{
:redTeam="redTeam"
/>
{
:totalRound="totalRounds"
:scores="scores"
:blueScores="blueScores"
- :tips="
- !start && scores.length > 0
- ? `本次射程${scores[scores.length - 1].dst / 100}米,${
- scores[scores.length - 1].dst / 100 >= 5 ? '已' : '未'
- }达到距离要求`
- : ''
- "
/>