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
448927ad
Commit
448927ad
authored
Sep 20, 2018
by
LoveEevee
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix tabbing out before drumrolls on auto play
parent
7958afc0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
21 deletions
+27
-21
public/src/js/game.js
public/src/js/game.js
+17
-17
public/src/js/mekadon.js
public/src/js/mekadon.js
+10
-4
No files found.
public/src/js/game.js
View file @
448927ad
...
@@ -18,7 +18,7 @@ class Game{
...
@@ -18,7 +18,7 @@ class Game{
}
}
this
.
HPGain
=
100
/
this
.
songData
.
circles
.
filter
(
circle
=>
{
this
.
HPGain
=
100
/
this
.
songData
.
circles
.
filter
(
circle
=>
{
var
type
=
circle
.
getType
()
var
type
=
circle
.
getType
()
return
type
==
"
don
"
||
type
==
"
ka
"
||
type
==
"
daiDon
"
||
type
==
"
daiKa
"
return
type
==
=
"
don
"
||
type
===
"
ka
"
||
type
===
"
daiDon
"
||
type
=
==
"
daiKa
"
}).
length
}).
length
this
.
paused
=
false
this
.
paused
=
false
this
.
started
=
false
this
.
started
=
false
...
@@ -89,17 +89,17 @@ class Game{
...
@@ -89,17 +89,17 @@ class Game{
}
}
}
}
}
else
if
(
currentTime
>
endTime
){
}
else
if
(
currentTime
>
endTime
){
if
(
drumrollNotes
){
if
(
!
this
.
controller
.
autoPlayEnabled
){
circle
.
updateStatus
(
-
1
)
if
(
drumrollNotes
){
circle
.
played
(
0
,
false
)
circle
.
updateStatus
(
-
1
)
this
.
updateCurrentCircle
(
)
circle
.
played
(
0
,
false
)
if
(
this
.
controller
.
multiplayer
==
1
){
this
.
updateCurrentCircle
()
p2
.
send
(
"
drumroll
"
,
{
if
(
this
.
controller
.
multiplayer
===
1
)
{
p
ace
:
(
this
.
getElapsedTime
().
ms
-
circle
.
getMS
())
/
circle
.
timesHit
p
2
.
send
(
"
drumroll
"
,
{
})
pace
:
(
this
.
getElapsedTime
().
ms
-
circle
.
getMS
())
/
circle
.
timesHit
}
})
}
else
{
}
if
(
!
this
.
controller
.
autoPlayEnabled
)
{
}
else
{
circle
.
updateStatus
(
-
1
)
circle
.
updateStatus
(
-
1
)
var
currentScore
=
0
var
currentScore
=
0
circle
.
played
(
currentScore
,
type
===
"
daiDon
"
||
type
===
"
daiKa
"
)
circle
.
played
(
currentScore
,
type
===
"
daiDon
"
||
type
===
"
daiKa
"
)
...
@@ -107,11 +107,11 @@ class Game{
...
@@ -107,11 +107,11 @@ class Game{
this
.
updateCurrentCircle
()
this
.
updateCurrentCircle
()
this
.
updateCombo
(
currentScore
)
this
.
updateCombo
(
currentScore
)
this
.
updateGlobalScore
(
currentScore
,
1
)
this
.
updateGlobalScore
(
currentScore
,
1
)
}
if
(
this
.
controller
.
multiplayer
===
1
){
if
(
this
.
controller
.
multiplayer
===
1
)
{
p2
.
send
(
"
note
"
,
{
p2
.
send
(
"
note
"
,
{
score
:
-
1
score
:
-
1
})
}
)
}
}
}
}
}
}
}
...
...
public/src/js/mekadon.js
View file @
448927ad
...
@@ -8,9 +8,15 @@ class Mekadon{
...
@@ -8,9 +8,15 @@ class Mekadon{
}
}
play
(
circle
){
play
(
circle
){
var
type
=
circle
.
getType
()
var
type
=
circle
.
getType
()
if
(
type
==
"
balloon
"
){
if
((
type
===
"
balloon
"
||
type
===
"
drumroll
"
||
type
===
"
daiDrumroll
"
)
&&
this
.
getMS
()
>
circle
.
getEndTime
()){
circle
.
updateStatus
(
-
1
)
circle
.
played
(
0
,
false
)
this
.
game
.
updateCurrentCircle
()
}
type
=
circle
.
getType
()
if
(
type
===
"
balloon
"
){
this
.
playDrumrollAt
(
circle
,
0
,
30
)
this
.
playDrumrollAt
(
circle
,
0
,
30
)
}
else
if
(
type
==
"
drumroll
"
||
type
==
"
daiDrumroll
"
){
}
else
if
(
type
==
=
"
drumroll
"
||
type
=
==
"
daiDrumroll
"
){
this
.
playDrumrollAt
(
circle
,
0
,
60
)
this
.
playDrumrollAt
(
circle
,
0
,
60
)
}
else
{
}
else
{
this
.
playAt
(
circle
,
0
,
450
)
this
.
playAt
(
circle
,
0
,
450
)
...
@@ -59,12 +65,12 @@ class Mekadon{
...
@@ -59,12 +65,12 @@ class Mekadon{
this
.
setKey
(
this
.
lr
?
kbd
[
"
ka_l
"
]
:
kbd
[
"
ka_r
"
])
this
.
setKey
(
this
.
lr
?
kbd
[
"
ka_l
"
]
:
kbd
[
"
ka_r
"
])
this
.
lr
=
!
this
.
lr
this
.
lr
=
!
this
.
lr
}
}
if
(
type
==
"
balloon
"
){
if
(
type
==
=
"
balloon
"
){
if
(
circle
.
requiredHits
==
1
){
if
(
circle
.
requiredHits
==
1
){
assets
.
sounds
[
"
balloon
"
].
play
()
assets
.
sounds
[
"
balloon
"
].
play
()
}
}
this
.
game
.
checkBalloon
(
circle
)
this
.
game
.
checkBalloon
(
circle
)
}
else
if
(
type
==
"
drumroll
"
||
type
==
"
daiDrumroll
"
){
}
else
if
(
type
==
=
"
drumroll
"
||
type
=
==
"
daiDrumroll
"
){
this
.
game
.
checkDrumroll
(
circle
)
this
.
game
.
checkDrumroll
(
circle
)
}
else
{
}
else
{
if
(
typeof
score
==
"
undefined
"
){
if
(
typeof
score
==
"
undefined
"
){
...
...
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