33 Commits
Author SHA1 Message Date
zhangyi 88febb92e5 update:更换语音 2026-09-15 15:44:14 +08:00
zhangyi c8533de5cf update:优化测距展示 2026-09-03 10:35:16 +08:00
zhangyi 74bfd7a327 update:优化赏金赛记录 2026-08-31 16:14:57 +08:00
zhangyi bbfa35e871 update:优化个人训练 2026-08-28 11:12:28 +08:00
zhangyi 469487ba73 update:优化新手教程 2026-08-27 17:24:25 +08:00
zhangyi b9bbaba77f update:优化新版个人训练 2026-08-26 17:23:36 +08:00
zhangyi 11eeb98b74 update:图片更新 2026-08-26 15:36:45 +08:00
zhangyi 96b64e4187 update:新增稳定训练 2026-08-26 15:23:02 +08:00
zhangyi 45bc324f70 update:优化节奏训练结算 2026-08-25 18:00:14 +08:00
zhangyi 2eba5f87d7 update:优化记录 2026-08-25 17:49:44 +08:00
zhangyi 9a06dcf942 update:对接节奏训练 2026-08-25 17:36:54 +08:00
zhangyi 35e0ee3ca0 update:优化节奏训练 2026-08-24 16:35:56 +08:00
zhangyi 59fa317c5a update: 优化个人训练 2026-08-21 15:38:01 +08:00
zhangyi 09756ae165 Merge branch 'feat-scene' into test 2026-08-20 18:09:06 +08:00
zhangyi b89c003313 update: 新增回到首页按钮 2026-08-20 18:08:49 +08:00
zhangyi 9dda58b19c Merge branch 'feat-yuyin' into test 2026-08-20 17:57:33 +08:00
zhangyi 962596e510 update:优化精准射箭语音 2026-08-20 17:57:22 +08:00
zhangyi 8a2fbb0780 Merge branch 'feat-scene' into test 2026-08-20 17:14:11 +08:00
zhangyi 0c0a00f742 update: 优化机构金币相关 2026-08-20 17:13:36 +08:00
zhangyi 66fc7fa8eb Merge branch 'feat-yuyin' into test 2026-08-20 16:56:47 +08:00
zhangyi 6363dda204 update: 语音优化 2026-08-20 16:56:34 +08:00
zhangyi 9f4fbbe4c9 Merge branch 'feat-scene' into test 2026-08-20 16:10:48 +08:00
zhangyi 45957d04b1 update:优化金币 2026-08-20 16:10:17 +08:00
zhangyi 42cfb5c3d8 update: 优化图片 2026-08-20 14:43:28 +08:00
zhangyi 844f72489e Merge branch 'feat-scene' into test 2026-08-20 14:37:47 +08:00
zhangyi d2571854bc update: 对接金币相关 2026-08-20 14:37:08 +08:00
zhangyi bb224c9f29 update:语音优化 2026-08-19 14:04:12 +08:00
zhangyi 82c360f1b1 Merge branch 'test' into feat-scene 2026-08-19 10:17:38 +08:00
zhangyi 63f3cada0f update:暂存金币相关 2026-08-19 10:14:17 +08:00
chenlimao 75cfcd66ee fix: OTA轮询次数改为15次 2026-08-18 13:57:49 +08:00
chenlimao 7955b37ec5 fix: 修复首页更新卡在更新中弹窗问题 2026-08-18 11:48:20 +08:00
chenlimao 9e6ad4cf50 feat: OTA 首页弹窗优化 2026-08-18 10:30:16 +08:00
zhangyi d60c32506f update:优化机构扫码页 2026-08-17 14:05:52 +08:00
81 changed files with 4131 additions and 447 deletions
+79 -3
View File
@@ -26,8 +26,9 @@ try {
} }
const ADDONS_BASE_URL = BASE_URL.replace(/\/api\/shoot$/, "/api/shoot"); const ADDONS_BASE_URL = BASE_URL.replace(/\/api\/shoot$/, "/api/shoot");
const API_ROOT_URL = BASE_URL.replace(/\/api\/shoot$/, "");
// 统一处理业务接口请求,包含登录态、业务错误和特定接口空响应兼容。 // 统一处理业务接口请求,包含登录态、业务错误和特定接口空响应兼容。
function request(method, url, data = {}, baseUrl = BASE_URL) { function request(method, url, data = {}, baseUrl = BASE_URL, successCodes = [0]) {
const token = uni.getStorageSync( const token = uni.getStorageSync(
`${uni.getAccountInfoSync().miniProgram.envVersion}_token` `${uni.getAccountInfoSync().miniProgram.envVersion}_token`
); );
@@ -51,7 +52,7 @@ function request(method, url, data = {}, baseUrl = BASE_URL) {
} }
if (res.data) { if (res.data) {
const {code, data, message} = res.data; const {code, data, message} = res.data;
if (code === 0) resolve(data); if (successCodes.includes(code)) resolve(data);
else if (message) { else if (message) {
const error = {code, data, message}; const error = {code, data, message};
if (message.indexOf("登录身份已失效") !== -1) { if (message.indexOf("登录身份已失效") !== -1) {
@@ -375,9 +376,11 @@ export const readyGameAPI = (battleId) => {
}); });
}; };
export const simulShootAPI = (device_id, x, y) => { export const simulShootAPI = (device_id, x, y, targetType = 40) => {
const data = { const data = {
device_id, device_id,
// 模拟射箭仅支持 20cm、40cm 靶纸,未传或传入无效值时默认使用 40cm。
targetType: Number(targetType) === 20 ? 20 : 40,
}; };
if (x !== undefined && y !== undefined) { if (x !== undefined && y !== undefined) {
data.x = x; data.x = x;
@@ -698,3 +701,76 @@ export const getMyTenRingRank = (seasonId) => {
if (seasonId !== undefined && seasonId !== null) data.seasonId = seasonId; if (seasonId !== undefined && seasonId !== null) data.seasonId = seasonId;
return request("GET", "/index/myTenRingRank", data); return request("GET", "/index/myTenRingRank", data);
}; };
// 获取当前用户的金币统计,可按门店查询。
export const getMyGoldAPI = (storeId) => {
const data = {};
if (storeId !== undefined && storeId !== null) data.storeId = storeId;
return request("GET", "/index/gold/my", data);
};
// 分页获取当前用户的金币流水,type:1=获得,2=兑换。
export const getGoldLogAPI = ({page = 1, pageSize = 20, type, storeId} = {}) => {
const data = {page, pageSize};
if (type !== undefined && type !== null) data.type = type;
if (storeId !== undefined && storeId !== null) data.storeId = storeId;
return request("GET", "/index/gold/log", data);
};
// 前台礼品接口位于站点根路径,并使用 code=200 表示成功。
export const getGiftListAPI = ({
page = 1,
pageSize = 20,
sort = "coin_desc",
storeId,
} = {}) => {
const data = {page, page_size: pageSize, sort};
if (storeId !== undefined && storeId !== null && storeId !== "") {
data.store_id = storeId;
}
return request(
"GET",
"/gin/api/v1/gift/list",
data,
API_ROOT_URL,
[0, 200]
);
};
export const getGiftDetailAPI = (id) => {
return request(
"GET",
`/gin/api/v1/gift/${id}`,
{},
API_ROOT_URL,
[0, 200]
);
};
// 根据用户定位分页获取附近门店。
export const getNearbyStoresAPI = ({
longitude,
latitude,
radius = 65535,
page = 1,
pageSize = 20,
} = {}) => {
return request("GET", "/store/nearby", {
longitude,
latitude,
radius,
page,
pageSize,
});
};
// 分页获取指定门店的公开金币规则。
export const getStoreGoldRuleListAPI = ({storeId, page = 1, pageSize = 20} = {}) => {
return request(
"GET",
`/gin/api/v1/super-admin/gold-rule/store/${storeId}/list`,
{page, page_size: pageSize},
API_ROOT_URL,
[0, 200]
);
};
+105 -2
View File
@@ -1,5 +1,61 @@
export const AUDIO_INTERRUPTION_BEGIN_EVENT = "audio-interruption-begin"; export const AUDIO_INTERRUPTION_BEGIN_EVENT = "audio-interruption-begin";
export const AUDIO_INTERRUPTION_END_EVENT = "audio-interruption-end"; export const AUDIO_INTERRUPTION_END_EVENT = "audio-interruption-end";
export const RHYTHM_SHOOT_WINDOW_AUDIO_KEY = "请射箭";
export const STABILITY_START_AUDIO_KEY =
"请在计时结束前能量条达到百分百";
export const STABILITY_ENERGY_50_AUDIO_KEY = "加油!到达50%啦";
export const STABILITY_ENERGY_70_AUDIO_KEY =
"70%啦!还差一点,胜利就在眼前";
const TRAINING_START_AUDIO_KEY_MAP = Object.freeze({
base: "请于计时前完成指定环数对应箭量",
endurance: "请于计时前完成累计环数和箭量",
precision: "请射箭命中高亮区域",
rhythm: "请在读条推进到标记区间内射箭",
stability: "请在计时结束前能量条达到百分百",
});
export const getTrainingStartAudioKey = (trainingType, fallback = "") =>
TRAINING_START_AUDIO_KEY_MAP[trainingType] || fallback;
export const getPrecisionShotAudioKeys = (shootData, directionText = "") => {
if (!shootData || typeof shootData !== "object") return [];
const ring = Number(shootData.ring);
const directionAudioKey =
shootData.angle !== null &&
shootData.angle !== undefined &&
directionText
? `${directionText}调整`
: "";
if (!Number.isFinite(ring) || ring <= 0) {
return ["未上靶", directionAudioKey].filter(Boolean);
}
// protobuf 的 false 可能不编码;只要不是明确命中,本箭就反馈未命中。
const hitAudioKey = shootData.ok === true ? "Bingo命中目标" : "未命中";
return [directionAudioKey, hitAudioKey].filter(Boolean);
};
export const getRhythmShotAudioKeys = (shootData) => {
if (!shootData || typeof shootData !== "object") return [];
const ring = Number(shootData.ring);
const ringAudioKey =
Number.isFinite(ring) && ring > 0
? `${shootData.ringX ? "X" : ring}`
: "未上靶";
// 节奏训练是否达标完全由服务端 ok 字段决定,前端不根据环数复算。
return [ringAudioKey, shootData.ok === true ? "Perfect" : "miss"];
};
export const getStabilityShotAudioKeys = (shootData) => {
if (!shootData || typeof shootData !== "object") return [];
const ring = Number(shootData.ring);
const ringAudioKey =
Number.isFinite(ring) && ring > 0
? `${shootData.ringX ? "X" : ring}`
: "未上靶";
return [ringAudioKey];
};
export const audioFils = { export const audioFils = {
tententen: "https://static.shelingxingqiu.com/shootmini/static/audio/tententen.mp3", tententen: "https://static.shelingxingqiu.com/shootmini/static/audio/tententen.mp3",
@@ -20,6 +76,22 @@ export const audioFils = {
"https://static.shelingxingqiu.com/attachment/2025-09-17/dcutwrda0amn5kqr4j.mp3", "https://static.shelingxingqiu.com/attachment/2025-09-17/dcutwrda0amn5kqr4j.mp3",
距离不足: 距离不足:
"https://static.shelingxingqiu.com/attachment/2025-11-12/de6hr2faw28t0ianh0.mp3", "https://static.shelingxingqiu.com/attachment/2025-11-12/de6hr2faw28t0ianh0.mp3",
"靶纸不符!请更换靶纸":
"https://static.shelingxingqiu.com/shootmini/static/audio/%E9%9D%B6%E7%BA%B8%E4%B8%8D%E7%AC%A6%EF%BC%81%E8%AF%B7%E6%9B%B4%E6%8D%A2%E9%9D%B6%E7%BA%B8.MP3",
"站距与靶纸合格":
"https://static.shelingxingqiu.com/shootmini/static/audio/%E7%AB%99%E8%B7%9D%E4%B8%8E%E9%9D%B6%E7%BA%B8%E5%90%88%E6%A0%BC.MP3",
"请射箭!测试站距与靶纸":
"https://static.shelingxingqiu.com/shootmini/static/audio/%E8%AF%B7%E5%B0%84%E7%AE%AD%EF%BC%81%E6%B5%8B%E8%AF%95%E7%AB%99%E8%B7%9D%E4%B8%8E%E9%9D%B6%E7%BA%B8.MP3",
"站距过近,靶纸正确":
"https://static.shelingxingqiu.com/shootmini/static/audio0820/%E7%AB%99%E8%B7%9D%E8%BF%87%E8%BF%91%EF%BC%8C%E9%9D%B6%E7%BA%B8%E6%AD%A3%E7%A1%AE.MP3",
"站距过近,靶纸错误":
"https://static.shelingxingqiu.com/shootmini/static/audio0820/%E7%AB%99%E8%B7%9D%E8%BF%87%E8%BF%91%EF%BC%8C%E9%9D%B6%E7%BA%B8%E9%94%99%E8%AF%AF.MP3",
"站距合格,靶纸正确":
"https://static.shelingxingqiu.com/shootmini/static/audio0820/%E7%AB%99%E8%B7%9D%E5%90%88%E6%A0%BC%EF%BC%8C%E9%9D%B6%E7%BA%B8%E6%AD%A3%E7%A1%AE.MP3",
"站距合格,靶纸错误":
"https://static.shelingxingqiu.com/shootmini/static/audio0820/%E7%AB%99%E8%B7%9D%E5%90%88%E6%A0%BC%EF%BC%8C%E9%9D%B6%E7%BA%B8%E9%94%99%E8%AF%AF.MP3",
"未识别到靶纸,请瞄准靶纸射箭":
"https://static.shelingxingqiu.com/shootmini/static/audio/%E6%9C%AA%E8%AF%86%E5%88%AB%E5%88%B0%E9%9D%B6%E7%BA%B8%EF%BC%8C%E8%AF%B7%E7%9E%84%E5%87%86%E9%9D%B6%E7%BA%B8%E5%B0%84%E7%AE%AD.MP3",
"未发现靶纸,请瞄准靶纸射箭": "未发现靶纸,请瞄准靶纸射箭":
"https://static.shelingxingqiu.com/shootmini/static/audio/%E6%9C%AA%E5%8F%91%E7%8E%B0%E9%9D%B6%E7%BA%B8%EF%BC%8C%E8%AF%B7%E7%9E%84%E5%87%86%E9%9D%B6%E7%BA%B8%E5%B0%84%E7%AE%AD.MP3", "https://static.shelingxingqiu.com/shootmini/static/audio/%E6%9C%AA%E5%8F%91%E7%8E%B0%E9%9D%B6%E7%BA%B8%EF%BC%8C%E8%AF%B7%E7%9E%84%E5%87%86%E9%9D%B6%E7%BA%B8%E5%B0%84%E7%AE%AD.MP3",
轮到你了: 轮到你了:
@@ -54,6 +126,8 @@ export const audioFils = {
"https://static.shelingxingqiu.com/shootmini/static/audio/%E5%B0%84%E7%AE%AD%E6%97%A0%E6%95%88%E6%A3%80%E6%9F%A5%E8%B7%9D%E7%A6%BB%E5%92%8C%E9%9D%B6%E7%BA%B8.mp3", "https://static.shelingxingqiu.com/shootmini/static/audio/%E5%B0%84%E7%AE%AD%E6%97%A0%E6%95%88%E6%A3%80%E6%9F%A5%E8%B7%9D%E7%A6%BB%E5%92%8C%E9%9D%B6%E7%BA%B8.mp3",
"射箭无效,距离不足": "射箭无效,距离不足":
"https://static.shelingxingqiu.com/shootmini/static/audio/%E5%B0%84%E7%AE%AD%E6%97%A0%E6%95%88%EF%BC%8C%E8%B7%9D%E7%A6%BB%E4%B8%8D%E8%B6%B3.MP3", "https://static.shelingxingqiu.com/shootmini/static/audio/%E5%B0%84%E7%AE%AD%E6%97%A0%E6%95%88%EF%BC%8C%E8%B7%9D%E7%A6%BB%E4%B8%8D%E8%B6%B3.MP3",
"射箭无效,距离不足且靶纸错误":
"https://static.shelingxingqiu.com/shootmini/static/audio/%E5%B0%84%E7%AE%AD%E6%97%A0%E6%95%88%EF%BC%8C%E8%B7%9D%E7%A6%BB%E4%B8%8D%E8%B6%B3%E4%B8%94%E9%9D%B6%E7%BA%B8%E9%94%99%E8%AF%AF.MP3",
"射箭无效,未识别到靶纸": "射箭无效,未识别到靶纸":
"https://static.shelingxingqiu.com/shootmini/static/audio/%E5%B0%84%E7%AE%AD%E6%97%A0%E6%95%88%EF%BC%8C%E6%9C%AA%E8%AF%86%E5%88%AB%E5%88%B0%E9%9D%B6%E7%BA%B8.MP3", "https://static.shelingxingqiu.com/shootmini/static/audio/%E5%B0%84%E7%AE%AD%E6%97%A0%E6%95%88%EF%BC%8C%E6%9C%AA%E8%AF%86%E5%88%AB%E5%88%B0%E9%9D%B6%E7%BA%B8.MP3",
"射箭无效,靶纸错误": "射箭无效,靶纸错误":
@@ -101,6 +175,30 @@ export const audioFils = {
"https://static.shelingxingqiu.com/attachment/2025-11-13/de7kzzllq0futwynso.mp3", "https://static.shelingxingqiu.com/attachment/2025-11-13/de7kzzllq0futwynso.mp3",
练习开始: 练习开始:
"https://static.shelingxingqiu.com/attachment/2025-11-14/de88w0lmmt43nnfmoi.mp3", "https://static.shelingxingqiu.com/attachment/2025-11-14/de88w0lmmt43nnfmoi.mp3",
[STABILITY_START_AUDIO_KEY]:
"https://static.shelingxingqiu.com/shootaudio/%E8%AF%B7%E5%9C%A8%E8%AE%A1%E6%97%B6%E7%BB%93%E6%9D%9F%E5%89%8D%E8%83%BD%E9%87%8F%E6%9D%A1%E8%BE%BE%E5%88%B0%E7%99%BE%E5%88%86%E7%99%BE.MP3",
[STABILITY_ENERGY_50_AUDIO_KEY]:
"https://static.shelingxingqiu.com/shootmini/static/audio0820/%E5%8A%A0%E6%B2%B9%EF%BC%81%E5%88%B0%E8%BE%BE50%25%E5%95%A6.MP3",
[STABILITY_ENERGY_70_AUDIO_KEY]:
"https://static.shelingxingqiu.com/shootmini/static/audio0820/70%25%E5%95%A6%EF%BC%81%E8%BF%98%E5%B7%AE%E4%B8%80%E7%82%B9%EF%BC%8C%E8%83%9C%E5%88%A9%E5%B0%B1%E5%9C%A8%E7%9C%BC%E5%89%8D.MP3",
请于计时前完成指定环数对应箭量:
"https://static.shelingxingqiu.com/shootmini/static/audio0820/%E8%AF%B7%E4%BA%8E%E8%AE%A1%E6%97%B6%E5%89%8D%E5%AE%8C%E6%88%90%E6%8C%87%E5%AE%9A%E7%8E%AF%E6%95%B0%E5%AF%B9%E5%BA%94%E7%AE%AD%E9%87%8F.MP3",
请于计时前完成累计环数和箭量:
"https://static.shelingxingqiu.com/shootmini/static/audio0820/%E8%AF%B7%E4%BA%8E%E8%AE%A1%E6%97%B6%E5%89%8D%E5%AE%8C%E6%88%90%E7%B4%AF%E8%AE%A1%E7%8E%AF%E6%95%B0%E5%92%8C%E7%AE%AD%E9%87%8F.MP3",
请射箭命中高亮区域:
"https://static.shelingxingqiu.com/shootmini/static/audio0820/%E8%AF%B7%E5%B0%84%E7%AE%AD%E5%91%BD%E4%B8%AD%E9%AB%98%E4%BA%AE%E5%8C%BA%E5%9F%9F.MP3",
请在读条推进到标记区间内射箭:
"https://static.shelingxingqiu.com/shootmini/static/audio0820/%E8%AF%B7%E5%9C%A8%E8%AF%BB%E6%9D%A1%E6%8E%A8%E8%BF%9B%E5%88%B0%E6%A0%87%E8%AE%B0%E5%8C%BA%E9%97%B4%E5%86%85%E5%B0%84%E7%AE%AD.MP3",
[RHYTHM_SHOOT_WINDOW_AUDIO_KEY]:
"https://static.shelingxingqiu.com/shootmini/static/audio0820/%E8%AF%B7%E5%B0%84%E7%AE%AD.MP3",
Perfect:
"https://static.shelingxingqiu.com/shootmini/static/audio0820/Perfect.MP3",
miss:
"https://static.shelingxingqiu.com/shootmini/static/audio0820/miss.MP3",
Bingo命中目标:
"https://static.shelingxingqiu.com/shootmini/static/audio0820/Bingo%E5%91%BD%E4%B8%AD%E7%9B%AE%E6%A0%87.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",
射箭声音: 射箭声音:
@@ -126,16 +224,21 @@ const AUDIO_WARM_PRIORITY_KEYS = [
"比赛结束", "比赛结束",
"射击无效", "射击无效",
"射箭无效,距离不足", "射箭无效,距离不足",
"射箭无效,距离不足且靶纸错误",
"射箭无效,未识别到靶纸", "射箭无效,未识别到靶纸",
"射箭无效,靶纸错误", "射箭无效,靶纸错误",
"请射箭!测试站距与靶纸",
"站距过近,靶纸正确",
"站距过近,靶纸错误",
"站距合格,靶纸正确",
"站距合格,靶纸错误",
"未识别到靶纸,请瞄准靶纸射箭",
"中场休息", "中场休息",
"下半场开始", "下半场开始",
"决金箭轮", "决金箭轮",
"请蓝方射箭", "请蓝方射箭",
"请红方射箭", "请红方射箭",
"距离合格", "距离合格",
"距离不足",
"未发现靶纸,请瞄准靶纸射箭",
"未上靶", "未上靶",
"X环", "X环",
]; ];
+13 -2
View File
@@ -51,6 +51,10 @@ const props = defineProps({
type: Boolean, type: Boolean,
default: false, default: false,
}, },
targetType: {
type: [Number, String],
default: 40,
},
targetRadius: { targetRadius: {
type: Number, type: Number,
default: 20, default: 20,
@@ -426,12 +430,19 @@ function getExperienceTipStyle(shot) {
); );
} }
const simulShoot = async () => { const simulShoot = async () => {
if (device.value.deviceId) await simulShootAPI(device.value.deviceId); if (device.value.deviceId) {
await simulShootAPI(
device.value.deviceId,
undefined,
undefined,
props.targetType
);
}
}; };
const simulShoot2 = async () => { const simulShoot2 = async () => {
if (device.value.deviceId) { if (device.value.deviceId) {
const r1 = Math.random() > 0.5 ? 0.01 : 0.02; const r1 = Math.random() > 0.5 ? 0.01 : 0.02;
await simulShootAPI(device.value.deviceId, r1, r1); await simulShootAPI(device.value.deviceId, r1, r1, props.targetType);
} }
}; };
+6 -2
View File
@@ -9,6 +9,7 @@ import DeviceChargingDialog from "@/components/DeviceChargingDialog.vue";
import {laserAimAPI, getBattleAPI, matchGameAPI} from "@/apis"; import {laserAimAPI, getBattleAPI, matchGameAPI} from "@/apis";
import { capsuleHeight, debounce } from "@/util"; import { capsuleHeight, debounce } from "@/util";
import { returnToBattle } from "@/utils/matchReturn"; import { returnToBattle } from "@/utils/matchReturn";
const emit = defineEmits(["scrolltolower"]);
const props = defineProps({ const props = defineProps({
title: { title: {
type: String, type: String,
@@ -131,8 +132,9 @@ const goCalibration = async () => {
<template> <template>
<view :style="{ paddingTop: capsuleHeight + 'px' }"> <view :style="{ paddingTop: capsuleHeight + 'px' }">
<AppBackground :type="bgType" :bgColor="bgColor" /> <AppBackground :type="bgType" :bgColor="bgColor" />
<slot v-if="$slots.header" name="header"></slot>
<Header <Header
v-if="!isHome" v-else-if="!isHome"
:class="headerClass" :class="headerClass"
:title="title" :title="title"
:onBack="onBack" :onBack="onBack"
@@ -158,8 +160,10 @@ const goCalibration = async () => {
:enhanced="true" :enhanced="true"
:bounces="false" :bounces="false"
:show-scrollbar="false" :show-scrollbar="false"
:lower-threshold="120"
@scrolltolower="emit('scrolltolower')"
:style="{ :style="{
height: `calc(100vh - ${capsuleHeight + (isHome ? 0 : 50)}px - ${ height: `calc(100vh - ${capsuleHeight + (($slots.header || !isHome) ? 50 : 0)}px - ${
$slots.bottom && showBottom ? (isIOS ? '75px' : '65px') : '0px' $slots.bottom && showBottom ? (isIOS ? '75px' : '65px') : '0px'
})`, })`,
}" }"
+3
View File
@@ -125,6 +125,8 @@ onBeforeUnmount(() => {
<view <view
:style="[{ color: whiteBackArrow ? '#fff' : '#000' }, titleStyle]" :style="[{ color: whiteBackArrow ? '#fff' : '#000' }, titleStyle]"
> >
<slot v-if="$slots.title" name="title"></slot>
<template v-else>
<view <view
v-if="currentPage === 'pages/point-book'" v-if="currentPage === 'pages/point-book'"
class="user-header" class="user-header"
@@ -190,6 +192,7 @@ onBeforeUnmount(() => {
> >
</view> </view>
</block> </block>
</template>
</view> </view>
<view v-if="pointBook" class="point-book-info"> <view v-if="pointBook" class="point-book-info">
<text>{{ pointBook.bowType.name }}</text> <text>{{ pointBook.bowType.name }}</text>
+6 -2
View File
@@ -2,7 +2,11 @@
import { ref, watch, onMounted, onBeforeUnmount } from "vue"; import { ref, watch, onMounted, onBeforeUnmount } from "vue";
import audioManager from "@/audioManager"; import audioManager from "@/audioManager";
import { MESSAGETYPESV2 } from "@/constants"; import { MESSAGETYPESV2 } from "@/constants";
import { getDirectionText, getInvalidShotAudioKey } from "@/util"; import {
getDirectionText,
getInvalidShotAudioKey,
getInvalidShotText,
} from "@/util";
import useStore from "@/store"; import useStore from "@/store";
import { storeToRefs } from "pinia"; import { storeToRefs } from "pinia";
@@ -88,7 +92,7 @@ async function onReceiveMessage(message) {
currentRoundEnded.value = true; currentRoundEnded.value = true;
} else if (type === MESSAGETYPESV2.InvalidShot) { } else if (type === MESSAGETYPESV2.InvalidShot) {
uni.showToast({ uni.showToast({
title: "距离不足,无效", title: getInvalidShotText(shootData),
icon: "none", icon: "none",
}); });
audioManager.play(getInvalidShotAudioKey(shootData)); audioManager.play(getInvalidShotAudioKey(shootData));
+6 -2
View File
@@ -2,7 +2,11 @@
import { ref, watch, onMounted, onBeforeUnmount, computed } from "vue"; import { ref, watch, onMounted, onBeforeUnmount, computed } from "vue";
import audioManager from "@/audioManager"; import audioManager from "@/audioManager";
import { MESSAGETYPESV2 } from "@/constants"; import { MESSAGETYPESV2 } from "@/constants";
import { getDirectionText, getInvalidShotAudioKey } from "@/util"; import {
getDirectionText,
getInvalidShotAudioKey,
getInvalidShotText,
} from "@/util";
import useStore from "@/store"; import useStore from "@/store";
import { storeToRefs } from "pinia"; import { storeToRefs } from "pinia";
@@ -171,7 +175,7 @@ async function onReceiveMessage(msg) {
audioManager.play("中场休息"); audioManager.play("中场休息");
} else if (msg.type === MESSAGETYPESV2.InvalidShot) { } else if (msg.type === MESSAGETYPESV2.InvalidShot) {
uni.showToast({ uni.showToast({
title: "距离不足,无效", title: getInvalidShotText(msg.shootData),
icon: "none", icon: "none",
}); });
audioManager.play(getInvalidShotAudioKey(msg.shootData)); audioManager.play(getInvalidShotAudioKey(msg.shootData));
+63 -12
View File
@@ -6,10 +6,16 @@ import Avatar from "@/components/Avatar.vue";
import audioManager from "@/audioManager"; import audioManager from "@/audioManager";
import { simulShootAPI } from "@/apis"; import { simulShootAPI } from "@/apis";
import { MESSAGETYPESV2 } from "@/constants"; import { MESSAGETYPESV2 } from "@/constants";
import {
getDistanceCheckAudioKey,
getDistanceCheckText,
getShootValidation,
} from "@/util";
import useStore from "@/store"; import useStore from "@/store";
import { storeToRefs } from "pinia"; import { storeToRefs } from "pinia";
const store = useStore(); const store = useStore();
const { user, device } = storeToRefs(store); const { user, device } = storeToRefs(store);
const emit = defineEmits(["passed"]);
const props = defineProps({ const props = defineProps({
guide: { guide: {
type: Boolean, type: Boolean,
@@ -23,18 +29,50 @@ const props = defineProps({
type: Number, type: Number,
default: 15, default: 15,
}, },
targetType: {
type: [Number, String],
default: 40,
},
autoStart: {
type: Boolean,
default: false,
},
}); });
const arrow = ref({}); const arrow = ref({});
const distance = ref(0); const distance = ref(0);
const statusText = ref("");
const showsimul = ref(false); const showsimul = ref(false);
const count = ref(props.count); const count = ref(props.count);
const timer = ref(null); const timer = ref(null);
const autoStartPending = ref(false);
const autoStartTriggered = ref(false);
let autoStartTimer = null;
const DISTANCE_PASSED_AUDIO_KEY = "站距合格,靶纸正确";
const AUTO_START_TIMEOUT_MS = 6000;
const clearAutoStartTimer = () => {
if (!autoStartTimer) return;
clearTimeout(autoStartTimer);
autoStartTimer = null;
};
const triggerAutoStart = () => {
if (!autoStartPending.value || autoStartTriggered.value) return;
clearAutoStartTimer();
autoStartPending.value = false;
autoStartTriggered.value = true;
emit("passed");
};
const onAudioEnded = (key) => {
if (key === DISTANCE_PASSED_AUDIO_KEY) triggerAutoStart();
};
const updateTimer = (value) => { const updateTimer = (value) => {
count.value = Math.round(value); count.value = Math.round(value);
}; };
onMounted(() => { onMounted(() => {
audioManager.play("请射箭测试距离"); audioManager.play("请射箭测试站距与靶纸");
if (props.isBattle) { if (props.isBattle) {
timer.value = setInterval(() => { timer.value = setInterval(() => {
count.value -= 1; count.value -= 1;
@@ -42,28 +80,43 @@ onMounted(() => {
}, 1000); }, 1000);
} }
uni.$on("update-timer", updateTimer); uni.$on("update-timer", updateTimer);
uni.$on("audioEnded", onAudioEnded);
}); });
onBeforeUnmount(() => { onBeforeUnmount(() => {
if (timer.value) clearInterval(timer.value); if (timer.value) clearInterval(timer.value);
clearAutoStartTimer();
uni.$off("update-timer", updateTimer); uni.$off("update-timer", updateTimer);
uni.$off("audioEnded", onAudioEnded);
}); });
async function onReceiveMessage(msg) { async function onReceiveMessage(msg) {
if (Array.isArray(msg)) return; if (Array.isArray(msg)) return;
if (msg.type === MESSAGETYPESV2.TestDistance) { if (msg.type === MESSAGETYPESV2.TestDistance) {
const rawDistance = Number(msg.shootData?.distance); if (autoStartPending.value || autoStartTriggered.value) return;
const rawDistance = Number(msg.shootData?.distance ?? msg.shootData?.dst);
distance.value = Number.isFinite(rawDistance) distance.value = Number.isFinite(rawDistance)
? Number((rawDistance / 100).toFixed(2)) ? Number((rawDistance / 100).toFixed(2))
: 0; : 0;
if (rawDistance === 0) { statusText.value = getDistanceCheckText(msg.shootData);
audioManager.play("未发现靶纸,请瞄准靶纸射箭"); const audioKey = getDistanceCheckAudioKey(msg.shootData);
} else if (distance.value >= 5) audioManager.play("距离合格"); const validation = getShootValidation(msg.shootData);
else audioManager.play("距离不足"); if (props.autoStart && validation.distanceOk && validation.targetOk) {
autoStartPending.value = true;
autoStartTimer = setTimeout(triggerAutoStart, AUTO_START_TIMEOUT_MS);
}
audioManager.play(audioKey);
} }
} }
const simulShoot = async () => { const simulShoot = async () => {
if (device.value.deviceId) await simulShootAPI(device.value.deviceId); if (device.value.deviceId) {
await simulShootAPI(
device.value.deviceId,
undefined,
undefined,
props.targetType
);
}
}; };
onMounted(() => { onMounted(() => {
@@ -101,13 +154,11 @@ onBeforeUnmount(() => {
模拟射箭 模拟射箭
</button> </button>
<view class="warnning-text"> <view class="warnning-text">
<block v-if="distance > 0"> <block v-if="statusText">
<text>当前距离{{ distance }}</text> <text>{{ statusText }}</text>
<text v-if="distance >= 5">已达到距离要求</text>
<text v-else>请调整站位</text>
</block> </block>
<block v-else> <block v-else>
<text>请射箭测试站距</text> <text>请射箭测试站距与靶纸</text>
</block> </block>
</view> </view>
<view class="user-row"> <view class="user-row">
+9 -2
View File
@@ -24,13 +24,20 @@ const props = defineProps({
const getDisplayText = (arrow = {}) => { const getDisplayText = (arrow = {}) => {
if (!arrow) return ""; if (!arrow) return "";
if (!arrow.ring) return "0"; if (!arrow.ring) return props.trainingType === "stability" ? "-" : "0";
return arrow.ringX ? "X" : String(arrow.ring); return arrow.ringX ? "X" : String(arrow.ring);
}; };
const isFailed = (arrow = {}) => { const isFailed = (arrow = {}) => {
if (!arrow) return false; if (!arrow) return false;
if (props.recordMode && props.trainingType !== "precision") return false; if (
props.recordMode &&
props.trainingType !== "precision" &&
props.trainingType !== "rhythm" &&
props.trainingType !== "stability"
) {
return false;
}
return arrow.ok !== true; return arrow.ok !== true;
}; };
+260 -27
View File
@@ -9,7 +9,19 @@ import {
getServerMessageTypeName, getServerMessageTypeName,
} from "@/utils/matchProtocol"; } from "@/utils/matchProtocol";
import { MESSAGETYPESV2 } from "@/constants"; import { MESSAGETYPESV2 } from "@/constants";
import { getDirectionText, getInvalidShotAudioKey } from "@/util"; import {
getDirectionText,
getDistanceCheckAudioKey,
getInvalidShotAudioKey,
} from "@/util";
import {
getPrecisionShotAudioKeys,
getRhythmShotAudioKeys,
getStabilityShotAudioKeys,
getTrainingStartAudioKey,
STABILITY_ENERGY_50_AUDIO_KEY,
STABILITY_ENERGY_70_AUDIO_KEY,
} from "@/audioManager";
import { import {
normalizeId, normalizeId,
normalizeMatchInfo, normalizeMatchInfo,
@@ -49,20 +61,6 @@ const ENABLE_REALTIME_MESSAGE_LOG = (() => {
} }
})(); })();
function getServerMessageLogSummary(message = {}) {
const practiceInfo = message.practice_info || message.practiceInfo || {};
const matchInfo = message.match_info || message.matchInfo || {};
return {
type: message.type,
matchId: normalizeId(pickField(message, "matchId", "match_id")),
sequence: message.sequence,
practiceDetailCount: Array.isArray(practiceInfo.details)
? practiceInfo.details.length
: 0,
roundCount: Array.isArray(matchInfo.rounds) ? matchInfo.rounds.length : 0,
};
}
// 比赛服消息类型先映射成项目里已有的 V2 业务消息,页面仍然复用原来的 socket-inbox 流程。 // 比赛服消息类型先映射成项目里已有的 V2 业务消息,页面仍然复用原来的 socket-inbox 流程。
const BUSINESS_TYPE_BY_SERVER_TYPE = { const BUSINESS_TYPE_BY_SERVER_TYPE = {
[ServerMessageType.SERVER_MSG_MATCH_READY]: MESSAGETYPESV2.AboutToStart, [ServerMessageType.SERVER_MSG_MATCH_READY]: MESSAGETYPESV2.AboutToStart,
@@ -87,6 +85,9 @@ function normalizeShootData(shootData) {
if (normalized.distance === undefined && normalized.dst !== undefined) { if (normalized.distance === undefined && normalized.dst !== undefined) {
normalized.distance = normalized.dst; normalized.distance = normalized.dst;
} }
if (normalized.targetOk === undefined && normalized.target_ok !== undefined) {
normalized.targetOk = normalized.target_ok;
}
return normalized; return normalized;
} }
@@ -152,6 +153,15 @@ function buildBusinessMessage(message) {
matchInfo.status = 0; matchInfo.status = 0;
} }
const practiceInfo = normalizePracticeInfo(message.practice_info); const practiceInfo = normalizePracticeInfo(message.practice_info);
const trainingType = String(
practiceInfo.trainingType ||
matchInfo.trainingType ||
currentContext?.trainingType ||
""
).trim();
if (currentContext && trainingType) {
currentContext.trainingType = trainingType;
}
const businessType = getBusinessType(message, matchInfo); const businessType = getBusinessType(message, matchInfo);
if (!businessType) return null; if (!businessType) return null;
@@ -204,11 +214,22 @@ function buildBusinessMessage(message) {
matchWsType: message.type, matchWsType: message.type,
matchWsTypeName: getServerMessageTypeName(message.type), matchWsTypeName: getServerMessageTypeName(message.type),
isSecondHalfStart, isSecondHalfStart,
...(trainingType ? { trainingType } : {}),
}; };
} }
function buildPracticeSyncMessage(message) { function buildPracticeSyncMessage(message) {
const practiceInfo = normalizePracticeInfo(message.practice_info); const practiceInfo = normalizePracticeInfo(message.practice_info);
if (currentContext && practiceInfo.trainingType) {
currentContext.trainingType = String(practiceInfo.trainingType).trim();
}
updateStabilityEnergyContext(practiceInfo, {
fullSnapshot: true,
detectCrossing: false,
});
updateStabilityShotContext(practiceInfo, {
detectShot: false,
});
const matchId = normalizeId( const matchId = normalizeId(
pickField(message, "matchId", "match_id") || pickField(message, "matchId", "match_id") ||
practiceInfo.id || practiceInfo.id ||
@@ -367,17 +388,183 @@ function getShootResultAudioKeys(shootData) {
return keys; return keys;
} }
function normalizeScoreSlot(value) {
const scoreSlot = Number(value);
return Number.isFinite(scoreSlot) && scoreSlot > 0 ? scoreSlot : 0;
}
function clampEnergy(value, scoreSlot = 0) {
const energy = Number(value);
if (!Number.isFinite(energy)) return 0;
const maxEnergy = normalizeScoreSlot(scoreSlot);
return maxEnergy > 0
? Math.min(maxEnergy, Math.max(0, energy))
: Math.max(0, energy);
}
function getEnergyPercent(energy, scoreSlot) {
const maxEnergy = normalizeScoreSlot(scoreSlot);
if (!maxEnergy) return 0;
return Math.min(100, (clampEnergy(energy, maxEnergy) / maxEnergy) * 100);
}
function getStabilityArrowCount(source = {}) {
const candidates = [
Array.isArray(source.details) ? source.details.length : NaN,
Number(source.currentArrows),
Number(source.totalArrows),
].filter((value) => Number.isFinite(value) && value >= 0);
return candidates.length > 0 ? Math.max(...candidates) : null;
}
function updateStabilityShotContext(
source = {},
{ detectShot = false } = {}
) {
const trainingType = String(
source.trainingType || currentContext?.trainingType || ""
).trim();
if (trainingType !== "stability" || !currentContext) return false;
const nextArrowCount = getStabilityArrowCount(source);
if (nextArrowCount === null) return false;
const storedArrowCount = Number(currentContext.stabilityArrowCount);
const previousArrowCount = Number.isFinite(storedArrowCount)
? storedArrowCount
: 0;
const hasNewShot =
detectShot && nextArrowCount > previousArrowCount;
if (nextArrowCount >= previousArrowCount) {
currentContext.stabilityArrowCount = nextArrowCount;
}
return hasNewShot;
}
// 稳定训练的阈值语音必须和 ACK 使用同一份判定结果,避免页面播放了
// 里程碑语音但比赛服提前收到 ACK。能量跌破阈值后再次向上跨越可重复触发。
function updateStabilityEnergyContext(
source = {},
{ fullSnapshot = false, detectCrossing = false } = {}
) {
const trainingType = String(
source.trainingType || currentContext?.trainingType || ""
).trim();
if (trainingType !== "stability" || !currentContext) return "";
const hasCurrentEnergy = Object.prototype.hasOwnProperty.call(
source,
"currentEnergy"
);
if (!hasCurrentEnergy && !fullSnapshot) return "";
const previousScoreSlot = normalizeScoreSlot(
currentContext.stabilityScoreSlot
);
const nextScoreSlot =
normalizeScoreSlot(source.scoreSlot) || previousScoreSlot;
const previousEnergy = clampEnergy(
currentContext.stabilityEnergy,
previousScoreSlot
);
const nextEnergy = clampEnergy(
hasCurrentEnergy ? source.currentEnergy : 0,
nextScoreSlot
);
const previousPercent = getEnergyPercent(
previousEnergy,
previousScoreSlot || nextScoreSlot
);
const nextPercent = getEnergyPercent(nextEnergy, nextScoreSlot);
currentContext.stabilityEnergy = nextEnergy;
currentContext.stabilityScoreSlot = nextScoreSlot;
if (!detectCrossing) {
currentContext.stabilityEnergy50Armed = nextPercent < 50;
currentContext.stabilityEnergy70Armed = nextPercent < 70;
return "";
}
let energy50Armed =
typeof currentContext.stabilityEnergy50Armed === "boolean"
? currentContext.stabilityEnergy50Armed
: previousPercent < 50;
let energy70Armed =
typeof currentContext.stabilityEnergy70Armed === "boolean"
? currentContext.stabilityEnergy70Armed
: previousPercent < 70;
if (nextPercent < 50) energy50Armed = true;
if (nextPercent < 70) energy70Armed = true;
let milestoneAudioKey = "";
if (energy70Armed && nextPercent >= 70) {
milestoneAudioKey = STABILITY_ENERGY_70_AUDIO_KEY;
energy70Armed = false;
// 同一次直接跨过两个阈值时只播70%,不能在后续补播50%。
energy50Armed = false;
} else if (energy50Armed && nextPercent >= 50) {
milestoneAudioKey = STABILITY_ENERGY_50_AUDIO_KEY;
energy50Armed = false;
}
currentContext.stabilityEnergy50Armed = energy50Armed;
currentContext.stabilityEnergy70Armed = energy70Armed;
return milestoneAudioKey;
}
function getTestDistanceAudioKeys(shootData) { function getTestDistanceAudioKeys(shootData) {
const distance = Number(shootData?.distance ?? shootData?.dst); if (!shootData) return [];
if (Number.isNaN(distance)) return []; return [getDistanceCheckAudioKey(shootData)];
if (distance === 0) return ["未发现靶纸,请瞄准靶纸射箭"]; }
return [distance / 100 >= 5 ? "\u8ddd\u79bb\u5408\u683c" : "\u8ddd\u79bb\u4e0d\u8db3"];
function attachStabilityAudioContext(message, businessMessage) {
const fullStabilitySnapshot = [
ServerMessageType.SERVER_MSG_MATCH_START,
ServerMessageType.SERVER_MSG_SHOT,
ServerMessageType.SERVER_MSG_MATCH_END,
ServerMessageType.SERVER_MSG_TIMEOUT,
ServerMessageType.SERVER_MSG_PRACTICE_END,
].includes(message.type);
const stabilityMilestoneAudioKey = updateStabilityEnergyContext(
businessMessage,
{
fullSnapshot: fullStabilitySnapshot,
detectCrossing: message.type === ServerMessageType.SERVER_MSG_SHOT,
}
);
const stabilityHasNewShot = updateStabilityShotContext(businessMessage, {
detectShot: message.type === ServerMessageType.SERVER_MSG_SHOT,
});
if (businessMessage && stabilityMilestoneAudioKey) {
businessMessage.stabilityMilestoneAudioKey = stabilityMilestoneAudioKey;
}
if (businessMessage) {
businessMessage.stabilityHasNewShot = stabilityHasNewShot;
}
} }
function getAckAudioKeys(message, businessMessage) { function getAckAudioKeys(message, businessMessage) {
const stabilityMilestoneAudioKey = String(
businessMessage?.stabilityMilestoneAudioKey || ""
).trim();
const stabilityHasNewShot =
businessMessage?.stabilityHasNewShot === true;
switch (message.type) { switch (message.type) {
case ServerMessageType.SERVER_MSG_MATCH_START: case ServerMessageType.SERVER_MSG_MATCH_START:
return [businessMessage?.isSecondHalfStart ? "下半场开始" : "比赛开始"]; if (businessMessage?.isSecondHalfStart) return ["下半场开始"];
// 个人训练在开始接口成功后主动播报,不再等待 MATCH_START 触发语音。
if (
getTrainingStartAudioKey(
businessMessage?.trainingType || currentContext?.trainingType
)
) {
return [];
}
return ["比赛开始"];
case ServerMessageType.SERVER_MSG_NOW_YOU: case ServerMessageType.SERVER_MSG_NOW_YOU:
if (isMeleeMessage(message, businessMessage)) return []; if (isMeleeMessage(message, businessMessage)) return [];
return getNowYouAudioKeys(businessMessage); return getNowYouAudioKeys(businessMessage);
@@ -388,6 +575,27 @@ function getAckAudioKeys(message, businessMessage) {
) { ) {
return []; return [];
} }
const trainingType =
businessMessage?.trainingType || currentContext?.trainingType;
if (trainingType === "precision") {
const shootData = businessMessage?.shootData;
const directionText =
shootData?.angle !== null && shootData?.angle !== undefined
? getDirectionText(shootData.angle)
: "";
return getPrecisionShotAudioKeys(shootData, directionText);
}
if (trainingType === "rhythm") {
return getRhythmShotAudioKeys(businessMessage?.shootData);
}
if (trainingType === "stability") {
return [
...(stabilityHasNewShot
? getStabilityShotAudioKeys(businessMessage?.shootData)
: []),
stabilityMilestoneAudioKey,
].filter(Boolean);
}
return getShootResultAudioKeys(businessMessage?.shootData); return getShootResultAudioKeys(businessMessage?.shootData);
case ServerMessageType.SERVER_MSG_MATCH_END: case ServerMessageType.SERVER_MSG_MATCH_END:
return ["比赛结束"]; return ["比赛结束"];
@@ -652,7 +860,9 @@ function sendHeartbeatAck() {
} }
function sendPracticeInfoSync() { function sendPracticeInfoSync() {
if (!socket || !currentContext?.matchId || !currentContext?.userId) return; if (!socket || !currentContext?.matchId || !currentContext?.userId) {
return false;
}
const clientMessage = { const clientMessage = {
type: ClientMessageType.CLIENT_MSG_SYNC_PRACTICE_INFO, type: ClientMessageType.CLIENT_MSG_SYNC_PRACTICE_INFO,
@@ -667,6 +877,12 @@ function sendPracticeInfoSync() {
"CLIENT_MSG_SYNC_PRACTICE_INFO", "CLIENT_MSG_SYNC_PRACTICE_INFO",
clientMessage clientMessage
); );
return true;
}
// 训练开始后可在不重连 WebSocket 的情况下主动刷新完整练习快照。
export function requestPracticeInfoSync() {
return sendPracticeInfoSync();
} }
function sendAck({ matchId, sequence }) { function sendAck({ matchId, sequence }) {
@@ -805,13 +1021,8 @@ function handleMessage(data) {
return; return;
} }
const typeName = getServerMessageTypeName(message.type);
if (ENABLE_REALTIME_MESSAGE_LOG) { if (ENABLE_REALTIME_MESSAGE_LOG) {
console.log( console.log("收到比赛服 WebSocket 消息", message);
"收到比赛服 WebSocket 消息",
typeName,
getServerMessageLogSummary(message)
);
} }
const decodedMatchId = normalizeId(pickField(message, "matchId", "match_id")); const decodedMatchId = normalizeId(pickField(message, "matchId", "match_id"));
@@ -846,6 +1057,8 @@ function handleMessage(data) {
if (businessMessage?.matchId && currentContext) { if (businessMessage?.matchId && currentContext) {
currentContext.matchId = businessMessage.matchId; currentContext.matchId = businessMessage.matchId;
} }
// 阈值事件必须先于 ACK 判断生成,确保无 sequence 的状态推送也能播放。
attachStabilityAudioContext(message, businessMessage);
queueAckAfterAudio(message, businessMessage); queueAckAfterAudio(message, businessMessage);
emitBusinessMessage(businessMessage); emitBusinessMessage(businessMessage);
} }
@@ -879,6 +1092,7 @@ export function connectMatchWebSocket(options = {}) {
requestPracticeInfoOnOpen = false, requestPracticeInfoOnOpen = false,
appHideResumable = false, appHideResumable = false,
practiceEndAudioKey = "", practiceEndAudioKey = "",
trainingType = "",
force = false, force = false,
reconnecting = false, reconnecting = false,
reconnectReason = "", reconnectReason = "",
@@ -886,6 +1100,7 @@ export function connectMatchWebSocket(options = {}) {
const normalizedMatchId = normalizeId(matchId); const normalizedMatchId = normalizeId(matchId);
const normalizedUserId = normalizeId(userId); const normalizedUserId = normalizeId(userId);
const normalizedMode = Number(mode); const normalizedMode = Number(mode);
const normalizedTrainingType = String(trainingType || "").trim();
const incomingUrl = normalizeServerUrl(serverAddr, token); const incomingUrl = normalizeServerUrl(serverAddr, token);
const currentUrlToken = getUrlToken(currentContext?.url); const currentUrlToken = getUrlToken(currentContext?.url);
const shouldKeepAuthenticatedUrl = !!( const shouldKeepAuthenticatedUrl = !!(
@@ -952,6 +1167,24 @@ export function connectMatchWebSocket(options = {}) {
requestPracticeInfoOnOpen: requestPracticeInfoOnOpen === true, requestPracticeInfoOnOpen: requestPracticeInfoOnOpen === true,
appHideResumable: appHideResumable === true, appHideResumable: appHideResumable === true,
practiceEndAudioKey: String(practiceEndAudioKey || "").trim(), practiceEndAudioKey: String(practiceEndAudioKey || "").trim(),
trainingType:
normalizedTrainingType ||
(isSameContext ? currentContext?.trainingType || "" : ""),
stabilityEnergy: isSameContext
? currentContext?.stabilityEnergy
: undefined,
stabilityScoreSlot: isSameContext
? currentContext?.stabilityScoreSlot
: undefined,
stabilityEnergy50Armed: isSameContext
? currentContext?.stabilityEnergy50Armed
: undefined,
stabilityEnergy70Armed: isSameContext
? currentContext?.stabilityEnergy70Armed
: undefined,
stabilityArrowCount: isSameContext
? currentContext?.stabilityArrowCount
: undefined,
meleeHalfRest: isSameContext meleeHalfRest: isSameContext
? currentContext?.meleeHalfRest === true ? currentContext?.meleeHalfRest === true
: false, : false,
+23
View File
@@ -133,6 +133,29 @@
} }
}, },
"subPackages": [ "subPackages": [
{
"root": "pages/coin",
"pages": [
{
"path": "index"
},
{
"path": "rules"
},
{
"path": "earning-records"
},
{
"path": "exchange-records"
},
{
"path": "nearby-stores"
},
{
"path": "product-detail"
}
]
},
{ {
"root": "pages/device", "root": "pages/device",
"pages": [ "pages": [
@@ -0,0 +1,76 @@
<script setup>
defineProps({
cumulative: {
type: [Number, String],
default: 0,
},
available: {
type: [Number, String],
default: 0,
},
});
</script>
<template>
<view class="balance-panel">
<view class="balance-list">
<view class="balance-item">
<text class="balance-item__label">累计金币</text>
<text class="balance-item__value">{{ cumulative }}</text>
</view>
<view class="balance-list__line" />
<view class="balance-item">
<text class="balance-item__label">可兑换金币</text>
<text class="balance-item__value">{{ available }}</text>
</view>
</view>
</view>
</template>
<style scoped>
.balance-panel {
width: 100%;
padding: 8rpx 28rpx 0;
box-sizing: border-box;
}
.balance-list {
display: flex;
align-items: center;
justify-content: center;
width: 706rpx;
height: 60rpx;
margin-top: 0;
border: 2rpx solid rgba(255, 217, 71, 0.25);
border-radius: 12rpx;
box-sizing: border-box;
background-color: rgba(255, 217, 71, 0.06);
}
.balance-item {
width: auto;
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
}
.balance-item__label {
color: #ffffff;
font-size: 24rpx;
line-height: 34rpx;
}
.balance-item__value {
color: #ffd947;
font-size: 30rpx;
line-height: 42rpx;
}
.balance-list__line {
width: 2rpx;
height: 28rpx;
background-color: rgba(255, 255, 255, 0.5);
margin: 0 22rpx;
}
</style>
@@ -0,0 +1,37 @@
<script setup>
defineProps({
text: {
type: String,
default: "暂无金币获取记录。",
},
});
</script>
<template>
<view class="empty-state">
<image
src="https://static.shelingxingqiu.com/shootmini/static/coin/empty-coin-record.png"
mode="aspectFit"
/>
<text>{{ text }}</text>
</view>
</template>
<style scoped>
.empty-state {
width: 100%;
padding-top: 280rpx;
display: flex;
flex-direction: column;
align-items: center;
color: #ffffff;
font-size: 26rpx;
line-height: 36rpx;
}
.empty-state > image {
width: 162rpx;
height: 190rpx;
margin-bottom: 26rpx;
}
</style>
+86
View File
@@ -0,0 +1,86 @@
<script setup>
import Header from "@/components/Header.vue";
const props = defineProps({
title: {
type: String,
default: "",
},
subtitle: {
type: String,
default: "",
},
onBack: {
type: Function,
default: null,
},
});
</script>
<template>
<view class="coin-header">
<Header title="" :onBack="onBack">
<template #title>
<view class="coin-header__title-group">
<text
:class="[
'coin-header__title',
subtitle ? 'coin-header__title--with-subtitle' : '',
]"
>
{{ title }}
</text>
<text v-if="subtitle" class="coin-header__subtitle">
{{ subtitle }}
</text>
</view>
</template>
</Header>
</view>
</template>
<style scoped>
.coin-header {
position: sticky;
top: 0;
z-index: 20;
width: 100%;
height: 50px;
display: flex;
align-items: center;
flex-shrink: 0;
}
.coin-header__title-group {
position: absolute;
top: 50%;
left: 50%;
width: 430rpx;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
transform: translate(-50%, -50%);
text-align: center;
}
.coin-header__title {
color: #e7ba80;
font-size: 30rpx;
line-height: 42rpx;
font-weight: 500;
white-space: nowrap;
}
.coin-header__title--with-subtitle {
font-size: 28rpx;
}
.coin-header__subtitle {
color: #ffffff;
font-size: 20rpx;
line-height: 28rpx;
font-weight: 400;
white-space: nowrap;
}
</style>
@@ -0,0 +1,50 @@
<script setup>
defineProps({
menus: {
type: Array,
default: () => [],
},
});
const emit = defineEmits(["select"]);
</script>
<template>
<view class="quick-menu">
<view
v-for="item in menus"
:key="item.key"
class="quick-menu__item"
@click="emit('select', item)"
>
<image class="quick-menu__icon" :src="item.icon" mode="aspectFit" />
<text>{{ item.label }}</text>
</view>
</view>
</template>
<style scoped>
.quick-menu {
display: flex;
align-items: flex-start;
justify-content: space-between;
width: 100%;
padding: 26rpx 46rpx 30rpx;
box-sizing: border-box;
}
.quick-menu__item {
width: 142rpx;
display: flex;
flex-direction: column;
align-items: center;
color: #fae6bc;
font-size: 24rpx;
line-height: 34rpx;
}
.quick-menu__icon {
width: 116rpx;
height: 116rpx;
}
</style>
@@ -0,0 +1,188 @@
<script setup>
defineProps({
records: {
type: Array,
default: () => [],
},
mode: {
type: String,
default: "earning",
},
});
</script>
<template>
<view
class="record-table"
:class="{ 'record-table--exchange': mode === 'exchange' }"
>
<view class="record-table__header">
<template v-if="mode === 'exchange'">
<text>兑换内容</text>
<text>兑换类型</text>
<text>时间</text>
<text>金币使用</text>
</template>
<template v-else>
<text>时间</text>
<text>类型</text>
<text>金币获取</text>
</template>
</view>
<view
v-for="item in records"
:key="item.id"
class="record-table__row"
>
<template v-if="mode === 'exchange'">
<text class="record-table__exchange-content">{{ item.content }}</text>
<text class="record-table__exchange-type">{{ item.type }}</text>
<view class="record-table__time record-table__exchange-time">
<text>{{ item.date }}</text>
<text>{{ item.time }}</text>
</view>
<text class="record-table__amount record-table__exchange-amount">
{{ item.amount }}
</text>
</template>
<template v-else>
<view class="record-table__time">
<text>{{ item.date }}</text>
<text>{{ item.time }}</text>
</view>
<text class="record-table__type">{{ item.type }}</text>
<text class="record-table__amount">{{ item.amount }}</text>
</template>
</view>
</view>
</template>
<style scoped>
.record-table {
width: 670rpx;
margin: 20rpx auto 0;
box-sizing: border-box;
border: 2rpx solid rgba(255, 255, 255, 0.35);
}
.record-table__header,
.record-table__row {
display: flex;
align-items: center;
}
.record-table__header {
height: 66rpx;
color: #ffffff;
font-size: 24rpx;
line-height: 34rpx;
}
.record-table__header > text {
height: 100%;
display: flex;
align-items: center;
justify-content: center;
box-sizing: border-box;
border-right: 2rpx solid rgba(255, 255, 255, 0.35);
}
.record-table__header > text:nth-child(1),
.record-table__time {
width: 182rpx;
flex: 0 0 182rpx;
}
.record-table__header > text:nth-child(2),
.record-table__type {
width: 304rpx;
flex: 0 0 304rpx;
}
.record-table__header > text:nth-child(3),
.record-table__amount {
width: 180rpx;
flex: 0 0 180rpx;
border-right: none;
}
.record-table__row {
height: 86rpx;
border-top: 2rpx solid rgba(255, 255, 255, 0.35);
color: #ffffff;
font-size: 24rpx;
line-height: 34rpx;
}
.record-table__row > view,
.record-table__row > text {
height: 100%;
box-sizing: border-box;
border-right: 2rpx solid rgba(255, 255, 255, 0.35);
}
.record-table__time {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.record-table__time > text:last-child {
color: #ffffff;
font-size: 24rpx;
line-height: 34rpx;
}
.record-table__type {
display: flex;
align-items: center;
justify-content: center;
color: #ffffff;
}
.record-table__row > .record-table__amount {
display: flex;
align-items: center;
justify-content: center;
color: #ffffff;
text-align: center;
font-size: 24rpx;
border-right: none;
}
.record-table__exchange-content,
.record-table__exchange-type {
display: flex;
align-items: center;
justify-content: center;
padding: 0 8rpx;
color: #ffffff;
text-align: center;
}
.record-table--exchange .record-table__header > text:nth-child(1),
.record-table__exchange-content {
width: 286rpx;
flex: 0 0 286rpx;
}
.record-table--exchange .record-table__header > text:nth-child(2),
.record-table__exchange-type {
width: 110rpx;
flex: 0 0 110rpx;
}
.record-table--exchange .record-table__header > text:nth-child(3),
.record-table__exchange-time {
width: 160rpx;
flex: 0 0 160rpx;
}
.record-table--exchange .record-table__header > text:nth-child(4),
.record-table__exchange-amount {
width: 110rpx;
flex: 0 0 110rpx;
border-right: none;
}
</style>
@@ -0,0 +1,54 @@
<script setup>
const emit = defineEmits(["authorize"]);
</script>
<template>
<view class="location-state">
<image
src="https://static.shelingxingqiu.com/shootmini/static/coin/location-permission.png"
mode="aspectFit"
/>
<text>授权获取你的定位以便推荐附近门店</text>
<button hover-class="none" @click="emit('authorize')">立即授权</button>
</view>
</template>
<style scoped>
.location-state {
width: 100%;
padding-top: 190rpx;
display: flex;
flex-direction: column;
align-items: center;
color: #ffffff;
font-size: 32rpx;
line-height: 44rpx;
font-weight: 600;
}
.location-state > image {
width: 168rpx;
height: 190rpx;
margin-bottom: 52rpx;
}
.location-state > button {
width: 360rpx;
height: 72rpx;
margin-top: 44rpx;
padding: 0;
display: flex;
align-items: center;
justify-content: center;
border-radius: 36rpx;
background-color: #ffd947;
color: #22222e;
font-size: 26rpx;
line-height: 72rpx;
font-weight: 500;
}
.location-state > button::after {
border: none;
}
</style>
@@ -0,0 +1,56 @@
<script setup>
defineProps({
variant: {
type: String,
default: "gold",
},
});
</script>
<template>
<view class="exchange-notice" :class="`exchange-notice--${variant}`">
<image
src="https://static.shelingxingqiu.com/shootmini/static/coin/icon-notice.png"
mode="aspectFit"
/>
<text>暂不支持线上兑换请前往线下门店进行兑换</text>
</view>
</template>
<style scoped>
.exchange-notice {
display: flex;
align-items: center;
justify-content: center;
width: 504rpx;
height: 40rpx;
margin: 0 auto;
padding: 0 16rpx;
box-sizing: border-box;
color: rgba(255, 255, 255, 0.65);
font-size: 20rpx;
line-height: 28rpx;
border-radius: 24rpx;
}
.exchange-notice--gold {
border: 2rpx solid rgba(255, 217, 71, 0.28);
background-color: rgba(255, 217, 71, 0.05);
}
.exchange-notice--red {
width: 492rpx;
height: 44rpx;
margin: 0 0 0 40rpx;
border: none;
background-color: rgba(255, 96, 96, 0.3);
color: #ffffff;
}
.exchange-notice > image {
width: 24rpx;
height: 24rpx;
margin-right: 8rpx;
flex-shrink: 0;
}
</style>
@@ -0,0 +1,90 @@
<script setup>
import { computed, ref } from "vue";
const DEFAULT_PRODUCT_IMAGE =
"https://static.shelingxingqiu.com/shootmini/static/coin/product-hero-item.png";
const props = defineProps({
images: {
type: Array,
default: () => [],
},
});
const current = ref(0);
const slideImages = computed(() => {
const images = props.images.filter(
(image) => typeof image === "string" && image.trim()
);
return images.length ? images : [DEFAULT_PRODUCT_IMAGE];
});
const onChange = (event) => {
current.value = event.detail.current;
};
</script>
<template>
<view class="hero-swiper">
<swiper class="hero-swiper__body" :duration="260" @change="onChange">
<swiper-item v-for="(image, index) in slideImages" :key="index">
<view class="hero-swiper__item">
<image
class="hero-swiper__background"
src="https://static.shelingxingqiu.com/shootmini/static/coin/product-hero-bg.png"
mode="scaleToFill"
/>
<image class="hero-swiper__product" :src="image" mode="aspectFit" />
</view>
</swiper-item>
</swiper>
<view class="hero-swiper__dots">
<view
v-for="(_, index) in slideImages"
:key="index"
class="hero-swiper__dot"
:class="{ 'hero-swiper__dot--active': current === index }"
/>
</view>
</view>
</template>
<style scoped>
.hero-swiper,
.hero-swiper__body,
.hero-swiper__item {
position: relative;
width: 750rpx;
height: 750rpx;
}
.hero-swiper__background,
.hero-swiper__product {
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 100%;
}
.hero-swiper__dots {
position: absolute;
left: 0;
bottom: 20rpx;
width: 100%;
display: flex;
align-items: center;
justify-content: center;
}
.hero-swiper__dot {
width: 12rpx;
height: 12rpx;
margin: 0 6rpx;
border-radius: 50%;
background-color: rgba(34, 34, 46, 0.55);
}
.hero-swiper__dot--active {
background-color: #ffd947;
}
</style>
@@ -0,0 +1,97 @@
<script setup>
import { computed } from "vue";
const DEFAULT_PRODUCT_IMAGE =
"https://static.shelingxingqiu.com/shootmini/static/coin/product-hero-bg.png";
const props = defineProps({
product: {
type: Object,
required: true,
},
});
const productImage = computed(() => {
const image = props.product?.image;
return typeof image === "string" && image.trim()
? image
: DEFAULT_PRODUCT_IMAGE;
});
</script>
<template>
<view class="product-card">
<view class="product-card__image-wrap">
<image class="product-card__image" :src="productImage" mode="aspectFit" />
</view>
<text class="product-card__name">{{ product.name }}</text>
<view class="product-card__footer">
<text>{{ product.cost }}金币</text>
<text class="product-card__divider">|</text>
<text>剩余{{ product.stock }}</text>
</view>
</view>
</template>
<style scoped>
.product-card {
width: 336rpx;
height: 418rpx;
padding: 10rpx 10rpx 14rpx;
box-sizing: border-box;
border: 2rpx solid rgba(255, 217, 71, 0.1);
border-radius: 12rpx;
background-color: rgba(84, 67, 29, 0.2);
overflow: hidden;
}
.product-card__image-wrap {
position: relative;
width: 312rpx;
height: 312rpx;
overflow: hidden;
border-radius: 12rpx;
}
.product-card__image {
display: block;
width: 100%;
height: 100%;
}
.product-card__name {
display: block;
margin-top: 12rpx;
color: #fff0c9;
font-size: 26rpx;
line-height: 36rpx;
font-weight: 600;
text-align: center;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.product-card__footer {
display: flex;
align-items: center;
justify-content: center;
margin-top: 4rpx;
color: rgba(255, 255, 255, 0.85);
font-size: 22rpx;
line-height: 32rpx;
}
.product-card__footer > text:first-child {
color: #ffffff;
}
.product-card__footer > text:last-child {
color: rgba(255, 255, 255, 0.78);
}
.product-card__divider {
margin: 0 10rpx;
color: rgba(255, 255, 255, 0.45);
}
</style>
+69
View File
@@ -0,0 +1,69 @@
<script setup>
const props = defineProps({
store: {
type: Object,
required: true,
},
});
const emit = defineEmits(["select"]);
const selectStore = () => {
emit("select", props.store);
};
</script>
<template>
<view class="store-card" hover-class="none" @click="selectStore">
<image class="store-card__photo" :src="store.image" mode="aspectFill" />
<text class="store-card__name">{{ store.name }}</text>
<view class="store-card__info">
<view class="store-card__row">
<text>地址{{ store.address }}</text>
</view>
<view class="store-card__row">
<text>电话{{ store.phone }}</text>
</view>
<view class="store-card__row">
<text>营业时间{{ store.hours }}</text>
</view>
</view>
</view>
</template>
<style scoped>
.store-card {
width: 650rpx;
margin: 22rpx auto 0;
box-sizing: border-box;
}
.store-card__photo {
width: 650rpx;
height: 324rpx;
border-radius: 20rpx;
}
.store-card__name {
display: block;
margin-top: 24rpx;
margin-left: 10rpx;
color: #ffffff;
font-size: 32rpx;
line-height: 44rpx;
font-weight: 500;
}
.store-card__info {
width: 584rpx;
margin-top: 12rpx;
margin-left: 10rpx;
}
.store-card__row {
margin-top: 0;
color: #ffffff;
font-size: 24rpx;
line-height: 40rpx;
}
</style>
+22
View File
@@ -0,0 +1,22 @@
export const quickMenus = [
{
key: "rules",
label: "金币规则",
icon: "https://static.shelingxingqiu.com/shootmini/static/coin/icon-rules.png",
},
{
key: "earningRecords",
label: "获取明细",
icon: "https://static.shelingxingqiu.com/shootmini/static/coin/icon-earning-records.png",
},
{
key: "exchangeRecords",
label: "兑换记录",
icon: "https://static.shelingxingqiu.com/shootmini/static/coin/icon-exchange-records.png",
},
{
key: "nearbyStores",
label: "附近门店",
icon: "https://static.shelingxingqiu.com/shootmini/static/coin/icon-nearby-store.png",
},
];
+130
View File
@@ -0,0 +1,130 @@
<script setup>
import { computed, ref } from "vue";
import { onLoad } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue";
import CoinHeader from "./components/CoinHeader.vue";
import CoinRecordList from "./components/CoinRecordList.vue";
import CoinEmptyState from "./components/CoinEmptyState.vue";
import { getGoldLogAPI } from "@/apis";
const PAGE_SIZE = 20;
const storeId = ref("");
const earningRecords = ref([]);
const page = ref(0);
const total = ref(0);
const loading = ref(false);
const noMore = ref(false);
const loaded = ref(false);
const showEmpty = computed(() => loaded.value && !earningRecords.value.length);
const formatRecord = (item = {}) => {
const [date = "", time = ""] = String(item.createdAt || "").split(" ");
const amount = Number(item.amount) || 0;
return {
id: item.id,
date,
time,
type: item.remark || item.typeDesc || "-",
amount: amount > 0 ? `+${amount}` : String(amount),
};
};
// 实际接口返回 totalCount/pageCount/pageSize,同时兼容接口文档中的旧字段。
const updatePaginationState = (result, list, nextPage) => {
const currentPage = Number(result?.page) || nextPage;
const pageCount = Number(result?.pageCount);
const totalCount = Number(result?.totalCount ?? result?.total);
const responsePageSize = Number(result?.pageSize ?? result?.perPage) || PAGE_SIZE;
page.value = currentPage;
total.value = Number.isFinite(totalCount) ? totalCount : 0;
if (Number.isFinite(pageCount) && pageCount >= 0) {
noMore.value = currentPage >= pageCount;
return;
}
if (Number.isFinite(totalCount) && totalCount >= 0) {
noMore.value = earningRecords.value.length >= totalCount;
return;
}
noMore.value = list.length < responsePageSize;
};
const loadRecords = async ({ reset = false } = {}) => {
if (loading.value || (!reset && noMore.value)) return;
const nextPage = reset ? 1 : page.value + 1;
loading.value = true;
if (reset) noMore.value = false;
try {
const result = await getGoldLogAPI({
page: nextPage,
pageSize: PAGE_SIZE,
type: 1,
storeId: storeId.value,
});
const list = Array.isArray(result?.list) ? result.list : [];
const mappedList = list.map(formatRecord);
earningRecords.value = reset
? mappedList
: earningRecords.value.concat(mappedList);
updatePaginationState(result, list, nextPage);
} catch (error) {
if (reset) {
earningRecords.value = [];
page.value = 0;
}
console.error("加载金币获取明细失败", error);
} finally {
loading.value = false;
loaded.value = true;
}
};
onLoad((options = {}) => {
const currentStoreId = String(options.storeId || "");
if (!/^\d+$/.test(currentStoreId) || Number(currentStoreId) <= 0) {
uni.redirectTo({
url: "/pages/coin/nearby-stores",
});
return;
}
storeId.value = currentStoreId;
loadRecords({ reset: true });
});
</script>
<template>
<Container :bgType="6" :isHome="true" @scrolltolower="loadRecords">
<template #header>
<CoinHeader title="金币获取明细" />
</template>
<view class="records-page">
<CoinEmptyState v-if="showEmpty" />
<CoinRecordList v-else :records="earningRecords" />
<view
v-if="loading || (noMore && earningRecords.length)"
class="records-page__status"
>
<text>{{ loading ? "加载中..." : "没有更多了" }}</text>
</view>
</view>
</Container>
</template>
<style scoped>
.records-page {
width: 100%;
min-height: 100%;
}
.records-page__status {
padding: 24rpx 0 32rpx;
color: rgba(255, 255, 255, 0.6);
font-size: 24rpx;
line-height: 34rpx;
text-align: center;
}
</style>
+130
View File
@@ -0,0 +1,130 @@
<script setup>
import { computed, ref } from "vue";
import { onLoad } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue";
import CoinHeader from "./components/CoinHeader.vue";
import CoinRecordList from "./components/CoinRecordList.vue";
import CoinEmptyState from "./components/CoinEmptyState.vue";
import { getGoldLogAPI } from "@/apis";
const PAGE_SIZE = 20;
const storeId = ref("");
const exchangeRecords = ref([]);
const page = ref(0);
const total = ref(0);
const loading = ref(false);
const noMore = ref(false);
const loaded = ref(false);
const showEmpty = computed(() => loaded.value && !exchangeRecords.value.length);
const formatRecord = (item = {}) => {
const [date = "", time = ""] = String(item.createdAt || "").split(" ");
return {
id: item.id,
content: item.remark || "-",
type: item.typeDesc || "-",
date,
time,
amount: String(Number(item.amount) || 0),
};
};
// 实际接口返回 totalCount/pageCount/pageSize,同时兼容接口文档中的旧字段。
const updatePaginationState = (result, list, nextPage) => {
const currentPage = Number(result?.page) || nextPage;
const pageCount = Number(result?.pageCount);
const totalCount = Number(result?.totalCount ?? result?.total);
const responsePageSize = Number(result?.pageSize ?? result?.perPage) || PAGE_SIZE;
page.value = currentPage;
total.value = Number.isFinite(totalCount) ? totalCount : 0;
if (Number.isFinite(pageCount) && pageCount >= 0) {
noMore.value = currentPage >= pageCount;
return;
}
if (Number.isFinite(totalCount) && totalCount >= 0) {
noMore.value = exchangeRecords.value.length >= totalCount;
return;
}
noMore.value = list.length < responsePageSize;
};
const loadRecords = async ({ reset = false } = {}) => {
if (loading.value || (!reset && noMore.value)) return;
const nextPage = reset ? 1 : page.value + 1;
loading.value = true;
if (reset) noMore.value = false;
try {
const result = await getGoldLogAPI({
page: nextPage,
pageSize: PAGE_SIZE,
type: 2,
storeId: storeId.value,
});
const list = Array.isArray(result?.list) ? result.list : [];
const mappedList = list.map(formatRecord);
exchangeRecords.value = reset
? mappedList
: exchangeRecords.value.concat(mappedList);
updatePaginationState(result, list, nextPage);
} catch (error) {
if (reset) {
exchangeRecords.value = [];
page.value = 0;
}
console.error("加载金币兑换记录失败", error);
} finally {
loading.value = false;
loaded.value = true;
}
};
onLoad((options = {}) => {
const currentStoreId = String(options.storeId || "");
if (!/^\d+$/.test(currentStoreId) || Number(currentStoreId) <= 0) {
uni.redirectTo({
url: "/pages/coin/nearby-stores",
});
return;
}
storeId.value = currentStoreId;
loadRecords({ reset: true });
});
</script>
<template>
<Container :bgType="6" :isHome="true" @scrolltolower="loadRecords">
<template #header>
<CoinHeader title="金币兑换记录" />
</template>
<view class="records-page">
<CoinEmptyState v-if="showEmpty" text="暂无金币兑换记录。" />
<CoinRecordList v-else mode="exchange" :records="exchangeRecords" />
<view
v-if="loading || (noMore && exchangeRecords.length)"
class="records-page__status"
>
<text>{{ loading ? "加载中..." : "没有更多了" }}</text>
</view>
</view>
</Container>
</template>
<style scoped>
.records-page {
width: 100%;
min-height: 100%;
}
.records-page__status {
padding: 24rpx 0 32rpx;
color: rgba(255, 255, 255, 0.6);
font-size: 24rpx;
line-height: 34rpx;
text-align: center;
}
</style>
+216
View File
@@ -0,0 +1,216 @@
<script setup>
import { ref } from "vue";
import { onLoad } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue";
import CoinHeader from "./components/CoinHeader.vue";
import CoinBalancePanel from "./components/CoinBalancePanel.vue";
import CoinQuickMenu from "./components/CoinQuickMenu.vue";
import OfflineExchangeNotice from "./components/OfflineExchangeNotice.vue";
import RewardProductCard from "./components/RewardProductCard.vue";
import { getGiftListAPI, getMyGoldAPI } from "@/apis";
import { quickMenus } from "./data";
const PAGE_SIZE = 20;
const coinSummary = ref({
cumulative: 0,
available: 0,
});
const selectedStoreId = ref("");
const selectedStoreName = ref("");
const rewardProducts = ref([]);
const productPage = ref(0);
const productTotal = ref(0);
const productLoading = ref(false);
const productNoMore = ref(false);
const loadCoinSummary = async () => {
try {
const result = await getMyGoldAPI(selectedStoreId.value);
coinSummary.value = {
cumulative: Number(result?.totalGold) || 0,
available: Number(result?.usableGold) || 0,
};
} catch (error) {
console.error("加载金币统计失败", error);
}
};
const loadProducts = async ({ reset = false } = {}) => {
if (productLoading.value || (!reset && productNoMore.value)) return;
const nextPage = reset ? 1 : productPage.value + 1;
productLoading.value = true;
if (reset) productNoMore.value = false;
try {
const result = await getGiftListAPI({
page: nextPage,
pageSize: PAGE_SIZE,
storeId: selectedStoreId.value,
});
const list = Array.isArray(result?.list) ? result.list : [];
const mappedList = list.map((item) => ({
id: item.id,
name: item.name || "",
cost: Number(item.coin_price) || 0,
stock: Number(item.stock) || 0,
image: item.cover_image || "",
}));
rewardProducts.value = reset
? mappedList
: rewardProducts.value.concat(mappedList);
productPage.value = Number(result?.page) || nextPage;
const pageCount = Number(result?.pageCount ?? result?.page_count);
const totalCount = Number(result?.totalCount ?? result?.total);
const responsePageSize =
Number(result?.pageSize ?? result?.page_size) || PAGE_SIZE;
productTotal.value = Number.isFinite(totalCount) ? totalCount : 0;
if (Number.isFinite(pageCount) && pageCount >= 0) {
productNoMore.value = productPage.value >= pageCount;
} else if (Number.isFinite(totalCount) && totalCount >= 0) {
productNoMore.value = rewardProducts.value.length >= totalCount;
} else {
productNoMore.value = list.length < responsePageSize;
}
} catch (error) {
if (reset) {
rewardProducts.value = [];
productPage.value = 0;
}
console.error("加载礼品列表失败", error);
} finally {
productLoading.value = false;
}
};
const menuRoutes = {
rules: "/pages/coin/rules",
earningRecords: "/pages/coin/earning-records",
exchangeRecords: "/pages/coin/exchange-records",
};
const buildStorePageUrl = (path, extraQuery = "") => {
const query = [
`storeId=${encodeURIComponent(selectedStoreId.value)}`,
`storeName=${encodeURIComponent(selectedStoreName.value)}`,
extraQuery,
]
.filter(Boolean)
.join("&");
return `${path}?${query}`;
};
const decodeRouteText = (value = "") => {
const text = String(value);
try {
return decodeURIComponent(text.replace(/\+/g, " "));
} catch (error) {
console.error("门店名称解码失败", error);
return text;
}
};
const onMenuSelect = (menu) => {
if (menu.key === "nearbyStores") {
uni.redirectTo({
url: "/pages/coin/nearby-stores",
});
return;
}
const url = menuRoutes[menu.key];
if (!url) {
uni.showToast({
title: "功能开发中",
icon: "none",
});
return;
}
uni.navigateTo({
url: buildStorePageUrl(url),
});
};
const toProductDetail = (product) => {
uni.navigateTo({
url: buildStorePageUrl(
"/pages/coin/product-detail",
`id=${encodeURIComponent(product.id)}`
),
});
};
onLoad((options = {}) => {
const storeId = String(options.storeId || "");
if (!/^\d+$/.test(storeId) || Number(storeId) <= 0) {
uni.redirectTo({
url: "/pages/coin/nearby-stores",
});
return;
}
selectedStoreId.value = storeId;
selectedStoreName.value = decodeRouteText(options.storeName);
loadCoinSummary();
loadProducts({ reset: true });
});
</script>
<template>
<Container :bgType="6" :isHome="true" @scrolltolower="loadProducts">
<template #header>
<CoinHeader title="我的金币" :subtitle="selectedStoreName" />
</template>
<view class="coin-page">
<CoinBalancePanel
:cumulative="coinSummary.cumulative"
:available="coinSummary.available"
/>
<CoinQuickMenu :menus="quickMenus" @select="onMenuSelect" />
<OfflineExchangeNotice />
<view class="reward-section">
<view class="reward-grid">
<view
v-for="product in rewardProducts"
:key="product.id"
class="reward-grid__item"
@click="toProductDetail(product)"
>
<RewardProductCard :product="product" />
</view>
</view>
</view>
</view>
</Container>
</template>
<style scoped>
.coin-page {
width: 100%;
min-height: 100%;
padding-bottom: 40rpx;
box-sizing: border-box;
}
.reward-section {
padding: 20rpx 28rpx 40rpx;
box-sizing: border-box;
}
.reward-grid {
display: flex;
flex-wrap: wrap;
}
.reward-grid__item {
width: 336rpx;
margin-right: 22rpx;
margin-bottom: 20rpx;
}
.reward-grid__item:nth-child(2n) {
margin-right: 0;
}
</style>
+167
View File
@@ -0,0 +1,167 @@
<script setup>
import { ref } from "vue";
import { onLoad } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue";
import CoinHeader from "./components/CoinHeader.vue";
import LocationPermissionState from "./components/LocationPermissionState.vue";
import StoreCard from "./components/StoreCard.vue";
import { getNearbyStoresAPI } from "@/apis";
const PAGE_SIZE = 20;
const DEFAULT_STORE_IMAGE =
"https://static.shelingxingqiu.com/shootmini/static/coin/store-photo.png";
const showPermissionState = ref(false);
const stores = ref([]);
const location = ref(null);
const page = ref(0);
const total = ref(0);
const loading = ref(false);
const noMore = ref(false);
const loaded = ref(false);
const getCurrentLocation = () =>
new Promise((resolve, reject) => {
uni.getLocation({
type: "gcj02",
success: resolve,
fail: reject,
});
});
const mapStore = (item = {}) => ({
id: item.id,
name: item.name || "",
address: item.address || "",
phone: item.phone || "",
hours: item.businessHours || "",
image: item.coverImage || DEFAULT_STORE_IMAGE,
});
const loadStores = async ({ reset = false } = {}) => {
if (!location.value || loading.value || (!reset && noMore.value)) return;
const nextPage = reset ? 1 : page.value + 1;
loading.value = true;
if (reset) noMore.value = false;
try {
const result = await getNearbyStoresAPI({
...location.value,
page: nextPage,
pageSize: PAGE_SIZE,
});
const list = Array.isArray(result?.list) ? result.list : [];
const mappedList = list.map(mapStore);
stores.value = reset ? mappedList : stores.value.concat(mappedList);
page.value = Number(result?.page) || nextPage;
const pageCount = Number(result?.pageCount);
const totalCount = Number(result?.totalCount ?? result?.total);
const responsePageSize = Number(result?.pageSize) || PAGE_SIZE;
total.value = Number.isFinite(totalCount) ? totalCount : 0;
if (Number.isFinite(pageCount) && pageCount >= 0) {
noMore.value = page.value >= pageCount;
} else if (Number.isFinite(totalCount) && totalCount >= 0) {
noMore.value = stores.value.length >= totalCount;
} else {
noMore.value = list.length < responsePageSize;
}
} catch (error) {
if (reset) {
stores.value = [];
page.value = 0;
}
console.error("加载附近门店失败", error);
} finally {
loading.value = false;
loaded.value = true;
}
};
const locateAndLoadStores = async () => {
try {
const position = await getCurrentLocation();
location.value = {
longitude: position.longitude,
latitude: position.latitude,
};
showPermissionState.value = false;
await loadStores({ reset: true });
} catch (error) {
showPermissionState.value = true;
loaded.value = true;
console.error("获取定位失败", error);
}
};
const authorizeLocation = () => {
uni.openSetting({
success: locateAndLoadStores,
fail: locateAndLoadStores,
});
};
// 选择门店后替换当前页面,返回时直接回到进入金币模块前的页面。
const selectStore = (store) => {
const storeId = String(store?.id || "");
if (!/^\d+$/.test(storeId) || Number(storeId) <= 0) {
uni.showToast({
title: "门店信息无效",
icon: "none",
});
return;
}
const storeName = encodeURIComponent(store?.name || "");
uni.redirectTo({
url: `/pages/coin/index?storeId=${encodeURIComponent(storeId)}&storeName=${storeName}`,
});
};
onLoad(locateAndLoadStores);
</script>
<template>
<Container :bgType="6" :isHome="true" @scrolltolower="loadStores">
<template #header>
<CoinHeader title="附近门店" />
</template>
<view class="stores-page">
<LocationPermissionState
v-if="showPermissionState"
@authorize="authorizeLocation"
/>
<template v-else>
<StoreCard
v-for="store in stores"
:key="store.id"
:store="store"
@select="selectStore"
/>
<text v-if="loaded && !stores.length" class="stores-page__more">
附近暂无门店~
</text>
<text v-else-if="noMore" class="stores-page__more">没有更多门店了~</text>
</template>
</view>
</Container>
</template>
<style scoped>
.stores-page {
width: 100%;
min-height: 100%;
padding-bottom: 54rpx;
box-sizing: border-box;
}
.stores-page__more {
display: block;
width: 650rpx;
margin: 26rpx auto 0;
color: rgba(255, 255, 255, 0.72);
font-size: 26rpx;
line-height: 36rpx;
text-align: left;
}
</style>
+144
View File
@@ -0,0 +1,144 @@
<script setup>
import { ref } from "vue";
import { onLoad } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue";
import CoinHeader from "./components/CoinHeader.vue";
import ProductHeroSwiper from "./components/ProductHeroSwiper.vue";
import OfflineExchangeNotice from "./components/OfflineExchangeNotice.vue";
import { getGiftDetailAPI } from "@/apis";
const productDetail = ref({
name: "",
coinPrice: 0,
stock: 0,
images: [],
descriptions: [],
});
const loadProductDetail = async (id) => {
try {
const result = await getGiftDetailAPI(id);
const images = Array.isArray(result?.images)
? result.images
.slice()
.sort((first, second) =>
(Number(first?.sort_order) || 0) - (Number(second?.sort_order) || 0)
)
.map((item) => item?.image_url)
.filter(Boolean)
: [];
productDetail.value = {
...productDetail.value,
name: result?.name || "",
coinPrice: Number(result?.coin_price) || 0,
stock: Number(result?.stock) || 0,
images,
descriptions: result?.description
? String(result.description).split(/\r?\n/).filter(Boolean)
: [],
};
} catch (error) {
console.error("加载礼品详情失败", error);
}
};
onLoad((options = {}) => {
const id = Number(options.id);
if (!Number.isInteger(id) || id <= 0) {
uni.showToast({
title: "商品参数无效",
icon: "none",
});
return;
}
loadProductDetail(id);
});
</script>
<template>
<Container :bgType="6" :isHome="true">
<template #header>
<CoinHeader title="商品详情" />
</template>
<view class="product-detail">
<ProductHeroSwiper
:images="productDetail.images"
/>
<view class="product-detail__summary">
<text class="product-detail__name">{{ productDetail.name }}</text>
<view class="product-detail__balance">
<text>金币</text>
<text class="product-detail__amount">{{ productDetail.coinPrice }}</text>
<text>剩余{{ productDetail.stock }}</text>
</view>
</view>
<OfflineExchangeNotice variant="red" />
<view class="product-detail__content">
<text
v-for="(description, index) in productDetail.descriptions"
:key="index"
class="product-detail__paragraph"
>
{{ description }}
</text>
</view>
</view>
</Container>
</template>
<style scoped>
.product-detail {
width: 100%;
min-height: 100%;
padding-bottom: 60rpx;
box-sizing: border-box;
background-color: #22222e;
}
.product-detail__summary {
padding: 30rpx 40rpx 20rpx;
display: flex;
flex-direction: column;
}
.product-detail__name {
color: #ffd947;
font-size: 52rpx;
line-height: 74rpx;
font-weight: 500;
}
.product-detail__balance {
display: flex;
align-items: baseline;
margin-top: 10rpx;
color: rgba(255, 255, 255, 0.75);
font-size: 24rpx;
line-height: 34rpx;
}
.product-detail__amount {
margin-right: 6rpx;
color: #ffffff;
font-size: 36rpx;
line-height: 50rpx;
font-weight: 500;
}
.product-detail__content {
padding: 38rpx 40rpx 60rpx;
box-sizing: border-box;
border-bottom: 2rpx solid rgba(255, 217, 71, 0.05);
}
.product-detail__paragraph {
display: block;
margin-bottom: 20rpx;
color: rgba(255, 255, 255, 0.75);
font-size: 26rpx;
line-height: 40rpx;
text-align: justify;
}
</style>
+133
View File
@@ -0,0 +1,133 @@
<script setup>
import { computed, ref } from "vue";
import { onLoad } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue";
import CoinHeader from "./components/CoinHeader.vue";
import CoinEmptyState from "./components/CoinEmptyState.vue";
import { getStoreGoldRuleListAPI } from "@/apis";
const PAGE_SIZE = 20;
const storeId = ref("");
const coinRules = ref([]);
const page = ref(0);
const loading = ref(false);
const noMore = ref(false);
const loaded = ref(false);
const showEmpty = computed(() => loaded.value && !coinRules.value.length);
const updatePaginationState = (result, list, nextPage) => {
const currentPage = Number(result?.page) || nextPage;
const pageCount = Number(result?.pageCount ?? result?.page_count);
const totalCount = Number(result?.totalCount ?? result?.total);
const responsePageSize =
Number(result?.pageSize ?? result?.page_size) || PAGE_SIZE;
page.value = currentPage;
if (Number.isFinite(pageCount) && pageCount >= 0) {
noMore.value = currentPage >= pageCount;
return;
}
if (Number.isFinite(totalCount) && totalCount >= 0) {
noMore.value = coinRules.value.length >= totalCount;
return;
}
noMore.value = list.length < responsePageSize;
};
const loadRules = async ({ reset = false } = {}) => {
if (loading.value || (!reset && noMore.value)) return;
const nextPage = reset ? 1 : page.value + 1;
loading.value = true;
if (reset) noMore.value = false;
try {
const result = await getStoreGoldRuleListAPI({
storeId: storeId.value,
page: nextPage,
pageSize: PAGE_SIZE,
});
const list = Array.isArray(result?.list) ? result.list : [];
const mappedList = list.map((item) => ({
id: item.id,
content: item.content || "",
}));
coinRules.value = reset ? mappedList : coinRules.value.concat(mappedList);
updatePaginationState(result, list, nextPage);
} catch (error) {
if (reset) {
coinRules.value = [];
page.value = 0;
}
console.error("加载金币规则失败", error);
} finally {
loading.value = false;
loaded.value = true;
}
};
onLoad((options = {}) => {
const currentStoreId = String(options.storeId || "");
if (!/^\d+$/.test(currentStoreId) || Number(currentStoreId) <= 0) {
uni.redirectTo({
url: "/pages/coin/nearby-stores",
});
return;
}
storeId.value = currentStoreId;
loadRules({ reset: true });
});
</script>
<template>
<Container :bgType="6" :isHome="true" @scrolltolower="loadRules">
<template #header>
<CoinHeader title="金币规则" />
</template>
<view class="rules-page">
<CoinEmptyState v-if="showEmpty" text="暂无金币规则。" />
<template v-else>
<view
v-for="rule in coinRules"
:key="rule.id"
class="rules-page__item"
>
<rich-text class="rules-page__content" :nodes="rule.content" />
</view>
</template>
<view v-if="loading" class="rules-page__status">
<text>加载中...</text>
</view>
</view>
</Container>
</template>
<style scoped>
.rules-page {
width: 100%;
padding: 28rpx 38rpx 60rpx;
box-sizing: border-box;
}
.rules-page__item {
margin-bottom: 26rpx;
color: rgba(255, 255, 255, 0.88);
font-size: 28rpx;
line-height: 52rpx;
text-align: justify;
}
.rules-page__content {
display: block;
}
.rules-page__status {
padding: 12rpx 0 20rpx;
color: rgba(255, 255, 255, 0.6);
font-size: 24rpx;
line-height: 34rpx;
text-align: center;
}
</style>
+15 -11
View File
@@ -22,7 +22,12 @@ import {
} from "@/apis"; } from "@/apis";
import { connectMatchWebSocket, closeMatchWebSocket } from "@/matchWebsocket"; import { connectMatchWebSocket, closeMatchWebSocket } from "@/matchWebsocket";
import { sharePractiseData } from "@/canvas"; import { sharePractiseData } from "@/canvas";
import { wxShare, debounce } from "@/util"; import {
wxShare,
debounce,
getDistanceCheckAudioKey,
getShootValidation,
} from "@/util";
import { MESSAGETYPESV2 } from "@/constants"; import { MESSAGETYPESV2 } from "@/constants";
import useStore from "@/store"; import useStore from "@/store";
import { storeToRefs } from "pinia"; import { storeToRefs } from "pinia";
@@ -109,7 +114,7 @@ const createPractise = async (arrows) => {
const result = await createPractiseAPI( const result = await createPractiseAPI(
arrows, arrows,
120, 120,
1, 2,
device.value.deviceId device.value.deviceId
); );
if (result) practiseId.value = result.id; if (result) practiseId.value = result.id;
@@ -154,14 +159,11 @@ async function onReceiveMessage(msg) {
} else if (msg.type === MESSAGETYPESV2.BattleEnd) { } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
setTimeout(() => onOver(msg), 1500); setTimeout(() => onOver(msg), 1500);
} else if (msg.type === MESSAGETYPESV2.TestDistance && step.value === 3) { } else if (msg.type === MESSAGETYPESV2.TestDistance && step.value === 3) {
const rawDistance = Number(msg.shootData?.distance); const result = getShootValidation(msg.shootData);
if (rawDistance === 0) { const isQualified = result.distanceOk && result.targetOk;
audioManager.play("未发现靶纸,请瞄准靶纸射箭"); audioManager.play(getDistanceCheckAudioKey(msg.shootData));
} else if (rawDistance / 100 >= 5) { btnDisabled.value = !isQualified;
audioManager.play("距离合格"); showGuide.value = isQualified;
btnDisabled.value = false;
showGuide.value = true;
} else audioManager.play("距离不足");
} }
// messages.forEach((msg) => { // messages.forEach((msg) => {
// if (msg.constructor === MESSAGETYPES.ShootSyncMeArrowID) { // if (msg.constructor === MESSAGETYPES.ShootSyncMeArrowID) {
@@ -382,7 +384,7 @@ const getResultTipSrc = (result = {}) => {
<text>请完成以上步骤校准智能弓</text> <text>请完成以上步骤校准智能弓</text>
</view> </view>
<ShootProgress v-if="step === 5" tips="请开始连续射箭" :start="start" /> <ShootProgress v-if="step === 5" tips="请开始连续射箭" :start="start" />
<TestDistance v-if="step === 3" :guide="false" /> <TestDistance v-if="step === 3" :guide="false" :targetType="40" />
<view <view
class="user-row" class="user-row"
v-if="step === 5" v-if="step === 5"
@@ -397,6 +399,8 @@ const getResultTipSrc = (result = {}) => {
:totalRound="step === 5 ? total : 0" :totalRound="step === 5 ? total : 0"
:scores="scores" :scores="scores"
:isSvip="isSvip" :isSvip="isSvip"
:targetType="40"
stable-shot-effect
/> />
<ScorePanel <ScorePanel
v-if="step === 5" v-if="step === 5"
+119 -48
View File
@@ -1,5 +1,5 @@
<script setup> <script setup>
import {onMounted, onUnmounted, ref} from "vue"; import {onMounted, onUnmounted, ref, watch} from "vue";
import {onShareAppMessage, onShareTimeline, onShow} from "@dcloudio/uni-app"; import {onShareAppMessage, onShareTimeline, onShow} from "@dcloudio/uni-app";
import Container from "@/components/Container.vue"; import Container from "@/components/Container.vue";
import AppFooter from "@/components/AppFooter.vue"; import AppFooter from "@/components/AppFooter.vue";
@@ -52,20 +52,41 @@ const otaInfo = ref({
forceUpdate: false, forceUpdate: false,
}); });
const isStartingOta = ref(false); const isStartingOta = ref(false);
let isCheckingOta = false;
let otaCheckQueuedForOnline = false;
let otaProgressTimer = null; let otaProgressTimer = null;
let otaStatusTimer = null; let otaStatusTimer = null;
let otaTimeoutTimer = null; let otaTimeoutTimer = null;
let otaResultTimer = null;
let otaStatusPollCount = 0;
let otaUpdateRunId = 0;
// 首页 OTA 轮询采用请求次数和总时长双重兜底,避免更新中状态长期卡住。
const OTA_TASK_STATUS_POLL_INTERVAL = 2000;
const OTA_TASK_STATUS_MAX_POLL_COUNT = 15;
const OTA_TASK_STATUS_TIMEOUT = 30000;
// 清理首页 OTA 更新定时器,避免弹窗关闭或页面卸载后继续轮询。 // 清理首页 OTA 更新定时器,避免弹窗关闭或页面卸载后继续轮询。
const clearOtaUpdateTimers = () => { const clearOtaUpdateTimers = () => {
clearInterval(otaProgressTimer); clearInterval(otaProgressTimer);
clearTimeout(otaStatusTimer); clearTimeout(otaStatusTimer);
clearTimeout(otaTimeoutTimer); clearTimeout(otaTimeoutTimer);
clearTimeout(otaResultTimer);
otaProgressTimer = null; otaProgressTimer = null;
otaStatusTimer = null; otaStatusTimer = null;
otaTimeoutTimer = null; otaTimeoutTimer = null;
otaResultTimer = null;
otaStatusPollCount = 0;
}; };
// 使当前 OTA 运行失效,确保旧请求返回后不会继续轮询或覆盖新状态。
const invalidateOtaUpdateRun = () => {
otaUpdateRunId += 1;
clearOtaUpdateTimers();
};
const isOtaUpdateRunActive = (runId) =>
runId === otaUpdateRunId && otaState.value === "update_progress";
// 启动首页 OTA 本地进度动画,最终成功失败以后端任务状态为准。 // 启动首页 OTA 本地进度动画,最终成功失败以后端任务状态为准。
const startOtaProgressAnimation = () => { const startOtaProgressAnimation = () => {
clearInterval(otaProgressTimer); clearInterval(otaProgressTimer);
@@ -91,21 +112,51 @@ const applyOtaVersionInfo = (versionInfo) => {
// 检查当前设备盒子是否存在可升级版本。 // 检查当前设备盒子是否存在可升级版本。
const checkOtaUpdate = async () => { const checkOtaUpdate = async () => {
let versionInfo; if (isCheckingOta || otaVisible.value) return;
isCheckingOta = true;
try { try {
versionInfo = await getHardwareBoxVersionAPI(); let deviceStatus;
} catch (err) { try {
deviceStatus = await getDeviceBatteryAPI();
} catch (err) {
return;
}
if (deviceStatus?.online !== true || otaVisible.value) return;
let versionInfo;
try {
versionInfo = await getHardwareBoxVersionAPI();
} catch (err) {
return;
}
if (!versionInfo?.needUpdate || otaVisible.value) return;
applyOtaVersionInfo(versionInfo);
const dismissedAt = uni.getStorageSync("ota_dismissed_at");
const now = Date.now();
if (!otaInfo.value.forceUpdate && dismissedAt && now - dismissedAt < 24 * 60 * 60 * 1000) return;
otaState.value = "new_version";
otaVisible.value = true;
} finally {
isCheckingOta = false;
const shouldRecheckForOnline = otaCheckQueuedForOnline;
otaCheckQueuedForOnline = false;
if (shouldRecheckForOnline && !otaVisible.value) {
void checkOtaUpdate();
}
}
};
// 设备由 WS 通知上线时补查 OTA;已显示任何 OTA 弹窗时保留当前流程和结果。
watch(online, (nextOnline, previousOnline) => {
if (previousOnline !== false || nextOnline !== true || otaVisible.value) return;
if (isCheckingOta) {
otaCheckQueuedForOnline = true;
return; return;
} }
if (!versionInfo?.needUpdate) return; void checkOtaUpdate();
applyOtaVersionInfo(versionInfo); });
const dismissedAt = uni.getStorageSync("ota_dismissed_at");
const now = Date.now();
if (!otaInfo.value.forceUpdate && dismissedAt && now - dismissedAt < 24 * 60 * 60 * 1000) return;
otaState.value = "new_version";
otaVisible.value = true;
};
// 拼接 OTA WiFi 页参数,让未连 WiFi 的设备继续使用同一份版本信息。 // 拼接 OTA WiFi 页参数,让未连 WiFi 的设备继续使用同一份版本信息。
const getOtaWifiUrl = () => { const getOtaWifiUrl = () => {
@@ -125,61 +176,78 @@ const handleOtaDismiss = () => {
}; };
// 将首页 OTA 直连更新流程标记为失败。 // 将首页 OTA 直连更新流程标记为失败。
const failHomeOtaUpdate = () => { const failHomeOtaUpdate = (runId) => {
clearOtaUpdateTimers(); if (!isOtaUpdateRunActive(runId)) return;
invalidateOtaUpdateRun();
isStartingOta.value = false; isStartingOta.value = false;
otaState.value = "update_failure"; otaState.value = "update_failure";
otaVisible.value = true; otaVisible.value = true;
}; };
// 将首页 OTA 直连更新流程标记为成功。 // 将首页 OTA 直连更新流程标记为成功。
const completeHomeOtaUpdate = () => { const completeHomeOtaUpdate = (runId) => {
clearOtaUpdateTimers(); if (!isOtaUpdateRunActive(runId)) return;
invalidateOtaUpdateRun();
isStartingOta.value = false; isStartingOta.value = false;
otaProgress.value = 100; otaProgress.value = 100;
setTimeout(() => { const completedRunId = otaUpdateRunId;
otaResultTimer = setTimeout(() => {
otaResultTimer = null;
if (completedRunId !== otaUpdateRunId) return;
otaState.value = "update_success"; otaState.value = "update_success";
otaVisible.value = true; otaVisible.value = true;
}, 300); }, 300);
}; };
// 轮询首页直接发起的 OTA 更新任务状态。 // 轮询首页直接发起的 OTA 更新任务状态。
const pollHomeOtaTaskStatus = (taskId) => { const pollHomeOtaTaskStatus = async (taskId, runId) => {
clearTimeout(otaStatusTimer); if (!isOtaUpdateRunActive(runId)) return;
otaStatusTimer = setTimeout(async () => {
try { otaStatusPollCount += 1;
const taskStatus = await getHardwareBoxTaskStatusAPI(taskId); try {
const status = Number(taskStatus?.status); const taskStatus = await getHardwareBoxTaskStatusAPI(taskId);
if (status === 2) { if (!isOtaUpdateRunActive(runId)) return;
completeHomeOtaUpdate();
return; const status = Number(taskStatus?.status);
} if (status === 2) {
if (status === 3) { completeHomeOtaUpdate(runId);
failHomeOtaUpdate(); return;
return;
}
if (status === 0 || status === 1) {
pollHomeOtaTaskStatus(taskId);
return;
}
failHomeOtaUpdate();
} catch (err) {
failHomeOtaUpdate();
} }
}, 3000); if (status === 3) {
failHomeOtaUpdate(runId);
return;
}
if (status === 0 || status === 1) {
if (otaStatusPollCount >= OTA_TASK_STATUS_MAX_POLL_COUNT) {
failHomeOtaUpdate(runId);
return;
}
otaStatusTimer = setTimeout(() => {
otaStatusTimer = null;
if (!isOtaUpdateRunActive(runId)) return;
void pollHomeOtaTaskStatus(taskId, runId);
}, OTA_TASK_STATUS_POLL_INTERVAL);
return;
}
failHomeOtaUpdate(runId);
} catch (err) {
if (!isOtaUpdateRunActive(runId)) return;
failHomeOtaUpdate(runId);
}
}; };
// 设备盒子已连 WiFi 时,从首页直接传空 WiFi 信息发起 OTA 更新。 // 设备盒子已连 WiFi 时,从首页直接传空 WiFi 信息发起 OTA 更新。
const startHomeOtaUpdate = async () => { const startHomeOtaUpdate = async () => {
invalidateOtaUpdateRun();
const runId = otaUpdateRunId;
otaState.value = "update_progress"; otaState.value = "update_progress";
otaVisible.value = true; otaVisible.value = true;
otaProgress.value = 0; otaProgress.value = 0;
startOtaProgressAnimation(); startOtaProgressAnimation();
otaTimeoutTimer = setTimeout(() => { otaTimeoutTimer = setTimeout(() => {
if (otaState.value === "update_progress") { if (!isOtaUpdateRunActive(runId)) return;
failHomeOtaUpdate(); failHomeOtaUpdate(runId);
} }, OTA_TASK_STATUS_TIMEOUT);
}, 5 * 60 * 1000);
try { try {
const updateResult = await sendHardwareBoxUpdateAPI({ const updateResult = await sendHardwareBoxUpdateAPI({
@@ -188,13 +256,15 @@ const startHomeOtaUpdate = async () => {
wifiPassword: "", wifiPassword: "",
resourceUrl: otaInfo.value.resourceUrl, resourceUrl: otaInfo.value.resourceUrl,
}); });
if (!isOtaUpdateRunActive(runId)) return;
if (!updateResult?.taskId) { if (!updateResult?.taskId) {
failHomeOtaUpdate(); failHomeOtaUpdate(runId);
return; return;
} }
pollHomeOtaTaskStatus(updateResult.taskId); void pollHomeOtaTaskStatus(updateResult.taskId, runId);
} catch (err) { } catch (err) {
failHomeOtaUpdate(); if (!isOtaUpdateRunActive(runId)) return;
failHomeOtaUpdate(runId);
} }
}; };
@@ -240,6 +310,7 @@ const handleOtaDone = () => {
// 处理 OTA 更新失败后的重试按钮,重新走立即更新判断流程。 // 处理 OTA 更新失败后的重试按钮,重新走立即更新判断流程。
const handleOtaRetry = () => { const handleOtaRetry = () => {
invalidateOtaUpdateRun();
handleOtaUpdate(); handleOtaUpdate();
}; };
@@ -351,7 +422,7 @@ onMounted(async () => {
}); });
onUnmounted(() => { onUnmounted(() => {
clearOtaUpdateTimers(); invalidateOtaUpdateRun();
}); });
onShareAppMessage(() => { onShareAppMessage(() => {
+6
View File
@@ -29,6 +29,7 @@ const { user, online } = storeToRefs(store);
const title = ref(""); const title = ref("");
const start = ref(null); const start = ref(null);
const battleId = ref(""); const battleId = ref("");
const targetType = ref(20);
/** 对战模式:1=好友约战 2=排位赛,用于结算页跳转判断 */ /** 对战模式:1=好友约战 2=排位赛,用于结算页跳转判断 */
const way = ref(0); const way = ref(0);
const currentRound = ref(1); const currentRound = ref(1);
@@ -254,6 +255,8 @@ watch(online, (newVal, oldVal) => {
function recoverData(battleInfo, { force = false } = {}) { function recoverData(battleInfo, { force = false } = {}) {
battleInfo = normalizeBattleInfo(battleInfo); battleInfo = normalizeBattleInfo(battleInfo);
if (!battleInfo) return; if (!battleInfo) return;
const nextTargetType = Number(battleInfo.targetType ?? battleInfo.target_type);
if ([20, 40].includes(nextTargetType)) targetType.value = nextTargetType;
if (battleInfo.status !== undefined) { if (battleInfo.status !== undefined) {
battleEnded = [2, 4].includes(Number(battleInfo.status)); battleEnded = [2, 4].includes(Number(battleInfo.status));
} }
@@ -374,6 +377,7 @@ function onMatchSocketState(event) {
} }
onLoad(async (options) => { onLoad(async (options) => {
targetType.value = 20;
const returnSnapshot = options.fromReturn ? takeMatchReturnSnapshot() : null; const returnSnapshot = options.fromReturn ? takeMatchReturnSnapshot() : null;
skipNextRestoreOnShow = false; skipNextRestoreOnShow = false;
if (returnSnapshot?.matchId) battleId.value = returnSnapshot.matchId; if (returnSnapshot?.matchId) battleId.value = returnSnapshot.matchId;
@@ -468,6 +472,7 @@ onShow(() => {
:guide="false" :guide="false"
:isBattle="true" :isBattle="true"
:count="readyTime" :count="readyTime"
:targetType="targetType"
/> />
<ShootProgress <ShootProgress
:show="start" :show="start"
@@ -490,6 +495,7 @@ onShow(() => {
:totalRound="12" :totalRound="12"
:scores="playersScores.map((r) => r[user.id]).flat()" :scores="playersScores.map((r) => r[user.id]).flat()"
:isSvip="isCurrentUserSvip" :isSvip="isCurrentUserSvip"
:targetType="targetType"
:stop="halfRest" :stop="halfRest"
stable-shot-effect stable-shot-effect
/> />
+1 -10
View File
@@ -13,19 +13,10 @@ const { user } = storeToRefs(store);
const arrows = ref([]); const arrows = ref([]);
const isSvip = ref(false); const isSvip = ref(false);
const practiseDetail = ref({}); const practiseDetail = ref({});
const trainingTypeNameMap = Object.freeze({
base: "基础训练",
endurance: "耐力训练",
precision: "精准训练",
rhythm: "节奏训练",
});
const trainingType = computed(() => const trainingType = computed(() =>
String(practiseDetail.value.trainingType || "").trim().toLowerCase() String(practiseDetail.value.trainingType || "").trim().toLowerCase()
); );
const trainingTypeName = computed(
() => trainingTypeNameMap[trainingType.value] || "自由训练"
);
const targetTypeText = computed(() => { const targetTypeText = computed(() => {
const targetType = Number(practiseDetail.value.targetType); const targetType = Number(practiseDetail.value.targetType);
return targetType > 0 ? `${targetType}CM靶` : ""; return targetType > 0 ? `${targetType}CM靶` : "";
@@ -82,7 +73,7 @@ onLoad(async (options) => {
</view> --> </view> -->
<view v-if="practiseDetail.id" class="practice-meta"> <view v-if="practiseDetail.id" class="practice-meta">
<text v-if="targetTypeText">{{ targetTypeText }}</text> <text v-if="targetTypeText">{{ targetTypeText }}</text>
<text>{{ trainingTypeName }}</text> <text>{{ practiseDetail.trainingTypeText }}</text>
<text v-if="difficultyText">{{ difficultyText }}</text> <text v-if="difficultyText">{{ difficultyText }}</text>
</view> </view>
<view :style="{ marginBottom: '20px' }"> <view :style="{ marginBottom: '20px' }">
+1 -12
View File
@@ -15,17 +15,6 @@ const selectedIndex = ref(0);
const matchList = ref([]); const matchList = ref([]);
const battleList = ref([]); const battleList = ref([]);
const practiseList = ref([]); const practiseList = ref([]);
const trainingTypeNameMap = Object.freeze({
base: "基础训练",
endurance: "耐力训练",
precision: "精准训练",
rhythm: "节奏训练",
});
const getTrainingTypeName = (trainingType) => {
const normalizedType = String(trainingType || "").trim().toLowerCase();
return trainingTypeNameMap[normalizedType] || "自由训练";
};
const formatPractiseTime = (value) => { const formatPractiseTime = (value) => {
const normalizedTime = String(value || "").trim(); const normalizedTime = String(value || "").trim();
@@ -172,7 +161,7 @@ onLoad((options) => {
@click="() => getPractiseDetail(item.id)" @click="() => getPractiseDetail(item.id)"
> >
<text <text
>{{ getTrainingTypeName(item.trainingType) }} >{{ item.trainingTypeText }}
{{ formatPractiseTime(item.createTime) }}</text {{ formatPractiseTime(item.createTime) }}</text
> >
<image src="../static/back.png" mode="widthFix" /> <image src="../static/back.png" mode="widthFix" />
+160 -33
View File
@@ -1,16 +1,35 @@
<script setup> <script setup>
import { ref } from "vue"; import { computed, ref } from "vue";
import { onLoad } from "@dcloudio/uni-app"; import { onLoad } from "@dcloudio/uni-app";
import Signin from "@/components/Signin.vue"; import Signin from "@/components/Signin.vue";
import SButton from "@/components/SButton.vue"; import SButton from "@/components/SButton.vue";
import Avatar from "@/components/Avatar.vue";
import AppBackground from "@/components/AppBackground.vue";
import DeviceChargingDialog from "@/components/DeviceChargingDialog.vue"; import DeviceChargingDialog from "@/components/DeviceChargingDialog.vue";
import { tempBindOrgAPI } from "@/apis"; import { tempBindOrgAPI } from "@/apis";
import useStore from "@/store";
import { storeToRefs } from "pinia";
const store = useStore();
const { user } = storeToRefs(store);
const scene = ref(""); const scene = ref("");
const status = ref("idle"); const status = ref("idle");
const errorMessage = ref(""); const errorMessage = ref("");
const showSignin = ref(false); const showSignin = ref(false);
const binding = ref(false); const binding = ref(false);
const bindInfo = ref({});
const successInfo = computed(() => {
const result = bindInfo.value || {};
return {
avatar: user.value.avatar,
nickName: user.value.nickName || "--",
mobile: result.mobile || "--",
storeName: result.storeName || "--",
};
});
const getToken = () => { const getToken = () => {
try { try {
@@ -40,9 +59,17 @@ const bindOrg = async () => {
binding.value = true; binding.value = true;
status.value = "binding"; status.value = "binding";
errorMessage.value = ""; errorMessage.value = "";
bindInfo.value = {};
try { try {
await tempBindOrgAPI(scene.value); const result = (await tempBindOrgAPI(scene.value)) || {};
if (result.success !== true) {
status.value = "failed";
errorMessage.value = result.msg || "授权登录失败,请稍后重试。";
return;
}
bindInfo.value = result;
status.value = "success"; status.value = "success";
} catch (error) { } catch (error) {
if (error?.type === "AUTH_INVALID") { if (error?.type === "AUTH_INVALID") {
@@ -61,6 +88,10 @@ const handleLoginSuccess = async () => {
await bindOrg(); await bindOrg();
}; };
const goHome = () => {
uni.reLaunch({ url: "/pages/index" });
};
onLoad((options) => { onLoad((options) => {
try { try {
const value = decodeURIComponent(String(options?.scene || "")); const value = decodeURIComponent(String(options?.scene || ""));
@@ -83,45 +114,74 @@ onLoad((options) => {
<template> <template>
<view class="page"> <view class="page">
<AppBackground :type="6" bgColor="#20202c" />
<view class="content"> <view class="content">
<text class="title">机构设备绑定</text> <text class="title">登录门店Pad端</text>
<view v-if="status === 'idle' || status === 'binding'" class="state"> <view
<text class="state-title">正在绑定</text> v-if="status === 'idle' || status === 'binding'"
<text class="description">正在绑定机构设备请稍候</text> class="state message-state"
>
<text class="state-title">正在授权登录</text>
<text class="description">正在登录门店Pad端请稍候</text>
</view> </view>
<view v-else-if="status === 'login'" class="state"> <view v-else-if="status === 'login'" class="state login-state">
<text class="state-title">请先登录</text> <image
<text class="description"> class="login-icon"
{{ src="../static/org-bind/login-icon.png"
errorMessage || mode="aspectFit"
"登录后即可绑定当前机构设备。关闭登录窗口后,也可以再次点击下方按钮继续。" />
}} <text class="login-title">{{
</text> errorMessage || "请先登录小程序"
<SButton width="560rpx" :rounded="20" :onClick="openSignin"> }}</text>
<text>立即登录</text> <SButton width="600rpx" :rounded="22" :onClick="openSignin">
<text>微信授权登录</text>
</SButton> </SButton>
</view> </view>
<view v-else-if="status === 'success'" class="state"> <view v-else-if="status === 'success'" class="state success-state">
<text class="state-title">绑定成功</text> <view class="avatar-wrap">
<text class="description"> <Avatar
您的账号已成功绑定机构设备请返回 iPad 继续操作 :src="successInfo.avatar"
</text> :size="176"
sizeUnit="rpx"
imageMode="aspectFill"
/>
<image
class="success-badge"
src="../static/org-bind/green-gou.png"
mode="aspectFit"
/>
</view>
<text class="success-title">已成功授权登录射灵星球门店Pad端</text>
<view class="account-info">
<text>登录账号{{ successInfo.nickName }}</text>
<text>手机号{{ successInfo.mobile }}</text>
<text>登录门店{{ successInfo.storeName }}</text>
<text class="warm-tip">
温馨提示离开门店时候记得在Pad退出登录哦
</text>
</view>
<view class="success-action">
<SButton width="600rpx" :rounded="22" :onClick="goHome">
<text>回到首页</text>
</SButton>
</view>
</view> </view>
<view v-else-if="status === 'failed'" class="state"> <view v-else-if="status === 'failed'" class="state message-state">
<text class="state-title">绑定失败</text> <text class="state-title">授权登录失败</text>
<text class="description">{{ errorMessage }}</text> <text class="description">{{ errorMessage }}</text>
<SButton width="560rpx" :rounded="20" :onClick="bindOrg"> <SButton width="600rpx" :rounded="22" :onClick="bindOrg">
<text>重新绑定</text> <text>重新登录</text>
</SButton> </SButton>
</view> </view>
<view v-else class="state"> <view v-else class="state message-state">
<text class="state-title">二维码无效</text> <text class="state-title">二维码无效</text>
<text class="description">请重新扫描机构设备上的小程序码</text> <text class="description">请重新扫描门店Pad端上的小程序码</text>
</view> </view>
</view> </view>
@@ -139,32 +199,99 @@ onLoad((options) => {
box-sizing: border-box; box-sizing: border-box;
width: 100%; width: 100%;
min-height: 100vh; min-height: 100vh;
padding: calc(var(--status-bar-height) + 120rpx) 48rpx 80rpx; padding: calc(var(--status-bar-height) + 64rpx) 48rpx 80rpx;
background-color: #000;
color: #fff; color: #fff;
} }
.content { .content {
position: relative;
z-index: 1;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
} }
.title { .title {
font-size: 44rpx; color: #d8ad69;
font-weight: 600; font-size: 30rpx;
font-weight: 500;
} }
.state { .state {
width: 100%; width: 100%;
margin-top: 120rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
} }
.login-state,
.success-state {
margin-top: 320rpx;
}
.message-state {
margin-top: 240rpx;
}
.login-icon {
width: 176rpx;
height: 176rpx;
border-radius: 50%;
}
.login-title {
width: 600rpx;
margin: 28rpx 0 60rpx;
font-size: 40rpx;
font-weight: 500;
text-align: center;
}
.avatar-wrap {
position: relative;
}
.success-badge {
position: absolute;
right: -2rpx;
bottom: 4rpx;
width: 40rpx;
height: 40rpx;
}
.success-title {
width: 572rpx;
margin-top: 28rpx;
color: #fed847;
font-size: 34rpx;
font-weight: 500;
line-height: 48rpx;
}
.account-info {
box-sizing: border-box;
width: 572rpx;
margin-top: 20rpx;
display: flex;
flex-direction: column;
color: #FFFFFF;
font-size: 28rpx;
line-height: 52rpx;
}
.warm-tip {
margin-top: 40rpx;
color: #b8b8bd;
font-size: 24rpx;
line-height: 40rpx;
}
.success-action {
margin-top: 64rpx;
}
.state-title { .state-title {
font-size: 36rpx; font-size: 38rpx;
font-weight: 600; font-weight: 600;
} }
+24 -8
View File
@@ -1,5 +1,5 @@
<script setup> <script setup>
import { ref, nextTick, onMounted, onBeforeUnmount } from "vue"; import { computed, ref, nextTick, onMounted, onBeforeUnmount } from "vue";
import { onHide, onLoad, onShow } from "@dcloudio/uni-app"; import { onHide, onLoad, onShow } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue"; import Container from "@/components/Container.vue";
import ShootProgress from "@/components/ShootProgress.vue"; import ShootProgress from "@/components/ShootProgress.vue";
@@ -37,6 +37,7 @@ const store = useStore();
const { user, device } = storeToRefs(store); const { user, device } = storeToRefs(store);
const start = ref(false); const start = ref(false);
const practiceStarting = ref(false);
const scores = ref([]); const scores = ref([]);
const isSvip = ref(false); const isSvip = ref(false);
const total = 12; const total = 12;
@@ -46,6 +47,9 @@ const serverAddr = ref("");
const showGuide = ref(false); const showGuide = ref(false);
const tips = ref(""); const tips = ref("");
const targetType = ref(1); const targetType = ref(1);
const simulatorTargetType = computed(() =>
[2, 40].includes(Number(targetType.value)) ? 40 : 20
);
const sharing = ref(false); const sharing = ref(false);
const exiting = ref(false); const exiting = ref(false);
const hiddenWhileActive = ref(false); const hiddenWhileActive = ref(false);
@@ -156,12 +160,18 @@ const beginPractise = async () => {
}; };
const onReady = async () => { const onReady = async () => {
const result = await beginPractise(); if (practiceStarting.value || start.value) return;
if (!result) return; practiceStarting.value = true;
scores.value = []; try {
isSvip.value = false; const result = await beginPractise();
start.value = true; if (!result) return;
audioManager.play("练习开始"); scores.value = [];
isSvip.value = false;
start.value = true;
audioManager.play("练习开始");
} finally {
practiceStarting.value = false;
}
}; };
const onOver = async (message) => { const onOver = async (message) => {
@@ -438,7 +448,12 @@ onBeforeUnmount(() => {
:onBack="exitPractise" :onBack="exitPractise"
> >
<view> <view>
<TestDistance v-if="!start && !practiseResult.id" /> <TestDistance
v-if="!start && !practiseResult.id"
:targetType="simulatorTargetType"
:autoStart="true"
@passed="onReady"
/>
<block v-else> <block v-else>
<ShootProgress <ShootProgress
:tips="`${ :tips="`${
@@ -466,6 +481,7 @@ onBeforeUnmount(() => {
:currentRound="scores.length % 3" :currentRound="scores.length % 3"
:scores="scores" :scores="scores"
:isSvip="isSvip" :isSvip="isSvip"
:targetType="simulatorTargetType"
stable-shot-effect stable-shot-effect
/> />
<ScorePanel2 :arrows="scores" /> <ScorePanel2 :arrows="scores" />
+24 -8
View File
@@ -1,5 +1,5 @@
<script setup> <script setup>
import { ref, nextTick, onMounted, onBeforeUnmount } from "vue"; import { computed, ref, nextTick, onMounted, onBeforeUnmount } from "vue";
import { onHide, onLoad, onShow } from "@dcloudio/uni-app"; import { onHide, onLoad, onShow } from "@dcloudio/uni-app";
import Container from "@/components/Container.vue"; import Container from "@/components/Container.vue";
import ShootProgress from "@/components/ShootProgress.vue"; import ShootProgress from "@/components/ShootProgress.vue";
@@ -37,6 +37,7 @@ const store = useStore();
const { user, device } = storeToRefs(store); const { user, device } = storeToRefs(store);
const start = ref(false); const start = ref(false);
const practiceStarting = ref(false);
const scores = ref([]); const scores = ref([]);
const isSvip = ref(false); const isSvip = ref(false);
const total = 36; const total = 36;
@@ -45,6 +46,9 @@ const practiseId = ref("");
const serverAddr = ref(""); const serverAddr = ref("");
const showGuide = ref(false); const showGuide = ref(false);
const targetType = ref(1); const targetType = ref(1);
const simulatorTargetType = computed(() =>
[2, 40].includes(Number(targetType.value)) ? 40 : 20
);
const sharing = ref(false); const sharing = ref(false);
const exiting = ref(false); const exiting = ref(false);
const hiddenWhileActive = ref(false); const hiddenWhileActive = ref(false);
@@ -155,12 +159,18 @@ const beginPractise = async () => {
}; };
const onReady = async () => { const onReady = async () => {
const result = await beginPractise(); if (practiceStarting.value || start.value) return;
if (!result) return; practiceStarting.value = true;
scores.value = []; try {
isSvip.value = false; const result = await beginPractise();
start.value = true; if (!result) return;
audioManager.play("练习开始"); scores.value = [];
isSvip.value = false;
start.value = true;
audioManager.play("练习开始");
} finally {
practiceStarting.value = false;
}
}; };
const onOver = async (message) => { const onOver = async (message) => {
@@ -452,7 +462,12 @@ onBeforeUnmount(() => {
:onBack="exitPractise" :onBack="exitPractise"
> >
<view> <view>
<TestDistance v-if="!start && !practiseResult.id" /> <TestDistance
v-if="!start && !practiseResult.id"
:targetType="simulatorTargetType"
:autoStart="true"
@passed="onReady"
/>
<block v-else> <block v-else>
<ShootProgress <ShootProgress
:tips="`请连续射${total}支箭`" :tips="`请连续射${total}支箭`"
@@ -475,6 +490,7 @@ onBeforeUnmount(() => {
:totalRound="start ? total : 0" :totalRound="start ? total : 0"
:scores="scores" :scores="scores"
:isSvip="isSvip" :isSvip="isSvip"
:targetType="simulatorTargetType"
/> />
<ScorePanel <ScorePanel
v-if="start" v-if="start"
+13 -2
View File
@@ -55,6 +55,10 @@ const props = defineProps({
type: Boolean, type: Boolean,
default: false, default: false,
}, },
targetType: {
type: [Number, String],
default: 20,
},
targetRadius: { targetRadius: {
type: Number, type: Number,
default: 20, default: 20,
@@ -422,12 +426,19 @@ function getExperienceTipStyle(shot) {
); );
} }
const simulShoot = async () => { const simulShoot = async () => {
if (device.value.deviceId) await simulShootAPI(device.value.deviceId); if (device.value.deviceId) {
await simulShootAPI(
device.value.deviceId,
undefined,
undefined,
props.targetType
);
}
}; };
const simulShoot2 = async () => { const simulShoot2 = async () => {
if (device.value.deviceId) { if (device.value.deviceId) {
const r1 = Math.random() > 0.5 ? 0.01 : 0.02; const r1 = Math.random() > 0.5 ? 0.01 : 0.02;
await simulShootAPI(device.value.deviceId, r1, r1); await simulShootAPI(device.value.deviceId, r1, r1, props.targetType);
} }
}; };
@@ -6,6 +6,7 @@ import Avatar from "./Avatar.vue";
import audioManager from "@/audioManager"; import audioManager from "@/audioManager";
import { simulShootAPI } from "@/apis"; import { simulShootAPI } from "@/apis";
import { MESSAGETYPESV2 } from "@/constants"; import { MESSAGETYPESV2 } from "@/constants";
import { getDistanceCheckAudioKey, getDistanceCheckText } from "@/util";
import useStore from "@/store"; import useStore from "@/store";
import { storeToRefs } from "pinia"; import { storeToRefs } from "pinia";
const store = useStore(); const store = useStore();
@@ -23,9 +24,14 @@ const props = defineProps({
type: Number, type: Number,
default: 15, default: 15,
}, },
targetType: {
type: [Number, String],
default: 20,
},
}); });
const arrow = ref({}); const arrow = ref({});
const distance = ref(0); const distance = ref(0);
const statusText = ref("");
const showsimul = ref(false); const showsimul = ref(false);
const count = ref(props.count); const count = ref(props.count);
const timer = ref(null); const timer = ref(null);
@@ -34,7 +40,7 @@ const updateTimer = (value) => {
count.value = Math.round(value); count.value = Math.round(value);
}; };
onMounted(() => { onMounted(() => {
audioManager.play("请射箭测试距离"); audioManager.play("请射箭测试站距与靶纸");
if (props.isBattle) { if (props.isBattle) {
timer.value = setInterval(() => { timer.value = setInterval(() => {
count.value -= 1; count.value -= 1;
@@ -51,19 +57,24 @@ onBeforeUnmount(() => {
async function onReceiveMessage(msg) { async function onReceiveMessage(msg) {
if (Array.isArray(msg)) return; if (Array.isArray(msg)) return;
if (msg.type === MESSAGETYPESV2.TestDistance) { if (msg.type === MESSAGETYPESV2.TestDistance) {
const rawDistance = Number(msg.shootData?.distance); const rawDistance = Number(msg.shootData?.distance ?? msg.shootData?.dst);
distance.value = Number.isFinite(rawDistance) distance.value = Number.isFinite(rawDistance)
? Number((rawDistance / 100).toFixed(2)) ? Number((rawDistance / 100).toFixed(2))
: 0; : 0;
if (rawDistance === 0) { statusText.value = getDistanceCheckText(msg.shootData);
audioManager.play("未发现靶纸,请瞄准靶纸射箭"); audioManager.play(getDistanceCheckAudioKey(msg.shootData));
} else if (distance.value >= 5) audioManager.play("距离合格");
else audioManager.play("距离不足");
} }
} }
const simulShoot = async () => { const simulShoot = async () => {
if (device.value.deviceId) await simulShootAPI(device.value.deviceId); if (device.value.deviceId) {
await simulShootAPI(
device.value.deviceId,
undefined,
undefined,
props.targetType
);
}
}; };
onMounted(() => { onMounted(() => {
@@ -101,13 +112,11 @@ onBeforeUnmount(() => {
模拟射箭 模拟射箭
</button> </button>
<view class="warnning-text"> <view class="warnning-text">
<block v-if="distance > 0"> <block v-if="statusText">
<text>当前距离{{ distance }}</text> <text>{{ statusText }}</text>
<text v-if="distance >= 5">已达到距离要求</text>
<text v-else>请调整站位</text>
</block> </block>
<block v-else> <block v-else>
<text>请射箭测试站距</text> <text>请射箭测试站距与靶纸</text>
</block> </block>
</view> </view>
<view class="user-row"> <view class="user-row">
+12 -2
View File
@@ -20,7 +20,11 @@ import {
MATCH_WS_STATE_EVENT, MATCH_WS_STATE_EVENT,
} from "@/matchWebsocket"; } from "@/matchWebsocket";
import { MESSAGETYPESV2 } from "@/constants"; import { MESSAGETYPESV2 } from "@/constants";
import { getDirectionText, getInvalidShotAudioKey } from "@/util"; import {
getDirectionText,
getInvalidShotAudioKey,
getInvalidShotText,
} from "@/util";
import { takeMatchReturnSnapshot } from "@/utils/matchReturn"; import { takeMatchReturnSnapshot } from "@/utils/matchReturn";
import audioManager, { import audioManager, {
AUDIO_INTERRUPTION_BEGIN_EVENT, AUDIO_INTERRUPTION_BEGIN_EVENT,
@@ -63,6 +67,7 @@ const COUNTDOWN_READY_EVENT = "team-battle-countdown-ready";
const start = ref(null); const start = ref(null);
const tips = ref(""); const tips = ref("");
const battleId = ref(""); const battleId = ref("");
const targetType = ref(20);
const currentRound = ref(0); const currentRound = ref(0);
const roundTipRound = ref(0); const roundTipRound = ref(0);
const goldenRound = ref(0); const goldenRound = ref(0);
@@ -650,6 +655,8 @@ function applyBattleBase(battleInfo) {
battleInfo = normalizeBattleInfo(battleInfo); battleInfo = normalizeBattleInfo(battleInfo);
if (!battleInfo) return; if (!battleInfo) return;
if (battleInfo.matchId) battleId.value = battleInfo.matchId; if (battleInfo.matchId) battleId.value = battleInfo.matchId;
const nextTargetType = Number(battleInfo.targetType ?? battleInfo.target_type);
if ([20, 40].includes(nextTargetType)) targetType.value = nextTargetType;
if (battleInfo.status !== undefined) { if (battleInfo.status !== undefined) {
start.value = battleInfo.status !== 0; start.value = battleInfo.status !== 0;
matchStatus.value = battleInfo.status; matchStatus.value = battleInfo.status;
@@ -1133,7 +1140,7 @@ async function runBattleEndTask(task, runId) {
async function runInvalidShotTask(task, runId) { async function runInvalidShotTask(task, runId) {
if (!isQueueAlive(runId)) return; if (!isQueueAlive(runId)) return;
uni.showToast({ uni.showToast({
title: "距离不足,无效", title: getInvalidShotText(task.message?.shootData),
icon: "none", icon: "none",
}); });
await playAudioKeys(getInvalidShotAudioKey(task.message?.shootData), { await playAudioKeys(getInvalidShotAudioKey(task.message?.shootData), {
@@ -1261,6 +1268,7 @@ onLoad((options) => {
start.value = null; start.value = null;
tips.value = ""; tips.value = "";
battleId.value = returnSnapshot?.matchId || options.battleId || ""; battleId.value = returnSnapshot?.matchId || options.battleId || "";
targetType.value = 20;
currentRound.value = 0; currentRound.value = 0;
roundTipRound.value = 0; roundTipRound.value = 0;
goldenRound.value = 0; goldenRound.value = 0;
@@ -1394,6 +1402,7 @@ onShow(() => {
:guide="false" :guide="false"
:isBattle="true" :isBattle="true"
:count="readyTime" :count="readyTime"
:targetType="targetType"
/> />
<!-- 比赛进行中显示左右队伍进度条靶面和底部比分 --> <!-- 比赛进行中显示左右队伍进度条靶面和底部比分 -->
<view v-if="start" class="players-row"> <view v-if="start" class="players-row">
@@ -1419,6 +1428,7 @@ onShow(() => {
:latestShotFlash="latestShotFlash" :latestShotFlash="latestShotFlash"
:redTeam="redTeam" :redTeam="redTeam"
:blueTeam="blueTeam" :blueTeam="blueTeam"
:targetType="targetType"
stable-shot-effect stable-shot-effect
/> />
<BattleFooter <BattleFooter
@@ -28,6 +28,10 @@ const props = defineProps({
type: Number, type: Number,
default: 0, default: 0,
}, },
trainingType: {
type: String,
default: "",
},
}); });
</script> </script>
@@ -72,6 +76,7 @@ const props = defineProps({
:rowCount="total === 12 ? 6 : 9" :rowCount="total === 12 ? 6 : 9"
:total="total" :total="total"
:arrows="arrows" :arrows="arrows"
:trainingType="trainingType"
:margin="total === 12 ? 4 : 1" :margin="total === 12 ? 4 : 1"
:fontSize="total === 12 ? 25 : 22" :fontSize="total === 12 ? 25 : 22"
/> />
+13 -2
View File
@@ -56,6 +56,10 @@ const props = defineProps({
type: Boolean, type: Boolean,
default: false, default: false,
}, },
targetType: {
type: [Number, String],
default: 40,
},
coordinateRadius: { coordinateRadius: {
type: Number, type: Number,
default: 20, default: 20,
@@ -433,12 +437,19 @@ watch(
); );
const simulShoot = async () => { const simulShoot = async () => {
if (device.value.deviceId) await simulShootAPI(device.value.deviceId); if (device.value.deviceId) {
await simulShootAPI(
device.value.deviceId,
undefined,
undefined,
props.targetType
);
}
}; };
const simulShoot2 = async () => { const simulShoot2 = async () => {
if (device.value.deviceId) { if (device.value.deviceId) {
const r1 = Math.random() > 0.5 ? 0.01 : 0.02; const r1 = Math.random() > 0.5 ? 0.01 : 0.02;
await simulShootAPI(device.value.deviceId, r1, r1); await simulShootAPI(device.value.deviceId, r1, r1, props.targetType);
} }
}; };
+9 -1
View File
@@ -21,6 +21,10 @@ const props = defineProps({
type: Boolean, type: Boolean,
default: true, default: true,
}, },
trainingType: {
type: String,
default: "",
},
}); });
const items = ref(new Array(props.total).fill(9)); const items = ref(new Array(props.total).fill(9));
const bgImages = [ const bgImages = [
@@ -34,7 +38,11 @@ const getDisplayText = (arrow) => {
}; };
const isLowScore = (arrow) => { const isLowScore = (arrow) => {
if (!arrow || arrow.ringX) return false; if (!arrow) return false;
if (["rhythm", "stability"].includes(props.trainingType)) {
return arrow.ok !== true;
}
if (arrow.ringX) return false;
const ring = Number(arrow.ring); const ring = Number(arrow.ring);
return Number.isFinite(ring) && ring < 6; return Number.isFinite(ring) && ring < 6;
}; };
+83 -67
View File
@@ -54,6 +54,18 @@ const showComment = ref(false);
const showBowData = ref(false); const showBowData = ref(false);
const showUpgrade = ref(false); const showUpgrade = ref(false);
const isCompleted = computed(() => props.result.completed === true);
const heroBackground = computed(() =>
isCompleted.value
? "https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/result-bg.png"
: "https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/result-bg-fail.png"
);
const titleBackground = computed(() =>
isCompleted.value
? "https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/result-t-bg.png"
: "https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/result-t-bg-fail.png"
);
const closePanel = () => { const closePanel = () => {
showPanel.value = false; showPanel.value = false;
setTimeout(() => { setTimeout(() => {
@@ -219,6 +231,13 @@ const metricConfigs = {
deltaKeys: ["deltaStability", "delta_stability"], deltaKeys: ["deltaStability", "delta_stability"],
deltaUnit: "", deltaUnit: "",
}, },
{
label: "十环次数",
valueKeys: ["tenRingCount", "ten_ring_count"],
unit: "次",
deltaKeys: ["deltaTenRingCount", "delta_ten_ring_count"],
deltaUnit: "次",
},
], ],
rhythm: [ rhythm: [
{ {
@@ -235,6 +254,39 @@ const metricConfigs = {
deltaKeys: ["deltaTotalRings", "delta_total_rings"], deltaKeys: ["deltaTotalRings", "delta_total_rings"],
deltaUnit: "环", deltaUnit: "环",
}, },
{
label: "十环次数",
valueKeys: ["tenRingCount", "ten_ring_count"],
unit: "次",
deltaKeys: ["deltaTenRingCount", "delta_ten_ring_count"],
deltaUnit: "次",
},
],
stability: [
{
label: "能量最高值",
valueKeys: ["maxEnergyPercent", "max_energy_percent"],
unit: "%",
deltaKeys: [
"deltaMaxEnergyPercent",
"delta_max_energy_percent",
],
deltaUnit: "%",
},
{
label: "达标箭数",
valueKeys: ["qualifiedArrows", "qualified_arrows"],
unit: "箭",
deltaKeys: ["deltaQualifiedArrows", "delta_qualified_arrows"],
deltaUnit: "箭",
},
{
label: "达标率",
valueKeys: ["qualifiedRate", "qualified_rate"],
unit: "%",
deltaKeys: ["deltaQualifiedRate", "delta_qualified_rate"],
deltaUnit: "%",
},
], ],
endurance: [ endurance: [
{ {
@@ -251,41 +303,43 @@ const metricConfigs = {
deltaKeys: ["deltaTotalRings", "delta_total_rings"], deltaKeys: ["deltaTotalRings", "delta_total_rings"],
deltaUnit: "环", deltaUnit: "环",
}, },
{
label: "平均环数",
valueKeys: ["averageRing", "average_ring"],
unit: "环",
deltaKeys: ["deltaAverageRing", "delta_average_ring"],
deltaUnit: "环",
},
], ],
precision: [ precision: [
{ {
label: "命中目标", label: "命中目标",
valueKeys: ["totalHits", "total_hits"], valueKeys: ["totalHits", "total_hits"],
fallback: () => 0, fallback: () => 0,
unit: "次", unit: "次",
deltaKeys: [ deltaKeys: ["deltaTotalHits", "delta_total_hits"],
"deltaTotalHits",
"delta_total_hits",
"hitCompare",
"hitDiff",
"hitDelta",
],
deltaUnit: "次", deltaUnit: "次",
}, },
{ {
label: "用时", label: "射箭数",
valueKeys: ["duration", "usedTime", "shootTime", "time"], valueKeys: ["totalArrows", "total_arrows"],
unit: "", unit: "",
deltaKeys: [ deltaKeys: ["deltaTotalArrows", "delta_total_arrows"],
"deltaDuration", deltaUnit: "箭",
"delta_duration", },
"timeCompare", {
"timeDiff", label: "命中率",
"durationDiff", valueKeys: ["hitRate", "hit_rate"],
], unit: "%",
deltaUnit: "", deltaKeys: ["deltaHitRate", "delta_hit_rate"],
duration: true, deltaUnit: "%",
}, },
], ],
}; };
const resultRows = computed(() => { const resultRows = computed(() => {
const configs = metricConfigs[resultTrainingType.value] || metricConfigs.precision; const configs =
metricConfigs[resultTrainingType.value] || metricConfigs.precision;
return configs.map((config) => { return configs.map((config) => {
const fallback = config.fallback ? config.fallback() : 0; const fallback = config.fallback ? config.fallback() : 0;
const value = readMetricNumber(config.valueKeys, fallback); const value = readMetricNumber(config.valueKeys, fallback);
@@ -314,20 +368,17 @@ const handlePrimary = () => {
retryPractice(); retryPractice();
}; };
const calories = computed(
() => formatMetricNumber(readMetricNumber(["calories", "calorie", "kcal"]))
);
</script> </script>
<template> <template>
<view :class="['result-mask', showPanel ? 'result-mask--show' : 'result-mask--hide']"> <view :class="['result-mask', showPanel ? 'result-mask--show' : 'result-mask--hide']">
<image class="hero-glow" src="https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/result-bg.png" mode="widthFix" /> <image class="hero-glow" :src="heroBackground" mode="widthFix" />
<view class="result-title"> <view class="result-title">
<image class="result-title-bg" src="https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/result-t-bg.png" mode="widthFix" /> <image class="result-title-bg" :src="titleBackground" mode="widthFix" />
<view class="result-title-text">Lv{{ resultDifficultyLevel }}</view> <view class="result-title-text">Lv{{ resultDifficultyLevel }}</view>
</view> </view>
<view class="result-panel"> <view :class="['result-panel', { 'result-panel--fail': !isCompleted }]">
<view class="line-top"></view> <view class="line-top"></view>
<view class="line-bottom"></view> <view class="line-bottom"></view>
<view class="stats"> <view class="stats">
@@ -352,25 +403,6 @@ const calories = computed(
<view v-else class="stat-value">--</view> <view v-else class="stat-value">--</view>
</view> </view>
</view> </view>
<view class="stat-row">
<image class="stat-bg" src="https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/result-c-bg.png" mode="scaleToFill" />
<view class="stat-cell">
<text class="stat-label">消耗卡路里</text>
<view class="stat-value">
<text>{{ calories }}</text>
</view>
</view>
<text class="stat-equal"></text>
<!-- <view class="stat-divider"></view> -->
<view class="stat-cell stat-cell--compare">
<view class="stat-value">
<image v-for="index in 3" :key="index" class="rice-icon"
src="https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/result-rice.png" mode="widthFix" />
</view>
</view>
</view>
<view class="actions"> <view class="actions">
<view class="action-item" @click="() => (showBowData = true)"> <view class="action-item" @click="() => (showBowData = true)">
<image class="action-icon" src="https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/result-icon-1.png" mode="widthFix" /> <image class="action-icon" src="https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/result-icon-1.png" mode="widthFix" />
@@ -435,7 +467,7 @@ const calories = computed(
</view> </view>
</view> </view>
</ScreenHint> </ScreenHint>
<BowData :total="arrows.length" :arrows="result.details" :show="showBowData" <BowData :total="details.length" :arrows="details" :show="showBowData" :trainingType="resultTrainingType"
:onClose="() => (showBowData = false)" /> :onClose="() => (showBowData = false)" />
<UserUpgrade :show="showUpgrade" :onClose="() => (showUpgrade = false)" :lvl="userLevel" /> <UserUpgrade :show="showUpgrade" :onClose="() => (showUpgrade = false)" :lvl="userLevel" />
</view> </view>
@@ -517,6 +549,10 @@ const calories = computed(
position: relative; position: relative;
} }
.result-panel--fail {
background: rgba(34, 34, 46, 0.8);
}
.stats { .stats {
width: 100%; width: 100%;
margin-top: 34rpx; margin-top: 34rpx;
@@ -610,14 +646,6 @@ const calories = computed(
transform: skewX(12deg); transform: skewX(12deg);
} }
.stat-equal{
width: 30rpx;
height: 40rpx;
color: #F3E0B9;
font-size: 30rpx;
margin-left: 10rpx;
}
.trend-icon { .trend-icon {
width: 28rpx; width: 28rpx;
height: 42rpx; height: 42rpx;
@@ -636,18 +664,6 @@ const calories = computed(
height: 62rpx; height: 62rpx;
} }
.rice-list {
width: 160rpx;
display: flex;
align-items: center;
}
.rice-icon {
width: 36rpx;
height: 34rpx;
margin-right: 14rpx;
}
.oper-box { .oper-box {
position: relative; position: relative;
z-index: 1; z-index: 1;
+494 -21
View File
@@ -1,8 +1,22 @@
<script setup> <script setup>
import { ref, watch, onMounted, onBeforeUnmount, computed } from "vue"; import {
import audioManager from "@/audioManager"; ref,
watch,
onMounted,
onBeforeUnmount,
computed,
nextTick,
} from "vue";
import audioManager, {
getTrainingStartAudioKey,
RHYTHM_SHOOT_WINDOW_AUDIO_KEY,
} from "@/audioManager";
import { MESSAGETYPESV2 } from "@/constants"; import { MESSAGETYPESV2 } from "@/constants";
import { getDirectionText, getInvalidShotAudioKey } from "@/util"; import {
getDirectionText,
getInvalidShotAudioKey,
getInvalidShotText,
} from "@/util";
import Avatar from "@/components/Avatar.vue"; import Avatar from "@/components/Avatar.vue";
import useStore from "@/store"; import useStore from "@/store";
@@ -35,6 +49,38 @@ const props = defineProps({
type: String, type: String,
default: "precision", default: "precision",
}, },
roundTime: {
type: Number,
default: 0,
},
shootTime: {
type: Number,
default: 0,
},
shootWindowStart: {
type: [Number, String],
default: 0,
},
inShootWindow: {
type: Boolean,
default: false,
},
serverTimestamp: {
type: [Number, String],
default: 0,
},
hitReq: {
type: Number,
default: 0,
},
energyPercent: {
type: Number,
default: 0,
},
energyReqPercent: {
type: Number,
default: 0,
},
isVip: { isVip: {
type: Boolean, type: Boolean,
default: false, default: false,
@@ -89,12 +135,100 @@ const currentRoundEnded = ref(false);
const halfTime = ref(false); const halfTime = ref(false);
const wait = ref(0); const wait = ref(0);
const transitionStyle = ref("all 1s linear"); const transitionStyle = ref("all 1s linear");
const rhythmRemainingMs = ref(0);
const rhythmRemainingSeconds = ref(0);
const rhythmIsShootWindow = ref(false);
const rhythmTransitionStyle = ref("none");
let rhythmCountdownTimer = null;
let rhythmTransitionTimer = null;
let rhythmServerClockOffsetMs = 0;
let rhythmSyncGeneration = 0;
const isRhythmTraining = computed(() => props.trainingType === "rhythm");
const isStabilityTraining = computed(
() => props.trainingType === "stability"
);
const normalizePositiveInteger = (value) => {
const numberValue = Number(value);
return Number.isFinite(numberValue) && numberValue > 0
? Math.round(numberValue)
: 0;
};
// protobuf int64
const normalizeTimestamp = (value) => {
const numberValue = Number(value);
if (!Number.isFinite(numberValue) || numberValue <= 0) return 0;
return numberValue < 1e12 ? numberValue * 1000 : numberValue;
};
const validRhythmRoundTime = computed(() =>
normalizePositiveInteger(props.roundTime)
);
const validRhythmShootTime = computed(() =>
Math.min(
normalizePositiveInteger(props.shootTime),
validRhythmRoundTime.value
)
);
const validRhythmHitReq = computed(() =>
normalizePositiveInteger(props.hitReq)
);
const rhythmRoundDurationMs = computed(
() => validRhythmRoundTime.value * 1000
);
const rhythmShootDurationMs = computed(
() => validRhythmShootTime.value * 1000
);
const progressPercent = computed(() => { const progressPercent = computed(() => {
if (!props.countdownEnabled || !props.total) return 0; if (!props.countdownEnabled || !props.total) return 0;
return Math.max(0, Math.min(100, (remain.value / props.total) * 100)); return Math.max(0, Math.min(100, (remain.value / props.total) * 100));
}); });
const stabilityEnergyPercent = computed(() =>
Math.max(0, Math.min(100, Number(props.energyPercent) || 0))
);
const stabilityEnergyReqPercent = computed(() =>
Math.max(0, Math.min(100, Number(props.energyReqPercent) || 0))
);
const stabilityEnergyReached = computed(
() =>
stabilityEnergyReqPercent.value > 0 &&
stabilityEnergyPercent.value >= stabilityEnergyReqPercent.value
);
const rhythmMarkerPercent = computed(() => {
if (!validRhythmRoundTime.value) return 0;
return Math.max(
0,
Math.min(
100,
(validRhythmShootTime.value / validRhythmRoundTime.value) * 100
)
);
});
const rhythmProgressPercent = computed(() => {
if (!rhythmRoundDurationMs.value) return 0;
return Math.max(
0,
Math.min(
100,
(rhythmRemainingMs.value / rhythmRoundDurationMs.value) * 100
)
);
});
const rhythmTitle = computed(() => {
if (!validRhythmShootTime.value) return "节奏训练";
if (!validRhythmHitReq.value) {
return `在最后的${validRhythmShootTime.value}秒内射箭`;
}
return `在最后的${validRhythmShootTime.value}秒并命中${validRhythmHitReq.value}环内`;
});
const displayName = computed(() => { const displayName = computed(() => {
return ( return (
user.value?.nickName || user.value?.nickName ||
@@ -139,8 +273,147 @@ const clearTimer = () => {
timer.value = null; timer.value = null;
}; };
const clearRhythmTimers = () => {
if (rhythmCountdownTimer) {
clearTimeout(rhythmCountdownTimer);
rhythmCountdownTimer = null;
}
if (rhythmTransitionTimer) {
clearTimeout(rhythmTransitionTimer);
rhythmTransitionTimer = null;
}
};
const getRhythmServerNow = () => Date.now() + rhythmServerClockOffsetMs;
const getRhythmRoundRemainingMs = () => {
const shootWindowStart = normalizeTimestamp(props.shootWindowStart);
if (!shootWindowStart || !rhythmRoundDurationMs.value) return 0;
const firstRoundEnd = shootWindowStart + rhythmShootDurationMs.value;
const serverNow = getRhythmServerNow();
let roundEnd = firstRoundEnd;
// round_time 0
if (serverNow >= firstRoundEnd) {
const elapsedRounds =
Math.floor(
(serverNow - firstRoundEnd) / rhythmRoundDurationMs.value
) + 1;
roundEnd = firstRoundEnd + elapsedRounds * rhythmRoundDurationMs.value;
}
return Math.max(
0,
Math.min(rhythmRoundDurationMs.value, roundEnd - serverNow)
);
};
const updateRhythmShootWindow = (isInWindow) => {
const nextIsInWindow = Boolean(isInWindow);
const enteredShootWindow =
nextIsInWindow && !rhythmIsShootWindow.value;
rhythmIsShootWindow.value = nextIsInWindow;
// 沿
if (enteredShootWindow && props.start && isRhythmTraining.value) {
audioManager.play(RHYTHM_SHOOT_WINDOW_AUDIO_KEY);
}
};
// CSS transition
const scheduleRhythmCountdownStep = () => {
rhythmCountdownTimer = null;
const currentRemaining = getRhythmRoundRemainingMs();
if (currentRemaining <= 0) {
rhythmTransitionStyle.value = "none";
rhythmRemainingMs.value = 0;
rhythmRemainingSeconds.value = 0;
updateRhythmShootWindow(false);
return;
}
// 使
rhythmRemainingSeconds.value = Math.ceil(currentRemaining / 1000);
updateRhythmShootWindow(
currentRemaining <= rhythmShootDurationMs.value
);
// 100%
if (currentRemaining - rhythmRemainingMs.value > 1000) {
rhythmTransitionStyle.value = "none";
rhythmRemainingMs.value = currentRemaining;
rhythmTransitionTimer = setTimeout(() => {
rhythmTransitionTimer = null;
scheduleRhythmCountdownStep();
}, 50);
return;
}
const targetRemaining = Math.max(
0,
(Math.ceil(currentRemaining / 1000) - 1) * 1000
);
const stepDuration = Math.max(50, currentRemaining - targetRemaining);
rhythmTransitionStyle.value = `width ${stepDuration}ms linear`;
rhythmRemainingMs.value = targetRemaining;
rhythmCountdownTimer = setTimeout(
scheduleRhythmCountdownStep,
stepDuration
);
};
const syncRhythmCountdown = async () => {
const generation = ++rhythmSyncGeneration;
clearRhythmTimers();
if (!isRhythmTraining.value) {
rhythmTransitionStyle.value = "none";
rhythmRemainingMs.value = 0;
rhythmRemainingSeconds.value = 0;
updateRhythmShootWindow(false);
return;
}
const serverTimestamp = normalizeTimestamp(props.serverTimestamp);
rhythmServerClockOffsetMs = serverTimestamp
? serverTimestamp - Date.now()
: 0;
if (
!validRhythmRoundTime.value ||
!validRhythmShootTime.value ||
!normalizeTimestamp(props.shootWindowStart)
) {
rhythmTransitionStyle.value = "none";
rhythmRemainingMs.value = 0;
rhythmRemainingSeconds.value = 0;
updateRhythmShootWindow(false);
return;
}
rhythmTransitionStyle.value = "none";
rhythmRemainingMs.value = getRhythmRoundRemainingMs();
rhythmRemainingSeconds.value = Math.ceil(rhythmRemainingMs.value / 1000);
updateRhythmShootWindow(
rhythmRemainingMs.value > 0 &&
rhythmRemainingMs.value <= rhythmShootDurationMs.value
);
await nextTick();
if (generation !== rhythmSyncGeneration) return;
rhythmTransitionTimer = setTimeout(() => {
rhythmTransitionTimer = null;
scheduleRhythmCountdownStep();
}, 50);
};
const resetTimer = (count) => { const resetTimer = (count) => {
clearTimer(); clearTimer();
if (isRhythmTraining.value) {
remain.value = 0;
return;
}
if (!props.countdownEnabled) { if (!props.countdownEnabled) {
remain.value = 0; remain.value = 0;
return; return;
@@ -173,9 +446,12 @@ const resetTimer = (count) => {
}; };
watch( watch(
() => [props.start, props.countdownEnabled], () => [props.start, props.countdownEnabled, props.trainingType],
([started, countdownEnabled]) => { ([started, countdownEnabled, trainingType]) => {
if (started && countdownEnabled) { if (trainingType === "rhythm") {
clearTimer();
remain.value = 0;
} else if (started && countdownEnabled) {
resetTimer(props.total); resetTimer(props.total);
} else { } else {
clearTimer(); clearTimer();
@@ -187,6 +463,18 @@ watch(
} }
); );
watch(
() => [
props.trainingType,
props.roundTime,
props.shootTime,
props.shootWindowStart,
props.serverTimestamp,
],
syncRhythmCountdown,
{ immediate: true }
);
const tipContent = computed(() => { const tipContent = computed(() => {
if (halfTime.value) { if (halfTime.value) {
return props.battleId ? "中场休息" : `中场休息(${wait.value}秒)`; return props.battleId ? "中场休息" : `中场休息(${wait.value}秒)`;
@@ -203,11 +491,14 @@ async function onReceiveMessage(msg) {
if (Array.isArray(msg)) return; if (Array.isArray(msg)) return;
if (msg.type === MESSAGETYPESV2.BattleStart) { if (msg.type === MESSAGETYPESV2.BattleStart) {
halfTime.value = false; halfTime.value = false;
audioManager.play("比赛开始"); //
if (!getTrainingStartAudioKey(props.trainingType)) {
audioManager.play("比赛开始");
}
} else if (msg.type === MESSAGETYPESV2.BattleEnd) { } else if (msg.type === MESSAGETYPESV2.BattleEnd) {
audioManager.play("练习结束", false); audioManager.play("练习结束", false);
} else if (msg.type === MESSAGETYPESV2.ShootResult) { } else if (msg.type === MESSAGETYPESV2.ShootResult) {
// //
if (props.externalShootResultAudio) return; if (props.externalShootResultAudio) return;
const latestDetail = const latestDetail =
Array.isArray(msg.details) && msg.details.length > 0 Array.isArray(msg.details) && msg.details.length > 0
@@ -238,7 +529,7 @@ async function onReceiveMessage(msg) {
audioManager.play("中场休息"); audioManager.play("中场休息");
} else if (msg.type === MESSAGETYPESV2.InvalidShot) { } else if (msg.type === MESSAGETYPESV2.InvalidShot) {
uni.showToast({ uni.showToast({
title: "距离不足,无效", title: getInvalidShotText(msg.shootData),
icon: "none", icon: "none",
}); });
audioManager.play(getInvalidShotAudioKey(msg.shootData)); audioManager.play(getInvalidShotAudioKey(msg.shootData));
@@ -260,12 +551,66 @@ onBeforeUnmount(() => {
uni.$off("socket-inbox", onReceiveMessage); uni.$off("socket-inbox", onReceiveMessage);
uni.$off("play-sound", playSound); uni.$off("play-sound", playSound);
clearTimer(); clearTimer();
rhythmSyncGeneration += 1;
clearRhythmTimers();
}); });
</script> </script>
<template> <template>
<view v-if="show" class="progress-card"> <view
<view class="progress-card__header"> v-if="show"
:class="
isRhythmTraining
? 'rhythm-progress'
: isStabilityTraining
? 'stability-progress'
: 'progress-card'
"
>
<template v-if="isStabilityTraining">
<text class="stability-progress__time">{{ remain }}</text>
<view class="stability-progress__track">
<view
class="stability-progress__fill"
:class="{
'stability-progress__fill--reached': stabilityEnergyReached,
}"
:style="{ width: `${stabilityEnergyPercent}%` }"
/>
<view
class="stability-progress__marker"
:style="{ left: `${stabilityEnergyReqPercent}%` }"
/>
<text class="stability-progress__value">
{{ Math.round(stabilityEnergyPercent) }}%
</text>
</view>
</template>
<template v-else-if="isRhythmTraining">
<text class="rhythm-progress__title">{{ rhythmTitle }}</text>
<view class="rhythm-progress__track">
<view
class="rhythm-progress__fill"
:class="{
'rhythm-progress__fill--shooting': rhythmIsShootWindow,
}"
:style="{
width: `${rhythmProgressPercent}%`,
transition: rhythmTransitionStyle,
}"
/>
<view
class="rhythm-progress__marker"
:style="{ left: `${rhythmMarkerPercent}%` }"
/>
<text
v-if="rhythmRemainingSeconds > 0"
class="rhythm-progress__window-label"
>{{ rhythmRemainingSeconds }}</text>
</view>
</template>
<template v-else>
<view class="progress-card__header">
<view class="progress-card__profile"> <view class="progress-card__profile">
<view class="progress-card__avatar-shell"> <view class="progress-card__avatar-shell">
<Avatar <Avatar
@@ -297,16 +642,16 @@ onBeforeUnmount(() => {
mode="aspectFit" mode="aspectFit"
/> />
</button> --> </button> -->
</view> </view>
<view class="progress-card__track-wrap"> <view class="progress-card__track-wrap">
<image <image
class="progress-card__titile" class="progress-card__titile"
:src="trainingTitleIcon" :src="trainingTitleIcon"
mode="aspectFit" mode="aspectFit"
/> />
<view v-if="countdownEnabled" class="progress-card__track"> <view v-if="countdownEnabled" class="progress-card__track">
<view <view
class="progress-card__fill" class="progress-card__fill"
:style="{ :style="{
width: `${progressPercent}%`, width: `${progressPercent}%`,
@@ -314,13 +659,14 @@ onBeforeUnmount(() => {
right: tips.includes('红队') ? 0 : 'unset', right: tips.includes('红队') ? 0 : 'unset',
transition: transitionStyle, transition: transitionStyle,
}" }"
/> />
<view class="progress-card__badge"> <view class="progress-card__badge">
<text class="progress-card__badge-text">剩余{{ remain }}</text> <text class="progress-card__badge-text">剩余{{ remain }}</text>
</view>
</view> </view>
<!-- <text v-if="tipContent" class="progress-card__tip">{{ tipContent }}123</text> -->
</view> </view>
<!-- <text v-if="tipContent" class="progress-card__tip">{{ tipContent }}123</text> --> </template>
</view>
</view> </view>
</template> </template>
@@ -459,4 +805,131 @@ onBeforeUnmount(() => {
line-height: 1.4; line-height: 1.4;
text-align: center; text-align: center;
} }
.stability-progress {
box-sizing: border-box;
margin: 32rpx 84rpx 0;
}
.stability-progress__time {
display: block;
margin-bottom: 20rpx;
color: #ffffff;
font-size: 34rpx;
font-weight: 500;
line-height: 48rpx;
text-align: center;
}
.stability-progress__track {
position: relative;
width: 100%;
height: 24rpx;
overflow: hidden;
border-radius: 18rpx;
background: #444444;
}
.stability-progress__fill {
position: absolute;
top: 0;
bottom: 0;
left: 0;
border-radius: 18rpx;
background: linear-gradient(90deg, #87f1df 0%, #5ba8e8 100%);
transition: width 240ms linear, background 240ms ease;
}
.stability-progress__fill--reached {
background: linear-gradient(90deg, #a5df62 0%, #61c787 100%);
}
.stability-progress__marker {
position: absolute;
top: 0;
bottom: 0;
z-index: 2;
width: 4rpx;
transform: translateX(-2rpx);
background: rgba(26, 24, 22, 0.92);
}
.stability-progress__value {
position: absolute;
inset: 0;
z-index: 3;
display: flex;
align-items: center;
justify-content: center;
color: #eefaff;
font-size: 18rpx;
line-height: 24rpx;
text-align: center;
pointer-events: none;
}
.rhythm-progress {
box-sizing: border-box;
margin: 32rpx 84rpx 0;
}
.rhythm-progress__title {
display: block;
margin-bottom: 20rpx;
color: #ffffff;
font-size: 30rpx;
font-weight: 500;
line-height: 42rpx;
text-align: center;
}
.rhythm-progress__track {
position: relative;
width: 100%;
height: 24rpx;
overflow: hidden;
border-radius: 18rpx;
background: #444444;
}
.rhythm-progress__fill {
position: absolute;
top: 0;
bottom: 0;
left: 0;
border-radius: 18rpx;
background: linear-gradient(133deg, #ffd19a 0%, #a17636 100%);
}
.rhythm-progress__fill--shooting {
background: linear-gradient(90deg, #e2bd2e 0%, #fff047 100%);
}
.rhythm-progress__marker {
position: absolute;
top: 0;
bottom: 0;
z-index: 2;
width: 4rpx;
transform: translateX(-2rpx);
background: rgba(26, 24, 22, 0.9);
}
.rhythm-progress__window-label {
position: absolute;
top: 0;
bottom: 0;
left: 50%;
z-index: 3;
display: flex;
align-items: center;
justify-content: center;
transform: translateX(-50%);
color: #fff7de;
font-size: 18rpx;
line-height: 24rpx;
text-align: center;
white-space: nowrap;
pointer-events: none;
}
</style> </style>
+59 -12
View File
@@ -6,10 +6,16 @@ import Avatar from "@/components/Avatar.vue";
import audioManager from "@/audioManager"; import audioManager from "@/audioManager";
import { simulShootAPI } from "@/apis"; import { simulShootAPI } from "@/apis";
import { MESSAGETYPESV2 } from "@/constants"; import { MESSAGETYPESV2 } from "@/constants";
import {
getDistanceCheckAudioKey,
getDistanceCheckText,
getShootValidation,
} from "@/util";
import useStore from "@/store"; import useStore from "@/store";
import { storeToRefs } from "pinia"; import { storeToRefs } from "pinia";
const store = useStore(); const store = useStore();
const { user, device } = storeToRefs(store); const { user, device } = storeToRefs(store);
const emit = defineEmits(["passed"]);
const props = defineProps({ const props = defineProps({
guide: { guide: {
type: Boolean, type: Boolean,
@@ -27,18 +33,46 @@ const props = defineProps({
type: [Number, String], type: [Number, String],
default: "", default: "",
}, },
autoStart: {
type: Boolean,
default: false,
},
}); });
const arrow = ref({}); const arrow = ref({});
const distance = ref(0); const distance = ref(0);
const statusText = ref("");
const showsimul = ref(false); const showsimul = ref(false);
const count = ref(props.count); const count = ref(props.count);
const timer = ref(null); const timer = ref(null);
const autoStartPending = ref(false);
const autoStartTriggered = ref(false);
let autoStartTimer = null;
const DISTANCE_PASSED_AUDIO_KEY = "站距合格,靶纸正确";
const AUTO_START_TIMEOUT_MS = 6000;
const clearAutoStartTimer = () => {
if (!autoStartTimer) return;
clearTimeout(autoStartTimer);
autoStartTimer = null;
};
const triggerAutoStart = () => {
if (!autoStartPending.value || autoStartTriggered.value) return;
clearAutoStartTimer();
autoStartPending.value = false;
autoStartTriggered.value = true;
emit("passed");
};
const onAudioEnded = (key) => {
if (key === DISTANCE_PASSED_AUDIO_KEY) triggerAutoStart();
};
const updateTimer = (value) => { const updateTimer = (value) => {
count.value = Math.round(value); count.value = Math.round(value);
}; };
onMounted(() => { onMounted(() => {
audioManager.play("请射箭测试距离"); audioManager.play("请射箭测试站距与靶纸");
if (props.isBattle) { if (props.isBattle) {
timer.value = setInterval(() => { timer.value = setInterval(() => {
count.value -= 1; count.value -= 1;
@@ -46,28 +80,43 @@ onMounted(() => {
}, 1000); }, 1000);
} }
uni.$on("update-timer", updateTimer); uni.$on("update-timer", updateTimer);
uni.$on("audioEnded", onAudioEnded);
}); });
onBeforeUnmount(() => { onBeforeUnmount(() => {
if (timer.value) clearInterval(timer.value); if (timer.value) clearInterval(timer.value);
clearAutoStartTimer();
uni.$off("update-timer", updateTimer); uni.$off("update-timer", updateTimer);
uni.$off("audioEnded", onAudioEnded);
}); });
async function onReceiveMessage(msg) { async function onReceiveMessage(msg) {
if (Array.isArray(msg)) return; if (Array.isArray(msg)) return;
if (msg.type === MESSAGETYPESV2.TestDistance) { if (msg.type === MESSAGETYPESV2.TestDistance) {
const rawDistance = Number(msg.shootData?.distance); if (autoStartPending.value || autoStartTriggered.value) return;
const rawDistance = Number(msg.shootData?.distance ?? msg.shootData?.dst);
distance.value = Number.isFinite(rawDistance) distance.value = Number.isFinite(rawDistance)
? Number((rawDistance / 100).toFixed(2)) ? Number((rawDistance / 100).toFixed(2))
: 0; : 0;
if (rawDistance === 0) { statusText.value = getDistanceCheckText(msg.shootData);
audioManager.play("未发现靶纸,请瞄准靶纸射箭"); const audioKey = getDistanceCheckAudioKey(msg.shootData);
} else if (distance.value >= 5) audioManager.play("距离合格"); const validation = getShootValidation(msg.shootData);
else audioManager.play("距离不足"); if (props.autoStart && validation.distanceOk && validation.targetOk) {
autoStartPending.value = true;
autoStartTimer = setTimeout(triggerAutoStart, AUTO_START_TIMEOUT_MS);
}
audioManager.play(audioKey);
} }
} }
const simulShoot = async () => { const simulShoot = async () => {
if (device.value.deviceId) await simulShootAPI(device.value.deviceId); if (device.value.deviceId) {
await simulShootAPI(
device.value.deviceId,
undefined,
undefined,
props.targetType
);
}
}; };
onMounted(() => { onMounted(() => {
@@ -100,13 +149,11 @@ onBeforeUnmount(() => {
</button> </button>
<view class="warnning-text"> <view class="warnning-text">
<view class="target-tip">当前靶纸为<text class="text-yellow">{{ targetType }}cm</text>全环靶</view> <view class="target-tip">当前靶纸为<text class="text-yellow">{{ targetType }}cm</text>全环靶</view>
<block v-if="distance > 0"> <block v-if="statusText">
<text>当前距离<text class="text-yellow">{{ distance }}</text></text> <text>{{ statusText }}</text>
<text v-if="distance >= 5">已达到距离要求</text>
<text v-else>请调整站位</text>
</block> </block>
<block v-else> <block v-else>
<text>请射箭测试站距</text> <text>请射箭测试站距与靶纸</text>
</block> </block>
</view> </view>
<view class="user-row"> <view class="user-row">
@@ -15,6 +15,10 @@ const props = defineProps({
type: Boolean, type: Boolean,
default: false, default: false,
}, },
showUnlockProgress: {
type: Boolean,
default: false,
},
completedProgress: { completedProgress: {
type: Number, type: Number,
default: 0, default: 0,
@@ -106,6 +110,15 @@ const handleClick = () => {
<view class="difficulty-badge__label">{{ node.label }}</view> <view class="difficulty-badge__label">{{ node.label }}</view>
</view> </view>
</view> </view>
<view
v-if="showUnlockProgress"
class="difficulty-badge__unlock-progress"
>
<view
class="difficulty-badge__unlock-progress-completed"
:style="{ width: `${progressValue}%` }"
></view>
</view>
</view> </view>
</template> </template>
@@ -315,6 +328,25 @@ const handleClick = () => {
overflow: hidden; overflow: hidden;
} }
.difficulty-badge__unlock-progress {
position: absolute;
top: calc(100% + 30rpx);
left: 50%;
width: 120rpx;
height: 10rpx;
overflow: hidden;
border-radius: 6rpx;
background: rgba(0, 0, 0, 0.6);
transform: translateX(-50%);
pointer-events: none;
}
.difficulty-badge__unlock-progress-completed {
height: 100%;
border-radius: 6rpx;
background: rgba(255, 217, 71, 1);
}
@keyframes badge-orbit-spin { @keyframes badge-orbit-spin {
from { from {
transform: translate(-50%, -50%) rotate(0deg); transform: translate(-50%, -50%) rotate(0deg);
@@ -13,7 +13,20 @@ const props = defineProps({
}); });
const previewLines = computed(() => { const previewLines = computed(() => {
return props.lines.map((line) => String(line || "").trim()).filter(Boolean); return props.lines
.map((line) => {
const rawParts = Array.isArray(line?.parts)
? line.parts
: [{ text: line }];
const parts = rawParts
.map((part) => ({
text: String(part?.text ?? part ?? "").trim(),
}))
.filter((part) => part.text);
return { parts };
})
.filter((line) => line.parts.length > 0);
}); });
</script> </script>
@@ -27,13 +40,16 @@ const previewLines = computed(() => {
<view class="difficulty-preview__content"> <view class="difficulty-preview__content">
<text class="difficulty-preview__title">{{ title }}</text> <text class="difficulty-preview__title">{{ title }}</text>
<view class="difficulty-preview__copy"> <view class="difficulty-preview__copy">
<text <view
v-for="(line, index) in previewLines" v-for="(line, index) in previewLines"
:key="`${line}-${index}`" :key="index"
class="difficulty-preview__line" class="difficulty-preview__line"
> >
{{ line }} <text
</text> v-for="(part, partIndex) in line.parts"
:key="partIndex"
>{{ part.text }}</text>
</view>
</view> </view>
</view> </view>
</view> </view>
@@ -86,6 +102,4 @@ const previewLines = computed(() => {
.difficulty-preview__line { .difficulty-preview__line {
display: block; display: block;
} }
</style> </style>
+66 -16
View File
@@ -13,7 +13,7 @@ import {
} from "@/apis"; } from "@/apis";
// //
// 1. GET /training/difficulty/list?type=base/endurance/precision/rhythm // 1. GET /training/difficulty/list?type=base/endurance/precision/rhythm/stability
// 2. user_levels / list.completed // 2. user_levels / list.completed
const trainingDifficultyStorageKey = "training-selection"; const trainingDifficultyStorageKey = "training-selection";
const defaultTrainingType = "precision"; const defaultTrainingType = "precision";
@@ -35,6 +35,10 @@ const trainingTypeMetaMap = {
key: "rhythm", key: "rhythm",
title: "节奏训练", title: "节奏训练",
}, },
stability: {
key: "stability",
title: "稳定训练",
},
}; };
const routeModeTypeMap = { const routeModeTypeMap = {
basic: "base", basic: "base",
@@ -42,6 +46,9 @@ const routeModeTypeMap = {
endurance: "endurance", endurance: "endurance",
precision: "precision", precision: "precision",
rhythm: "rhythm", rhythm: "rhythm",
stability: "stability",
// power stability
power: "stability",
}; };
const defaultTargetType = 1; const defaultTargetType = 1;
@@ -83,10 +90,6 @@ const checkDifficultyCompleted = (item = {}) => {
return Boolean(item.completed) || (promoteCnt > 0 && completedCnt >= promoteCnt); return Boolean(item.completed) || (promoteCnt > 0 && completedCnt >= promoteCnt);
}; };
const getDifficultyModeText = (mode) => {
return Number(mode) === 1 ? "随机区域+指定环数" : "随机区域命中";
};
const createEmptyModeConfig = (type = defaultTrainingType) => { const createEmptyModeConfig = (type = defaultTrainingType) => {
const meta = trainingTypeMetaMap[type] || trainingTypeMetaMap[defaultTrainingType]; const meta = trainingTypeMetaMap[type] || trainingTypeMetaMap[defaultTrainingType];
@@ -107,14 +110,13 @@ const createDifficultySummary = (item = {}) => {
const timeLimit = toNumber(item.time_limit); const timeLimit = toNumber(item.time_limit);
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 promoteCnt = toNumber(item.promote_cnt); const energyReqPercent = toNumber(item.energy_req_percent);
const shootingTimeText = const shootingTimeText =
timeLimit > 0 ? `${timeLimit}秒内进行射箭` : "不限时进行射箭"; timeLimit > 0 ? `${timeLimit}秒内进行射箭` : "不限时进行射箭";
const enduranceTimeText = const enduranceTimeText =
timeLimit > 0 timeLimit > 0
? `${timeLimit}秒内完成${arrows}` ? `${timeLimit}秒内完成${arrows}`
: `不限时完成${arrows}`; : `不限时完成${arrows}`;
const promoteText = promoteCnt > 0 ? `完成${promoteCnt}次晋级` : "";
const summaryMap = { const summaryMap = {
base: [ base: [
@@ -130,15 +132,30 @@ const createDifficultySummary = (item = {}) => {
`需要有${arrows}箭命中高亮区域`, `需要有${arrows}箭命中高亮区域`,
], ],
rhythm: [ rhythm: [
desc || `间隔${timeLimit}秒射击`, arrows > 0
[ ? `需要在指定时间节点射出${arrows}射箭`
`${arrows}`, : "需要在指定时间节点射箭",
hitReq > 0 ? `每箭${hitReq}以上` : "上靶即可", hitReq > 0 ? `每箭命中${hitReq}` : "且每箭命中指定区域",
getDifficultyModeText(item.mode), ],
promoteText, stability: [
] {
.filter(Boolean) parts: [
.join(" · "), { text: timeLimit > 0 ? "在" : "" },
{
text: timeLimit > 0 ? `${timeLimit}` : "不限时",
highlight: true,
},
{ text: timeLimit > 0 ? "内射箭,命中" : "射箭,命中" },
{ text: `${hitReq}`, highlight: true },
{ text: "可获得能量" },
],
},
{
parts: [
{ text: "计时结束能量需要大于" },
{ text: `${energyReqPercent}%`, highlight: true },
],
},
], ],
}; };
@@ -612,6 +629,23 @@ const createPracticeQuery = (difficulty) => {
rhythm: { rhythm: {
hitReq: toNumber(difficulty.hit_req), hitReq: toNumber(difficulty.hit_req),
mode: toNumber(difficulty.mode), mode: toNumber(difficulty.mode),
roundTime: toNumber(difficulty.round_time ?? difficulty.roundTime),
shootTime: toNumber(difficulty.shoot_time ?? difficulty.shootTime),
},
stability: {
hitReq: toNumber(difficulty.hit_req),
scoreSlot: toNumber(
difficulty.score_slot ?? difficulty.scoreSlot
),
energyPerHit: toNumber(
difficulty.energy_per_hit ?? difficulty.energyPerHit
),
energyCostPerSec: toNumber(
difficulty.energy_cost_per_sec ?? difficulty.energyCostPerSec
),
energyReqPercent: toNumber(
difficulty.energy_req_percent ?? difficulty.energyReqPercent
),
}, },
}; };
@@ -645,6 +679,21 @@ const saveTrainingContext = (practice = {}) => {
difficultyLabel: difficulty.label, difficultyLabel: difficulty.label,
targetType: defaultTargetType, targetType: defaultTargetType,
targetPaperType: difficulty.targetPaperType, targetPaperType: difficulty.targetPaperType,
roundTime: toNumber(difficulty.round_time ?? difficulty.roundTime),
shootTime: toNumber(difficulty.shoot_time ?? difficulty.shootTime),
hitReq: toNumber(difficulty.hit_req ?? difficulty.hitReq),
scoreSlot: toNumber(
difficulty.score_slot ?? difficulty.scoreSlot
),
energyPerHit: toNumber(
difficulty.energy_per_hit ?? difficulty.energyPerHit
),
energyCostPerSec: toNumber(
difficulty.energy_cost_per_sec ?? difficulty.energyCostPerSec
),
energyReqPercent: toNumber(
difficulty.energy_req_percent ?? difficulty.energyReqPercent
),
practiceId: practice.id || "", practiceId: practice.id || "",
serverAddr: practice.serverAddr || "", serverAddr: practice.serverAddr || "",
createdAt: practice.id ? Date.now() : 0, createdAt: practice.id ? Date.now() : 0,
@@ -803,6 +852,7 @@ onShow(() => {
:node="node" :node="node"
:active="node.id === selectedDifficultyId" :active="node.id === selectedDifficultyId"
:locked="checkDifficultyLocked(node)" :locked="checkDifficultyLocked(node)"
:showUnlockProgress="node.id === unlockedDifficultyId"
:completedProgress="getCompletedDifficultyProgress(node)" :completedProgress="getCompletedDifficultyProgress(node)"
@click="handleSelectDifficulty" @click="handleSelectDifficulty"
/> />
+57 -95
View File
@@ -15,19 +15,19 @@ const trainingModeRouteMap = {
endurance: "endurance", endurance: "endurance",
precision: "precision", precision: "precision",
rhythm: "rhythm", rhythm: "rhythm",
strength: "power", stability: "stability",
}; };
const unavailableTrainingIds = new Set(["rhythm", "strength"]); const unavailableTrainingIds = new Set();
// //
const trainingModeIconMap = { const trainingModeIconMap = {
base_bow: base_bow:
"https://static.shelingxingqiu.com/shootmini/static/training-home/img_3.png", "https://static.shelingxingqiu.com/shootmini/static/training-home/img_3.png",
bow: "https://static.shelingxingqiu.com/shootmini/static/training-home/img_4.png", bow: "https://static.shelingxingqiu.com/shootmini/static/training-home/img_5.png",
target: target:
"https://static.shelingxingqiu.com/shootmini/static/training-home/img_5.png", "https://static.shelingxingqiu.com/shootmini/static/training-home/img_4.png",
wave: "https://static.shelingxingqiu.com/shootmini/static/training-home/img_6.png", wave: "https://static.shelingxingqiu.com/shootmini/static/training-home/img_6.png",
muscle: muscle:
"https://static.shelingxingqiu.com/shootmini/static/training-home/img_6.png", "https://static.shelingxingqiu.com/shootmini/static/training-home/img_7.png",
}; };
// id CDN // id CDN
const trainingModeTitleImageMap = { const trainingModeTitleImageMap = {
@@ -39,21 +39,22 @@ const trainingModeTitleImageMap = {
"https://static.shelingxingqiu.com/shootmini/static/training-home/jingzhunxunlian.png", "https://static.shelingxingqiu.com/shootmini/static/training-home/jingzhunxunlian.png",
rhythm: rhythm:
"https://static.shelingxingqiu.com/shootmini/static/training-home/jiezouxunlian.png", "https://static.shelingxingqiu.com/shootmini/static/training-home/jiezouxunlian.png",
strength: stability:
"https://static.shelingxingqiu.com/shootmini/static/training-home/liliangxulian.png", "https://static.shelingxingqiu.com/shootmini/static/training-home/wendingxunlian.png",
}; };
const defaultWeekDays = ["周一", "周二", "周三", "周四", "周五", "周六", "周日"]; const defaultWeekDays = ["周一", "周二", "周三", "周四", "周五", "周六", "周日"];
const defaultRadarDimensions = [ const defaultRadarDimensions = [
{ name: "基础", score: 0 }, { name: "基础", score: 0 },
{ name: "精准", score: 0 }, { name: "精准", score: 0 },
{ name: "力量", score: 0 }, { name: "稳定", score: 0 },
{ name: "节奏", score: 0 }, { name: "节奏", score: 0 },
{ name: "耐力", score: 0 }, { name: "耐力", score: 0 },
]; ];
const radarDimensionTrainingIdMap = Object.freeze({ const radarDimensionTrainingIdMap = Object.freeze({
基础: "base", 基础: "base",
精准: "precision", 精准: "precision",
力量: "strength", 稳定: "stability",
力量: "stability",
节奏: "rhythm", 节奏: "rhythm",
耐力: "endurance", 耐力: "endurance",
}); });
@@ -66,7 +67,7 @@ const createDefaultTrainingData = () => ({
total_arrows: 0, total_arrows: 0,
target_rate: 0, target_rate: 0,
ten_ring_count: 0, ten_ring_count: 0,
total_calories: 0, average_ring: 0,
}, },
beat_percent: 0, beat_percent: 0,
radar_max: 0, radar_max: 0,
@@ -124,20 +125,20 @@ const formatValue = (value, digits = 1) => {
return String(Number(numberValue.toFixed(digits))); return String(Number(numberValue.toFixed(digits)));
}; };
const formatCompactCount = (value) => {
const numberValue = Number(value);
if (!Number.isFinite(numberValue)) return "--";
if (numberValue >= 10000) return `${formatValue(numberValue / 1000)}K`;
return formatValue(numberValue, 0);
};
const getLevelText = (item) => { const getLevelText = (item) => {
if (!item) return ""; if (!item) return "";
const level = Number(item.current_level) || 0; const level = Number(item.current_level) || 0;
return `当前进度 LV${level} >`; return `当前进度 LV${level} >`;
}; };
// K / W const getAverageRingValue = (value) => formatValue(value);
const getCaloriesValue = (value) => {
const numberValue = Number(value);
if (!Number.isFinite(numberValue)) return "--";
if (numberValue >= 10000) return `${formatValue(numberValue / 10000)}W`;
if (numberValue >= 1000) return `${formatValue(numberValue / 1000)}K`;
return formatValue(numberValue, 0);
};
const getTrainingIcon = (item = {}) => const getTrainingIcon = (item = {}) =>
trainingModeIconMap[item.icon] || trainingModeIconMap.bow; trainingModeIconMap[item.icon] || trainingModeIconMap.bow;
@@ -288,7 +289,7 @@ const loadPersonalTrainingData = async () => {
total_arrows: result?.stats?.total_arrows ?? 0, total_arrows: result?.stats?.total_arrows ?? 0,
target_rate: result?.stats?.target_rate ?? 0, target_rate: result?.stats?.target_rate ?? 0,
ten_ring_count: result?.stats?.ten_ring_count ?? 0, ten_ring_count: result?.stats?.ten_ring_count ?? 0,
total_calories: result?.stats?.total_calories ?? 0, average_ring: result?.stats?.average_ring ?? 0,
}, },
beat_percent: result?.beat_percent ?? 0, beat_percent: result?.beat_percent ?? 0,
radar_max: result?.radar_max ?? 0, radar_max: result?.radar_max ?? 0,
@@ -418,7 +419,7 @@ onShow(async () => {
<view class="stats-value-row"> <view class="stats-value-row">
<view class="stats-value-group"> <view class="stats-value-group">
<text class="stats-value"> <text class="stats-value">
{{ formatValue(trainingData.stats.total_arrows, 0) }} {{ formatCompactCount(trainingData.stats.total_arrows) }}
</text> </text>
<text class="stats-unit"></text> <text class="stats-unit"></text>
<view class="stats-value-decoration"></view> <view class="stats-value-decoration"></view>
@@ -444,7 +445,7 @@ onShow(async () => {
<view class="stats-value-row"> <view class="stats-value-row">
<view class="stats-value-group"> <view class="stats-value-group">
<text class="stats-value"> <text class="stats-value">
{{ formatValue(trainingData.stats.ten_ring_count, 0) }} {{ formatCompactCount(trainingData.stats.ten_ring_count) }}
</text> </text>
<text class="stats-unit"></text> <text class="stats-unit"></text>
<view class="stats-value-decoration"></view> <view class="stats-value-decoration"></view>
@@ -457,13 +458,13 @@ onShow(async () => {
<view class="stats-value-row"> <view class="stats-value-row">
<view class="stats-value-group"> <view class="stats-value-group">
<text class="stats-value"> <text class="stats-value">
{{ getCaloriesValue(trainingData.stats.total_calories) }} {{ getAverageRingValue(trainingData.stats.average_ring) }}
</text> </text>
<text class="stats-unit">卡路里</text> <text class="stats-unit"></text>
<view class="stats-value-decoration"></view> <view class="stats-value-decoration"></view>
</view> </view>
</view> </view>
<text class="stats-label">共消耗</text> <text class="stats-label">平均环数</text>
</view> </view>
</view> </view>
</view> </view>
@@ -483,7 +484,7 @@ onShow(async () => {
<text class="record-sub-text">我的训练记录</text> <text class="record-sub-text">我的训练记录</text>
<image <image
class="record-arrow" class="record-arrow"
src="https://static.shelingxingqiu.com/shootmini/static/training-home/img_7.png" src="https://static.shelingxingqiu.com/shootmini/static/training-home/img_right.png"
mode="widthFix" mode="widthFix"
/> />
</view> </view>
@@ -530,19 +531,26 @@ onShow(async () => {
</view> </view>
</view> </view>
<view class="featured-card" @click="$clickSound(openRoutineTraining)">
<image
class="featured-card-bg"
src="https://static.shelingxingqiu.com/shootmini/static/training-home/img_22.png"
mode="widthFix"
/>
<view class="featured-card-mask"></view>
<view class="featured-card-copy">
<text class="featured-card-subtitle">12箭练习</text>
</view>
</view>
<view class="mode-grid"> <view class="mode-grid">
<view
class="mode-card"
@click="$clickSound(openRoutineTraining)"
>
<view class="mode-card-copy">
<image
class="mode-card-title-image"
src="https://static.shelingxingqiu.com/shootmini/static/training-home/ziyouxunlian.png"
mode="widthFix"
/>
<text class="mode-card-progress">无级别限制</text>
</view>
<image
class="mode-card-icon"
src="https://static.shelingxingqiu.com/shootmini/static/training-home/img_2.png"
mode="aspectFit"
/>
</view>
<view <view
v-for="item in visibleTrainingItems" v-for="item in visibleTrainingItems"
:key="item.id" :key="item.id"
@@ -743,7 +751,7 @@ onShow(async () => {
.radar-section { .radar-section {
position: relative; position: relative;
padding-top: 34rpx; padding-top: 30rpx;
} }
.record-bubble { .record-bubble {
@@ -860,52 +868,6 @@ onShow(async () => {
width: 92rpx; width: 92rpx;
} }
.featured-card {
position: relative;
width: 100%;
height: 150rpx;
margin-top: 70rpx;
border-radius: 16rpx;
overflow: hidden;
}
.featured-card-bg {
width: 100%;
}
.featured-card-mask {
position: absolute;
left: 0;
top: 0;
width: 278rpx;
height: 150rpx;
}
.featured-card-copy {
position: absolute;
left: 174rpx;
top: 58rpx;
display: flex;
flex-direction: column;
}
.featured-card-title {
display: block;
color: #895409;
font-size: 34rpx;
font-family: "AlimamaShuHeiTi-Bold", "PingFang SC", sans-serif;
font-weight: 700;
line-height: 42rpx;
}
.featured-card-subtitle {
display: block;
margin-top: 10rpx;
color: #895409;
font-size: 22rpx;
line-height: 32rpx;
}
.mode-grid { .mode-grid {
display: grid; display: grid;
grid-template-columns: repeat(2, minmax(0, 1fr)); grid-template-columns: repeat(2, minmax(0, 1fr));
@@ -915,11 +877,11 @@ onShow(async () => {
.mode-card { .mode-card {
position: relative; position: relative;
height: 150rpx; height: 130rpx;
box-shadow: inset 2rpx 2rpx 6rpx 0rpx rgba(255, 255, 255, 0.27); box-shadow: inset 2rpx 2rpx 6rpx 0rpx rgba(255, 255, 255, 0.27);
border-radius: 16rpx; border-radius: 16rpx;
border: 2rpx solid rgba(235, 184, 123, 0.5); border: 2rpx solid rgba(235, 184, 123, 0.5);
background: rgba(0, 0, 0, 0.5); /* background: rgba(0, 0, 0, 0.5); */
overflow: hidden; overflow: hidden;
} }
@@ -928,8 +890,8 @@ onShow(async () => {
left: 0; left: 0;
top: 0; top: 0;
width: 72rpx; width: 72rpx;
height: 34rpx; height: 28rpx;
line-height: 34rpx; line-height: 28rpx;
text-align: center; text-align: center;
font-size: 20rpx; font-size: 20rpx;
color: #000; color: #000;
@@ -940,7 +902,7 @@ onShow(async () => {
.mode-card-copy { .mode-card-copy {
position: absolute; position: absolute;
left: 30rpx; left: 30rpx;
top: 40rpx; top: 32rpx;
} }
.mode-card-title { .mode-card-title {
@@ -968,16 +930,16 @@ onShow(async () => {
display: block; display: block;
margin-top: 14rpx; margin-top: 14rpx;
color: #fcce96; color: #fcce96;
font-size: 22rpx; font-size: 20rpx;
line-height: 32rpx; line-height: 28rpx;
opacity: 0.5; opacity: 0.5;
} }
.mode-card-icon { .mode-card-icon {
position: absolute; position: absolute;
right: 12rpx; right: 18rpx;
top: 14rpx; top: 8rpx;
width: 124rpx; width: 116rpx;
height: 124rpx; height: 116rpx;
} }
</style> </style>
+481 -15
View File
@@ -10,7 +10,15 @@ import Avatar from "@/components/Avatar.vue";
import BowPower from "@/components/BowPower.vue"; import BowPower from "@/components/BowPower.vue";
import TestDistance from "./components/TestDistance.vue"; import TestDistance from "./components/TestDistance.vue";
import BubbleTip from "./components/BubbleTip.vue"; import BubbleTip from "./components/BubbleTip.vue";
import audioManager from "@/audioManager"; import audioManager, {
getPrecisionShotAudioKeys,
getRhythmShotAudioKeys,
getStabilityShotAudioKeys,
getTrainingStartAudioKey,
RHYTHM_SHOOT_WINDOW_AUDIO_KEY,
STABILITY_ENERGY_50_AUDIO_KEY,
STABILITY_ENERGY_70_AUDIO_KEY,
} from "@/audioManager";
import { import {
createPractiseV2API, createPractiseV2API,
@@ -23,12 +31,13 @@ import {
import { import {
connectMatchWebSocket, connectMatchWebSocket,
closeMatchWebSocket, closeMatchWebSocket,
requestPracticeInfoSync,
setMatchAppHideResumable, setMatchAppHideResumable,
MATCH_WS_PRACTICE_SYNC_EVENT, MATCH_WS_PRACTICE_SYNC_EVENT,
MATCH_WS_STATE_EVENT, MATCH_WS_STATE_EVENT,
} from "@/matchWebsocket"; } from "@/matchWebsocket";
import { sharePractiseData } from "@/canvas"; import { sharePractiseData } from "@/canvas";
import { wxShare, debounce, getDirectionText } from "@/util"; import { wxShare, debounce, getDirectionText, capsuleHeight } from "@/util";
import { MESSAGETYPESV2, roundsName } from "@/constants"; import { MESSAGETYPESV2, roundsName } from "@/constants";
import useStore from "@/store"; import useStore from "@/store";
@@ -38,6 +47,7 @@ const { user } = storeToRefs(store);
const sound = ref(true); const sound = ref(true);
const start = ref(false); const start = ref(false);
const practiceStarting = ref(false);
const pageStages = Object.freeze({ const pageStages = Object.freeze({
DISTANCE: "distance", DISTANCE: "distance",
SHOOTING: "shooting", SHOOTING: "shooting",
@@ -46,6 +56,25 @@ const pageStages = Object.freeze({
}); });
const pageStage = ref(pageStages.LOADING); const pageStage = ref(pageStages.LOADING);
const scores = ref([]); const scores = ref([]);
// Header
const rhythmHeaderTitleStyle = Object.freeze({
position: "fixed",
top: `${capsuleHeight}px`,
left: "50%",
width: "430rpx",
height: "50px",
display: "flex",
alignItems: "center",
justifyContent: "center",
transform: "translateX(-50%)",
color: "#e7ba80",
fontSize: "30rpx",
lineHeight: "42rpx",
fontWeight: 500,
textAlign: "center",
whiteSpace: "nowrap",
zIndex: 20,
});
// ShootResult // ShootResult
const shotEffectToken = ref(0); const shotEffectToken = ref(0);
// //
@@ -62,6 +91,17 @@ const tips = ref("");
const targetType = ref(defaultTargetType); const targetType = ref(defaultTargetType);
const trainingParams = ref({}); const trainingParams = ref({});
const practiceInfo = ref({}); const practiceInfo = ref({});
const simulatorTargetType = computed(() => {
const currentTargetType = Number(practiceInfo.value.targetType);
if ([20, 40].includes(currentTargetType)) return currentTargetType;
return [2, 40].includes(Number(targetType.value)) ? 40 : 20;
});
const rhythmServerTimestamp = ref(0);
const rhythmFallbackWindowStart = ref(0);
const rhythmFallbackTimestamp = ref(0);
const rhythmHasActiveServerAnchor = ref(false);
// total_arrows arrows_left
const rhythmTargetArrows = ref(0);
// practiceInfo // practiceInfo
const visiblePrecisionTarget = ref({ const visiblePrecisionTarget = ref({
randomBlock: 0, randomBlock: 0,
@@ -232,6 +272,96 @@ const loadNextDifficultyState = (result = {}) => {
// time_limit // time_limit
const timeLimit = computed(() => getPositiveInteger(practiceInfo.value.timeLimit)); const timeLimit = computed(() => getPositiveInteger(practiceInfo.value.timeLimit));
const hasTimeLimit = computed(() => timeLimit.value > 0); const hasTimeLimit = computed(() => timeLimit.value > 0);
const isRhythmTraining = computed(() => trainingType.value === "rhythm");
const isStabilityTraining = computed(
() => trainingType.value === "stability"
);
const rhythmRoundTime = computed(() =>
getPositiveInteger(practiceInfo.value.roundTime) ||
getPositiveInteger(trainingParams.value.roundTime)
);
const rhythmShootTime = computed(() =>
getPositiveInteger(practiceInfo.value.shootTime) ||
getPositiveInteger(trainingParams.value.shootTime)
);
const rhythmShootWindowStart = computed(() => {
if (rhythmHasActiveServerAnchor.value) {
return practiceInfo.value.shootWindowStart || 0;
}
return (
rhythmFallbackWindowStart.value ||
practiceInfo.value.shootWindowStart ||
0
);
});
const rhythmCountdownTimestamp = computed(() =>
rhythmHasActiveServerAnchor.value
? rhythmServerTimestamp.value
: rhythmFallbackTimestamp.value || rhythmServerTimestamp.value
);
const rhythmInShootWindow = computed(
() => practiceInfo.value.inShootWindow === true
);
const rhythmHitReq = computed(
() =>
getPositiveInteger(practiceInfo.value.hitReq) ||
getPositiveInteger(trainingParams.value.hitReq)
);
const stabilityEnergyReqPercent = computed(() =>
Math.max(
0,
Math.min(
100,
getPracticeNumber(
practiceInfo.value.energyReqPercent,
trainingParams.value.energyReqPercent
)
)
)
);
const stabilityScoreSlot = computed(() =>
Math.max(
0,
getPracticeNumber(
practiceInfo.value.scoreSlot,
trainingParams.value.scoreSlot
)
)
);
const stabilityCurrentEnergy = computed(() => {
const currentEnergy = Math.max(
0,
getPracticeNumber(practiceInfo.value.currentEnergy)
);
return stabilityScoreSlot.value > 0
? Math.min(stabilityScoreSlot.value, currentEnergy)
: currentEnergy;
});
const stabilityEnergyPercent = computed(() => {
if (stabilityScoreSlot.value <= 0) return 0;
return Math.min(
100,
(stabilityCurrentEnergy.value / stabilityScoreSlot.value) * 100
);
});
const initializeRhythmFirstRoundCountdown = () => {
rhythmHasActiveServerAnchor.value = false;
rhythmFallbackWindowStart.value = 0;
rhythmFallbackTimestamp.value = 0;
if (!isRhythmTraining.value) return;
const roundTime = rhythmRoundTime.value;
const shootTime = rhythmShootTime.value;
if (!roundTime || !shootTime || shootTime > roundTime) return;
const localNow = Date.now();
rhythmFallbackTimestamp.value = localNow;
// shootWindowStart shootTime
rhythmFallbackWindowStart.value =
localNow + (roundTime - shootTime) * 1000;
};
const precisionBlocks = computed(() => { const precisionBlocks = computed(() => {
if (useHighlightTest.value) { if (useHighlightTest.value) {
@@ -336,6 +466,62 @@ const trainingCopy = computed(() => {
}; };
} }
if (trainingType.value === "rhythm") {
const targetArrows = getPositiveInteger(rhythmTargetArrows.value);
const arrowsLeft = Math.min(
targetArrows,
Math.max(
0,
getPracticeNumber(practiceInfo.value.arrowsLeft, targetArrows)
)
);
const completedArrows = targetArrows - arrowsLeft;
const hitReq = rhythmHitReq.value;
return {
inline: true,
details: [
{ text: "在进度条读取到高亮区间时射箭命中" },
{
text: hitReq > 0 ? `${hitReq}环内` : "指定区域",
highlight: true,
},
{ text: ",需完成" },
{ text: `(${completedArrows}/${targetArrows})`, highlight: true },
{ text: "箭" },
],
};
}
if (trainingType.value === "stability") {
const hitReq = getPracticeNumber(
practiceInfo.value.hitReq,
trainingParams.value.hitReq
);
const stabilityTimeLimit = getPracticeNumber(
practiceInfo.value.timeLimit,
trainingParams.value.timeLimit
);
return {
inline: true,
details: [
{ text: stabilityTimeLimit > 0 ? "在" : "" },
{
text: stabilityTimeLimit > 0 ? `${stabilityTimeLimit}` : "不限时",
highlight: true,
},
{ text: stabilityTimeLimit > 0 ? "内射箭,命中" : "射箭,命中" },
{ text: `${hitReq}`, highlight: true },
{ text: "可获得能量,计时结束能量需要大于" },
{
text: `${stabilityEnergyReqPercent.value}%`,
highlight: true,
},
],
};
}
return null; return null;
}); });
@@ -369,6 +555,22 @@ const practiceInfoFields = [
"blocks", "blocks",
"randomBlock", "randomBlock",
"randomRingArea", "randomRingArea",
"roundTime",
"shootTime",
"shootWindowStart",
"inShootWindow",
"scoreSlot",
"currentEnergy",
"energyCostPerSec",
"energyPerHit",
"energyReqPercent",
"deltaCurrentEnergy",
"maxEnergyPercent",
"qualifiedArrows",
"qualifiedRate",
"deltaMaxEnergyPercent",
"deltaQualifiedArrows",
"deltaQualifiedRate",
"timeLimit", "timeLimit",
"completed", "completed",
"totalArrows", "totalArrows",
@@ -377,13 +579,17 @@ const practiceInfoFields = [
"stability", "stability",
"maxCombo", "maxCombo",
"totalHits", "totalHits",
"hitRate",
"deltaTotalHits", "deltaTotalHits",
"deltaDuration", "deltaDuration",
"deltaHitRate",
"deltaMaxCombo", "deltaMaxCombo",
"deltaTotalRings", "deltaTotalRings",
"deltaTotalArrows", "deltaTotalArrows",
"deltaAverageRing", "deltaAverageRing",
"deltaStability", "deltaStability",
"tenRingCount",
"deltaTenRingCount",
"beforeExp", "beforeExp",
"beforeLevel", "beforeLevel",
"currentExp", "currentExp",
@@ -404,14 +610,30 @@ const practiceResultFields = [
"stability", "stability",
"maxCombo", "maxCombo",
"totalHits", "totalHits",
"hitRate",
"currentRings", "currentRings",
"scoreSlot",
"currentEnergy",
"energyCostPerSec",
"energyPerHit",
"energyReqPercent",
"deltaCurrentEnergy",
"maxEnergyPercent",
"qualifiedArrows",
"qualifiedRate",
"deltaMaxEnergyPercent",
"deltaQualifiedArrows",
"deltaQualifiedRate",
"deltaTotalHits", "deltaTotalHits",
"deltaDuration", "deltaDuration",
"deltaHitRate",
"deltaMaxCombo", "deltaMaxCombo",
"deltaTotalRings", "deltaTotalRings",
"deltaTotalArrows", "deltaTotalArrows",
"deltaAverageRing", "deltaAverageRing",
"deltaStability", "deltaStability",
"tenRingCount",
"deltaTenRingCount",
"beforeExp", "beforeExp",
"beforeLevel", "beforeLevel",
"currentExp", "currentExp",
@@ -421,7 +643,72 @@ const practiceResultFields = [
"details", "details",
]; ];
const cacheRhythmTrainingConfig = (message = {}) => {
const messageTrainingType = String(
message.trainingType ?? message.training_type ?? trainingType.value
).trim();
if (messageTrainingType !== "rhythm") return;
const roundTime = getPositiveInteger(
message.roundTime ?? message.round_time
);
const shootTime = getPositiveInteger(
message.shootTime ?? message.shoot_time
);
const hitReq = getPositiveInteger(message.hitReq ?? message.hit_req);
const nextConfig = {};
// practiceInfo
if (roundTime > 0) nextConfig.roundTime = roundTime;
if (shootTime > 0) nextConfig.shootTime = shootTime;
if (hitReq > 0) nextConfig.hitReq = hitReq;
if (Object.keys(nextConfig).length === 0) return;
trainingParams.value = {
...trainingParams.value,
...nextConfig,
};
//
if (
start.value &&
!rhythmHasActiveServerAnchor.value &&
!rhythmFallbackWindowStart.value &&
rhythmRoundTime.value > 0 &&
rhythmShootTime.value > 0
) {
initializeRhythmFirstRoundCountdown();
}
};
const cacheRhythmTargetArrows = (message = {}) => {
const messageTrainingType = String(
message.trainingType ?? message.training_type ?? trainingType.value
).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);
cacheRhythmTargetArrows(message);
const messageTrainingType = String(
message.trainingType ?? message.training_type ?? trainingType.value
).trim();
const nextInfo = practiceInfoFields.reduce((result, field) => { const nextInfo = practiceInfoFields.reduce((result, field) => {
if (Object.prototype.hasOwnProperty.call(message, field)) { if (Object.prototype.hasOwnProperty.call(message, field)) {
result[field] = message[field]; result[field] = message[field];
@@ -429,6 +716,24 @@ const syncPracticeInfo = (message = {}) => {
return result; return result;
}, {}); }, {});
const isStabilityEnergySnapshot =
messageTrainingType === "stability" &&
(Object.prototype.hasOwnProperty.call(message, "currentEnergy") ||
message.type === undefined ||
[
MESSAGETYPESV2.BattleStart,
MESSAGETYPESV2.ShootResult,
MESSAGETYPESV2.BattleEnd,
].includes(message.type));
if (isStabilityEnergySnapshot) {
// BattleStart/ShootResult/PracticeEnd/
// current_energy 0 protobuf 沿
if (!Object.prototype.hasOwnProperty.call(nextInfo, "currentEnergy")) {
nextInfo.currentEnergy = 0;
}
}
const isPrecisionSnapshot = const isPrecisionSnapshot =
(message.type === MESSAGETYPESV2.BattleStart || (message.type === MESSAGETYPESV2.BattleStart ||
message.type === MESSAGETYPESV2.ShootResult) && message.type === MESSAGETYPESV2.ShootResult) &&
@@ -466,16 +771,28 @@ const buildShootResultAudioKeys = (message = {}) => {
return []; return [];
} }
const keys = [ const directionText =
arrow.ring ? `${arrow.ringX ? "X" : arrow.ring}` : "未上靶", arrow.angle !== null && arrow.angle !== undefined
]; ? getDirectionText(arrow.angle)
if (arrow.angle !== null && arrow.angle !== undefined) { : "";
keys.push(`${getDirectionText(arrow.angle)}调整`); return getPrecisionShotAudioKeys(arrow, directionText);
};
const buildRhythmShootResultAudioKeys = (message = {}) => {
const latestDetail =
Array.isArray(message.details) && message.details.length > 0
? message.details[message.details.length - 1]
: null;
const arrow = message.shootData || latestDetail;
if (!arrow) return [];
if (
arrow.playerId !== undefined &&
arrow.playerId !== null &&
String(arrow.playerId) !== String(user.value?.id)
) {
return [];
} }
if (arrow.threeConsecutive10Rings === true) { return getRhythmShotAudioKeys(arrow);
keys.push("tententen");
}
return keys;
}; };
const playAudioKeysAndWait = (keys) => { const playAudioKeysAndWait = (keys) => {
@@ -703,6 +1020,16 @@ const onPracticeInfoSync = (payload = {}) => {
const snapshot = payload.practiceInfo; const snapshot = payload.practiceInfo;
if (!snapshot || typeof snapshot !== "object") return; if (!snapshot || typeof snapshot !== "object") return;
if (
start.value &&
(snapshot.trainingType === "rhythm" || isRhythmTraining.value) &&
Number(snapshot.shootWindowStart) > 0
) {
rhythmHasActiveServerAnchor.value = true;
}
if (payload.timestamp !== undefined && payload.timestamp !== null) {
rhythmServerTimestamp.value = payload.timestamp;
}
const shouldShowDistance = const shouldShowDistance =
waitingPracticeSync && pageStage.value === pageStages.LOADING; waitingPracticeSync && pageStage.value === pageStages.LOADING;
@@ -790,6 +1117,7 @@ const connectPracticeServer = ({
requestPracticeInfoOnOpen: true, requestPracticeInfoOnOpen: true,
appHideResumable: appHideResumable.value, appHideResumable: appHideResumable.value,
practiceEndAudioKey: "练习结束", practiceEndAudioKey: "练习结束",
trainingType: trainingType.value,
}); });
connectionClosed.value = false; connectionClosed.value = false;
return true; return true;
@@ -1015,16 +1343,58 @@ onLoad((options = {}) => {
toRouteNumber(trainingContext.difficultyLevel) toRouteNumber(trainingContext.difficultyLevel)
), ),
recordId: options.recordId || "", recordId: options.recordId || "",
hitReq: toRouteNumber(options.hitReq), hitReq: toRouteNumber(
options.hitReq,
toRouteNumber(trainingContext.hitReq)
),
totalReq: toRouteNumber(options.totalReq), totalReq: toRouteNumber(options.totalReq),
blocks: toRouteNumber(options.blocks), blocks: toRouteNumber(options.blocks),
mode: toRouteNumber(options.mode), mode: toRouteNumber(options.mode),
roundTime: toRouteNumber(
options.roundTime,
toRouteNumber(trainingContext.roundTime)
),
shootTime: toRouteNumber(
options.shootTime,
toRouteNumber(trainingContext.shootTime)
),
energyPerHit: toRouteNumber(
options.energyPerHit,
toRouteNumber(trainingContext.energyPerHit)
),
energyCostPerSec: toRouteNumber(
options.energyCostPerSec,
toRouteNumber(trainingContext.energyCostPerSec)
),
energyReqPercent: toRouteNumber(
options.energyReqPercent,
toRouteNumber(trainingContext.energyReqPercent)
),
scoreSlot: toRouteNumber(
options.scoreSlot,
toRouteNumber(trainingContext.scoreSlot)
),
}; };
practiseId.value = trainingContext.practiceId || ""; practiseId.value = trainingContext.practiceId || "";
serverAddr.value = trainingContext.serverAddr || ""; serverAddr.value = trainingContext.serverAddr || "";
const startAudioKey = getTrainingStartAudioKey(trainingParams.value.type);
const warmupKeys = [startAudioKey, "胜利", "失败"];
if (trainingParams.value.type === "precision") {
warmupKeys.push("Bingo命中目标", "未命中");
} else if (trainingParams.value.type === "rhythm") {
warmupKeys.push(RHYTHM_SHOOT_WINDOW_AUDIO_KEY, "Perfect", "miss");
} else if (trainingParams.value.type === "stability") {
warmupKeys.push(
STABILITY_ENERGY_50_AUDIO_KEY,
STABILITY_ENERGY_70_AUDIO_KEY
);
}
void audioManager.warmKeys(warmupKeys.filter(Boolean));
}); });
const onReady = async () => { const onReady = async () => {
if (practiceStarting.value) return;
if ( if (
!practiseId.value || !practiseId.value ||
practiceEnded.value || practiceEnded.value ||
@@ -1038,6 +1408,7 @@ const onReady = async () => {
return; return;
} }
practiceStarting.value = true;
pageStage.value = pageStages.LOADING; pageStage.value = pageStages.LOADING;
clearHighlightTestTimer(); clearHighlightTestTimer();
useHighlightTest.value = false; useHighlightTest.value = false;
@@ -1048,15 +1419,23 @@ const onReady = async () => {
practiseResult.value = {}; practiseResult.value = {};
scores.value = []; scores.value = [];
shotEffectToken.value = 0; shotEffectToken.value = 0;
initializeRhythmFirstRoundCountdown();
start.value = true; start.value = true;
pageStage.value = pageStages.SHOOTING; pageStage.value = pageStages.SHOOTING;
setPracticeAppHideResumable(true); setPracticeAppHideResumable(true);
audioManager.play("练习开始"); //
requestPracticeInfoSync();
// BattleStart
audioManager.play(
getTrainingStartAudioKey(trainingType.value, "练习开始")
);
} catch (error) { } catch (error) {
start.value = false; start.value = false;
pageStage.value = pageStages.DISTANCE; pageStage.value = pageStages.DISTANCE;
setPracticeAppHideResumable(true); setPracticeAppHideResumable(true);
throw error; throw error;
} finally {
practiceStarting.value = false;
} }
}; };
@@ -1079,6 +1458,7 @@ const enterPracticeResult = (result = {}) => {
clearPracticeRuntimeContext(); clearPracticeRuntimeContext();
closePracticeConnection("training-practice-result"); closePracticeConnection("training-practice-result");
pageStage.value = pageStages.RESULT; pageStage.value = pageStages.RESULT;
audioManager.play(result.completed === true ? "胜利" : "失败");
return true; return true;
}; };
@@ -1111,7 +1491,27 @@ const onOver = async () => {
async function onReceiveMessage(msg) { async function onReceiveMessage(msg) {
const previousScoreLength = scores.value.length; const previousScoreLength = scores.value.length;
const incomingRhythmWindowStart = Number(msg.shootWindowStart);
const currentRhythmWindowStart = Number(rhythmShootWindowStart.value);
const shouldSyncRhythmAnchor =
start.value &&
isRhythmTraining.value &&
incomingRhythmWindowStart > 0 &&
(!rhythmHasActiveServerAnchor.value ||
incomingRhythmWindowStart !== currentRhythmWindowStart);
//
if (
shouldSyncRhythmAnchor &&
msg.timestamp !== undefined &&
msg.timestamp !== null
) {
rhythmServerTimestamp.value = msg.timestamp;
}
syncPracticeInfo(msg); syncPracticeInfo(msg);
if (shouldSyncRhythmAnchor) {
rhythmHasActiveServerAnchor.value = true;
}
if (msg.type === MESSAGETYPESV2.BattleStart) { if (msg.type === MESSAGETYPESV2.BattleStart) {
invalidateShotPresentations(); invalidateShotPresentations();
@@ -1150,6 +1550,38 @@ async function onReceiveMessage(msg) {
audioPromise, audioPromise,
effectPromise, effectPromise,
}); });
} else if (trainingType.value === "rhythm") {
const audioKeys = buildRhythmShootResultAudioKeys(msg);
if (audioKeys.length > 0) {
audioManager.play(audioKeys, false);
}
if (hasNewShot) {
shotEffectToken.value += 1;
}
} else if (trainingType.value === "stability") {
const hasStabilityShot =
msg.stabilityHasNewShot === true || hasNewShot;
const latestDetail =
Array.isArray(msg.details) && msg.details.length > 0
? msg.details[msg.details.length - 1]
: null;
const arrow = msg.shootData || latestDetail;
const audioKeys = hasStabilityShot
? getStabilityShotAudioKeys(arrow)
: [];
const milestoneAudioKey = String(
msg.stabilityMilestoneAudioKey || ""
).trim();
// WebSocket key ACK
// /
if (milestoneAudioKey) audioKeys.push(milestoneAudioKey);
if (audioKeys.length > 0) {
audioManager.play(audioKeys, false);
}
if (hasStabilityShot) {
shotEffectToken.value += 1;
}
} else if (hasNewShot) { } else if (hasNewShot) {
shotEffectToken.value += 1; shotEffectToken.value += 1;
} }
@@ -1196,6 +1628,11 @@ async function onRetry() {
practiseResult.value = {}; practiseResult.value = {};
practiceEndSnapshot.value = {}; practiceEndSnapshot.value = {};
practiceInfo.value = {}; practiceInfo.value = {};
rhythmServerTimestamp.value = 0;
rhythmFallbackWindowStart.value = 0;
rhythmFallbackTimestamp.value = 0;
rhythmHasActiveServerAnchor.value = false;
rhythmTargetArrows.value = 0;
invalidateShotPresentations({ resetVisible: true }); invalidateShotPresentations({ resetVisible: true });
start.value = false; start.value = false;
scores.value = []; scores.value = [];
@@ -1318,11 +1755,27 @@ onBeforeUnmount(() => {
:showBottom="isDistanceStage" :showBottom="isDistanceStage"
:scroll="!isShootingStage" :scroll="!isShootingStage"
:onBack="exitPractice" :onBack="exitPractice"
:title="
isShootingStage
? isRhythmTraining
? '节奏训练'
: isStabilityTraining
? '稳定训练'
: ''
: ''
"
:titleStyle="
isShootingStage && (isRhythmTraining || isStabilityTraining)
? rhythmHeaderTitleStyle
: {}
"
> >
<view class="practise-content"> <view class="practise-content">
<TestDistance <TestDistance
v-if="isDistanceStage" v-if="isDistanceStage"
:targetType="practiceInfo.targetType" :targetType="simulatorTargetType"
:autoStart="true"
@passed="onReady"
/> />
<view v-else-if="isShootingStage" class="shooting-layout"> <view v-else-if="isShootingStage" class="shooting-layout">
<view class="shooting-fixed"> <view class="shooting-fixed">
@@ -1331,9 +1784,21 @@ onBeforeUnmount(() => {
:total="timeLimit" :total="timeLimit"
:countdownEnabled="hasTimeLimit" :countdownEnabled="hasTimeLimit"
:trainingType="trainingType" :trainingType="trainingType"
:roundTime="rhythmRoundTime"
:shootTime="rhythmShootTime"
:shootWindowStart="rhythmShootWindowStart"
:inShootWindow="rhythmInShootWindow"
:serverTimestamp="rhythmCountdownTimestamp"
:hitReq="rhythmHitReq"
:energyPercent="stabilityEnergyPercent"
:energyReqPercent="stabilityEnergyReqPercent"
:isVip="isVip" :isVip="isVip"
:isSvip="isSvip" :isSvip="isSvip"
:externalShootResultAudio="trainingType === 'precision'" :externalShootResultAudio="
trainingType === 'precision' ||
trainingType === 'rhythm' ||
trainingType === 'stability'
"
:onStop="onTimeLimitReached" :onStop="onTimeLimitReached"
/> />
<view class="user-row"> <view class="user-row">
@@ -1349,6 +1814,7 @@ onBeforeUnmount(() => {
:currentRound="scores.length % 3" :currentRound="scores.length % 3"
:scores="scores" :scores="scores"
:isSvip="isSvip" :isSvip="isSvip"
:targetType="simulatorTargetType"
:shotEffectToken="shotEffectToken" :shotEffectToken="shotEffectToken"
:showCrosshair="false" :showCrosshair="false"
:sectorCount="precisionBlocks" :sectorCount="precisionBlocks"
+22
View File
@@ -4,6 +4,7 @@ import Container from "@/components/Container.vue";
import UserHeader from "@/components/UserHeader.vue"; import UserHeader from "@/components/UserHeader.vue";
import UserItem from "@/components/UserItem.vue"; import UserItem from "@/components/UserItem.vue";
import Avatar from "@/components/Avatar.vue"; import Avatar from "@/components/Avatar.vue";
import { getMyGoldAPI } from "@/apis";
import { canEenter } from "@/util"; import { canEenter } from "@/util";
import useStore from "@/store"; import useStore from "@/store";
import { storeToRefs } from "pinia"; import { storeToRefs } from "pinia";
@@ -24,6 +25,21 @@ const toFristTryPage = async () => {
}); });
} }
}; };
const toCoinPage = () => {
uni.navigateTo({
url: "/pages/coin/nearby-stores",
});
};
const showCoinEntry = ref(false);
const loadCoinEntryVisibility = async () => {
showCoinEntry.value = false;
try {
const result = await getMyGoldAPI();
showCoinEntry.value = result?.hasTempBind === true;
} catch (error) {
console.error("加载金币入口状态失败", error);
}
};
const toBeVipPage = () => { const toBeVipPage = () => {
uni.navigateTo({ uni.navigateTo({
url: "/pages/member/be-vip", url: "/pages/member/be-vip",
@@ -69,6 +85,7 @@ const logout = () => {
updateUser(); updateUser();
}; };
onMounted(() => { onMounted(() => {
loadCoinEntryVisibility();
const accountInfo = uni.getAccountInfoSync(); const accountInfo = uni.getAccountInfoSync();
const envVersion = accountInfo.miniProgram.envVersion; const envVersion = accountInfo.miniProgram.envVersion;
if (envVersion !== "release") showLogout.value = true; if (envVersion !== "release") showLogout.value = true;
@@ -108,6 +125,11 @@ const buildVersion = typeof __BUILD_TIME__ !== 'undefined' ? __BUILD_TIME__ : ''
<text v-if="user.trio > 0" :style="{ color: '#259249' }">已完成</text> <text v-if="user.trio > 0" :style="{ color: '#259249' }">已完成</text>
<text v-else :style="{ color: '#CC311F' }">未完成</text> <text v-else :style="{ color: '#CC311F' }">未完成</text>
</UserItem> </UserItem>
<UserItem
v-if="showCoinEntry"
title="我的金币"
:onClick="toCoinPage"
/>
<UserItem title="会员" :onClick="toBeVipPage"> <UserItem title="会员" :onClick="toBeVipPage">
<view <view
v-if="user.sVip === true" v-if="user.sVip === true"
Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 332 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 156 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 65 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 173 B

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 348 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

+60 -8
View File
@@ -329,18 +329,70 @@ export const getDirectionText = (angle = 0) => {
} }
}; };
// 正式射箭阶段的距离单位为厘米,按距离异常类型选择对应语音 // 射箭数据中的距离单位为厘米;旧版本会明确上报 target_ok=true
export const getInvalidShotAudioKey = (shootData) => { export const getShootValidation = (shootData) => {
if (!shootData || typeof shootData !== "object") return "射击无效"; if (!shootData || typeof shootData !== "object") {
// protobuf 会省略值为 0 的标量字段;消息体存在且距离缺失时按 0 处理。 return {
rawDistance: 0,
distance: 0,
distanceOk: false,
targetOk: false,
targetDetected: false,
};
}
const rawDistance = Number(shootData.distance ?? shootData.dst ?? 0); const rawDistance = Number(shootData.distance ?? shootData.dst ?? 0);
if (!Number.isFinite(rawDistance)) return "射击无效"; const finiteDistance = Number.isFinite(rawDistance) ? rawDistance : 0;
if (rawDistance < 0) return "射箭无效,靶纸错误"; const targetFlag = shootData.targetOk ?? shootData.target_ok;
if (rawDistance === 0) return "射箭无效,未识别到靶纸"; const targetDetected = finiteDistance !== 0;
if (rawDistance / 100 < 5) return "射箭无效,距离不足"; const targetOk = finiteDistance > 0 && targetFlag === true;
return {
rawDistance: finiteDistance,
distance: Math.max(0, finiteDistance / 100),
// 旧固件以负距离表示靶纸错误,此时只提示靶纸问题,不叠加距离不足。
distanceOk: finiteDistance < 0 || finiteDistance >= 500,
targetOk: targetDetected && targetOk,
targetDetected,
};
};
// 测距阶段提示音:按站距与靶纸组合播放新版测距语音。
export const getDistanceCheckAudioKey = (shootData) => {
const result = getShootValidation(shootData);
if (!result.targetDetected) return "未识别到靶纸,请瞄准靶纸射箭";
if (!result.distanceOk && !result.targetOk) {
return "站距过近,靶纸错误";
}
if (!result.distanceOk) return "站距过近,靶纸正确";
if (!result.targetOk) return "站距合格,靶纸错误";
return "站距合格,靶纸正确";
};
export const getDistanceCheckText = (shootData) => {
const result = getShootValidation(shootData);
if (!result.targetDetected) return "未识别到靶纸,请瞄准靶纸射箭";
if (result.rawDistance < 0) return "靶纸错误";
return `${result.distanceOk ? "站距合格" : "站距过近"}${
result.targetOk ? "靶纸正确" : "靶纸错误"
}`;
};
// 正式射箭阶段的距离和靶纸异常类型选择对应语音。
export const getInvalidShotAudioKey = (shootData) => {
const result = getShootValidation(shootData);
if (!result.targetDetected) return "射箭无效,未识别到靶纸";
if (!result.distanceOk && !result.targetOk) {
return "射箭无效,距离不足且靶纸错误";
}
if (!result.targetOk) return "射箭无效,靶纸错误";
if (!result.distanceOk) return "射箭无效,距离不足";
return "射击无效"; return "射击无效";
}; };
export const getInvalidShotText = (shootData) =>
getInvalidShotAudioKey(shootData);
export const wxLogin = () => { export const wxLogin = () => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
uni.login({ uni.login({
+1 -1
View File
File diff suppressed because one or more lines are too long
+14 -2
View File
@@ -7,8 +7,8 @@ const { Reader, Writer } = protobuf;
// 所以这里使用 minimal Reader/Writer 做静态字段解码和客户端消息编码。 // 所以这里使用 minimal Reader/Writer 做静态字段解码和客户端消息编码。
// <match-schema-generated> // <match-schema-generated>
// 此区块由 scripts/generate-match-schema.mjs 自动生成,请勿手动修改。 // 此区块由 scripts/generate-match-schema.mjs 自动生成,请勿手动修改。
// 来源:src/utils/match.min.jssha256: 150812589c2e6f7a // 来源:src/utils/match.min.jssha256: bece92f31bde3072
// 协议命名空间:rpc;消息数:12;字段数:151 // 协议命名空间:rpc;消息数:12;字段数:163
export const ServerMessageType = { export const ServerMessageType = {
SERVER_MSG_UNKNOWN: 0, SERVER_MSG_UNKNOWN: 0,
@@ -51,6 +51,7 @@ const SCHEMAS = {
8: { name: "distance", kind: "float" }, 8: { name: "distance", kind: "float" },
9: { name: "three_consecutive_10_rings", kind: "bool" }, 9: { name: "three_consecutive_10_rings", kind: "bool" },
10: { name: "ok", kind: "bool" }, 10: { name: "ok", kind: "bool" },
11: { name: "target_ok", kind: "bool" },
}, },
MatchShootList: { MatchShootList: {
1: { name: "items", kind: "message", type: "MatchShoot", repeated: true }, 1: { name: "items", kind: "message", type: "MatchShoot", repeated: true },
@@ -139,6 +140,7 @@ const SCHEMAS = {
7: { name: "device_id", kind: "string" }, 7: { name: "device_id", kind: "string" },
8: { name: "shoot_id", kind: "string" }, 8: { name: "shoot_id", kind: "string" },
9: { name: "three_consecutive_10_rings", kind: "bool" }, 9: { name: "three_consecutive_10_rings", kind: "bool" },
10: { name: "target_ok", kind: "bool" },
}, },
PracticeInfo: { PracticeInfo: {
1: { name: "id", kind: "int64" }, 1: { name: "id", kind: "int64" },
@@ -194,6 +196,16 @@ const SCHEMAS = {
51: { name: "shoot_window_start", kind: "int64" }, 51: { name: "shoot_window_start", kind: "int64" },
52: { name: "in_shoot_window", kind: "bool" }, 52: { name: "in_shoot_window", kind: "bool" },
53: { name: "shoot_time", kind: "int32" }, 53: { name: "shoot_time", kind: "int32" },
54: { name: "ten_ring_count", kind: "int32" },
55: { name: "delta_ten_ring_count", kind: "int32" },
56: { name: "max_energy_percent", kind: "int32" },
57: { name: "qualified_arrows", kind: "int32" },
58: { name: "qualified_rate", kind: "int32" },
59: { name: "delta_max_energy_percent", kind: "int32" },
60: { name: "delta_qualified_arrows", kind: "int32" },
61: { name: "delta_qualified_rate", kind: "int32" },
62: { name: "hit_rate", kind: "int32" },
63: { name: "delta_hit_rate", kind: "int32" },
}, },
MatchInfo: { MatchInfo: {
1: { name: "match_id", kind: "string" }, 1: { name: "match_id", kind: "string" },