Skip to content

Commit

Permalink
调整两个暂停相关音效名称
Browse files Browse the repository at this point in the history
  • Loading branch information
MrZ626 committed Jul 30, 2024
1 parent d34dbc7 commit 744ef1e
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion assets/scene/game_out.lua
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ local function sysAction(action)
end
elseif action=='back' then
if canPause() then
FMOD.effect('pause')
FMOD.effect('pause_pause')
SCN.swapTo('pause_out','none')
else
SCN.back()
Expand Down
8 changes: 7 additions & 1 deletion assets/scene/main_out.lua
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,13 @@ local function sysAction(action)
end
end
function scene.keyDown(key,isRep)
if key=='t' then playExterior('acry/test')() return true end
if key=='1' then FMOD.effect('notice')
elseif key=='2' then FMOD.effect('solve')
end
-- if key=='b' then playExterior('brik/exterior/test')() return true
-- elseif key=='g' then playExterior('gela/test')() return true
-- elseif key=='a' then playExterior('acry/test')() return true
-- end
if isRep then return true end
sysAction(KEYMAP.sys:getAction(key))
return true
Expand Down
2 changes: 1 addition & 1 deletion assets/scene/pause_out.lua
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ local function sysAction(action)
SCN.back()
elseif action=='back' then
FMOD.effect.keyOff('music_pause')
FMOD.effect('unpause')
FMOD.effect('pause_unpause')
SCN.swapTo('game_out','none')
elseif action=='restart' then
if GAME.playing then
Expand Down

0 comments on commit 744ef1e

Please sign in to comment.