diff --git a/main.lua b/main.lua index eb8bca28..fe04965a 100644 --- a/main.lua +++ b/main.lua @@ -30,7 +30,7 @@ SAVEDIR=fs.getSaveDirectory() --Global Vars & Settings SFXPACKS={'chiptune'} -VOCPACKS={'miya','mono','xiaoya','miku'} +VOCPACKS={'miya','mono','xiaoya','miku','rin'} FIRSTLAUNCH=false DAILYLAUNCH=false @@ -291,6 +291,7 @@ IMG.init{ xiaoyaCH='media/image/characters/xiaoya.png', xiaoyaOmino='media/image/characters/xiaoya_Omino.png', mikuCH='media/image/characters/miku.png', + rinCH='media/image/characters/rin.png', z={ character='media/image/characters/z_character.png', screen1='media/image/characters/z_screen1.png', diff --git a/media/image/characters/miku.png b/media/image/characters/miku.png index e1fa2c1f..f1238afb 100644 Binary files a/media/image/characters/miku.png and b/media/image/characters/miku.png differ diff --git a/media/image/characters/rin.png b/media/image/characters/rin.png new file mode 100644 index 00000000..e2867448 Binary files /dev/null and b/media/image/characters/rin.png differ diff --git a/media/vocal/rin/b2b.ogg b/media/vocal/rin/b2b.ogg new file mode 100644 index 00000000..b384e019 Binary files /dev/null and b/media/vocal/rin/b2b.ogg differ diff --git a/media/vocal/rin/b3b.ogg b/media/vocal/rin/b3b.ogg new file mode 100644 index 00000000..17538cc4 Binary files /dev/null and b/media/vocal/rin/b3b.ogg differ diff --git a/media/vocal/rin/bye.ogg b/media/vocal/rin/bye.ogg new file mode 100644 index 00000000..79992495 Binary files /dev/null and b/media/vocal/rin/bye.ogg differ diff --git a/media/vocal/rin/cspin.ogg b/media/vocal/rin/cspin.ogg new file mode 100644 index 00000000..fab54605 Binary files /dev/null and b/media/vocal/rin/cspin.ogg differ diff --git a/media/vocal/rin/double.ogg b/media/vocal/rin/double.ogg new file mode 100644 index 00000000..3cac67b6 Binary files /dev/null and b/media/vocal/rin/double.ogg differ diff --git a/media/vocal/rin/espin.ogg b/media/vocal/rin/espin.ogg new file mode 100644 index 00000000..7c00c037 Binary files /dev/null and b/media/vocal/rin/espin.ogg differ diff --git a/media/vocal/rin/fspin.ogg b/media/vocal/rin/fspin.ogg new file mode 100644 index 00000000..5b73d774 Binary files /dev/null and b/media/vocal/rin/fspin.ogg differ diff --git a/media/vocal/rin/half_clear.ogg b/media/vocal/rin/half_clear.ogg new file mode 100644 index 00000000..65aacc8e Binary files /dev/null and b/media/vocal/rin/half_clear.ogg differ diff --git a/media/vocal/rin/hspin.ogg b/media/vocal/rin/hspin.ogg new file mode 100644 index 00000000..988cf294 Binary files /dev/null and b/media/vocal/rin/hspin.ogg differ diff --git a/media/vocal/rin/ispin.ogg b/media/vocal/rin/ispin.ogg new file mode 100644 index 00000000..80e86799 Binary files /dev/null and b/media/vocal/rin/ispin.ogg differ diff --git a/media/vocal/rin/jspin.ogg b/media/vocal/rin/jspin.ogg new file mode 100644 index 00000000..656d19c1 Binary files /dev/null and b/media/vocal/rin/jspin.ogg differ diff --git a/media/vocal/rin/lose.ogg b/media/vocal/rin/lose.ogg new file mode 100644 index 00000000..333aa5df Binary files /dev/null and b/media/vocal/rin/lose.ogg differ diff --git a/media/vocal/rin/lspin.ogg b/media/vocal/rin/lspin.ogg new file mode 100644 index 00000000..1e00cd60 Binary files /dev/null and b/media/vocal/rin/lspin.ogg differ diff --git a/media/vocal/rin/mini.ogg b/media/vocal/rin/mini.ogg new file mode 100644 index 00000000..a0f54077 Binary files /dev/null and b/media/vocal/rin/mini.ogg differ diff --git a/media/vocal/rin/nspin.ogg b/media/vocal/rin/nspin.ogg new file mode 100644 index 00000000..4e4b22d1 Binary files /dev/null and b/media/vocal/rin/nspin.ogg differ diff --git a/media/vocal/rin/ospin.ogg b/media/vocal/rin/ospin.ogg new file mode 100644 index 00000000..4610ebc1 Binary files /dev/null and b/media/vocal/rin/ospin.ogg differ diff --git a/media/vocal/rin/pentacrash.ogg b/media/vocal/rin/pentacrash.ogg new file mode 100644 index 00000000..627d88ef Binary files /dev/null and b/media/vocal/rin/pentacrash.ogg differ diff --git a/media/vocal/rin/perfect_clear.ogg b/media/vocal/rin/perfect_clear.ogg new file mode 100644 index 00000000..d2bf6dd3 Binary files /dev/null and b/media/vocal/rin/perfect_clear.ogg differ diff --git a/media/vocal/rin/pspin.ogg b/media/vocal/rin/pspin.ogg new file mode 100644 index 00000000..d1f0857e Binary files /dev/null and b/media/vocal/rin/pspin.ogg differ diff --git a/media/vocal/rin/qspin.ogg b/media/vocal/rin/qspin.ogg new file mode 100644 index 00000000..976dd084 Binary files /dev/null and b/media/vocal/rin/qspin.ogg differ diff --git a/media/vocal/rin/rspin.ogg b/media/vocal/rin/rspin.ogg new file mode 100644 index 00000000..90356f91 Binary files /dev/null and b/media/vocal/rin/rspin.ogg differ diff --git a/media/vocal/rin/single.ogg b/media/vocal/rin/single.ogg new file mode 100644 index 00000000..1b68eddd Binary files /dev/null and b/media/vocal/rin/single.ogg differ diff --git a/media/vocal/rin/sspin.ogg b/media/vocal/rin/sspin.ogg new file mode 100644 index 00000000..e6235ab7 Binary files /dev/null and b/media/vocal/rin/sspin.ogg differ diff --git a/media/vocal/rin/techrash.ogg b/media/vocal/rin/techrash.ogg new file mode 100644 index 00000000..34bf650b Binary files /dev/null and b/media/vocal/rin/techrash.ogg differ diff --git a/media/vocal/rin/triple.ogg b/media/vocal/rin/triple.ogg new file mode 100644 index 00000000..6d63a1e4 Binary files /dev/null and b/media/vocal/rin/triple.ogg differ diff --git a/media/vocal/rin/tspin.ogg b/media/vocal/rin/tspin.ogg new file mode 100644 index 00000000..d3f4568b Binary files /dev/null and b/media/vocal/rin/tspin.ogg differ diff --git a/media/vocal/rin/uspin.ogg b/media/vocal/rin/uspin.ogg new file mode 100644 index 00000000..1822a87c Binary files /dev/null and b/media/vocal/rin/uspin.ogg differ diff --git a/media/vocal/rin/vspin.ogg b/media/vocal/rin/vspin.ogg new file mode 100644 index 00000000..09d5d65b Binary files /dev/null and b/media/vocal/rin/vspin.ogg differ diff --git a/media/vocal/rin/win.ogg b/media/vocal/rin/win.ogg new file mode 100644 index 00000000..1e029ef1 Binary files /dev/null and b/media/vocal/rin/win.ogg differ diff --git a/media/vocal/rin/wspin.ogg b/media/vocal/rin/wspin.ogg new file mode 100644 index 00000000..0b10a88a Binary files /dev/null and b/media/vocal/rin/wspin.ogg differ diff --git a/media/vocal/rin/xspin.ogg b/media/vocal/rin/xspin.ogg new file mode 100644 index 00000000..fe2146a8 Binary files /dev/null and b/media/vocal/rin/xspin.ogg differ diff --git a/media/vocal/rin/yspin.ogg b/media/vocal/rin/yspin.ogg new file mode 100644 index 00000000..2e066afc Binary files /dev/null and b/media/vocal/rin/yspin.ogg differ diff --git a/media/vocal/rin/zspin.ogg b/media/vocal/rin/zspin.ogg new file mode 100644 index 00000000..ffd5a058 Binary files /dev/null and b/media/vocal/rin/zspin.ogg differ diff --git a/parts/scenes/setting_sound.lua b/parts/scenes/setting_sound.lua index f483e19c..de2fedf9 100644 --- a/parts/scenes/setting_sound.lua +++ b/parts/scenes/setting_sound.lua @@ -65,15 +65,18 @@ function scene.draw() gc.draw(IMG.miyaHeart,162,52,nil,.3) elseif vocPack=="mono"then local jump=math.max(30-(TIME()-last1)*60,0)%10 - gc.translate(760,340+6*sin(TIME()*.5)+(jump-10)*jump*.3) - gc.draw(IMG.monoCH,-30) + gc.translate(730,340+6*sin(TIME()*.5)+(jump-10)*jump*.3) + gc.draw(IMG.monoCH) elseif vocPack=="xiaoya"then gc.translate(770,340+4*sin(TIME()*.5)) gc.draw(IMG.xiaoyaCH) gc.draw(IMG.xiaoyaOmino,16,168,26/(1+TIME()-last1),.36,.36,33,37) elseif vocPack=="miku"then - gc.translate(800,340+12*sin(TIME()*.5)) - gc.draw(IMG.mikuCH,-30) + gc.translate(630,350+12*sin(TIME()*.5)) + gc.draw(IMG.mikuCH) + elseif vocPack=="rin"then + gc.translate(780,320+12*sin(TIME()*.5)) + gc.draw(IMG.rinCH) end gc.pop() end diff --git a/parts/updateLog.lua b/parts/updateLog.lua index 4b26506b..f5ca6830 100644 --- a/parts/updateLog.lua +++ b/parts/updateLog.lua @@ -3,7 +3,10 @@ return[=[ R E M A K E 0.17.6: 昏暗 Dim + 新增: + 新语音包:rin(by vocaloidvictory) 改动: + 更换miku立绘 按钮改为松开触发，按下后移走可以取消按下状态 修复: BGM有时候会不循环