Merge branch 'feat-audio2' into test
This commit is contained in:
@@ -89,6 +89,8 @@ export const audioFils = {
|
|||||||
"https://static.shelingxingqiu.com/attachment/2025-11-13/de7kzzllq0futwynso.mp3",
|
"https://static.shelingxingqiu.com/attachment/2025-11-13/de7kzzllq0futwynso.mp3",
|
||||||
练习开始:
|
练习开始:
|
||||||
"https://static.shelingxingqiu.com/attachment/2025-11-14/de88w0lmmt43nnfmoi.mp3",
|
"https://static.shelingxingqiu.com/attachment/2025-11-14/de88w0lmmt43nnfmoi.mp3",
|
||||||
|
练习结束:
|
||||||
|
"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/v4/v4/%E7%AE%AD%E9%A3%9E%E8%A1%8C.mp3",
|
"https://static.shelingxingqiu.com/shootaudio/v4/v4/%E7%AE%AD%E9%A3%9E%E8%A1%8C.mp3",
|
||||||
命中:
|
命中:
|
||||||
@@ -102,6 +104,7 @@ const AUDIO_WARM_PRIORITY_KEYS = [
|
|||||||
"点击按钮",
|
"点击按钮",
|
||||||
"比赛开始",
|
"比赛开始",
|
||||||
"练习开始",
|
"练习开始",
|
||||||
|
"练习结束",
|
||||||
"请开始射击",
|
"请开始射击",
|
||||||
"轮到你了",
|
"轮到你了",
|
||||||
"比赛结束",
|
"比赛结束",
|
||||||
|
|||||||
@@ -46,6 +46,10 @@ const props = defineProps({
|
|||||||
type: Function,
|
type: Function,
|
||||||
default: () => {},
|
default: () => {},
|
||||||
},
|
},
|
||||||
|
endAudioKey: {
|
||||||
|
type: String,
|
||||||
|
default: "比赛结束",
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
const barColor = ref("#fed847");
|
const barColor = ref("#fed847");
|
||||||
@@ -144,7 +148,7 @@ async function onReceiveMessage(msg) {
|
|||||||
halfTime.value = false;
|
halfTime.value = false;
|
||||||
audioManager.play(audioKey);
|
audioManager.play(audioKey);
|
||||||
} else if (msg.type === MESSAGETYPESV2.BattleEnd) {
|
} else if (msg.type === MESSAGETYPESV2.BattleEnd) {
|
||||||
audioManager.play("比赛结束", false);
|
audioManager.play(props.endAudioKey, false);
|
||||||
} else if (msg.type === MESSAGETYPESV2.ShootResult) {
|
} else if (msg.type === MESSAGETYPESV2.ShootResult) {
|
||||||
let arrow = {};
|
let arrow = {};
|
||||||
if (msg.details && Array.isArray(msg.details)) {
|
if (msg.details && Array.isArray(msg.details)) {
|
||||||
|
|||||||
@@ -450,6 +450,7 @@ onBeforeUnmount(() => {
|
|||||||
}`"
|
}`"
|
||||||
:start="start"
|
:start="start"
|
||||||
:onStop="onOver"
|
:onStop="onOver"
|
||||||
|
end-audio-key="练习结束"
|
||||||
/>
|
/>
|
||||||
<view class="user-row">
|
<view class="user-row">
|
||||||
<Avatar :src="user.avatar" :size="35" />
|
<Avatar :src="user.avatar" :size="35" />
|
||||||
|
|||||||
@@ -459,6 +459,7 @@ onBeforeUnmount(() => {
|
|||||||
:start="start"
|
:start="start"
|
||||||
:total="3600"
|
:total="3600"
|
||||||
:onStop="onOver"
|
:onStop="onOver"
|
||||||
|
end-audio-key="练习结束"
|
||||||
/>
|
/>
|
||||||
<view class="user-row">
|
<view class="user-row">
|
||||||
<Avatar :src="user.avatar" :size="35" />
|
<Avatar :src="user.avatar" :size="35" />
|
||||||
|
|||||||
Reference in New Issue
Block a user