danoniplus 34.6.0 → 34.7.0

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2024/01/07
+ * Revised : 2024/01/12
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 34.6.0`;
-const g_revisedDate = `2024/01/07`;
+const g_version = `Ver 34.7.0`;
+const g_revisedDate = `2024/01/12`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -2705,9 +2705,16 @@ const headerConvert = _dosObj => {
 	g_stateObj.rotateEnabled = obj.imgType[0].rotateEnabled;
 	g_stateObj.flatStepHeight = obj.imgType[0].flatStepHeight;
 
+	const [titleArrowName, titleArrowRotate] = padArray(_dosObj.titleArrowName?.split(`:`), [`Original`, 180]);
+	obj.titleArrowNo = roundZero(g_keycons.imgTypes.findIndex(imgType => imgType === titleArrowName));
+	obj.titleArrowRotate = titleArrowRotate;
+
 	// サーバ上の場合、画像セットを再読込（ローカルファイル時は読込済みのためスキップ）
 	if (!g_isFile) {
+		updateImgType(obj.imgType[obj.titleArrowNo], true);
 		updateImgType(obj.imgType[0]);
+	} else {
+		g_imgObj.titleArrow = C_IMG_ARROW;
 	}
 
 	// ラベルテキスト、オンマウステキスト、確認メッセージ定義の上書き設定
@@ -3347,7 +3354,10 @@ const getMusicNameMultiLine = _musicName => {
  * 画像セットの入れ替え処理
  * @param {array} _imgType 
  */
-const updateImgType = _imgType => {
+const updateImgType = (_imgType, _initFlg = false) => {
+	if (_initFlg) {
+		C_IMG_TITLE_ARROW = `../img/${_imgType.name}/arrow.${_imgType.extension}`;
+	}
 	resetImgs(_imgType.name, _imgType.extension);
 	reloadImgObj();
 	Object.keys(g_imgObj).forEach(key => g_imgObj[key] = `${g_rootPath}${g_imgObj[key]}`);
@@ -4039,7 +4049,7 @@ const titleInit = _ => {
 				background: makeColorGradation(g_headerObj.titlearrowgrds[0] || g_headerObj.setColorOrg[0], {
 					_defaultColorgrd: [false, `#eeeeee`],
 					_objType: `titleArrow`,
-				}), rotate: 180,
+				}), rotate: `titleArrow:${g_headerObj.titleArrowRotate}`,
 			})
 		);
 	}
@@ -4523,7 +4533,7 @@ const makeDifList = (_difList, _targetKey = ``) => {
 			_difList.appendChild(makeDifLblCssButton(`dif${k}`, text, k, _ => nextDifficulty(j - g_stateObj.scoreId),
 				{ btnStyle: (j === g_stateObj.scoreId ? `Setting` : `Default`) }));
 			if (j === g_stateObj.scoreId) {
-				pos = k + 6 + (g_sHeight - 500) / 50;
+				pos = k + 6.5 * (g_sHeight - 239) / 261;
 				curk = k;
 			}
 			k++;
@@ -4566,6 +4576,7 @@ const createDifWindow = (_key = ``) => {
 	setShortcutEvent(g_currentPage);
 	const difList = createEmptySprite(optionsprite, `difList`, g_windowObj.difList, g_cssObj.settings_DifSelector);
 	const difCover = createEmptySprite(optionsprite, `difCover`, g_windowObj.difCover, g_cssObj.settings_DifSelector);
+	const difFilter = createEmptySprite(difCover, `difFilter`, g_windowObj.difFilter, g_cssObj.settings_DifSelector)
 
 	// リスト再作成
 	makeDifList(difList, _key);
@@ -4589,18 +4600,18 @@ const createDifWindow = (_key = ``) => {
 	// キー別フィルタボタン作成
 	let pos = 0;
 	g_headerObj.viewKeyLists.forEach((targetKey, m) => {
-		difCover.appendChild(
-			makeDifLblCssButton(`keyFilter${m}`, `${getKeyName(targetKey)} ${getStgDetailName('key')}`, m + 2.7, _ => {
+		difFilter.appendChild(
+			makeDifLblCssButton(`keyFilter${m}`, `${getKeyName(targetKey)} ${getStgDetailName('key')}`, m, _ => {
 				resetDifWindow();
 				g_stateObj.filterKeys = targetKey;
 				createDifWindow(targetKey);
 			}, { w: g_limitObj.difCoverWidth, btnStyle: (g_stateObj.filterKeys === targetKey ? `Setting` : `Default`) })
 		);
 		if (g_stateObj.filterKeys === targetKey) {
-			pos = m + 9;
+			pos = m + 5 * (g_sHeight - 300) / 200;
 		}
 	});
-	difCover.scrollTop = Math.max(pos * g_limitObj.setLblHeight - parseInt(difCover.style.height), 0);
+	difFilter.scrollTop = Math.max(pos * g_limitObj.setLblHeight - parseInt(difFilter.style.height), 0);
 
 	multiAppend(optionsprite, makeDifBtn(-1), makeDifBtn());
 };

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2024/01/07 (v34.6.0)
+ * Revised : 2024/01/12 (v34.7.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -186,7 +186,8 @@ const updateWindowSiz = _ => {
     Object.assign(g_windowObj, {
         optionSprite: { x: (g_sWidth - 450) / 2, y: 65, w: 450, h: 325 },
         difList: { x: 165, y: 60, w: 280, h: 261 + g_sHeight - 500, overflow: `auto` },
-        difCover: { x: 25, y: 60, w: 140, h: 261 + g_sHeight - 500, overflow: `auto`, opacity: 0.95 },
+        difCover: { x: 25, y: 60, w: 140, h: 261 + g_sHeight - 500, opacity: 0.95 },
+        difFilter: { x: 0, y: 61, w: 140, h: 200 + g_sHeight - 500, overflow: `auto` },
         displaySprite: { x: 25, y: 30, w: (g_sWidth - 450) / 2, h: g_limitObj.setLblHeight * 5 },
         scoreDetail: { x: 20, y: 85, w: (g_sWidth - 500) / 2 + 420, h: 236, visibility: `hidden` },
         detailObj: { w: (g_sWidth - 500) / 2 + 420, h: 230, visibility: `hidden` },
@@ -476,6 +477,7 @@ let C_IMG_CURSOR = `../img/cursor.svg`;
 let C_IMG_FRZBAR = `../img/frzbar.svg`;
 let C_IMG_LIFEBAR = `../img/frzbar.svg`;
 let C_IMG_LIFEBORDER = `../img/borderline.svg`;
+let C_IMG_TITLE_ARROW;
 
 if (typeof loadBinary === C_TYP_FUNCTION) {
     loadBinary();
@@ -584,6 +586,8 @@ const reloadImgObj = _ => {
     g_imgObj.frzBar = C_IMG_FRZBAR;
     g_imgObj.lifeBar = C_IMG_LIFEBAR;
     g_imgObj.lifeBorder = C_IMG_LIFEBORDER;
+
+    g_imgObj.titleArrow = C_IMG_TITLE_ARROW;
 };
 reloadImgObj();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "danoniplus",
-  "version": "34.6.0",
+  "version": "34.7.0",
   "description": "Dancing☆Onigiri (CW Edition) - Web-based Rhythm Game",
   "main": "index.js",
   "scripts": {