|
@@ -124,16 +124,17 @@ export function handlerModeChange(oldPlayType:"play"|"sing", oldPlaySource:IPlay
|
|
|
function modeChangeHandleTimes(oldPlayType:"play"|"sing", oldPlaySource:IPlayState){
|
|
|
const playType = state.playType
|
|
|
const playSource = state.playSource
|
|
|
- const {notBeatFixtime, xmlMp3BeatFixTime} = state.times[0]
|
|
|
+ const {notBeatFixtime, xmlMp3BeatFixTime, difftime} = state.times[0]
|
|
|
const { isOpenMetronome, isSingOpenMetronome } = state
|
|
|
// 演奏向演唱切
|
|
|
if(oldPlayType === "play"&&playType === "sing"){
|
|
|
if(playSource === "mingSong"){
|
|
|
- state.fixtime = 0
|
|
|
+ // 唱名文件也要加上弱起时间 他们制作曲子加了弱起时间
|
|
|
+ state.fixtime = difftime
|
|
|
state.times.map(item => {
|
|
|
- item.time = item.xmlNoteTime
|
|
|
- item.endtime = item.xmlNoteEndTime
|
|
|
- item.fixtime = 0
|
|
|
+ item.time = item.xmlNoteTime + difftime
|
|
|
+ item.endtime = item.xmlNoteEndTime + difftime
|
|
|
+ item.fixtime = difftime
|
|
|
})
|
|
|
return true
|
|
|
}else{
|
|
@@ -200,11 +201,12 @@ function modeChangeHandleTimes(oldPlayType:"play"|"sing", oldPlaySource:IPlaySta
|
|
|
// 演唱之间切换
|
|
|
// 切到唱名时候
|
|
|
if(playSource === "mingSong"){
|
|
|
- state.fixtime = 0
|
|
|
+ // 唱名文件也要加上弱起时间 他们制作曲子加了弱起时间
|
|
|
+ state.fixtime = difftime
|
|
|
state.times.map(item => {
|
|
|
- item.time = item.xmlNoteTime
|
|
|
- item.endtime = item.xmlNoteEndTime
|
|
|
- item.fixtime = 0
|
|
|
+ item.time = item.xmlNoteTime + difftime
|
|
|
+ item.endtime = item.xmlNoteEndTime + difftime
|
|
|
+ item.fixtime = difftime
|
|
|
})
|
|
|
return true
|
|
|
}else if(oldPlaySource === "mingSong"){
|