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

整理代码，调整local函数名规范（较边缘的代码不必遵守，比如外部的库和小程序）：

Browse Source 
特别临时性的用全大写字母缩写或者单字母
TASK模块用到的任务函数和检查函数开头分别为task_和check_
其他函数开头添加下划线作为指示
This commit is contained in:
MrZ626
2021-08-25 02:40:01 +08:00
parent ee55055385
commit 8f910f95f4
40 changed files with 470 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Zframework/bgm.lua
View File

@@ -25,7 +25,7 @@ function BGM.init(list)
local count=#simpList
function BGM.getCount()return count end
local function load(name)
local function _load(name)
if type(Sources[name])=='string'then
if love.filesystem.getInfo(Sources[name])then
Sources[name]=love.audio.newSource(Sources[name],'stream')
@@ -41,8 +41,8 @@ function BGM.init(list)
MES.new('warn',"No BGM: "..name,5)
end
end
function BGM.loadAll()for name in next,Sources do load(name)end end
local function fadeOut(src)
function BGM.loadAll()for name in next,Sources do _load(name)end end
local function task_fadeOut(src)
while true do
coroutine.yield()
local v=src:getVolume()-.025*SETTING.bgm
@@ -53,7 +53,7 @@ function BGM.init(list)
end
end
end
local function fadeIn(src)
local function task_fadeIn(src)
while true do
coroutine.yield()
local v=SETTING.bgm
@@ -64,12 +64,12 @@ function BGM.init(list)
end
end
end
local function removeCurFadeOut(task,code,src)
local function check_curFadeOut(task,code,src)
return task.code==code and task.args[1]==src
end
function BGM.play(name)
if not name then name=BGM.default end
if not load(name)then return end
if not _load(name)then return end
if SETTING.bgm==0 then
BGM.nowPlay=name
BGM.playing=Sources[name]
@@ -77,11 +77,11 @@ function BGM.init(list)
end
if name and Sources[name]then
if BGM.nowPlay~=name then
if BGM.nowPlay then TASK.new(fadeOut,BGM.playing)end
TASK.removeTask_iterate(removeCurFadeOut,fadeOut,Sources[name])
TASK.removeTask_code(fadeIn)
if BGM.nowPlay then TASK.new(task_fadeOut,BGM.playing)end
TASK.removeTask_iterate(check_curFadeOut,task_fadeOut,Sources[name])
TASK.removeTask_code(task_fadeIn)
TASK.new(fadeIn,Sources[name])
TASK.new(task_fadeIn,Sources[name])
BGM.nowPlay=name
BGM.playing=Sources[name]
BGM.playing:play()
@@ -101,8 +101,8 @@ function BGM.init(list)
end
end
function BGM.stop()
TASK.removeTask_code(fadeIn)
if BGM.nowPlay then TASK.new(fadeOut,BGM.playing)end
TASK.removeTask_code(task_fadeIn)
if BGM.nowPlay then TASK.new(task_fadeOut,BGM.playing)end
BGM.nowPlay,BGM.playing=nil
end
end