Skip to content

Commit e3dbe75

Browse files
committed
Merge branch 'release/v2.3.3'
2 parents 6cb56f8 + c7db54b commit e3dbe75

15 files changed

Lines changed: 31 additions & 26 deletions

ChangeLog.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
### v2.3.3 / 2024-02-17
2+
3+
- #114 ネット対戦で持ち時間が不正に消化されるバグを修正
4+
- @kobalab/majiang-ui 1.2.0 → 1.2.1
5+
16
### v2.3.2 / 2024-02-16
27

38
- ネット対戦に持ち時間の指定と時間切れによる強制打牌の機能を追加

package-lock.json

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"name": "majiang",
3-
"version": "2.3.2",
3+
"version": "2.3.3",
44
"description": "HTML5 + JavaScript で動作する麻雀アプリ「電脳麻将」",
55
"private": true,
66
"scripts": {
77
"build:html": "pug -o dist -P src/html/page/",
8-
"build:css": "stylus src/css/index.styl -o dist/css/majiang-2.3.2.css",
8+
"build:css": "stylus src/css/index.styl -o dist/css/majiang-2.3.3.css",
99
"build:js": "webpack --mode development --devtool inline-source-map",
1010
"build": "npm run build:html && npm run build:css && npm run build:js",
1111
"release": "npm run build:html && npm run build:css && webpack --mode production",
@@ -33,7 +33,7 @@
3333
"dependencies": {
3434
"@kobalab/majiang-ai": "^1.0.9",
3535
"@kobalab/majiang-core": "^1.2.0",
36-
"@kobalab/majiang-ui": "^1.2.0",
36+
"@kobalab/majiang-ui": "^1.2.1",
3737
"jquery": "^3.7.1"
3838
}
3939
}

src/html/inc/version.pug

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
- var version = '2.3.2'
1+
- var version = '2.3.3'

src/js/autoplay.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* 電脳麻将: 自動対戦 v2.3.2
2+
* 電脳麻将: 自動対戦 v2.3.3
33
*
44
* Copyright(C) 2017 Satoshi Kobayashi
55
* Released under the MIT license

src/js/dapai.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* 電脳麻将: 何切る解答機 v2.3.2
2+
* 電脳麻将: 何切る解答機 v2.3.3
33
*
44
* Copyright(C) 2017 Satoshi Kobayashi
55
* Released under the MIT license

src/js/drill.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* 電脳麻将: 点数計算ドリル v2.3.2
2+
* 電脳麻将: 点数計算ドリル v2.3.3
33
*
44
* Copyright(C) 2017 Satoshi Kobayashi
55
* Released under the MIT license

src/js/hule.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* 電脳麻将: 和了点計算 v2.3.2
2+
* 電脳麻将: 和了点計算 v2.3.3
33
*
44
* Copyright(C) 2017 Satoshi Kobayashi
55
* Released under the MIT license

src/js/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* 電脳麻将 v2.3.2
2+
* 電脳麻将 v2.3.3
33
*
44
* Copyright(C) 2017 Satoshi Kobayashi
55
* Released under the MIT license

src/js/majiang.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* 電脳麻将 v2.3.2
2+
* 電脳麻将 v2.3.3
33
*
44
* Copyright(C) 2017 Satoshi Kobayashi
55
* Released under the MIT license
@@ -9,6 +9,6 @@
99
global.Majiang = require('@kobalab/majiang-core');
1010
global.Majiang.AI = require('@kobalab/majiang-ai');
1111
global.Majiang.UI = require('@kobalab/majiang-ui');
12-
global.Majiang.VERSION = '2.3.2';
12+
global.Majiang.VERSION = '2.3.3';
1313
global.jQuery = require('jquery');
1414
global.$ = jQuery;

0 commit comments

Comments
 (0)