소스 검색

fix: #10295、#10294bug修复

TIANYONG 1 년 전
부모
커밋
2a7be73c7a
4개의 변경된 파일9개의 추가작업 그리고 5개의 파일을 삭제
  1. 1 1
      osmd-extended
  2. 1 1
      src/helpers/customMusicScore.ts
  3. 6 2
      src/helpers/formateMusic.ts
  4. 1 1
      src/state.ts

+ 1 - 1
osmd-extended

@@ -1 +1 @@
-Subproject commit a66f3376a9e2aef0048bcf812ef5240d6ec3b847
+Subproject commit 4e2e9dce29b9bf1b8a49f50452e231444512ee0e

+ 1 - 1
src/helpers/customMusicScore.ts

@@ -827,7 +827,7 @@ export const setGlobalMusicSheet = () => {
 	const customAccentItem = customAccentList.find(({id, part_index}) => {
 	  return id == state.cbsExamSongId && part_index == partIndex
 	})
-	if (customAccentItem) {
+	if (customAccentItem || state.isEvxml) {
 	  setGlobalData('customAccentItem', true)
 	}
 	/** 全声部声部 +  */

+ 6 - 2
src/helpers/formateMusic.ts

@@ -674,9 +674,13 @@ export const formatXML = (xml: string, xmlUrl?: string): string => {
 		if (measure.getElementsByTagName("words").length && state.isEvxml) {
 			const wordList = Array.from(measure.getElementsByTagName("words")) || [];
 			wordList.forEach((word: any) => {
-				if(hideSpeedWords.includes(word?.textContent) && word?.parentNode?.parentNode) {
+				// TODO:删除妙极客曲子无意义的words
+				if (word?.textContent && word?.parentNode?.parentNode) {
 					measure.removeChild(word.parentNode.parentNode);
 				}
+				// if(hideSpeedWords.includes(word?.textContent) && word?.parentNode?.parentNode) {
+				// 	measure.removeChild(word.parentNode.parentNode);
+				// }
 			})
 		}
 		if (measure.getElementsByTagName("note").length === 0) {
@@ -1165,7 +1169,7 @@ export const formateTimes = (osmd: OpenSheetMusicDisplay) => {
 			}
 			// console.log(note.sourceMeasure.MeasureNumberXML, note.sourceMeasure.verticalSourceStaffEntryContainers.length)
 			// console.log('👀看看endtime', nodeDetail.duration, relaEndtime, fixtime, i)
-			// console.log('音符时间',nodeDetail.i,nodeDetail.time)
+			// console.log('音符时间',nodeDetail.i,nodeDetail.time,nodeDetail.endtime)
 			tickables = tickables.filter((tickable: any) => tickable.attrs?.type !== "GhostNote")
 			const maxNum = (state.isCombineRender && note.maxNoteNum) ? note.maxNoteNum : tickables.length;
 			nodeDetail.noteLength = maxNum || 1;

+ 1 - 1
src/state.ts

@@ -503,7 +503,7 @@ const setStep = () => {
 };
 /** 开始播放 */
 export const onPlay = () => {
-  console.log("开始播放");
+  console.log("开始播放",'音频总时长:',getAudioDuration());
   state.playEnd = false;
   // offset_duration = browserInfo.xiaomi ? 0.2 : 0.08;
   offset_duration = 0.2;