Merge branch 'release/v1.6.8'

ChangeLog.md

@@ -1,3 +1,8 @@
+### 2022-03-24 v1.6.8
+
+ - 安全牌がなくやや危険な牌を切ってオリたときに、検討モードでその牌が黄色で表示されないバグを修正
+ - 脆弱性警告に対処(minimist 1.2.5 → 1.2.6)
+
 ### 2022-03-05 v1.6.7
 
  - #99 副露後に役を崩してしまう打牌をすることがあるバグを修正

package.json

@@ -1,14 +1,14 @@
 {
   "name": "majiang",
-  "version": "1.6.7",
+  "version": "1.6.8",
   "description": "HTML5 + JavaScript で動作する麻雀アプリ「電脳麻将」",
   "main": "src/js/majiang.js",
   "private": true,
   "scripts": {
     "preinstall": "npx npm-force-resolutions",
     "build:html": "pug -o www -P src/html/page/",
     "build:js": "webpack --mode development --devtool inline-source-map",
-    "build:css": "stylus src/css/index.styl -o www/css/majiang-1.6.7.css",
+    "build:css": "stylus src/css/index.styl -o www/css/majiang-1.6.8.css",
     "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",
     "test": "mocha -u tdd",

src/html/version.pug

@@ -1 +1 @@
-- var version = '1.6.7'
+- var version = '1.6.8'

src/js/majiang.js

@@ -1,6 +1,6 @@
 /*!
  *
- *  Majiang v1.6.7
+ *  Majiang v1.6.8
  *
  *  Copyright(C) 2017 Satoshi Kobayashi
  *  Released under the MIT license
@@ -10,7 +10,7 @@
 "use strict";
 
 module.exports = {
-    VERSION: '1.6.7',
+    VERSION: '1.6.8',
     Shoupai: require('./majiang/shoupai'),
     Shan:    require('./majiang/shan'),
     He:      require('./majiang/he'),

src/js/majiang/player.js

@@ -573,7 +573,8 @@ select_dapai(info) {
             info.push({
                 p: anquan.substr(0,2),
                 n_xiangting: Majiang.Util.xiangting(
-                                        this._shoupai.clone().dapai(anquan))
+                                        this._shoupai.clone().dapai(anquan)),
+                weixian: weixian(anquan)
             });
         }
     }