Merge branch 'fix-tianyong'

src/page-instrument/view-detail/index.tsx

@@ -90,6 +90,7 @@ export default defineComponent({
       }
     };
     onBeforeMount(() => {
+      console.time('渲染加载耗时')
       api_keepScreenLongLight();
       getAPPData();
       api_setStatusBarVisibility();
@@ -244,6 +245,7 @@ export default defineComponent({
       resetPlaybackToStart();
 
       pushAppMusic();
+      console.timeEnd('渲染加载耗时')
     };
     /** 指法配置 */
     const fingerConfig = computed<any>(() => {

src/page-instrument/view-figner/index.tsx

@@ -225,6 +225,7 @@ export default defineComponent({
           ocarina: 2,
           piccolo: 2,
           "hulusi-flute": 2,
+          "baroque-recorder": 2
         };
         data.viewTotal = o[data.subject] || 1;
         data.fingeringMode = "listenMode";
@@ -261,6 +262,7 @@ export default defineComponent({
         ocarina: 2,
         piccolo: 2,
         "hulusi-flute": 2,
+        "baroque-recorder": 2
       };
       data.viewTotal = o[data.subject] || 1;
       getFingeringData();

src/view/figner-preview/index.ts

@@ -5010,6 +5010,303 @@ export const FIGNER_INSTRUMENT_DATA: { [_: string]: IFIGNER_INSTRUMENT_DATA } =
 			},
 		],
 	},
+	"baroque-recorder": {
+		tips: [
+			{
+				key: 0,
+				name: "拿竖笛的方法",
+				octave: 0,
+				step: 0,
+				realKey: 0,
+				realName:
+					"把竖笛拿起来，然后放在嘴边，把它轻轻地放在你的唇间，并用你的手指拿稳。记住要把你的左手放在上边，有一个孔的背面应该正对着你，不要咬吹口或是让它碰到牙。",
+			},
+			{
+				key: 0,
+				name: "吹竖笛的力度",
+				octave: 0,
+				step: 0,
+				realKey: 0,
+				realName:
+					"向竖笛吹气，轻一点吹想象你在吹泡泡一样，控制气流的稳定并轻柔地吹奏，尝试用膈肌呼吸并确保你吹得均匀，这可以使声音稳定持续。",
+			},
+			{
+				key: 0,
+				name: "学习呼吸方法",
+				octave: 0,
+				step: 0,
+				realKey: 0,
+				realName:
+					"吹竖笛时，气息的控制是很关键的，气息分为缓吹法和急吹法，吸气要从鼻子和嘴角吸气，吸到胸部和腰部，小腹微微向里收，以使演奏有气息支持。",
+			},
+			{
+				key: 0,
+				name: "勤练习指法",
+				octave: 0,
+				step: 0,
+				realKey: 0,
+				realName:
+					"指法图是用来表示竖笛上的单音的，后背的孔叫0孔，从上到下依次为一孔、二孔、三孔、四孔、五孔、六孔、七孔，要吹奏简单的练习曲，必须要牢记单音的指法。",
+			},
+			{
+				key: 0,
+				name: "学习一些演奏技法",
+				octave: 0,
+				step: 0,
+				realKey: 0,
+				realName:
+					"单吐是用舌尖顶住上牙的牙根，用气息轻轻地把舌尖冲开，待声音发出后舌尖有弹性地返回到原来的位置，这时舌尖就像一个通气阀门，如果我们让它发出声音就像发“嘟”音的感觉。在有连线的地方只有第一个音采用单吐的技法，后面的音不再做吐音，只接前面“嘟”音的尾音发出“呜”音，整个连线里面的音就像“嘟呜”的。",
+			},
+		],
+		tones: [
+			{
+				key: 1,
+				name: "C",
+				octave: 5,
+				step: 0,
+				realKey: 0,
+				realName: "",	
+			}
+		],
+		list: [
+			{
+				key: 1,
+				name: "C",
+				octave: 5,
+				step: 0,
+				realKey: 60,
+				realName: "C5",
+			},
+			{
+				key: 2,
+				name: "D",
+				octave: 5,
+				step: 0,
+				realKey: 61,
+				mark: "fall",
+				realName: "Db5",
+			},
+			{
+				key: 2,
+				name: "D",
+				octave: 5,
+				step: 0,
+				realKey: 62,
+				realName: "D5",
+			},
+			{
+				key: 3,
+				name: "E",
+				octave: 5,
+				step: 0,
+				realKey: 63,
+				mark: "fall",
+				realName: "Eb5",
+			},
+			{
+				key: 3,
+				name: "E",
+				octave: 5,
+				step: 0,
+				realKey: 64,
+				realName: "E5",
+			},
+			{
+				key: 4,
+				name: "F",
+				octave: 5,
+				step: 0,
+				realKey: 65,
+				realName: "F5",
+			},
+			{
+				key: 5,
+				name: "G",
+				octave: 5,
+				step: 0,
+				realKey: 66,
+				mark: "fall",
+				realName: "Gb5",
+			},
+			{
+				key: 5,
+				name: "G",
+				octave: 5,
+				step: 0,
+				realKey: 67,
+				realName: "G5",
+			},
+			{
+				key: 6,
+				name: "A",
+				octave: 5,
+				step: 0,
+				realKey: 68,
+				mark: "fall",
+				realName: "Ab5",
+			},
+			{
+				key: 6,
+				name: "A",
+				octave: 5,
+				step: 0,
+				realKey: 69,
+				realName: "A5",
+			},
+			{
+				key: 7,
+				name: "B",
+				octave: 5,
+				step: 0,
+				realKey: 70,
+				mark: "fall",
+				realName: "Bb5",
+			},
+			{
+				key: 7,
+				name: "B",
+				octave: 5,
+				step: 0,
+				realKey: 71,
+				realName: "B5",
+			},
+			{
+				key: 1,
+				name: "C",
+				octave: 6,
+				step: 1,
+				realKey: 72,
+				realName: "C6",
+			},
+			{
+				key: 2,
+				name: "D",
+				octave: 6,
+				step: 1,
+				realKey: 73,
+				mark: "fall",
+				realName: "Db6",
+			},
+			{
+				key: 2,
+				name: "D",
+				octave: 6,
+				step: 1,
+				realKey: 74,
+				realName: "D6",
+			},
+			{
+				key: 3,
+				name: "E",
+				octave: 6,
+				step: 1,
+				realKey: 75,
+				mark: "fall",
+				realName: "Eb6",
+			},
+			{
+				key: 3,
+				name: "E",
+				octave: 6,
+				step: 1,
+				realKey: 76,
+				realName: "E6",
+			},
+			{
+				key: 4,
+				name: "F",
+				octave: 6,
+				step: 1,
+				realKey: 77,
+				realName: "F6",
+			},
+			{
+				key: 5,
+				name: "G",
+				octave: 6,
+				step: 1,
+				realKey: 78,
+				mark: "fall",
+				realName: "Gb6",
+			},
+			{
+				key: 5,
+				name: "G",
+				octave: 6,
+				step: 1,
+				realKey: 79,
+				realName: "G6",
+			},
+			{
+				key: 6,
+				name: "A",
+				octave: 6,
+				step: 1,
+				realKey: 80,
+				mark: "fall",
+				realName: "Ab6",
+			},
+			{
+				key: 6,
+				name: "A",
+				octave: 6,
+				step: 1,
+				realKey: 81,
+				realName: "A6",
+			},
+			{
+				key: 7,
+				name: "B",
+				octave: 6,
+				step: 1,
+				realKey: 82,
+				mark: "fall",
+				realName: "Bb6",
+			},
+			{
+				key: 7,
+				name: "B",
+				octave: 6,
+				step: 1,
+				realKey: 83,
+				realName: "B6",
+			},
+			{
+				key: 1,
+				name: "C",
+				octave: 7,
+				step: 2,
+				realKey: 84,
+				realName: "C7",
+			},
+			{
+				key: 2,
+				name: "D",
+				octave: 7,
+				step: 2,
+				realKey: 85,
+				mark: "fall",
+				realName: "Db7",
+			},
+			{
+				key: 2,
+				name: "D",
+				octave: 7,
+				step: 2,
+				realKey: 86,
+				realName: "D7",
+			},
+			{
+				key: 3,
+				name: "D",
+				octave: 7,
+				step: 2,
+				realKey: 87,
+				mark: "fall",
+				realName: "Db7",
+			},
+		],
+	},
 };
 
 

src/view/fingering/fingering-config.ts

@@ -52,7 +52,10 @@ export type IVocals =
   | "ocarina1"
   | "ocarina2"
   | "melodica"
-  | "melodica1";
+  | "melodica1"
+  | "baroque-recorder"
+  | "baroque-recorder1"
+  | "baroque-recorder2";
 
 /** 映射声部ID */
 export const mappingVoicePart = (id: number | string, soruce: "GYM" | "COLEXIU" | "ORCHESTRA" | "INSTRUMENT" | "ENSEMBLE"): number => {
@@ -116,6 +119,7 @@ export const mappingVoicePart = (id: number | string, soruce: "GYM" | "COLEXIU"
       ukulele: 130,
       mouthorgan: 140,
       piano: 150,
+	  baroquerecorder: 'baroque-recorder',
       4: "piccolo",
       3: "hulusi-flute",
       1: "pan-flute",
@@ -201,6 +205,7 @@ export const mappingVoicePart = (id: number | string, soruce: "GYM" | "COLEXIU"
       panpipes: "pan-flute",
       ocarina: "ocarina",
       nai: "melodica",
+	  BaroqueRecorder: 'baroque-recorder',
     };
     let _track;
     if (typeof code === "string") {
@@ -286,7 +291,7 @@ export const subjectFingering = (subjectId: number | string): IFingering => {
         orientation: 1,
         hasTizhi: true,
       };
-    case "piccolo": // 竖笛
+    case "piccolo": // 德式竖笛
       return {
         name: "piccolo",
         direction: "vertical",
@@ -333,6 +338,15 @@ export const subjectFingering = (subjectId: number | string): IFingering => {
         code: "口风琴",
         hasTizhi: false,
       };
+	case "baroque-recorder": // 英式竖笛
+	  return {
+		name: "baroque-recorder",
+		direction: "vertical",
+		width: "3rem",
+		orientation: 1,
+		code: "竖笛",
+		hasTizhi: true,
+	  };	  
     default:
       return {};
   }
@@ -533,7 +547,25 @@ export const getFingeringConfig = async (type: IVocals | undefined): Promise<ITy
           marginTop: "auto",
         },
       };
+	case "baroque-recorder":
+		const baroqueRecorder = await import(`./fingering-img/baroque-recorder/index.json`);
+		return {
+			json: baroqueRecorder.default,
+			relationship: relationships.baroqueRecorder,
+		};  	
+	case "baroque-recorder1":
+		const baroqueRecorder1 = await import(`./fingering-img/baroque-recorder1/index.json`);
+		return {
+			json: baroqueRecorder1.default,
+			relationship: relationships.baroqueRecorder,
+		};	
+	case "baroque-recorder2":
+		const baroqueRecorder2 = await import(`./fingering-img/baroque-recorder2/index.json`);
+		return {
+			json: baroqueRecorder2.default,
+			relationship: relationships.baroqueRecorder,
+		};			  
     default:
       return null;
   }
-};
+};

src/view/fingering/fingering-relationships.ts

@@ -385,8 +385,8 @@ const relationships = {
 		82: [1, 2, 33, 5, 6, 7],
 		83: [1, 2, 33, 5, 6],
 		84: [1, 2, 5, 6],
-		85: [1, 2, 4, 5, 7, 8],
-		86: [1, 2, 4, 5, 7, 88],
+		85: [1, 2, 4, 5, 7, 8, 100],
+		86: [1, 2, 4, 5, 7, 8],
 	},
 	"small-drum": {
 		0: ["active", "active-left", "active-right"],
@@ -492,6 +492,49 @@ const relationships = {
 		83: [18],
 		84: [19],
 	},
+	baroqueRecorder: { // 英式竖笛
+		// 0: [1, 2, 3, 4, 5, 6, 7, 8, 11, 33, 77, 88],
+		// 888: [11, 2, 33, 4, 5, 6, 7, 8],
+		60: [11, 2, 33, 4, 5, 6, 7, 8],
+		61: [11, 2, 33, 4, 5, 6, 7, 88],
+		62: [11, 2, 33, 4, 5, 6, 7],
+		63: [11, 2, 33, 4, 5, 6, 77],
+		64: [11, 2, 33, 4, 5, 6],
+		65: [11, 2, 33, 4, 5, 7, 8],
+		66: [11, 2, 33, 4, 6, 7],
+		67: [11, 2, 33, 4],
+		68: [11, 2, 33, 5, 6, 77],
+		69: [11, 2 ,33],
+		70: [11, 2, 4, 5],
+		71: [11, 2],
+		72: [11, 33],
+		73: [2, 33],
+		74: [33],
+		75: [ 33, 4, 5, 6, 7],
+		76: [1, 2, 33, 4, 5, 6],
+		77: [1, 2, 33, 4, 5, 7],
+		78: [1, 2, 33, 4, 6],
+		79: [1, 2, 33, 4],
+		80: [1, 2, 33, 5],
+		81: [1, 2, 33],
+		82: [1, 2, 33, 5, 6, 7],
+		83: [1, 2, 33, 5, 6],
+		84: [1, 2, 5, 6],
+		85: [1, 2, 4, 5, 7, 8, 100],
+		86: [1, 2, 4, 5, 7, 8],
+		87: [1, 2, 4],
+		88: [1, 2, 33, 4, 5, 6],
+		89: [1, 2, 33, 4, 5, 7],
+		90: [1, 2, 33, 4, 6],
+		91: [1, 2, 33, 4],
+		92: [1, 2, 33, 5],
+		93: [1, 2, 33],
+		94: [1, 2, 33, 5, 6, 7],
+		95: [1, 2, 33, 5, 6],
+		96: [1, 2, 5, 6],
+		97: [1, 2, 4, 5, 7, 8],
+		98: [1, 2, 4],
+	  },	
 };
 
 export default relationships;