Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
14f9ccd1ef | ||
|
|
cc8f997600 | ||
|
|
a81494973c | ||
|
|
f3fab17687 | ||
|
|
d22d958215 | ||
|
|
b4ed13d2b5 | ||
|
|
b8b0ab4005 | ||
|
|
05f73acf47 | ||
|
|
eca15178f4 | ||
|
|
9eb6ef7cf1 | ||
|
|
00f84fc3e4 | ||
|
|
5bb9df8a03 | ||
|
|
bad336c7d4 | ||
|
|
21ed8066aa | ||
|
|
9ad2c5e12e | ||
|
|
9de435a369 | ||
|
|
5357f131de |
@@ -243,6 +243,14 @@
|
||||
{
|
||||
"type": "folder",
|
||||
"value": "static/training-difficulty-design"
|
||||
},
|
||||
{
|
||||
"type": "folder",
|
||||
"value": "static/coin"
|
||||
},
|
||||
{
|
||||
"type": "folder",
|
||||
"value": "static/home-device"
|
||||
}
|
||||
],
|
||||
"include": []
|
||||
|
||||
@@ -264,11 +264,6 @@ function buildSchema({ messageName, definition, messages, enumNames }) {
|
||||
}
|
||||
|
||||
const repeated = rule === "repeated";
|
||||
if (repeated && !isMessage && !["string", "bytes"].includes(kind)) {
|
||||
throw new Error(
|
||||
`${messageName}.${fieldKey} 是 packed scalar repeated,当前通用解码器尚不支持`
|
||||
);
|
||||
}
|
||||
|
||||
const field = isMessage
|
||||
? { name: fieldName, kind: "message", type: typeName }
|
||||
|
||||
@@ -770,6 +770,21 @@ export const getGiftDetailAPI = (id) => {
|
||||
);
|
||||
};
|
||||
|
||||
// 分页获取启用门店及当前用户在各店的会员状态。
|
||||
export const getStoreVipListAPI = ({page = 1, pageSize = 20} = {}) => {
|
||||
return request("GET", "/store/list", {page, pageSize});
|
||||
};
|
||||
|
||||
// 查询当前用户在指定门店的会员状态及权益剩余次数。
|
||||
export const getStoreBenefitAPI = (storeId) => {
|
||||
return request("GET", "/store/benefit", {storeId});
|
||||
};
|
||||
|
||||
// 获取体验中心 VIP 介绍纯文本,无需登录。
|
||||
export const getStoreVipIntroAPI = () => {
|
||||
return request("GET", "/store/vip-intro");
|
||||
};
|
||||
|
||||
// 根据用户定位分页获取附近门店。
|
||||
export const getNearbyStoresAPI = ({
|
||||
longitude,
|
||||
|
||||
@@ -18,6 +18,10 @@ const TRAINING_START_AUDIO_KEY_MAP = Object.freeze({
|
||||
export const getTrainingStartAudioKey = (trainingType, fallback = "") =>
|
||||
TRAINING_START_AUDIO_KEY_MAP[trainingType] || fallback;
|
||||
|
||||
// 与服务端通关判定保持一致,proto3 省略的 false 同样按失败处理。
|
||||
export const getTrainingEndAudioKey = (completed) =>
|
||||
completed === true ? "通关成功" : "通关失败";
|
||||
|
||||
export const getPrecisionShotAudioKeys = (shootData, directionText = "") => {
|
||||
if (!shootData || typeof shootData !== "object") return [];
|
||||
const ring = Number(shootData.ring);
|
||||
@@ -201,6 +205,10 @@ export const audioFils = {
|
||||
"https://static.shelingxingqiu.com/shootmini/static/audio0820/%E6%9C%AA%E5%91%BD%E4%B8%AD.MP3",
|
||||
练习结束:
|
||||
"https://static.shelingxingqiu.com/shootmini/static/audio/%E7%BB%83%E4%B9%A0%E7%BB%93%E6%9D%9F.mp3",
|
||||
通关成功:
|
||||
"https://static.shelingxingqiu.com/shootaudio/%E9%80%9A%E5%85%B3%E6%88%90%E5%8A%9F.mp3",
|
||||
通关失败:
|
||||
"https://static.shelingxingqiu.com/shootaudio/%E9%80%9A%E5%85%B3%E5%A4%B1%E8%B4%A5.mp3",
|
||||
射箭声音:
|
||||
"https://static.shelingxingqiu.com/shootaudio/v4/v4/%E7%AE%AD%E9%A3%9E%E8%A1%8C.mp3",
|
||||
命中:
|
||||
|
||||
@@ -46,10 +46,10 @@ const props = defineProps({
|
||||
type: Number,
|
||||
default: 0,
|
||||
},
|
||||
// 指定环数,1 到 10;无效值表示高亮整个区域。
|
||||
activeRing: {
|
||||
type: Number,
|
||||
default: 0,
|
||||
// 指定一个或多个环数,空数组表示高亮整个区域。
|
||||
activeRings: {
|
||||
type: Array,
|
||||
default: () => [],
|
||||
},
|
||||
// 每次变化时以固定低帧数重新展开当前高亮扇区;默认关闭。
|
||||
highlightRefreshToken: {
|
||||
@@ -192,6 +192,25 @@ const getPositiveInteger = (value) => {
|
||||
return Number.isInteger(numberValue) && numberValue > 0 ? numberValue : 0;
|
||||
};
|
||||
|
||||
// 过滤、去重并合并连续环,避免 3、4 环同时高亮时绘制中间描边。
|
||||
const getActiveRingRanges = (ringCount) => {
|
||||
const rings = [...new Set(
|
||||
(Array.isArray(props.activeRings) ? props.activeRings : [])
|
||||
.map(getPositiveInteger)
|
||||
.filter((ring) => ring >= 1 && ring <= ringCount)
|
||||
)].sort((first, second) => first - second);
|
||||
|
||||
return rings.reduce((ranges, ring) => {
|
||||
const lastRange = ranges[ranges.length - 1];
|
||||
if (lastRange && ring === lastRange.end + 1) {
|
||||
lastRange.end = ring;
|
||||
} else {
|
||||
ranges.push({ start: ring, end: ring });
|
||||
}
|
||||
return ranges;
|
||||
}, []);
|
||||
};
|
||||
|
||||
// 正上方作为第一区起始边界,Canvas 角度递增方向即为顺时针。
|
||||
const getSectorAngles = (sector, sectorCount) => {
|
||||
const count = getPositiveInteger(sectorCount);
|
||||
@@ -256,7 +275,7 @@ const drawTargetRings = (ctx, centerX, centerY, targetRadius, config) => {
|
||||
}
|
||||
};
|
||||
|
||||
// 高亮后端指定区域;activeRing 有效时只高亮该区域内的单个环。
|
||||
// 高亮后端指定区域;activeRings 非空时高亮该区域内的一个或多个环。
|
||||
const drawSectorHighlight = (
|
||||
ctx,
|
||||
centerX,
|
||||
@@ -274,32 +293,35 @@ const drawSectorHighlight = (
|
||||
);
|
||||
if (safeRevealProgress <= 0) return;
|
||||
|
||||
const ring = getPositiveInteger(props.activeRing);
|
||||
const hasActiveRing = ring >= 1 && ring <= config.ringCount;
|
||||
const innerRadius = hasActiveRing
|
||||
? targetRadius * ((config.ringCount - ring) / config.ringCount)
|
||||
: 0;
|
||||
const outerRadius = hasActiveRing
|
||||
? targetRadius * ((config.ringCount + 1 - ring) / config.ringCount)
|
||||
: targetRadius;
|
||||
const ringRanges = getActiveRingRanges(config.ringCount);
|
||||
const highlightRanges = ringRanges.length > 0
|
||||
? ringRanges
|
||||
: [{ start: 1, end: config.ringCount }];
|
||||
const style = {
|
||||
...defaultHighlightStyle,
|
||||
...props.highlightStyle,
|
||||
};
|
||||
|
||||
drawAnnularSector(
|
||||
ctx,
|
||||
centerX,
|
||||
centerY,
|
||||
innerRadius,
|
||||
outerRadius,
|
||||
angles.startAngle,
|
||||
angles.startAngle +
|
||||
(angles.endAngle - angles.startAngle) * safeRevealProgress,
|
||||
style.color,
|
||||
style.strokeColor,
|
||||
Math.max(1, targetRadius * style.lineWidthRatio)
|
||||
);
|
||||
highlightRanges.forEach((range) => {
|
||||
const innerRadius =
|
||||
targetRadius * ((config.ringCount - range.end) / config.ringCount);
|
||||
const outerRadius =
|
||||
targetRadius * ((config.ringCount + 1 - range.start) / config.ringCount);
|
||||
|
||||
drawAnnularSector(
|
||||
ctx,
|
||||
centerX,
|
||||
centerY,
|
||||
innerRadius,
|
||||
outerRadius,
|
||||
angles.startAngle,
|
||||
angles.startAngle +
|
||||
(angles.endAngle - angles.startAngle) * safeRevealProgress,
|
||||
style.color,
|
||||
style.strokeColor,
|
||||
Math.max(1, targetRadius * style.lineWidthRatio)
|
||||
);
|
||||
});
|
||||
};
|
||||
|
||||
// 从正上方开始顺时针绘制所有区域边界。
|
||||
@@ -420,7 +442,7 @@ const getDrawKey = (width, height) => {
|
||||
showRingLabels: props.showRingLabels,
|
||||
sectorCount: props.sectorCount,
|
||||
activeSector: props.activeSector,
|
||||
activeRing: props.activeRing,
|
||||
activeRings: props.activeRings,
|
||||
showSectorLabels: props.showSectorLabels,
|
||||
targetStyleConfig: props.targetStyleConfig,
|
||||
crosshairStyle: props.crosshairStyle,
|
||||
@@ -591,7 +613,7 @@ watch(
|
||||
props.showRingLabels,
|
||||
props.sectorCount,
|
||||
props.activeSector,
|
||||
props.activeRing,
|
||||
props.activeRings,
|
||||
props.highlightRefreshToken,
|
||||
props.showSectorLabels,
|
||||
props.highlightOnly,
|
||||
|
||||
@@ -294,6 +294,14 @@
|
||||
{
|
||||
"type" : "folder",
|
||||
"value" : "static/training-difficulty-design"
|
||||
},
|
||||
{
|
||||
"type" : "folder",
|
||||
"value" : "static/coin"
|
||||
},
|
||||
{
|
||||
"type" : "folder",
|
||||
"value" : "static/home-device"
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
@@ -18,6 +18,7 @@ import {
|
||||
getPrecisionShotAudioKeys,
|
||||
getRhythmShotAudioKeys,
|
||||
getStabilityShotAudioKeys,
|
||||
getTrainingEndAudioKey,
|
||||
getTrainingStartAudioKey,
|
||||
STABILITY_ENERGY_50_AUDIO_KEY,
|
||||
STABILITY_ENERGY_70_AUDIO_KEY,
|
||||
@@ -603,6 +604,10 @@ function getAckAudioKeys(message, businessMessage) {
|
||||
if (businessMessage?.type === MESSAGETYPESV2.HalfRest) return ["中场休息"];
|
||||
return ["比赛结束"];
|
||||
case ServerMessageType.SERVER_MSG_PRACTICE_END:
|
||||
// 个人训练的 ACK 等待实际播放的通关语音,其他练习保留原有配置。
|
||||
if (currentContext?.practiceEndAudioKey === "练习结束") {
|
||||
return [getTrainingEndAudioKey(businessMessage?.completed)];
|
||||
}
|
||||
return [currentContext?.practiceEndAudioKey || "比赛结束"];
|
||||
case ServerMessageType.SERVER_MSG_CHECK:
|
||||
return getTestDistanceAudioKeys(businessMessage?.shootData);
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"pages": [
|
||||
{
|
||||
"pages": [
|
||||
{
|
||||
"path": "pages/index"
|
||||
},
|
||||
@@ -9,118 +9,136 @@
|
||||
{
|
||||
"path": "pages/friend-battle"
|
||||
},
|
||||
{
|
||||
"path": "pages/point-book"
|
||||
},
|
||||
{
|
||||
"path": "pages/point-book-rank"
|
||||
},
|
||||
{
|
||||
"path": "pages/my-like-list"
|
||||
},
|
||||
{
|
||||
"path": "pages/audio-test"
|
||||
},
|
||||
{
|
||||
"path": "pages/about-us"
|
||||
},
|
||||
{
|
||||
"path": "pages/webview",
|
||||
"style": {
|
||||
"navigationBarTitleText": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/melee-battle"
|
||||
},
|
||||
{
|
||||
"path": "pages/battle-result"
|
||||
},
|
||||
{
|
||||
"path": "pages/friend-battle-result"
|
||||
},
|
||||
{
|
||||
"path": "pages/point-book-edit"
|
||||
},
|
||||
{
|
||||
"path": "pages/point-book-create"
|
||||
},
|
||||
{
|
||||
"path": "pages/point-book-list"
|
||||
},
|
||||
{
|
||||
"path": "pages/point-book-detail"
|
||||
},
|
||||
{
|
||||
"path": "pages/point-book-detail-share"
|
||||
},
|
||||
{
|
||||
"path": "pages/match-page"
|
||||
},
|
||||
{
|
||||
"path": "pages/user"
|
||||
},
|
||||
{
|
||||
"path": "pages/grade-intro"
|
||||
},
|
||||
{
|
||||
"path": "pages/rank-intro"
|
||||
},
|
||||
{
|
||||
"path": "pages/my-growth"
|
||||
},
|
||||
{
|
||||
"path": "pages/first-try"
|
||||
},
|
||||
{
|
||||
"path": "pages/practise"
|
||||
},
|
||||
{
|
||||
"path": "pages/practise-one"
|
||||
},
|
||||
{
|
||||
"path": "pages/practise-two"
|
||||
},
|
||||
{
|
||||
"path": "pages/battle-room"
|
||||
},
|
||||
{
|
||||
"path": "pages/ranking"
|
||||
},
|
||||
{
|
||||
"path": "pages/rank-list"
|
||||
},
|
||||
{
|
||||
"path": "pages/match-detail"
|
||||
},
|
||||
{
|
||||
"path": "pages/melee-bow-data"
|
||||
},
|
||||
{
|
||||
"path": "pages/point-book"
|
||||
},
|
||||
{
|
||||
"path": "pages/point-book-rank"
|
||||
},
|
||||
{
|
||||
"path": "pages/my-like-list"
|
||||
},
|
||||
{
|
||||
"path": "pages/audio-test"
|
||||
},
|
||||
{
|
||||
"path": "pages/calibration"
|
||||
},
|
||||
{
|
||||
"path": "pages/about-us"
|
||||
},
|
||||
{
|
||||
"path": "pages/webview",
|
||||
"style": {
|
||||
"navigationBarTitleText": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/melee-battle"
|
||||
},
|
||||
{
|
||||
"path": "pages/battle-result"
|
||||
},
|
||||
{
|
||||
"path": "pages/friend-battle-result"
|
||||
},
|
||||
{
|
||||
"path": "pages/point-book-edit"
|
||||
},
|
||||
{
|
||||
"path": "pages/point-book-create"
|
||||
},
|
||||
{
|
||||
"path": "pages/point-book-list"
|
||||
},
|
||||
{
|
||||
"path": "pages/point-book-detail"
|
||||
},
|
||||
{
|
||||
"path": "pages/point-book-detail-share"
|
||||
},
|
||||
{
|
||||
"path": "pages/match-page"
|
||||
},
|
||||
{
|
||||
"path": "pages/my-device"
|
||||
},
|
||||
{
|
||||
"path": "pages/device-intro"
|
||||
},
|
||||
{
|
||||
"path": "pages/user"
|
||||
},
|
||||
{
|
||||
"path": "pages/grade-intro"
|
||||
},
|
||||
{
|
||||
"path": "pages/rank-intro"
|
||||
},
|
||||
{
|
||||
"path": "pages/my-growth"
|
||||
},
|
||||
{
|
||||
"path": "pages/first-try"
|
||||
},
|
||||
{
|
||||
"path": "pages/practise"
|
||||
},
|
||||
{
|
||||
"path": "pages/practise-one"
|
||||
},
|
||||
{
|
||||
"path": "pages/practise-two"
|
||||
},
|
||||
{
|
||||
"path": "pages/battle-room"
|
||||
},
|
||||
{
|
||||
"path": "pages/ranking"
|
||||
},
|
||||
{
|
||||
"path": "pages/rank-list"
|
||||
},
|
||||
{
|
||||
"path": "pages/match-detail"
|
||||
},
|
||||
{
|
||||
"path": "pages/melee-bow-data"
|
||||
},
|
||||
{
|
||||
"path": "pages/mine-bow-data"
|
||||
},
|
||||
{
|
||||
"path": "pages/ota-wifi",
|
||||
"style": {
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
}
|
||||
],
|
||||
"globalStyle": {
|
||||
"backgroundColor": "@bgColor",
|
||||
"backgroundColorBottom": "@bgColorBottom",
|
||||
"backgroundColorTop": "@bgColorTop",
|
||||
"backgroundTextStyle": "@bgTxtStyle",
|
||||
"navigationBarBackgroundColor": "#000000",
|
||||
"navigationBarTextStyle": "@navTxtStyle",
|
||||
"navigationBarTitleText": "Uni Creator",
|
||||
"navigationStyle": "custom",
|
||||
"enablePullDownRefresh": false
|
||||
},
|
||||
"easycom": {
|
||||
"autoscan": true,
|
||||
"custom": {
|
||||
"^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue"
|
||||
}
|
||||
},
|
||||
"globalStyle": {
|
||||
"backgroundColor": "@bgColor",
|
||||
"backgroundColorBottom": "@bgColorBottom",
|
||||
"backgroundColorTop": "@bgColorTop",
|
||||
"backgroundTextStyle": "@bgTxtStyle",
|
||||
"navigationBarBackgroundColor": "#000000",
|
||||
"navigationBarTextStyle": "@navTxtStyle",
|
||||
"navigationBarTitleText": "Uni Creator",
|
||||
"navigationStyle": "custom",
|
||||
"enablePullDownRefresh": false
|
||||
},
|
||||
"easycom": {
|
||||
"autoscan": true,
|
||||
"custom": {
|
||||
"^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue"
|
||||
}
|
||||
},
|
||||
"subPackages": [
|
||||
{
|
||||
"root": "pages/coin",
|
||||
"pages": [
|
||||
{
|
||||
"path": "vip-intro"
|
||||
},
|
||||
{
|
||||
"path": "index"
|
||||
},
|
||||
@@ -178,48 +196,48 @@
|
||||
},
|
||||
{
|
||||
"root": "pages/member",
|
||||
"pages": [
|
||||
{
|
||||
"path": "orders"
|
||||
},
|
||||
{
|
||||
"path": "order-detail"
|
||||
},
|
||||
{
|
||||
"path": "be-vip"
|
||||
},
|
||||
{
|
||||
"path": "vip-intro"
|
||||
},
|
||||
{
|
||||
"path": "agreement"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"root": "pages/team-battle",
|
||||
"pages": [
|
||||
{
|
||||
"path": "index"
|
||||
},
|
||||
{
|
||||
"path": "team-bow-data"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"root": "pages/training",
|
||||
"pages": [
|
||||
{
|
||||
"path": "index"
|
||||
},
|
||||
{
|
||||
"path": "difficulty"
|
||||
},
|
||||
{
|
||||
"path": "practise-one"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
"pages": [
|
||||
{
|
||||
"path": "orders"
|
||||
},
|
||||
{
|
||||
"path": "order-detail"
|
||||
},
|
||||
{
|
||||
"path": "be-vip"
|
||||
},
|
||||
{
|
||||
"path": "vip-intro"
|
||||
},
|
||||
{
|
||||
"path": "agreement"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"root": "pages/team-battle",
|
||||
"pages": [
|
||||
{
|
||||
"path": "index"
|
||||
},
|
||||
{
|
||||
"path": "team-bow-data"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"root": "pages/training",
|
||||
"pages": [
|
||||
{
|
||||
"path": "index"
|
||||
},
|
||||
{
|
||||
"path": "difficulty"
|
||||
},
|
||||
{
|
||||
"path": "practise-one"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@@ -38,13 +38,12 @@ defineProps({
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 706rpx;
|
||||
width: 100%;
|
||||
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);
|
||||
background: linear-gradient(90deg, transparent, rgba(4, 4, 4, 0.7), transparent);
|
||||
}
|
||||
|
||||
.balance-item {
|
||||
@@ -69,7 +68,7 @@ defineProps({
|
||||
|
||||
.balance-list__line {
|
||||
width: 2rpx;
|
||||
height: 28rpx;
|
||||
height: 16rpx;
|
||||
background-color: rgba(255, 255, 255, 0.5);
|
||||
margin: 0 22rpx;
|
||||
}
|
||||
|
||||
@@ -10,11 +10,13 @@ const props = defineProps({
|
||||
type: String,
|
||||
default: "",
|
||||
},
|
||||
switchable: { type: Boolean, default: false },
|
||||
onBack: {
|
||||
type: Function,
|
||||
default: null,
|
||||
},
|
||||
});
|
||||
const emit = defineEmits(["select-store"]);
|
||||
</script>
|
||||
|
||||
<template>
|
||||
@@ -30,16 +32,20 @@ const props = defineProps({
|
||||
>
|
||||
{{ title }}
|
||||
</text>
|
||||
<text v-if="subtitle" class="coin-header__subtitle">
|
||||
{{ subtitle }}
|
||||
</text>
|
||||
<view v-if="subtitle" class="coin-header__store" @click="switchable && emit('select-store')">
|
||||
<text class="coin-header__subtitle">{{ subtitle }}</text>
|
||||
<image v-if="switchable" class="coin-header__switch" src="https://static.shelingxingqiu.com/shootmini/static/coin/store-switch.png" mode="aspectFit" />
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
</Header>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
<style scoped lang="scss">
|
||||
.coin-header__store { display: flex; align-items: center; max-width: 430rpx; }
|
||||
.coin-header__store .coin-header__subtitle { overflow: hidden; text-overflow: ellipsis; }
|
||||
.coin-header__switch { flex-shrink: 0; width: 28rpx; height: 28rpx; margin-left: 10rpx; }
|
||||
.coin-header {
|
||||
position: sticky;
|
||||
top: 0;
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
import { computed, ref } from "vue";
|
||||
|
||||
const DEFAULT_PRODUCT_IMAGE =
|
||||
"https://static.shelingxingqiu.com/shootmini/static/coin/product-hero-item.png";
|
||||
"https://static.shelingxingqiu.com/shootmini/static/coin/product-hero-bg.png";
|
||||
const props = defineProps({
|
||||
images: {
|
||||
type: Array,
|
||||
|
||||
@@ -51,6 +51,9 @@ const productImage = computed(() => {
|
||||
height: 312rpx;
|
||||
overflow: hidden;
|
||||
border-radius: 12rpx;
|
||||
background-image: url("https://static.shelingxingqiu.com/shootmini/static/coin/product-card-bg.png");
|
||||
background-size: 100% 100%;
|
||||
background-repeat: no-repeat;
|
||||
}
|
||||
|
||||
.product-card__image {
|
||||
|
||||
@@ -0,0 +1,80 @@
|
||||
<script setup>
|
||||
defineProps({
|
||||
benefit: {
|
||||
type: Object,
|
||||
required: true,
|
||||
},
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<!-- 与会员卡共用剩余次数,接口缺失时显示占位。 -->
|
||||
<view class="benefit-card">
|
||||
<text class="benefit-card__badge">{{ benefit.remaining }}次</text>
|
||||
<image class="benefit-card__icon" :src="benefit.icon" mode="aspectFit" />
|
||||
<view class="benefit-card__content">
|
||||
<text class="benefit-card__title">{{ benefit.title }}</text>
|
||||
<text class="benefit-card__description">{{ benefit.description }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.benefit-card {
|
||||
position: relative;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
min-height: 176rpx;
|
||||
margin-bottom: 24rpx;
|
||||
padding: 28rpx 28rpx 28rpx 56rpx;
|
||||
box-sizing: border-box;
|
||||
border-radius: 20rpx;
|
||||
background: linear-gradient(180deg, #080808, rgba(152, 124, 84, 0.4));
|
||||
}
|
||||
|
||||
// .benefit-card:last-child {
|
||||
// margin-bottom: 0;
|
||||
// }
|
||||
|
||||
.benefit-card__badge {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 64rpx;
|
||||
height: 32rpx;
|
||||
border-radius: 16rpx 0 16rpx 0;
|
||||
background: linear-gradient(135deg, #ffd19a, #a17636);
|
||||
color: #ffffff;
|
||||
font-size: 22rpx;
|
||||
line-height: 30rpx;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.benefit-card__icon {
|
||||
flex-shrink: 0;
|
||||
width: 120rpx;
|
||||
height: 120rpx;
|
||||
margin-right: 38rpx;
|
||||
}
|
||||
|
||||
.benefit-card__content {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.benefit-card__title {
|
||||
display: block;
|
||||
color: #fae6bc;
|
||||
font-size: 30rpx;
|
||||
line-height: 42rpx;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.benefit-card__description {
|
||||
display: block;
|
||||
margin-top: 10rpx;
|
||||
color: #ffffff;
|
||||
font-size: 22rpx;
|
||||
line-height: 30rpx;
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,61 @@
|
||||
<script setup>
|
||||
defineProps({
|
||||
tabs: {
|
||||
type: Array,
|
||||
default: () => [],
|
||||
},
|
||||
active: {
|
||||
type: String,
|
||||
default: "vip",
|
||||
},
|
||||
});
|
||||
|
||||
const emit = defineEmits(["select"]);
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<!-- 业务 Tab 只切换内容,不接管系统导航。 -->
|
||||
<view class="section-tabs">
|
||||
<view
|
||||
v-for="tab in tabs"
|
||||
:key="tab.key"
|
||||
class="section-tabs__item"
|
||||
:class="{ 'section-tabs__item--active': active === tab.key }"
|
||||
hover-class="section-tabs__item--pressed"
|
||||
@click="emit('select', tab.key)"
|
||||
>
|
||||
<text>{{ tab.label }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.section-tabs {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
padding: 20rpx 40rpx 0;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.section-tabs__item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 326rpx;
|
||||
height: 68rpx;
|
||||
border-radius: 34rpx;
|
||||
color: #999999;
|
||||
background: #000000;
|
||||
font-size: 28rpx;
|
||||
line-height: 40rpx;
|
||||
}
|
||||
|
||||
.section-tabs__item--active {
|
||||
color: #ffffff;
|
||||
background: linear-gradient(135deg, #ffd19a, #a17636);
|
||||
}
|
||||
|
||||
.section-tabs__item--pressed {
|
||||
opacity: 0.8;
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,135 @@
|
||||
<script setup>
|
||||
defineProps({
|
||||
membership: {
|
||||
type: Object,
|
||||
required: true,
|
||||
},
|
||||
benefits: {
|
||||
type: Array,
|
||||
default: () => [],
|
||||
},
|
||||
});
|
||||
|
||||
const emit = defineEmits(["introduction"]);
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<view class="vip-card" :class="{ 'vip-card--active': membership.active }">
|
||||
<!-- 切图仅含静态字效与徽章,次数、有效期和状态独立渲染。 -->
|
||||
<image class="vip-card__background" :src="membership.cardImage" mode="aspectFit" />
|
||||
<view class="vip-card__benefits">
|
||||
<view v-for="benefit in benefits" :key="benefit.key" class="vip-card__benefit">
|
||||
<text class="vip-card__label">{{ benefit.title }}</text>
|
||||
<view class="vip-card__count">
|
||||
<text class="vip-card__number">{{ membership.remaining[benefit.key] }}</text>
|
||||
<text class="vip-card__unit">次</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<text class="vip-card__status">
|
||||
{{ membership.active ? `有效期至${membership.expiresAt}` : "未开通" }}
|
||||
</text>
|
||||
<view class="vip-card__introduction" @click="emit('introduction')">
|
||||
<text>查看更多关于体验中心VIP的介绍 ></text>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.vip-card {
|
||||
position: relative;
|
||||
width: 750rpx;
|
||||
height: 288rpx;
|
||||
color: #333333;
|
||||
}
|
||||
|
||||
.vip-card__background {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 750rpx;
|
||||
height: 288rpx;
|
||||
}
|
||||
|
||||
.vip-card__benefits {
|
||||
position: absolute;
|
||||
top: 124rpx;
|
||||
left: 70rpx;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
width: 400rpx;
|
||||
}
|
||||
|
||||
.vip-card__benefit {
|
||||
width: 120rpx;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.vip-card__label {
|
||||
display: block;
|
||||
font-size: 20rpx;
|
||||
line-height: 28rpx;
|
||||
white-space: nowrap;
|
||||
opacity: 0.8;
|
||||
}
|
||||
|
||||
.vip-card__count {
|
||||
display: flex;
|
||||
align-items: baseline;
|
||||
justify-content: center;
|
||||
position: relative;
|
||||
height: 44rpx;
|
||||
}
|
||||
|
||||
.vip-card__count::before {
|
||||
content: "";
|
||||
position: absolute;
|
||||
left: 16rpx;
|
||||
bottom: 4rpx;
|
||||
width: 88rpx;
|
||||
height: 12rpx;
|
||||
border-radius: 8rpx;
|
||||
background: #ffd947;
|
||||
}
|
||||
|
||||
.vip-card__number {
|
||||
position: relative;
|
||||
font-size: 40rpx;
|
||||
line-height: 48rpx;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.vip-card__unit {
|
||||
position: relative;
|
||||
margin-left: 2rpx;
|
||||
font-size: 22rpx;
|
||||
line-height: 30rpx;
|
||||
opacity: 0.8;
|
||||
}
|
||||
|
||||
.vip-card__status {
|
||||
position: absolute;
|
||||
top: 212rpx;
|
||||
left: 496rpx;
|
||||
width: 232rpx;
|
||||
color: #888888;
|
||||
font-size: 22rpx;
|
||||
line-height: 30rpx;
|
||||
text-align: center;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.vip-card--active .vip-card__status {
|
||||
color: #b47d42;
|
||||
}
|
||||
|
||||
.vip-card__introduction {
|
||||
position: absolute;
|
||||
left: 74rpx;
|
||||
bottom: 16rpx;
|
||||
padding: 6rpx 0;
|
||||
font-size: 22rpx;
|
||||
line-height: 30rpx;
|
||||
opacity: 0.8;
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,62 @@
|
||||
<script setup>
|
||||
const props = defineProps({
|
||||
active: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
});
|
||||
const emit = defineEmits(["open"]);
|
||||
const handleOpen = () => {
|
||||
if (!props.active) emit("open");
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<!-- 当前门店已开通时仅展示状态,未开通时提供线下开通提醒。 -->
|
||||
<view class="vip-footer">
|
||||
<text class="vip-footer__price">特惠价格:9.9元/90天</text>
|
||||
<view class="vip-footer__status" @click="handleOpen">
|
||||
<image class="vip-footer__badge" src="https://static.shelingxingqiu.com/shootmini/static/coin/store-vip-badge.png" mode="aspectFit" />
|
||||
<text>{{ active ? "您已开通VIP" : "开通方式:请前往线下门店联系工作人员开通" }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.vip-footer {
|
||||
margin-top: 84rpx;
|
||||
padding: 0 24rpx 22rpx;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.vip-footer__price {
|
||||
display: block;
|
||||
color: #fae6bc;
|
||||
font-size: 40rpx;
|
||||
line-height: 56rpx;
|
||||
font-weight: 500;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.vip-footer__status {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
min-height: 90rpx;
|
||||
margin-top: 12rpx;
|
||||
padding: 8rpx 28rpx;
|
||||
box-sizing: border-box;
|
||||
border-radius: 46rpx;
|
||||
color: #333333;
|
||||
background: #ffd947;
|
||||
font-size: 26rpx;
|
||||
line-height: 36rpx;
|
||||
}
|
||||
|
||||
.vip-footer__badge {
|
||||
flex-shrink: 0;
|
||||
width: 80rpx;
|
||||
height: 74rpx;
|
||||
margin-right: 4rpx;
|
||||
}
|
||||
</style>
|
||||
@@ -1,3 +1,4 @@
|
||||
// 金币快捷入口保持原有路由与图标配置。
|
||||
export const quickMenus = [
|
||||
{
|
||||
key: "rules",
|
||||
@@ -20,3 +21,30 @@ export const quickMenus = [
|
||||
icon: "https://static.shelingxingqiu.com/shootmini/static/coin/icon-nearby-store.png",
|
||||
},
|
||||
];
|
||||
|
||||
// 体验中心业务 Tab。
|
||||
export const storeSections = [
|
||||
{ key: "vip", label: "体验中心VIP" },
|
||||
{ key: "coin", label: "我的金币" },
|
||||
];
|
||||
|
||||
export const storeVipBenefits = [
|
||||
{
|
||||
key: "trial",
|
||||
title: "免费体验权益",
|
||||
description: "使用该权益可免费体验智能弓箭30分钟1次,加入官方社群还可以额外获赠1次。",
|
||||
icon: "https://static.shelingxingqiu.com/shootmini/static/coin/store-vip-benefit-trial.png",
|
||||
},
|
||||
{
|
||||
key: "discount",
|
||||
title: "特惠购买权益",
|
||||
description: "使用该权益可以19.9元的特惠价格购买30分钟体验服务1次。",
|
||||
icon: "https://static.shelingxingqiu.com/shootmini/static/coin/store-vip-benefit-discount.png",
|
||||
},
|
||||
{
|
||||
key: "drink",
|
||||
title: "到店赠饮权益",
|
||||
description: "使用该权益每次到店后可获得免费赠送的指定饮品一支。",
|
||||
icon: "https://static.shelingxingqiu.com/shootmini/static/coin/store-vip-benefit-drink.png",
|
||||
},
|
||||
];
|
||||
|
||||
@@ -1,14 +1,53 @@
|
||||
<script setup>
|
||||
import { ref } from "vue";
|
||||
import { onLoad } from "@dcloudio/uni-app";
|
||||
import { computed, ref } from "vue";
|
||||
import { onLoad, onShow } from "@dcloudio/uni-app";
|
||||
import Container from "@/components/Container.vue";
|
||||
import ModalDialog from "@/components/ModalDialog.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";
|
||||
import { quickMenus, storeSections, storeVipBenefits } from "./data";
|
||||
import StoreSectionTabs from "./components/StoreSectionTabs.vue";
|
||||
import StoreVipCard from "./components/StoreVipCard.vue";
|
||||
import StoreBenefitCard from "./components/StoreBenefitCard.vue";
|
||||
import StoreVipFooter from "./components/StoreVipFooter.vue";
|
||||
import { getSelectedExperienceStore, rememberExperienceStore, loadStoreMembership } from "@/utils/storeVip";
|
||||
|
||||
const activeTab = ref("vip");
|
||||
const membership = ref(null);
|
||||
const vipLoading = ref(false);
|
||||
const vipError = ref("");
|
||||
const displayedBenefits = computed(() => storeVipBenefits.map((benefit) => ({
|
||||
...benefit, remaining: membership.value?.remaining[benefit.key] ?? "--",
|
||||
})));
|
||||
const loadMembership = async () => {
|
||||
if (!selectedStoreId.value || vipLoading.value) return;
|
||||
vipLoading.value = true;
|
||||
vipError.value = "";
|
||||
membership.value = null;
|
||||
try {
|
||||
const result = await loadStoreMembership(selectedStoreId.value);
|
||||
membership.value = result;
|
||||
if (result.name) selectedStoreName.value = result.name;
|
||||
rememberExperienceStore(selectedStoreId.value, selectedStoreName.value);
|
||||
} catch (error) {
|
||||
vipError.value = "会员信息加载失败,请点击重试或切换门店";
|
||||
console.error("加载门店会员失败", error);
|
||||
} finally {
|
||||
vipLoading.value = false;
|
||||
}
|
||||
};
|
||||
const selectStore = () => uni.redirectTo({ url: `/pages/coin/nearby-stores?tab=${activeTab.value}` });
|
||||
const selectTab = (tab) => {
|
||||
if (storeSections.some((item) => item.key === tab)) activeTab.value = tab;
|
||||
};
|
||||
const showVipIntroduction = () => uni.navigateTo({ url: "/pages/coin/vip-intro" });
|
||||
const vipOpeningVisible = ref(false);
|
||||
const showVipOpening = () => { vipOpeningVisible.value = true; };
|
||||
const closeVipOpening = () => { vipOpeningVisible.value = false; };
|
||||
|
||||
const PAGE_SIZE = 20;
|
||||
const coinSummary = ref({
|
||||
@@ -19,8 +58,8 @@ const selectedStoreId = ref("");
|
||||
const selectedStoreName = ref("");
|
||||
const rewardProducts = ref([]);
|
||||
const productPage = ref(0);
|
||||
const productTotal = ref(0);
|
||||
const productLoading = ref(false);
|
||||
const productError = ref(false);
|
||||
const productNoMore = ref(false);
|
||||
|
||||
const loadCoinSummary = async () => {
|
||||
@@ -40,6 +79,7 @@ const loadProducts = async ({ reset = false } = {}) => {
|
||||
|
||||
const nextPage = reset ? 1 : productPage.value + 1;
|
||||
productLoading.value = true;
|
||||
productError.value = false;
|
||||
if (reset) productNoMore.value = false;
|
||||
|
||||
try {
|
||||
@@ -65,7 +105,6 @@ const loadProducts = async ({ reset = false } = {}) => {
|
||||
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;
|
||||
@@ -79,6 +118,7 @@ const loadProducts = async ({ reset = false } = {}) => {
|
||||
rewardProducts.value = [];
|
||||
productPage.value = 0;
|
||||
}
|
||||
productError.value = true;
|
||||
console.error("加载礼品列表失败", error);
|
||||
} finally {
|
||||
productLoading.value = false;
|
||||
@@ -115,7 +155,7 @@ const decodeRouteText = (value = "") => {
|
||||
const onMenuSelect = (menu) => {
|
||||
if (menu.key === "nearbyStores") {
|
||||
uni.redirectTo({
|
||||
url: "/pages/coin/nearby-stores",
|
||||
url: `/pages/coin/nearby-stores?tab=${activeTab.value}`,
|
||||
});
|
||||
return;
|
||||
}
|
||||
@@ -143,50 +183,104 @@ const toProductDetail = (product) => {
|
||||
};
|
||||
|
||||
onLoad((options = {}) => {
|
||||
const storeId = String(options.storeId || "");
|
||||
activeTab.value = options.tab === "coin" ? "coin" : "vip";
|
||||
const previous = getSelectedExperienceStore();
|
||||
const storeId = String(options.storeId || previous?.id || "");
|
||||
if (!/^\d+$/.test(storeId) || Number(storeId) <= 0) {
|
||||
uni.redirectTo({
|
||||
url: "/pages/coin/nearby-stores",
|
||||
});
|
||||
selectStore();
|
||||
return;
|
||||
}
|
||||
|
||||
selectedStoreId.value = storeId;
|
||||
selectedStoreName.value = decodeRouteText(options.storeName);
|
||||
loadCoinSummary();
|
||||
selectedStoreName.value = options.storeId
|
||||
? decodeRouteText(options.storeName)
|
||||
: previous?.name || "";
|
||||
rememberExperienceStore(storeId, selectedStoreName.value);
|
||||
loadProducts({ reset: true });
|
||||
});
|
||||
|
||||
// 从介绍、商品等页面返回时刷新会员和余额。
|
||||
onShow(() => {
|
||||
if (!selectedStoreId.value) return;
|
||||
loadMembership();
|
||||
loadCoinSummary();
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<Container :bgType="6" :isHome="true" @scrolltolower="loadProducts">
|
||||
<!-- 标题固定,门店切换复用原有附近门店页面。 -->
|
||||
<Container :bgType="6" bgColor="#22222e" :isHome="true" @scrolltolower="activeTab === 'coin' && loadProducts()">
|
||||
<template #header>
|
||||
<CoinHeader title="我的金币" :subtitle="selectedStoreName" />
|
||||
<CoinHeader title="线下体验中心" :subtitle="selectedStoreName || '选择门店'" switchable @select-store="selectStore" />
|
||||
</template>
|
||||
<view class="coin-page">
|
||||
<CoinBalancePanel
|
||||
:cumulative="coinSummary.cumulative"
|
||||
:available="coinSummary.available"
|
||||
<StoreSectionTabs
|
||||
:tabs="storeSections"
|
||||
:active="activeTab"
|
||||
@select="selectTab"
|
||||
/>
|
||||
<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 v-if="activeTab === 'vip'" class="vip-section">
|
||||
<view v-if="vipLoading" class="page-status">会员信息加载中...</view>
|
||||
<view v-else-if="vipError" class="page-status" @click="loadMembership">{{ vipError }}</view>
|
||||
<StoreVipCard
|
||||
v-else-if="membership"
|
||||
:membership="membership"
|
||||
:benefits="storeVipBenefits"
|
||||
@introduction="showVipIntroduction"
|
||||
/>
|
||||
<view class="vip-section__content">
|
||||
<text class="vip-section__description">
|
||||
门店体验中心VIP是为热爱射箭运动的用户专属打造的VIP服务,开通后即可享受以下三大专属权益:
|
||||
</text>
|
||||
<view class="vip-section__benefits">
|
||||
<StoreBenefitCard
|
||||
v-for="benefit in displayedBenefits"
|
||||
:key="benefit.key"
|
||||
:benefit="benefit"
|
||||
/>
|
||||
</view>
|
||||
</view>
|
||||
<StoreVipFooter v-if="membership" :active="membership.active" @open="showVipOpening" />
|
||||
</view>
|
||||
|
||||
<!-- 保留原金币接口、分页与详情链路。 -->
|
||||
<view v-else class="coin-section">
|
||||
<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 v-if="productLoading" class="page-status">加载中...</view>
|
||||
<view v-else-if="productError" class="page-status" @click="loadProducts()">加载失败,点击重试</view>
|
||||
<view v-else-if="productNoMore" class="page-status">{{ rewardProducts.length ? '没有更多商品了~' : '暂无兑换商品~' }}</view>
|
||||
</view>
|
||||
</view>
|
||||
</Container>
|
||||
<ModalDialog
|
||||
:show="vipOpeningVisible"
|
||||
content="请前往线下门店体验中心,联系工作人员开通VIP。"
|
||||
:show-cancel="false"
|
||||
confirm-text="我已知晓"
|
||||
:on-confirm="closeVipOpening"
|
||||
/>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
<style scoped lang="scss">
|
||||
.page-status { padding: 30rpx; color: #cccccc; text-align: center; font-size: 26rpx; }
|
||||
.coin-page {
|
||||
width: 100%;
|
||||
min-height: 100%;
|
||||
@@ -194,6 +288,30 @@ onLoad((options = {}) => {
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.vip-section {
|
||||
padding-top: 30rpx;
|
||||
}
|
||||
|
||||
.vip-section__content {
|
||||
padding: 0 28rpx;
|
||||
}
|
||||
|
||||
.vip-section__description {
|
||||
display: block;
|
||||
margin-top: 50rpx;
|
||||
color: #ffffff;
|
||||
font-size: 24rpx;
|
||||
line-height: 34rpx;
|
||||
}
|
||||
|
||||
.vip-section__benefits {
|
||||
margin-top: 30rpx;
|
||||
}
|
||||
|
||||
.coin-section {
|
||||
padding-top: 20rpx;
|
||||
}
|
||||
|
||||
.reward-section {
|
||||
padding: 20rpx 28rpx 40rpx;
|
||||
box-sizing: border-box;
|
||||
|
||||
@@ -6,6 +6,9 @@ import CoinHeader from "./components/CoinHeader.vue";
|
||||
import LocationPermissionState from "./components/LocationPermissionState.vue";
|
||||
import StoreCard from "./components/StoreCard.vue";
|
||||
import { getNearbyStoresAPI } from "@/apis";
|
||||
import { rememberExperienceStore } from "@/utils/storeVip";
|
||||
|
||||
const activeTab = ref("vip");
|
||||
|
||||
const PAGE_SIZE = 20;
|
||||
const DEFAULT_STORE_IMAGE =
|
||||
@@ -113,12 +116,16 @@ const selectStore = (store) => {
|
||||
}
|
||||
|
||||
const storeName = encodeURIComponent(store?.name || "");
|
||||
rememberExperienceStore(storeId, store?.name || "");
|
||||
uni.redirectTo({
|
||||
url: `/pages/coin/index?storeId=${encodeURIComponent(storeId)}&storeName=${storeName}`,
|
||||
url: `/pages/coin/index?storeId=${encodeURIComponent(storeId)}&storeName=${storeName}&tab=${activeTab.value}`,
|
||||
});
|
||||
};
|
||||
|
||||
onLoad(locateAndLoadStores);
|
||||
onLoad((options = {}) => {
|
||||
activeTab.value = options.tab === "coin" ? "coin" : "vip";
|
||||
locateAndLoadStores();
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
<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 { getStoreVipIntroAPI } from "@/apis";
|
||||
|
||||
const content = ref("");
|
||||
const loading = ref(false);
|
||||
const failed = ref(false);
|
||||
|
||||
const loadIntroduction = async () => {
|
||||
if (loading.value) return;
|
||||
loading.value = true;
|
||||
failed.value = false;
|
||||
try {
|
||||
const result = await getStoreVipIntroAPI();
|
||||
if (typeof result?.content !== "string") {
|
||||
throw new Error("体验中心 VIP 介绍响应格式异常");
|
||||
}
|
||||
// 保留服务端原文与换行,空白内容单独展示提示。
|
||||
content.value = result.content;
|
||||
} catch (error) {
|
||||
failed.value = true;
|
||||
console.error("加载体验中心 VIP 介绍失败", error);
|
||||
} finally {
|
||||
loading.value = false;
|
||||
}
|
||||
};
|
||||
|
||||
onLoad(loadIntroduction);
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<Container :bgType="6" bgColor="#22222e" :isHome="true">
|
||||
<template #header><CoinHeader title="体验中心VIP介绍" /></template>
|
||||
<view class="vip-intro">
|
||||
<text v-if="loading">加载中...</text>
|
||||
<text v-else-if="failed" @click="loadIntroduction">加载失败,点击重试</text>
|
||||
<text v-else-if="content.trim()">{{ content }}</text>
|
||||
<text v-else>暂无介绍内容</text>
|
||||
</view>
|
||||
</Container>
|
||||
</template>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.vip-intro { padding: 32rpx 28rpx; color: #ffffff; font-size: 28rpx; line-height: 44rpx; white-space: pre-wrap; }
|
||||
</style>
|
||||
@@ -84,9 +84,9 @@ const props = defineProps({
|
||||
type: Number,
|
||||
default: 0,
|
||||
},
|
||||
activeRing: {
|
||||
type: Number,
|
||||
default: 0,
|
||||
activeRings: {
|
||||
type: Array,
|
||||
default: () => [],
|
||||
},
|
||||
showSectorLabels: {
|
||||
type: Boolean,
|
||||
@@ -548,7 +548,7 @@ onBeforeUnmount(() => {
|
||||
:highlightOnly="true"
|
||||
:sectorCount="sectorCount"
|
||||
:activeSector="activeSector"
|
||||
:activeRing="activeRing"
|
||||
:activeRings="activeRings"
|
||||
:highlightRefreshToken="highlightRefreshToken"
|
||||
:showSectorLabels="showSectorLabels"
|
||||
/>
|
||||
@@ -877,7 +877,7 @@ onBeforeUnmount(() => {
|
||||
width: calc(100% - 20px);
|
||||
padding: 0 10px;
|
||||
display: flex;
|
||||
margin-top: -40px;
|
||||
margin-top: 15px;
|
||||
justify-content: flex-end;
|
||||
}
|
||||
.footer > image {
|
||||
|
||||
@@ -8,6 +8,7 @@ import {
|
||||
nextTick,
|
||||
} from "vue";
|
||||
import audioManager, {
|
||||
getTrainingEndAudioKey,
|
||||
getTrainingStartAudioKey,
|
||||
RHYTHM_SHOOT_WINDOW_AUDIO_KEY,
|
||||
} from "@/audioManager";
|
||||
@@ -73,11 +74,11 @@ const props = defineProps({
|
||||
type: Number,
|
||||
default: 0,
|
||||
},
|
||||
energyPercent: {
|
||||
energyCostPerSec: {
|
||||
type: Number,
|
||||
default: 0,
|
||||
},
|
||||
energyReqPercent: {
|
||||
scoreSlot: {
|
||||
type: Number,
|
||||
default: 0,
|
||||
},
|
||||
@@ -111,6 +112,8 @@ const props = defineProps({
|
||||
},
|
||||
});
|
||||
|
||||
const emit = defineEmits(["rhythm-round-complete"]);
|
||||
|
||||
const trainingTitleIconMap = Object.freeze({
|
||||
base:
|
||||
"https://static.shelingxingqiu.com/shootmini/static/training-difficulty-design/text-icon-jcxl.png",
|
||||
@@ -143,6 +146,7 @@ let rhythmCountdownTimer = null;
|
||||
let rhythmTransitionTimer = null;
|
||||
let rhythmServerClockOffsetMs = 0;
|
||||
let rhythmSyncGeneration = 0;
|
||||
let rhythmRoundCompletionTimer = null;
|
||||
|
||||
const isRhythmTraining = computed(() => props.trainingType === "rhythm");
|
||||
const isStabilityTraining = computed(
|
||||
@@ -187,17 +191,14 @@ const progressPercent = computed(() => {
|
||||
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 stabilityEnergyCostPercentText = computed(() => {
|
||||
const scoreSlot = Number(props.scoreSlot);
|
||||
// 以满能量值为基数,换算每秒损失的能量百分比。
|
||||
const value = scoreSlot > 0
|
||||
? (Math.max(0, Number(props.energyCostPerSec) || 0) / scoreSlot) * 100
|
||||
: 0;
|
||||
return Number.isInteger(value) ? String(value) : String(Number(value.toFixed(2)));
|
||||
});
|
||||
|
||||
const rhythmMarkerPercent = computed(() => {
|
||||
if (!validRhythmRoundTime.value) return 0;
|
||||
@@ -226,7 +227,7 @@ const rhythmTitle = computed(() => {
|
||||
if (!validRhythmHitReq.value) {
|
||||
return `在最后的${validRhythmShootTime.value}秒内射箭`;
|
||||
}
|
||||
return `在最后的${validRhythmShootTime.value}秒并命中${validRhythmHitReq.value}环内`;
|
||||
return `在最后的${validRhythmShootTime.value}秒射箭并命中${validRhythmHitReq.value}环内`;
|
||||
});
|
||||
|
||||
const displayName = computed(() => {
|
||||
@@ -309,6 +310,30 @@ const getRhythmRoundRemainingMs = () => {
|
||||
);
|
||||
};
|
||||
|
||||
const clearRhythmRoundCompletionTimer = () => {
|
||||
if (rhythmRoundCompletionTimer !== null) {
|
||||
clearTimeout(rhythmRoundCompletionTimer);
|
||||
rhythmRoundCompletionTimer = null;
|
||||
}
|
||||
};
|
||||
|
||||
// 与当前显示的倒计时一起计时;消息校准不重建此任务,避免同一轮重复计数。
|
||||
const scheduleRhythmRoundCompletion = (remainingMs) => {
|
||||
if (
|
||||
rhythmRoundCompletionTimer !== null ||
|
||||
!props.start ||
|
||||
!isRhythmTraining.value ||
|
||||
remainingMs <= 0
|
||||
) return;
|
||||
|
||||
rhythmRoundCompletionTimer = setTimeout(() => {
|
||||
rhythmRoundCompletionTimer = null;
|
||||
if (!props.start || !isRhythmTraining.value) return;
|
||||
emit("rhythm-round-complete");
|
||||
scheduleRhythmRoundCompletion(rhythmRoundDurationMs.value);
|
||||
}, remainingMs);
|
||||
};
|
||||
|
||||
const updateRhythmShootWindow = (isInWindow) => {
|
||||
const nextIsInWindow = Boolean(isInWindow);
|
||||
const enteredShootWindow =
|
||||
@@ -367,7 +392,8 @@ const syncRhythmCountdown = async () => {
|
||||
const generation = ++rhythmSyncGeneration;
|
||||
clearRhythmTimers();
|
||||
|
||||
if (!isRhythmTraining.value) {
|
||||
if (!isRhythmTraining.value || !props.start) {
|
||||
clearRhythmRoundCompletionTimer();
|
||||
rhythmTransitionStyle.value = "none";
|
||||
rhythmRemainingMs.value = 0;
|
||||
rhythmRemainingSeconds.value = 0;
|
||||
@@ -385,6 +411,7 @@ const syncRhythmCountdown = async () => {
|
||||
!validRhythmShootTime.value ||
|
||||
!normalizeTimestamp(props.shootWindowStart)
|
||||
) {
|
||||
clearRhythmRoundCompletionTimer();
|
||||
rhythmTransitionStyle.value = "none";
|
||||
rhythmRemainingMs.value = 0;
|
||||
rhythmRemainingSeconds.value = 0;
|
||||
@@ -394,6 +421,7 @@ const syncRhythmCountdown = async () => {
|
||||
|
||||
rhythmTransitionStyle.value = "none";
|
||||
rhythmRemainingMs.value = getRhythmRoundRemainingMs();
|
||||
scheduleRhythmRoundCompletion(rhythmRemainingMs.value);
|
||||
rhythmRemainingSeconds.value = Math.ceil(rhythmRemainingMs.value / 1000);
|
||||
updateRhythmShootWindow(
|
||||
rhythmRemainingMs.value > 0 &&
|
||||
@@ -465,6 +493,7 @@ watch(
|
||||
|
||||
watch(
|
||||
() => [
|
||||
props.start,
|
||||
props.trainingType,
|
||||
props.roundTime,
|
||||
props.shootTime,
|
||||
@@ -496,7 +525,7 @@ async function onReceiveMessage(msg) {
|
||||
audioManager.play("比赛开始");
|
||||
}
|
||||
} else if (msg.type === MESSAGETYPESV2.BattleEnd) {
|
||||
audioManager.play("练习结束", false);
|
||||
audioManager.play(getTrainingEndAudioKey(msg.completed), false);
|
||||
} else if (msg.type === MESSAGETYPESV2.ShootResult) {
|
||||
// 精准和节奏训练由页面统一处理专属结果语音,其他训练保持原播放链路。
|
||||
if (props.externalShootResultAudio) return;
|
||||
@@ -553,6 +582,7 @@ onBeforeUnmount(() => {
|
||||
clearTimer();
|
||||
rhythmSyncGeneration += 1;
|
||||
clearRhythmTimers();
|
||||
clearRhythmRoundCompletionTimer();
|
||||
});
|
||||
</script>
|
||||
|
||||
@@ -568,22 +598,18 @@ onBeforeUnmount(() => {
|
||||
"
|
||||
>
|
||||
<template v-if="isStabilityTraining">
|
||||
<text class="stability-progress__time">{{ remain }}秒</text>
|
||||
<view class="stability-progress__track">
|
||||
<text class="stability-progress__cost">
|
||||
每秒失去{{ stabilityEnergyCostPercentText }}%能量
|
||||
</text>
|
||||
<view v-if="countdownEnabled" class="stability-progress__countdown">
|
||||
<view
|
||||
class="stability-progress__fill"
|
||||
:class="{
|
||||
'stability-progress__fill--reached': stabilityEnergyReached,
|
||||
class="stability-progress__countdown-fill"
|
||||
:style="{
|
||||
width: `${progressPercent}%`,
|
||||
transition: transitionStyle,
|
||||
}"
|
||||
:style="{ width: `${stabilityEnergyPercent}%` }"
|
||||
/>
|
||||
<view
|
||||
class="stability-progress__marker"
|
||||
:style="{ left: `${stabilityEnergyReqPercent}%` }"
|
||||
/>
|
||||
<text class="stability-progress__value">
|
||||
{{ Math.round(stabilityEnergyPercent) }}%
|
||||
</text>
|
||||
<text class="stability-progress__countdown-text">剩余{{ remain }}秒</text>
|
||||
</view>
|
||||
</template>
|
||||
<template v-else-if="isRhythmTraining">
|
||||
@@ -811,17 +837,17 @@ onBeforeUnmount(() => {
|
||||
margin: 32rpx 84rpx 0;
|
||||
}
|
||||
|
||||
.stability-progress__time {
|
||||
.stability-progress__cost {
|
||||
display: block;
|
||||
margin-bottom: 20rpx;
|
||||
color: #ffffff;
|
||||
font-size: 34rpx;
|
||||
font-size: 32rpx;
|
||||
font-weight: 500;
|
||||
line-height: 48rpx;
|
||||
line-height: 44rpx;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.stability-progress__track {
|
||||
.stability-progress__countdown {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
height: 24rpx;
|
||||
@@ -830,38 +856,23 @@ onBeforeUnmount(() => {
|
||||
background: #444444;
|
||||
}
|
||||
|
||||
.stability-progress__fill {
|
||||
.stability-progress__countdown-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;
|
||||
background: linear-gradient(133deg, #ffd19a 0%, #a17636 100%);
|
||||
}
|
||||
|
||||
.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 {
|
||||
.stability-progress__countdown-text {
|
||||
position: absolute;
|
||||
inset: 0;
|
||||
z-index: 3;
|
||||
z-index: 2;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
color: #eefaff;
|
||||
color: #fff7de;
|
||||
font-size: 18rpx;
|
||||
line-height: 24rpx;
|
||||
text-align: center;
|
||||
|
||||
@@ -0,0 +1,730 @@
|
||||
<script setup>
|
||||
import {
|
||||
computed,
|
||||
getCurrentInstance,
|
||||
nextTick,
|
||||
onBeforeUnmount,
|
||||
onMounted,
|
||||
ref,
|
||||
watch,
|
||||
} from "vue";
|
||||
|
||||
const props = defineProps({
|
||||
percent: {
|
||||
type: Number,
|
||||
default: 0,
|
||||
},
|
||||
introPending: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
});
|
||||
|
||||
const WIDTH = 750;
|
||||
const HEIGHT = 228;
|
||||
const MASK_SCALE = 2;
|
||||
const MASK_WIDTH = WIDTH / MASK_SCALE;
|
||||
const MASK_HEIGHT = HEIGHT / MASK_SCALE;
|
||||
const ENTRY_PADDING = 24;
|
||||
const EXIT_PADDING = 32;
|
||||
const MAX_FEATHER = 60;
|
||||
const FULL_TRACK_OFFSET_Y = -3;
|
||||
const ENTRY_EDGE_BLEND_PERCENT = 5;
|
||||
const EXIT_EDGE_BLEND_START_PERCENT = 90;
|
||||
const SWEEP_TRACK_RADIUS = 28;
|
||||
const SWEEP_TRACK_FEATHER = 8;
|
||||
const ENTRY_ANIMATION_DURATION = 1000;
|
||||
const UPDATE_DURATION = 240;
|
||||
const SWEEP_DELAY = 100;
|
||||
const SWEEP_DURATION = 1000;
|
||||
const ASSET_ROOT =
|
||||
"/pages/training/static/stability-energy";
|
||||
const getAssetSource = (filename) => `${ASSET_ROOT}/${filename}`;
|
||||
|
||||
const instance = getCurrentInstance();
|
||||
const canvasId = `stability-energy-${Math.random().toString(36).slice(2, 10)}`;
|
||||
const canvasReady = ref(false);
|
||||
const fallbackVisible = ref(true);
|
||||
const normalizedPercent = computed(() =>
|
||||
Math.max(0, Math.min(100, Number(props.percent) || 0))
|
||||
);
|
||||
|
||||
let engine = null;
|
||||
let disposed = false;
|
||||
let animationHandle = null;
|
||||
let renderedPercent = props.introPending ? 100 : normalizedPercent.value;
|
||||
let entryAnimationPlaying = false;
|
||||
let entryAnimationRequested = false;
|
||||
|
||||
const showCanvas = () => {
|
||||
canvasReady.value = true;
|
||||
};
|
||||
|
||||
const requestFrame = (callback) => {
|
||||
if (typeof requestAnimationFrame === "function") {
|
||||
return { type: "frame", id: requestAnimationFrame(callback) };
|
||||
}
|
||||
return {
|
||||
type: "timer",
|
||||
id: setTimeout(() => callback(Date.now()), 16),
|
||||
};
|
||||
};
|
||||
|
||||
const cancelFrame = () => {
|
||||
if (!animationHandle) return;
|
||||
if (
|
||||
animationHandle.type === "frame" &&
|
||||
typeof cancelAnimationFrame === "function"
|
||||
) {
|
||||
cancelAnimationFrame(animationHandle.id);
|
||||
} else {
|
||||
clearTimeout(animationHandle.id);
|
||||
}
|
||||
animationHandle = null;
|
||||
};
|
||||
|
||||
const waitForPaint = () =>
|
||||
new Promise((resolve) => {
|
||||
const schedule = (callback) => {
|
||||
if (typeof requestAnimationFrame === "function") {
|
||||
requestAnimationFrame(callback);
|
||||
} else {
|
||||
setTimeout(callback, 16);
|
||||
}
|
||||
};
|
||||
schedule(() => schedule(resolve));
|
||||
});
|
||||
|
||||
const presentCanvas = async () => {
|
||||
showCanvas();
|
||||
await nextTick();
|
||||
await waitForPaint();
|
||||
if (disposed) return false;
|
||||
fallbackVisible.value = false;
|
||||
return true;
|
||||
};
|
||||
|
||||
const smoothStep = (value) => {
|
||||
const amount = Math.max(0, Math.min(1, value));
|
||||
return amount * amount * (3 - 2 * amount);
|
||||
};
|
||||
|
||||
const enableImageSmoothing = (context) => {
|
||||
if ("imageSmoothingEnabled" in context) {
|
||||
context.imageSmoothingEnabled = true;
|
||||
}
|
||||
if ("imageSmoothingQuality" in context) {
|
||||
context.imageSmoothingQuality = "high";
|
||||
}
|
||||
};
|
||||
|
||||
// 复用参考 HTML 的贝塞尔路径,保证能量光带沿靶纸下方的弧线推进。
|
||||
const sampleTrack = () => {
|
||||
const curves = [
|
||||
// 新素材移除了左上方延伸段,进度从箭头端点开始进入弯道。
|
||||
[171, 53, 145, 56, 123, 68, 125, 82],
|
||||
[125, 82, 128, 128, 272, 163, 412, 163],
|
||||
[412, 163, 530, 164, 650, 137, 657, 98],
|
||||
[657, 98, 659, 86, 650, 76, 643, 72],
|
||||
];
|
||||
const points = [{ x: 171, y: 53, distance: 0 }];
|
||||
|
||||
curves.forEach((curve) => {
|
||||
for (let step = 1; step <= 32; step += 1) {
|
||||
const amount = step / 32;
|
||||
const rest = 1 - amount;
|
||||
const point = {
|
||||
x:
|
||||
rest ** 3 * curve[0] +
|
||||
3 * rest ** 2 * amount * curve[2] +
|
||||
3 * rest * amount ** 2 * curve[4] +
|
||||
amount ** 3 * curve[6],
|
||||
y:
|
||||
rest ** 3 * curve[1] +
|
||||
3 * rest ** 2 * amount * curve[3] +
|
||||
3 * rest * amount ** 2 * curve[5] +
|
||||
amount ** 3 * curve[7],
|
||||
};
|
||||
const previous = points[points.length - 1];
|
||||
point.distance =
|
||||
previous.distance + Math.hypot(point.x - previous.x, point.y - previous.y);
|
||||
points.push(point);
|
||||
}
|
||||
});
|
||||
|
||||
return points;
|
||||
};
|
||||
|
||||
const createOffscreenCanvas = (canvas, width = WIDTH, height = HEIGHT) => {
|
||||
let layerCanvas = null;
|
||||
|
||||
if (typeof canvas.createOffscreenCanvas === "function") {
|
||||
try {
|
||||
layerCanvas = canvas.createOffscreenCanvas({ type: "2d", width, height });
|
||||
} catch (error) {
|
||||
layerCanvas = null;
|
||||
}
|
||||
}
|
||||
if (
|
||||
!layerCanvas &&
|
||||
typeof wx !== "undefined" &&
|
||||
typeof wx.createOffscreenCanvas === "function"
|
||||
) {
|
||||
try {
|
||||
layerCanvas = wx.createOffscreenCanvas({ type: "2d", width, height });
|
||||
} catch (error) {
|
||||
layerCanvas = null;
|
||||
}
|
||||
}
|
||||
if (!layerCanvas && typeof document !== "undefined") {
|
||||
layerCanvas = document.createElement("canvas");
|
||||
layerCanvas.width = width;
|
||||
layerCanvas.height = height;
|
||||
}
|
||||
|
||||
if (!layerCanvas) throw new Error("Offscreen canvas unavailable");
|
||||
layerCanvas.width = width;
|
||||
layerCanvas.height = height;
|
||||
const context = layerCanvas.getContext("2d");
|
||||
if (!context) throw new Error("Offscreen canvas context unavailable");
|
||||
enableImageSmoothing(context);
|
||||
return { canvas: layerCanvas, context };
|
||||
};
|
||||
|
||||
const loadCanvasImage = (canvas, source) =>
|
||||
new Promise((resolve, reject) => {
|
||||
const image =
|
||||
typeof canvas.createImage === "function"
|
||||
? canvas.createImage()
|
||||
: typeof Image !== "undefined"
|
||||
? new Image()
|
||||
: null;
|
||||
if (!image) {
|
||||
reject(new Error("Canvas image unavailable"));
|
||||
return;
|
||||
}
|
||||
image.onload = () => resolve(image);
|
||||
image.onerror = () => reject(new Error(`Image unavailable: ${source}`));
|
||||
image.src = source;
|
||||
});
|
||||
|
||||
const createEnergyEngine = async (canvas, preloadedFullImage = null) => {
|
||||
const context = canvas.getContext("2d");
|
||||
if (!context) throw new Error("Canvas unavailable");
|
||||
enableImageSmoothing(context);
|
||||
|
||||
const maskLayer = createOffscreenCanvas(canvas, MASK_WIDTH, MASK_HEIGHT);
|
||||
const emptyLayer = createOffscreenCanvas(canvas);
|
||||
const fullLayer = createOffscreenCanvas(canvas);
|
||||
const glowLayer = createOffscreenCanvas(canvas);
|
||||
const sweepLayer = createOffscreenCanvas(canvas);
|
||||
const track = sampleTrack();
|
||||
const pathLength = track[track.length - 1].distance;
|
||||
const revealStarts = new Float32Array(MASK_WIDTH * MASK_HEIGHT);
|
||||
const revealRates = new Float32Array(MASK_WIDTH * MASK_HEIGHT);
|
||||
const sweepTrackAlpha = new Float32Array(MASK_WIDTH * MASK_HEIGHT);
|
||||
const maskPixels = maskLayer.context.createImageData(MASK_WIDTH, MASK_HEIGHT);
|
||||
maskPixels.data.fill(255);
|
||||
|
||||
const images = await Promise.all([
|
||||
loadCanvasImage(canvas, getAssetSource("progress-empty.png")),
|
||||
preloadedFullImage ||
|
||||
loadCanvasImage(canvas, getAssetSource("progress-full.png")),
|
||||
loadCanvasImage(canvas, getAssetSource("progress-glow.png")),
|
||||
]);
|
||||
|
||||
const segments = track.slice(1).map((end, index) => {
|
||||
const start = track[index];
|
||||
const deltaX = end.x - start.x;
|
||||
const deltaY = end.y - start.y;
|
||||
return {
|
||||
start,
|
||||
deltaX,
|
||||
deltaY,
|
||||
length: end.distance - start.distance,
|
||||
inverseSquaredLength: 1 / (deltaX ** 2 + deltaY ** 2),
|
||||
};
|
||||
});
|
||||
|
||||
// 初始化每个蒙版像素抵达能量路径的时刻,后续更新只重绘,不重复计算。
|
||||
for (let pixel = 0; pixel < revealStarts.length; pixel += 1) {
|
||||
const pixelX = ((pixel % MASK_WIDTH) + 0.5) * MASK_SCALE;
|
||||
const pixelY = (Math.floor(pixel / MASK_WIDTH) + 0.5) * MASK_SCALE;
|
||||
let nearestSquaredDistance = Infinity;
|
||||
let arrivalDistance = 0;
|
||||
|
||||
for (let index = 0; index < segments.length; index += 1) {
|
||||
const segment = segments[index];
|
||||
const offsetX = pixelX - segment.start.x;
|
||||
const offsetY = pixelY - segment.start.y;
|
||||
const projection =
|
||||
(offsetX * segment.deltaX + offsetY * segment.deltaY) *
|
||||
segment.inverseSquaredLength;
|
||||
const amount = Math.max(0, Math.min(1, projection));
|
||||
const squaredDistance =
|
||||
(offsetX - segment.deltaX * amount) ** 2 +
|
||||
(offsetY - segment.deltaY * amount) ** 2;
|
||||
if (squaredDistance >= nearestSquaredDistance) continue;
|
||||
|
||||
nearestSquaredDistance = squaredDistance;
|
||||
arrivalDistance = segment.start.distance + amount * segment.length;
|
||||
if (index === 0 && projection < 0) {
|
||||
arrivalDistance = Math.max(-ENTRY_PADDING, projection * segment.length);
|
||||
}
|
||||
if (index === segments.length - 1 && projection > 1) {
|
||||
arrivalDistance = Math.min(
|
||||
pathLength + EXIT_PADDING,
|
||||
segment.start.distance + projection * segment.length
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
const nearestDistance = Math.sqrt(nearestSquaredDistance);
|
||||
const feather = Math.min(
|
||||
MAX_FEATHER,
|
||||
16 + nearestDistance * 0.9
|
||||
);
|
||||
revealStarts[pixel] = arrivalDistance;
|
||||
revealRates[pixel] = 1 / feather;
|
||||
sweepTrackAlpha[pixel] =
|
||||
1 -
|
||||
smoothStep(
|
||||
(nearestDistance - SWEEP_TRACK_RADIUS) / SWEEP_TRACK_FEATHER
|
||||
);
|
||||
}
|
||||
|
||||
const temporary = new Float32Array(revealStarts.length);
|
||||
const radius = 3;
|
||||
for (let pass = 0; pass < 3; pass += 1) {
|
||||
for (let row = 0; row < MASK_HEIGHT; row += 1) {
|
||||
for (let column = 0; column < MASK_WIDTH; column += 1) {
|
||||
let sum = 0;
|
||||
for (let offset = -radius; offset <= radius; offset += 1) {
|
||||
const neighbor = Math.max(
|
||||
0,
|
||||
Math.min(MASK_WIDTH - 1, column + offset)
|
||||
);
|
||||
sum += revealStarts[row * MASK_WIDTH + neighbor];
|
||||
}
|
||||
temporary[row * MASK_WIDTH + column] = sum / (radius * 2 + 1);
|
||||
}
|
||||
}
|
||||
for (let row = 0; row < MASK_HEIGHT; row += 1) {
|
||||
for (let column = 0; column < MASK_WIDTH; column += 1) {
|
||||
let sum = 0;
|
||||
for (let offset = -radius; offset <= radius; offset += 1) {
|
||||
const neighbor = Math.max(
|
||||
0,
|
||||
Math.min(MASK_HEIGHT - 1, row + offset)
|
||||
);
|
||||
sum += temporary[neighbor * MASK_WIDTH + column];
|
||||
}
|
||||
revealStarts[row * MASK_WIDTH + column] = sum / (radius * 2 + 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const trackPosition = (distance) => {
|
||||
const boundedDistance = Math.max(0, Math.min(pathLength, distance));
|
||||
let upper = 1;
|
||||
while (
|
||||
upper < track.length - 1 &&
|
||||
track[upper].distance < boundedDistance
|
||||
) {
|
||||
upper += 1;
|
||||
}
|
||||
const start = track[upper - 1];
|
||||
const end = track[upper];
|
||||
const amount =
|
||||
(boundedDistance - start.distance) / (end.distance - start.distance);
|
||||
return {
|
||||
x: start.x + (end.x - start.x) * amount,
|
||||
y: start.y + (end.y - start.y) * amount,
|
||||
};
|
||||
};
|
||||
|
||||
// 满轨素材的视觉中心比空轨低约 3px,所有满轨绘制统一上移补偿。
|
||||
const drawFullTrack = (targetContext) => {
|
||||
targetContext.drawImage(
|
||||
images[1],
|
||||
0,
|
||||
FULL_TRACK_OFFSET_Y,
|
||||
WIDTH,
|
||||
HEIGHT
|
||||
);
|
||||
};
|
||||
|
||||
const maskedImage = (layer, image, operation, offsetY = 0) => {
|
||||
layer.context.globalCompositeOperation = "source-over";
|
||||
layer.context.clearRect(0, 0, WIDTH, HEIGHT);
|
||||
layer.context.drawImage(image, 0, offsetY, WIDTH, HEIGHT);
|
||||
layer.context.globalCompositeOperation = operation;
|
||||
layer.context.drawImage(maskLayer.canvas, 0, 0, WIDTH, HEIGHT);
|
||||
layer.context.globalCompositeOperation = "source-over";
|
||||
};
|
||||
|
||||
const draw = (progress) => {
|
||||
context.globalCompositeOperation = "source-over";
|
||||
context.clearRect(0, 0, WIDTH, HEIGHT);
|
||||
|
||||
if (progress <= 0) {
|
||||
context.drawImage(images[0], 0, 0, WIDTH, HEIGHT);
|
||||
return;
|
||||
}
|
||||
if (progress >= 100) {
|
||||
drawFullTrack(context);
|
||||
return;
|
||||
}
|
||||
|
||||
// 主体百分比仍映射轨道本体,头尾仅补偿端点羽化,避免整图与蒙版切换时跳变。
|
||||
const distance = (progress / 100) * pathLength;
|
||||
const entryBlend = smoothStep(progress / ENTRY_EDGE_BLEND_PERCENT);
|
||||
const exitBlend = smoothStep(
|
||||
(progress - EXIT_EDGE_BLEND_START_PERCENT) /
|
||||
(100 - EXIT_EDGE_BLEND_START_PERCENT)
|
||||
);
|
||||
for (let pixel = 0; pixel < revealStarts.length; pixel += 1) {
|
||||
const trackAlpha =
|
||||
smoothStep(
|
||||
(distance - revealStarts[pixel]) * revealRates[pixel]
|
||||
) * entryBlend;
|
||||
maskPixels.data[pixel * 4 + 3] = Math.round(
|
||||
255 * (trackAlpha + (1 - trackAlpha) * exitBlend)
|
||||
);
|
||||
}
|
||||
maskLayer.context.putImageData(maskPixels, 0, 0);
|
||||
maskedImage(emptyLayer, images[0], "destination-out");
|
||||
maskedImage(
|
||||
fullLayer,
|
||||
images[1],
|
||||
"destination-in",
|
||||
FULL_TRACK_OFFSET_Y
|
||||
);
|
||||
context.drawImage(emptyLayer.canvas, 0, 0);
|
||||
context.globalCompositeOperation = "lighter";
|
||||
context.drawImage(fullLayer.canvas, 0, 0);
|
||||
context.globalCompositeOperation = "source-over";
|
||||
|
||||
const headBlend =
|
||||
smoothStep(progress / 10) * (1 - smoothStep((progress - 85) / 15));
|
||||
const position = trackPosition(distance - 16);
|
||||
const headSize = Math.round(72 * (0.55 + 0.45 * headBlend));
|
||||
const headX = Math.round(position.x - headSize / 2);
|
||||
const headY = Math.round(position.y - headSize / 2);
|
||||
glowLayer.context.clearRect(0, 0, WIDTH, HEIGHT);
|
||||
glowLayer.context.drawImage(
|
||||
images[2],
|
||||
headX,
|
||||
headY,
|
||||
headSize,
|
||||
headSize
|
||||
);
|
||||
glowLayer.context.globalCompositeOperation = "destination-in";
|
||||
drawFullTrack(glowLayer.context);
|
||||
glowLayer.context.globalCompositeOperation = "source-over";
|
||||
context.globalAlpha = 0.8 * headBlend;
|
||||
context.drawImage(glowLayer.canvas, 0, 0);
|
||||
context.globalAlpha = 1;
|
||||
};
|
||||
|
||||
const drawSweep = (amount) => {
|
||||
context.globalCompositeOperation = "source-over";
|
||||
context.clearRect(0, 0, WIDTH, HEIGHT);
|
||||
drawFullTrack(context);
|
||||
|
||||
const lead = pathLength * 0.03;
|
||||
const core = pathLength * 0.08;
|
||||
const tail = pathLength * 0.18;
|
||||
const sweepCenter = -tail + amount * (pathLength + lead + tail);
|
||||
for (let pixel = 0; pixel < revealStarts.length; pixel += 1) {
|
||||
const offset = sweepCenter - revealStarts[pixel];
|
||||
let intensity = 0;
|
||||
if (offset >= -lead && offset < 0) {
|
||||
intensity = smoothStep(1 + offset / lead);
|
||||
} else if (offset >= 0 && offset <= core) {
|
||||
intensity = 1;
|
||||
} else if (offset > core && offset <= core + tail) {
|
||||
intensity = 1 - smoothStep((offset - core) / tail);
|
||||
}
|
||||
maskPixels.data[pixel * 4 + 3] = Math.round(
|
||||
255 * intensity * sweepTrackAlpha[pixel]
|
||||
);
|
||||
}
|
||||
maskLayer.context.putImageData(maskPixels, 0, 0);
|
||||
|
||||
sweepLayer.context.globalCompositeOperation = "source-over";
|
||||
sweepLayer.context.clearRect(0, 0, WIDTH, HEIGHT);
|
||||
drawFullTrack(sweepLayer.context);
|
||||
sweepLayer.context.globalCompositeOperation = "source-in";
|
||||
sweepLayer.context.fillStyle = "#fffbd8";
|
||||
sweepLayer.context.fillRect(0, 0, WIDTH, HEIGHT);
|
||||
sweepLayer.context.globalCompositeOperation = "destination-in";
|
||||
sweepLayer.context.drawImage(maskLayer.canvas, 0, 0, WIDTH, HEIGHT);
|
||||
sweepLayer.context.globalCompositeOperation = "source-over";
|
||||
|
||||
// 普通透明叠加只提亮轨道核心,不把满轨素材的外围光晕染白。
|
||||
context.globalCompositeOperation = "source-over";
|
||||
context.globalAlpha = 0.9;
|
||||
context.drawImage(sweepLayer.canvas, 0, 0);
|
||||
context.globalAlpha = 1;
|
||||
context.globalCompositeOperation = "source-over";
|
||||
};
|
||||
|
||||
return { draw, drawSweep };
|
||||
};
|
||||
|
||||
const runCompletionSweep = () => {
|
||||
cancelFrame();
|
||||
let startedAt = null;
|
||||
const step = (timestamp) => {
|
||||
if (!engine || disposed) return;
|
||||
if (startedAt === null) startedAt = timestamp;
|
||||
const elapsed = timestamp - startedAt;
|
||||
if (elapsed < SWEEP_DELAY) {
|
||||
engine.draw(100);
|
||||
animationHandle = requestFrame(step);
|
||||
return;
|
||||
}
|
||||
const amount = Math.min(1, (elapsed - SWEEP_DELAY) / SWEEP_DURATION);
|
||||
engine.drawSweep(amount);
|
||||
if (amount < 1) {
|
||||
animationHandle = requestFrame(step);
|
||||
} else {
|
||||
animationHandle = null;
|
||||
engine.draw(100);
|
||||
}
|
||||
};
|
||||
animationHandle = requestFrame(step);
|
||||
};
|
||||
|
||||
// 服务端能量既会因命中增加,也会按秒下降,因此双向过渡都以最新快照为准。
|
||||
const drawPercent = (targetPercent, animate = true) => {
|
||||
if (!engine) return;
|
||||
cancelFrame();
|
||||
const from = renderedPercent;
|
||||
const target = Math.max(0, Math.min(100, targetPercent));
|
||||
const reachesFull = from < 100 && target >= 100;
|
||||
|
||||
if (!animate || Math.abs(target - from) < 0.01) {
|
||||
renderedPercent = target;
|
||||
engine.draw(target);
|
||||
if (reachesFull) runCompletionSweep();
|
||||
return;
|
||||
}
|
||||
|
||||
let startedAt = null;
|
||||
const step = (timestamp) => {
|
||||
if (!engine || disposed) return;
|
||||
if (startedAt === null) startedAt = timestamp;
|
||||
const amount = Math.min(1, (timestamp - startedAt) / UPDATE_DURATION);
|
||||
renderedPercent = from + (target - from) * smoothStep(amount);
|
||||
engine.draw(renderedPercent);
|
||||
if (amount < 1) {
|
||||
animationHandle = requestFrame(step);
|
||||
} else {
|
||||
animationHandle = null;
|
||||
renderedPercent = target;
|
||||
engine.draw(target);
|
||||
if (reachesFull) runCompletionSweep();
|
||||
}
|
||||
};
|
||||
animationHandle = requestFrame(step);
|
||||
};
|
||||
|
||||
// 首次进入时先展示满能量,再用 1 秒线性动画回落到 0%。
|
||||
const runEntryAnimation = () => {
|
||||
if (!engine || disposed) return;
|
||||
cancelFrame();
|
||||
entryAnimationRequested = false;
|
||||
entryAnimationPlaying = true;
|
||||
renderedPercent = 100;
|
||||
engine.draw(100);
|
||||
showCanvas();
|
||||
|
||||
let startedAt = null;
|
||||
const step = (timestamp) => {
|
||||
if (!engine || disposed) return;
|
||||
if (startedAt === null) startedAt = timestamp;
|
||||
const amount = Math.min(
|
||||
1,
|
||||
(timestamp - startedAt) / ENTRY_ANIMATION_DURATION
|
||||
);
|
||||
renderedPercent = 100 * (1 - amount);
|
||||
engine.draw(renderedPercent);
|
||||
|
||||
if (amount < 1) {
|
||||
animationHandle = requestFrame(step);
|
||||
return;
|
||||
}
|
||||
|
||||
animationHandle = null;
|
||||
entryAnimationPlaying = false;
|
||||
renderedPercent = 0;
|
||||
engine.draw(0);
|
||||
|
||||
// 动画期间可能收到服务端快照,结束后再追到最新真实能量。
|
||||
if (normalizedPercent.value > 0) {
|
||||
drawPercent(normalizedPercent.value);
|
||||
}
|
||||
};
|
||||
|
||||
animationHandle = requestFrame(step);
|
||||
};
|
||||
|
||||
const initialize = async () => {
|
||||
await nextTick();
|
||||
const info = await new Promise((resolve) => {
|
||||
let query = uni.createSelectorQuery();
|
||||
if (instance?.proxy && typeof query.in === "function") {
|
||||
query = query.in(instance.proxy);
|
||||
}
|
||||
query
|
||||
.select(`#${canvasId}`)
|
||||
.fields({ node: true, size: true })
|
||||
.exec((result) => resolve(result?.[0] || null));
|
||||
});
|
||||
|
||||
if (disposed) return;
|
||||
if (!info?.node?.getContext) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
const canvas = info.node;
|
||||
canvas.width = WIDTH;
|
||||
canvas.height = HEIGHT;
|
||||
const context = canvas.getContext("2d");
|
||||
if (!context) throw new Error("Canvas unavailable");
|
||||
enableImageSmoothing(context);
|
||||
|
||||
let preloadedFullImage = null;
|
||||
if (props.introPending) {
|
||||
preloadedFullImage = await loadCanvasImage(
|
||||
canvas,
|
||||
getAssetSource("progress-full.png")
|
||||
);
|
||||
if (disposed) return;
|
||||
context.clearRect(0, 0, WIDTH, HEIGHT);
|
||||
context.drawImage(
|
||||
preloadedFullImage,
|
||||
0,
|
||||
FULL_TRACK_OFFSET_Y,
|
||||
WIDTH,
|
||||
HEIGHT
|
||||
);
|
||||
renderedPercent = 100;
|
||||
if (!(await presentCanvas())) return;
|
||||
// 先让满能量首帧完成合成,再开始较重的遮罩和轨道计算。
|
||||
await new Promise((resolve) => setTimeout(resolve, 0));
|
||||
if (disposed) return;
|
||||
}
|
||||
|
||||
engine = await createEnergyEngine(canvas, preloadedFullImage);
|
||||
if (disposed) return;
|
||||
if (props.introPending || entryAnimationRequested) {
|
||||
renderedPercent = 100;
|
||||
engine.draw(100);
|
||||
showCanvas();
|
||||
if (!props.introPending && entryAnimationRequested) {
|
||||
runEntryAnimation();
|
||||
}
|
||||
return;
|
||||
}
|
||||
renderedPercent = normalizedPercent.value;
|
||||
engine.draw(renderedPercent);
|
||||
await presentCanvas();
|
||||
} catch (error) {
|
||||
console.log("stability energy canvas unavailable", error);
|
||||
}
|
||||
};
|
||||
|
||||
watch(normalizedPercent, (value) => {
|
||||
if (!engine || props.introPending || entryAnimationPlaying) return;
|
||||
drawPercent(value);
|
||||
});
|
||||
|
||||
watch(
|
||||
() => props.introPending,
|
||||
(pending, wasPending) => {
|
||||
if (pending) {
|
||||
entryAnimationRequested = false;
|
||||
if (!engine) return;
|
||||
cancelFrame();
|
||||
entryAnimationPlaying = false;
|
||||
renderedPercent = 100;
|
||||
engine.draw(100);
|
||||
showCanvas();
|
||||
return;
|
||||
}
|
||||
if (!wasPending) return;
|
||||
|
||||
entryAnimationRequested = true;
|
||||
if (engine) runEntryAnimation();
|
||||
}
|
||||
);
|
||||
|
||||
onMounted(initialize);
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
disposed = true;
|
||||
cancelFrame();
|
||||
engine = null;
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<view class="stability-energy-track" aria-label="稳定训练能量进度">
|
||||
<image
|
||||
v-if="fallbackVisible"
|
||||
class="stability-energy-track__image"
|
||||
:src="getAssetSource('progress-full.png')"
|
||||
mode="scaleToFill"
|
||||
/>
|
||||
<canvas
|
||||
:id="canvasId"
|
||||
:canvas-id="canvasId"
|
||||
:class="[
|
||||
'stability-energy-track__canvas',
|
||||
canvasReady ? 'stability-energy-track__canvas--ready' : '',
|
||||
]"
|
||||
type="2d"
|
||||
:width="WIDTH"
|
||||
:height="HEIGHT"
|
||||
/>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.stability-energy-track {
|
||||
position: relative;
|
||||
z-index: 4;
|
||||
width: 100%;
|
||||
height: 228rpx;
|
||||
margin: -164rpx 0 -80rpx;
|
||||
margin-left: -10rpx;
|
||||
overflow: hidden;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.stability-energy-track__image,
|
||||
.stability-energy-track__canvas {
|
||||
position: absolute;
|
||||
inset: 0;
|
||||
display: block;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.stability-energy-track__image {
|
||||
z-index: 0;
|
||||
transform: translateY(-3rpx);
|
||||
}
|
||||
|
||||
.stability-energy-track__canvas {
|
||||
z-index: 1;
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
.stability-energy-track__canvas--ready {
|
||||
opacity: 1;
|
||||
}
|
||||
</style>
|
||||
@@ -20,7 +20,8 @@ const previewLines = computed(() => {
|
||||
: [{ text: line }];
|
||||
const parts = rawParts
|
||||
.map((part) => ({
|
||||
text: String(part?.text ?? part ?? "").trim(),
|
||||
text: String(part?.text ?? part ?? ""),
|
||||
highlight: part?.highlight === true,
|
||||
}))
|
||||
.filter((part) => part.text);
|
||||
|
||||
@@ -48,6 +49,7 @@ const previewLines = computed(() => {
|
||||
<text
|
||||
v-for="(part, partIndex) in line.parts"
|
||||
:key="partIndex"
|
||||
:class="{ 'difficulty-preview__highlight': part.highlight }"
|
||||
>{{ part.text }}</text>
|
||||
</view>
|
||||
</view>
|
||||
@@ -89,7 +91,7 @@ const previewLines = computed(() => {
|
||||
}
|
||||
|
||||
.difficulty-preview__copy {
|
||||
width: 84%;
|
||||
width: 100%;
|
||||
margin: 0 auto;
|
||||
display: block;
|
||||
color: #ffffff;
|
||||
@@ -102,4 +104,9 @@ const previewLines = computed(() => {
|
||||
.difficulty-preview__line {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.difficulty-preview__highlight {
|
||||
color: #ffd543;
|
||||
font-weight: 500;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -110,50 +110,51 @@ const createDifficultySummary = (item = {}) => {
|
||||
const timeLimit = toNumber(item.time_limit);
|
||||
const hitReq = toNumber(item.hit_req);
|
||||
const totalReq = toNumber(item.total_req);
|
||||
const energyReqPercent = toNumber(item.energy_req_percent);
|
||||
const shootingTimeText =
|
||||
timeLimit > 0 ? `在${timeLimit}秒内进行射箭` : "不限时进行射箭";
|
||||
const enduranceTimeText =
|
||||
timeLimit > 0
|
||||
? `在${timeLimit}秒内完成${arrows}箭`
|
||||
: `不限时完成${arrows}箭`;
|
||||
const rhythmRequiredArrows = toNumber(item.total_req, arrows) || arrows;
|
||||
const timeParts = timeLimit > 0
|
||||
? [{ text: `${timeLimit}`, highlight: true }, { text: "秒内," }]
|
||||
: [{ text: "不限时," }];
|
||||
|
||||
const summaryMap = {
|
||||
base: [
|
||||
shootingTimeText,
|
||||
`需要有${arrows}箭命中${hitReq}环内`,
|
||||
{ parts: [
|
||||
...timeParts,
|
||||
{ text: "命中" }, { text: `${arrows}`, highlight: true },
|
||||
{ text: "支" }, { text: `≥${hitReq}`, highlight: true },
|
||||
{ text: "环的箭" },
|
||||
] },
|
||||
],
|
||||
endurance: [
|
||||
enduranceTimeText,
|
||||
`且累计环数大于${totalReq}环`,
|
||||
{ parts: [
|
||||
...timeParts,
|
||||
{ text: "共射出" }, { text: `≥${arrows}`, highlight: true },
|
||||
{ text: "支箭,且总环数" }, { text: `≥${totalReq}`, highlight: true },
|
||||
{ text: "环" },
|
||||
] },
|
||||
],
|
||||
precision: [
|
||||
shootingTimeText,
|
||||
`需要有${arrows}箭命中高亮区域`,
|
||||
{ parts: [
|
||||
...timeParts,
|
||||
{ text: "命中" }, { text: `${arrows}`, highlight: true },
|
||||
{ text: "箭高亮区域" },
|
||||
] },
|
||||
],
|
||||
rhythm: [
|
||||
arrows > 0
|
||||
? `需要在指定时间节点射出${arrows}射箭`
|
||||
: "需要在指定时间节点射箭",
|
||||
hitReq > 0 ? `且每箭命中${hitReq}环内` : "且每箭命中指定区域",
|
||||
{ parts: [
|
||||
{ text: `${arrows}`, highlight: true },
|
||||
{ text: "个节奏内,随节奏射箭,命中" },
|
||||
{ text: `${rhythmRequiredArrows}`, highlight: true },
|
||||
{ text: "箭成绩" }, { text: `≥${hitReq}`, highlight: true },
|
||||
{ text: "环且踩中节拍区间" },
|
||||
] },
|
||||
],
|
||||
stability: [
|
||||
{
|
||||
parts: [
|
||||
{ text: timeLimit > 0 ? "在" : "" },
|
||||
{
|
||||
text: timeLimit > 0 ? `${timeLimit}秒` : "不限时",
|
||||
highlight: true,
|
||||
},
|
||||
{ text: timeLimit > 0 ? "内射箭,命中" : "射箭,命中" },
|
||||
{ text: `${hitReq}环`, highlight: true },
|
||||
{ text: "可获得能量" },
|
||||
],
|
||||
},
|
||||
{
|
||||
parts: [
|
||||
{ text: "计时结束能量需要大于" },
|
||||
{ text: `${energyReqPercent}%`, highlight: true },
|
||||
...timeParts,
|
||||
{ text: "每射一箭" },
|
||||
{ text: `≥${hitReq}`, highlight: true },
|
||||
{ text: "环可为能量槽充能,能量充满即过关" },
|
||||
],
|
||||
},
|
||||
],
|
||||
@@ -628,6 +629,7 @@ const createPracticeQuery = (difficulty) => {
|
||||
},
|
||||
rhythm: {
|
||||
hitReq: toNumber(difficulty.hit_req),
|
||||
totalReq: toNumber(difficulty.total_req, toNumber(difficulty.arrows)),
|
||||
mode: toNumber(difficulty.mode),
|
||||
roundTime: toNumber(difficulty.round_time ?? difficulty.roundTime),
|
||||
shootTime: toNumber(difficulty.shoot_time ?? difficulty.shootTime),
|
||||
|
||||
@@ -3,6 +3,7 @@ import { computed, ref, onMounted, onBeforeUnmount } from "vue";
|
||||
import { onHide, onLoad, onShow, onUnload } from "@dcloudio/uni-app";
|
||||
import Container from "@/components/Container.vue";
|
||||
import ShootProgress from "./components/ShootProgress.vue";
|
||||
import StabilityEnergyTrack from "./components/StabilityEnergyTrack.vue";
|
||||
import BowTarget from "./components/BowTarget.vue";
|
||||
import ScorePanel2 from "@/components/TrainingScorePanel.vue";
|
||||
import ScoreResult from "./components/ScoreResult.vue";
|
||||
@@ -48,6 +49,7 @@ const { user } = storeToRefs(store);
|
||||
const sound = ref(true);
|
||||
const start = ref(false);
|
||||
const practiceStarting = ref(false);
|
||||
const stabilityEnergyIntroPending = ref(false);
|
||||
const pageStages = Object.freeze({
|
||||
DISTANCE: "distance",
|
||||
SHOOTING: "shooting",
|
||||
@@ -100,19 +102,19 @@ const rhythmServerTimestamp = ref(0);
|
||||
const rhythmFallbackWindowStart = ref(0);
|
||||
const rhythmFallbackTimestamp = ref(0);
|
||||
const rhythmHasActiveServerAnchor = ref(false);
|
||||
// 节奏训练目标箭数以服务端 total_arrows 为准;首帧缺失时用 arrows_left 初始化并保持稳定。
|
||||
const rhythmTargetArrows = ref(0);
|
||||
// 仅由前端每轮倒计时完成事件累加,不根据服务端箭数推算。
|
||||
const rhythmCompletedRounds = ref(0);
|
||||
// 服务端状态立即落到 practiceInfo,精准训练的目标区域单独延迟展示。
|
||||
const visiblePrecisionTarget = ref({
|
||||
randomBlock: 0,
|
||||
randomRingArea: 0,
|
||||
randomRingAreas: [],
|
||||
});
|
||||
const trainingDifficultyStorageKey = "training-selection";
|
||||
const useHighlightTest = ref(false);
|
||||
const highlightTestState = ref({
|
||||
blocks: 8,
|
||||
randomBlock: 1,
|
||||
randomRingArea: 0,
|
||||
randomRingAreas: [],
|
||||
});
|
||||
const highlightTestTimer = ref(null);
|
||||
const serverAddr = ref("");
|
||||
@@ -133,11 +135,14 @@ let shotPresentationGeneration = 0;
|
||||
let nextDifficultyRequest = null;
|
||||
let nextDifficultyRequestGeneration = 0;
|
||||
const audioWaiters = new Set();
|
||||
let stabilityEnergyIntroGeneration = 0;
|
||||
let stabilityEnergyIntroTimer = null;
|
||||
const shotEffectWaiters = new Map();
|
||||
const PRACTICE_SYNC_TIMEOUT_MS = 5000;
|
||||
const SHOT_EFFECT_WAIT_TIMEOUT_MS = 1200;
|
||||
const AUDIO_TIMEOUT_BASE = 3500;
|
||||
const AUDIO_TIMEOUT_PER_KEY = 2600;
|
||||
const STABILITY_ENERGY_ENTRY_DELAY_MS = 1000;
|
||||
const AUDIO_TIMEOUT_MAX = 12000;
|
||||
const RUNTIME_DIAGNOSTIC_INTERVAL_MS = 60000;
|
||||
let lastRuntimeDiagnosticAt = 0;
|
||||
@@ -195,9 +200,23 @@ const getPositiveInteger = (value) => {
|
||||
return Number.isInteger(numberValue) && numberValue > 0 ? numberValue : 0;
|
||||
};
|
||||
|
||||
const normalizePrecisionRingAreas = (source = {}) => {
|
||||
const multipleRings = Array.isArray(source.randomRingAreas)
|
||||
? [...new Set(source.randomRingAreas.map(getPositiveInteger))].filter(
|
||||
(ring) => ring >= 1 && ring <= 10
|
||||
)
|
||||
: [];
|
||||
|
||||
if (multipleRings.length > 0) return multipleRings;
|
||||
|
||||
const singleRing = getPositiveInteger(source.randomRingArea);
|
||||
return singleRing >= 1 && singleRing <= 10 ? [singleRing] : [];
|
||||
};
|
||||
|
||||
const getPrecisionTargetSnapshot = (source = {}) => ({
|
||||
randomBlock: getPositiveInteger(source.randomBlock),
|
||||
randomRingArea: getPositiveInteger(source.randomRingArea),
|
||||
// 多环字段优先;后端仅在单环时继续下发旧单值字段。
|
||||
randomRingAreas: normalizePrecisionRingAreas(source),
|
||||
});
|
||||
|
||||
const applyVisiblePrecisionTarget = (source = {}) => {
|
||||
@@ -345,6 +364,15 @@ const stabilityEnergyPercent = computed(() => {
|
||||
(stabilityCurrentEnergy.value / stabilityScoreSlot.value) * 100
|
||||
);
|
||||
});
|
||||
const stabilityEnergyCostPerSec = computed(() =>
|
||||
Math.max(
|
||||
0,
|
||||
getPracticeNumber(
|
||||
practiceInfo.value.energyCostPerSec,
|
||||
trainingParams.value.energyCostPerSec
|
||||
)
|
||||
)
|
||||
);
|
||||
|
||||
const initializeRhythmFirstRoundCountdown = () => {
|
||||
rhythmHasActiveServerAnchor.value = false;
|
||||
@@ -384,14 +412,13 @@ const precisionRandomBlock = computed(() => {
|
||||
return block <= precisionBlocks.value ? block : 0;
|
||||
});
|
||||
|
||||
const precisionRandomRingArea = computed(() => {
|
||||
const ring = getPositiveInteger(
|
||||
const precisionRandomRingAreas = computed(() =>
|
||||
normalizePrecisionRingAreas(
|
||||
useHighlightTest.value
|
||||
? highlightTestState.value.randomRingArea
|
||||
: visiblePrecisionTarget.value.randomRingArea
|
||||
);
|
||||
return ring >= 1 && ring <= 10 ? ring : 0;
|
||||
});
|
||||
? highlightTestState.value
|
||||
: visiblePrecisionTarget.value
|
||||
)
|
||||
);
|
||||
|
||||
// 只展示后端进度,不在前端重复判断训练是否完成。
|
||||
const trainingCopy = computed(() => {
|
||||
@@ -413,10 +440,11 @@ const trainingCopy = computed(() => {
|
||||
return {
|
||||
inline: true,
|
||||
details: [
|
||||
{ text: "计时结束前需要有" },
|
||||
{ text: "命中 " },
|
||||
{ text: `(${completedArrows}/${targetArrows})`, highlight: true },
|
||||
{ text: "箭命中" },
|
||||
{ text: `${hitReq}环`, highlight: true },
|
||||
{ text: " 支" },
|
||||
{ text: `≥${hitReq}`, highlight: true },
|
||||
{ text: "环的箭" },
|
||||
],
|
||||
};
|
||||
}
|
||||
@@ -436,11 +464,11 @@ const trainingCopy = computed(() => {
|
||||
return {
|
||||
inline: true,
|
||||
details: [
|
||||
{ text: "计时结束前完成" },
|
||||
{ text: "射出≥ " },
|
||||
{ text: `(${currentArrows}/${targetArrows})`, highlight: true },
|
||||
{ text: "箭且累计命中" },
|
||||
{ text: " 支箭,总环数达到≥ " },
|
||||
{ text: `(${currentRings}/${targetRings})`, highlight: true },
|
||||
{ text: "环" },
|
||||
{ text: " 环" },
|
||||
],
|
||||
};
|
||||
}
|
||||
@@ -459,36 +487,34 @@ const trainingCopy = computed(() => {
|
||||
return {
|
||||
inline: true,
|
||||
details: [
|
||||
{ text: "射箭命中高亮区域需完成" },
|
||||
{ text: "命中高亮区域 " },
|
||||
{ text: `(${completedArrows}/${targetArrows})`, highlight: true },
|
||||
{ text: "箭" },
|
||||
{ text: " 箭" },
|
||||
],
|
||||
};
|
||||
}
|
||||
|
||||
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 totalArrows = getPositiveInteger(total.value);
|
||||
// 节奏数由前端倒计时累计,达标箭数与下方金色箭记录使用同一判定。
|
||||
const targetArrows =
|
||||
getPositiveInteger(practiceInfo.value.targetArrows) ||
|
||||
getPositiveInteger(trainingParams.value.totalReq) || totalArrows;
|
||||
// 展示当前节奏序号,从 1 开始;内部仍累计已完成次数。
|
||||
const currentRound = Math.min(totalArrows, rhythmCompletedRounds.value + 1);
|
||||
const hitReq = rhythmHitReq.value;
|
||||
const qualifiedArrows = scores.value.filter((arrow) => arrow?.ok === true).length;
|
||||
|
||||
return {
|
||||
inline: true,
|
||||
details: [
|
||||
{ text: "在进度条读取到高亮区间时射箭命中" },
|
||||
{
|
||||
text: hitReq > 0 ? `${hitReq}环内` : "指定区域",
|
||||
highlight: true,
|
||||
},
|
||||
{ text: ",需完成" },
|
||||
{ text: `(${completedArrows}/${targetArrows})`, highlight: true },
|
||||
{ text: "箭" },
|
||||
{ text: `(${currentRound}/${totalArrows})`, highlight: true },
|
||||
{ text: " 个节奏内,跟随节奏射箭,命中 " },
|
||||
{ text: `(${qualifiedArrows}/${targetArrows})`, highlight: true },
|
||||
{ text: " 箭" },
|
||||
{ text: `≥${hitReq}`, highlight: true },
|
||||
{ text: "环且踩中节拍区间" },
|
||||
],
|
||||
};
|
||||
}
|
||||
@@ -498,26 +524,12 @@ const trainingCopy = computed(() => {
|
||||
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,
|
||||
},
|
||||
{ text: "每射一箭" },
|
||||
{ text: `≥${hitReq}`, highlight: true },
|
||||
{ text: "环可为能量槽充能,充满即过关" },
|
||||
],
|
||||
};
|
||||
}
|
||||
@@ -555,6 +567,7 @@ const practiceInfoFields = [
|
||||
"blocks",
|
||||
"randomBlock",
|
||||
"randomRingArea",
|
||||
"randomRingAreas",
|
||||
"roundTime",
|
||||
"shootTime",
|
||||
"shootWindowStart",
|
||||
@@ -681,31 +694,14 @@ const cacheRhythmTrainingConfig = (message = {}) => {
|
||||
}
|
||||
};
|
||||
|
||||
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 onRhythmRoundComplete = () => {
|
||||
if (!isShootingStage.value || !start.value || !isRhythmTraining.value || practiceEnded.value) return;
|
||||
const totalRounds = getPositiveInteger(total.value);
|
||||
rhythmCompletedRounds.value = Math.min(totalRounds, rhythmCompletedRounds.value + 1);
|
||||
};
|
||||
|
||||
const syncPracticeInfo = (message = {}) => {
|
||||
cacheRhythmTrainingConfig(message);
|
||||
cacheRhythmTargetArrows(message);
|
||||
const messageTrainingType = String(
|
||||
message.trainingType ?? message.training_type ?? trainingType.value
|
||||
).trim();
|
||||
@@ -716,6 +712,22 @@ const syncPracticeInfo = (message = {}) => {
|
||||
return result;
|
||||
}, {});
|
||||
|
||||
const isRhythmSnapshot =
|
||||
messageTrainingType === "rhythm" &&
|
||||
(message.type === undefined ||
|
||||
[
|
||||
MESSAGETYPESV2.BattleStart,
|
||||
MESSAGETYPESV2.ShootResult,
|
||||
MESSAGETYPESV2.BattleEnd,
|
||||
].includes(message.type));
|
||||
|
||||
if (isRhythmSnapshot) {
|
||||
// 达标箭数的 0 按 protobuf 默认值处理;剩余数缺失不能用于推算节奏进度。
|
||||
if (!Object.prototype.hasOwnProperty.call(nextInfo, "qualifiedArrows")) {
|
||||
nextInfo.qualifiedArrows = 0;
|
||||
}
|
||||
}
|
||||
|
||||
const isStabilityEnergySnapshot =
|
||||
messageTrainingType === "stability" &&
|
||||
(Object.prototype.hasOwnProperty.call(message, "currentEnergy") ||
|
||||
@@ -746,6 +758,9 @@ const syncPracticeInfo = (message = {}) => {
|
||||
if (!Object.prototype.hasOwnProperty.call(message, "randomRingArea")) {
|
||||
nextInfo.randomRingArea = 0;
|
||||
}
|
||||
if (!Object.prototype.hasOwnProperty.call(message, "randomRingAreas")) {
|
||||
nextInfo.randomRingAreas = [];
|
||||
}
|
||||
}
|
||||
|
||||
if (Object.keys(nextInfo).length === 0) return;
|
||||
@@ -836,6 +851,12 @@ const playAudioKeysAndWait = (keys) => {
|
||||
});
|
||||
};
|
||||
|
||||
const clearStabilityEnergyIntroTimer = () => {
|
||||
if (!stabilityEnergyIntroTimer) return;
|
||||
clearTimeout(stabilityEnergyIntroTimer);
|
||||
stabilityEnergyIntroTimer = null;
|
||||
};
|
||||
|
||||
const shouldWaitForShotEffect = (shot) => {
|
||||
const x = Number(shot?.x);
|
||||
const y = Number(shot?.y);
|
||||
@@ -1290,7 +1311,7 @@ const clearHighlightTestTimer = () => {
|
||||
}
|
||||
};
|
||||
|
||||
// 开发环境测试入口:依次切换 8 个顺时针区域,偶数区域只高亮指定环。
|
||||
// 开发环境测试入口:依次切换 8 个顺时针区域,偶数区域同时高亮两个环。
|
||||
const runHighlightTest = () => {
|
||||
clearHighlightTestTimer();
|
||||
useHighlightTest.value = true;
|
||||
@@ -1302,7 +1323,7 @@ const runHighlightTest = () => {
|
||||
highlightTestState.value = {
|
||||
blocks: 8,
|
||||
randomBlock: block,
|
||||
randomRingArea: 0,
|
||||
randomRingAreas: [],
|
||||
};
|
||||
|
||||
highlightTestTimer.value = setInterval(() => {
|
||||
@@ -1315,7 +1336,10 @@ const runHighlightTest = () => {
|
||||
highlightTestState.value = {
|
||||
blocks: 8,
|
||||
randomBlock: block,
|
||||
randomRingArea: block % 2 === 0 ? Math.min(block, 10) : 0,
|
||||
randomRingAreas:
|
||||
block % 2 === 0
|
||||
? [Math.min(block, 9), Math.min(block + 1, 10)]
|
||||
: [],
|
||||
};
|
||||
}, 1000);
|
||||
};
|
||||
@@ -1326,7 +1350,7 @@ const resetHighlightTest = () => {
|
||||
highlightTestState.value = {
|
||||
blocks: 8,
|
||||
randomBlock: 1,
|
||||
randomRingArea: 0,
|
||||
randomRingAreas: [],
|
||||
};
|
||||
scores.value = [];
|
||||
};
|
||||
@@ -1375,11 +1399,14 @@ onLoad((options = {}) => {
|
||||
toRouteNumber(trainingContext.scoreSlot)
|
||||
),
|
||||
};
|
||||
// 稳定训练在测距阶段预挂载 Canvas,并提前绘制 100% 满能量首帧。
|
||||
stabilityEnergyIntroPending.value =
|
||||
trainingParams.value.type === "stability";
|
||||
practiseId.value = trainingContext.practiceId || "";
|
||||
serverAddr.value = trainingContext.serverAddr || "";
|
||||
|
||||
const startAudioKey = getTrainingStartAudioKey(trainingParams.value.type);
|
||||
const warmupKeys = [startAudioKey, "胜利", "失败"];
|
||||
const warmupKeys = [startAudioKey, "通关成功", "通关失败", "胜利", "失败"];
|
||||
if (trainingParams.value.type === "precision") {
|
||||
warmupKeys.push("Bingo命中目标", "未命中");
|
||||
} else if (trainingParams.value.type === "rhythm") {
|
||||
@@ -1409,6 +1436,7 @@ const onReady = async () => {
|
||||
}
|
||||
|
||||
practiceStarting.value = true;
|
||||
rhythmCompletedRounds.value = 0;
|
||||
pageStage.value = pageStages.LOADING;
|
||||
clearHighlightTestTimer();
|
||||
useHighlightTest.value = false;
|
||||
@@ -1420,15 +1448,30 @@ const onReady = async () => {
|
||||
scores.value = [];
|
||||
shotEffectToken.value = 0;
|
||||
initializeRhythmFirstRoundCountdown();
|
||||
const shouldPlayStabilityEnergyIntro =
|
||||
trainingType.value === "stability";
|
||||
clearStabilityEnergyIntroTimer();
|
||||
const stabilityIntroGeneration = ++stabilityEnergyIntroGeneration;
|
||||
stabilityEnergyIntroPending.value = shouldPlayStabilityEnergyIntro;
|
||||
const startAudioKey = getTrainingStartAudioKey(
|
||||
trainingType.value,
|
||||
"练习开始"
|
||||
);
|
||||
start.value = true;
|
||||
pageStage.value = pageStages.SHOOTING;
|
||||
setPracticeAppHideResumable(true);
|
||||
// 先由本地锚点保证首轮立即显示,再用最新服务端快照无感校准。
|
||||
requestPracticeInfoSync();
|
||||
// 开始接口成功即进入正式训练,直接播放对应提示,避免依赖 BattleStart 消息。
|
||||
audioManager.play(
|
||||
getTrainingStartAudioKey(trainingType.value, "练习开始")
|
||||
);
|
||||
// 开始语音只进入原播放队列,不参与能量条的入场计时。
|
||||
audioManager.play(startAudioKey);
|
||||
if (shouldPlayStabilityEnergyIntro) {
|
||||
stabilityEnergyIntroTimer = setTimeout(() => {
|
||||
stabilityEnergyIntroTimer = null;
|
||||
if (stabilityIntroGeneration !== stabilityEnergyIntroGeneration) return;
|
||||
if (!isShootingStage.value || !isStabilityTraining.value) return;
|
||||
stabilityEnergyIntroPending.value = false;
|
||||
}, STABILITY_ENERGY_ENTRY_DELAY_MS);
|
||||
}
|
||||
} catch (error) {
|
||||
start.value = false;
|
||||
pageStage.value = pageStages.DISTANCE;
|
||||
@@ -1619,6 +1662,9 @@ function onComplete() {
|
||||
|
||||
async function onRetry() {
|
||||
pageStage.value = pageStages.LOADING;
|
||||
clearStabilityEnergyIntroTimer();
|
||||
stabilityEnergyIntroGeneration += 1;
|
||||
stabilityEnergyIntroPending.value = isStabilityTraining.value;
|
||||
setPracticeAppHideResumable(false);
|
||||
clearHighlightTestTimer();
|
||||
useHighlightTest.value = false;
|
||||
@@ -1632,7 +1678,7 @@ async function onRetry() {
|
||||
rhythmFallbackWindowStart.value = 0;
|
||||
rhythmFallbackTimestamp.value = 0;
|
||||
rhythmHasActiveServerAnchor.value = false;
|
||||
rhythmTargetArrows.value = 0;
|
||||
rhythmCompletedRounds.value = 0;
|
||||
invalidateShotPresentations({ resetVisible: true });
|
||||
start.value = false;
|
||||
scores.value = [];
|
||||
@@ -1655,7 +1701,7 @@ function onAudioEnded(key) {
|
||||
Array.from(audioWaiters).forEach((waiter) => {
|
||||
if (waiter.expectedKey === key) waiter.done();
|
||||
});
|
||||
if (["比赛结束", "练习结束"].includes(String(key || ""))) {
|
||||
if (["比赛结束", "练习结束", "通关成功", "通关失败"].includes(String(key || ""))) {
|
||||
void onOver();
|
||||
}
|
||||
}
|
||||
@@ -1731,6 +1777,9 @@ onMounted(() => {
|
||||
});
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
clearStabilityEnergyIntroTimer();
|
||||
stabilityEnergyIntroGeneration += 1;
|
||||
stabilityEnergyIntroPending.value = false;
|
||||
setPracticeAppHideResumable(false);
|
||||
invalidateShotPresentations();
|
||||
clearPracticeRuntimeContext();
|
||||
@@ -1790,8 +1839,8 @@ onBeforeUnmount(() => {
|
||||
:inShootWindow="rhythmInShootWindow"
|
||||
:serverTimestamp="rhythmCountdownTimestamp"
|
||||
:hitReq="rhythmHitReq"
|
||||
:energyPercent="stabilityEnergyPercent"
|
||||
:energyReqPercent="stabilityEnergyReqPercent"
|
||||
:energyCostPerSec="stabilityEnergyCostPerSec"
|
||||
:scoreSlot="stabilityScoreSlot"
|
||||
:isVip="isVip"
|
||||
:isSvip="isSvip"
|
||||
:externalShootResultAudio="
|
||||
@@ -1800,6 +1849,7 @@ onBeforeUnmount(() => {
|
||||
trainingType === 'stability'
|
||||
"
|
||||
:onStop="onTimeLimitReached"
|
||||
@rhythm-round-complete="onRhythmRoundComplete"
|
||||
/>
|
||||
<view class="user-row">
|
||||
<!-- <Avatar :src="user.avatar" :size="35" /> -->
|
||||
@@ -1819,11 +1869,16 @@ onBeforeUnmount(() => {
|
||||
:showCrosshair="false"
|
||||
:sectorCount="precisionBlocks"
|
||||
:activeSector="precisionRandomBlock"
|
||||
:activeRing="precisionRandomRingArea"
|
||||
:activeRings="precisionRandomRingAreas"
|
||||
:highlightRefreshToken="precisionTargetRefreshToken"
|
||||
stable-shot-effect
|
||||
@shot-effect-complete="onShotEffectComplete"
|
||||
/>
|
||||
<StabilityEnergyTrack
|
||||
v-if="isStabilityTraining"
|
||||
:percent="stabilityEnergyPercent"
|
||||
:introPending="stabilityEnergyIntroPending"
|
||||
/>
|
||||
<!-- <view v-if="env !== 'release'" class="highlight-test-actions">
|
||||
<button
|
||||
class="highlight-test-btn"
|
||||
@@ -2019,6 +2074,8 @@ onBeforeUnmount(() => {
|
||||
margin: 0;
|
||||
background: transparent;
|
||||
border: none;
|
||||
position: relative;
|
||||
z-index: 6;
|
||||
}
|
||||
|
||||
.sound-btn::after {
|
||||
@@ -2068,7 +2125,7 @@ onBeforeUnmount(() => {
|
||||
font-size: 26rpx;
|
||||
font-weight: 400;
|
||||
line-height: 40rpx;
|
||||
white-space: normal;
|
||||
white-space: pre-line;
|
||||
word-break: break-all;
|
||||
}
|
||||
.text1{
|
||||
@@ -2084,9 +2141,7 @@ onBeforeUnmount(() => {
|
||||
line-height: 36rpx;
|
||||
}
|
||||
.text2-yellow{
|
||||
font-size: 30rpx;
|
||||
color: #FFD947;
|
||||
font-weight: 500;
|
||||
margin: 0 4rpx;
|
||||
}
|
||||
</style>
|
||||
|
||||
|
After Width: | Height: | Size: 34 KiB |
|
After Width: | Height: | Size: 47 KiB |
|
After Width: | Height: | Size: 8.4 KiB |
@@ -1,5 +1,7 @@
|
||||
<script setup>
|
||||
import { ref, onMounted } from "vue";
|
||||
import { onShow } from "@dcloudio/uni-app";
|
||||
import { getSelectedExperienceStore, hasAnyStoreVip } from "@/utils/storeVip";
|
||||
import Container from "@/components/Container.vue";
|
||||
import UserHeader from "@/components/UserHeader.vue";
|
||||
import UserItem from "@/components/UserItem.vue";
|
||||
@@ -26,20 +28,40 @@ const toFristTryPage = async () => {
|
||||
}
|
||||
};
|
||||
const toCoinPage = () => {
|
||||
const selected = getSelectedExperienceStore();
|
||||
uni.navigateTo({
|
||||
url: "/pages/coin/nearby-stores",
|
||||
url: selected ? "/pages/coin/index?tab=vip" : "/pages/coin/nearby-stores?tab=vip",
|
||||
});
|
||||
};
|
||||
const showCoinEntry = ref(false);
|
||||
const storeVipLabel = ref("加载中");
|
||||
const storeVipFailed = ref(false);
|
||||
let entryRequest = 0;
|
||||
const loadCoinEntryVisibility = async () => {
|
||||
const requestId = ++entryRequest;
|
||||
showCoinEntry.value = false;
|
||||
storeVipFailed.value = false;
|
||||
storeVipLabel.value = "加载中";
|
||||
try {
|
||||
const result = await getMyGoldAPI();
|
||||
if (requestId !== entryRequest) return;
|
||||
showCoinEntry.value = result?.hasTempBind === true;
|
||||
if (!showCoinEntry.value) return;
|
||||
try {
|
||||
const active = await hasAnyStoreVip();
|
||||
if (requestId !== entryRequest) return;
|
||||
storeVipLabel.value = active ? "VIP已开通" : "VIP未开通";
|
||||
} catch (error) {
|
||||
if (requestId !== entryRequest) return;
|
||||
storeVipLabel.value = "加载失败,重试";
|
||||
storeVipFailed.value = true;
|
||||
console.error("加载入口门店VIP失败", error);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("加载金币入口状态失败", error);
|
||||
}
|
||||
};
|
||||
onShow(loadCoinEntryVisibility);
|
||||
const toBeVipPage = () => {
|
||||
uni.navigateTo({
|
||||
url: "/pages/member/be-vip",
|
||||
@@ -85,7 +107,6 @@ const logout = () => {
|
||||
updateUser();
|
||||
};
|
||||
onMounted(() => {
|
||||
loadCoinEntryVisibility();
|
||||
const accountInfo = uni.getAccountInfoSync();
|
||||
const envVersion = accountInfo.miniProgram.envVersion;
|
||||
if (envVersion !== "release") showLogout.value = true;
|
||||
@@ -127,9 +148,11 @@ const buildVersion = typeof __BUILD_TIME__ !== 'undefined' ? __BUILD_TIME__ : ''
|
||||
</UserItem>
|
||||
<UserItem
|
||||
v-if="showCoinEntry"
|
||||
title="我的金币"
|
||||
title="线下体验中心"
|
||||
:onClick="toCoinPage"
|
||||
/>
|
||||
>
|
||||
<text class="store-vip-label" @click.stop="storeVipFailed ? loadCoinEntryVisibility() : toCoinPage()">{{ storeVipLabel }}</text>
|
||||
</UserItem>
|
||||
<!-- <UserItem title="会员" :onClick="toBeVipPage">
|
||||
<view
|
||||
v-if="user.sVip === true"
|
||||
@@ -205,6 +228,7 @@ const buildVersion = typeof __BUILD_TIME__ !== 'undefined' ? __BUILD_TIME__ : ''
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.store-vip-label { padding: 4rpx 12rpx; border: 1rpx solid #999999; border-radius: 20rpx; font-size: 24rpx; }
|
||||
.container {
|
||||
background-color: #f5f5f5;
|
||||
height: calc(100% - 65px);
|
||||
|
||||
|
After Width: | Height: | Size: 458 B |
|
After Width: | Height: | Size: 27 KiB |
|
After Width: | Height: | Size: 23 KiB |
|
After Width: | Height: | Size: 20 KiB |
|
After Width: | Height: | Size: 22 KiB |
|
After Width: | Height: | Size: 152 KiB |
|
After Width: | Height: | Size: 162 KiB |
@@ -2,13 +2,23 @@ import protobuf from "protobufjs/minimal.js";
|
||||
|
||||
const { Reader, Writer } = protobuf;
|
||||
|
||||
// protobuf 会将这些 repeated 标量默认编码为 packed(length-delimited),
|
||||
// 同时也允许发送端使用逐项的 unpacked 编码。
|
||||
const PACKABLE_SCALAR_KINDS = new Set([
|
||||
"int32",
|
||||
"int64",
|
||||
"float",
|
||||
"double",
|
||||
"bool",
|
||||
]);
|
||||
|
||||
// 比赛服 protobuf 协议适配层:
|
||||
// 小程序环境不支持 protobufjs 反射模式里的动态 Function codegen,
|
||||
// 所以这里使用 minimal Reader/Writer 做静态字段解码和客户端消息编码。
|
||||
// <match-schema-generated>
|
||||
// 此区块由 scripts/generate-match-schema.mjs 自动生成,请勿手动修改。
|
||||
// 来源:src/utils/match.min.js(sha256: ec0371baeba9a9bf)
|
||||
// 协议命名空间:rpc;消息数:12;字段数:163
|
||||
// 来源:src/utils/match.min.js(sha256: 5b72fd5f9e087921)
|
||||
// 协议命名空间:rpc;消息数:12;字段数:164
|
||||
|
||||
export const ServerMessageType = {
|
||||
SERVER_MSG_UNKNOWN: 0,
|
||||
@@ -206,6 +216,7 @@ const SCHEMAS = {
|
||||
61: { name: "delta_qualified_rate", kind: "int32" },
|
||||
62: { name: "hit_rate", kind: "int32" },
|
||||
63: { name: "delta_hit_rate", kind: "int32" },
|
||||
64: { name: "random_ring_areas", kind: "int32", repeated: true },
|
||||
},
|
||||
MatchInfo: {
|
||||
1: { name: "match_id", kind: "string" },
|
||||
@@ -341,6 +352,20 @@ function readValue(reader, field) {
|
||||
return readScalar(reader, field.kind);
|
||||
}
|
||||
|
||||
function readPackedValues(reader, field) {
|
||||
const end = reader.uint32() + reader.pos;
|
||||
const values = [];
|
||||
|
||||
while (reader.pos < end) {
|
||||
values.push(readScalar(reader, field.kind));
|
||||
}
|
||||
if (reader.pos !== end) {
|
||||
throw new Error(`Invalid packed protobuf field: ${field.name}`);
|
||||
}
|
||||
|
||||
return values;
|
||||
}
|
||||
|
||||
function decodeMessage(schemaName, readerOrData, length) {
|
||||
const schema = SCHEMAS[schemaName];
|
||||
const reader =
|
||||
@@ -351,9 +376,10 @@ function decodeMessage(schemaName, readerOrData, length) {
|
||||
while (reader.pos < end) {
|
||||
const tag = reader.uint32();
|
||||
const field = schema[tag >>> 3];
|
||||
const wireType = tag & 7;
|
||||
|
||||
if (!field) {
|
||||
reader.skipType(tag & 7);
|
||||
reader.skipType(wireType);
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -365,6 +391,17 @@ function decodeMessage(schemaName, readerOrData, length) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (
|
||||
field.repeated &&
|
||||
PACKABLE_SCALAR_KINDS.has(field.kind) &&
|
||||
wireType === 2
|
||||
) {
|
||||
const values = message[field.name] || [];
|
||||
values.push(...readPackedValues(reader, field));
|
||||
message[field.name] = values;
|
||||
continue;
|
||||
}
|
||||
|
||||
const value = readValue(reader, field);
|
||||
|
||||
if (field.repeated) {
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
import { getStoreBenefitAPI, getStoreVipListAPI } from "@/apis";
|
||||
import useStore from "@/store";
|
||||
|
||||
// 按账号隔离最近选择,刷新登录令牌后仍可恢复同一门店。
|
||||
const selectionKey = () => {
|
||||
const version = uni.getAccountInfoSync().miniProgram.envVersion;
|
||||
return `${version}_experience_store_${useStore().user.id || "guest"}`;
|
||||
};
|
||||
|
||||
export const getSelectedExperienceStore = () => {
|
||||
const value = uni.getStorageSync(selectionKey());
|
||||
return value && /^\d+$/.test(String(value.id)) && Number(value.id) > 0
|
||||
? { id: String(value.id), name: String(value.name || "") }
|
||||
: null;
|
||||
};
|
||||
|
||||
export const rememberExperienceStore = (id, name) => {
|
||||
uni.setStorageSync(selectionKey(), { id: String(id), name });
|
||||
};
|
||||
|
||||
// 入口汇总所有门店;找到有效会员即可结束,未开通须查询完整列表。
|
||||
export const hasAnyStoreVip = async () => {
|
||||
const pageSize = 20;
|
||||
let received = 0;
|
||||
for (let page = 1; ; page += 1) {
|
||||
const result = await getStoreVipListAPI({ page, pageSize });
|
||||
const list = result?.list;
|
||||
if (!Array.isArray(list) || !Number.isSafeInteger(result.total) || result.total < 0) {
|
||||
throw new Error("门店会员列表响应格式异常");
|
||||
}
|
||||
if (list.some((item) => item?.isVip === true)) return true;
|
||||
if (list.some((item) => typeof item?.isVip !== "boolean")) {
|
||||
throw new Error("门店会员状态缺失");
|
||||
}
|
||||
received += list.length;
|
||||
if (received >= result.total) return false;
|
||||
// 列表尚未读完却返回空页时,不把不完整结果判为未开通。
|
||||
if (!list.length) throw new Error("门店会员列表分页异常");
|
||||
}
|
||||
};
|
||||
|
||||
// 只接受非负整数,缺失或异常值不能转换成“已用完”的 0 次。
|
||||
const normalizeRemaining = (benefit) => {
|
||||
const remain = benefit?.remain;
|
||||
return Number.isSafeInteger(remain) && remain >= 0 ? remain : "--";
|
||||
};
|
||||
|
||||
export const normalizeStoreMembership = (store) => {
|
||||
if (typeof store?.isVip !== "boolean") throw new Error("门店会员状态缺失");
|
||||
const active = store.isVip === true;
|
||||
return {
|
||||
active,
|
||||
cardImage: `https://static.shelingxingqiu.com/shootmini/static/coin/store-vip-card-${active ? "active" : "inactive"}.png`,
|
||||
expiresAt: active ? String(store.vipExpireAt || "").slice(0, 10).replace(/-/g, "/") || "--" : "",
|
||||
// 未开通或已过期统一为 0;有效会员逐项读取后端剩余次数。
|
||||
remaining: {
|
||||
trial: active ? normalizeRemaining(store.freeTrial) : 0,
|
||||
discount: active ? normalizeRemaining(store.discountPurchase) : 0,
|
||||
drink: active ? normalizeRemaining(store.drink) : 0,
|
||||
},
|
||||
};
|
||||
};
|
||||
|
||||
export const loadStoreMembership = async (storeId) => {
|
||||
const result = await getStoreBenefitAPI(storeId);
|
||||
if (String(result?.storeId) !== String(storeId)) {
|
||||
throw new Error("门店权益响应与当前门店不匹配");
|
||||
}
|
||||
return { name: result.storeName || "", ...normalizeStoreMembership(result) };
|
||||
};
|
||||