Skip to content

Commit

Permalink
Merge branch 'release/v2.4.9'
Browse files Browse the repository at this point in the history
  • Loading branch information
kobalab committed Nov 19, 2024
2 parents 9c49ede + d2fb4bb commit bcdd415
Show file tree
Hide file tree
Showing 16 changed files with 53 additions and 40 deletions.
7 changes: 7 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
### v2.4.9 / 2024-11-19

- @kobalab/majiang-ui 1.4.8 → 1.4.9
- 赤牌2つを含む暗槓を表示できないバグを修正
- 脆弱性警告に対処
- cross-spawn 7.0.3 → 7.0.6

### v2.4.8 / 2024-11-17

- @kobalab/majiang-ui 1.4.7 → 1.4.8
Expand Down
23 changes: 14 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,19 +87,23 @@ WebSocketによる麻雀サーバーの実装です。

## ブログ記事

書籍出版以降(ver.2.0.0以降)の情報です。
書籍出版以降(ver.2.0.0以降)の情報です(カッコ内は執筆時のバージョン)

- 牌譜エディタ
- [牌譜エディタの使い方](https://blog.kobalab.net/entry/2024/10/28/000539)
- [電脳麻将でNAGA解析用のデータを作成する](https://blog.kobalab.net/entry/2024/11/02/223910)
- [牌譜エディタの使い方](https://blog.kobalab.net/entry/2024/10/28/000539) (v2.4)
- [電脳麻将でNAGA解析用のデータを作成する](https://blog.kobalab.net/entry/2024/11/02/223910) (v2.4)
- 麻雀サーバー
- [麻雀サーバーの使い方](https://blog.kobalab.net/entry/2024/02/15/081605)
- [Passportで外部認証を実現する](https://blog.kobalab.net/entry/2024/02/19/211526)
- [ネット対戦の持ち時間設定方法](https://blog.kobalab.net/entry/2024/02/17/120315)
- [麻雀サーバーの使い方](https://blog.kobalab.net/entry/2024/02/15/081605) (v2.3)
- [Passportで外部認証を実現する](https://blog.kobalab.net/entry/2024/02/19/211526) (v2.3)
- [ネット対戦の持ち時間設定方法](https://blog.kobalab.net/entry/2024/02/17/120315) (v2.3)
- 点数計算ドリル
- [電脳麻将 ver.2.2.0 公開#健数計算ドリル](https://blog.kobalab.net/entry/2023/12/24/220847#%E7%82%B9%E6%95%B0%E8%A8%88%E7%AE%97%E3%83%89%E3%83%AA%E3%83%AB)
- その他
- [天鳳鳳凰卓統計(2023年)](https://blog.kobalab.net/entry/2024/11/04/215201)
- [電脳麻将 ver.2.2.0 公開#点数計算ドリル](https://blog.kobalab.net/entry/2023/12/24/220847#%E7%82%B9%E6%95%B0%E8%A8%88%E7%AE%97%E3%83%89%E3%83%AA%E3%83%AB) (v2.2)
- [麻雀の点数計算方法(正式版・簡易版)](https://blog.kobalab.net/entry/2023/12/11/204103) (v2.2)
- アルゴリズム・その他
- [天鳳鳳凰卓統計(2023年)](https://blog.kobalab.net/entry/2024/11/04/215201) (v2.4)
- [バックトラックで麻雀の和了形一覧を求める](https://blog.kobalab.net/entry/2024/09/16/111847) (v2.3)
- [麻雀の「待ち」を出力するプログラム](https://blog.kobalab.net/entry/2022/05/01/181217) (v2.0)
- [麻雀アプリのデバッグに使える牌姿](https://blog.kobalab.net/entry/2022/04/17/174206) (v2.0)

## (旧)ブログ記事

Expand Down Expand Up @@ -167,6 +171,7 @@ ver.2.0.0 のプログラムの情報は [書籍](#書籍) をご覧ください
- [牌の危険度計算アルゴリズム(3)](https://blog.kobalab.net/entry/2021/11/15/080258) (v1.6)
- [牌の危険度計算アルゴリズム(4)](https://blog.kobalab.net/entry/2021/11/22/071442) (v1.6)
- 表示処理
- [電脳麻将におけるMVCの実装](https://blog.kobalab.net/entry/2021/03/25/205151) (v1.5)
- [麻雀の手牌を表示するプログラム](https://blog.kobalab.net/entry/2020/08/14/234729) (v1.4)
- その他
- [電脳麻将のプログラム中の中国語一覧](https://blog.kobalab.net/entry/20170722/1500688645) (v0.8)
Expand Down
31 changes: 16 additions & 15 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "majiang",
"version": "2.4.8",
"version": "2.4.9",
"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.8.css",
"build:css": "stylus src/css/index.styl -o dist/css/majiang-2.4.9.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",
Expand Down Expand Up @@ -33,7 +33,7 @@
"dependencies": {
"@kobalab/majiang-ai": "^1.0.10",
"@kobalab/majiang-core": "^1.3.1",
"@kobalab/majiang-ui": "^1.4.8",
"@kobalab/majiang-ui": "^1.4.9",
"@kobalab/tenhou-url-log": "^1.0.2",
"jquery": "^3.7.1"
}
Expand Down
2 changes: 1 addition & 1 deletion src/html/inc/version.pug
Original file line number Diff line number Diff line change
@@ -1 +1 @@
- var version = '2.4.8'
- var version = '2.4.9'
2 changes: 1 addition & 1 deletion src/js/autoplay.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* 電脳麻将: 自動対戦 v2.4.8
* 電脳麻将: 自動対戦 v2.4.9
*
* Copyright(C) 2017 Satoshi Kobayashi
* Released under the MIT license
Expand Down
2 changes: 1 addition & 1 deletion src/js/dapai.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* 電脳麻将: 何切る解答機 v2.4.8
* 電脳麻将: 何切る解答機 v2.4.9
*
* Copyright(C) 2017 Satoshi Kobayashi
* Released under the MIT license
Expand Down
2 changes: 1 addition & 1 deletion src/js/drill.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* 電脳麻将: 点数計算ドリル v2.4.8
* 電脳麻将: 点数計算ドリル v2.4.9
*
* Copyright(C) 2017 Satoshi Kobayashi
* Released under the MIT license
Expand Down
2 changes: 1 addition & 1 deletion src/js/hule.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* 電脳麻将: 和了点計算 v2.4.8
* 電脳麻将: 和了点計算 v2.4.9
*
* Copyright(C) 2017 Satoshi Kobayashi
* Released under the MIT license
Expand Down
2 changes: 1 addition & 1 deletion src/js/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* 電脳麻将 v2.4.8
* 電脳麻将 v2.4.9
*
* Copyright(C) 2017 Satoshi Kobayashi
* Released under the MIT license
Expand Down
4 changes: 2 additions & 2 deletions src/js/majiang.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* 電脳麻将 v2.4.8
* 電脳麻将 v2.4.9
*
* Copyright(C) 2017 Satoshi Kobayashi
* Released under the MIT license
Expand All @@ -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.8';
global.Majiang.VERSION = '2.4.9';
global.jQuery = require('jquery');
global.$ = jQuery;
2 changes: 1 addition & 1 deletion src/js/netplay.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* 電脳麻将: ネット対戦 v2.4.8
* 電脳麻将: ネット対戦 v2.4.9
*
* Copyright(C) 2017 Satoshi Kobayashi
* Released under the MIT license
Expand Down
2 changes: 1 addition & 1 deletion src/js/paiga.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* 電脳麻将: 牌画入力 v2.4.8
* 電脳麻将: 牌画入力 v2.4.9
*
* Copyright(C) 2017 Satoshi Kobayashi
* Released under the MIT license
Expand Down
2 changes: 1 addition & 1 deletion src/js/paili.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* 電脳麻将: 牌理 v2.4.8
* 電脳麻将: 牌理 v2.4.9
*
* Copyright(C) 2017 Satoshi Kobayashi
* Released under the MIT license
Expand Down
2 changes: 1 addition & 1 deletion src/js/paipu.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* 電脳麻将: 牌譜ビューア v2.4.8
* 電脳麻将: 牌譜ビューア v2.4.9
*
* Copyright(C) 2017 Satoshi Kobayashi
* Released under the MIT license
Expand Down
2 changes: 1 addition & 1 deletion src/js/rule.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* 電脳麻将: ルール設定 v2.4.8
* 電脳麻将: ルール設定 v2.4.9
*
* Copyright(C) 2017 Satoshi Kobayashi
* Released under the MIT license
Expand Down

0 comments on commit bcdd415

Please sign in to comment.