Merge branch '2023-8-14_指法预览' into online

src/page-instrument/component/mode-type-mode/index.tsx

@@ -92,7 +92,7 @@ export default defineComponent({
 					{data.showPC && headTopData.modeType === "init" ? <TeacherBootom></TeacherBootom> : null}
 					{data.showStudent && headTopData.modeType === "init" ? <StudentBottom></StudentBottom> : null}
 					{data.showVip && headTopData.modeType === "init" && <TheVip />}
-					{headTopData.modeType === 'show' && state.modeType !== 'evaluating' && <GuideIndex list={['detail']} />}
+					{headTopData.modeType === 'show' && state.modeType !== 'evaluating' && state.fingeringInfo?.name && <GuideIndex list={['detail']} />}
 				</div>
 			</>
 		);

src/page-instrument/view-figner/index.module.less

@@ -59,7 +59,7 @@
         top: 0;
         left: 0;
         padding-left: 33px;
-        padding-top: 25px;
+        padding-top: 30px;
         display: flex;
         align-items: center;
 
@@ -89,7 +89,7 @@
     .rightBtn {
         position: absolute;
         right: 23px;
-        top: 20px;
+        top: 25px;
         display: flex;
         align-items: center;
         justify-content: space-evenly;
@@ -158,6 +158,7 @@
         flex-direction: column;
         background: url('./image/icon_bg_v.png') no-repeat;
         background-size: cover;
+        background-position-y: -3px;
 
         .tips {
             height: 238px;

src/view/figner-preview/index.ts

@@ -1426,7 +1426,40 @@ export const FIGNER_INSTRUMENT_DATA: { [_: string]: IFIGNER_INSTRUMENT_DATA } =
 					"单吐是用舌尖顶住上牙的牙根，用气息轻轻地把舌尖冲开，待声音发出后舌尖有弹性地返回到原来的位置，这时舌尖就像一个通气阀门，如果我们让它发出声音就像发“嘟”音的感觉。在有连线的地方只有第一个音采用单吐的技法，后面的音不再做吐音，只接前面“嘟”音的尾音发出“呜”音，整个连线里面的音就像“嘟呜”的。",
 			},
 		],
-		tones: [],
+		tones: [
+			{
+				key: 1,
+				name: "C",
+				octave: 5,
+				step: 0,
+				realKey: 0,
+				realName: "",	
+			},
+			{
+				key: 4,
+				name: "F",
+				octave: 4,
+				step: -1,
+				realKey: 0,
+				realName: "F4",	
+			},
+			{
+				key: 2,
+				name: "D",
+				octave: 4,
+				step: -1,
+				realKey: 0,
+				realName: "D4",	
+			},
+			{
+				key: 5,
+				name: "G",
+				octave: 4,
+				step: -1,
+				realKey: 0,
+				realName: "G4",	
+			},
+		],
 		list: [
 			{
 				key: 1,
@@ -1656,6 +1689,693 @@ export const FIGNER_INSTRUMENT_DATA: { [_: string]: IFIGNER_INSTRUMENT_DATA } =
 				realName: "D7",
 			},
 		],
+		listF4: [
+			{
+				key: 5,
+				step: -1,
+				name: "C",
+				octave: 5,
+				realKey: 60,
+				realName: "C5",
+			},
+			{
+				key: 5,
+				step: -1,
+				mark: "rise",
+				name: "D",
+				octave: 5,
+				realKey: 61,
+				realName: "Db5",
+			},
+			{
+				key: 6,
+				step: -1,
+				name: "D",
+				octave: 5,
+				realKey: 62,
+				realName: "D5",
+			},
+			{
+				key: 6,
+				step: -1,
+				mark: "rise",
+				name: "E",
+				octave: 5,
+				realKey: 63,
+				realName: "Eb5",
+			},
+			{
+				key: 7,
+				step: -1,
+				name: "E",
+				octave: 5,
+				realKey: 64,
+				realName: "E5",
+			},
+			{
+				key: 1,
+				step: 0,
+				name: "F",
+				octave: 5,
+				realKey: 65,
+				realName: "F5",
+			},
+			{
+				key: 1,
+				step: 0,
+				mark: "rise",
+				name: "G",
+				octave: 5,
+				realKey: 66,
+				realName: "Gb5",
+			},
+			{
+				key: 2,
+				step: 0,
+				name: "G",
+				octave: 5,
+				realKey: 67,
+				realName: "G5",
+			},
+			{
+				key: 2,
+				step: 0,
+				mark: "rise",
+				name: "A",
+				octave: 5,
+				realKey: 68,
+				realName: "Ab5",
+			},
+			{
+				key: 3,
+				step: 0,
+				name: "A",
+				octave: 5,
+				realKey: 69,
+				realName: "A5",
+			},
+			{
+				key: 4,
+				step: 0,
+				name: "B",
+				octave: 5,
+				realKey: 70,
+				realName: "Bb5",
+			},
+			{
+				key: 4,
+				step: 0,
+				mark: 'rise',
+				name: "B",
+				octave: 5,
+				realKey: 71,
+				realName: "B5",
+			},
+			{
+				key: 5,
+				step: 0,
+				name: "C",
+				octave: 6,
+				realKey: 72,
+				realName: "C6",
+			},
+			{
+				key: 5,
+				step: 0,
+				mark: "rise",
+				name: "D",
+				octave: 6,
+				realKey: 73,
+				realName: "Db6",
+			},
+			{
+				key: 6,
+				step: 0,
+				name: "D",
+				octave: 6,
+				realKey: 74,
+				realName: "D6",
+			},
+			{
+				key: 6,
+				step: 0,
+				mark: "rise",
+				name: "E",
+				octave: 6,
+				realKey: 75,
+				realName: "Eb6",
+			},
+			{
+				key: 7,
+				step: 0,
+				name: "E",
+				octave: 6,
+				realKey: 76,
+				realName: "E6",
+			},
+			{
+				key: 1,
+				step: 1,
+				name: "F",
+				octave: 6,
+				realKey: 77,
+				realName: "F6",
+			},
+			{
+				key: 1,
+				step: 1,
+				mark: "rise",
+				name: "G",
+				octave: 6,
+				realKey: 78,
+				realName: "Gb6",
+			},
+			{
+				key: 2,
+				step: 1,
+				name: "G",
+				octave: 6,
+				realKey: 79,
+				realName: "G6",
+			},
+			{
+				key: 2,
+				step: 1,
+				mark: "rise",
+				name: "A",
+				octave: 6,
+				realKey: 80,
+				realName: "Ab6",
+			},
+			{
+				key: 3,
+				step: 1,
+				name: "A",
+				octave: 6,
+				realKey: 81,
+				realName: "A6",
+			},
+			{
+				key: 4,
+				step: 1,
+				name: "B",
+				octave: 6,
+				realKey: 82,
+				realName: "Bb6",
+			},
+			{
+				key: 4,
+				step: 1,
+				mark: 'rise',
+				name: "B",
+				octave: 6,
+				realKey: 83,
+				realName: "B6",
+			},
+			{
+				key: 5,
+				step: 1,
+				name: "C",
+				octave: 7,
+				realKey: 84,
+				realName: "C7",
+			},
+			{
+				key: 5,
+				step: 1,
+				name: "D",
+				mark: "rise",
+				octave: 7,
+				realKey: 85,
+				realName: "Db7",
+			},
+			{
+				key: 6,
+				step: 1,
+				name: "D",
+				octave: 7,
+				realKey: 86,
+				realName: "D7",
+			},
+		],
+		listD4: [
+			{
+				key: 6,
+				step: -1,
+				mark: 'rise',
+				name: "C",
+				octave: 5,
+				realKey: 60,
+				realName: "C5",
+			},
+			{
+				key: 7,
+				step: -1,
+				name: "D",
+				octave: 5,
+				realKey: 61,
+				realName: "Db5",
+			},
+			{
+				key: 1,
+				step: 0,
+				name: "D",
+				octave: 5,
+				realKey: 62,
+				realName: "D5",
+			},
+			{
+				key: 1,
+				step: 0,
+				mark: "rise",
+				name: "E",
+				octave: 5,
+				realKey: 63,
+				realName: "Eb5",
+			},
+			{
+				key: 2,
+				step: 0,
+				name: "E",
+				octave: 5,
+				realKey: 64,
+				realName: "E5",
+			},
+			{
+				key: 2,
+				step: 0,
+				mark: "rise",
+				name: "F",
+				octave: 5,
+				realKey: 65,
+				realName: "F5",
+			},
+			{
+				key: 3,
+				step: 0,
+				name: "G",
+				octave: 5,
+				realKey: 66,
+				realName: "Gb5",
+			},
+			{
+				key: 4,
+				step: 0,
+				name: "G",
+				octave: 5,
+				realKey: 67,
+				realName: "G5",
+			},
+			{
+				key: 4,
+				step: 0,
+				mark: "rise",
+				name: "A",
+				octave: 5,
+				realKey: 68,
+				realName: "Ab5",
+			},
+			{
+				key: 5,
+				step: 0,
+				name: "A",
+				octave: 5,
+				realKey: 69,
+				realName: "A5",
+			},
+			{
+				key: 5,
+				step: 0,
+				mark: "rise",
+				name: "B",
+				octave: 5,
+				realKey: 70,
+				realName: "Bb5",
+			},
+			{
+				key: 6,
+				step: 0,
+				name: "B",
+				octave: 5,
+				realKey: 71,
+				realName: "B5",
+			},
+			{
+				key: 6,
+				step: 0,
+				mark: "rise",
+				name: "C",
+				octave: 6,
+				realKey: 72,
+				realName: "C6",
+			},
+			{
+				key: 7,
+				step: 0,
+				name: "D",
+				octave: 6,
+				realKey: 73,
+				realName: "Db6",
+			},
+			{
+				key: 1,
+				step: 1,
+				name: "D",
+				octave: 6,
+				realKey: 74,
+				realName: "D6",
+			},
+			{
+				key: 1,
+				step: 1,
+				mark: "rise",
+				name: "E",
+				octave: 6,
+				realKey: 75,
+				realName: "Eb6",
+			},
+			{
+				key: 2,
+				step: 1,
+				name: "E",
+				octave: 6,
+				realKey: 76,
+				realName: "E6",
+			},
+			{
+				key: 2,
+				step: 1,
+				mark: "rise",
+				name: "F",
+				octave: 6,
+				realKey: 77,
+				realName: "F6",
+			},
+			{
+				key: 3,
+				step: 1,
+				name: "G",
+				octave: 6,
+				realKey: 78,
+				realName: "Gb6",
+			},
+			{
+				key: 4,
+				step: 1,
+				name: "G",
+				octave: 6,
+				realKey: 79,
+				realName: "G6",
+			},
+			{
+				key: 4,
+				step: 1,
+				mark: "rise",
+				name: "A",
+				octave: 6,
+				realKey: 80,
+				realName: "Ab6",
+			},
+			{
+				key: 5,
+				step: 1,
+				name: "A",
+				octave: 6,
+				realKey: 81,
+				realName: "A6",
+			},
+			{
+				key: 5,
+				step: 1,
+				mark: "rise",
+				name: "B",
+				octave: 6,
+				realKey: 82,
+				realName: "Bb6",
+			},
+			{
+				key: 6,
+				step: 1,
+				name: "B",
+				octave: 6,
+				realKey: 83,
+				realName: "B6",
+			},
+			{
+				key: 6,
+				step: 1,
+				mark: "rise",
+				name: "C",
+				octave: 7,
+				realKey: 84,
+				realName: "C7",
+			},
+			{
+				key: 7,
+				step: 1,
+				name: "D",
+				octave: 7,
+				realKey: 85,
+				realName: "Db7",
+			},
+			{
+				key: 1,
+				step: 2,
+				name: "D",
+				octave: 7,
+				realKey: 86,
+				realName: "D7",
+			},
+		],
+		listG4: [
+			{
+				key: 4,
+				step: -1,
+				name: "C",
+				octave: 5,
+				realKey: 60,
+				realName: "C5",
+			},
+			{
+				key: 4,
+				step: -1,
+				mark: "rise",
+				name: "D",
+				octave: 5,
+				realKey: 61,
+				realName: "Db5",
+			},
+			{
+				key: 5,
+				step: -1,
+				name: "D",
+				octave: 5,
+				realKey: 62,
+				realName: "D5",
+			},
+			{
+				key: 5,
+				step: -1,
+				mark: "rise",
+				name: "E",
+				octave: 5,
+				realKey: 63,
+				realName: "Eb5",
+			},
+			{
+				key: 6,
+				step: -1,
+				name: "E",
+				octave: 5,
+				realKey: 64,
+				realName: "E5",
+			},
+			{
+				key: 6,
+				step: -1,
+				mark: "rise",
+				name: "F",
+				octave: 5,
+				realKey: 65,
+				realName: "F5",
+			},
+			{
+				key: 7,
+				step: -1,
+				name: "G",
+				octave: 5,
+				realKey: 66,
+				realName: "Gb5",
+			},
+			{
+				key: 1,
+				step: 0,
+				name: "G",
+				octave: 5,
+				realKey: 67,
+				realName: "G5",
+			},
+			{
+				key: 1,
+				step: 0,
+				mark: "rise",
+				name: "A",
+				octave: 5,
+				realKey: 68,
+				realName: "Ab5",
+			},
+			{
+				key: 2,
+				step: 0,
+				name: "A",
+				octave: 5,
+				realKey: 69,
+				realName: "A5",
+			},
+			{
+				key: 2,
+				step: 0,
+				mark: "rise",
+				name: "B",
+				octave: 5,
+				realKey: 70,
+				realName: "Bb5",
+			},
+			{
+				key: 3,
+				step: 0,
+				name: "B",
+				octave: 5,
+				realKey: 71,
+				realName: "B5",
+			},
+			{
+				key: 4,
+				step: 0,
+				name: "C",
+				octave: 6,
+				realKey: 72,
+				realName: "C6",
+			},
+			{
+				key: 4,
+				step: 0,
+				mark: "rise",
+				name: "D",
+				octave: 6,
+				realKey: 73,
+				realName: "Db6",
+			},
+			{
+				key: 5,
+				step: 0,
+				name: "D",
+				octave: 6,
+				realKey: 74,
+				realName: "D6",
+			},
+			{
+				key: 5,
+				step: 0,
+				mark: "rise",
+				name: "E",
+				octave: 6,
+				realKey: 75,
+				realName: "Eb6",
+			},
+			{
+				key: 6,
+				step: 0,
+				name: "E",
+				octave: 6,
+				realKey: 76,
+				realName: "E6",
+			},
+			{
+				key: 6,
+				step: 0,
+				mark: "rise",
+				name: "F",
+				octave: 6,
+				realKey: 77,
+				realName: "F6",
+			},
+			{
+				key: 7,
+				step: 0,
+				name: "G",
+				octave: 6,
+				realKey: 78,
+				realName: "Gb6",
+			},
+			{
+				key: 1,
+				step: 1,
+				name: "G",
+				octave: 6,
+				realKey: 79,
+				realName: "G6",
+			},
+			{
+				key: 1,
+				step: 1,
+				mark: "rise",
+				name: "A",
+				octave: 6,
+				realKey: 80,
+				realName: "Ab6",
+			},
+			{
+				key: 2,
+				step: 1,
+				name: "A",
+				octave: 6,
+				realKey: 81,
+				realName: "A6",
+			},
+			{
+				key: 2,
+				step: 1,
+				mark: "rise",
+				name: "B",
+				octave: 6,
+				realKey: 82,
+				realName: "Bb6",
+			},
+			{
+				key: 3,
+				step: 1,
+				name: "B",
+				octave: 6,
+				realKey: 83,
+				realName: "B6",
+			},
+			{
+				key: 4,
+				step: 1,
+				name: "C",
+				octave: 7,
+				realKey: 84,
+				realName: "C7",
+			},
+			{
+				key: 4,
+				step: 1,
+				name: "D",
+				mark: "rise",
+				octave: 7,
+				realKey: 85,
+				realName: "Db7",
+			},
+			{
+				key: 5,
+				step: 1,
+				name: "D",
+				octave: 7,
+				realKey: 86,
+				realName: "D7",
+			},
+		],
 	},
 	ocarina: {
 		tips: [