[ver23.5.4] シャッフルグループ・カラーグループの処理見直し

cwtickle · Dec 13, 2021 · eb823e0 · eb823e0
1 parent c046be0
commit eb823e0
Showing 1 changed file with 26 additions and 28 deletions.
diff --git a/js/danoni_main.js b/js/danoni_main.js
@@ -3732,6 +3732,14 @@ function keysConvert(_dosObj) {
 		}
 	};
 
+	/**
+	 * 子構成配列へのコピー
+	 * @param {number} _k 
+	 * @param {string} _header 
+	 * @returns 
+	 */
+	const copyChildArray = (_k, _header) => g_keyObj[`${_header}_${_k}_0`] = copyArray2d(g_keyObj[`${_header}_${_k}`]);
+
 	// 対象キー毎に処理
 	keyExtraList.forEach(newKey => {
 		let tmpDivPtn = [];
@@ -3743,9 +3751,7 @@ function keysConvert(_dosObj) {
 		// 矢印色パターン (colorX_Y)
 		tmpMinPatterns = newKeyMultiParam(newKey, `color`, toNumber, {
 			errCd: `E_0101`,
-			loopFunc: (k, keyheader) => {
-				g_keyObj[`${keyheader}_${k}_0`] = g_keyObj[`${keyheader}_${k}`];
-			},
+			loopFunc: (k, keyheader) => copyChildArray(k, keyheader),
 		});
 
 		// 読込変数の接頭辞 (charaX_Y)
@@ -3811,7 +3817,9 @@ function keysConvert(_dosObj) {
 		newKeySingleParam(newKey, `transKey`, C_TYP_STRING);
 
 		// シャッフルグループ (shuffleX_Y)
-		newKeyMultiParam(newKey, `shuffle`, toNumber);
+		newKeyMultiParam(newKey, `shuffle`, toNumber, {
+			loopFunc: (k, keyheader) => copyChildArray(k, keyheader),
+		});
 
 		// スクロールパターン (scrollX_Y)
 		// |scroll(newKey)=Cross::1,1,-1,-1,-1,1,1/Split::1,1,1,-1,-1,-1,-1$...|
@@ -5132,8 +5140,9 @@ function getKeyCtrl(_localStorage, _extraKeyName = ``) {
 			}
 		}
 
+		const isUpdate = prevPtn !== -1 && g_keyObj.prevKey !== g_keyObj.currentKey;
 		g_keyCopyLists.multiple.forEach(header => {
-			if (g_keyObj[`${header}${basePtn}`] !== undefined && prevPtn !== -1) {
+			if (g_keyObj[`${header}${basePtn}`] !== undefined && isUpdate) {
 				g_keyObj[`${header}${copyPtn}`] = copyArray2d(g_keyObj[`${header}${basePtn}`]);
 			}
 		});
@@ -5142,12 +5151,14 @@ function getKeyCtrl(_localStorage, _extraKeyName = ``) {
 		});
 
 		[`color`, `shuffle`].forEach(type => {
-			let maxPtn = 0;
-			while (g_keyObj[`${type}${basePtn}_${maxPtn}`] !== undefined) {
-				maxPtn++;
-			}
-			for (let j = 0; j < maxPtn; j++) {
-				g_keyObj[`${type}${copyPtn}_${j}`] = g_keyObj[`${type}${basePtn}_${j}`];
+			if (isUpdate) {
+				let maxPtn = 0;
+				while (g_keyObj[`${type}${basePtn}_${maxPtn}`] !== undefined) {
+					maxPtn++;
+				}
+				for (let j = 0; j < maxPtn; j++) {
+					g_keyObj[`${type}${copyPtn}_${j}`] = g_keyObj[`${type}${basePtn}_${j}`];
+				}
 			}
 		});
 	}
@@ -5487,21 +5498,10 @@ function keyConfigInit(_kcType = g_kcType) {
 	 * @returns 
 	 */
 	const changeTmpData = (_type, _len, _j, _scrollNum) => {
-		const basePtn = getBasePtn();
-		const hasMultiGroup = g_keyObj[`${_type}${keyCtrlPtn}_1`] !== undefined;
 		const tmpNo = nextPos(g_keyObj[`${_type}${keyCtrlPtn}`][_j], _scrollNum, _len);
+		g_keyObj[`${_type}${keyCtrlPtn}`][_j] = tmpNo;
+		g_keyObj[`${_type}${keyCtrlPtn}_${g_keycons[`${_type}GroupNum`]}`][_j] = tmpNo;
 
-		const setTmpData = _ptn => {
-			g_keyObj[`${_type}${_ptn}`][_j] = tmpNo;
-			if (hasMultiGroup) {
-				g_keyObj[`${_type}${_ptn}_${g_keycons[`${_type}GroupNum`]}`][_j] = tmpNo;
-			}
-		};
-
-		setTmpData(keyCtrlPtn);
-		if (keyCtrlPtn === basePtn) {
-			setTmpData(`${g_keyObj.currentKey}_-1`);
-		}
 		return tmpNo;
 	};
 
@@ -5636,10 +5636,8 @@ function keyConfigInit(_kcType = g_kcType) {
 			if (g_keyObj[`${_type}${keyCtrlPtn}_1`] !== undefined) {
 				document.getElementById(`lnk${toCapitalize(_type)}Group`).textContent =
 					getStgDetailName(`${g_keycons[`${_type}GroupNum`] + 1}`);
-				viewGroupObj[_type](`_${g_keycons[`${_type}GroupNum`]}`);
-			} else {
-				viewGroupObj[_type]();
 			}
+			viewGroupObj[_type](`_${g_keycons[`${_type}GroupNum`]}`);
 		}
 	}
 	const setGroup = (_type, _scrollNum = 1) => {
@@ -5852,7 +5850,7 @@ function keyConfigInit(_kcType = g_kcType) {
 			g_stateObj.d_color = g_keycons.colorDefs[nextNum];
 		}
 		changeSetColor();
-		viewGroupObj.color(g_keyObj[`color${keyCtrlPtn}_1`] !== undefined ? `_${g_keycons.colorGroupNum}` : ``);
+		viewGroupObj.color(`_${g_keycons.colorGroupNum}`);
 		lnkColorType.textContent = `${getStgDetailName(g_colorType)}${g_localStorage.colorType === g_colorType ? ' *' : ''}`;
 	};