nanahira/taiko-web
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scoresheet: don't wait for results if no crown

Browse Source
This commit is contained in:
Bui 2018-10-13 10:08:00 +01:00
parent 5fbea99d06
commit b16f74d252
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/src/js/scoresheet.js
View File

@ -433,6 +433,7 @@ class Scoresheet{
if(elapsed >= 1200){ if(elapsed >= 1200){
ctx.save() ctx.save()
ctx.setTransform(1, 0, 0, 1, 0, 0) ctx.setTransform(1, 0, 0, 1, 0, 0)
var noCrownResultWait = -2000;
for(var p = 0; p < players; p++){ for(var p = 0; p < players; p++){
var results = this.results var results = this.results
@ -446,6 +447,7 @@ class Scoresheet{
crownType = "silver" crownType = "silver"
} }
if(crownType !== null){ if(crownType !== null){
noCrownResultWait = 0;
var amount = Math.min(1, (elapsed - 1200) / 450) var amount = Math.min(1, (elapsed - 1200) / 450)
this.draw.alpha(this.draw.easeIn(amount), ctx, ctx => { this.draw.alpha(this.draw.easeIn(amount), ctx, ctx => {
ctx.save() ctx.save()
@ -494,7 +496,7 @@ class Scoresheet{
ctx.restore() ctx.restore()
} }
if(elapsed >= 2400){ if(elapsed >= 2400 + noCrownResultWait){
ctx.save() ctx.save()
ctx.translate(frameLeft, frameTop) ctx.translate(frameLeft, frameTop)
@ -504,7 +506,7 @@ class Scoresheet{
var lastTime = 0 var lastTime = 0
for(var p = 0; p < players; p++){ for(var p = 0; p < players; p++){
var results = p === 0 ? this.results : p2.results var results = p === 0 ? this.results : p2.results
var currentTime = 3100 + results.points.length * 30 * this.frame var currentTime = 3100 + noCrownResultWait + results.points.length * 30 * this.frame
if(currentTime > lastTime){ if(currentTime > lastTime){
lastTime = currentTime lastTime = currentTime
} }
@ -537,7 +539,7 @@ class Scoresheet{
this.state.countupShown = false this.state.countupShown = false
var points = this.getNumber(results.points, 3100, elapsed) var points = this.getNumber(results.points, 3100 + noCrownResultWait, elapsed)
var scale = 1.3 var scale = 1.3
ctx.font = "35px " + this.font ctx.font = "35px " + this.font
ctx.translate(760, 286) ctx.translate(760, 286)
@ -555,7 +557,7 @@ class Scoresheet{
if(!this.state["countupTime" + p]){ if(!this.state["countupTime" + p]){
var times = {} var times = {}
var lastTime = 3100 + results.points.length * 30 * this.frame + 1000 var lastTime = 3100 + noCrownResultWait + results.points.length * 30 * this.frame + 1000
for(var i in printNumbers){ for(var i in printNumbers){
times[printNumbers[i]] = lastTime + 500 times[printNumbers[i]] = lastTime + 500
lastTime = lastTime + 500 + results[printNumbers[i]].length * 30 * this.frame lastTime = lastTime + 500 + results[printNumbers[i]].length * 30 * this.frame