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

修复多媒体库更新后两个用到bgm库的地方没有跟上

Browse Source
This commit is contained in:
MrZ626
2020-12-10 11:59:26 +08:00
parent b97b87bfb0
commit c7a813e8d5
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Zframework/bgm.lua
View File

@@ -6,7 +6,7 @@ local BGM={
function BGM.init(list)
BGM.init=nil
local min=math.min
local Sources={}function BGM.getList()return Sources end
local Sources={}function BGM.getList()return list end
local count=#list function BGM.getCount()return count end
local function fadeOut(src)

17
parts/scenes/music.lua
View File

@@ -5,10 +5,11 @@ local sin=math.sin
local scene={}
local bgmList=BGM.getList()
function scene.sceneInit()
if BGM.nowPlay then
for i=1,BGM.getCount()do
if BGM.list[i]==BGM.nowPlay then
if bgmList[i]==BGM.nowPlay then
sceneTemp=i--Music selected
return
end
@@ -34,8 +35,8 @@ function scene.keyDown(key)
SFX.play("move",.7)
end
elseif key=="return"or key=="space"then
if BGM.nowPlay~=BGM.list[S]then
BGM.play(BGM.list[S])
if BGM.nowPlay~=bgmList[S]then
BGM.play(bgmList[S])
if SETTING.bgm>0 then SFX.play("click")end
else
BGM.stop()
@@ -49,13 +50,13 @@ function scene.draw()
gc.setColor(1,1,1)
setFont(50)
gc.print(BGM.list[sceneTemp],320,355)
gc.print(bgmList[sceneTemp],320,355)
setFont(35)
if sceneTemp>1 then gc.print(BGM.list[sceneTemp-1],320,350-30)end
if sceneTemp<BGM.getCount()then gc.print(BGM.list[sceneTemp+1],320,350+65)end
if sceneTemp>1 then gc.print(bgmList[sceneTemp-1],320,350-30)end
if sceneTemp<BGM.getCount()then gc.print(bgmList[sceneTemp+1],320,350+65)end
setFont(20)
if sceneTemp>2 then gc.print(BGM.list[sceneTemp-2],320,350-50)end
if sceneTemp<BGM.getCount()-1 then gc.print(BGM.list[sceneTemp+2],320,350+110)end
if sceneTemp>2 then gc.print(bgmList[sceneTemp-2],320,350-50)end
if sceneTemp<BGM.getCount()-1 then gc.print(bgmList[sceneTemp+2],320,350+110)end
gc.draw(IMG.title,840,220,nil,1.5,nil,206,35)
if BGM.nowPlay then