|
@@ -116,13 +116,13 @@ export const getTempList = (element: 'jianpu' | 'staff') => {
|
|
|
/** 随机生成元素 */
|
|
|
export const randomScoreElement = (element?: string) => {
|
|
|
// const tempoList = setting.tempo;
|
|
|
- let tempoList = getTempList(setting.element).tempo4Num || [] as any
|
|
|
+ let tempoList = getTempList(setting_modal.element).tempo4Num || [] as any
|
|
|
if (['4-2', '4-3', '4-4'].includes(setting_modal.beat)) {
|
|
|
- tempoList = getTempList(setting.element).tempo4Num;
|
|
|
+ tempoList = getTempList(setting_modal.element).tempo4Num;
|
|
|
} else if (['8-3', '8-6'].includes(setting_modal.beat)) {
|
|
|
- tempoList = getTempList(setting.element).tempo8Num;
|
|
|
+ tempoList = getTempList(setting_modal.element).tempo8Num;
|
|
|
}
|
|
|
- const prefix = setting.element === 'jianpu' ? 'j-' : 'f-';
|
|
|
+ const prefix = setting_modal.element === 'jianpu' ? 'j-' : 'f-';
|
|
|
if (element) {
|
|
|
const newArr = tempoList.filter((item: any) => item !== element);
|
|
|
// 生成一个0到newArr长度之间的随机索引
|
|
@@ -171,8 +171,6 @@ export const elementDirection = (type: string, index: number) => {
|
|
|
i = toIndex - 1;
|
|
|
}
|
|
|
} else if (type === 'down') {
|
|
|
- // console.log(tempoList, '121212', index);
|
|
|
- // console.log(toIndex);
|
|
|
if (toIndex >= tempoList.length - 1) {
|
|
|
ele = tempoList[0];
|
|
|
i = 0;
|
|
@@ -245,12 +243,11 @@ export const initSelectScorePart = (i?: number, j?: number) => {
|
|
|
|
|
|
/** 随机生成元素 设置中 */
|
|
|
export const randomScoreElementModal = (element?: string) => {
|
|
|
- // const tempoList = setting.tempo;
|
|
|
- let tempoList = getTempList(setting.element).tempo4Num || [] as any
|
|
|
+ let tempoList = getTempList(setting_modal.element).tempo4Num || [] as any
|
|
|
if (['4-2', '4-3', '4-4'].includes(setting_modal.beat)) {
|
|
|
- tempoList = getTempList(setting.element).tempo4Num;
|
|
|
+ tempoList = getTempList(setting_modal.element).tempo4Num;
|
|
|
} else if (['8-3', '8-6'].includes(setting_modal.beat)) {
|
|
|
- tempoList = getTempList(setting.element).tempo8Num;
|
|
|
+ tempoList = getTempList(setting_modal.element).tempo8Num;
|
|
|
}
|
|
|
|
|
|
const prefix = setting_modal.element === 'jianpu' ? 'j-' : 'f-';
|
|
@@ -296,7 +293,6 @@ export const renderScoreModal = () => {
|
|
|
};
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
setting_modal.scorePart = tempBeat;
|
|
|
|
|
|
const beatLengthInMilliseconds = (60 / setting.speed) * 1000;
|