@@ -1 +1 @@
-Subproject commit aa9562c2e5674361ae5a9b8964040fd3d5f1688b
+Subproject commit 0f7cca4a0e1e3ef3bdd04762a312a910935900cb
@@ -156,6 +156,7 @@ const instruments: any = {
Melodica: '口风琴',
'Snare Drum': '小军鼓',
'Horn in F': '圆号',
+ 'Horns in F': '圆号',
Triangle: '三角铁',
Vibrato: '颤音琴',
'Suspend Cymbals': '吊镲',
@@ -3,7 +3,7 @@ const instrumentsClassfiy: any = {
"4": ["Clarinet"],
"6": ["Soprano Sax", "Alto Sax", "Tenor Sax", "Baritone Sax", "Soprano Saxophone", "Alto Saxophone", "Tenor Saxophone", "Baritone Saxophone"],
"12": ["Trumpet", "Muted Trumpet"],
- "13": ["Horn in F", "French Horn"],
+ "13": ["Horn in F", "French Horn", "Horns in F"],
"14": ["Trombone"],
"15": ["Euphonium"],
"17": ["Tuba"],
@@ -681,8 +681,8 @@ export const formatXML = (xml: string, xmlUrl?: string): string => {
for (const minute of minutes) {
let measureSpeed = minute.textContent ? Number(minute.textContent) : 0;
// 速度带附点,需要转换成不带附点的速度值
- const hasSpeedDot = Array.from(minute?.parentElement?.children || []).some((item: any) => item?.tagName === 'beat-unit-dot')
- measureSpeed = hasSpeedDot ? measureSpeed + measureSpeed/2 : measureSpeed;
+ // const hasSpeedDot = Array.from(minute?.parentElement?.children || []).some((item: any) => item?.tagName === 'beat-unit-dot')
+ // measureSpeed = hasSpeedDot ? measureSpeed + measureSpeed/2 : measureSpeed;
if (minute.textContent && measureSpeed) {
speeds.push(Number(measureSpeed))
}
@@ -179,6 +179,7 @@ export const mappingVoicePart = (id: number | string, soruce: "GYM" | "COLEXIU"
"Horn in F": 13,
"Horn in F 1": 13,
"Horn in F 2": 13,
+ "Horns in F": 13,
"Trombone 1": 14,
"Trombone 2": 14,
"Trombone 3": 14,
@@ -287,6 +288,7 @@ export const matchVoicePart = (id: number | string, type: "SINGLE" | "CONCERT"):