|
@@ -370,6 +370,8 @@ const state = reactive({
|
|
needTick: false,
|
|
needTick: false,
|
|
/** 演唱模式是否需要节拍器 */
|
|
/** 演唱模式是否需要节拍器 */
|
|
needSingTick: false,
|
|
needSingTick: false,
|
|
|
|
+ /** 是否能使用节拍器 */
|
|
|
|
+ isMixBeat: true,
|
|
/** 曲谱实例 */
|
|
/** 曲谱实例 */
|
|
osmd: null as unknown as OpenSheetMusicDisplay,
|
|
osmd: null as unknown as OpenSheetMusicDisplay,
|
|
/**是否是特殊乐谱类型, 主要针对管乐迷 */
|
|
/**是否是特殊乐谱类型, 主要针对管乐迷 */
|
|
@@ -1354,6 +1356,8 @@ const getMusicInfo = async (res: any) => {
|
|
state.isScoreRender = res.data?.isScoreRender
|
|
state.isScoreRender = res.data?.isScoreRender
|
|
// 是否默认显示总谱
|
|
// 是否默认显示总谱
|
|
state.defaultScoreRender = res.data?.defaultScoreRender
|
|
state.defaultScoreRender = res.data?.defaultScoreRender
|
|
|
|
+ // 是否显示节拍器
|
|
|
|
+ state.isMixBeat = res.data?.isMixBeat
|
|
let partIndex = query["part-index"] ? parseInt(query["part-index"]) : -1 // -1为partIndex没有值的时候
|
|
let partIndex = query["part-index"] ? parseInt(query["part-index"]) : -1 // -1为partIndex没有值的时候
|
|
// 如果是评测报告,会有默认的分轨index
|
|
// 如果是评测报告,会有默认的分轨index
|
|
if (state.isEvaluatReport) {
|
|
if (state.isEvaluatReport) {
|
|
@@ -1504,18 +1508,21 @@ function initMusicSource(data: any, tracks: string[], partIndex: number, workRec
|
|
state.mingSong = fanSongObj?.solmizationFileUrl
|
|
state.mingSong = fanSongObj?.solmizationFileUrl
|
|
state.mingSongGirl = fanSongObj?.femaleSolmizationFileUrl
|
|
state.mingSongGirl = fanSongObj?.femaleSolmizationFileUrl
|
|
}
|
|
}
|
|
- Object.assign(state.beatSong, {
|
|
|
|
- music: musicObj?.audioBeatMixUrl,
|
|
|
|
- accompany: accompanyObj?.audioBeatMixUrl,
|
|
|
|
- fanSong: fanSongObj?.audioBeatMixUrl,
|
|
|
|
- banSong: banSongObj?.audioBeatMixUrl
|
|
|
|
- })
|
|
|
|
- // 如果没有男唱名
|
|
|
|
- if(!fanSongObj?.solmizationBeatUrl){
|
|
|
|
- state.beatSong.mingSong = fanSongObj?.femaleSolmizationBeatUrl
|
|
|
|
- }else{
|
|
|
|
- state.beatSong.mingSong = fanSongObj?.solmizationBeatUrl
|
|
|
|
- state.beatSong.mingSongGirl = fanSongObj?.femaleSolmizationBeatUrl
|
|
|
|
|
|
+ // 当使用节拍器的时候才加载节拍器音频
|
|
|
|
+ if(state.isMixBeat) {
|
|
|
|
+ Object.assign(state.beatSong, {
|
|
|
|
+ music: musicObj?.audioBeatMixUrl,
|
|
|
|
+ accompany: accompanyObj?.audioBeatMixUrl,
|
|
|
|
+ fanSong: fanSongObj?.audioBeatMixUrl,
|
|
|
|
+ banSong: banSongObj?.audioBeatMixUrl
|
|
|
|
+ })
|
|
|
|
+ // 如果没有男唱名
|
|
|
|
+ if(!fanSongObj?.solmizationBeatUrl){
|
|
|
|
+ state.beatSong.mingSong = fanSongObj?.femaleSolmizationBeatUrl
|
|
|
|
+ }else{
|
|
|
|
+ state.beatSong.mingSong = fanSongObj?.solmizationBeatUrl
|
|
|
|
+ state.beatSong.mingSongGirl = fanSongObj?.femaleSolmizationBeatUrl
|
|
|
|
+ }
|
|
}
|
|
}
|
|
return {
|
|
return {
|
|
index,
|
|
index,
|