liushengqiang 1 năm trước cách đây
mục cha
commit
3abe60f190
28 tập tin đã thay đổi với 13 bổ sung4 xóa
  1. 3 3
      src/page-instrument/view-figner/index.tsx
  2. 8 1
      src/view/fingering/fingering-config.ts
  3. 0 0
      src/view/fingering/fingering-img/pan-flute/index.json
  4. 0 0
      src/view/fingering/fingering-img/pan-flute1/index.json
  5. 0 0
      src/view/fingering/fingering-img/pan-flute4/1.png
  6. 0 0
      src/view/fingering/fingering-img/pan-flute4/10.png
  7. 0 0
      src/view/fingering/fingering-img/pan-flute4/11.png
  8. 0 0
      src/view/fingering/fingering-img/pan-flute4/12.png
  9. 0 0
      src/view/fingering/fingering-img/pan-flute4/13.png
  10. 0 0
      src/view/fingering/fingering-img/pan-flute4/14.png
  11. 0 0
      src/view/fingering/fingering-img/pan-flute4/15.png
  12. 0 0
      src/view/fingering/fingering-img/pan-flute4/16.png
  13. 0 0
      src/view/fingering/fingering-img/pan-flute4/17.png
  14. 0 0
      src/view/fingering/fingering-img/pan-flute4/18.png
  15. 0 0
      src/view/fingering/fingering-img/pan-flute4/19.png
  16. 0 0
      src/view/fingering/fingering-img/pan-flute4/2.png
  17. 0 0
      src/view/fingering/fingering-img/pan-flute4/20.png
  18. 0 0
      src/view/fingering/fingering-img/pan-flute4/21.png
  19. 0 0
      src/view/fingering/fingering-img/pan-flute4/3.png
  20. 0 0
      src/view/fingering/fingering-img/pan-flute4/4.png
  21. 0 0
      src/view/fingering/fingering-img/pan-flute4/5.png
  22. 0 0
      src/view/fingering/fingering-img/pan-flute4/6.png
  23. 0 0
      src/view/fingering/fingering-img/pan-flute4/7.png
  24. 0 0
      src/view/fingering/fingering-img/pan-flute4/8.png
  25. 0 0
      src/view/fingering/fingering-img/pan-flute4/9.png
  26. 0 0
      src/view/fingering/fingering-img/pan-flute4/full.png
  27. 1 0
      src/view/fingering/fingering-img/pan-flute4/index.json
  28. 1 0
      src/view/fingering/index.tsx

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

@@ -64,7 +64,7 @@ export default defineComponent({
 			popupActiveTone: {} as IFIGNER_INSTRUMENT_Note,
 			activeToneName: "",
 			soundFonts: {} as any,
-			viewIndex: 0,
+			viewIndex: 1,
 			noteAudio: null as unknown as Howl,
 			transform: {
 				scale: 1,
@@ -353,8 +353,8 @@ export default defineComponent({
 									class={styles.baseBtn}
 									onClick={() => {
 										data.viewIndex++;
-										if (data.viewIndex > 3) {
-											data.viewIndex = 0;
+										if (data.viewIndex > 4) {
+											data.viewIndex = 1;
 										}
 										getFingeringData();
 									}}

+ 8 - 1
src/view/fingering/fingering-config.ts

@@ -43,6 +43,7 @@ export type IVocals =
 	| "pan-flute1"
 	| "pan-flute2"
 	| "pan-flute3"
+	| "pan-flute4"
 	| "ocarina"
 	| "melodica";
 
@@ -217,7 +218,7 @@ export const subjectFingering = (subjectId: number | string): IFingering => {
 			return {
 				name: "pan-flute",
 				direction: "transverse",
-				height: "2.6rem",
+				height: "2rem",
 				disabledFinger: true,
 				orientation: 0,
 				code: "排箫",
@@ -358,6 +359,12 @@ export const getFingeringConfig = async (type: IVocals | undefined): Promise<ITy
 				json: pan3.default,
 				relationship: relationships.pan,
 			};
+		case "pan-flute4":
+			const pan4 = await import(`./fingering-img/pan-flute4/index.json`);
+			return {
+				json: pan4.default,
+				relationship: relationships.pan,
+			};
 		case "ocarina":
 			const ocarina = await import(`./fingering-img/ocarina/index.json`);
 			return {

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
src/view/fingering/fingering-img/pan-flute/index.json


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
src/view/fingering/fingering-img/pan-flute1/index.json


+ 0 - 0
src/view/fingering/fingering-img/pan-flute1/1.png → src/view/fingering/fingering-img/pan-flute4/1.png


+ 0 - 0
src/view/fingering/fingering-img/pan-flute1/10.png → src/view/fingering/fingering-img/pan-flute4/10.png


+ 0 - 0
src/view/fingering/fingering-img/pan-flute1/11.png → src/view/fingering/fingering-img/pan-flute4/11.png


+ 0 - 0
src/view/fingering/fingering-img/pan-flute1/12.png → src/view/fingering/fingering-img/pan-flute4/12.png


+ 0 - 0
src/view/fingering/fingering-img/pan-flute1/13.png → src/view/fingering/fingering-img/pan-flute4/13.png


+ 0 - 0
src/view/fingering/fingering-img/pan-flute1/14.png → src/view/fingering/fingering-img/pan-flute4/14.png


+ 0 - 0
src/view/fingering/fingering-img/pan-flute1/15.png → src/view/fingering/fingering-img/pan-flute4/15.png


+ 0 - 0
src/view/fingering/fingering-img/pan-flute1/16.png → src/view/fingering/fingering-img/pan-flute4/16.png


+ 0 - 0
src/view/fingering/fingering-img/pan-flute1/17.png → src/view/fingering/fingering-img/pan-flute4/17.png


+ 0 - 0
src/view/fingering/fingering-img/pan-flute1/18.png → src/view/fingering/fingering-img/pan-flute4/18.png


+ 0 - 0
src/view/fingering/fingering-img/pan-flute1/19.png → src/view/fingering/fingering-img/pan-flute4/19.png


+ 0 - 0
src/view/fingering/fingering-img/pan-flute1/2.png → src/view/fingering/fingering-img/pan-flute4/2.png


+ 0 - 0
src/view/fingering/fingering-img/pan-flute1/20.png → src/view/fingering/fingering-img/pan-flute4/20.png


+ 0 - 0
src/view/fingering/fingering-img/pan-flute1/21.png → src/view/fingering/fingering-img/pan-flute4/21.png


+ 0 - 0
src/view/fingering/fingering-img/pan-flute1/3.png → src/view/fingering/fingering-img/pan-flute4/3.png


+ 0 - 0
src/view/fingering/fingering-img/pan-flute1/4.png → src/view/fingering/fingering-img/pan-flute4/4.png


+ 0 - 0
src/view/fingering/fingering-img/pan-flute1/5.png → src/view/fingering/fingering-img/pan-flute4/5.png


+ 0 - 0
src/view/fingering/fingering-img/pan-flute1/6.png → src/view/fingering/fingering-img/pan-flute4/6.png


+ 0 - 0
src/view/fingering/fingering-img/pan-flute1/7.png → src/view/fingering/fingering-img/pan-flute4/7.png


+ 0 - 0
src/view/fingering/fingering-img/pan-flute1/8.png → src/view/fingering/fingering-img/pan-flute4/8.png


+ 0 - 0
src/view/fingering/fingering-img/pan-flute1/9.png → src/view/fingering/fingering-img/pan-flute4/9.png


+ 0 - 0
src/view/fingering/fingering-img/pan-flute1/full.png → src/view/fingering/fingering-img/pan-flute4/full.png


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 0
src/view/fingering/fingering-img/pan-flute4/index.json


+ 1 - 0
src/view/fingering/index.tsx

@@ -14,6 +14,7 @@ export default defineComponent({
 		});
 		const getFingeringData = async () => {
 			fingerData.subject = await getFingeringConfig(state.fingeringInfo.name);
+			console.log("🚀 ~ fingerData.subject:", fingerData.subject)
 		};
 		onBeforeMount(() => {
 			getFingeringData();

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác