Add fallback font

This commit is contained in:
LoveEevee 2018-10-12 21:21:21 +03:00
parent f80565f25b
commit fecf4d86b6
6 changed files with 13 additions and 10 deletions

View File

@ -32,7 +32,7 @@
border:.5vmin solid #ae7a26; border:.5vmin solid #ae7a26;
background: #fff; background: #fff;
color: #000; color: #000;
font-family: TnT; font-family: TnT, Meiryo, sans-serif;
font-size: 3.5vmin; font-size: 3.5vmin;
border-radius: 1.5vmin; border-radius: 1.5vmin;
outline: none; outline: none;

View File

@ -21,7 +21,7 @@ body{
margin: 0; margin: 0;
padding: 0; padding: 0;
background: #fe7839 url("/assets/img/bg-pattern-1.png") top center; background: #fe7839 url("/assets/img/bg-pattern-1.png") top center;
font-family: TnT; font-family: TnT, Meiryo, sans-serif;
} }
#assets{ #assets{
display: none; display: none;
@ -234,7 +234,7 @@ kbd{
bottom: 1vh; bottom: 1vh;
right: 1vh; right: 1vh;
opacity: 0.7; opacity: 0.7;
font-family: TnT; font-family: TnT, Meiryo, sans-serif;
} }
#version a { #version a {

View File

@ -103,7 +103,7 @@ class CanvasTest{
var comboX = 100 var comboX = 100
var comboY = 100 var comboY = 100
var fontSize = 120 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.textAlign = "center"
this.ctx.strokeStyle = "#000" this.ctx.strokeStyle = "#000"
this.ctx.lineWidth = fontSize / 10 this.ctx.lineWidth = fontSize / 10

View File

@ -10,7 +10,7 @@ class Scoresheet{
this.canvas = document.getElementById("canvas") this.canvas = document.getElementById("canvas")
this.ctx = this.canvas.getContext("2d") this.ctx = this.canvas.getContext("2d")
this.font = "TnT" this.font = "TnT, Meiryo, sans-serif"
this.state = { this.state = {
screen: "fadeIn", screen: "fadeIn",
screenMS: this.getMS(), screenMS: this.getMS(),

View File

@ -78,7 +78,7 @@ class SongSelect{
outline: "#656565" outline: "#656565"
} }
} }
this.font = "TnT" this.font = "TnT, Meiryo, sans-serif"
this.songs = [] this.songs = []
for(let song of assets.songs){ for(let song of assets.songs){
@ -432,6 +432,9 @@ class SongSelect{
this.state.locked = true this.state.locked = true
this.state.moveHover = null this.state.moveHover = null
this.state.ura = 0 this.state.ura = 0
if(this.selectedDiff === 5){
this.selectedDiff = 4
}
assets.sounds["don"].play() assets.sounds["don"].play()
assets.sounds["song-select"].stop() assets.sounds["song-select"].stop()

View File

@ -76,7 +76,7 @@ class View{
} }
} }
run(){ run(){
this.ctx.font = "normal 14pt TnT" this.ctx.font = "normal 14pt TnT, Meiryo, sans-serif"
this.setBackground() this.setBackground()
if(this.controller.multiplayer !== 2){ if(this.controller.multiplayer !== 2){
@ -321,7 +321,7 @@ class View{
var comboX = this.taikoX + this.taikoW / 2 var comboX = this.taikoX + this.taikoW / 2
var comboY = this.barY + this.barH / 2 var comboY = this.barY + this.barH / 2
var fontSize = this.taikoH * 0.4 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.textAlign = "center"
this.ctx.strokeStyle = "#000" this.ctx.strokeStyle = "#000"
this.ctx.lineWidth = fontSize / 10 this.ctx.lineWidth = fontSize / 10
@ -357,7 +357,7 @@ class View{
}else{ }else{
this.ctx.fillStyle = "#fff" 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.ctx.lineWidth = fontSize / 5
this.strokeFillText("コンボ", this.strokeFillText("コンボ",
comboX, comboX,
@ -389,7 +389,7 @@ class View{
var fontSize = 0.7 * this.scoreSquareH var fontSize = 0.7 * this.scoreSquareH
// Draw score text // 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.fillStyle = "#fff"
this.ctx.textAlign = "center" this.ctx.textAlign = "center"
var glyph = this.ctx.measureText("0").width var glyph = this.ctx.measureText("0").width