Merge branch 'main' into test-new-mode-system

This commit is contained in:
MrZ626
2021-12-16 02:32:51 +08:00
21 changed files with 281 additions and 230 deletions

View File

@@ -71,6 +71,8 @@ mStr=GC.mStr
mText=GC.simpX
mDraw=GC.draw
Snd=SFX.playSample
string.repD=STRING.repD
string.sArg=STRING.sArg
--Delete all naked files (from too old version)
FILE.clear('')
@@ -123,9 +125,10 @@ end})
table.insert(_LOADTIMELIST_,("Load Parts: %.3fs"):format(TIME()-_LOADTIME_))
--Init Zframework
Z.setIfPowerInfo(function()
return SETTING.powerInfo and LOADED
end)
Z.setCleanCanvas(SETTING.cleanCanvas)
Z.setFrameMul(SETTING.frameMul)
Z.setClickFX(SETTING.clickFX)
do--Z.setCursor
local normImg=GC.DO{16,16,
{'fCirc',8,8,4},