Browse Source

Merge branch 'iteration-beat-one'

lex 1 year ago
parent
commit
9ff45c6767

+ 1 - 1
src/views/tempo-practice/beat-tick.ts

@@ -85,7 +85,7 @@ export const handleStartBeat = async () => {
       const part = setting.scorePart[i][j];
       const params = {
         ...part,
-        ...beatDesc[part.index + 1]
+        ...beatDesc[part.index]
       };
       const single16th = beatData.beatLengthInMilliseconds;
       const source = beatData.source2;

+ 4 - 5
src/views/tempo-practice/index.tsx

@@ -154,12 +154,10 @@ export default defineComponent({
                             return;
                           }
                           // const obj = randomScoreElement(child.index);
-                          const obj = elementDirection(
-                            'up',
-                            Number(child.index)
-                          );
+                          const obj = elementDirection('up', Number(child.key));
                           child.index = obj.index;
                           child.url = obj.url;
+                          child.key = obj.key;
                         }}></div>
                       <div
                         class={styles.down}
@@ -172,10 +170,11 @@ export default defineComponent({
                           // const obj = randomScoreElement(child.index);
                           const obj = elementDirection(
                             'down',
-                            Number(child.index)
+                            Number(child.key)
                           );
                           child.index = obj.index;
                           child.url = obj.url;
+                          child.key = obj.key;
                         }}></div>
                     </div>
                     <div class={styles.imgSection}>

+ 9 - 4
src/views/tempo-practice/setting.ts

@@ -60,21 +60,24 @@ export const randomScoreElement = (element?: string) => {
     const randomIndex = Math.floor(Math.random() * newArr.length);
     return {
       url: prefix + newArr[randomIndex] + '.png',
-      index: randomIndex
+      index: newArr[randomIndex],
+      key: randomIndex
     };
   } else {
     // 如果只有一个就直接返回
     if (tempoList.length === 1) {
       return {
         url: prefix + tempoList[0] + '.png',
-        index: 0
+        index: tempoList[0],
+        key: 0
       };
     } else {
       const randomIndex = Math.floor(Math.random() * tempoList.length);
       const randomItem = tempoList[randomIndex];
       return {
         url: prefix + randomItem + '.png',
-        index: randomIndex
+        index: randomItem,
+        key: randomIndex
       };
     }
   }
@@ -104,9 +107,11 @@ export const elementDirection = (type: string, index: number) => {
     }
   }
 
+  // console.log(ele, Number(index), type, i);
   return {
     url: prefix + ele + '.png',
-    index: Number(i)
+    index: Number(ele),
+    key: Number(i)
   };
 };