修Singularity跳过前奏的时间不对

添加更多的日志信息
fmod遇到各种exception会输出更多日志
整理代码 框架跟进

Author: MrZ626

Zenitha

@@ -360,7 +360,7 @@ for packName,set in next,L do
         setmetatable(set,{
             __index=function(t,k)
                 t[k]='?'
-                LOG("warn","char set '"..packName.."' has no char '"..k.."'")
+                LOG('warn',"char set '"..packName.."' has no char '"..k.."'")
             end
         })
         for name,code in next,set do

assets/char.lua

@@ -57,14 +57,14 @@ local Cname
 if SYSTEM=='Windows' or SYSTEM=='Linux' then
     Cname=LOADLIB.ffi('discord-rpc')
 elseif MOBILE then
-    LOG("warn",STRING.repD("No Discord-RPC for $1",SYSTEM))
+    LOG('warn',STRING.repD("No Discord-RPC for $1",SYSTEM))
 else
-    MSG.warnLog(STRING.repD("Waiting Discord-RPC for $1",SYSTEM))
+    MSG.log('warn',STRING.repD("Waiting Discord-RPC for $1",SYSTEM))
 end
 
 if not Cname then return MyRPC end
 
-LOG("info","DiscordRPC loaded")
+LOG('info',"DiscordRPC loaded")
 
 ffi.cdef[[
     typedef struct DiscordRichPresence {
@@ -312,22 +312,22 @@ getmetatable(RPC.gcDummy).__gc=function()
 end
 
 function RPC.ready(userId,username,discriminator,avatar)
-    LOG("info",string.format("Discord: ready (%s,%s,%s,%s)",userId,username,discriminator,avatar))
+    LOG('info',string.format("Discord: ready (%s,%s,%s,%s)",userId,username,discriminator,avatar))
 end
 function RPC.disconnected(errorCode,message)
-    LOG("info",string.format("Discord: disconnected (%d: %s)",errorCode,message))
+    LOG('info',string.format("Discord: disconnected (%d: %s)",errorCode,message))
 end
 function RPC.errored(errorCode,message)
-    LOG("info",string.format("Discord: error (%d: %s)",errorCode,message))
+    LOG('info',string.format("Discord: error (%d: %s)",errorCode,message))
 end
 function RPC.joinGame(joinSecret)
-    LOG("info",string.format("Discord: join (%s)",joinSecret))
+    LOG('info',string.format("Discord: join (%s)",joinSecret))
 end
 function RPC.spectateGame(spectateSecret)
-    LOG("info",string.format("Discord: spectate (%s)",spectateSecret))
+    LOG('info',string.format("Discord: spectate (%s)",spectateSecret))
 end
 function RPC.joinRequest(userId,username,discriminator,avatar)
-    LOG("info",string.format("Discord: join request (%s,%s,%s,%s)",userId,username,discriminator,avatar))
+    LOG('info',string.format("Discord: join request (%s,%s,%s,%s)",userId,username,discriminator,avatar))
     RPC.respond(userId,'yes')
 end
 RPC.initialize(MyRPC.appId,true)

assets/discordRPC.lua

@@ -8,7 +8,7 @@ if SYSTEM=='Web' then
         __index=function(t,k)
             t[k]=NOLL
             return NOLL
-        end
+        end,
     })
 end
 
@@ -36,7 +36,7 @@ if M.C and M.C2 then
     require'constants'
     require'wrap'
     require'errors'
-    LOG("info","FMOD loaded")
+    LOG('info',"FMOD loaded")
 end
 
 --------------------------------------------------------------
@@ -52,11 +52,22 @@ function M.init(args)
         M.studio:release()
         firstTime=false
     end
-    M.studio=M.newStudio()
-    M.core=M.studio:getCoreSystem()
+
+    local res
+    M.studio,res=M.newStudio()
+    if res~=M.FMOD_OK then MSG.log('error',"fmod newStudio error: "..M.errorString[res]) return end
+
+    M.core,res=M.studio:getCoreSystem()
+    if res~=M.FMOD_OK then MSG.log('error',"fmod getCoreSystem error: "..M.errorString[res]) return end
+
     studio,core=M.studio,M.core
-    core:setDSPBufferSize(args.DSPBufferLength or 128,args.DSPBufferCount or 4)
-    studio:initialize(args.maxChannel,args.studioFlag,args.coreFlag)
+
+    res=core:setDSPBufferSize(args.DSPBufferLength or 128,args.DSPBufferCount or 4)
+    if res~=M.FMOD_OK then MSG.log('error',"fmod setDSPBufferSize error: "..M.errorString[res]) return end
+
+    res=studio:initialize(args.maxChannel,args.studioFlag,args.coreFlag)
+    if res~=M.FMOD_OK then MSG.log('error',"fmod initialize error: "..M.errorString[res]) return end
+
     if firstTime then
         TASK.new(function()
             while studio do
@@ -77,12 +88,13 @@ end
 ---This method can only load files visible to fmod
 ---@param path string
 ---@param flag? FMOD.Const
+---@return FMOD.Studio.Bank?, string? errInfo
 function M.loadBank(path,flag)
     if not studio then return end
     local bank,res=studio:loadBankFile(path,flag or M.FMOD_STUDIO_LOAD_BANK_NORMAL)
     if res~=M.FMOD_OK then
-        MSG.errorLog("FMOD loadBank error: "..M.errorString[res])
-        return
+        LOG('error',"fmodstudio:loadBankFile error: "..M.errorString[res])
+        return nil,M.errorString[res]
     end
     M.banks[path]=bank
     return bank
@@ -91,20 +103,20 @@ end
 ---This method uses 'loadBankMemory' instead of 'loadBankFile', which makes files visible to love2d's filesystem can be loaded
 ---@param path string
 ---@param flag? FMOD.Const
----@return FMOD.Studio.Bank?
+---@return FMOD.Studio.Bank?, string? errInfo
 function M.loadBank2(path,flag)
     if not studio then return end
     if not love.filesystem.getInfo(path) then
-        MSG.new('warn',"Bank file not found: "..path)
-        return
+        LOG('warn',"Bank file not found: "..path)
+        return nil,"Bank file not found: "..path
     end
     local file=love.filesystem.newFile(path)
     local data,size=file:read('data')
     local bank,res=studio:loadBankMemory(data:getPointer(),size,0,flag or M.FMOD_STUDIO_LOAD_BANK_NORMAL)
     file:close(); file:release(); data:release()
     if res~=M.FMOD_OK then
-        MSG.errorLog("FMOD loadBankMemory error: "..M.errorString[res])
-        return
+        LOG('error',"FMOD loadBankMemory error: "..M.errorString[res])
+        return nil,M.errorString[res]
     end
     M.banks[path]=bank
     return bank
@@ -187,13 +199,13 @@ function M.music.play(name,args)
     if not desc then
         if not unhintedBGM[name] then
             unhintedBGM[name]=true
-            MSG.new('warn',"No BGM named "..name)
+            MSG.log('warn',"No BGM named "..name)
         end
         return
     end
     local event,res=desc:createInstance()
     if res~=M.FMOD_OK then
-        MSG.new('warn',"Event named "..name.." created failed: "..M.errorString[res])
+        MSG.log('warn',"Event named "..name.." created failed: "..M.errorString[res])
         return
     end
     playing={
@@ -329,13 +341,13 @@ function M.effect.play(name,args)
     if not desc then
         if not unhintedSFX[name] then
             unhintedSFX[name]=true
-            MSG.new('warn',"No SE named "..name)
+            MSG.log('warn',"No SE named "..name)
         end
         return
     end
     local event,res=desc:createInstance()
     if res~=M.FMOD_OK then
-        MSG.new('warn',"Play SE '"..name.."' failed: "..M.errorString[res])
+        MSG.log('warn',"Play SE '"..name.."' failed: "..M.errorString[res])
         return
     end
 

assets/fmod20221/init.lua

@@ -95,7 +95,7 @@ function P:playSound(event,...)
         if self.soundEvent[event] then
             self.soundEvent[event](...)
         else
-            MSG.new('warn',"Unknown sound event: "..event)
+            MSG.log('warn',"Unknown sound event: "..event)
         end
     end
 end
@@ -312,7 +312,7 @@ function P:finish(reason)
 
     -- TODO: Just for temporary use
     if self.isMain then
-        MSG.new(reason=='win' and 'check' or 'error',finishTexts[reason] or finishTexts.other,6.26)
+        MSG(reason=='win' and 'check' or 'error',finishTexts[reason] or finishTexts.other,6.26)
         self:playSound('finish_'..reason)
     end
 end
@@ -820,7 +820,7 @@ local function dump(self,L,t,path)
                 k='["FUNC:'..regFuncToStr[k]..'"]='
             else
                 k='["*'..tostring(k)..'"]='
-                LOG("Wrong key type: "..T..", "..nPath)
+                LOG('warn',"Wrong key type: "..T..", "..nPath)
             end
 
             T=type(v)
@@ -831,19 +831,19 @@ local function dump(self,L,t,path)
             elseif T=='table' then
                 v=t<10 and dump(self,v,t+1,nPath)
             elseif T=='function' then
-                v='"FUNC:'..(regFuncToStr[v] or LOG("UNKNOWN_FUNCTION: "..nPath) or "unknown")..'"'
+                v='"FUNC:'..(regFuncToStr[v] or LOG('warn',"UNKNOWN_FUNCTION: "..nPath) or "unknown")..'"'
             elseif T=='userdata' then
                 T=v:type()
                 if T=='RandomGenerator' then
                     v=dump(self,{__type=T,state=v:getState()},t+1,nPath)
                 elseif T=='ParticleSystem' then
                     v=nil -- Skip
                 else
-                    LOG("Un-handled type:"..T..", "..nPath)
+                    LOG('warn',"Un-handled type:"..T..", "..nPath)
                 end
             else
                 v='["*'..tostring(v)..'"]='
-                LOG("Wrong value type: "..T..", "..nPath)
+                LOG('warn',"Wrong value type: "..T..", "..nPath)
             end
 
             if v~=nil then
@@ -864,10 +864,10 @@ local function undump(self,L,t)
         if T=='number' or T=='boolean' then
         elseif T=='string' then
             if k:sub(1,5)=='FUNC:' then
-                k=regStrToFunc[k:sub(6)] or LOG("UNKNOWN_FUNCTION: "..k)
+                k=regStrToFunc[k:sub(6)] or LOG('warn',"UNKNOWN_FUNCTION: "..k)
             end
         else
-            LOG("Abnormal key type: "..T)
+            LOG('warn',"Abnormal key type: "..T)
         end
 
         T=type(v)
@@ -877,18 +877,18 @@ local function undump(self,L,t)
                     self[k]=love.math.newRandomGenerator()
                     self[k]:setState(v.state)
                 else
-                    LOG("Un-handled type:"..v.__type)
+                    LOG('warn',"Un-handled type:"..v.__type)
                 end
             elseif t<=10 then
                 self[k]={}
                 undump(self[k],v,t+1)
             else
-                LOG("WARNING: table depth over 10, skipped")
+                LOG('warn',"WARNING: table depth over 10, skipped")
             end
         else
             if T=='string' then
                 if v:sub(1,5)=='FUNC:' then
-                    v=regStrToFunc[v:sub(6)] or LOG("UNKNOWN_FUNCTION: "..v)
+                    v=regStrToFunc[v:sub(6)] or LOG('warn',"UNKNOWN_FUNCTION: "..v)
                 end
             end
             self[k]=v
@@ -898,10 +898,10 @@ end
 function P:unserialize(data)
     local f='return'..data
     f=loadstring(f)
-    if type(f)~='function' then return LOG("Cannot parse data as luaon") end
+    if type(f)~='function' then return LOG('warn',"Cannot parse data as luaon") end
     setfenv(f,{})
     local res=f()
-    if type(res)~='table' then return LOG("Cannot parse data as luaon") end
+    if type(res)~='table' then return LOG('warn',"Cannot parse data as luaon") end
     undump(self,res,0)
 
     self.soundTimeHistory=setmetatable({},soundTimeMeta)

assets/game/basePlayer.lua

@@ -243,7 +243,7 @@ local function _enterMode(m)
             FMOD.effect('map_enter')
             SCN.go('game_out','fade','brik/exterior/'..m.name)
         else
-            MSG.new('warn',"No mode file")
+            MSG.log('warn',"No mode file")
         end
     end
 end

assets/game/exteriorMap.lua

@@ -215,7 +215,7 @@ end
 function GAME.load(mode,seed)
     -- print("Game Loaded: "..mode.."-"..seed)
     if GAME.mode then
-        MSG.new('warn',"Game is running")
+        MSG.log('warn',"Game is running")
         return
     end
     GAME.playing=true
@@ -232,7 +232,7 @@ function GAME.load(mode,seed)
     TASK.removeTask_code(task_unloadGame)
 
     if #GAME.playerList==0 then
-        MSG.new('warn',"No players created in this mode")
+        MSG.log('warn',"No players created in this mode")
     else
         if GAME.mainPlayer then
             local conf=SETTINGS['game_'..GAME.mainPlayer.gameMode]
@@ -276,7 +276,7 @@ end
 ---@param remote? boolean
 function GAME.newPlayer(id,pType,remote)
     if not (type(id)=='number' and math.floor(id)==id and id>=1 and id<=1000) then
-        MSG.new('error',"player id must be 1~1000 integer")
+        MSG.log('error',"player id must be 1~1000 integer")
         return
     end
 
@@ -288,7 +288,7 @@ function GAME.newPlayer(id,pType,remote)
     elseif pType=='acry' then
         P=require'acryPlayer'.new(remote)
     else
-        MSG.new('error',"invalid player type :'"..tostring(pType).."'")
+        MSG.log('error',"invalid player type :'"..tostring(pType).."'")
         return
     end
 

assets/game/init.lua

@@ -1,6 +1,6 @@
 function sureCheck(event)
     if TASK.lock('sureCheck_'..event,1) then
-        MSG.new('info',Text.sureText[event],1)
+        MSG('info',Text.sureText[event],1)
     else
         return true
     end
@@ -227,7 +227,7 @@ local interiorModeMeta={
         if success then
             SCN.go('game_in','none',self.name)
         else
-            MSG.new('warn',Text.noMode:repD(tostring(self.name):simplifyPath(),errInfo))
+            MSG.log('warn',Text.noMode:repD(tostring(self.name):simplifyPath(),errInfo))
         end
     end
 }
@@ -241,7 +241,7 @@ local exteriorModeMeta={
         if success then
             SCN.go('game_out','fade',self.name)
         else
-            MSG.new('warn',Text.noMode:repD(tostring(self.name):simplifyPath(),errInfo))
+            MSG.log('warn',Text.noMode:repD(tostring(self.name):simplifyPath(),errInfo))
         end
     end
 }
@@ -319,7 +319,7 @@ end
 
 function _getLatestBank(dt)
     TASK.new(function()
-        MSG.new('info',"Opening URL to bank files...")
+        MSG('info',"Opening URL to bank files...")
         TASK.yieldT(dt or 0.626)
         love.system.openURL("https://kyzj-my.sharepoint.com/:f:/g/personal/noreply_studio26f_org/ElmKJZYcNpFDhGks9nekrUYBoyr1ZJZgpx1lCyFu6tHXQg?e=vJnaQX")
     end)