diff --git a/ChangeLog.md b/ChangeLog.md index e412bd9..d93be04 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,8 @@ +### v2.4.6 / 2024-11-11 + + - 牌譜ビューアがネット上の牌譜をロードするときにメッセージを表示するよう修正 + - @kobalab/majiang-ui 1.4.5 → 1.4.6 + ### v2.4.5 / 2024-11-09 - 牌譜エディタの和了情報入力でドラの初期値にカンドラが含まれないバグを修正 diff --git a/package-lock.json b/package-lock.json index 7514927..ff2e657 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,17 +1,17 @@ { "name": "majiang", - "version": "2.4.5", + "version": "2.4.6", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "majiang", - "version": "2.4.5", + "version": "2.4.6", "license": "MIT", "dependencies": { "@kobalab/majiang-ai": "^1.0.10", "@kobalab/majiang-core": "^1.3.1", - "@kobalab/majiang-ui": "^1.4.5", + "@kobalab/majiang-ui": "^1.4.6", "@kobalab/tenhou-url-log": "^1.0.2", "jquery": "^3.7.1" }, @@ -167,9 +167,9 @@ "license": "MIT" }, "node_modules/@kobalab/majiang-ui": { - "version": "1.4.5", - "resolved": "https://registry.npmjs.org/@kobalab/majiang-ui/-/majiang-ui-1.4.5.tgz", - "integrity": "sha512-bISa+BLUgY+woHxCvb0n2NYvRgMrl94PTW384IyfWIyR9f6l1HJdtMTIvWmro98XLLkhK6qQtP3QtaSidAVQwQ==", + "version": "1.4.6", + "resolved": "https://registry.npmjs.org/@kobalab/majiang-ui/-/majiang-ui-1.4.6.tgz", + "integrity": "sha512-jsEWkJyai6DXsMH7prczobqwPEgCw0vNjkCocT+Khx6EZVCO30Z/twSFUjGWjJlOo2eclmw6qH+9ta+hRXqJ2Q==", "license": "MIT", "dependencies": { "@kobalab/majiang-ai": "^1.0.10", @@ -2493,9 +2493,9 @@ "integrity": "sha512-5qWMX05vnMZYfEUuNbk+DxY/5FVDiHAXBhsnqzt/D+8fS9h+7OSYjpYY1Lx/RLaJkOlH48Cz37UzyJEtj7zK3Q==" }, "@kobalab/majiang-ui": { - "version": "1.4.5", - "resolved": "https://registry.npmjs.org/@kobalab/majiang-ui/-/majiang-ui-1.4.5.tgz", - "integrity": "sha512-bISa+BLUgY+woHxCvb0n2NYvRgMrl94PTW384IyfWIyR9f6l1HJdtMTIvWmro98XLLkhK6qQtP3QtaSidAVQwQ==", + "version": "1.4.6", + "resolved": "https://registry.npmjs.org/@kobalab/majiang-ui/-/majiang-ui-1.4.6.tgz", + "integrity": "sha512-jsEWkJyai6DXsMH7prczobqwPEgCw0vNjkCocT+Khx6EZVCO30Z/twSFUjGWjJlOo2eclmw6qH+9ta+hRXqJ2Q==", "requires": { "@kobalab/majiang-ai": "^1.0.10", "@kobalab/majiang-core": "^1.3.1", diff --git a/package.json b/package.json index 4028601..7c94f6e 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { "name": "majiang", - "version": "2.4.5", + "version": "2.4.6", "description": "HTML5 + JavaScript で動作する麻雀アプリ「電脳麻将」", "private": true, "scripts": { "build:html": "pug -o dist -P src/html/page/", - "build:css": "stylus src/css/index.styl -o dist/css/majiang-2.4.5.css", + "build:css": "stylus src/css/index.styl -o dist/css/majiang-2.4.6.css", "build:js": "webpack --mode development --devtool inline-source-map", "build": "npm run build:html && npm run build:css && npm run build:js", "release": "npm run build:html && npm run build:css && webpack --mode production", @@ -33,7 +33,7 @@ "dependencies": { "@kobalab/majiang-ai": "^1.0.10", "@kobalab/majiang-core": "^1.3.1", - "@kobalab/majiang-ui": "^1.4.5", + "@kobalab/majiang-ui": "^1.4.6", "@kobalab/tenhou-url-log": "^1.0.2", "jquery": "^3.7.1" } diff --git a/src/css/file.styl b/src/css/file.styl index c3ba712..8b2533e 100644 --- a/src/css/file.styl +++ b/src/css/file.styl @@ -108,11 +108,19 @@ body.file input[name="room_no"] width: 3em .error - transition: opacity 0.5s + .loading + transition: opacity 0.5s ease-out margin: 2px 0px border-radius: 5px border: solid 1px #f99 - color: red - background: #fdd padding: 4px 1em font-family: menu-font + .error + color: red + background: #fdd + .loading + color: green + background: #cfc + border: solid 1px #090 + .blink + animation: blink-text 2s infinite diff --git a/src/html/inc/file.pug b/src/html/inc/file.pug index f8f4dd1..b1271b2 100644 --- a/src/html/inc/file.pug +++ b/src/html/inc/file.pug @@ -67,6 +67,8 @@ if page == 'paipu' .error.hide + .loading.hide + .blink 牌譜取得中...... label.upload img(src="img/icon-upload-alt.png") | 牌譜追加 diff --git a/src/html/inc/version.pug b/src/html/inc/version.pug index 234860c..9157eca 100644 --- a/src/html/inc/version.pug +++ b/src/html/inc/version.pug @@ -1 +1 @@ -- var version = '2.4.5' +- var version = '2.4.6' diff --git a/src/js/autoplay.js b/src/js/autoplay.js index 4535a57..52e79f5 100644 --- a/src/js/autoplay.js +++ b/src/js/autoplay.js @@ -1,5 +1,5 @@ /*! - * 電脳麻将: 自動対戦 v2.4.5 + * 電脳麻将: 自動対戦 v2.4.6 * * Copyright(C) 2017 Satoshi Kobayashi * Released under the MIT license diff --git a/src/js/dapai.js b/src/js/dapai.js index 04f00b3..18a0787 100644 --- a/src/js/dapai.js +++ b/src/js/dapai.js @@ -1,5 +1,5 @@ /*! - * 電脳麻将: 何切る解答機 v2.4.5 + * 電脳麻将: 何切る解答機 v2.4.6 * * Copyright(C) 2017 Satoshi Kobayashi * Released under the MIT license diff --git a/src/js/drill.js b/src/js/drill.js index a88af9b..fbfaa94 100644 --- a/src/js/drill.js +++ b/src/js/drill.js @@ -1,5 +1,5 @@ /*! - * 電脳麻将: 点数計算ドリル v2.4.5 + * 電脳麻将: 点数計算ドリル v2.4.6 * * Copyright(C) 2017 Satoshi Kobayashi * Released under the MIT license diff --git a/src/js/hule.js b/src/js/hule.js index eaff5f8..cae7a75 100644 --- a/src/js/hule.js +++ b/src/js/hule.js @@ -1,5 +1,5 @@ /*! - * 電脳麻将: 和了点計算 v2.4.5 + * 電脳麻将: 和了点計算 v2.4.6 * * Copyright(C) 2017 Satoshi Kobayashi * Released under the MIT license diff --git a/src/js/index.js b/src/js/index.js index dab39fc..931bb42 100644 --- a/src/js/index.js +++ b/src/js/index.js @@ -1,5 +1,5 @@ /*! - * 電脳麻将 v2.4.5 + * 電脳麻将 v2.4.6 * * Copyright(C) 2017 Satoshi Kobayashi * Released under the MIT license diff --git a/src/js/majiang.js b/src/js/majiang.js index 332a77c..e306f15 100644 --- a/src/js/majiang.js +++ b/src/js/majiang.js @@ -1,5 +1,5 @@ /*! - * 電脳麻将 v2.4.5 + * 電脳麻将 v2.4.6 * * Copyright(C) 2017 Satoshi Kobayashi * Released under the MIT license @@ -9,6 +9,6 @@ global.Majiang = require('@kobalab/majiang-core'); global.Majiang.AI = require('@kobalab/majiang-ai'); global.Majiang.UI = require('@kobalab/majiang-ui'); -global.Majiang.VERSION = '2.4.5'; +global.Majiang.VERSION = '2.4.6'; global.jQuery = require('jquery'); global.$ = jQuery; diff --git a/src/js/netplay.js b/src/js/netplay.js index 7fbb02b..daee1c0 100644 --- a/src/js/netplay.js +++ b/src/js/netplay.js @@ -1,5 +1,5 @@ /*! - * 電脳麻将: ネット対戦 v2.4.5 + * 電脳麻将: ネット対戦 v2.4.6 * * Copyright(C) 2017 Satoshi Kobayashi * Released under the MIT license diff --git a/src/js/paiga.js b/src/js/paiga.js index 8b9a0ca..8b5c8ef 100644 --- a/src/js/paiga.js +++ b/src/js/paiga.js @@ -1,5 +1,5 @@ /*! - * 電脳麻将: 牌画入力 v2.4.5 + * 電脳麻将: 牌画入力 v2.4.6 * * Copyright(C) 2017 Satoshi Kobayashi * Released under the MIT license diff --git a/src/js/paili.js b/src/js/paili.js index 5c4bec0..f376762 100644 --- a/src/js/paili.js +++ b/src/js/paili.js @@ -1,5 +1,5 @@ /*! - * 電脳麻将: 牌理 v2.4.5 + * 電脳麻将: 牌理 v2.4.6 * * Copyright(C) 2017 Satoshi Kobayashi * Released under the MIT license diff --git a/src/js/paipu.js b/src/js/paipu.js index 3f82160..f19ddd1 100644 --- a/src/js/paipu.js +++ b/src/js/paipu.js @@ -1,5 +1,5 @@ /*! - * 電脳麻将: 牌譜ビューア v2.4.5 + * 電脳麻将: 牌譜ビューア v2.4.6 * * Copyright(C) 2017 Satoshi Kobayashi * Released under the MIT license diff --git a/src/js/rule.js b/src/js/rule.js index 9887ffc..d486891 100644 --- a/src/js/rule.js +++ b/src/js/rule.js @@ -1,5 +1,5 @@ /*! - * 電脳麻将: ルール設定 v2.4.5 + * 電脳麻将: ルール設定 v2.4.6 * * Copyright(C) 2017 Satoshi Kobayashi * Released under the MIT license