diff --git a/media/sample/bass/1.ogg b/media/sample/bass/1.ogg new file mode 100644 index 00000000..387669f9 Binary files /dev/null and b/media/sample/bass/1.ogg differ diff --git a/media/sample/bass/10.ogg b/media/sample/bass/10.ogg new file mode 100644 index 00000000..970b4480 Binary files /dev/null and b/media/sample/bass/10.ogg differ diff --git a/media/sample/bass/11.ogg b/media/sample/bass/11.ogg new file mode 100644 index 00000000..c5bee6d5 Binary files /dev/null and b/media/sample/bass/11.ogg differ diff --git a/media/sample/bass/12.ogg b/media/sample/bass/12.ogg new file mode 100644 index 00000000..59cfb10e Binary files /dev/null and b/media/sample/bass/12.ogg differ diff --git a/media/sample/bass/13.ogg b/media/sample/bass/13.ogg new file mode 100644 index 00000000..415727e3 Binary files /dev/null and b/media/sample/bass/13.ogg differ diff --git a/media/sample/bass/14.ogg b/media/sample/bass/14.ogg new file mode 100644 index 00000000..743d43af Binary files /dev/null and b/media/sample/bass/14.ogg differ diff --git a/media/sample/bass/15.ogg b/media/sample/bass/15.ogg new file mode 100644 index 00000000..0ac755b0 Binary files /dev/null and b/media/sample/bass/15.ogg differ diff --git a/media/sample/bass/16.ogg b/media/sample/bass/16.ogg new file mode 100644 index 00000000..7dee96d8 Binary files /dev/null and b/media/sample/bass/16.ogg differ diff --git a/media/sample/bass/17.ogg b/media/sample/bass/17.ogg new file mode 100644 index 00000000..282c0d29 Binary files /dev/null and b/media/sample/bass/17.ogg differ diff --git a/media/sample/bass/18.ogg b/media/sample/bass/18.ogg new file mode 100644 index 00000000..693580fc Binary files /dev/null and b/media/sample/bass/18.ogg differ diff --git a/media/sample/bass/19.ogg b/media/sample/bass/19.ogg new file mode 100644 index 00000000..4f859b24 Binary files /dev/null and b/media/sample/bass/19.ogg differ diff --git a/media/sample/bass/2.ogg b/media/sample/bass/2.ogg new file mode 100644 index 00000000..53d570cf Binary files /dev/null and b/media/sample/bass/2.ogg differ diff --git a/media/sample/bass/20.ogg b/media/sample/bass/20.ogg new file mode 100644 index 00000000..0156068e Binary files /dev/null and b/media/sample/bass/20.ogg differ diff --git a/media/sample/bass/21.ogg b/media/sample/bass/21.ogg new file mode 100644 index 00000000..f4596e0d Binary files /dev/null and b/media/sample/bass/21.ogg differ diff --git a/media/sample/bass/22.ogg b/media/sample/bass/22.ogg new file mode 100644 index 00000000..a8531361 Binary files /dev/null and b/media/sample/bass/22.ogg differ diff --git a/media/sample/bass/23.ogg b/media/sample/bass/23.ogg new file mode 100644 index 00000000..6aa0990a Binary files /dev/null and b/media/sample/bass/23.ogg differ diff --git a/media/sample/bass/24.ogg b/media/sample/bass/24.ogg new file mode 100644 index 00000000..20085fd0 Binary files /dev/null and b/media/sample/bass/24.ogg differ diff --git a/media/sample/bass/25.ogg b/media/sample/bass/25.ogg new file mode 100644 index 00000000..3c85ed50 Binary files /dev/null and b/media/sample/bass/25.ogg differ diff --git a/media/sample/bass/26.ogg b/media/sample/bass/26.ogg new file mode 100644 index 00000000..b44eca46 Binary files /dev/null and b/media/sample/bass/26.ogg differ diff --git a/media/sample/bass/27.ogg b/media/sample/bass/27.ogg new file mode 100644 index 00000000..da8b1e4e Binary files /dev/null and b/media/sample/bass/27.ogg differ diff --git a/media/sample/bass/28.ogg b/media/sample/bass/28.ogg new file mode 100644 index 00000000..c3307555 Binary files /dev/null and b/media/sample/bass/28.ogg differ diff --git a/media/sample/bass/3.ogg b/media/sample/bass/3.ogg new file mode 100644 index 00000000..f60b28ca Binary files /dev/null and b/media/sample/bass/3.ogg differ diff --git a/media/sample/bass/4.ogg b/media/sample/bass/4.ogg new file mode 100644 index 00000000..fd9c9b21 Binary files /dev/null and b/media/sample/bass/4.ogg differ diff --git a/media/sample/bass/5.ogg b/media/sample/bass/5.ogg new file mode 100644 index 00000000..c5dd1c2e Binary files /dev/null and b/media/sample/bass/5.ogg differ diff --git a/media/sample/bass/6.ogg b/media/sample/bass/6.ogg new file mode 100644 index 00000000..812da23c Binary files /dev/null and b/media/sample/bass/6.ogg differ diff --git a/media/sample/bass/7.ogg b/media/sample/bass/7.ogg new file mode 100644 index 00000000..7c97936b Binary files /dev/null and b/media/sample/bass/7.ogg differ diff --git a/media/sample/bass/8.ogg b/media/sample/bass/8.ogg new file mode 100644 index 00000000..98f728ef Binary files /dev/null and b/media/sample/bass/8.ogg differ diff --git a/media/sample/bass/9.ogg b/media/sample/bass/9.ogg new file mode 100644 index 00000000..ea6ae3aa Binary files /dev/null and b/media/sample/bass/9.ogg differ diff --git a/media/sample/bell/1.ogg b/media/sample/bell/1.ogg new file mode 100644 index 00000000..7b551174 Binary files /dev/null and b/media/sample/bell/1.ogg differ diff --git a/media/sample/bell/10.ogg b/media/sample/bell/10.ogg new file mode 100644 index 00000000..833b2bd9 Binary files /dev/null and b/media/sample/bell/10.ogg differ diff --git a/media/sample/bell/11.ogg b/media/sample/bell/11.ogg new file mode 100644 index 00000000..c3358235 Binary files /dev/null and b/media/sample/bell/11.ogg differ diff --git a/media/sample/bell/12.ogg b/media/sample/bell/12.ogg new file mode 100644 index 00000000..cf92582c Binary files /dev/null and b/media/sample/bell/12.ogg differ diff --git a/media/sample/bell/13.ogg b/media/sample/bell/13.ogg new file mode 100644 index 00000000..5e411df3 Binary files /dev/null and b/media/sample/bell/13.ogg differ diff --git a/media/sample/bell/14.ogg b/media/sample/bell/14.ogg new file mode 100644 index 00000000..2a2aed72 Binary files /dev/null and b/media/sample/bell/14.ogg differ diff --git a/media/sample/bell/15.ogg b/media/sample/bell/15.ogg new file mode 100644 index 00000000..68050165 Binary files /dev/null and b/media/sample/bell/15.ogg differ diff --git a/media/sample/bell/16.ogg b/media/sample/bell/16.ogg new file mode 100644 index 00000000..154fc2da Binary files /dev/null and b/media/sample/bell/16.ogg differ diff --git a/media/sample/bell/17.ogg b/media/sample/bell/17.ogg new file mode 100644 index 00000000..3dac992e Binary files /dev/null and b/media/sample/bell/17.ogg differ diff --git a/media/sample/bell/18.ogg b/media/sample/bell/18.ogg new file mode 100644 index 00000000..850e4ddc Binary files /dev/null and b/media/sample/bell/18.ogg differ diff --git a/media/sample/bell/19.ogg b/media/sample/bell/19.ogg new file mode 100644 index 00000000..712dce2c Binary files /dev/null and b/media/sample/bell/19.ogg differ diff --git a/media/sample/bell/2.ogg b/media/sample/bell/2.ogg new file mode 100644 index 00000000..5a04b6c5 Binary files /dev/null and b/media/sample/bell/2.ogg differ diff --git a/media/sample/bell/20.ogg b/media/sample/bell/20.ogg new file mode 100644 index 00000000..443bafa0 Binary files /dev/null and b/media/sample/bell/20.ogg differ diff --git a/media/sample/bell/21.ogg b/media/sample/bell/21.ogg new file mode 100644 index 00000000..698ef597 Binary files /dev/null and b/media/sample/bell/21.ogg differ diff --git a/media/sample/bell/22.ogg b/media/sample/bell/22.ogg new file mode 100644 index 00000000..a5a8ac28 Binary files /dev/null and b/media/sample/bell/22.ogg differ diff --git a/media/sample/bell/23.ogg b/media/sample/bell/23.ogg new file mode 100644 index 00000000..72adf5c4 Binary files /dev/null and b/media/sample/bell/23.ogg differ diff --git a/media/sample/bell/24.ogg b/media/sample/bell/24.ogg new file mode 100644 index 00000000..a22b8d21 Binary files /dev/null and b/media/sample/bell/24.ogg differ diff --git a/media/sample/bell/25.ogg b/media/sample/bell/25.ogg new file mode 100644 index 00000000..43a8aa0a Binary files /dev/null and b/media/sample/bell/25.ogg differ diff --git a/media/sample/bell/26.ogg b/media/sample/bell/26.ogg new file mode 100644 index 00000000..b14b7152 Binary files /dev/null and b/media/sample/bell/26.ogg differ diff --git a/media/sample/bell/27.ogg b/media/sample/bell/27.ogg new file mode 100644 index 00000000..daddaef1 Binary files /dev/null and b/media/sample/bell/27.ogg differ diff --git a/media/sample/bell/28.ogg b/media/sample/bell/28.ogg new file mode 100644 index 00000000..d0b809a7 Binary files /dev/null and b/media/sample/bell/28.ogg differ diff --git a/media/sample/bell/3.ogg b/media/sample/bell/3.ogg new file mode 100644 index 00000000..864348d0 Binary files /dev/null and b/media/sample/bell/3.ogg differ diff --git a/media/sample/bell/4.ogg b/media/sample/bell/4.ogg new file mode 100644 index 00000000..8d94bcc8 Binary files /dev/null and b/media/sample/bell/4.ogg differ diff --git a/media/sample/bell/5.ogg b/media/sample/bell/5.ogg new file mode 100644 index 00000000..982a52b1 Binary files /dev/null and b/media/sample/bell/5.ogg differ diff --git a/media/sample/bell/6.ogg b/media/sample/bell/6.ogg new file mode 100644 index 00000000..954c331d Binary files /dev/null and b/media/sample/bell/6.ogg differ diff --git a/media/sample/bell/7.ogg b/media/sample/bell/7.ogg new file mode 100644 index 00000000..43b20a21 Binary files /dev/null and b/media/sample/bell/7.ogg differ diff --git a/media/sample/bell/8.ogg b/media/sample/bell/8.ogg new file mode 100644 index 00000000..3f0b8ecd Binary files /dev/null and b/media/sample/bell/8.ogg differ diff --git a/media/sample/bell/9.ogg b/media/sample/bell/9.ogg new file mode 100644 index 00000000..51bdc6ab Binary files /dev/null and b/media/sample/bell/9.ogg differ diff --git a/media/sample/lead/1.ogg b/media/sample/lead/1.ogg new file mode 100644 index 00000000..f8bd74bb Binary files /dev/null and b/media/sample/lead/1.ogg differ diff --git a/media/sample/lead/10.ogg b/media/sample/lead/10.ogg new file mode 100644 index 00000000..00faea0f Binary files /dev/null and b/media/sample/lead/10.ogg differ diff --git a/media/sample/lead/11.ogg b/media/sample/lead/11.ogg new file mode 100644 index 00000000..c04b2140 Binary files /dev/null and b/media/sample/lead/11.ogg differ diff --git a/media/sample/lead/12.ogg b/media/sample/lead/12.ogg new file mode 100644 index 00000000..9642f006 Binary files /dev/null and b/media/sample/lead/12.ogg differ diff --git a/media/sample/lead/13.ogg b/media/sample/lead/13.ogg new file mode 100644 index 00000000..26ae2ccd Binary files /dev/null and b/media/sample/lead/13.ogg differ diff --git a/media/sample/lead/14.ogg b/media/sample/lead/14.ogg new file mode 100644 index 00000000..2e42eed8 Binary files /dev/null and b/media/sample/lead/14.ogg differ diff --git a/media/sample/lead/15.ogg b/media/sample/lead/15.ogg new file mode 100644 index 00000000..5d15516a Binary files /dev/null and b/media/sample/lead/15.ogg differ diff --git a/media/sample/lead/16.ogg b/media/sample/lead/16.ogg new file mode 100644 index 00000000..011663b8 Binary files /dev/null and b/media/sample/lead/16.ogg differ diff --git a/media/sample/lead/17.ogg b/media/sample/lead/17.ogg new file mode 100644 index 00000000..ada36265 Binary files /dev/null and b/media/sample/lead/17.ogg differ diff --git a/media/sample/lead/18.ogg b/media/sample/lead/18.ogg new file mode 100644 index 00000000..c48d24ae Binary files /dev/null and b/media/sample/lead/18.ogg differ diff --git a/media/sample/lead/19.ogg b/media/sample/lead/19.ogg new file mode 100644 index 00000000..7a4661e6 Binary files /dev/null and b/media/sample/lead/19.ogg differ diff --git a/media/sample/lead/2.ogg b/media/sample/lead/2.ogg new file mode 100644 index 00000000..bb954722 Binary files /dev/null and b/media/sample/lead/2.ogg differ diff --git a/media/sample/lead/20.ogg b/media/sample/lead/20.ogg new file mode 100644 index 00000000..8f83f416 Binary files /dev/null and b/media/sample/lead/20.ogg differ diff --git a/media/sample/lead/21.ogg b/media/sample/lead/21.ogg new file mode 100644 index 00000000..d720d403 Binary files /dev/null and b/media/sample/lead/21.ogg differ diff --git a/media/sample/lead/22.ogg b/media/sample/lead/22.ogg new file mode 100644 index 00000000..d4a95cf6 Binary files /dev/null and b/media/sample/lead/22.ogg differ diff --git a/media/sample/lead/23.ogg b/media/sample/lead/23.ogg new file mode 100644 index 00000000..1eee3b58 Binary files /dev/null and b/media/sample/lead/23.ogg differ diff --git a/media/sample/lead/24.ogg b/media/sample/lead/24.ogg new file mode 100644 index 00000000..9cc05fe6 Binary files /dev/null and b/media/sample/lead/24.ogg differ diff --git a/media/sample/lead/25.ogg b/media/sample/lead/25.ogg new file mode 100644 index 00000000..e0bb7930 Binary files /dev/null and b/media/sample/lead/25.ogg differ diff --git a/media/sample/lead/26.ogg b/media/sample/lead/26.ogg new file mode 100644 index 00000000..6ed1db52 Binary files /dev/null and b/media/sample/lead/26.ogg differ diff --git a/media/sample/lead/27.ogg b/media/sample/lead/27.ogg new file mode 100644 index 00000000..4a836bb6 Binary files /dev/null and b/media/sample/lead/27.ogg differ diff --git a/media/sample/lead/28.ogg b/media/sample/lead/28.ogg new file mode 100644 index 00000000..64301e7b Binary files /dev/null and b/media/sample/lead/28.ogg differ diff --git a/media/sample/lead/3.ogg b/media/sample/lead/3.ogg new file mode 100644 index 00000000..f034c6d0 Binary files /dev/null and b/media/sample/lead/3.ogg differ diff --git a/media/sample/lead/4.ogg b/media/sample/lead/4.ogg new file mode 100644 index 00000000..a455b8b9 Binary files /dev/null and b/media/sample/lead/4.ogg differ diff --git a/media/sample/lead/5.ogg b/media/sample/lead/5.ogg new file mode 100644 index 00000000..6bd054d5 Binary files /dev/null and b/media/sample/lead/5.ogg differ diff --git a/media/sample/lead/6.ogg b/media/sample/lead/6.ogg new file mode 100644 index 00000000..6c0defbe Binary files /dev/null and b/media/sample/lead/6.ogg differ diff --git a/media/sample/lead/7.ogg b/media/sample/lead/7.ogg new file mode 100644 index 00000000..079e7a69 Binary files /dev/null and b/media/sample/lead/7.ogg differ diff --git a/media/sample/lead/8.ogg b/media/sample/lead/8.ogg new file mode 100644 index 00000000..60256445 Binary files /dev/null and b/media/sample/lead/8.ogg differ diff --git a/media/sample/lead/9.ogg b/media/sample/lead/9.ogg new file mode 100644 index 00000000..5dc09c72 Binary files /dev/null and b/media/sample/lead/9.ogg differ diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 4e111bfe..a46fcf4d 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -2,6 +2,7 @@ local C=COLOR return{ loadText={ loadSFX="Loading sound effects", + loadSample="Loading instrument samples", loadVoice="Loading voice packs", loadFont="Loading fonts", loadModeIcon="Loading mode icons", diff --git a/parts/language/lang_yygq.lua b/parts/language/lang_yygq.lua index 136f3e56..aaa7972c 100644 --- a/parts/language/lang_yygq.lua +++ b/parts/language/lang_yygq.lua @@ -1,6 +1,7 @@ return{ loadText={ loadSFX="音效", + loadSample="乐器", loadVoice="语音", loadFont="字体", loadModeIcon="模式图标", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index d1858419..8aa418f9 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -2,6 +2,7 @@ local C=COLOR return{ loadText={ loadSFX="加载音效资源", + loadSample="加载乐器采样", loadVoice="加载语音资源", loadFont="缓存字体资源", loadModeIcon="加载模式图标", diff --git a/parts/language/lang_zh3.lua b/parts/language/lang_zh3.lua index 26e82830..e40b3b0a 100644 --- a/parts/language/lang_zh3.lua +++ b/parts/language/lang_zh3.lua @@ -3,6 +3,7 @@ return{ fallback='zh', loadText={ loadSFX="加载音效", + loadSample="装载仪器样品", loadVoice="加载语音包", loadFont="加载字体", loadModeIcon="加载模式图标", diff --git a/parts/scenes/load.lua b/parts/scenes/load.lua index 80abfcfc..cabb37e5 100644 --- a/parts/scenes/load.lua +++ b/parts/scenes/load.lua @@ -23,6 +23,10 @@ local loadingThread=coroutine.wrap(function() end YIELD() YIELD('loadSFX')SFX.load('media/effect/'..SETTING.sfxPack..'/') + YIELD('loadSample') + SFX.loadSample{name='bass',path='media/sample/bass',base='A2'} + SFX.loadSample{name='lead',path='media/sample/lead',base='A3'} + SFX.loadSample{name='bell',path='media/sample/bell',base='A4'} YIELD('loadVoice')VOC.load('media/vocal/'..SETTING.vocPack..'/') YIELD('loadFont')for i=1,17 do getFont(15+5*i)end