diff --git a/main.lua b/main.lua index b512c1f7..71fd62dd 100644 --- a/main.lua +++ b/main.lua @@ -109,14 +109,14 @@ IMG.init{ pay1="mess/pay1.png", pay2="mess/pay2.png", - miyaCH="miya/ch.png", - miyaF1="miya/f1.png", - miyaF2="miya/f2.png", - miyaF3="miya/f3.png", - miyaF4="miya/f4.png", - - electric="mess/electric.png", - hbm="mess/hbm.png", + nakiCH="characters/naki.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", + electric="characters/electric.png", + hbm="characters/hbm.png", lanterns={ "lanterns/1.png", diff --git a/media/image/mess/electric.png b/media/image/characters/electric.png similarity index 100% rename from media/image/mess/electric.png rename to media/image/characters/electric.png diff --git a/media/image/mess/hbm.png b/media/image/characters/hbm.png similarity index 100% rename from media/image/mess/hbm.png rename to media/image/characters/hbm.png diff --git a/media/image/miya/ch.png b/media/image/characters/miya.png similarity index 100% rename from media/image/miya/ch.png rename to media/image/characters/miya.png diff --git a/media/image/miya/f1.png b/media/image/characters/miya_f1.png similarity index 100% rename from media/image/miya/f1.png rename to media/image/characters/miya_f1.png diff --git a/media/image/miya/f2.png b/media/image/characters/miya_f2.png similarity index 100% rename from media/image/miya/f2.png rename to media/image/characters/miya_f2.png diff --git a/media/image/miya/f3.png b/media/image/characters/miya_f3.png similarity index 100% rename from media/image/miya/f3.png rename to media/image/characters/miya_f3.png diff --git a/media/image/miya/f4.png b/media/image/characters/miya_f4.png similarity index 100% rename from media/image/miya/f4.png rename to media/image/characters/miya_f4.png diff --git a/media/image/characters/naki.png b/media/image/characters/naki.png new file mode 100644 index 00000000..05c71f3b Binary files /dev/null and b/media/image/characters/naki.png differ diff --git a/parts/scenes/setting_sound.lua b/parts/scenes/setting_sound.lua index 03652c69..390a28c7 100644 --- a/parts/scenes/setting_sound.lua +++ b/parts/scenes/setting_sound.lua @@ -10,8 +10,7 @@ local jump--Animation timer(10 to 0) local cv=SETTING.cv function scene.sceneInit() - last=0 - jump=0 + last,jump=0,0 cv=SETTING.cv BG.set() end @@ -34,24 +33,24 @@ function scene.touchDown(x,y) end function scene.update() - local t=jump - if t>0 then - jump=t-1 - end + if jump>0 then jump=jump-1 end end function scene.draw() gc.setColor(1,1,1) local t=TIME() - local _=jump - local x,y=800,340+10*sin(t*.5)+(_-10)*_*.3 + local x,y=800,340+10*sin(t*.5)+(jump-10)*jump*.3 gc.translate(x,y) - gc.draw(IMG.miyaCH,0,0) - gc.setColor(1,1,1,.7) - gc.draw(IMG.miyaF1,4,47+4*sin(t*.9)) - gc.draw(IMG.miyaF2,42,107+5*sin(t)) - gc.draw(IMG.miyaF3,93,126+3*sin(t*.7)) - gc.draw(IMG.miyaF4,129,98+3*sin(t*.7)) + if cv=="miya"then + gc.draw(IMG.miyaCH) + gc.setColor(1,1,1,.7) + gc.draw(IMG.miyaF1,4,47+4*sin(t*.9)) + gc.draw(IMG.miyaF2,42,107+5*sin(t)) + gc.draw(IMG.miyaF3,93,126+3*sin(t*.7)) + gc.draw(IMG.miyaF4,129,98+3*sin(t*.5)) + elseif cv=="naki"then + gc.draw(IMG.nakiCH) + end gc.translate(-x,-y) end