diff --git a/src/apis.js b/src/apis.js
index b94d5e7..7e105fd 100644
--- a/src/apis.js
+++ b/src/apis.js
@@ -506,3 +506,7 @@ export const laserAimAPI = async () => {
export const laserCloseAPI = async () => {
return request("POST", "/user/device/closeAim");
};
+
+export const getDeviceBatteryAPI = async () => {
+ return request("GET", "/user/device/battery");
+};
diff --git a/src/components/BattleFooter.vue b/src/components/BattleFooter.vue
index 3a83868..d31c577 100644
--- a/src/components/BattleFooter.vue
+++ b/src/components/BattleFooter.vue
@@ -15,10 +15,6 @@ defineProps({
type: Number,
default: 0,
},
- power: {
- type: Number,
- default: 0,
- },
goldenRound: {
type: Number,
default: 0,
@@ -36,7 +32,7 @@ defineProps({
transform: 'scale(0.8) translateX(10px)',
}"
>
-
+
diff --git a/src/components/BowPower.vue b/src/components/BowPower.vue
index c0361d3..19d59fa 100644
--- a/src/components/BowPower.vue
+++ b/src/components/BowPower.vue
@@ -1,9 +1,19 @@
diff --git a/src/components/BowTarget.vue b/src/components/BowTarget.vue
index 96a12f6..9ec73b3 100644
--- a/src/components/BowTarget.vue
+++ b/src/components/BowTarget.vue
@@ -21,10 +21,6 @@ const props = defineProps({
type: String,
default: "",
},
- power: {
- type: Number,
- default: 0,
- },
scores: {
type: Array,
default: () => [],
@@ -118,7 +114,7 @@ onMounted(() => {
"/" +
totalRound
}}
-
+
中场休息
diff --git a/src/components/TestDistance.vue b/src/components/TestDistance.vue
index 127dd0d..82a5611 100644
--- a/src/components/TestDistance.vue
+++ b/src/components/TestDistance.vue
@@ -22,7 +22,6 @@ const props = defineProps({
},
});
const arrow = ref({});
-const power = ref(0);
const distance = ref(0);
const debugInfo = ref("");
const showsimul = ref(false);
@@ -49,7 +48,6 @@ async function onReceiveMessage(messages = []) {
messages.forEach((msg) => {
if (msg.constructor === MESSAGETYPES.ShootSyncMeArrowID) {
arrow.value = msg.target;
- power.value = msg.target.battery;
distance.value = Number((msg.target.dst / 100).toFixed(2));
debugInfo.value = msg.target;
audioManager.play("距离合格");
@@ -120,7 +118,7 @@ onBeforeUnmount(() => {
-
+
diff --git a/src/pages/first-try.vue b/src/pages/first-try.vue
index 06466e0..c849487 100644
--- a/src/pages/first-try.vue
+++ b/src/pages/first-try.vue
@@ -33,7 +33,6 @@ const stepButtonTexts = [
const title = ref("新手试炼场");
const start = ref(false);
const practiseResult = ref({});
-const power = ref(0);
const btnDisabled = ref(false);
const practiseId = ref("");
const showGuide = ref(false);
@@ -66,11 +65,10 @@ async function onReceiveMessage(messages = []) {
if (scores.value.length < total) {
scores.value.push(msg.target);
}
- power.value = msg.target.battery;
- // if (step.value === 2 && msg.target.dst / 100 >= 5) {
- btnDisabled.value = false;
- showGuide.value = true;
- // }
+ if (step.value === 2 && msg.target.dst / 100 >= 5) {
+ btnDisabled.value = false;
+ showGuide.value = true;
+ }
}
if (msg.constructor === MESSAGETYPES.ShootSyncMePracticeID) {
if (practiseId.value && practiseId.value === msg.practice.id) {
@@ -230,7 +228,7 @@ const onClose = () => {
:style="{ marginBottom: step === 2 ? '40px' : '0' }"
>
-
+
{
/>
-
+
{
还有两场,坚持
就是胜利!💪
-
+
{
完成过半,胜利
在望!💪
-
+
{
@@ -347,7 +346,6 @@ onHide(() => {
:redPoints="redPoints"
:bluePoints="bluePoints"
:goldenRound="goldenRound"
- :power="power"
/>
{