diff --git a/TJAPlayer3/Common/CSkin.cs b/TJAPlayer3/Common/CSkin.cs index c0af4ec1..f3f15406 100644 --- a/TJAPlayer3/Common/CSkin.cs +++ b/TJAPlayer3/Common/CSkin.cs @@ -806,7 +806,8 @@ namespace TJAPlayer3 ReloadSkin(); tReadSkinConfig(); - hsHitSoundsInformations = new CHitSounds(Path(@"Sounds\HitSounds\HitSounds.json")); + //hsHitSoundsInformations = new CHitSounds(Path(@"Sounds\HitSounds\HitSounds.json")); + hsHitSoundsInformations = new CHitSounds(@"Global\HitSounds\HitSounds.json"); } public void ReloadSkin() diff --git a/TJAPlayer3/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs b/TJAPlayer3/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs index 0497bef8..df4b88ff 100644 --- a/TJAPlayer3/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs +++ b/TJAPlayer3/Stages/07.Game/Taiko/CStage演奏ドラム画面.cs @@ -303,10 +303,15 @@ namespace TJAPlayer3 var hs = TJAPlayer3.Skin.hsHitSoundsInformations; - this.soundRed[i] = TJAPlayer3.Sound管理.tサウンドを生成する(CSkin.Path(hs.don[actual]), ESoundGroup.SoundEffect); - this.soundBlue[i] = TJAPlayer3.Sound管理.tサウンドを生成する(CSkin.Path(hs.ka[actual]), ESoundGroup.SoundEffect); - this.soundAdlib[i] = TJAPlayer3.Sound管理.tサウンドを生成する(CSkin.Path(hs.adlib[actual]), ESoundGroup.SoundEffect); - this.soundClap[i] = TJAPlayer3.Sound管理.tサウンドを生成する(CSkin.Path(hs.clap[actual]), ESoundGroup.SoundEffect); + //this.soundRed[i] = TJAPlayer3.Sound管理.tサウンドを生成する(CSkin.Path(hs.don[actual]), ESoundGroup.SoundEffect); + //this.soundBlue[i] = TJAPlayer3.Sound管理.tサウンドを生成する(CSkin.Path(hs.ka[actual]), ESoundGroup.SoundEffect); + //this.soundAdlib[i] = TJAPlayer3.Sound管理.tサウンドを生成する(CSkin.Path(hs.adlib[actual]), ESoundGroup.SoundEffect); + //this.soundClap[i] = TJAPlayer3.Sound管理.tサウンドを生成する(CSkin.Path(hs.clap[actual]), ESoundGroup.SoundEffect); + + this.soundRed[i] = TJAPlayer3.Sound管理.tサウンドを生成する((@"Global\HitSounds\" + hs.don[actual]), ESoundGroup.SoundEffect); + this.soundBlue[i] = TJAPlayer3.Sound管理.tサウンドを生成する((@"Global\HitSounds\" + hs.ka[actual]), ESoundGroup.SoundEffect); + this.soundAdlib[i] = TJAPlayer3.Sound管理.tサウンドを生成する((@"Global\HitSounds\" + hs.adlib[actual]), ESoundGroup.SoundEffect); + this.soundClap[i] = TJAPlayer3.Sound管理.tサウンドを生成する((@"Global\HitSounds\" + hs.clap[actual]), ESoundGroup.SoundEffect); int _panning = TJAPlayer3.ConfigIni.nPanning[TJAPlayer3.ConfigIni.nPlayerCount - 1][i]; this.soundRed[i].n位置 = _panning; diff --git a/Test/Global/HitSounds/Electro/Adlib.wav b/Test/Global/HitSounds/Electro/Adlib.wav new file mode 100644 index 00000000..ea67b689 Binary files /dev/null and b/Test/Global/HitSounds/Electro/Adlib.wav differ diff --git a/Test/Global/HitSounds/Electro/clap.wav b/Test/Global/HitSounds/Electro/clap.wav new file mode 100644 index 00000000..33bd4d54 Binary files /dev/null and b/Test/Global/HitSounds/Electro/clap.wav differ diff --git a/Test/Global/HitSounds/Electro/dong.wav b/Test/Global/HitSounds/Electro/dong.wav new file mode 100644 index 00000000..ea67b689 Binary files /dev/null and b/Test/Global/HitSounds/Electro/dong.wav differ diff --git a/Test/Global/HitSounds/Electro/ka.wav b/Test/Global/HitSounds/Electro/ka.wav new file mode 100644 index 00000000..0a6a0cac Binary files /dev/null and b/Test/Global/HitSounds/Electro/ka.wav differ diff --git a/Test/Global/HitSounds/HitSounds.json b/Test/Global/HitSounds/HitSounds.json new file mode 100644 index 00000000..b1b9450f --- /dev/null +++ b/Test/Global/HitSounds/HitSounds.json @@ -0,0 +1,22 @@ +[ + { + "name": "Taiko", + "path": "Taiko\\", + "format": "OGG", + }, + { + "name": "Electro", + "path": "Electro\\", + "format": "WAV", + }, + { + "name": "Konga", + "path": "Konga\\", + "format": "WAV", + }, + { + "name": "None", + "path": "None\\", + "format": "WAV", + }, +] diff --git a/Test/Global/HitSounds/Konga/Adlib.wav b/Test/Global/HitSounds/Konga/Adlib.wav new file mode 100644 index 00000000..c059dce4 Binary files /dev/null and b/Test/Global/HitSounds/Konga/Adlib.wav differ diff --git a/Test/Global/HitSounds/Konga/clap.wav b/Test/Global/HitSounds/Konga/clap.wav new file mode 100644 index 00000000..dcccdfb1 Binary files /dev/null and b/Test/Global/HitSounds/Konga/clap.wav differ diff --git a/Test/Global/HitSounds/Konga/dong.wav b/Test/Global/HitSounds/Konga/dong.wav new file mode 100644 index 00000000..c059dce4 Binary files /dev/null and b/Test/Global/HitSounds/Konga/dong.wav differ diff --git a/Test/Global/HitSounds/Konga/ka.wav b/Test/Global/HitSounds/Konga/ka.wav new file mode 100644 index 00000000..8037f2a6 Binary files /dev/null and b/Test/Global/HitSounds/Konga/ka.wav differ diff --git a/Test/Global/HitSounds/Taiko/Adlib.ogg b/Test/Global/HitSounds/Taiko/Adlib.ogg new file mode 100644 index 00000000..58bdb5b1 Binary files /dev/null and b/Test/Global/HitSounds/Taiko/Adlib.ogg differ diff --git a/Test/Global/HitSounds/Taiko/clap.ogg b/Test/Global/HitSounds/Taiko/clap.ogg new file mode 100644 index 00000000..233fcd15 Binary files /dev/null and b/Test/Global/HitSounds/Taiko/clap.ogg differ diff --git a/Test/Global/HitSounds/Taiko/dong.ogg b/Test/Global/HitSounds/Taiko/dong.ogg new file mode 100644 index 00000000..58bdb5b1 Binary files /dev/null and b/Test/Global/HitSounds/Taiko/dong.ogg differ diff --git a/Test/Global/HitSounds/Taiko/ka.ogg b/Test/Global/HitSounds/Taiko/ka.ogg new file mode 100644 index 00000000..88096c4c Binary files /dev/null and b/Test/Global/HitSounds/Taiko/ka.ogg differ