danoniplus 37.3.1 → 37.5.0

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2024/07/07
+ * Revised : 2024/09/04
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 37.3.1`;
-const g_revisedDate = `2024/07/07`;
+const g_version = `Ver 37.5.0`;
+const g_revisedDate = `2024/09/04`;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
 let g_localVersion = ``;
@@ -475,8 +475,8 @@ const fuzzyListMatching = (_str, _headerList, _footerList) =>
  * @param {array} _pairs 
  */
 const replaceStr = (_str, _pairs) => {
-	let tmpStr = _str;
-	_pairs.forEach(pair => tmpStr = tmpStr?.replaceAll(pair[0], pair[1]));
+	let tmpStr = _str || ``;
+	_pairs.forEach(pair => tmpStr = tmpStr.split(pair[0]).join(pair[1]));
 	return tmpStr;
 };
 
@@ -493,11 +493,17 @@ const escapeHtml = (_str, _escapeList = g_escapeStr.escape) => escapeHtmlForEnab
  */
 const escapeHtmlForEnabledTag = _str => replaceStr(_str, g_escapeStr.escapeTag);
 
+/**
+ * HTML Entityから元の文字に戻す
+ * @param {string} _str 
+ */
+const unEscapeEmoji = _str => _str?.replace(/&#(.*?);/g, (_, p1) => String.fromCodePoint(`0${p1}`));
+
 /**
  * エスケープ文字を元の文字に戻す
  * @param {string} _str 
  */
-const unEscapeHtml = _str => replaceStr(_str, g_escapeStr.unEscapeTag);
+const unEscapeHtml = _str => unEscapeEmoji(replaceStr(_str, g_escapeStr.unEscapeTag));
 
 /**
  * 配列の中身を全てエスケープ処理
@@ -5791,7 +5797,7 @@ const makeDisabledLabel = (_id, _heightPos, _defaultStr) =>
  * @param {string} _extraKeyName 特殊キー名(通常キーは省略)
  */
 const getKeyReverse = (_localStorage, _extraKeyName = ``) => {
-	if (_localStorage[`reverse${_extraKeyName}`] !== undefined) {
+	if (_localStorage[`reverse${_extraKeyName}`] !== undefined && g_headerObj.reverseUse) {
 		g_stateObj.reverse = _localStorage[`reverse${_extraKeyName}`] ?? C_FLG_OFF;
 		g_settings.reverseNum = roundZero(g_settings.reverses.findIndex(reverse => reverse === g_stateObj.reverse));
 	} else {
@@ -5808,7 +5814,7 @@ const setReverseDefault = _ => {
 };
 
 const setReverse = _btn => {
-	if (!g_settings.scrolls.includes(`Reverse`)) {
+	if (!g_settings.scrolls.includes(`Reverse`) && g_headerObj.reverseUse) {
 		g_settings.reverseNum = (g_settings.reverseNum + 1) % 2;
 		g_stateObj.reverse = g_settings.reverses[g_settings.reverseNum];
 		setReverseView(_btn);
@@ -5818,7 +5824,7 @@ const setReverse = _btn => {
 const setReverseView = _btn => {
 	_btn.classList.replace(g_cssObj[`button_Rev${g_settings.reverses[(g_settings.reverseNum + 1) % 2]}`],
 		g_cssObj[`button_Rev${g_settings.reverses[g_settings.reverseNum]}`]);
-	if (!g_settings.scrolls.includes(`Reverse`)) {
+	if (!g_settings.scrolls.includes(`Reverse`) && g_headerObj.reverseUse) {
 		_btn.textContent = `${g_lblNameObj.Reverse}:${getStgDetailName(g_stateObj.reverse)}`;
 	} else {
 		_btn.textContent = `X`;
@@ -9135,7 +9141,9 @@ const getArrowSettings = _ => {
 			storageObj = g_localStorage;
 			addKey = g_keyObj.currentKey;
 		}
-		storageObj[`reverse${addKey}`] = g_stateObj.reverse;
+		if (g_headerObj.reverseUse) {
+			storageObj[`reverse${addKey}`] = g_stateObj.reverse;
+		}
 		storageObj[`keyCtrl${addKey}`] = setKeyCtrl(g_localKeyStorage, keyNum, keyCtrlPtn);
 		if (g_keyObj.currentPtn !== -1) {
 			storageObj[`keyCtrlPtn${addKey}`] = g_keyObj.currentPtn;

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2024/06/29 (v37.2.0)
+ * Revised : 2024/09/04 (v37.5.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -1084,7 +1084,7 @@ let g_storeSettings = [`adjustment`, `volume`, `appearance`, `opacity`, `hitPosi
 let g_storeSettingsEx = [`d_stepzone`, `d_judgment`, `d_fastslow`, `d_lifegauge`,
     `d_score`, `d_musicinfo`, `d_filterline`];
 
-let g_canDisabledSettings = [`motion`, `scroll`, `shuffle`, `autoPlay`, `gauge`, `excessive`, `appearance`];
+let g_canDisabledSettings = [`motion`, `scroll`, `reverse`, `shuffle`, `autoPlay`, `gauge`, `excessive`, `appearance`];
 
 const g_hidSudFunc = {
     filterPos: _filterPos => `${_filterPos}${g_lblNameObj.percent}`,
@@ -1958,12 +1958,16 @@ const g_keyObj = {
     color9B_2_0: [0, 0, 0, 0, 2, 1, 1, 1, 1],
 
     // ColorGroup - 2
+    color9A_0_1: [0, 0, 3, 0, 2, 0, 0, 3, 0],
     color9B_0_1: [4, 3, 1, 0, 2, 0, 1, 3, 4],
+    color13_0_1: [4, 4, 3, 4, 0, 0, 3, 0, 2, 0, 0, 3, 0],
     color17_0_1: [0, 1, 0, 1, 0, 1, 0, 1, 2, 3, 4, 3, 4, 3, 4, 3, 4],
 
+    color9B_1_1: [0, 0, 1, 0, 2, 0, 0, 1, 0],
     color17_1_1: [1, 1, 1, 1, 2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0],
 
     color9A_2_1: [4, 1, 3, 0, 2, 0, 3, 1, 4],
+    color9B_2_1: [0, 0, 1, 0, 2, 0, 0, 1, 0],
 
     // ColorGroup - 3
     color17_0_2: [1, 4, 0, 3, 1, 4, 0, 3, 2, 3, 0, 4, 1, 3, 0, 4, 1],

package/js/template/danoni_setting.js

@@ -1,7 +1,7 @@
 'use strict';
 /**
  * Dancing☆Onigiri 設定用jsファイル
- * Template Update: 2024/01/28 (v35.0.0)
+ * Template Update: 2024/09/04 (v37.5.0)
  * 
  * このファイルでは、作品全体に対しての初期設定を行うことができます。
  * 譜面データ側で個別に同様の項目が設定されている場合は、譜面データ側の設定が優先されます。
@@ -226,6 +226,7 @@ g_presetObj.customDesignUse = {
 g_presetObj.settingUse = {
 	motion: `true`,
 	scroll: `true`,
+	// reverse: `true`,
 	shuffle: `true`,
 	autoPlay: `true`,
 	gauge: `true`,

package/package.json

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