Add second player backgrounds, add fade on miss
This commit is contained in:
parent
f25aee9643
commit
6d770e7b2d
@ -137,6 +137,14 @@
|
|||||||
background-size: auto calc(var(--sh2) / var(--sh1) * 100%);
|
background-size: auto calc(var(--sh2) / var(--sh1) * 100%);
|
||||||
--raised: calc((var(--sh2) - var(--sh1)) / var(--sh2) * var(--h) * -1);
|
--raised: calc((var(--sh2) - var(--sh1)) / var(--sh2) * var(--h) * -1);
|
||||||
}
|
}
|
||||||
|
.donlayer3{
|
||||||
|
background-color: #000;
|
||||||
|
opacity: 0;
|
||||||
|
transition: 0.15s opacity linear;
|
||||||
|
}
|
||||||
|
.donbg-dark .donlayer3{
|
||||||
|
opacity: 0.5;
|
||||||
|
}
|
||||||
.donbg-1 .donlayer2,
|
.donbg-1 .donlayer2,
|
||||||
.donbg-2 .donlayer2,
|
.donbg-2 .donlayer2,
|
||||||
.donbg-4 .donlayer2,
|
.donbg-4 .donlayer2,
|
||||||
|
@ -102,6 +102,9 @@ class loadSong{
|
|||||||
}
|
}
|
||||||
if(this.selectedSong.donBg !== null){
|
if(this.selectedSong.donBg !== null){
|
||||||
filenames.push("bg_don_" + this.selectedSong.donBg)
|
filenames.push("bg_don_" + this.selectedSong.donBg)
|
||||||
|
if(this.multiplayer){
|
||||||
|
filenames.push("bg_don2_" + this.selectedSong.donBg)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
for(var i = 0; i < filenames.length; i++){
|
for(var i = 0; i < filenames.length; i++){
|
||||||
for(var letter = 0; letter < 2; letter++){
|
for(var letter = 0; letter < 2; letter++){
|
||||||
|
@ -10,6 +10,7 @@
|
|||||||
|
|
||||||
this.portraitClass = false
|
this.portraitClass = false
|
||||||
this.touchp2Class = false
|
this.touchp2Class = false
|
||||||
|
this.darkDonBg = false
|
||||||
|
|
||||||
this.pauseOptions = [
|
this.pauseOptions = [
|
||||||
"演奏をつづける",
|
"演奏をつづける",
|
||||||
@ -1000,36 +1001,39 @@
|
|||||||
var selectedSong = this.controller.selectedSong
|
var selectedSong = this.controller.selectedSong
|
||||||
var songSkinName = selectedSong.songSkin.name
|
var songSkinName = selectedSong.songSkin.name
|
||||||
var donLayers = []
|
var donLayers = []
|
||||||
|
var filename = this.multiplayer === 2 ? "bg_don2_" : "bg_don_"
|
||||||
|
|
||||||
this.donBg = document.createElement("div")
|
this.donBg = document.createElement("div")
|
||||||
this.donBg.classList.add("donbg")
|
this.donBg.classList.add("donbg")
|
||||||
if(this.multiplayer === 2){
|
if(this.multiplayer === 2){
|
||||||
this.donBg.classList.add("donbg-bottom")
|
this.donBg.classList.add("donbg-bottom")
|
||||||
}
|
}
|
||||||
for(var layer = 1; layer <= 2; layer++){
|
for(var layer = 1; layer <= 3; layer++){
|
||||||
var donLayer = document.createElement("div")
|
var donLayer = document.createElement("div")
|
||||||
donLayer.classList.add("donlayer" + layer)
|
donLayer.classList.add("donlayer" + layer)
|
||||||
this.donBg.appendChild(donLayer)
|
this.donBg.appendChild(donLayer)
|
||||||
donLayers.push(donLayer)
|
if(layer !== 3){
|
||||||
|
donLayers.push(donLayer)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
songBg.parentNode.insertBefore(this.donBg, songBg)
|
songBg.parentNode.insertBefore(this.donBg, songBg)
|
||||||
var asset1, asset2
|
var asset1, asset2
|
||||||
if(!selectedSong.songSkin.don){
|
if(!selectedSong.songSkin.don){
|
||||||
this.donBg.classList.add("donbg-" + selectedSong.donBg)
|
this.donBg.classList.add("donbg-" + selectedSong.donBg)
|
||||||
this.setLayers(donLayers, "bg_don_" + selectedSong.donBg, true)
|
this.setLayers(donLayers, filename + selectedSong.donBg, true)
|
||||||
asset1 = "bg_don_" + selectedSong.donBg + "a"
|
asset1 = filename + selectedSong.donBg + "a"
|
||||||
asset2 = "bg_don_" + selectedSong.donBg + "b"
|
asset2 = filename + selectedSong.donBg + "b"
|
||||||
}else if(selectedSong.songSkin.don !== "none"){
|
}else if(selectedSong.songSkin.don !== "none"){
|
||||||
var notStatic = selectedSong.songSkin.don !== "static"
|
var notStatic = selectedSong.songSkin.don !== "static"
|
||||||
if(notStatic){
|
if(notStatic){
|
||||||
this.donBg.classList.add("donbg-" + selectedSong.songSkin.don)
|
this.donBg.classList.add("donbg-" + selectedSong.songSkin.don)
|
||||||
asset1 = "bg_don_" + songSkinName + "_a"
|
asset1 = filename + songSkinName + "_a"
|
||||||
asset2 = "bg_don_" + songSkinName + "_b"
|
asset2 = filename + songSkinName + "_b"
|
||||||
}else{
|
}else{
|
||||||
asset1 = "bg_don_" + songSkinName
|
asset1 = filename + songSkinName
|
||||||
asset2 = "bg_don_" + songSkinName
|
asset2 = filename + songSkinName
|
||||||
}
|
}
|
||||||
this.setLayers(donLayers, "bg_don_" + songSkinName + (notStatic ? "_" : ""), notStatic)
|
this.setLayers(donLayers, filename + songSkinName + (notStatic ? "_" : ""), notStatic)
|
||||||
}
|
}
|
||||||
var w1 = assets.image[asset1].width
|
var w1 = assets.image[asset1].width
|
||||||
var w2 = assets.image[asset2].width
|
var w2 = assets.image[asset2].width
|
||||||
@ -1474,6 +1478,16 @@
|
|||||||
explosion.setAnimation(false)
|
explosion.setAnimation(false)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
var miss = score === 0
|
||||||
|
}else{
|
||||||
|
var miss = true
|
||||||
|
}
|
||||||
|
if(!miss && this.darkDonBg){
|
||||||
|
this.darkDonBg = false
|
||||||
|
this.donBg.classList.remove("donbg-dark")
|
||||||
|
}else if(miss && !this.darkDonBg){
|
||||||
|
this.darkDonBg = true
|
||||||
|
this.donBg.classList.add("donbg-dark")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
posToMs(pos, speed){
|
posToMs(pos, speed){
|
||||||
|
Loading…
Reference in New Issue
Block a user