|
|
@@ -76,6 +76,17 @@ export const headTopData = reactive({
|
|
|
});
|
|
|
return;
|
|
|
}
|
|
|
+ /* 当前是唱名的模式 */
|
|
|
+ if(state.playSource === "mingSong") {
|
|
|
+ const isModeChange = modeChangeHandleTimes("play","mingSong","play","music")
|
|
|
+ // 没有切换的时候 不处理下面的
|
|
|
+ if (isModeChange) {
|
|
|
+ try {
|
|
|
+ metronomeData.metro.calculation(state.times);
|
|
|
+ } catch (error) {}
|
|
|
+ console.log("重新之后的times", state.times, state.fixtime);
|
|
|
+ }
|
|
|
+ }
|
|
|
// 评测模式，只有一行谱模式
|
|
|
// if (!state.isSingleLine) {
|
|
|
// state.isSingleLine = true;
|
|
|
@@ -151,45 +162,34 @@ export async function handlerModeChange(oldPlayType: "play" | "sing", oldPlaySou
|
|
|
}
|
|
|
}
|
|
|
// 模式切换之后重新给times赋值
|
|
|
-function modeChangeHandleTimes(oldPlayType: "play" | "sing", oldPlaySource: IPlayState) {
|
|
|
- const playType = state.playType;
|
|
|
- const playSource = state.playSource;
|
|
|
+function modeChangeHandleTimes(oldPlayType: "play" | "sing", oldPlaySource: IPlayState, nowPlayType?:"play" | "sing", nowPlaySource?: IPlayState) {
|
|
|
+ const playType = nowPlayType || state.playType;
|
|
|
+ const playSource = nowPlaySource || state.playSource;
|
|
|
const { notBeatFixtime, xmlMp3BeatFixTime, difftime } = state.times[0];
|
|
|
const { isOpenMetronome, isSingOpenMetronome } = state;
|
|
|
- // 演奏向演唱切
|
|
|
- if (oldPlayType === "play" && playType === "sing") {
|
|
|
- if (playSource === "mingSong") {
|
|
|
- // 唱名文件也要加上弱起时间 他们制作曲子加了弱起时间 注意这修改了之后给总控平台的时值也需要改
|
|
|
- state.fixtime = difftime;
|
|
|
- state.times.map((item) => {
|
|
|
- item.time = item.xmlNoteTime + difftime;
|
|
|
- item.endtime = item.xmlNoteEndTime + difftime;
|
|
|
- item.fixtime = difftime;
|
|
|
- });
|
|
|
- return true;
|
|
|
- } else {
|
|
|
- //演奏开了节拍器，演唱没开节拍器
|
|
|
- if (isOpenMetronome && !isSingOpenMetronome) {
|
|
|
- state.fixtime = notBeatFixtime;
|
|
|
- state.times.map((item) => {
|
|
|
- item.time = item.notBeatTime;
|
|
|
- item.endtime = item.notBeatEndTime;
|
|
|
- item.fixtime = notBeatFixtime;
|
|
|
- });
|
|
|
- return true;
|
|
|
- } else if (!isOpenMetronome && isSingOpenMetronome) {
|
|
|
- state.fixtime = notBeatFixtime + xmlMp3BeatFixTime;
|
|
|
- state.times.map((item) => {
|
|
|
- item.time = item.notBeatTime + xmlMp3BeatFixTime;
|
|
|
- item.endtime = item.notBeatEndTime + xmlMp3BeatFixTime;
|
|
|
- item.fixtime = notBeatFixtime + xmlMp3BeatFixTime;
|
|
|
- });
|
|
|
- return true;
|
|
|
- }
|
|
|
- }
|
|
|
- } else if (oldPlayType === "sing" && playType === "play") {
|
|
|
- // 演唱向演奏切
|
|
|
- if (oldPlaySource === "mingSong") {
|
|
|
+ // 因为演奏加了唱名，所以往跟练模式切换和评测模式切换的时候，刷新谱面的时候需要更新时值，这时候调用handleRessetState 会回到练习模式,这里是
|
|
|
+ if(state.modeType === "follow" || state.modeType === "evaluating") {
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ // 当相同时候也不处理
|
|
|
+ if(oldPlayType === playType && oldPlaySource === playSource) {
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ // 原声向伴奏和伴奏向原声不处理 范唱向伴唱和伴唱向范唱切不处理
|
|
|
+ if((oldPlaySource==="music"&&playSource==="background")||(oldPlaySource==="background"&&playSource==="music")){
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ // 唱名到唱名时候不处理
|
|
|
+ if(oldPlaySource === "mingSong" && playSource === "mingSong"){
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ // 原生伴奏向范唱伴唱，范唱伴唱向原生伴奏时候，isSingOpenMetronome和isOpenMetronome相等时候不处理
|
|
|
+ if(["music","background"].includes(oldPlaySource)&&["music","background"].includes(playSource)&&isOpenMetronome===isSingOpenMetronome){
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ // 当切为 原生伴奏，或者范唱伴唱 时候
|
|
|
+ if(playSource==="music" || playSource ==="background"){
|
|
|
+ if(playType === "play"){
|
|
|
// 有节拍器
|
|
|
if (isOpenMetronome) {
|
|
|
state.fixtime = notBeatFixtime + xmlMp3BeatFixTime;
|
|
|
@@ -209,37 +209,7 @@ function modeChangeHandleTimes(oldPlayType: "play" | "sing", oldPlaySource: IPla
|
|
|
return true;
|
|
|
}
|
|
|
}
|
|
|
- // 演奏开了节拍器，演唱没开节拍器
|
|
|
- if (isOpenMetronome && !isSingOpenMetronome) {
|
|
|
- state.fixtime = notBeatFixtime + xmlMp3BeatFixTime;
|
|
|
- state.times.map((item) => {
|
|
|
- item.time = item.notBeatTime + xmlMp3BeatFixTime;
|
|
|
- item.endtime = item.notBeatEndTime + xmlMp3BeatFixTime;
|
|
|
- item.fixtime = notBeatFixtime + xmlMp3BeatFixTime;
|
|
|
- });
|
|
|
- return true;
|
|
|
- } else if (!isOpenMetronome && isSingOpenMetronome) {
|
|
|
- state.fixtime = notBeatFixtime;
|
|
|
- state.times.map((item) => {
|
|
|
- item.time = item.notBeatTime;
|
|
|
- item.endtime = item.notBeatEndTime;
|
|
|
- item.fixtime = notBeatFixtime;
|
|
|
- });
|
|
|
- return true;
|
|
|
- }
|
|
|
- } else if (oldPlayType === "sing" && playType === "sing") {
|
|
|
- // 演唱之间切换
|
|
|
- // 切到唱名时候
|
|
|
- if (playSource === "mingSong") {
|
|
|
- // 唱名文件也要加上弱起时间 他们制作曲子加了弱起时间 注意这修改了之后给总控平台的时值也需要改
|
|
|
- state.fixtime = difftime;
|
|
|
- state.times.map((item) => {
|
|
|
- item.time = item.xmlNoteTime + difftime;
|
|
|
- item.endtime = item.xmlNoteEndTime + difftime;
|
|
|
- item.fixtime = difftime;
|
|
|
- });
|
|
|
- return true;
|
|
|
- } else if (oldPlaySource === "mingSong") {
|
|
|
+ if(playType==="sing"){
|
|
|
// 有节拍器
|
|
|
if (isSingOpenMetronome) {
|
|
|
state.fixtime = notBeatFixtime + xmlMp3BeatFixTime;
|
|
|
@@ -260,6 +230,17 @@ function modeChangeHandleTimes(oldPlayType: "play" | "sing", oldPlaySource: IPla
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ // 当切为唱名时候
|
|
|
+ if(playSource==="mingSong"){
|
|
|
+ // 唱名文件也要加上弱起时间 他们制作曲子加了弱起时间 注意这修改了之后给总控平台的时值也需要改
|
|
|
+ state.fixtime = difftime;
|
|
|
+ state.times.map((item) => {
|
|
|
+ item.time = item.xmlNoteTime + difftime;
|
|
|
+ item.endtime = item.xmlNoteEndTime + difftime;
|
|
|
+ item.fixtime = difftime;
|
|
|
+ });
|
|
|
+ return true;
|
|
|
+ }
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
@@ -404,6 +385,11 @@ export default defineComponent({
|
|
|
});
|
|
|
/** 播放类型按钮 */
|
|
|
const playTypeBtn = computed(() => {
|
|
|
+ // 管乐迷没有演唱模式，
|
|
|
+ return {
|
|
|
+ disabled: false,
|
|
|
+ display: false,
|
|
|
+ }
|
|
|
// 选择模式,跟练模式,评测模式 不显示
|
|
|
//if (headTopData.modeType !== "show" || state.modeType === "follow" || state.modeType === "evaluating" || state.isHomeWork) return { display: false, disabled: false };
|
|
|
if (state.modeType === "follow" || state.modeType === "evaluating" || state.isHomeWork) return { display: false, disabled: false };
|
|
|
@@ -815,7 +801,13 @@ export default defineComponent({
|
|
|
const oldPlayType = state.playType;
|
|
|
const oldPlaySource = state.playSource;
|
|
|
if (state.playType === "play") {
|
|
|
- state.playSource = state.playSource === "music" ? "background" : "music";
|
|
|
+ if (state.playSource === "music") {
|
|
|
+ state.playSource = state.accompany ? "background" : "mingSong";
|
|
|
+ } else if (state.playSource === "background") {
|
|
|
+ state.playSource = state.mingSong ? "mingSong" : "music";
|
|
|
+ } else {
|
|
|
+ state.playSource = state.music ? "music" : "background";
|
|
|
+ }
|
|
|
} else {
|
|
|
if (state.playSource === "music") {
|
|
|
state.playSource = state.banSong ? "background" : "mingSong";
|
|
|
@@ -832,7 +824,7 @@ export default defineComponent({
|
|
|
state.music = ""
|
|
|
}
|
|
|
showToast({
|
|
|
- message: state.playType === "play" ? (state.playSource === "music" ? "已切换为原声" : "已切换为伴奏") : state.playSource === "music" ? "已切换为范唱" : state.playSource === "background" ? "已切换为伴唱" : "已切换为唱名",
|
|
|
+ message: state.playType === "play" ? (state.playSource === "music" ? "已切换为原声" : state.playSource === "background" ? "已切换为伴奏" : "已切换为唱名") : state.playSource === "music" ? "已切换为范唱" : state.playSource === "background" ? "已切换为伴唱" : "已切换为唱名",
|
|
|
position: "top",
|
|
|
className: "selectionToast",
|
|
|
});
|
|
|
@@ -840,7 +832,7 @@ export default defineComponent({
|
|
|
>
|
|
|
<img style={{ display: state.playSource === "music" ? "" : "none" }} class={styles.iconBtn} src={state.playType === "play" ? headImg(`music.png`) : headImg(`music1.png`)} />
|
|
|
<img style={{ display: state.playSource === "background" ? "" : "none" }} class={styles.iconBtn} src={state.playType === "play" ? headImg(`background.png`) : headImg(`background1.png`)} />
|
|
|
- <img style={{ display: state.playSource === "mingSong" ? "" : "none" }} class={styles.iconBtn} src={headImg(`mingsong.png`)} />
|
|
|
+ <img style={{ display: state.playSource === "mingSong" ? "" : "none" }} class={styles.iconBtn} src={headImg(`ming_icon.png`)} />
|
|
|
<span>{state.playSource === "music" ? (state.playType === "play" ? "原声" : "范唱") : state.playSource === "background" ? (state.playType === "play" ? "伴奏" : "伴唱") : "唱名"}</span>
|
|
|
</div>
|
|
|
<div
|
TIANYONG