lex 1 년 전
부모
커밋
2bdd4f7f08
47개의 변경된 파일247개의 추가작업 그리고 142개의 파일을 삭제
  1. 1 0
      dist/assets/colexiu-4800f254.js
  2. 1 0
      dist/assets/colexiu-a1da9db0.js
  3. 0 0
      dist/assets/colexiu-legacy-8a9ba280.js
  4. 1 0
      dist/assets/index-013a8120.js
  5. 5 0
      dist/assets/index-119f11bf.js
  6. 4 0
      dist/assets/index-2f9c1660.js
  7. 1 0
      dist/assets/index-386dfac4.js
  8. 0 0
      dist/assets/index-3d37081f.js
  9. 0 0
      dist/assets/index-4207a972.js
  10. 0 0
      dist/assets/index-463d1281.js
  11. 0 0
      dist/assets/index-5dd7b83e.js
  12. 0 0
      dist/assets/index-5f275932.js
  13. 1 0
      dist/assets/index-8dbe2b84.js
  14. 1 0
      dist/assets/index-99901fba.js
  15. 4 0
      dist/assets/index-9c91b34c.js
  16. 1 0
      dist/assets/index-ae5e0734.js
  17. 1 0
      dist/assets/index-e962ac39.js
  18. 5 0
      dist/assets/index-eae4561d.js
  19. 0 0
      dist/assets/index-legacy-036dfd2d.js
  20. 0 0
      dist/assets/index-legacy-29c19be0.js
  21. 1 0
      dist/assets/index-legacy-30d6fa3d.js
  22. 5 0
      dist/assets/index-legacy-33094569.js
  23. 0 0
      dist/assets/index-legacy-6e2fb054.js
  24. 1 0
      dist/assets/index-legacy-7ff12af0.js
  25. 0 0
      dist/assets/index-legacy-b1a0a124.js
  26. 0 0
      dist/assets/index-legacy-b1dc7712.js
  27. 0 0
      dist/assets/index-legacy-bd75ca43.js
  28. 1 0
      dist/assets/index-legacy-e3349ced.js
  29. 4 0
      dist/assets/index-legacy-fbf8f763.js
  30. 0 0
      dist/assets/index-legacy-ffff2a2a.js
  31. 1 0
      dist/assets/instrument-9695c76b.js
  32. 1 0
      dist/assets/instrument-c2c27ae2.js
  33. 1 0
      dist/assets/instrument-legacy-ae003d04.js
  34. 1 0
      dist/assets/instrument-legacy-b6e4961b.js
  35. 0 0
      dist/assets/orchestra-fc04e5ab.js
  36. 0 0
      dist/assets/orchestra-legacy-e579f785.js
  37. 1 0
      dist/assets/report-share-db8ebf2a.js
  38. 1 0
      dist/assets/report-share-ff1ecb1c.js
  39. 0 0
      dist/assets/report-share-legacy-656964f0.js
  40. 0 0
      dist/assets/vue3-lottie.es-9877d209.js
  41. 0 0
      dist/assets/vue3-lottie.es-legacy-bd1069b7.js
  42. 12 0
      dist/colexiu.html
  43. 13 0
      dist/index.html
  44. 13 0
      dist/instrument.html
  45. 14 0
      dist/orchestra.html
  46. 9 0
      dist/report-share.html
  47. 142 142
      src/state.ts

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/colexiu-4800f254.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/colexiu-a1da9db0.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/assets/colexiu-legacy-8a9ba280.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-013a8120.js


+ 5 - 0
dist/assets/index-119f11bf.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-2f9c1660.js
+import{d as i,E as l,U as d,bz as e,K as r,S as c,k as s,aI as u}from"./index-0b81392a.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,E as l,U as d,bz as e,K as r,S as c,k as s,aI as u}from"./index-3d37081f.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};
+>>>>>>>> online:dist/assets/index-119f11bf.js

+ 4 - 0
dist/assets/index-2f9c1660.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-2f9c1660.js
 import{d as i,E as l,U as d,bz as e,K as r,S as c,k as s,aI as u}from"./index-0b81392a.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,E as l,U as d,bz as e,K as r,S as c,k as s,aI as u}from"./index-3d37081f.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};
+>>>>>>>> online:dist/assets/index-119f11bf.js

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-386dfac4.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/assets/index-3d37081f.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/assets/index-4207a972.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/assets/index-463d1281.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/assets/index-5dd7b83e.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/assets/index-5f275932.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-8dbe2b84.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-99901fba.js


+ 4 - 0
dist/assets/index-9c91b34c.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-9c91b34c.js
 import{d,r as i,U as p,S as e,v as r,ac as n,k as o}from"./index-0b81392a.js";const l=d({name:"measureSpeed",setup(){const s=i(!1),t=p({speed:e.speed,originSpeed:e.originSpeed});return r(()=>e.section.length,()=>{if(e.modeType==="practise"){if(!s.value&&e.section.length===2){s.value=!0,t.speed=e.speed;const a=e.section[0].beatSpeed;e.originSpeed=a,n(a)}s.value&&e.section.length===0&&(s.value=!1,e.originSpeed=t.originSpeed,n(t.speed))}}),()=>o("div",null,null)}});export{l as M};
+========
+import{d,r as i,U as p,S as e,v as r,ac as n,k as o}from"./index-3d37081f.js";const l=d({name:"measureSpeed",setup(){const s=i(!1),t=p({speed:e.speed,originSpeed:e.originSpeed});return r(()=>e.section.length,()=>{if(e.modeType==="practise"){if(!s.value&&e.section.length===2){s.value=!0,t.speed=e.speed;const a=e.section[0].beatSpeed;e.originSpeed=a,n(a)}s.value&&e.section.length===0&&(s.value=!1,e.originSpeed=t.originSpeed,n(t.speed))}}),()=>o("div",null,null)}});export{l as M};
+>>>>>>>> online:dist/assets/index-eae4561d.js

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-ae5e0734.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-e962ac39.js


+ 5 - 0
dist/assets/index-eae4561d.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-9c91b34c.js
+import{d,r as i,U as p,S as e,v as r,ac as n,k as o}from"./index-0b81392a.js";const l=d({name:"measureSpeed",setup(){const s=i(!1),t=p({speed:e.speed,originSpeed:e.originSpeed});return r(()=>e.section.length,()=>{if(e.modeType==="practise"){if(!s.value&&e.section.length===2){s.value=!0,t.speed=e.speed;const a=e.section[0].beatSpeed;e.originSpeed=a,n(a)}s.value&&e.section.length===0&&(s.value=!1,e.originSpeed=t.originSpeed,n(t.speed))}}),()=>o("div",null,null)}});export{l as M};
+========
+import{d,r as i,U as p,S as e,v as r,ac as n,k as o}from"./index-3d37081f.js";const l=d({name:"measureSpeed",setup(){const s=i(!1),t=p({speed:e.speed,originSpeed:e.originSpeed});return r(()=>e.section.length,()=>{if(e.modeType==="practise"){if(!s.value&&e.section.length===2){s.value=!0,t.speed=e.speed;const a=e.section[0].beatSpeed;e.originSpeed=a,n(a)}s.value&&e.section.length===0&&(s.value=!1,e.originSpeed=t.originSpeed,n(t.speed))}}),()=>o("div",null,null)}});export{l as M};
+>>>>>>>> online:dist/assets/index-eae4561d.js

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/assets/index-legacy-036dfd2d.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/assets/index-legacy-29c19be0.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy-30d6fa3d.js


+ 5 - 0
dist/assets/index-legacy-33094569.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-fbf8f763.js
+System.register(["./index-legacy-311f2cd9.js"],(function(e,n){"use strict";var i,t,s,r,d,p,o;return{setters:[e=>{i=e.d,t=e.r,s=e.U,r=e.S,d=e.v,p=e.ac,o=e.k}],execute:function(){e("M",i({name:"measureSpeed",setup(){const e=t(!1),n=s({speed:r.speed,originSpeed:r.originSpeed});return d((()=>r.section.length),(()=>{if("practise"===r.modeType){if(!e.value&&2===r.section.length){e.value=!0,n.speed=r.speed;const i=r.section[0].beatSpeed;r.originSpeed=i,p(i)}e.value&&0===r.section.length&&(e.value=!1,r.originSpeed=n.originSpeed,p(n.speed))}})),()=>o("div",null,null)}}))}}}));
+========
+System.register(["./index-legacy-29c19be0.js"],(function(e,n){"use strict";var i,t,s,r,d,p,o;return{setters:[e=>{i=e.d,t=e.r,s=e.U,r=e.S,d=e.v,p=e.ac,o=e.k}],execute:function(){e("M",i({name:"measureSpeed",setup(){const e=t(!1),n=s({speed:r.speed,originSpeed:r.originSpeed});return d((()=>r.section.length),(()=>{if("practise"===r.modeType){if(!e.value&&2===r.section.length){e.value=!0,n.speed=r.speed;const i=r.section[0].beatSpeed;r.originSpeed=i,p(i)}e.value&&0===r.section.length&&(e.value=!1,r.originSpeed=n.originSpeed,p(n.speed))}})),()=>o("div",null,null)}}))}}}));
+>>>>>>>> online:dist/assets/index-legacy-33094569.js

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/assets/index-legacy-6e2fb054.js


+ 1 - 0
dist/assets/index-legacy-7ff12af0.js

@@ -0,0 +1 @@
+System.register(["./index-legacy-29c19be0.js"],(function(e,t){"use strict";var i,n,a,o,r,s,d,l;return{setters:[e=>{i=e.d,n=e.E,a=e.U,o=e.bz,r=e.K,s=e.S,d=e.k,l=e.aI}],execute:function(){var t=document.createElement("style");t.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(t);const c="_detail_vtlsh_12",h="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),t=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,t.isLoading=!1}));const i=async()=>{console.log("渲染完成")};return()=>d("div",{class:c},[d("div",{id:"scrollContainer",class:[h,"hideCursor"]},[!t.isLoading&&d(l,{onRendered:i},null)])])}}))}}}));

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/assets/index-legacy-b1a0a124.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/assets/index-legacy-b1dc7712.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/assets/index-legacy-bd75ca43.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/index-legacy-e3349ced.js


+ 4 - 0
dist/assets/index-legacy-fbf8f763.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-fbf8f763.js
 System.register(["./index-legacy-311f2cd9.js"],(function(e,n){"use strict";var i,t,s,r,d,p,o;return{setters:[e=>{i=e.d,t=e.r,s=e.U,r=e.S,d=e.v,p=e.ac,o=e.k}],execute:function(){e("M",i({name:"measureSpeed",setup(){const e=t(!1),n=s({speed:r.speed,originSpeed:r.originSpeed});return d((()=>r.section.length),(()=>{if("practise"===r.modeType){if(!e.value&&2===r.section.length){e.value=!0,n.speed=r.speed;const i=r.section[0].beatSpeed;r.originSpeed=i,p(i)}e.value&&0===r.section.length&&(e.value=!1,r.originSpeed=n.originSpeed,p(n.speed))}})),()=>o("div",null,null)}}))}}}));
+========
+System.register(["./index-legacy-29c19be0.js"],(function(e,n){"use strict";var i,t,s,r,d,p,o;return{setters:[e=>{i=e.d,t=e.r,s=e.U,r=e.S,d=e.v,p=e.ac,o=e.k}],execute:function(){e("M",i({name:"measureSpeed",setup(){const e=t(!1),n=s({speed:r.speed,originSpeed:r.originSpeed});return d((()=>r.section.length),(()=>{if("practise"===r.modeType){if(!e.value&&2===r.section.length){e.value=!0,n.speed=r.speed;const i=r.section[0].beatSpeed;r.originSpeed=i,p(i)}e.value&&0===r.section.length&&(e.value=!1,r.originSpeed=n.originSpeed,p(n.speed))}})),()=>o("div",null,null)}}))}}}));
+>>>>>>>> online:dist/assets/index-legacy-33094569.js

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/assets/index-legacy-ffff2a2a.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/instrument-9695c76b.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/instrument-c2c27ae2.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/instrument-legacy-ae003d04.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/instrument-legacy-b6e4961b.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/assets/orchestra-fc04e5ab.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/assets/orchestra-legacy-e579f785.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/report-share-db8ebf2a.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 0
dist/assets/report-share-ff1ecb1c.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/assets/report-share-legacy-656964f0.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/assets/vue3-lottie.es-9877d209.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
dist/assets/vue3-lottie.es-legacy-bd1069b7.js


+ 12 - 0
dist/colexiu.html

@@ -40,11 +40,19 @@
       },
     })
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/colexiu-4800f254.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-0b81392a.js">
   <link rel="modulepreload" crossorigin href="./assets/index-7c22c723.js">
   <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-d2876335.js">
   <link rel="modulepreload" crossorigin href="./assets/index-9c91b34c.js">
+=======
+  <script type="module" crossorigin src="./assets/colexiu-a1da9db0.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-3d37081f.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-4207a972.js">
+  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-9877d209.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-eae4561d.js">
+>>>>>>> online
   <link rel="stylesheet" href="./assets/index-7ca35b66.css">
   <link rel="stylesheet" href="./assets/index-cc0254c0.css">
   <link rel="stylesheet" href="./assets/colexiu-4a62fa3a.css">
@@ -58,7 +66,11 @@
   
   <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="./assets/polyfills-legacy-a311398b.js"></script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/colexiu-legacy-e6939894.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/colexiu-legacy-8a9ba280.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> online
 </body>
 
 </html>

+ 13 - 0
dist/index.html

@@ -75,12 +75,21 @@
       }
     })
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index-0f9ec8e4.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-0b81392a.js">
   <link rel="modulepreload" crossorigin href="./assets/index-7c22c723.js">
   <link rel="modulepreload" crossorigin href="./assets/index-30c64df4.js">
   <link rel="modulepreload" crossorigin href="./assets/index-ae5e0734.js">
   <link rel="modulepreload" crossorigin href="./assets/index-9c91b34c.js">
+=======
+  <script type="module" crossorigin src="./assets/index-5dd7b83e.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-3d37081f.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-4207a972.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-5f275932.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-013a8120.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-eae4561d.js">
+>>>>>>> online
   <link rel="modulepreload" crossorigin href="./assets/plyr.min-ade72a33.js">
   <link rel="stylesheet" href="./assets/index-7ca35b66.css">
   <link rel="stylesheet" href="./assets/index-cc0254c0.css">
@@ -101,7 +110,11 @@
   
   <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="./assets/polyfills-legacy-a311398b.js"></script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-81099989.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-b1dc7712.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> online
 </body>
 
 </html>

+ 13 - 0
dist/instrument.html

@@ -42,12 +42,21 @@
     }
 
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/instrument-9695c76b.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-0b81392a.js">
   <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-d2876335.js">
   <link rel="modulepreload" crossorigin href="./assets/index-7c22c723.js">
   <link rel="modulepreload" crossorigin href="./assets/index-99901fba.js">
   <link rel="modulepreload" crossorigin href="./assets/index-30c64df4.js">
+=======
+  <script type="module" crossorigin src="./assets/instrument-c2c27ae2.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-3d37081f.js">
+  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-9877d209.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-4207a972.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-e962ac39.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-5f275932.js">
+>>>>>>> online
   <link rel="stylesheet" href="./assets/index-7ca35b66.css">
   <link rel="stylesheet" href="./assets/index-cc0254c0.css">
   <link rel="stylesheet" href="./assets/instrument-1635f495.css">
@@ -61,7 +70,11 @@
   
   <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="./assets/polyfills-legacy-a311398b.js"></script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/instrument-legacy-ae003d04.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/instrument-legacy-b6e4961b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> online
 </body>
 
 </html>

+ 14 - 0
dist/orchestra.html

@@ -41,6 +41,7 @@
       transition: opacity .3s;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/orchestra-c95fb25b.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-0b81392a.js">
   <link rel="modulepreload" crossorigin href="./assets/index-7c22c723.js">
@@ -48,6 +49,15 @@
   <link rel="modulepreload" crossorigin href="./assets/index-ae5e0734.js">
   <link rel="modulepreload" crossorigin href="./assets/index-9c91b34c.js">
   <link rel="modulepreload" crossorigin href="./assets/index-99901fba.js">
+=======
+  <script type="module" crossorigin src="./assets/orchestra-fc04e5ab.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-3d37081f.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-4207a972.js">
+  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-9877d209.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-013a8120.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-eae4561d.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-e962ac39.js">
+>>>>>>> online
   <link rel="stylesheet" href="./assets/index-7ca35b66.css">
   <link rel="stylesheet" href="./assets/index-cc0254c0.css">
   <link rel="stylesheet" href="./assets/index-85f95688.css">
@@ -73,7 +83,11 @@
   
   <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="./assets/polyfills-legacy-a311398b.js"></script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/orchestra-legacy-42f306b9.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/orchestra-legacy-e579f785.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> online
 </body>
 
 </html>

+ 9 - 0
dist/report-share.html

@@ -25,8 +25,13 @@
       transition: opacity .3s;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/report-share-ff1ecb1c.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-0b81392a.js">
+=======
+  <script type="module" crossorigin src="./assets/report-share-db8ebf2a.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-3d37081f.js">
+>>>>>>> online
   <link rel="modulepreload" crossorigin href="./assets/plyr.min-ade72a33.js">
   <link rel="stylesheet" href="./assets/index-7ca35b66.css">
   <link rel="stylesheet" href="./assets/plyr-aeb30ba4.css">
@@ -52,7 +57,11 @@
   
   <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="./assets/polyfills-legacy-a311398b.js"></script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/report-share-legacy-1537ef01.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/report-share-legacy-656964f0.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> online
 </body>
 
 </html>

+ 142 - 142
src/state.ts

@@ -35,147 +35,147 @@ export enum IPlatform {
 }
 
 const state = reactive({
-	/** 来源 : PC , app */
-	platform: "" as IPlatform,
-	appName: "" as "GYM" | "COLEXIU",
-	musicRenderType: EnumMusicRenderType.staff as EnumMusicRenderType,
-	/**曲谱是否渲染完成 */
-	musicRendered: false,
-	/** 当前曲谱数据ID, 和曲谱ID不一致 */
-	detailId: "",
-	/** 曲谱资源URL */
-	xmlUrl: "",
-	/** 声部ID */
-	subjectId: 0 as number,
-	/** 分类ID */
-	categoriesId: 0,
-	/** 分类名称 */
-	categoriesName: "",
-	/** 是否支持评测 */
-	enableEvaluation: true,
-	/** 是否支持转谱 */
-	enableNotation: false,
-	/** 曲谱ID */
-	examSongId: "",
-	/** 曲谱名称 */
-	examSongName: "",
-	/** 曲谱封面 */
-	coverImg: '',
-	/** 扩展字段 */
-	extConfigJson: {} as any,
-	/** 扩展样式字段 */
-	extStyleConfigJson: {} as any,
-	/** 是否开启节拍器 */
-	isOpenMetronome: false,
-	/** 是否显示指法 */
-	isShowFingering: false,
-	/** 原音 */
-	music: "",
-	/** 伴奏 */
-	accompany: "",
-	/** midiURL */
-	midiUrl: "",
-	/** 父分ID */
-	parentCategoriesId: 0,
-	/** 分类ID */
-	musicSheetCategoriesId: 0,
-	/** 资源类型: mp3 | midi */
-	playMode: "MP3" as "MP3" | "MIDI",
-	/** 设置的速度 */
-	speed: 0,
-	/** 曲谱音频正常的速度 */
-	originSpeed: 0,
-	/** 分轨名称 */
-	track: "",
-	/** 当前显示声部索引 */
-	partIndex: 0,
-	/** 是否需要节拍器 */
-	needTick: false,
-	/** 曲谱实例 */
-	osmd: null as unknown as OpenSheetMusicDisplay,
-	/**是否是特殊乐谱类型, 主要针对管乐迷  */
-	isSpecialBookCategory: false,
-	/** 播放状态 */
-	playState: "paused" as IAudioState,
-	/** 播放结束状态 */
-	playEnd: false,
-	/** 播放那个: 原音,伴奏 */
-	playSource: "music" as IPlayState,
-	/** 播放进度 */
-	playProgress: 0,
-	/** 激活的note index */
-	activeNoteIndex: 0,
-	/** 激活的小节 */
-	activeMeasureIndex: 0,
-	/** 选段状态 */
-	sectionStatus: false,
-	/** 选段数据 */
-	section: [] as any[],
-	/** 选段背景 */
-	sectionBoundingBoxs: [] as any[],
-	/** 开启选段预备 */
-	isOpenPrepare: false,
-	/** 选段预备 */
-	sectionFirst: null as any,
-	/** 音符数据 */
-	times: [] as any[],
-	/** 播放模式 */
-	modeType: "practise" as "practise" | "follow" | "evaluating",
-	/** 设置 */
-	setting: {
-		/** 效音提醒 */
-		soundEffect: true,
-		/** 护眼模式 */
-		eyeProtection: false,
-		/** 摄像头 */
-		camera: false,
-		/** 摄像头透明度 */
-		cameraOpacity: 70,
-		/** 循环播放 */
-		repeatAutoPlay: true,
-		/** 显示指法 */
-		displayFingering: true,
-		/** 显示光标 */
-		displayCursor: true,
-		/** 频率 */
-		frequency: 442,
-		/** 评测难度 */
-		evaluationDifficulty: "ADVANCED" as IDifficulty,
-		/** 保存到相册 */
-		saveToAlbum: false,
-		/** 开启伴奏 */
-		enableAccompaniment: true,
-		/** 反应时间 */
-		reactionTimeMs: 0,
-	},
-	/** 节拍器的时间 */
-	fixtime: 0,
-	/** 指法信息 */
-	fingeringInfo: {} as IFingering,
-	/** 滚动容器的ID */
-	scrollContainer: "musicAndSelection",
-	/** 是否是打击乐 */
-	isPercussion: false,
-	/** 是否重复节拍器的时间 */
-	repeatedBeats: 0,
-	/**当前曲谱中所有声部名字 */
-	partListNames: [] as string[],
-	/** 渐变速度信息 */
-	gradual: [] as GradualNote[],
-	/** 渐变速度版本 */
-	gradualVersion: GradualVersion.BASE as GradualVersion,
-	/** 渐变时间信息 */
-	gradualTimes: null as GradualTimes,
-	/** 单声部多声轨 */
-	multitrack: 0,
-	/** 缩放 */
-	zoom: 0.8,
-	/** 渲染曲谱比例 */
-	musicZoom: 1,
-	/** 练习,评测是否是选段模式 */
-	isSelectMeasureMode: false,
-	/** 是否是评分显示 */
-	isReport: false,
+  /** 来源 : PC , app */
+  platform: "" as IPlatform,
+  appName: "" as "GYM" | "COLEXIU",
+  musicRenderType: EnumMusicRenderType.staff as EnumMusicRenderType,
+  /**曲谱是否渲染完成 */
+  musicRendered: false,
+  /** 当前曲谱数据ID, 和曲谱ID不一致 */
+  detailId: "",
+  /** 曲谱资源URL */
+  xmlUrl: "",
+  /** 声部ID */
+  subjectId: 0 as number,
+  /** 分类ID */
+  categoriesId: 0,
+  /** 分类名称 */
+  categoriesName: "",
+  /** 是否支持评测 */
+  enableEvaluation: true,
+  /** 是否支持转谱 */
+  enableNotation: false,
+  /** 曲谱ID */
+  examSongId: "",
+  /** 曲谱名称 */
+  examSongName: "",
+  /** 曲谱封面 */
+  coverImg: "",
+  /** 扩展字段 */
+  extConfigJson: {} as any,
+  /** 扩展样式字段 */
+  extStyleConfigJson: {} as any,
+  /** 是否开启节拍器 */
+  isOpenMetronome: false,
+  /** 是否显示指法 */
+  isShowFingering: false,
+  /** 原音 */
+  music: "",
+  /** 伴奏 */
+  accompany: "",
+  /** midiURL */
+  midiUrl: "",
+  /** 父分ID */
+  parentCategoriesId: 0,
+  /** 分类ID */
+  musicSheetCategoriesId: 0,
+  /** 资源类型: mp3 | midi */
+  playMode: "MP3" as "MP3" | "MIDI",
+  /** 设置的速度 */
+  speed: 0,
+  /** 曲谱音频正常的速度 */
+  originSpeed: 0,
+  /** 分轨名称 */
+  track: "",
+  /** 当前显示声部索引 */
+  partIndex: 0,
+  /** 是否需要节拍器 */
+  needTick: false,
+  /** 曲谱实例 */
+  osmd: null as unknown as OpenSheetMusicDisplay,
+  /**是否是特殊乐谱类型, 主要针对管乐迷  */
+  isSpecialBookCategory: false,
+  /** 播放状态 */
+  playState: "paused" as IAudioState,
+  /** 播放结束状态 */
+  playEnd: false,
+  /** 播放那个: 原音,伴奏 */
+  playSource: "music" as IPlayState,
+  /** 播放进度 */
+  playProgress: 0,
+  /** 激活的note index */
+  activeNoteIndex: 0,
+  /** 激活的小节 */
+  activeMeasureIndex: 0,
+  /** 选段状态 */
+  sectionStatus: false,
+  /** 选段数据 */
+  section: [] as any[],
+  /** 选段背景 */
+  sectionBoundingBoxs: [] as any[],
+  /** 开启选段预备 */
+  isOpenPrepare: false,
+  /** 选段预备 */
+  sectionFirst: null as any,
+  /** 音符数据 */
+  times: [] as any[],
+  /** 播放模式 */
+  modeType: "practise" as "practise" | "follow" | "evaluating",
+  /** 设置 */
+  setting: {
+    /** 效音提醒 */
+    soundEffect: true,
+    /** 护眼模式 */
+    eyeProtection: false,
+    /** 摄像头 */
+    camera: false,
+    /** 摄像头透明度 */
+    cameraOpacity: 70,
+    /** 循环播放 */
+    repeatAutoPlay: true,
+    /** 显示指法 */
+    displayFingering: true,
+    /** 显示光标 */
+    displayCursor: true,
+    /** 频率 */
+    frequency: 442,
+    /** 评测难度 */
+    evaluationDifficulty: "ADVANCED" as IDifficulty,
+    /** 保存到相册 */
+    saveToAlbum: false,
+    /** 开启伴奏 */
+    enableAccompaniment: true,
+    /** 反应时间 */
+    reactionTimeMs: 0,
+  },
+  /** 节拍器的时间 */
+  fixtime: 0,
+  /** 指法信息 */
+  fingeringInfo: {} as IFingering,
+  /** 滚动容器的ID */
+  scrollContainer: "musicAndSelection",
+  /** 是否是打击乐 */
+  isPercussion: false,
+  /** 是否重复节拍器的时间 */
+  repeatedBeats: 0,
+  /**当前曲谱中所有声部名字 */
+  partListNames: [] as string[],
+  /** 渐变速度信息 */
+  gradual: [] as GradualNote[],
+  /** 渐变速度版本 */
+  gradualVersion: GradualVersion.BASE as GradualVersion,
+  /** 渐变时间信息 */
+  gradualTimes: null as GradualTimes,
+  /** 单声部多声轨 */
+  multitrack: 0,
+  /** 缩放 */
+  zoom: 0.8,
+  /** 渲染曲谱比例 */
+  musicZoom: 1,
+  /** 练习,评测是否是选段模式 */
+  isSelectMeasureMode: false,
+  /** 是否是评分显示 */
+  isReport: false,
   /** 是否隐藏评测报告弹窗,保存演奏按钮,默认不隐藏 */
   isHideEvaluatReportSaveBtn: false,
 });
@@ -567,6 +567,6 @@ export default state;
 export const evaluatCreateMusicPlayer = () => {
   return api_createMusicPlayer({
     musicSrc: state.accompany || state.music, // 曲谱音频url
-    tuneSrc: "https://cloud-coach.ks3-cn-beijing.ksyuncs.com/1686725501654check_music1_(1).mp3", //效音音频url
+    tuneSrc: "https://oss.dayaedu.com/cloud-coach/1686725501654check_music1_(1).mp3", //效音音频url
   });
 };

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.