diff --git a/main.lua b/main.lua index f10fd3bc..94b18e00 100644 --- a/main.lua +++ b/main.lua @@ -106,12 +106,13 @@ IMG.init{ pay1='mess/pay1.png', pay2='mess/pay2.png', - nakiCH='characters/nakiharu.png', miyaCH='characters/miya.png', miyaF1='characters/miya_f1.png', miyaF2='characters/miya_f2.png', miyaF3='characters/miya_f3.png', miyaF4='characters/miya_f4.png', + nakiCH='characters/nakiharu.png', + xiaoyaCH='characters/xiaoya.png', electric='characters/electric.png', hbm='characters/hbm.png', diff --git a/media/VOICE/xiaoya/b2b_1.ogg b/media/VOICE/xiaoya/b2b_1.ogg new file mode 100644 index 00000000..7df47e37 Binary files /dev/null and b/media/VOICE/xiaoya/b2b_1.ogg differ diff --git a/media/VOICE/xiaoya/b2b_2.ogg b/media/VOICE/xiaoya/b2b_2.ogg new file mode 100644 index 00000000..e6076e84 Binary files /dev/null and b/media/VOICE/xiaoya/b2b_2.ogg differ diff --git a/media/VOICE/xiaoya/b3b_1.ogg b/media/VOICE/xiaoya/b3b_1.ogg new file mode 100644 index 00000000..a6b39c78 Binary files /dev/null and b/media/VOICE/xiaoya/b3b_1.ogg differ diff --git a/media/VOICE/xiaoya/b3b_2.ogg b/media/VOICE/xiaoya/b3b_2.ogg new file mode 100644 index 00000000..bb2c9281 Binary files /dev/null and b/media/VOICE/xiaoya/b3b_2.ogg differ diff --git a/media/VOICE/xiaoya/bye_1.ogg b/media/VOICE/xiaoya/bye_1.ogg new file mode 100644 index 00000000..2099262f Binary files /dev/null and b/media/VOICE/xiaoya/bye_1.ogg differ diff --git a/media/VOICE/xiaoya/bye_2.ogg b/media/VOICE/xiaoya/bye_2.ogg new file mode 100644 index 00000000..11df25e1 Binary files /dev/null and b/media/VOICE/xiaoya/bye_2.ogg differ diff --git a/media/VOICE/xiaoya/bye_3.ogg b/media/VOICE/xiaoya/bye_3.ogg new file mode 100644 index 00000000..25e8e46c Binary files /dev/null and b/media/VOICE/xiaoya/bye_3.ogg differ diff --git a/media/VOICE/xiaoya/double_1.ogg b/media/VOICE/xiaoya/double_1.ogg new file mode 100644 index 00000000..35f906ff Binary files /dev/null and b/media/VOICE/xiaoya/double_1.ogg differ diff --git a/media/VOICE/xiaoya/double_2.ogg b/media/VOICE/xiaoya/double_2.ogg new file mode 100644 index 00000000..30ac9de1 Binary files /dev/null and b/media/VOICE/xiaoya/double_2.ogg differ diff --git a/media/VOICE/xiaoya/double_3.ogg b/media/VOICE/xiaoya/double_3.ogg new file mode 100644 index 00000000..42fdc183 Binary files /dev/null and b/media/VOICE/xiaoya/double_3.ogg differ diff --git a/media/VOICE/xiaoya/half_clear_1.ogg b/media/VOICE/xiaoya/half_clear_1.ogg new file mode 100644 index 00000000..10a27861 Binary files /dev/null and b/media/VOICE/xiaoya/half_clear_1.ogg differ diff --git a/media/VOICE/xiaoya/half_clear_2.ogg b/media/VOICE/xiaoya/half_clear_2.ogg new file mode 100644 index 00000000..212b53e9 Binary files /dev/null and b/media/VOICE/xiaoya/half_clear_2.ogg differ diff --git a/media/VOICE/xiaoya/ispin_1.ogg b/media/VOICE/xiaoya/ispin_1.ogg new file mode 100644 index 00000000..c15e59dc Binary files /dev/null and b/media/VOICE/xiaoya/ispin_1.ogg differ diff --git a/media/VOICE/xiaoya/ispin_2.ogg b/media/VOICE/xiaoya/ispin_2.ogg new file mode 100644 index 00000000..5603e105 Binary files /dev/null and b/media/VOICE/xiaoya/ispin_2.ogg differ diff --git a/media/VOICE/xiaoya/jspin_1.ogg b/media/VOICE/xiaoya/jspin_1.ogg new file mode 100644 index 00000000..5e65aaa5 Binary files /dev/null and b/media/VOICE/xiaoya/jspin_1.ogg differ diff --git a/media/VOICE/xiaoya/jspin_2.ogg b/media/VOICE/xiaoya/jspin_2.ogg new file mode 100644 index 00000000..8602cc92 Binary files /dev/null and b/media/VOICE/xiaoya/jspin_2.ogg differ diff --git a/media/VOICE/xiaoya/lose_1.ogg b/media/VOICE/xiaoya/lose_1.ogg new file mode 100644 index 00000000..cc9e7945 Binary files /dev/null and b/media/VOICE/xiaoya/lose_1.ogg differ diff --git a/media/VOICE/xiaoya/lose_2.ogg b/media/VOICE/xiaoya/lose_2.ogg new file mode 100644 index 00000000..43dd6dcc Binary files /dev/null and b/media/VOICE/xiaoya/lose_2.ogg differ diff --git a/media/VOICE/xiaoya/lose_3.ogg b/media/VOICE/xiaoya/lose_3.ogg new file mode 100644 index 00000000..3ed1f88e Binary files /dev/null and b/media/VOICE/xiaoya/lose_3.ogg differ diff --git a/media/VOICE/xiaoya/lspin_1.ogg b/media/VOICE/xiaoya/lspin_1.ogg new file mode 100644 index 00000000..27c329bb Binary files /dev/null and b/media/VOICE/xiaoya/lspin_1.ogg differ diff --git a/media/VOICE/xiaoya/lspin_2.ogg b/media/VOICE/xiaoya/lspin_2.ogg new file mode 100644 index 00000000..55f040d9 Binary files /dev/null and b/media/VOICE/xiaoya/lspin_2.ogg differ diff --git a/media/VOICE/xiaoya/mini_1.ogg b/media/VOICE/xiaoya/mini_1.ogg new file mode 100644 index 00000000..cdb4e6e6 Binary files /dev/null and b/media/VOICE/xiaoya/mini_1.ogg differ diff --git a/media/VOICE/xiaoya/mini_2.ogg b/media/VOICE/xiaoya/mini_2.ogg new file mode 100644 index 00000000..5640ddf2 Binary files /dev/null and b/media/VOICE/xiaoya/mini_2.ogg differ diff --git a/media/VOICE/xiaoya/ospin_1.ogg b/media/VOICE/xiaoya/ospin_1.ogg new file mode 100644 index 00000000..24fe6b0d Binary files /dev/null and b/media/VOICE/xiaoya/ospin_1.ogg differ diff --git a/media/VOICE/xiaoya/ospin_2.ogg b/media/VOICE/xiaoya/ospin_2.ogg new file mode 100644 index 00000000..f81e5c2a Binary files /dev/null and b/media/VOICE/xiaoya/ospin_2.ogg differ diff --git a/media/VOICE/xiaoya/perfect_clear_1.ogg b/media/VOICE/xiaoya/perfect_clear_1.ogg new file mode 100644 index 00000000..0a282db6 Binary files /dev/null and b/media/VOICE/xiaoya/perfect_clear_1.ogg differ diff --git a/media/VOICE/xiaoya/perfect_clear_2.ogg b/media/VOICE/xiaoya/perfect_clear_2.ogg new file mode 100644 index 00000000..53beb6e0 Binary files /dev/null and b/media/VOICE/xiaoya/perfect_clear_2.ogg differ diff --git a/media/VOICE/xiaoya/single_1.ogg b/media/VOICE/xiaoya/single_1.ogg new file mode 100644 index 00000000..f787f0c1 Binary files /dev/null and b/media/VOICE/xiaoya/single_1.ogg differ diff --git a/media/VOICE/xiaoya/single_2.ogg b/media/VOICE/xiaoya/single_2.ogg new file mode 100644 index 00000000..75a424aa Binary files /dev/null and b/media/VOICE/xiaoya/single_2.ogg differ diff --git a/media/VOICE/xiaoya/single_3.ogg b/media/VOICE/xiaoya/single_3.ogg new file mode 100644 index 00000000..9afcd190 Binary files /dev/null and b/media/VOICE/xiaoya/single_3.ogg differ diff --git a/media/VOICE/xiaoya/sspin_1.ogg b/media/VOICE/xiaoya/sspin_1.ogg new file mode 100644 index 00000000..60c9446d Binary files /dev/null and b/media/VOICE/xiaoya/sspin_1.ogg differ diff --git a/media/VOICE/xiaoya/sspin_2.ogg b/media/VOICE/xiaoya/sspin_2.ogg new file mode 100644 index 00000000..354a3a7d Binary files /dev/null and b/media/VOICE/xiaoya/sspin_2.ogg differ diff --git a/media/VOICE/xiaoya/techrash_1.ogg b/media/VOICE/xiaoya/techrash_1.ogg new file mode 100644 index 00000000..af629560 Binary files /dev/null and b/media/VOICE/xiaoya/techrash_1.ogg differ diff --git a/media/VOICE/xiaoya/techrash_2.ogg b/media/VOICE/xiaoya/techrash_2.ogg new file mode 100644 index 00000000..f540cb38 Binary files /dev/null and b/media/VOICE/xiaoya/techrash_2.ogg differ diff --git a/media/VOICE/xiaoya/techrash_3.ogg b/media/VOICE/xiaoya/techrash_3.ogg new file mode 100644 index 00000000..7c76424b Binary files /dev/null and b/media/VOICE/xiaoya/techrash_3.ogg differ diff --git a/media/VOICE/xiaoya/test_1.ogg b/media/VOICE/xiaoya/test_1.ogg new file mode 100644 index 00000000..b79eb112 Binary files /dev/null and b/media/VOICE/xiaoya/test_1.ogg differ diff --git a/media/VOICE/xiaoya/triple_1.ogg b/media/VOICE/xiaoya/triple_1.ogg new file mode 100644 index 00000000..9e8ef845 Binary files /dev/null and b/media/VOICE/xiaoya/triple_1.ogg differ diff --git a/media/VOICE/xiaoya/triple_2.ogg b/media/VOICE/xiaoya/triple_2.ogg new file mode 100644 index 00000000..5c57bd7e Binary files /dev/null and b/media/VOICE/xiaoya/triple_2.ogg differ diff --git a/media/VOICE/xiaoya/triple_3.ogg b/media/VOICE/xiaoya/triple_3.ogg new file mode 100644 index 00000000..5f6ca7f8 Binary files /dev/null and b/media/VOICE/xiaoya/triple_3.ogg differ diff --git a/media/VOICE/xiaoya/tspin_1.ogg b/media/VOICE/xiaoya/tspin_1.ogg new file mode 100644 index 00000000..5eae0c10 Binary files /dev/null and b/media/VOICE/xiaoya/tspin_1.ogg differ diff --git a/media/VOICE/xiaoya/welcome_voc_1.ogg b/media/VOICE/xiaoya/welcome_voc_1.ogg new file mode 100644 index 00000000..2796d328 Binary files /dev/null and b/media/VOICE/xiaoya/welcome_voc_1.ogg differ diff --git a/media/VOICE/xiaoya/welcome_voc_2.ogg b/media/VOICE/xiaoya/welcome_voc_2.ogg new file mode 100644 index 00000000..6db32a17 Binary files /dev/null and b/media/VOICE/xiaoya/welcome_voc_2.ogg differ diff --git a/media/VOICE/xiaoya/welcome_voc_3.ogg b/media/VOICE/xiaoya/welcome_voc_3.ogg new file mode 100644 index 00000000..7efb79ab Binary files /dev/null and b/media/VOICE/xiaoya/welcome_voc_3.ogg differ diff --git a/media/VOICE/xiaoya/win_1.ogg b/media/VOICE/xiaoya/win_1.ogg new file mode 100644 index 00000000..f4de8799 Binary files /dev/null and b/media/VOICE/xiaoya/win_1.ogg differ diff --git a/media/VOICE/xiaoya/win_2.ogg b/media/VOICE/xiaoya/win_2.ogg new file mode 100644 index 00000000..4b376729 Binary files /dev/null and b/media/VOICE/xiaoya/win_2.ogg differ diff --git a/media/VOICE/xiaoya/win_3.ogg b/media/VOICE/xiaoya/win_3.ogg new file mode 100644 index 00000000..371dea35 Binary files /dev/null and b/media/VOICE/xiaoya/win_3.ogg differ diff --git a/media/VOICE/xiaoya/zspin_1.ogg b/media/VOICE/xiaoya/zspin_1.ogg new file mode 100644 index 00000000..789297d3 Binary files /dev/null and b/media/VOICE/xiaoya/zspin_1.ogg differ diff --git a/media/VOICE/xiaoya/zspin_2.ogg b/media/VOICE/xiaoya/zspin_2.ogg new file mode 100644 index 00000000..fa6689c9 Binary files /dev/null and b/media/VOICE/xiaoya/zspin_2.ogg differ diff --git a/media/image/characters/xiaoya.png b/media/image/characters/xiaoya.png new file mode 100644 index 00000000..22e61212 Binary files /dev/null and b/media/image/characters/xiaoya.png differ diff --git a/parts/scenes/setting_sound.lua b/parts/scenes/setting_sound.lua index 4de7520a..200c9859 100644 --- a/parts/scenes/setting_sound.lua +++ b/parts/scenes/setting_sound.lua @@ -59,6 +59,8 @@ function scene.draw() gc.draw(IMG.miyaF4,129,98+3*sin(t*.5)) elseif cv=="naki"then gc.draw(IMG.nakiCH,-30) + elseif cv=="xiaoya"then + gc.draw(IMG.xiaoyaCH,-30) end gc.translate(-x,-y) end @@ -77,8 +79,8 @@ scene.widgetList={ WIDGET.newSlider{name="vib", x=300, y=540,w=420,color='lN',unit=10,change=function()VIB(2)end,disp=SETval("vib"),code=SETsto("vib")}, WIDGET.newSlider{name="voc", x=300, y=610,w=420,color='lN',change=function()VOC.play('test')end,disp=SETval("voc"),code=SETsto("voc")}, WIDGET.newSwitch{name="fine", x=1150, y=230,disp=SETval("fine"),code=function()SETTING.fine=not SETTING.fine if SETTING.fine then SFX.play('finesseError',.6)end end}, - WIDGET.newSelector{name="cv", x=1100, y=380,w=200, list={'miya','naki'},disp=function()return cv end,code=function(i)cv=i end}, - WIDGET.newButton{name="apply", x=1100, y=460,w=180,h=80, code=function()SETTING.cv=cv VOC.loadAll()end,hideF=function()return SETTING.cv==cv end}, + WIDGET.newSelector{name="cv", x=1100, y=380,w=200,list={'miya','naki','xiaoya'},disp=function()return cv end,code=function(i)cv=i end}, + WIDGET.newButton{name="apply", x=1100, y=460,w=180,h=80,code=function()SETTING.cv=cv VOC.loadAll()end,hideF=function()return SETTING.cv==cv end}, WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80,fText=TEXTURE.back,code=backScene}, }