Home Esplora Aiuto
Accedi
tianyong
/
gym-music-score
1
0
Forka 0
File Problemi 0 Pull Requests 0 Wiki
Sfoglia il codice sorgente

Merge remote-tracking branch 'origin/hqyDev' into feature-tianyong

TIANYONG 2 mesi fa
parent
7941a52fd0 aee7fdc1d9
commit
2412fe633a
27 ha cambiato i file con 22 aggiunte e 40 eliminazioni
Visualizzazione separata Mostra Diff Stats
  1. 4 4
      dist/instrument.html
  2. 0 0
      dist/js/index-3e6df93f.js
  3. 1 1
      dist/js/index-99ddcd8a.js
  4. 0 0
      dist/js/index-aea818cb.js
  5. 0 0
      dist/js/index-cd8df457.js
  6. 0 0
      dist/js/index-edd91e59.js
  7. 0 0
      dist/js/index-legacy-00cb60ba.js
  8. 0 0
      dist/js/index-legacy-2e86f535.js
  9. 0 0
      dist/js/index-legacy-4ab44eaa.js
  10. 1 1
      dist/js/index-legacy-5ae05846.js
  11. 0 0
      dist/js/index-legacy-d2b596be.js
  12. 0 0
      dist/js/instrument-85ec1a1d.js
  13. 0 0
      dist/js/instrument-legacy-9f9eab3b.js
  14. 0 0
      dist/js/modeView-9ed9aae1.js
  15. 0 0
      dist/js/modeView-legacy-6addcbf4.js
  16. 0 0
      dist/js/modeView-legacy-76473d15.js
  17. 0 0
      dist/js/polyfills-858fb2ee.js
  18. 0 0
      dist/js/polyfills-legacy-1f76d399.js
  19. 1 0
      src/constant/instruments.ts
  20. 1 1
      src/constant/instrumentsClassfiy.ts
  21. 6 0
      src/helpers/calcSpeed.ts
  22. 0 25
      src/helpers/customMusicScore.ts
  23. 2 3
      src/page-instrument/simple-detail/index.tsx
  24. 2 3
      src/page-instrument/view-detail/index.tsx
  25. 2 2
      src/state.ts
  26. 2 0
      src/view/fingering/fingering-config.ts
  27. 0 0
      stats.html

+ 4 - 4
dist/instrument.html
Vedi File 

@@ -2,7 +2,7 @@
 
 <html lang="en">
 
 
 <head>
 
-  <script type="module" crossorigin src="./js/polyfills-0f8dda44.js"></script>
 
+  <script type="module" crossorigin src="./js/polyfills-858fb2ee.js"></script>
 
 
   <meta charset="UTF-8" />
 
   <meta name="viewport"
 
@@ -41,7 +41,7 @@
 
       })
 
     }
 
   </script>
 
-  <script type="module" crossorigin src="./js/instrument-2958d7ec.js"></script>
 
+  <script type="module" crossorigin src="./js/instrument-85ec1a1d.js"></script>
 
   <link rel="stylesheet" href="./css/instrument-f4164af0.css">
 
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
 
   <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
 
@@ -65,8 +65,8 @@
 
     var vConsole = new window.VConsole();
 
   </script>   -->
 
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
 
-  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-7ea27e1e.js"></script>
 
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-2a2ddf2b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-1f76d399.js"></script>
 
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-9f9eab3b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 
 </body>
 
 
 </html>

File diff suppressed because it is too large
+ 0 - 0
dist/js/index-3e6df93f.js


+ 1 - 1
dist/js/index-579920f7.js → dist/js/index-99ddcd8a.js
Vedi File 

@@ -1 +1 @@
 
-import{d as i,g as l,r as d,E as e,o as r,s as c,b as s,M as u}from"./instrument-2958d7ec.js";const f="_skeleton_vtlsh_1",m="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:f,detail:m,container:p},y=i({name:"music-list",setup(){const n=l(),t=d({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:e.staff,base64:""},{state:!1,name:"首调",type:e.firstTone,base64:""},{state:!1,name:"固定调",type:e.fixedTone,base64:""}]});r(()=>{window.appName="colexiu",c.xmlUrl=n.xmlUrl,t.isLoading=!1});const o=async()=>{console.log("渲染完成")};return()=>s("div",{class:a.detail},[s("div",{id:"scrollContainer",class:[a.container,"hideCursor"]},[!t.isLoading&&s(u,{onRendered:o},null)])])}});export{y as default};
 
+import{d as i,g as l,r as d,E as e,o as r,s as c,b as s,M as u}from"./instrument-85ec1a1d.js";const f="_skeleton_vtlsh_1",m="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:f,detail:m,container:p},y=i({name:"music-list",setup(){const n=l(),t=d({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:e.staff,base64:""},{state:!1,name:"首调",type:e.firstTone,base64:""},{state:!1,name:"固定调",type:e.fixedTone,base64:""}]});r(()=>{window.appName="colexiu",c.xmlUrl=n.xmlUrl,t.isLoading=!1});const o=async()=>{console.log("渲染完成")};return()=>s("div",{class:a.detail},[s("div",{id:"scrollContainer",class:[a.container,"hideCursor"]},[!t.isLoading&&s(u,{onRendered:o},null)])])}});export{y as default};

File diff suppressed because it is too large
+ 0 - 0
dist/js/index-aea818cb.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/index-cd8df457.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/index-edd91e59.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/index-legacy-00cb60ba.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/index-legacy-2e86f535.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/index-legacy-4ab44eaa.js


+ 1 - 1
dist/js/index-legacy-f65aef84.js → dist/js/index-legacy-5ae05846.js
Vedi File 

@@ -1 +1 @@
 
-System.register(["./instrument-legacy-2a2ddf2b.js"],(function(e,t){"use strict";var i,n,a,o,r,s,l,d,c=document.createElement("style");return c.textContent="._skeleton_vtlsh_1{position:fixed;left:0;top:0;width:100vw;height:100vh;padding:.53333rem .8rem;background-color:#fff;z-index:1000;--van-skeleton-paragraph-height: .8rem}._detail_vtlsh_12{width:100vw;height:100vh;overflow:hidden;overflow-y:auto;--header-height: 1.65333rem;background:var(--container-background)}._detail_vtlsh_12 ._container_vtlsh_20{margin:0 .26667rem;border-radius:.26667rem}._detail_vtlsh_12 #musicAndSelection{overflow:initial!important;height:initial!important;max-height:initial!important}\n",document.head.appendChild(c),{setters:[e=>{i=e.d,n=e.g,a=e.r,o=e.E,r=e.o,s=e.s,l=e.b,d=e.M}],execute:function(){const t="_detail_vtlsh_12",c="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),i=a({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:o.staff,base64:""},{state:!1,name:"首调",type:o.firstTone,base64:""},{state:!1,name:"固定调",type:o.fixedTone,base64:""}]});r((()=>{window.appName="colexiu",s.xmlUrl=e.xmlUrl,i.isLoading=!1}));const h=async()=>{console.log("渲染完成")};return()=>l("div",{class:t},[l("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&l(d,{onRendered:h},null)])])}}))}}}));
 
+System.register(["./instrument-legacy-9f9eab3b.js"],(function(e,t){"use strict";var i,n,a,o,r,s,l,d,c=document.createElement("style");return c.textContent="._skeleton_vtlsh_1{position:fixed;left:0;top:0;width:100vw;height:100vh;padding:.53333rem .8rem;background-color:#fff;z-index:1000;--van-skeleton-paragraph-height: .8rem}._detail_vtlsh_12{width:100vw;height:100vh;overflow:hidden;overflow-y:auto;--header-height: 1.65333rem;background:var(--container-background)}._detail_vtlsh_12 ._container_vtlsh_20{margin:0 .26667rem;border-radius:.26667rem}._detail_vtlsh_12 #musicAndSelection{overflow:initial!important;height:initial!important;max-height:initial!important}\n",document.head.appendChild(c),{setters:[e=>{i=e.d,n=e.g,a=e.r,o=e.E,r=e.o,s=e.s,l=e.b,d=e.M}],execute:function(){const t="_detail_vtlsh_12",c="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),i=a({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:o.staff,base64:""},{state:!1,name:"首调",type:o.firstTone,base64:""},{state:!1,name:"固定调",type:o.fixedTone,base64:""}]});r((()=>{window.appName="colexiu",s.xmlUrl=e.xmlUrl,i.isLoading=!1}));const h=async()=>{console.log("渲染完成")};return()=>l("div",{class:t},[l("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&l(d,{onRendered:h},null)])])}}))}}}));

File diff suppressed because it is too large
+ 0 - 0
dist/js/index-legacy-d2b596be.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/instrument-85ec1a1d.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/instrument-legacy-9f9eab3b.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/modeView-9ed9aae1.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/modeView-legacy-6addcbf4.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/modeView-legacy-76473d15.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/polyfills-858fb2ee.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/polyfills-legacy-1f76d399.js


+ 1 - 0
src/constant/instruments.ts
Vedi File 

@@ -156,6 +156,7 @@ const instruments: any = {
 
 	Melodica: '口风琴',
 
 	'Snare Drum': '小军鼓',
 
 	'Horn in F': '圆号',
 
+	'Horns in F': '圆号',
 
 	Triangle: '三角铁',
 
 	Vibrato: '颤音琴',
 
 	'Suspend Cymbals': '吊镲',

+ 1 - 1
src/constant/instrumentsClassfiy.ts
Vedi File 

@@ -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"],

+ 6 - 0
src/helpers/calcSpeed.ts
Vedi File 

@@ -43,6 +43,12 @@ export const speedInfo: { [key in string]: number } = {
 
 	faster: 1.333333333,
 
 	"molto allargando": 1.333333333,
 
 	stringendo: 0.8,
 
+	"poco a poco rit.": 1.333333333,
 
+	"rit. poco a poco": 1.333333333,
 
+	"Ritardando": 1.333333333,
 
+	"Ritenuto": 1.333333333,
 
+	"accelerate": 0.8,
 
+	"poco a poco accel.": 0.8,
 
 };
 
 
 /**

+ 0 - 25
src/helpers/customMusicScore.ts
Vedi File 

@@ -1073,34 +1073,9 @@ export const setGlobalMusicSheet = () => {
 
 	}
 
 }
 
 
-/** 设置自定义渐慢 */
 
-export const setCustomGradual = () => {
 
-	if (state.gradualTimes) {
 
-		const detailId = state.cbsExamSongId + "";
 
-		const partIndex = state.partIndex + "";
 
-		if (["12280"].includes(detailId) && ["24"].includes(partIndex)) {
 
-			state.gradualTimes["8"] = "00:26:10";
 
-			state.gradualTimes["66"] = "01:53:35";
 
-			state.gradualTimes["90"] = "02:41:40";
 
-		}
 
-	}
 
-};
 
-
 
 /** 设置自定义音符数据 */
 
 export const setCustomNoteRealValue = () => {
 
 	const detailId = state.cbsExamSongId + "";
 
-    const partIndex = state.partIndex + "";
 
-	if (["2670"].includes(detailId)) {
 
-		customData.customNoteRealValue = {
 
-			0: 0.03125,
 
-		};
 
-	}
 
-	if (["12673"].includes(detailId) && ['22'].includes(partIndex)) {
 
-		customData.customNoteRealValue = {
 
-			208: 0.125,
 
-		};
 
-	}
 
-
 
     if (["12667", "12673"].includes(detailId)){
 
         customData.customNoteCurrentTime = true
 
     }

+ 2 - 3
src/page-instrument/simple-detail/index.tsx
Vedi File 

@@ -6,7 +6,7 @@ import { getQuery } from "/src/utils/queryString";
 
 import { closeToast, showLoadingToast } from "vant";
 
 import store from "store";
 
 import { formateTimes } from "../../helpers/formateMusic";
 
-import { setCustomGradual, setCustomNoteRealValue } from "/src/helpers/customMusicScore"
 
+import { setCustomNoteRealValue } from "/src/helpers/customMusicScore"
 
 import { initSmoothAnimation, smoothAnimationState, destroySmoothAnimation, moveSmoothAnimationByPlayTime } from "../view-detail/smoothAnimation";
 
 import { api_cloudLoading, simple_musicPage } from "/src/helpers/communication";
 
 
@@ -125,8 +125,7 @@ export default defineComponent({
 
 			if (saveSpeed) {
 
 				handleSetSpeed(saveSpeed);
 
 			}
 
-			setCustomGradual();
 
-			setCustomNoteRealValue();
 
+			// setCustomNoteRealValue();
 
 			state.times = formateTimes(osmd);
 
 			console.log("🚀 ~ state.times:", state.times, state);
 
 			nextTick(() => {

+ 2 - 3
src/page-instrument/view-detail/index.tsx
Vedi File 

@@ -27,7 +27,7 @@ import TheMusicList, { isMusicList } from "../component/the-music-list";
 
 import { storeData } from "/src/store";
 
 import ViewFigner from "../view-figner";
 
 import ToggleMusicSheet from "/src/view/plugins/toggleMusicSheet";
 
-import { setCustomGradual, setCustomNoteRealValue } from "/src/helpers/customMusicScore";
 
+import { setCustomNoteRealValue } from "/src/helpers/customMusicScore";
 
 import { usePageVisibility } from "@vant/use";
 
 import { initMidi } from "/src/helpers/midiPlay";
 
 import TheAudio from "/src/components/the-audio";
 
@@ -240,8 +240,7 @@ export default defineComponent({
 
       // if (saveSpeed) {
 
       //   handleSetSpeed(saveSpeed);
 
       // }
 
-      setCustomGradual();
 
-      setCustomNoteRealValue();
 
+      // setCustomNoteRealValue();
 
       state.times = formateTimes(osmd);
 
       // state.times = resetFrequency(state.times);
 
       state.times = setNoteHalfTone(state.times);

+ 2 - 2
src/state.ts
Vedi File 

@@ -1501,7 +1501,7 @@ const getMusicInfo = async (res: any) => {
 
   /* 获取声轨列表 */
 
   const tracks = xmlToTracks(xmlString)
 
   // 是否显示节拍器  (管乐迷 默认显示节拍器)
 
-  //state.isMixBeat = res.data?.isMixBeat  
+  state.isMixBeat = res.data?.isMixBeat  
   /* 设置partIndex */
 
   let partIndexs = query["part-index"] ? query["part-index"].split(",") : ["-1"] // -1为partIndex没有值的时候
 
   // 如果传入的是part-name，需要将part-name转换成part-index
 
@@ -1720,7 +1720,7 @@ function initMusicSource(data: any, tracks: string[], partIndex: number, workRec
 
   }
 
    /*  目前 管乐迷没有用到 后台生成的节拍器 */
 
   // 当使用节拍器的时候才加载节拍器音频
 
-  if(state.isMixBeat && false) {
 
+  if(state.isMixBeat) {
 
     Object.assign(state.beatSong, {
 
       music: musicObj?.audioBeatMixUrl,
 
       accompany: accompanyObj?.audioBeatMixUrl,

+ 2 - 0
src/view/fingering/fingering-config.ts
Vedi File 

@@ -180,6 +180,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,
 
@@ -292,6 +293,7 @@ export const matchVoicePart = (id: number | string, type: "SINGLE" | "CONCERT"):
 
       "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,

File diff suppressed because it is too large
+ 0 - 0
stats.html


Some files were not shown because too many files changed in this diff