danoniplus 26.6.0 → 27.0.0

package/js/lib/danoni_constants.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2022/02/23 (v26.3.1)
+ * Revised : 2022/03/18 (v27.0.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -28,6 +28,19 @@ const C_LBL_BASICFONT = `"Meiryo UI", sans-serif`;
 
 const C_BTN_HEIGHT = 50;
 const C_LNK_HEIGHT = 30;
+const C_LEN_SETLBL_LEFT = 160;
+const C_LEN_SETLBL_WIDTH = 210;
+const C_LEN_DIFSELECTOR_WIDTH = 250;
+const C_LEN_DIFCOVER_WIDTH = 110;
+const C_LEN_SETLBL_HEIGHT = 23;
+const C_SIZ_SETLBL = 17;
+const C_LEN_SETDIFLBL_HEIGHT = 25;
+const C_SIZ_SETDIFLBL = 17;
+const C_LEN_SETMINI_WIDTH = 40;
+const C_SIZ_SETMINI = 18;
+const C_SIZ_DIFSELECTOR = 14;
+const C_SIZ_MAIN = 14;
+const C_SIZ_MUSIC_TITLE = 13;
 
 // スプライト（ムービークリップ相当）のルート
 const C_SPRITE_ROOT = `divRoot`;
@@ -58,6 +71,32 @@ const C_TYP_FUNCTION = `function`;
 const C_TYP_SWITCH = `switch`;
 const C_TYP_CALC = `calc`;
 
+// ウィンドウサイズ
+let [g_sWidth, g_sHeight] = [
+    setVal($id(`canvas-frame`).width, 600, C_TYP_FLOAT), setVal($id(`canvas-frame`).height, 500, C_TYP_FLOAT)
+];
+
+// 固定ウィンドウサイズ
+const g_windowObj = {
+    divRoot: { margin: `auto`, letterSpacing: `normal` },
+    divBack: { background: `linear-gradient(#000000, #222222)` },
+
+    optionSprite: { x: (g_sWidth - 450) / 2, y: 65 + (g_sHeight - 500) / 2, w: 450, h: 325 },
+    difList: { x: 165, y: 65, w: 280, h: 255, overflow: `auto` },
+    difCover: { x: 25, y: 65, w: 140, h: 255, overflow: `auto`, opacity: 0.95 },
+
+    scoreDetail: { x: 20, y: 90, w: 420, h: 230, visibility: `hidden` },
+    detailObj: { w: 420, h: 230, visibility: `hidden` },
+
+    displaySprite: { x: 25, y: 30, w: (g_sWidth - 450) / 2, h: C_LEN_SETLBL_HEIGHT * 5 },
+    keyconSprite: { y: 88 + (g_sHeight - 500) / 2, h: g_sHeight, overflow: `auto` },
+
+    loader: { y: g_sHeight - 10, h: 10, backgroundColor: `#333333` },
+
+    playDataWindow: { x: g_sWidth / 2 - 225, y: 70 + (g_sHeight - 500) / 2, w: 450, h: 110 },
+    resultWindow: { x: g_sWidth / 2 - 200, y: 185 + (g_sHeight - 500) / 2, w: 400, h: 210 },
+};
+
 const g_imgObj = {};
 
 // 画像ファイル
@@ -223,20 +262,6 @@ const C_BLOCK_KEYS = [
 ];
 
 /** 設定・オプション画面用共通 */
-const C_LEN_SETLBL_LEFT = 160;
-const C_LEN_SETLBL_WIDTH = 210;
-const C_LEN_DIFSELECTOR_WIDTH = 250;
-const C_LEN_DIFCOVER_WIDTH = 110;
-const C_LEN_SETLBL_HEIGHT = 23;
-const C_SIZ_SETLBL = 17;
-const C_LEN_SETDIFLBL_HEIGHT = 25;
-const C_SIZ_SETDIFLBL = 17;
-const C_LEN_SETMINI_WIDTH = 40;
-const C_SIZ_SETMINI = 18;
-const C_SIZ_DIFSELECTOR = 14;
-const C_SIZ_MAIN = 14;
-const C_SIZ_MUSIC_TITLE = 13;
-
 const C_LEN_GRAPH_WIDTH = 286;
 const C_LEN_GRAPH_HEIGHT = 226;
 const C_CLR_SPEEDGRAPH_SPEED = `#cc3333`;
@@ -563,10 +588,6 @@ let g_storeSettings = [`appearance`, `opacity`, `d_stepzone`, `d_judgment`, `d_f
 
 let g_canDisabledSettings = [`motion`, `scroll`, `shuffle`, `autoPlay`, `gauge`, `appearance`];
 
-// サイズ(後で指定)
-let g_sWidth;
-let g_sHeight;
-
 const g_hidSudObj = {
     filterPos: 10,
 
@@ -2393,6 +2414,10 @@ const g_dfColorLightObj = {
     ],
 };
 
+/**
+ * 特殊文字列の置き換えリスト
+ * (置き換え元、置き換え先の組で二次元配列として定義。主にreplaceStr関数で使用)
+ */
 const g_escapeStr = {
     escape: [[`&`, `&amp;`], [`<`, `&lt;`], [`>`, `&gt;`], [`"`, `&quot;`]],
     escapeTag: [
@@ -2407,6 +2432,17 @@ const g_escapeStr = {
     escapeCode: [
         [`<script>`, ``], [`</script>`, ``],
     ],
+    musicNameSimple: [
+        [`<br>`, ` `], [`<nbr>`, ``], [`<dbr>`, `　`],
+    ],
+    musicNameMultiLine: [
+        [`<nbr>`, `<br>`], [`<dbr>`, `<br>`],
+    ],
+    frzName: [
+        [`leftdia`, `frzLdia`], [`rightdia`, `frzRdia`],
+        [`left`, `frzLeft`], [`down`, `frzDown`], [`up`, `frzUp`], [`right`, `frzRight`],
+        [`space`, `frzSpace`], [`iyo`, `frzIyo`], [`gor`, `frzGor`], [`oni`, `foni`],
+    ],
 };
 
 /**

package/js/lib/danoni_legacy_function.js

@@ -5,7 +5,7 @@
  *
  * Source by tickle
  * Created : 2019/11/19
- * Revised : 2021/04/28 (v22.0.0)
+ * Revised : 2022/03/18 (v27.0.0)
  *
  * https://github.com/cwtickle/danoniplus
  */
@@ -609,3 +609,86 @@ function createDivCustomLabel(_id, _x, _y, _width, _height, _fontsize, _color, _
 
     return div;
 }
+
+/**
+ * 外部jsファイルの読込 (callback)
+ * 読込可否を g_loadObj[ファイル名] で管理 (true: 読込成功, false: 読込失敗)
+ * @deprecated v27以降非推奨
+ * @param {string} _url 
+ * @param {function} _callback 
+ * @param {boolean} _requiredFlg (default : true / 読込必須)
+ * @param {string} _charset (default : UTF-8)
+ */
+function loadScript(_url, _callback, _requiredFlg = true, _charset = `UTF-8`) {
+    const baseUrl = _url.split(`?`)[0];
+    g_loadObj[baseUrl] = false;
+    const script = document.createElement(`script`);
+    script.type = `text/javascript`;
+    script.src = _url;
+    script.charset = _charset;
+    script.onload = _ => {
+        g_loadObj[baseUrl] = true;
+        _callback();
+    };
+    script.onerror = _ => {
+        if (_requiredFlg) {
+            makeWarningWindow(g_msgInfoObj.E_0041.split(`{0}`).join(_url.split(`?`)[0]));
+        } else {
+            _callback();
+        }
+    };
+    document.querySelector(`head`).appendChild(script);
+}
+
+/**
+ * CSSファイルの読み込み (callback)
+ * デフォルトは danoni_skin_default.css を読み込む
+ * @deprecated v27以降非推奨
+ * @param {url} _href 
+ * @param {function} _func
+ */
+function importCssFile(_href, _func) {
+    const baseUrl = _href.split(`?`)[0];
+    g_loadObj[baseUrl] = false;
+    const link = document.createElement(`link`);
+    link.rel = `stylesheet`;
+    link.href = _href;
+    link.onload = _ => {
+        g_loadObj[baseUrl] = true;
+        _func();
+    };
+    link.onerror = _ => {
+        makeWarningWindow(g_msgInfoObj.E_0041.split(`{0}`).join(baseUrl), { resetFlg: `title` });
+        _func();
+    };
+    document.head.appendChild(link);
+}
+
+/**
+ * js, cssファイルの連続読込 (callback)
+ * @deprecated v27以降非推奨
+ * @param {number} _j 
+ * @param {array} _fileData 
+ * @param {string} _loadType
+ * @param {function} _afterFunc 
+ */
+function loadMultipleFiles(_j, _fileData, _loadType, _afterFunc = _ => true) {
+    if (_j < _fileData.length) {
+        const filePath = `${_fileData[_j][1]}${_fileData[_j][0]}?${new Date().getTime()}`;
+        if (_fileData[_j][0].endsWith(`.css`)) {
+            _loadType = `css`;
+        }
+
+        // jsファイル、cssファイルにより呼び出す関数を切替
+        if (_loadType === `js`) {
+            loadScript(filePath, _ =>
+                loadMultipleFiles(_j + 1, _fileData, _loadType, _afterFunc), false);
+        } else if (_loadType === `css`) {
+            const cssPath = filePath.split(`.js`).join(`.css`);
+            importCssFile(cssPath, _ =>
+                loadMultipleFiles(_j + 1, _fileData, _loadType, _afterFunc));
+        }
+    } else {
+        _afterFunc();
+    }
+}

package/package.json

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