diff --git a/Zframework/init.lua b/Zframework/init.lua index 7aeb8df9..d4c66788 100644 --- a/Zframework/init.lua +++ b/Zframework/init.lua @@ -390,7 +390,7 @@ function love.errorhandler(msg) --Write messages to log file love.filesystem.append("conf/error.log", os.date("%Y/%m/%d %A %H:%M:%S\n").. - #ERRDATA.." crash(es) "..SYSTEM.."-"..VERSION_NAME.." scene: "..scn.."\n".. + #ERRDATA.." crash(es) "..SYSTEM.."-"..VERSION.string.." scene: "..scn.."\n".. table.concat(err,"\n",1,c-2).."\n\n" ) @@ -432,7 +432,7 @@ function love.errorhandler(msg) setFont(100)gc_print(":(",100,0,0,1.2) setFont(40)gc.printf(errorMsg,100,160,SCR.w0-100) setFont(20) - gc_print(SYSTEM.."-"..VERSION_NAME.." scene:"..(SCN and SCN.cur or"NULL"),100,660) + gc_print(SYSTEM.."-"..VERSION.string.." scene:"..(SCN and SCN.cur or"NULL"),100,660) gc.printf(err[1],100,360,1260-100) gc_print("TRACEBACK",100,450) for i=4,#err-2 do diff --git a/Zframework/log.lua b/Zframework/log.lua index c9072238..f82aebd7 100644 --- a/Zframework/log.lua +++ b/Zframework/log.lua @@ -4,7 +4,7 @@ local ins,rem=table.insert,table.remove local debugMesList={} local debugMesHistory={ - "Version: "..VERSION_NAME, + "Version: "..VERSION.string, os.date("Launched at %Y/%m/%d %H:%M"), } local LOG={} diff --git a/conf.lua b/conf.lua index ff83e34d..e0d5c2ba 100644 --- a/conf.lua +++ b/conf.lua @@ -1,5 +1,8 @@ -VERSION_CODE=1401 -VERSION_NAME="Alpha V0.14.1 黎明 Dawn" +VERSION={ + code=1401, + string="Alpha V0.14.1", + name="黎明 Dawn", +} function love.conf(t) t.identity="Techmino"--Saving folder t.version="11.1" @@ -12,7 +15,7 @@ function love.conf(t) end local W=t.window - W.title="Techmino "..VERSION_NAME + W.title="Techmino "..VERSION.string W.icon="media/image/icon.png" W.width,W.height=1280,720 W.minwidth,W.minheight=640,360 diff --git a/main.lua b/main.lua index b09beac8..c8b686cf 100644 --- a/main.lua +++ b/main.lua @@ -327,9 +327,9 @@ do end USER.username=nil - if STAT.version~=VERSION_CODE then + if STAT.version~=VERSION.code then newVersionLaunch=true - STAT.version=VERSION_CODE + STAT.version=VERSION.code FILE.save(STAT,"conf/data","q") end diff --git a/parts/gametoolfunc.lua b/parts/gametoolfunc.lua index 70c878da..38f311e0 100644 --- a/parts/gametoolfunc.lua +++ b/parts/gametoolfunc.lua @@ -956,7 +956,7 @@ do--function saveRecording() local fileHead= os.date("%Y/%m/%d %A %H:%M:%S\n").. GAME.curModeName.."\n".. - VERSION_NAME.."\n".. + VERSION.string.."\n".. (USER.username or"Player") local fileBody= GAME.seed.."\n".. diff --git a/parts/globalTables.lua b/parts/globalTables.lua index 501ee680..5cae8bd4 100644 --- a/parts/globalTables.lua +++ b/parts/globalTables.lua @@ -305,7 +305,7 @@ if S then--Statistics STAT=S else STAT={ - version=VERSION_CODE, + version=VERSION.code, run=0,game=0,time=0,frame=0, key=0,rotate=0,hold=0, extraPiece=0,finesseRate=0, diff --git a/parts/net.lua b/parts/net.lua index e8ff36e5..af0e3abc 100644 --- a/parts/net.lua +++ b/parts/net.lua @@ -247,8 +247,8 @@ function NET.updateWS_app() local res=_parse(message) if res then NET.connected=true - NET.allow_online=VERSION_CODE>=res.lowest - if VERSION_CODE=res.lowest + if VERSION.code.026 and{.3,.5,.9}or{.62,.3,.926} - stateInfo=SYSTEM.."-"..VERSION_NAME.." scene:"..ERRDATA[#ERRDATA].scene + stateInfo=SYSTEM.."-"..VERSION.string.." scene:"..ERRDATA[#ERRDATA].scene errorText=LOADED and text.errorMsg or"An error has occurred during loading.\nError info has been created, and you can send it to the author." errorShot,errorInfo=ERRDATA[#ERRDATA].shot,ERRDATA[#ERRDATA].mes if SETTING then SFX.fplay("error",SETTING.voc*.8 or 0)end diff --git a/parts/scenes/main.lua b/parts/scenes/main.lua index 56a699a3..a0fec1f7 100644 --- a/parts/scenes/main.lua +++ b/parts/scenes/main.lua @@ -2,7 +2,7 @@ local gc=love.graphics local scene={} -local verName=SYSTEM.." "..VERSION_NAME +local verName=("%s %s %s"):format(SYSTEM,VERSION.string,VERSION.name) local tipLength=760 local tip=gc.newText(getFont(30),"") local scrollX--Tip scroll position diff --git a/parts/scenes/main_simple.lua b/parts/scenes/main_simple.lua index a0897a72..8d6982f9 100644 --- a/parts/scenes/main_simple.lua +++ b/parts/scenes/main_simple.lua @@ -17,7 +17,7 @@ end scene.widgetList={ WIDGET.newText{name="system", x=750,y=280,fText=SYSTEM,color="white",font=30,align="L"}, - WIDGET.newText{name="version", x=950,y=280,fText=VERSION_NAME,color="white",font=30,align="L"}, + WIDGET.newText{name="version", x=950,y=280,fText=VERSION.string,color="white",font=30,align="L"}, WIDGET.newButton{name="sprint", x=260,y=480,w=260,font=50,code=function()loadGame("sprint_40l",true)end}, WIDGET.newButton{name="marathon",x=640,y=480,w=260,font=50,code=function()loadGame("marathon_n",true)end}, WIDGET.newButton{name="setting",x=1000,y=400,w=120,fText="...",font=50,code=goScene"setting_game"},