Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
T
Taiko Web
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nanahira
Taiko Web
Commits
7958afc0
Commit
7958afc0
authored
Sep 20, 2018
by
LoveEevee
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix fire animation and dai notes
parent
8f4af0e2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
7 deletions
+11
-7
public/src/js/game.js
public/src/js/game.js
+2
-2
public/src/js/view.js
public/src/js/view.js
+2
-2
public/src/js/viewassets.js
public/src/js/viewassets.js
+7
-3
No files found.
public/src/js/game.js
View file @
7958afc0
...
...
@@ -91,7 +91,7 @@ class Game{
}
else
if
(
currentTime
>
endTime
){
if
(
drumrollNotes
){
circle
.
updateStatus
(
-
1
)
circle
.
played
(
0
)
circle
.
played
(
0
,
false
)
this
.
updateCurrentCircle
()
if
(
this
.
controller
.
multiplayer
==
1
){
p2
.
send
(
"
drumroll
"
,
{
...
...
@@ -102,7 +102,7 @@ class Game{
if
(
!
this
.
controller
.
autoPlayEnabled
){
circle
.
updateStatus
(
-
1
)
var
currentScore
=
0
circle
.
played
(
currentScore
)
circle
.
played
(
currentScore
,
type
===
"
daiDon
"
||
type
===
"
daiKa
"
)
this
.
controller
.
displayScore
(
currentScore
,
true
)
this
.
updateCurrentCircle
()
this
.
updateCombo
(
currentScore
)
...
...
public/src/js/view.js
View file @
7958afc0
...
...
@@ -31,7 +31,7 @@ class View{
this
.
currentScore
=
0
this
.
special
=
""
this
.
scoreDispCount
=
-
1
this
.
scoreOpacity
=
1
.0
this
.
scoreOpacity
=
1
this
.
lastMeasure
=
0
this
.
currentTimingPoint
=
0
...
...
@@ -418,7 +418,7 @@ class View{
var
timeForDistance
=
this
.
posToMs
(
this
.
distanceForCircle
+
this
.
bigCircleSize
/
2
,
speed
)
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
(
ms
>=
startingTime
&&
ms
<=
finishTime
){
...
...
public/src/js/viewassets.js
View file @
7958afc0
...
...
@@ -54,9 +54,12 @@ class ViewAssets{
var
imgh
=
370
var
scale
=
175
var
ms
=
this
.
controller
.
getElapsedTime
().
ms
var
grow
=
Math
.
min
(
100
,
ms
-
this
.
view
.
gogoTimeStarted
)
/
100
if
(
!
this
.
view
.
gogoTime
){
grow
=
1
-
grow
var
elapsed
=
ms
-
this
.
view
.
gogoTimeStarted
if
(
this
.
view
.
gogoTime
){
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
h
=
(
this
.
view
.
barH
*
imgh
)
/
scale
*
grow
...
...
@@ -72,6 +75,7 @@ class ViewAssets{
h
:
h
,
callback
:
()
=>
{
this
.
ctx
.
globalCompositeOperation
=
"
source-over
"
this
.
ctx
.
globalAlpha
=
1
}
}
})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment