danoniplus 25.5.5 → 25.5.8

package/js/danoni_main.js

@@ -4,12 +4,12 @@
  * 
  * Source by tickle
  * Created : 2018/10/08
- * Revised : 2022/02/16
+ * Revised : 2022/04/16
  * 
  * https://github.com/cwtickle/danoniplus
  */
-const g_version = `Ver 25.5.5`;
-const g_revisedDate = `2022/02/16`;
+const g_version = `Ver 25.5.8`;
+const g_revisedDate = `2022/04/16`;
 const g_alphaVersion = ``;
 
 // カスタム用バージョン (danoni_custom.js 等で指定可)
@@ -40,11 +40,11 @@ let g_localVersion2 = ``;
  */
 const current = _ => {
 	if (document.currentScript) {
-		return document.currentScript.src;
+		return encodeURI(document.currentScript.src);
 	}
 	const scripts = document.getElementsByTagName(`script`);
 	const targetScript = scripts[scripts.length - 1];
-	return targetScript.src;
+	return encodeURI(targetScript.src);
 };
 const g_rootPath = current().match(/(^.*\/)/)[0];
 const g_remoteFlg = g_rootPath.match(`^https://cwtickle.github.io/danoniplus/`) !== null;
@@ -1356,7 +1356,7 @@ function loadDos(_afterFunc, _scoreId = g_stateObj.scoreId, _cyclicFlg = false)
 	const externalDosInput = document.querySelector(`#externalDos`);
 	const divRoot = document.querySelector(`#divRoot`);
 	const queryDos = getQueryParamVal(`dos`) !== null ? `dos/${getQueryParamVal('dos')}.txt` :
-		(externalDosInput !== null ? externalDosInput.value : ``);
+		encodeURI(externalDosInput !== null ? externalDosInput.value : ``);
 
 	if (dosInput === null && queryDos === ``) {
 		makeWarningWindow(g_msgInfoObj.E_0023);
@@ -5166,8 +5166,8 @@ function createLblSetting(_settingName, _adjY = 0, _settingLabel = _settingName)
  * @param {string} _name 
  */
 function getStgDetailName(_name) {
-	return g_lblNameObj[`u_${_name}`] === undefined || typeof g_lblRenames !== C_TYP_OBJECT || !g_lblRenames[g_currentPage] ?
-		_name : g_lblNameObj[`u_${_name}`];
+	return g_lblNameObj[`u_${_name}`] !== undefined && (typeof g_lblRenames !== C_TYP_OBJECT ||
+		(typeof g_lblRenames === C_TYP_OBJECT && g_lblRenames[g_currentPage])) ? g_lblNameObj[`u_${_name}`] : _name;
 }
 
 /**

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2022/01/26 (v25.5.1)
+ * Revised : 2022/04/16 (v25.5.8)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -2203,11 +2203,19 @@ const g_keyObj = {
         'Left': [1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0],
         'Right': [0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1],
     },
+    assistPos9A_4: {
+        'Left': [1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0],
+        'Right': [0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1],
+    },
 
     assistPos11i_0: {
         'Left': [1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0],
         'Right': [0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1],
     },
+    assistPos11i_1: {
+        'Left': [1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0],
+        'Right': [0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1],
+    },
 
     assistPos17_0: {
         'Left': [1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0],

package/package.json

@@ -1,23 +1,23 @@
-{
-  "name": "danoniplus",
-  "version": "25.5.5",
-  "description": "Dancing☆Onigiri (CW Edition) - Web-based Rhythm Game",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/cwtickle/danoniplus.git"
-  },
-  "keywords": [
-    "rhythm-game",
-    "dancing-onigiri"
-  ],
-  "author": "tickle <quc_tickle@cw7.sakura.ne.jp> (https://github.com/cwtickle/)",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/cwtickle/danoniplus/issues"
-  },
-  "homepage": "https://github.com/cwtickle/danoniplus#readme"
+{
+  "name": "danoniplus",
+  "version": "25.5.8",
+  "description": "Dancing☆Onigiri (CW Edition) - Web-based Rhythm Game",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/cwtickle/danoniplus.git"
+  },
+  "keywords": [
+    "rhythm-game",
+    "dancing-onigiri"
+  ],
+  "author": "tickle <quc_tickle@cw7.sakura.ne.jp> (https://github.com/cwtickle/)",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/cwtickle/danoniplus/issues"
+  },
+  "homepage": "https://github.com/cwtickle/danoniplus#readme"
 }