Browse Source

Merge branch 'feature-tianyong-newVersion' into ktyq-online-new

TIANYONG 2 months ago
parent
commit
178798b5b2
2 changed files with 12 additions and 12 deletions
  1. 1 1
      osmd-extended
  2. 11 11
      src/helpers/formateMusic.ts

+ 1 - 1
osmd-extended

@@ -1 +1 @@
-Subproject commit 9bc136b4113e3451a35779dbaba7c970c2b85be8
+Subproject commit 6f3a126f8a6c84adf3e40e32b0704003acd5e321

+ 11 - 11
src/helpers/formateMusic.ts

@@ -1259,17 +1259,17 @@ export const formateTimes = (osmd: OpenSheetMusicDisplay) => {
 			/**
 			 * TODO:摇篮曲-人音-排箫(1788501975122489346),第12小节音符持续时间特殊处理
 			*/
-			if (['1788501975122489346','1788502467554750466'].includes(state.cbsExamSongId)) {
-				if (i == 13) {
-					noteLength = noteLength / 2;
-				}
-				if (i == 44) {
-					noteLength = noteLength * 6;
-				}
-				if (i == 56) {
-					noteLength = noteLength * 4;
-				}
-			}
+			// if (['1788501975122489346','1788502467554750466'].includes(state.cbsExamSongId)) {
+			// 	if (i == 13) {
+			// 		noteLength = noteLength / 2;
+			// 	}
+			// 	if (i == 44) {
+			// 		noteLength = noteLength * 6;
+			// 	}
+			// 	if (i == 56) {
+			// 		noteLength = noteLength * 4;
+			// 	}
+			// }
 			usetime += noteLength;
 			relaMeasureLength += noteLength;
 			let relaEndtime = noteLength + relativeTime;