From a45b6ad57efa0fe9feaf2f3eb0f58e58590ae45a Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Sun, 7 Nov 2021 01:41:29 +0800 Subject: [PATCH] =?UTF-8?q?move=E9=9F=B3=E6=95=88=E5=9C=A8=E6=96=B9?= =?UTF-8?q?=E5=9D=97=E5=9B=A0=E9=87=8D=E5=8A=9B=E6=88=96=E6=97=8B=E8=BD=AC?= =?UTF-8?q?=E8=A7=A6=E5=9C=B0=E6=97=B6=E4=B9=9F=E4=BC=9A=E6=92=AD=E6=94=BE?= =?UTF-8?q?=EF=BC=8C=E8=80=8C=E4=B8=8D=E5=8F=AA=E6=98=AF=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E5=90=8E=20move=E9=9F=B3=E6=95=88=E5=90=8D=E6=94=B9=E4=B8=BAto?= =?UTF-8?q?uch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Zframework/widget.lua | 4 ++-- media/effect/chiptune/{move.ogg => touch.ogg} | Bin parts/player/player.lua | 14 ++++++++------ parts/scenes/app_15p.lua | 2 +- parts/scenes/app_2048.lua | 2 +- parts/scenes/app_AtoZ.lua | 2 +- parts/scenes/app_UTTT.lua | 2 +- parts/scenes/app_arithmetic.lua | 2 +- parts/scenes/app_ten.lua | 2 +- parts/scenes/launchpad.lua | 4 ++-- parts/scenes/mod.lua | 2 +- 11 files changed, 19 insertions(+), 17 deletions(-) rename media/effect/chiptune/{move.ogg => touch.ogg} (100%) diff --git a/Zframework/widget.lua b/Zframework/widget.lua index a2ebbbda..fb099056 100644 --- a/Zframework/widget.lua +++ b/Zframework/widget.lua @@ -435,7 +435,7 @@ end function switch:press() self.code() if self.sound then - SFX.play('move') + SFX.play('touch') end end function WIDGET.newSwitch(D)--name,x,y[,lim][,fText][,color][,font=30][,sound=true][,disp],code[,hideF][,hide] @@ -1431,7 +1431,7 @@ function WIDGET.textinput(texts) if W and W.type=='inputBox'then if(not W.regex or texts:match(W.regex))and(not W.limit or #(WIDGET.sel.value..texts)<=W.limit)then WIDGET.sel.value=WIDGET.sel.value..texts - SFX.play('move') + SFX.play('touch') else SFX.play('finesseError',.3) end diff --git a/media/effect/chiptune/move.ogg b/media/effect/chiptune/touch.ogg similarity index 100% rename from media/effect/chiptune/move.ogg rename to media/effect/chiptune/touch.ogg diff --git a/parts/player/player.lua b/parts/player/player.lua index 65db9258..a42b950e 100644 --- a/parts/player/player.lua +++ b/parts/player/player.lua @@ -603,6 +603,12 @@ function Player:freshBlock(mode)--string mode: push/move/fresh/newBlock end end end + + --Play sound if touch ground + if mode=='move'and self.sound and self.curY==self.ghoY then + SFX.play('touch') + end + end function Player:lock() local CB=self.cur.bk @@ -2110,6 +2116,8 @@ local function update_alive(P) if P.ghoY~=P.curY then P.dropDelay=ENV.drop + elseif P.sound then + SFX.play('touch') end else P.lockDelay=P.lockDelay-1 @@ -2437,9 +2445,6 @@ function Player:act_moveLeft(auto) self:createMoveFX('left') self.curX=self.curX-1 self:freshBlock('move') - if self.sound and self.curY==self.ghoY then - SFX.play('move') - end if not auto then self.moving=0 end @@ -2466,9 +2471,6 @@ function Player:act_moveRight(auto) self:createMoveFX('right') self.curX=self.curX+1 self:freshBlock('move') - if self.sound and self.curY==self.ghoY then - SFX.play('move') - end if not auto then self.moving=0 end diff --git a/parts/scenes/app_15p.lua b/parts/scenes/app_15p.lua index 6af7ebe1..bf0fd3d7 100644 --- a/parts/scenes/app_15p.lua +++ b/parts/scenes/app_15p.lua @@ -124,7 +124,7 @@ local function tapBoard(x,y,key) SFX.play('win') return end - SFX.play('move') + SFX.play('touch') end end end diff --git a/parts/scenes/app_2048.lua b/parts/scenes/app_2048.lua index d032bb2a..6973eb57 100644 --- a/parts/scenes/app_2048.lua +++ b/parts/scenes/app_2048.lua @@ -313,7 +313,7 @@ function scene.keyDown(key,isRep) TEXT.show(arrows[key],640,360,80,'beat',3) move=move+1 if not autoPressing then - SFX.play('move') + SFX.play('touch') end end end diff --git a/parts/scenes/app_AtoZ.lua b/parts/scenes/app_AtoZ.lua index 26c8295e..3a0927b1 100644 --- a/parts/scenes/app_AtoZ.lua +++ b/parts/scenes/app_AtoZ.lua @@ -50,7 +50,7 @@ function scene.keyDown(key,isRep) progress=progress+1 frameKeyCount=frameKeyCount+1 TEXT.show(key:upper(),rnd(320,960),rnd(100,240),90,'score',2.6) - SFX.play('move') + SFX.play('touch') if progress==2 then state=1 startTime=TIME() diff --git a/parts/scenes/app_UTTT.lua b/parts/scenes/app_UTTT.lua index 684440f0..2ead8fd1 100644 --- a/parts/scenes/app_UTTT.lua +++ b/parts/scenes/app_UTTT.lua @@ -57,7 +57,7 @@ local function full(L) end local function place(X,x) board[X][x]=round - SFX.play('move') + SFX.play('touch') lastX,lastx=X,x curX,curx=nil placeTime=TIME() diff --git a/parts/scenes/app_arithmetic.lua b/parts/scenes/app_arithmetic.lua index e92847d4..a07d595f 100644 --- a/parts/scenes/app_arithmetic.lua +++ b/parts/scenes/app_arithmetic.lua @@ -157,7 +157,7 @@ function scene.keyDown(key,isRep) input=input..key inputTime=1 check(tonumber(input)) - SFX.play('move') + SFX.play('touch') end elseif key=="-"then if #input<8 then diff --git a/parts/scenes/app_ten.lua b/parts/scenes/app_ten.lua index fdc34a3f..d37271bf 100644 --- a/parts/scenes/app_ten.lua +++ b/parts/scenes/app_ten.lua @@ -211,7 +211,7 @@ function scene.update() SFX.play('fail') else fallingTimer=fast and 4 or 5 - SFX.play('move') + SFX.play('touch') end end elseif fast and( diff --git a/parts/scenes/launchpad.lua b/parts/scenes/launchpad.lua index a3f4119b..3fc8a275 100644 --- a/parts/scenes/launchpad.lua +++ b/parts/scenes/launchpad.lua @@ -42,7 +42,7 @@ pad={x=140,y=65,page=1, {samp={tag='ready2',func=function()playReadySFX(2)end}}, {samp={tag='ready1',func=function()playReadySFX(1)end}}, {samp={tag='start',func=function()playReadySFX(0)end}}, - {sfx='move'},{sfx='lock'},{sfx='drop'},{sfx='fall'}, + {sfx='touch'},{sfx='lock'},{sfx='drop'},{sfx='fall'}, }, { {sfx='hold'},{sfx='prehold'}, @@ -76,7 +76,7 @@ pad={x=140,y=65,page=1, {samp={tag='ready2',func=function()playReadySFX(2)end}}, {samp={tag='ready1',func=function()playReadySFX(1)end}}, {samp={tag='start',func=function()playReadySFX(0)end}}, - {sfx='move'},{sfx='lock'},{sfx='drop'},{sfx='fall'}, + {sfx='touch'},{sfx='lock'},{sfx='drop'},{sfx='fall'}, }, { {sfx='hold'},{sfx='prehold'}, diff --git a/parts/scenes/mod.lua b/parts/scenes/mod.lua index a4a0cf62..4687d8c6 100644 --- a/parts/scenes/mod.lua +++ b/parts/scenes/mod.lua @@ -36,7 +36,7 @@ local function _toggleMod(M,back) SFX.play('move',.6) SFX.play('lock') else - SFX.play('move') + SFX.play('touch') SFX.play('lock',.6) end scene.widgetList.unranked.hide=scoreValid()