13 Commits
13 changed files with 138 additions and 196 deletions
+4 -8
View File
@@ -4,6 +4,10 @@
"libVersion": "3.7.7", "libVersion": "3.7.7",
"packOptions": { "packOptions": {
"ignore": [ "ignore": [
{
"type": "folder",
"value": "static/coin"
},
{ {
"type": "file", "type": "file",
"value": "static/common/dialog-light.png" "value": "static/common/dialog-light.png"
@@ -243,14 +247,6 @@
{ {
"type": "folder", "type": "folder",
"value": "static/training-difficulty-design" "value": "static/training-difficulty-design"
},
{
"type": "folder",
"value": "static/coin"
},
{
"type": "folder",
"value": "static/home-device"
} }
], ],
"include": [] "include": []
-8
View File
@@ -18,10 +18,6 @@ const TRAINING_START_AUDIO_KEY_MAP = Object.freeze({
export const getTrainingStartAudioKey = (trainingType, fallback = "") => export const getTrainingStartAudioKey = (trainingType, fallback = "") =>
TRAINING_START_AUDIO_KEY_MAP[trainingType] || fallback; TRAINING_START_AUDIO_KEY_MAP[trainingType] || fallback;
// 与服务端通关判定保持一致,proto3 省略的 false 同样按失败处理。
export const getTrainingEndAudioKey = (completed) =>
completed === true ? "通关成功" : "通关失败";
export const getPrecisionShotAudioKeys = (shootData, directionText = "") => { export const getPrecisionShotAudioKeys = (shootData, directionText = "") => {
if (!shootData || typeof shootData !== "object") return []; if (!shootData || typeof shootData !== "object") return [];
const ring = Number(shootData.ring); const ring = Number(shootData.ring);
@@ -205,10 +201,6 @@ export const audioFils = {
"https://static.shelingxingqiu.com/shootmini/static/audio0820/%E6%9C%AA%E5%91%BD%E4%B8%AD.MP3", "https://static.shelingxingqiu.com/shootmini/static/audio0820/%E6%9C%AA%E5%91%BD%E4%B8%AD.MP3",
练习结束: 练习结束:
"https://static.shelingxingqiu.com/shootmini/static/audio/%E7%BB%83%E4%B9%A0%E7%BB%93%E6%9D%9F.mp3", "https://static.shelingxingqiu.com/shootmini/static/audio/%E7%BB%83%E4%B9%A0%E7%BB%93%E6%9D%9F.mp3",
通关成功:
"https://static.shelingxingqiu.com/shootaudio/%E9%80%9A%E5%85%B3%E6%88%90%E5%8A%9F.mp3",
通关失败:
"https://static.shelingxingqiu.com/shootaudio/%E9%80%9A%E5%85%B3%E5%A4%B1%E8%B4%A5.mp3",
射箭声音: 射箭声音:
"https://static.shelingxingqiu.com/shootaudio/v4/v4/%E7%AE%AD%E9%A3%9E%E8%A1%8C.mp3", "https://static.shelingxingqiu.com/shootaudio/v4/v4/%E7%AE%AD%E9%A3%9E%E8%A1%8C.mp3",
命中: 命中:
+1 -3
View File
@@ -164,8 +164,6 @@ const defaultHighlightStyle = {
color: "rgba(255, 228, 0, 0.6)", color: "rgba(255, 228, 0, 0.6)",
strokeColor: "rgba(254, 216, 71, 0.82)", strokeColor: "rgba(254, 216, 71, 0.82)",
lineWidthRatio: 0.003, lineWidthRatio: 0.003,
// 在最小线宽计算后应用倍数,确保不同靶面尺寸下按比例加粗。
lineWidthScale: 1,
}; };
// 合并默认靶纸样式和外部传入样式,ringColors 单独深合并。 // 合并默认靶纸样式和外部传入样式,ringColors 单独深合并。
@@ -321,7 +319,7 @@ const drawSectorHighlight = (
(angles.endAngle - angles.startAngle) * safeRevealProgress, (angles.endAngle - angles.startAngle) * safeRevealProgress,
style.color, style.color,
style.strokeColor, style.strokeColor,
Math.max(1, targetRadius * style.lineWidthRatio) * style.lineWidthScale Math.max(1, targetRadius * style.lineWidthRatio)
); );
}); });
}; };
+4 -8
View File
@@ -55,6 +55,10 @@
"appid" : "wxa8f5989dcd45cc23", "appid" : "wxa8f5989dcd45cc23",
"packOptions" : { "packOptions" : {
"ignore" : [ "ignore" : [
{
"type" : "folder",
"value" : "static/coin"
},
{ {
"type" : "file", "type" : "file",
"value" : "static/common/dialog-light.png" "value" : "static/common/dialog-light.png"
@@ -294,14 +298,6 @@
{ {
"type" : "folder", "type" : "folder",
"value" : "static/training-difficulty-design" "value" : "static/training-difficulty-design"
},
{
"type" : "folder",
"value" : "static/coin"
},
{
"type" : "folder",
"value" : "static/home-device"
} }
] ]
}, },
-5
View File
@@ -18,7 +18,6 @@ import {
getPrecisionShotAudioKeys, getPrecisionShotAudioKeys,
getRhythmShotAudioKeys, getRhythmShotAudioKeys,
getStabilityShotAudioKeys, getStabilityShotAudioKeys,
getTrainingEndAudioKey,
getTrainingStartAudioKey, getTrainingStartAudioKey,
STABILITY_ENERGY_50_AUDIO_KEY, STABILITY_ENERGY_50_AUDIO_KEY,
STABILITY_ENERGY_70_AUDIO_KEY, STABILITY_ENERGY_70_AUDIO_KEY,
@@ -604,10 +603,6 @@ function getAckAudioKeys(message, businessMessage) {
if (businessMessage?.type === MESSAGETYPESV2.HalfRest) return ["中场休息"]; if (businessMessage?.type === MESSAGETYPESV2.HalfRest) return ["中场休息"];
return ["比赛结束"]; return ["比赛结束"];
case ServerMessageType.SERVER_MSG_PRACTICE_END: case ServerMessageType.SERVER_MSG_PRACTICE_END:
// 个人训练的 ACK 等待实际播放的通关语音,其他练习保留原有配置。
if (currentContext?.practiceEndAudioKey === "练习结束") {
return [getTrainingEndAudioKey(businessMessage?.completed)];
}
return [currentContext?.practiceEndAudioKey || "比赛结束"]; return [currentContext?.practiceEndAudioKey || "比赛结束"];
case ServerMessageType.SERVER_MSG_CHECK: case ServerMessageType.SERVER_MSG_CHECK:
return getTestDistanceAudioKeys(businessMessage?.shootData); return getTestDistanceAudioKeys(businessMessage?.shootData);
-15
View File
@@ -21,9 +21,6 @@
{ {
"path": "pages/audio-test" "path": "pages/audio-test"
}, },
{
"path": "pages/calibration"
},
{ {
"path": "pages/about-us" "path": "pages/about-us"
}, },
@@ -60,12 +57,6 @@
{ {
"path": "pages/match-page" "path": "pages/match-page"
}, },
{
"path": "pages/my-device"
},
{
"path": "pages/device-intro"
},
{ {
"path": "pages/user" "path": "pages/user"
}, },
@@ -107,12 +98,6 @@
}, },
{ {
"path": "pages/mine-bow-data" "path": "pages/mine-bow-data"
},
{
"path": "pages/ota-wifi",
"style": {
"navigationStyle": "custom"
}
} }
], ],
"globalStyle": { "globalStyle": {
+5 -5
View File
@@ -447,12 +447,12 @@ onShow(async () => {
<text class="highlight-text">射灵智能弓箭</text> <text class="highlight-text">射灵智能弓箭</text>
<text>设备上的二维码</text> <text>设备上的二维码</text>
</view> </view>
<!-- <view class="benefit-copy"> <view class="benefit-copy">
<text>新设备首次绑定账号可获赠</text> <text>新设备首次绑定账号可获赠</text>
<text class="highlight-text">6个月射灵会员礼包</text> <text class="highlight-text">6个月射灵会员礼包</text>
<text>,</text> <text>,</text>
<text>该礼包仅可使用一次,请确保当前登录账号为您本人账号。</text> <text>该礼包仅可使用一次,请确保当前登录账号为您本人账号。</text>
</view> --> </view>
<button class="help-link" hover-class="none" @click="showTip = true"> <button class="help-link" hover-class="none" @click="showTip = true">
<text>没找到二维码或遇到问题&gt;</text> <text>没找到二维码或遇到问题&gt;</text>
</button> </button>
@@ -866,7 +866,7 @@ onShow(async () => {
} }
.help-link { .help-link {
margin-top: 36rpx; margin-top: 72rpx;
color: #ffd947; color: #ffd947;
font-size: 26rpx; font-size: 26rpx;
line-height: 36rpx; line-height: 36rpx;
@@ -874,8 +874,8 @@ onShow(async () => {
.product-link { .product-link {
position: fixed; position: fixed;
bottom: 208rpx; bottom: 104rpx;
/* bottom: calc(env(safe-area-inset-bottom) + 104rpx); */ bottom: calc(env(safe-area-inset-bottom) + 104rpx);
left: 0; left: 0;
z-index: 2; z-index: 2;
width: 100%; width: 100%;
+1 -20
View File
@@ -39,7 +39,6 @@ const connectMode = ref("secure"); // secure | open | manual
const connectError = ref(""); const connectError = ref("");
const connectStatusText = ref(""); const connectStatusText = ref("");
const isSubmittingWifi = ref(false); const isSubmittingWifi = ref(false);
const wifiSuccessVisible = ref(false);
const keyboardHeight = ref(0); const keyboardHeight = ref(0);
// 控制密码输入框是否显示明文 // 控制密码输入框是否显示明文
const showPassword = ref(false); const showPassword = ref(false);
@@ -365,13 +364,10 @@ const submitDeviceWifiConfig = async ({ ssid, password }) => {
secure: connectMode.value === "secure" || !!password, secure: connectMode.value === "secure" || !!password,
}; };
connectError.value = ""; connectError.value = "";
currentState.value = STATES.CONNECTED;
void refreshConnectedWifiName(); void refreshConnectedWifiName();
if (fromFirmwareUpdate.value) { if (fromFirmwareUpdate.value) {
currentState.value = STATES.CONNECTED;
openFirmwareCountdown(); openFirmwareCountdown();
} else {
// 保留配网输入界面,避免成功提示出现前先露出 WiFi 列表。
wifiSuccessVisible.value = true;
} }
} catch (err) { } catch (err) {
if (requestId === wifiConnectRequestId) { if (requestId === wifiConnectRequestId) {
@@ -386,13 +382,6 @@ const submitDeviceWifiConfig = async ({ ssid, password }) => {
} }
}; };
// 普通配网成功后,确认并收起输入界面,停留在当前 WiFi 页面。
const confirmWifiSuccess = () => {
if (!wifiSuccessVisible.value) return;
wifiSuccessVisible.value = false;
currentState.value = STATES.CONNECTED;
};
// 校验用户输入并提交 WiFi 配置,不再把手机连接结果当作设备连接成功。 // 校验用户输入并提交 WiFi 配置,不再把手机连接结果当作设备连接成功。
const joinNetwork = () => { const joinNetwork = () => {
if (joinDisabled.value) return; if (joinDisabled.value) return;
@@ -766,14 +755,6 @@ onUnmounted(() => {
</view> </view>
</view> </view>
<ModalDialog
:show="wifiSuccessVisible"
content="WIFI连接成功"
confirmText="确定"
:showCancel="false"
:onConfirm="confirmWifiSuccess"
></ModalDialog>
<ModalDialog <ModalDialog
:show="countdownVisible" :show="countdownVisible"
title="WiFi连接成功" title="WiFi连接成功"
@@ -546,7 +546,6 @@ onBeforeUnmount(() => {
:showCrosshair="false" :showCrosshair="false"
:showRingLabels="false" :showRingLabels="false"
:highlightOnly="true" :highlightOnly="true"
:highlightStyle="{ strokeColor: '#00fffc', lineWidthScale: 3 }"
:sectorCount="sectorCount" :sectorCount="sectorCount"
:activeSector="activeSector" :activeSector="activeSector"
:activeRings="activeRings" :activeRings="activeRings"
@@ -8,7 +8,6 @@ import {
nextTick, nextTick,
} from "vue"; } from "vue";
import audioManager, { import audioManager, {
getTrainingEndAudioKey,
getTrainingStartAudioKey, getTrainingStartAudioKey,
RHYTHM_SHOOT_WINDOW_AUDIO_KEY, RHYTHM_SHOOT_WINDOW_AUDIO_KEY,
} from "@/audioManager"; } from "@/audioManager";
@@ -112,8 +111,6 @@ const props = defineProps({
}, },
}); });
const emit = defineEmits(["rhythm-round-complete"]);
const trainingTitleIconMap = Object.freeze({ const trainingTitleIconMap = Object.freeze({
base: base:
"https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/text-icon-jcxl.png", "https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/text-icon-jcxl.png",
@@ -146,7 +143,6 @@ let rhythmCountdownTimer = null;
let rhythmTransitionTimer = null; let rhythmTransitionTimer = null;
let rhythmServerClockOffsetMs = 0; let rhythmServerClockOffsetMs = 0;
let rhythmSyncGeneration = 0; let rhythmSyncGeneration = 0;
let rhythmRoundCompletionTimer = null;
const isRhythmTraining = computed(() => props.trainingType === "rhythm"); const isRhythmTraining = computed(() => props.trainingType === "rhythm");
const isStabilityTraining = computed( const isStabilityTraining = computed(
@@ -310,30 +306,6 @@ const getRhythmRoundRemainingMs = () => {
); );
}; };
const clearRhythmRoundCompletionTimer = () => {
if (rhythmRoundCompletionTimer !== null) {
clearTimeout(rhythmRoundCompletionTimer);
rhythmRoundCompletionTimer = null;
}
};
// 与当前显示的倒计时一起计时;消息校准不重建此任务,避免同一轮重复计数。
const scheduleRhythmRoundCompletion = (remainingMs) => {
if (
rhythmRoundCompletionTimer !== null ||
!props.start ||
!isRhythmTraining.value ||
remainingMs <= 0
) return;
rhythmRoundCompletionTimer = setTimeout(() => {
rhythmRoundCompletionTimer = null;
if (!props.start || !isRhythmTraining.value) return;
emit("rhythm-round-complete");
scheduleRhythmRoundCompletion(rhythmRoundDurationMs.value);
}, remainingMs);
};
const updateRhythmShootWindow = (isInWindow) => { const updateRhythmShootWindow = (isInWindow) => {
const nextIsInWindow = Boolean(isInWindow); const nextIsInWindow = Boolean(isInWindow);
const enteredShootWindow = const enteredShootWindow =
@@ -392,8 +364,7 @@ const syncRhythmCountdown = async () => {
const generation = ++rhythmSyncGeneration; const generation = ++rhythmSyncGeneration;
clearRhythmTimers(); clearRhythmTimers();
if (!isRhythmTraining.value || !props.start) { if (!isRhythmTraining.value) {
clearRhythmRoundCompletionTimer();
rhythmTransitionStyle.value = "none"; rhythmTransitionStyle.value = "none";
rhythmRemainingMs.value = 0; rhythmRemainingMs.value = 0;
rhythmRemainingSeconds.value = 0; rhythmRemainingSeconds.value = 0;
@@ -411,7 +382,6 @@ const syncRhythmCountdown = async () => {
!validRhythmShootTime.value || !validRhythmShootTime.value ||
!normalizeTimestamp(props.shootWindowStart) !normalizeTimestamp(props.shootWindowStart)
) { ) {
clearRhythmRoundCompletionTimer();
rhythmTransitionStyle.value = "none"; rhythmTransitionStyle.value = "none";
rhythmRemainingMs.value = 0; rhythmRemainingMs.value = 0;
rhythmRemainingSeconds.value = 0; rhythmRemainingSeconds.value = 0;
@@ -421,7 +391,6 @@ const syncRhythmCountdown = async () => {
rhythmTransitionStyle.value = "none"; rhythmTransitionStyle.value = "none";
rhythmRemainingMs.value = getRhythmRoundRemainingMs(); rhythmRemainingMs.value = getRhythmRoundRemainingMs();
scheduleRhythmRoundCompletion(rhythmRemainingMs.value);
rhythmRemainingSeconds.value = Math.ceil(rhythmRemainingMs.value / 1000); rhythmRemainingSeconds.value = Math.ceil(rhythmRemainingMs.value / 1000);
updateRhythmShootWindow( updateRhythmShootWindow(
rhythmRemainingMs.value > 0 && rhythmRemainingMs.value > 0 &&
@@ -493,7 +462,6 @@ watch(
watch( watch(
() => [ () => [
props.start,
props.trainingType, props.trainingType,
props.roundTime, props.roundTime,
props.shootTime, props.shootTime,
@@ -525,7 +493,7 @@ async function onReceiveMessage(msg) {
audioManager.play("比赛开始"); audioManager.play("比赛开始");
} }
} else if (msg.type === MESSAGETYPESV2.BattleEnd) { } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
audioManager.play(getTrainingEndAudioKey(msg.completed), false); audioManager.play("练习结束", false);
} else if (msg.type === MESSAGETYPESV2.ShootResult) { } else if (msg.type === MESSAGETYPESV2.ShootResult) {
// 精准和节奏训练由页面统一处理专属结果语音,其他训练保持原播放链路。 // 精准和节奏训练由页面统一处理专属结果语音,其他训练保持原播放链路。
if (props.externalShootResultAudio) return; if (props.externalShootResultAudio) return;
@@ -582,7 +550,6 @@ onBeforeUnmount(() => {
clearTimer(); clearTimer();
rhythmSyncGeneration += 1; rhythmSyncGeneration += 1;
clearRhythmTimers(); clearRhythmTimers();
clearRhythmRoundCompletionTimer();
}); });
</script> </script>
+30 -23
View File
@@ -111,50 +111,57 @@ const createDifficultySummary = (item = {}) => {
const hitReq = toNumber(item.hit_req); const hitReq = toNumber(item.hit_req);
const totalReq = toNumber(item.total_req); const totalReq = toNumber(item.total_req);
const rhythmRequiredArrows = toNumber(item.total_req, arrows) || arrows; const rhythmRequiredArrows = toNumber(item.total_req, arrows) || arrows;
const timeParts = timeLimit > 0 const timeLine = {
? [{ text: `${timeLimit}`, highlight: true }, { text: "秒内," }] parts: timeLimit > 0
: [{ text: "不限时," }]; ? [{ text: "限时" }, { text: `${timeLimit}秒`, highlight: true }]
: [{ text: "不限时" }],
};
const summaryMap = { const summaryMap = {
base: [ base: [
{ parts: [ { parts: [
...timeParts, { text: "需有" }, { text: `${arrows}箭`, highlight: true },
{ text: "命中" }, { text: `${arrows}`, highlight: true }, { text: "命中" }, { text: `≥${hitReq}环`, highlight: true },
{ text: "支" }, { text: `≥${hitReq}`, highlight: true },
{ text: "环的箭" },
] }, ] },
timeLine,
], ],
endurance: [ endurance: [
{ parts: [ { parts: [
...timeParts, { text: "需射箭数" }, { text: `≥${arrows}箭`, highlight: true },
{ text: "共射出" }, { text: `≥${arrows}`, highlight: true }, { text: ",累计环数" }, { text: `≥${totalReq}环`, highlight: true },
{ text: "支箭,且总环数" }, { text: `≥${totalReq}`, highlight: true },
{ text: "环" },
] }, ] },
timeLine,
], ],
precision: [ precision: [
{ parts: [ { parts: [
...timeParts, { text: "需有" }, { text: `${arrows}箭`, highlight: true },
{ text: "命中" }, { text: `${arrows}`, highlight: true }, { text: "命中高亮区域" },
{ text: "箭高亮区域" },
] }, ] },
timeLine,
], ],
rhythm: [ rhythm: [
{ parts: [ { parts: [
{ text: `${arrows}`, highlight: true }, { text: "跟随节拍撒放,共" }, { text: `${arrows}箭`, highlight: true },
{ text: "个节奏内,随节奏射箭,命中" }, { text: "需" }, { text: `${rhythmRequiredArrows}箭`, highlight: true },
{ text: `${rhythmRequiredArrows}`, highlight: true }, ] },
{ text: "箭成绩" }, { text: `≥${hitReq}`, highlight: true }, { parts: [
{ text: "环且踩中节拍区间" }, { text: "命中" }, { text: `≥${hitReq}环`, highlight: true },
{ text: "且踏中节拍区间" },
] }, ] },
], ],
stability: [ stability: [
{ {
parts: [ parts: [
...timeParts, { text: "命中" },
{ text: "每射一箭" }, { text: `≥${hitReq}环`, highlight: true },
{ text: `≥${hitReq}`, highlight: true }, { text: "可为能量槽充能" },
{ text: "环可为能量槽充能,能量充满即过关" }, ],
},
{
parts: [
{ text: timeLimit > 0 ? "限时 " : "不限时" },
{ text: timeLimit > 0 ? `${timeLimit}` : "", highlight: true },
{ text: timeLimit > 0 ? " 秒,能量打满即过关" : ",能量打满即过关" },
], ],
}, },
], ],
+59 -40
View File
@@ -102,8 +102,8 @@ const rhythmServerTimestamp = ref(0);
const rhythmFallbackWindowStart = ref(0); const rhythmFallbackWindowStart = ref(0);
const rhythmFallbackTimestamp = ref(0); const rhythmFallbackTimestamp = ref(0);
const rhythmHasActiveServerAnchor = ref(false); const rhythmHasActiveServerAnchor = ref(false);
// 仅由前端每轮倒计时完成事件累加,不根据服务端箭数推算。 // 节奏训练目标箭数以服务端 total_arrows 为准;首帧缺失时用 arrows_left 初始化并保持稳定。
const rhythmCompletedRounds = ref(0); const rhythmTargetArrows = ref(0);
// 服务端状态立即落到 practiceInfo,精准训练的目标区域单独延迟展示。 // 服务端状态立即落到 practiceInfo,精准训练的目标区域单独延迟展示。
const visiblePrecisionTarget = ref({ const visiblePrecisionTarget = ref({
randomBlock: 0, randomBlock: 0,
@@ -440,11 +440,10 @@ const trainingCopy = computed(() => {
return { return {
inline: true, inline: true,
details: [ details: [
{ text: "命中 " }, { text: "需有 " },
{ text: `(${completedArrows}/${targetArrows})`, highlight: true }, { text: `(${completedArrows}/${targetArrows})`, highlight: true },
{ text: " 支" }, { text: " 箭命中" },
{ text: `≥${hitReq}`, highlight: true }, { text: `≥${hitReq}环`, highlight: true },
{ text: "环的箭" },
], ],
}; };
} }
@@ -464,11 +463,10 @@ const trainingCopy = computed(() => {
return { return {
inline: true, inline: true,
details: [ details: [
{ text: "射出≥ " }, { text: "需射箭数" },
{ text: `(${currentArrows}/${targetArrows})`, highlight: true }, { text: `≥ (${currentArrows}/${targetArrows}) 支`, highlight: true },
{ text: " 支箭,总环数达到≥ " }, { text: ",累计环数\n" },
{ text: `(${currentRings}/${targetRings})`, highlight: true }, { text: `≥ (${currentRings}/${targetRings}) 环`, highlight: true },
{ text: " 环" },
], ],
}; };
} }
@@ -487,34 +485,38 @@ const trainingCopy = computed(() => {
return { return {
inline: true, inline: true,
details: [ details: [
{ text: "命中高亮区域 " }, { text: "需有 " },
{ text: `(${completedArrows}/${targetArrows})`, highlight: true }, { text: `(${completedArrows}/${targetArrows})`, highlight: true },
{ text: " 箭" }, { text: " 箭命中高亮区域" },
], ],
}; };
} }
if (trainingType.value === "rhythm") { if (trainingType.value === "rhythm") {
// 总节奏数沿用关卡配置,与选择页保持一致,不使用消息中的箭数覆盖。 const totalArrows = getPositiveInteger(rhythmTargetArrows.value) || total.value;
const totalArrows = getPositiveInteger(total.value); // 节奏训练进度由总箭数减剩余箭数计算,qualifiedArrows 仅用于稳定训练。
// 节奏数由前端倒计时累计,达标箭数与下方金色箭记录使用同一判定。
const targetArrows = const targetArrows =
getPositiveInteger(practiceInfo.value.targetArrows) || getPositiveInteger(practiceInfo.value.targetArrows) ||
getPositiveInteger(trainingParams.value.totalReq) || totalArrows; getPositiveInteger(trainingParams.value.totalReq) || totalArrows;
// 展示当前节奏序号,从 1 开始;内部仍累计已完成次数。 const completedArrows = Math.min(
const currentRound = Math.min(totalArrows, rhythmCompletedRounds.value + 1); totalArrows,
Math.max(
0,
totalArrows - getPracticeNumber(practiceInfo.value.arrowsLeft, totalArrows)
)
);
const hitReq = rhythmHitReq.value; const hitReq = rhythmHitReq.value;
const qualifiedArrows = scores.value.filter((arrow) => arrow?.ok === true).length;
return { return {
inline: true, inline: true,
details: [ details: [
{ text: `(${currentRound}/${totalArrows})`, highlight: true }, { text: "跟随节拍撒放,共" },
{ text: " 个节奏内,跟随节奏射箭,命中 " }, { text: `${totalArrows}箭`, highlight: true },
{ text: `(${qualifiedArrows}/${targetArrows})`, highlight: true }, { text: "需 " },
{ text: " 箭" }, { text: `(${completedArrows}/${targetArrows}) 箭`, highlight: true },
{ text: `≥${hitReq}`, highlight: true }, { text: "\n命中" },
{ text: "环且踩中节拍区间" }, { text: `≥${hitReq}环`, highlight: true },
{ text: "且踏中节拍区间" },
], ],
}; };
} }
@@ -527,9 +529,9 @@ const trainingCopy = computed(() => {
return { return {
inline: true, inline: true,
details: [ details: [
{ text: "每射一箭" }, { text: "命中" },
{ text: `≥${hitReq}`, highlight: true }, { text: `≥${hitReq}环`, highlight: true },
{ text: "环可为能量槽充能,充满即过关" }, { text: "可为能量槽充能,能量打满即过关" },
], ],
}; };
} }
@@ -694,14 +696,31 @@ const cacheRhythmTrainingConfig = (message = {}) => {
} }
}; };
const onRhythmRoundComplete = () => { const cacheRhythmTargetArrows = (message = {}) => {
if (!isShootingStage.value || !start.value || !isRhythmTraining.value || practiceEnded.value) return; const messageTrainingType = String(
const totalRounds = getPositiveInteger(total.value); message.trainingType ?? message.training_type ?? trainingType.value
rhythmCompletedRounds.value = Math.min(totalRounds, rhythmCompletedRounds.value + 1); ).trim();
if (messageTrainingType !== "rhythm") return;
const totalArrows = getPositiveInteger(
message.totalArrows ?? message.total_arrows
);
if (totalArrows > 0) {
rhythmTargetArrows.value = totalArrows;
return;
}
// 兼容服务端首帧 total_arrows 暂为 0:只初始化一次,避免剩余数递减时分母跟着变化。
if (rhythmTargetArrows.value === 0) {
rhythmTargetArrows.value = getPositiveInteger(
message.arrowsLeft ?? message.arrows_left
);
}
}; };
const syncPracticeInfo = (message = {}) => { const syncPracticeInfo = (message = {}) => {
cacheRhythmTrainingConfig(message); cacheRhythmTrainingConfig(message);
cacheRhythmTargetArrows(message);
const messageTrainingType = String( const messageTrainingType = String(
message.trainingType ?? message.training_type ?? trainingType.value message.trainingType ?? message.training_type ?? trainingType.value
).trim(); ).trim();
@@ -722,9 +741,11 @@ const syncPracticeInfo = (message = {}) => {
].includes(message.type)); ].includes(message.type));
if (isRhythmSnapshot) { if (isRhythmSnapshot) {
// 达标箭数的 0 按 protobuf 默认值处理;剩余数缺失不能用于推算节奏进度。 // 完整快照中 proto3 会省略 0;最后一箭及重连时不能保留旧剩余数。
if (!Object.prototype.hasOwnProperty.call(nextInfo, "qualifiedArrows")) { for (const field of ["arrowsLeft", "qualifiedArrows"]) {
nextInfo.qualifiedArrows = 0; if (!Object.prototype.hasOwnProperty.call(nextInfo, field)) {
nextInfo[field] = 0;
}
} }
} }
@@ -1406,7 +1427,7 @@ onLoad((options = {}) => {
serverAddr.value = trainingContext.serverAddr || ""; serverAddr.value = trainingContext.serverAddr || "";
const startAudioKey = getTrainingStartAudioKey(trainingParams.value.type); const startAudioKey = getTrainingStartAudioKey(trainingParams.value.type);
const warmupKeys = [startAudioKey, "通关成功", "通关失败", "胜利", "失败"]; const warmupKeys = [startAudioKey, "胜利", "失败"];
if (trainingParams.value.type === "precision") { if (trainingParams.value.type === "precision") {
warmupKeys.push("Bingo命中目标", "未命中"); warmupKeys.push("Bingo命中目标", "未命中");
} else if (trainingParams.value.type === "rhythm") { } else if (trainingParams.value.type === "rhythm") {
@@ -1436,7 +1457,6 @@ const onReady = async () => {
} }
practiceStarting.value = true; practiceStarting.value = true;
rhythmCompletedRounds.value = 0;
pageStage.value = pageStages.LOADING; pageStage.value = pageStages.LOADING;
clearHighlightTestTimer(); clearHighlightTestTimer();
useHighlightTest.value = false; useHighlightTest.value = false;
@@ -1678,7 +1698,7 @@ async function onRetry() {
rhythmFallbackWindowStart.value = 0; rhythmFallbackWindowStart.value = 0;
rhythmFallbackTimestamp.value = 0; rhythmFallbackTimestamp.value = 0;
rhythmHasActiveServerAnchor.value = false; rhythmHasActiveServerAnchor.value = false;
rhythmCompletedRounds.value = 0; rhythmTargetArrows.value = 0;
invalidateShotPresentations({ resetVisible: true }); invalidateShotPresentations({ resetVisible: true });
start.value = false; start.value = false;
scores.value = []; scores.value = [];
@@ -1701,7 +1721,7 @@ function onAudioEnded(key) {
Array.from(audioWaiters).forEach((waiter) => { Array.from(audioWaiters).forEach((waiter) => {
if (waiter.expectedKey === key) waiter.done(); if (waiter.expectedKey === key) waiter.done();
}); });
if (["比赛结束", "练习结束", "通关成功", "通关失败"].includes(String(key || ""))) { if (["比赛结束", "练习结束"].includes(String(key || ""))) {
void onOver(); void onOver();
} }
} }
@@ -1849,7 +1869,6 @@ onBeforeUnmount(() => {
trainingType === 'stability' trainingType === 'stability'
" "
:onStop="onTimeLimitReached" :onStop="onTimeLimitReached"
@rhythm-round-complete="onRhythmRoundComplete"
/> />
<view class="user-row"> <view class="user-row">
<!-- <Avatar :src="user.avatar" :size="35" /> --> <!-- <Avatar :src="user.avatar" :size="35" /> -->
+16 -9
View File
@@ -93,30 +93,36 @@ function createWebSocket(token, onMessage) {
"/addons/shoot/otaResult", "/addons/shoot/otaResult",
]; ];
if (passthroughEvents.includes(event)) { if (passthroughEvents.includes(event)) {
if ((code == null || Number(code) === 0) && onMessage && data && typeof data === "object") { if (
(code == null || Number(code) === 0) &&
onMessage &&
data &&
typeof data === "object"
) {
onMessage({ event, data, code, timestamp }); onMessage({ event, data, code, timestamp });
} }
return; return;
} }
if (data?.type) { if (!data || typeof data !== "object") return;
if (data.type) {
if (ENABLE_REALTIME_MESSAGE_LOG) { if (ENABLE_REALTIME_MESSAGE_LOG) {
console.log("收到 WebSocket 消息", getMessageTypeName(data.type)); console.log("收到 WebSocket 消息", getMessageTypeName(data.type));
} }
if (onMessage) onMessage({ ...(data.data || {}), type: data.type }); if (onMessage) onMessage({ ...(data.data || {}), type: data.type });
return; return;
} }
const updates = Array.isArray(data?.updates) ? data.updates : []; if (!Array.isArray(data.updates)) return;
if (!updates.length) return; if (onMessage) onMessage(data.updates);
if (onMessage) onMessage(updates); const firstMessage = data.updates[0];
const msg = updates[0]; if (firstMessage && ENABLE_REALTIME_MESSAGE_LOG) {
if (msg) {
if (ENABLE_REALTIME_MESSAGE_LOG) {
console.log( console.log(
"收到 WebSocket 更新", "收到 WebSocket 更新",
getMessageTypeName(msg.constructor), getMessageTypeName(firstMessage.constructor),
{ updateCount: data.updates.length } { updateCount: data.updates.length }
); );
} }
data.updates.forEach((msg) => {
if (msg) {
if (msg.constructor === MESSAGETYPES.RankUpdate) { if (msg.constructor === MESSAGETYPES.RankUpdate) {
uni.setStorageSync("latestRank", msg.lvl); uni.setStorageSync("latestRank", msg.lvl);
} else if (msg.constructor === MESSAGETYPES.LvlUpdate) { } else if (msg.constructor === MESSAGETYPES.LvlUpdate) {
@@ -130,6 +136,7 @@ function createWebSocket(token, onMessage) {
} }
} }
}); });
});
socketTask.onError((err) => { socketTask.onError((err) => {
if (socket !== socketTask) return; if (socket !== socketTask) return;