SweetSea/Techmino
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BGM和BG模块设置成功（包括重复）返回true

Browse Source
This commit is contained in:
MrZ626
2021-03-18 12:43:32 +08:00
parent 0cca8f2c83
commit 601591c7db
2 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Zframework/background.lua
View File

@@ -34,7 +34,8 @@ function BG.setDefault(bg)
end end
function BG.set(background) function BG.set(background)
if not background then background=BG.default end if not background then background=BG.default end
if not BGs[background]or background==BG.cur or not SETTING.bg then return end if not BGs[background]or not SETTING.bg then return end
if background~=BG.cur then
BG.discard() BG.discard()
BG.cur=background BG.cur=background
background=BGs[background] background=BGs[background]
@@ -47,4 +48,6 @@ function BG.set(background)
BG.discard= background.discard or NULL BG.discard= background.discard or NULL
BG.init() BG.init()
end end
return true
end
return BG return BG

7
Zframework/bgm.lua
View File

@@ -63,9 +63,10 @@ function BGM.init(list)
if SETTING.bgm==0 then if SETTING.bgm==0 then
BGM.nowPlay=s BGM.nowPlay=s
BGM.playing=Sources[s] BGM.playing=Sources[s]
return return true
end end
if s and Sources[s]and BGM.nowPlay~=s then if s and Sources[s]then
if BGM.nowPlay~=s then
if BGM.nowPlay then TASK.new(fadeOut,BGM.playing)end if BGM.nowPlay then TASK.new(fadeOut,BGM.playing)end
TASK.removeTask_iterate(removeCurFadeOut,fadeOut,Sources[s]) TASK.removeTask_iterate(removeCurFadeOut,fadeOut,Sources[s])
TASK.removeTask_code(fadeIn) TASK.removeTask_code(fadeIn)
@@ -75,6 +76,8 @@ function BGM.init(list)
BGM.playing=Sources[s] BGM.playing=Sources[s]
BGM.playing:play() BGM.playing:play()
end end
return true
end
end end
function BGM.freshVolume() function BGM.freshVolume()
if BGM.playing then if BGM.playing then