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

osmd-extended

@@ -1 +1 @@
-Subproject commit fb702c6947470a08ebf5221bc62a6a7921ee65af
+Subproject commit d38f84a71bd007582ff14d17c5cb247c3978dc9a

src/helpers/formateMusic.ts

@@ -991,12 +991,13 @@ export const formateTimes = (osmd: OpenSheetMusicDisplay) => {
 			note.maxNoteNum = maxNoteNum;
 			note.trackIndex = minIndex;
 			_notes.push({
+				measureNum: note?.sourceMeasure?.MeasureNumberXML,
 				note,
 				iterator: { ...iterator },
 				currentTime,
 				isDouble,
 				isMutileSubject,
-				measuresTempoInBPM: note?.sourceMeasure?.tempoInBPM
+				measuresTempoInBPM: note?.sourceMeasure?.tempoInBPM,
 			});
 		}
 		iterator.moveToNextVisibleVoiceEntry(false);

src/state.ts

@@ -1642,6 +1642,11 @@ const setState = (data: any, index: number) => {
   // state.enableEvaluation = data.isEvaluated ? true : false;
   state.examSongId = data.bizId + "";
   state.cbsExamSongId = data.id + "";
+  // 曲子：1795013331841662977，1.3.5.7跳房子带repeat，2.4.6.8跳房子带DC，该曲子需要特殊处理，需要传入自定义的跳转规则
+  if (state.examSongId == '1795013331841662977') {
+    ; (window as any).DYCustomHopscotch = [1,2,1,2,1,2,1,2]
+  }
+  ; (window as any).DYExamSongId = state.examSongId
   state.examSongName = data.name;
   state.coverImg = data.musicCover ?? "";
   // 如果是simple页面，只显示单轨