diff --git a/public/src/css/game.css b/public/src/css/game.css index 6664dd0..5adad93 100644 --- a/public/src/css/game.css +++ b/public/src/css/game.css @@ -32,7 +32,7 @@ border:.5vmin solid #ae7a26; background: #fff; color: #000; - font-family: TnT; + font-family: TnT, Meiryo, sans-serif; font-size: 3.5vmin; border-radius: 1.5vmin; outline: none; diff --git a/public/src/css/main.css b/public/src/css/main.css index 119fea1..f807b79 100644 --- a/public/src/css/main.css +++ b/public/src/css/main.css @@ -21,7 +21,7 @@ body{ margin: 0; padding: 0; background: #fe7839 url("/assets/img/bg-pattern-1.png") top center; - font-family: TnT; + font-family: TnT, Meiryo, sans-serif; } #assets{ display: none; @@ -234,7 +234,7 @@ kbd{ bottom: 1vh; right: 1vh; opacity: 0.7; - font-family: TnT; + font-family: TnT, Meiryo, sans-serif; } #version a { diff --git a/public/src/js/canvastest.js b/public/src/js/canvastest.js index 5a5e92b..b952981 100644 --- a/public/src/js/canvastest.js +++ b/public/src/js/canvastest.js @@ -103,7 +103,7 @@ class CanvasTest{ var comboX = 100 var comboY = 100 var fontSize = 120 - this.ctx.font = "normal " + fontSize + "px TnT" + this.ctx.font = "normal " + fontSize + "px TnT, Meiryo, sans-serif" this.ctx.textAlign = "center" this.ctx.strokeStyle = "#000" this.ctx.lineWidth = fontSize / 10 diff --git a/public/src/js/scoresheet.js b/public/src/js/scoresheet.js index e73a224..064dbf2 100644 --- a/public/src/js/scoresheet.js +++ b/public/src/js/scoresheet.js @@ -10,7 +10,7 @@ class Scoresheet{ this.canvas = document.getElementById("canvas") this.ctx = this.canvas.getContext("2d") - this.font = "TnT" + this.font = "TnT, Meiryo, sans-serif" this.state = { screen: "fadeIn", screenMS: this.getMS(), diff --git a/public/src/js/songselect.js b/public/src/js/songselect.js index 0294273..fd3b629 100644 --- a/public/src/js/songselect.js +++ b/public/src/js/songselect.js @@ -78,7 +78,7 @@ class SongSelect{ outline: "#656565" } } - this.font = "TnT" + this.font = "TnT, Meiryo, sans-serif" this.songs = [] for(let song of assets.songs){ @@ -432,6 +432,9 @@ class SongSelect{ this.state.locked = true this.state.moveHover = null this.state.ura = 0 + if(this.selectedDiff === 5){ + this.selectedDiff = 4 + } assets.sounds["don"].play() assets.sounds["song-select"].stop() diff --git a/public/src/js/view.js b/public/src/js/view.js index 272259c..6d8d73e 100644 --- a/public/src/js/view.js +++ b/public/src/js/view.js @@ -76,7 +76,7 @@ class View{ } } run(){ - this.ctx.font = "normal 14pt TnT" + this.ctx.font = "normal 14pt TnT, Meiryo, sans-serif" this.setBackground() if(this.controller.multiplayer !== 2){ @@ -321,7 +321,7 @@ class View{ var comboX = this.taikoX + this.taikoW / 2 var comboY = this.barY + this.barH / 2 var fontSize = this.taikoH * 0.4 - this.ctx.font = "normal " + fontSize + "px TnT" + this.ctx.font = "normal " + fontSize + "px TnT, Meiryo, sans-serif" this.ctx.textAlign = "center" this.ctx.strokeStyle = "#000" this.ctx.lineWidth = fontSize / 10 @@ -357,7 +357,7 @@ class View{ }else{ this.ctx.fillStyle = "#fff" } - this.ctx.font = "normal " + fontSize + "px TnT" + this.ctx.font = "normal " + fontSize + "px TnT, Meiryo, sans-serif" this.ctx.lineWidth = fontSize / 5 this.strokeFillText("コンボ", comboX, @@ -389,7 +389,7 @@ class View{ var fontSize = 0.7 * this.scoreSquareH // Draw score text - this.ctx.font = "normal " + fontSize + "px TnT" + this.ctx.font = "normal " + fontSize + "px TnT, Meiryo, sans-serif" this.ctx.fillStyle = "#fff" this.ctx.textAlign = "center" var glyph = this.ctx.measureText("0").width