Commit 1fffb5fc authored by Bui's avatar Bui

remove ogg test

parent 235a282d
...@@ -155,7 +155,6 @@ var assets = { ...@@ -155,7 +155,6 @@ var assets = {
"bgm_result.mp3", "bgm_result.mp3",
"bgm_setsume.mp3" "bgm_setsume.mp3"
], ],
"audioOgg": "note_ka.ogg",
"fonts": [ "fonts": [
"Kozuka", "Kozuka",
"TnT" "TnT"
......
...@@ -90,7 +90,7 @@ class Loader{ ...@@ -90,7 +90,7 @@ class Loader{
})) }))
this.afterJSCount = this.afterJSCount =
[assets.audioOgg, "blurPerformance", "P2Connection"].length + ["blurPerformance", "P2Connection"].length +
assets.fonts.length + assets.fonts.length +
assets.audioSfx.length + assets.audioSfx.length +
assets.audioMusic.length + assets.audioMusic.length +
...@@ -113,14 +113,6 @@ class Loader{ ...@@ -113,14 +113,6 @@ class Loader{
) )
snd.sfxLoudGain.setVolume(1.2) snd.sfxLoudGain.setVolume(1.2)
this.afterJSCount--
this.addPromise(snd.buffer.load(gameConfig.assets_baseurl + "audio/" + assets.audioOgg).then(() => {
this.oggNotSupported = false
}, () => {
this.oggNotSupported = true
}).then(() => {
this.afterJSCount = 0 this.afterJSCount = 0
assets.fonts.forEach(name => { assets.fonts.forEach(name => {
...@@ -194,7 +186,7 @@ class Loader{ ...@@ -194,7 +186,7 @@ class Loader{
}) })
}, this.errorMsg.bind(this)) }, this.errorMsg.bind(this))
}))
}) })
} }
...@@ -203,9 +195,6 @@ class Loader{ ...@@ -203,9 +195,6 @@ class Loader{
promise.then(this.assetLoaded.bind(this)) promise.then(this.assetLoaded.bind(this))
} }
loadSound(name, gain){ loadSound(name, gain){
if(this.oggNotSupported && name.endsWith(".ogg")){
name = name.slice(0, -4) + ".wav"
}
var id = this.getFilename(name) var id = this.getFilename(name)
return gain.load(gameConfig.assets_baseurl + "audio/" + name).then(sound => { return gain.load(gameConfig.assets_baseurl + "audio/" + name).then(sound => {
assets.sounds[id] = sound assets.sounds[id] = sound
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment