Skip to content

Commit

Permalink
修interior进暂停菜单就爆炸
Browse files Browse the repository at this point in the history
改fmod启动参数默认值
删测试代码 框架跟进
  • Loading branch information
MrZ626 committed Jun 23, 2024
1 parent 4b58116 commit f0b5f8d
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Zenitha
Submodule Zenitha updated 1 files
+1 −1 debug.lua
3 changes: 0 additions & 3 deletions assets/scene/game_in.lua
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ function scene.load()
scene.widgetList.pause.text=canPause() and CHAR.icon.pause or CHAR.icon.back
WIDGET._reset()
end
function scene.unload()
GAME.unload()
end

local function sysAction(action)
if action=='restart' then
Expand Down
1 change: 0 additions & 1 deletion assets/scene/pause_in.lua
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ function scene.load()
end
function scene.unload()
FMOD.effect.keyOff('music_pause')
SCN.scenes['game_in'].unload()
end

local function sysAction(action)
Expand Down
2 changes: 1 addition & 1 deletion assets/settings.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ local settings={
sfxVol=1,
vocVol=0,
vibVol=1,
fmod_maxChannel=6,
fmod_maxChannel=64,
fmod_DSPBufferCount=2,
fmod_DSPBufferLength=6,

Expand Down
3 changes: 1 addition & 2 deletions main.lua
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,7 @@ MSG.addCategory('achievement',
{'fRect',6,17,28,6},
}
)
MSG.new('collect',"123")
MSG.new('achievement',"123")

IMG.init{
actionIcons={
texture='assets/image/action_icon.png',
Expand Down

0 comments on commit f0b5f8d

Please sign in to comment.