整理代码 框架跟进

Author: MrZ626

Zenitha

@@ -129,6 +129,7 @@ do -- function layoutFuncs.default():
     end
 end
 
+---@async
 local function task_switchToResult()
     if SCN.cur=='game_in' then
         SCN.swapTo('result_in','none')

assets/game/init.lua

@@ -252,6 +252,7 @@ function CanPause()
     return GAME.playing and not GAME.mode.name:find('/test')
 end
 
+---@async
 local function task_interiorAutoBack()
     local time=love.timer.getTime()
     local startScene=SCN.cur
@@ -268,7 +269,8 @@ function autoBack_interior(disable)
     end
 end
 
-local function _saveSettings()
+---@async
+local function task_saveSettings()
     TASK.yieldT(.626)
     FILE.save({
         system=SETTINGS._system,
@@ -281,8 +283,8 @@ local function _saveSettings()
     end
 end
 function SaveSettings()
-    TASK.removeTask_code(_saveSettings)
-    TASK.new(_saveSettings)
+    TASK.removeTask_code(task_saveSettings)
+    TASK.new(task_saveSettings)
 end
 function SaveKey()
     FILE.save({
@@ -309,6 +311,7 @@ function CallDict(entry)
     SCN.go('dictionary','none',entry)
 end
 
+---@async
 function task_unloadGame()
     coroutine.yield()
     TASK.yieldUntilNextScene()

assets/gamefunc.lua

@@ -123,7 +123,8 @@ local PROGRESS={}
 --------------------------------------------------------------
 -- Save & Load
 
----@param step nil
+---@async
+---@param step nil | 'yield' | 'save'
 function PROGRESS.save(step)
     if step==nil then
         -- Wait 1 frame before saving
@@ -289,14 +290,17 @@ function PROGRESS.applyEnv(env)
             02*cos(rc+w*2.),02*sin(rc+w*2.)
         end
         updateCursor(.55)
+        local _wid1,_wid2
+        local function cursor_anim(t) updateCursor(MATH.lerp(_wid1,_wid2,t)) end
+        local function cursor_anim2(t) msColor[4]=1-t end
         function ZENITHA.globalEvent.mouseDown(x,y,k)
             msColor[1],msColor[2],msColor[3]=unpack(k==1 and COLOR.lP or k==2 and COLOR.lS or COLOR.lR)
             msColor[4]=1
 
             TWEEN.tag_kill('cursor_anim')
-            local _wid=msWidth
-            TWEEN.new(function(t) updateCursor(MATH.lerp(_wid,.4,t)) end):setTag('cursor_anim'):setDuration(.0626):run()
             TWEEN.tag_kill('cursor_anim2')
+            _wid1,_wid2=msWidth,.4
+            TWEEN.new(cursor_anim):setTag('cursor_anim'):setDuration(.0626):run()
 
             if     k==1 then SYSFX.ripple(.26,x,y,26,.8,.62,1)
             elseif k==2 then SYSFX.ripple(.26,x,y,26,.62,.8,1)
@@ -309,11 +313,10 @@ function PROGRESS.applyEnv(env)
         function ZENITHA.globalEvent.mouseUp(x,y,k)
             if not love.mouse.isDown(1,2,3) then
                 TWEEN.tag_kill('cursor_anim')
-                local _wid=msWidth
-                TWEEN.new(function(t) updateCursor(MATH.lerp(_wid,.55,t)) end):setTag('cursor_anim'):setDuration(.0626):run()
-                TWEEN.new(function(t) msColor[4]=1-t end):setEase('Linear'):setTag('cursor_anim2'):setDuration(1):run()
+                _wid1,_wid2=msWidth,.55
+                TWEEN.new(cursor_anim):setTag('cursor_anim'):setDuration(.0626):run()
+                TWEEN.new(cursor_anim2):setEase('Linear'):setTag('cursor_anim2'):setDuration(1):run()
             end
-
             SFX.play('mouse_up')
         end
 

assets/progress.lua

@@ -133,7 +133,9 @@ local function searchMusic(str)
         musicListBox:select(bestID)
     end
 end
-local function timeBomb()
+
+---@async
+local function task_timeBomb()
     TASK.yieldT(26)
     if TASK.getLock('musicroom_glitchFX') then
         FMOD.effect.keyOff('music_glitch')
@@ -189,7 +191,7 @@ function scene.keyDown(key,isRep)
         elseif key=='f3' then
             if TASK.lock('musicroom_glitchFX') then
                 FMOD.effect('music_glitch')
-                TASK.new(timeBomb)
+                TASK.new(task_timeBomb)
             end
         end
     end

assets/scene/musicroom.lua

@@ -90,13 +90,14 @@ local settingTriggers={ -- Changing values in SETTINGS.system will trigger these
     locale=         function(v) Text=LANG.set(v) end,
 }
 
-local function updateDiscordRPC(v)
+---@async
+local function task_updateDiscordRPC(v)
     TASK.yieldT(2.6)
     DiscordRPC.setEnable(v)
 end
 function settingTriggers.discordConnect(v)
-    TASK.removeTask_code(updateDiscordRPC)
-    TASK.new(updateDiscordRPC,v)
+    TASK.removeTask_code(task_updateDiscordRPC)
+    TASK.new(task_updateDiscordRPC,v)
 end
 
 settings.system=setmetatable({},{