Skip to content

Commit

Permalink
Merge branch 'release/v1.1.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
kobalab committed May 29, 2019
2 parents b33d148 + ba85d4f commit b9a228d
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 7 deletions.
5 changes: 5 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
### 2019-05-29 v1.1.3

- 何切る解答機の初期表示の乱れを修正
- スマートフォンで音声が再生されないバグを修正

### 2019-05-21 v1.1.2

- 長時間利用すると音声が再生されなくなる場合がある問題に対処
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "majiang",
"version": "1.1.2",
"version": "1.1.3",
"description": "HTML5 + JavaScript で動作する麻雀アプリ「電脳麻将」",
"main": "src/js/majiang.js",
"private": true,
Expand Down
4 changes: 4 additions & 0 deletions src/css/base.styl
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,10 @@ body.demo {
}
}

#dapai {
display: none;
}

#paiga div {
width: 780px;
color: black;
Expand Down
2 changes: 1 addition & 1 deletion src/js/majiang.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"use strict";

module.exports = {
VERSION: '1.1.2',
VERSION: '1.1.3',
Shoupai: require('./majiang/shoupai'),
Shan: require('./majiang/shan'),
He: require('./majiang/he'),
Expand Down
13 changes: 9 additions & 4 deletions src/js/majiang/view/game.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ constructor(root, model) {

this._timer_id;

this._audio = _audio;
this._audio = get_audio();
}

redraw() {
Expand Down Expand Up @@ -386,16 +386,21 @@ summary(paipu) {

}

let _audio = {};
$(function(){
let _audio;
function get_audio() {

if (_audio) return _audio;

_audio = {};
for (let name of ['dapai','chi','peng','gang','rong','zimo','lizhi']) {
_audio[name] = [];
for (let l = 0; l < 4; l++) {
_audio[name][l] = audio(name);
}
}
_audio.gong = audio('gong');
});
return _audio;
}

let _tr;
$(function(){
Expand Down

0 comments on commit b9a228d

Please sign in to comment.