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

Fix fire animation and dai notes

Browse Source
This commit is contained in:
LoveEevee 2018-09-20 20:04:22 +03:00
parent 8f4af0e21e
commit 7958afc0f0
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/src/js/game.js
View File

@ -91,7 +91,7 @@ class Game{
}else if(currentTime > endTime){ }else if(currentTime > endTime){
if(drumrollNotes){ if(drumrollNotes){
circle.updateStatus(-1) circle.updateStatus(-1)
circle.played(0) circle.played(0, false)
this.updateCurrentCircle() this.updateCurrentCircle()
if(this.controller.multiplayer == 1){ if(this.controller.multiplayer == 1){
p2.send("drumroll", { p2.send("drumroll", {
@ -102,7 +102,7 @@ class Game{
if(!this.controller.autoPlayEnabled){ if(!this.controller.autoPlayEnabled){
circle.updateStatus(-1) circle.updateStatus(-1)
var currentScore = 0 var currentScore = 0
circle.played(currentScore) circle.played(currentScore, type === "daiDon" || type === "daiKa")
this.controller.displayScore(currentScore, true) this.controller.displayScore(currentScore, true)
this.updateCurrentCircle() this.updateCurrentCircle()
this.updateCombo(currentScore) this.updateCombo(currentScore)

4
public/src/js/view.js
View File

@ -31,7 +31,7 @@ class View{
this.currentScore = 0 this.currentScore = 0
this.special = "" this.special = ""
this.scoreDispCount = -1 this.scoreDispCount = -1
this.scoreOpacity = 1.0 this.scoreOpacity = 1
this.lastMeasure = 0 this.lastMeasure = 0
this.currentTimingPoint = 0 this.currentTimingPoint = 0
@ -418,7 +418,7 @@ class View{
var timeForDistance = this.posToMs(this.distanceForCircle + this.bigCircleSize / 2, speed) var timeForDistance = this.posToMs(this.distanceForCircle + this.bigCircleSize / 2, speed)
var startingTime = circle.getMS() - timeForDistance var startingTime = circle.getMS() - timeForDistance
var finishTime = circle.getEndTime() + this.posToMs(this.slotX - this.taikoSquareW + this.bigCircleSize / 2, speed) var finishTime = circle.getEndTime() + this.posToMs(this.slotX - this.taikoSquareW + this.bigCircleSize * 3, speed)
if(!circle.getPlayed() || circle.getScore() === 0){ if(!circle.getPlayed() || circle.getScore() === 0){
if(ms >= startingTime && ms <= finishTime){ if(ms >= startingTime && ms <= finishTime){

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

@ -54,9 +54,12 @@ class ViewAssets{
var imgh = 370 var imgh = 370
var scale = 175 var scale = 175
var ms = this.controller.getElapsedTime().ms var ms = this.controller.getElapsedTime().ms
var grow = Math.min(100, ms - this.view.gogoTimeStarted) / 100 var elapsed = ms - this.view.gogoTimeStarted
if(!this.view.gogoTime){ if(this.view.gogoTime){
grow = 1 - grow var grow = 3 - Math.min(200, elapsed) / 100
this.ctx.globalAlpha = Math.min(200, elapsed) / 200
}else{
var grow = 1 - Math.min(100, elapsed) / 100
} }
var w = (this.view.barH * imgw) / scale * grow var w = (this.view.barH * imgw) / scale * grow
var h = (this.view.barH * imgh) / scale * grow var h = (this.view.barH * imgh) / scale * grow
@ -72,6 +75,7 @@ class ViewAssets{
h: h, h: h,
callback: () => { callback: () => {
this.ctx.globalCompositeOperation = "source-over" this.ctx.globalCompositeOperation = "source-over"
this.ctx.globalAlpha = 1
} }
} }
}) })