代码规范:所有文件以空行结尾

This commit is contained in:
MrZ626
2021-08-28 16:46:10 +08:00
parent a1162f1b0f
commit a1c6f720a2
320 changed files with 333 additions and 333 deletions

View File

@@ -278,4 +278,4 @@ jobs:
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: Techmino_${{ env.Version }}_${{ GITHUB.RUN_NUMBER }}_${{ env.CommitID }}_macOS name: Techmino_${{ env.Version }}_${{ GITHUB.RUN_NUMBER }}_${{ env.CommitID }}_macOS
path: Techmino.zip path: Techmino.zip

View File

@@ -24,4 +24,4 @@ if __name__ == '__main__':
parser.add_argument('-P', '--Pre', action='store_true', help = '是否获取pre') parser.add_argument('-P', '--Pre', action='store_true', help = '是否获取pre')
parser.add_argument('-R', '--Repo', default = '26F-Studio/cold_clear_ai_love2d_wrapper', help = '获取的仓库, 默认为cold_clear_ai_love2d_wrapper, 输入格式为User/Repo') parser.add_argument('-R', '--Repo', default = '26F-Studio/cold_clear_ai_love2d_wrapper', help = '获取的仓库, 默认为cold_clear_ai_love2d_wrapper, 输入格式为User/Repo')
args = parser.parse_args() args = parser.parse_args()
getColdClear(args) getColdClear(args)

View File

@@ -22,4 +22,4 @@ elseif arg[1]=="-updateNote"then
:gsub("\n_","\n") :gsub("\n_","\n")
:gsub("\n\n","\n",1) :gsub("\n\n","\n",1)
print(note) print(note)
end end

View File

@@ -457,4 +457,4 @@ jobs:
uses: softprops/action-gh-release@v1 uses: softprops/action-gh-release@v1
with: with:
name: ${{ env.Title }} name: ${{ env.Title }}
body_path: ./updateNote.txt body_path: ./updateNote.txt

View File

@@ -94,4 +94,4 @@ if __name__ == '__main__':
elif args.Type == 'AndroidRelease': elif args.Type == 'AndroidRelease':
updateAndroid(args, 'Release') updateAndroid(args, 'Release')
elif args.Type == 'AndroidSnapshot': elif args.Type == 'AndroidSnapshot':
updateAndroid(args, 'Snapshot') updateAndroid(args, 'Snapshot')

View File

@@ -47,4 +47,4 @@ function BG.set(background)
end end
return true return true
end end
return BG return BG

View File

@@ -111,4 +111,4 @@ function BGM.init(list)
BGM.nowPlay,BGM.playing=nil BGM.nowPlay,BGM.playing=nil
end end
end end
return BGM return BGM

View File

@@ -123,4 +123,4 @@ do--Rainbow generators
end end
end end
return COLOR return COLOR

View File

@@ -87,4 +87,4 @@ function FILE.clear_s(path)
end end
fs.remove(path) fs.remove(path)
end end
return FILE return FILE

View File

@@ -156,4 +156,4 @@ do--function GC.DO(L)
return canvas return canvas
end end
end end
return GC return GC

View File

@@ -23,4 +23,4 @@ function IMG.init(list)
IMG.loadAll=nil IMG.loadAll=nil
end end
end end
return IMG return IMG

View File

@@ -732,4 +732,4 @@ function love.run()
if _<.0162 then WAIT(.0162-_)end if _<.0162 then WAIT(.0162-_)end
while TIME()-lastFrame<1/60 do end while TIME()-lastFrame<1/60 do end
end end
end end

View File

@@ -337,4 +337,4 @@ function json.decode(str)
if idx <= #str then decode_error(str, idx, "trailing garbage") end if idx <= #str then decode_error(str, idx, "trailing garbage") end
return res return res
end end
return json return json

View File

@@ -53,4 +53,4 @@ function LANG.init(langList,publicText)--Attention, calling this will destory al
end end
end end
end end
return LANG return LANG

View File

@@ -83,4 +83,4 @@ function LIGHT.add(x,y,radius,solidFunc)
setPow=setPow, setPow=setPow,
} }
end end
return LIGHT return LIGHT

View File

@@ -26,4 +26,4 @@ vec4 effect(vec4 color,Image tex,vec2 tex_coords,vec2 screen_coords){
// Multiply the distance to get a soft fading // Multiply the distance to get a soft fading
return vec4(vec3(1.),sum*smoothstep(1.,0.,r)); return vec4(vec3(1.),sum*smoothstep(1.,0.,r));
} }

View File

@@ -17,4 +17,4 @@ vec4 effect(vec4 color,Image tex,vec2 tex_coords,vec2 screen_coords){
)return vec4(vec3(y/yresolution),1.);// Collision check, alpha>0.1 means transparent )return vec4(vec3(y/yresolution),1.);// Collision check, alpha>0.1 means transparent
} }
return vec4(1.);// Return max distance 1 return vec4(1.);// Return max distance 1
} }

View File

@@ -145,4 +145,4 @@ function MES.traceback()
),5) ),5)
end end
return MES return MES

View File

@@ -173,4 +173,4 @@ function SCN.back()
SCN.stack[m],SCN.stack[m-1]=nil SCN.stack[m],SCN.stack[m-1]=nil
end end
end end
return SCN return SCN

View File

@@ -70,4 +70,4 @@ function SCR.info()
("k,dpi,rad : %.2f, %d, %.2f"):format(SCR.k,SCR.dpi,SCR.rad), ("k,dpi,rad : %.2f, %d, %.2f"):format(SCR.k,SCR.dpi,SCR.rad),
} }
end end
return SCR return SCR

View File

@@ -35,4 +35,4 @@ else
end end
return fontCache[s] return fontCache[s]
end end
end end

View File

@@ -84,4 +84,4 @@ function SFX.init(list)
end end
end end
end end
return SFX return SFX

View File

@@ -159,4 +159,4 @@ function STRING.unpackTable(t)
return JSON.decode(STRING.unpackText(t)) return JSON.decode(STRING.unpackText(t))
end end
return STRING return STRING

View File

@@ -202,4 +202,4 @@ function SYSFX.newLine(rate,x1,y1,x2,y2,r,g,b,a)
r=r or 1,g=g or 1,b=b or 1,a=a or 1, r=r or 1,g=g or 1,b=b or 1,a=a or 1,
}) })
end end
return SYSFX return SYSFX

View File

@@ -195,4 +195,4 @@ do--function TABLE.dumpDeflate(L,t)
TABLE.dumpDeflate=dump TABLE.dumpDeflate=dump
end end
return TABLE return TABLE

View File

@@ -48,4 +48,4 @@ function TASK.clear()
i=i-1 i=i-1
end end
end end
return TASK return TASK

View File

@@ -126,4 +126,4 @@ function TEXT.draw(list)
t:draw() t:draw()
end end
end end
return TEXT return TEXT

View File

@@ -98,4 +98,4 @@ function THEME.fresh()
THEME.set(THEME.calculate(os.date('%Y'),os.date('%m'),os.date('%d'))) THEME.set(THEME.calculate(os.date('%Y'),os.date('%m'),os.date('%d')))
end end
return THEME return THEME

View File

@@ -5,4 +5,4 @@ return function(t)
if L>0 then if L>0 then
vib(level[L+t]) vib(level[L+t])
end end
end end

View File

@@ -115,4 +115,4 @@ function VOC.init(list)
end end
end end
end end
return VOC return VOC

View File

@@ -188,4 +188,4 @@ function WS.update(dt)
end end
end end
return WS return WS

View File

@@ -188,4 +188,4 @@ end
SOCK:close() SOCK:close()
CHN_push(readCHN,8)--close CHN_push(readCHN,8)--close
CHN_push(readCHN,err or"Disconnected") CHN_push(readCHN,err or"Disconnected")
error() error()

View File

@@ -16,4 +16,4 @@ return function(y,key1,key2)
love.keypressed(key2 or"down") love.keypressed(key2 or"down")
float=float+1 float=float+1
end end
end end

View File

@@ -1505,4 +1505,4 @@ function WIDGET.draw()
gc_replaceTransform(SCR.xOy) gc_replaceTransform(SCR.xOy)
end end
return WIDGET return WIDGET

View File

@@ -5,4 +5,4 @@ Exec=wrapper-love %f
Type=Application Type=Application
Categories=Game; Categories=Game;
Terminal=false Terminal=false
Icon=icon Icon=icon

View File

@@ -2,4 +2,4 @@
export LOVE_LAUNCHER_LOCATION="$(dirname "$(which "$0")")" export LOVE_LAUNCHER_LOCATION="$(dirname "$(which "$0")")"
export LD_LIBRARY_PATH="${LOVE_LAUNCHER_LOCATION}/lib/x86_64-linux-gnu:${LOVE_LAUNCHER_LOCATION}/usr/bin:${LOVE_LAUNCHER_LOCATION}/usr/lib:${LOVE_LAUNCHER_LOCATION}/usr/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH="${LOVE_LAUNCHER_LOCATION}/lib/x86_64-linux-gnu:${LOVE_LAUNCHER_LOCATION}/usr/bin:${LOVE_LAUNCHER_LOCATION}/usr/lib:${LOVE_LAUNCHER_LOCATION}/usr/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH"
/sbin/ldconfig -p | grep -q libstdc++ || export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${LOVE_LAUNCHER_LOCATION}/libstdc++/" /sbin/ldconfig -p | grep -q libstdc++ || export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${LOVE_LAUNCHER_LOCATION}/libstdc++/"
exec ${LOVE_BIN_WRAPPER} "${LOVE_LAUNCHER_LOCATION}/usr/bin/love" "${LOVE_LAUNCHER_LOCATION}/usr/share/Techmino" exec ${LOVE_BIN_WRAPPER} "${LOVE_LAUNCHER_LOCATION}/usr/bin/love" "${LOVE_LAUNCHER_LOCATION}/usr/share/Techmino"

View File

@@ -4,20 +4,20 @@ PRODUCTVERSION @FileVersion
FILEOS 0x40004 FILEOS 0x40004
FILETYPE 0x1 FILETYPE 0x1
{ {
BLOCK "StringFileInfo" BLOCK "StringFileInfo"
{
BLOCK "040904B0"
{ {
VALUE "FileDescription", "Techmino Alpha" BLOCK "040904B0"
VALUE "CompanyName", "26F Studio" {
VALUE "LegalCopyright", "Copyright @ 26F Studio" VALUE "FileDescription", "Techmino Alpha"
VALUE "ProductName", "Techmino" VALUE "CompanyName", "26F Studio"
VALUE "ProductVersion", "@Version" VALUE "LegalCopyright", "Copyright @ 26F Studio"
VALUE "ProductName", "Techmino"
VALUE "ProductVersion", "@Version"
}
}
BLOCK "VarFileInfo"
{
VALUE "Translation", 0x0409 0x04E4
} }
} }
BLOCK "VarFileInfo"
{
VALUE "Translation", 0x0409 0x04E4
}
}

View File

@@ -53,4 +53,4 @@
<key>NSSupportsAutomaticGraphicsSwitching</key> <key>NSSupportsAutomaticGraphicsSwitching</key>
<false/> <false/>
</dict> </dict>
</plist> </plist>

View File

@@ -146,4 +146,4 @@ return{--返回一个table你也可以在之前定义一些常量或者函数
T<=183 and 1 or--D级要求解锁别的模式的最低标准 T<=183 and 1 or--D级要求解锁别的模式的最低标准
0--记录成绩的最低标准 0--记录成绩的最低标准
end, end,
} }

View File

@@ -47,4 +47,4 @@
split split
未来可能加入的: 未来可能加入的:
暂无 暂无

View File

@@ -953,4 +953,4 @@ for _,rs in next,RSlist do
end end
end end
return RSlist return RSlist

View File

@@ -22,4 +22,4 @@ function back.draw()
gc.rectangle('fill',0,0,SCR.w,SCR.h) gc.rectangle('fill',0,0,SCR.w,SCR.h)
gc.setShader() gc.setShader()
end end
return back return back

View File

@@ -21,4 +21,4 @@ function back.draw()
gc.rectangle('fill',0,0,SCR.w,SCR.h) gc.rectangle('fill',0,0,SCR.w,SCR.h)
gc.setShader() gc.setShader()
end end
return back return back

View File

@@ -21,4 +21,4 @@ function back.draw()
gc.rectangle('fill',0,0,SCR.w,SCR.h) gc.rectangle('fill',0,0,SCR.w,SCR.h)
gc.setShader() gc.setShader()
end end
return back return back

View File

@@ -63,4 +63,4 @@ end
function back.discard() function back.discard()
squares=nil squares=nil
end end
return back return back

View File

@@ -52,4 +52,4 @@ end
function back.discard() function back.discard()
mino=nil mino=nil
end end
return back return back

View File

@@ -51,4 +51,4 @@ end
function back.discard() function back.discard()
mino=nil mino=nil
end end
return back return back

View File

@@ -54,4 +54,4 @@ end
function back.discard() function back.discard()
mino=nil mino=nil
end end
return back return back

View File

@@ -78,4 +78,4 @@ end
function back.discard() function back.discard()
squares=nil squares=nil
end end
return back return back

View File

@@ -76,4 +76,4 @@ end
function back.discard() function back.discard()
petal=nil petal=nil
end end
return back return back

View File

@@ -95,4 +95,4 @@ end
function back.discard() function back.discard()
firework=nil firework=nil
end end
return back return back

View File

@@ -15,4 +15,4 @@ function back.draw()
else gc.clear(0,0,0) else gc.clear(0,0,0)
end end
end end
return back return back

View File

@@ -14,4 +14,4 @@ function back.draw()
local t1=(sin(t*.5)+sin(t*.7)+sin(t*.9+1)+sin(t*1.5)+sin(t*2+10))*.08 local t1=(sin(t*.5)+sin(t*.7)+sin(t*.9+1)+sin(t*1.5)+sin(t*2+10))*.08
gc.clear(t1,t1,t1) gc.clear(t1,t1,t1)
end end
return back return back

View File

@@ -45,4 +45,4 @@ function back.draw()
mDraw(img[int(L.phase*6)+1],L.x,L.y,nil,L.size) mDraw(img[int(L.phase*6)+1],L.x,L.y,nil,L.size)
end end
end end
return back return back

View File

@@ -33,4 +33,4 @@ function back.draw()
gc.draw(upCover,0,0,0,W,H*.3/64) gc.draw(upCover,0,0,0,W,H*.3/64)
gc.draw(downCover,0,H*.7,0,W,H*.3/64) gc.draw(downCover,0,H*.7,0,W,H*.3/64)
end end
return back return back

View File

@@ -15,4 +15,4 @@ function back.draw()
else gc.clear(0,0,0) else gc.clear(0,0,0)
end end
end end
return back return back

View File

@@ -23,4 +23,4 @@ function back.draw()
gc.setColor(_[1],_[2],_[3],.12) gc.setColor(_[1],_[2],_[3],.12)
gc.draw(TEXTURE.miniBlock[R],SCR.cx,SCR.cy,t%3.1416*6,400*SCR.k,nil,scs[R][0][2]+.5,#blocks[R][0]-scs[R][0][1]-.5) gc.draw(TEXTURE.miniBlock[R],SCR.cx,SCR.cy,t%3.1416*6,400*SCR.k,nil,scs[R][0][2]+.5,#blocks[R][0]-scs[R][0][1]-.5)
end end
return back return back

View File

@@ -28,4 +28,4 @@ function back.draw()
end end
end end
end end
return back return back

View File

@@ -22,4 +22,4 @@ function back.draw()
gc.rectangle('fill',0,0,SCR.w,SCR.h) gc.rectangle('fill',0,0,SCR.w,SCR.h)
gc.setShader() gc.setShader()
end end
return back return back

View File

@@ -22,4 +22,4 @@ function back.draw()
gc.rectangle('fill',0,0,SCR.w,SCR.h) gc.rectangle('fill',0,0,SCR.w,SCR.h)
gc.setShader() gc.setShader()
end end
return back return back

View File

@@ -17,4 +17,4 @@ function back.draw()
sin(t*1.9)*.06+.08 sin(t*1.9)*.06+.08
) )
end end
return back return back

View File

@@ -48,4 +48,4 @@ end
function back.discard() function back.discard()
snow=nil snow=nil
end end
return back return back

View File

@@ -43,4 +43,4 @@ end
function back.discard() function back.discard()
stars=nil stars=nil
end end
return back return back

View File

@@ -40,4 +40,4 @@ end
function back.discard() function back.discard()
ring=nil ring=nil
end end
return back return back

View File

@@ -36,4 +36,4 @@ function back.draw()
gc.draw(txt,-883*.5+3*sin(t*.7283),-110*.5+3*sin(t*.7626)) gc.draw(txt,-883*.5+3*sin(t*.7283),-110*.5+3*sin(t*.7626))
gc.pop() gc.pop()
end end
return back return back

View File

@@ -70,4 +70,4 @@ end
function back.discard() function back.discard()
bar,crystal=nil bar,crystal=nil
end end
return back return back

View File

@@ -197,4 +197,4 @@ function bot_9s.thread(bot)
end end
end end
end end
return bot_9s return bot_9s

View File

@@ -88,4 +88,4 @@ function bot_cc:switch20G()
self.P:loadAI(self.data) self.P:loadAI(self.data)
end end
bot_cc.lockWrongPlace=bot_cc.updateField bot_cc.lockWrongPlace=bot_cc.updateField
return bot_cc return bot_cc

View File

@@ -131,4 +131,4 @@ function BOT.new(P,data)
return bot return bot
end end
return BOT return BOT

View File

@@ -41,4 +41,4 @@ return{
bgm='hang out', bgm='hang out',
eventSet="X", eventSet="X",
} }

View File

@@ -427,4 +427,4 @@ function DATA.parseReplayData(fileName,fileData,ifFull)
available=false, available=false,
} }
end end
return DATA return DATA

View File

@@ -34,4 +34,4 @@ return{
end end
end end
end end
} }

View File

@@ -43,4 +43,4 @@ return{
end end
end end
end end
} }

View File

@@ -4,4 +4,4 @@ return{
P:receive(nil,P.lastPiece.atk,0,generateLine(P.holeRND:random(10))) P:receive(nil,P.lastPiece.atk,0,generateLine(P.holeRND:random(10)))
end end
end, end,
} }

View File

@@ -4,4 +4,4 @@ return{
P:receive(nil,P.lastPiece.atk,120,generateLine(P.holeRND:random(10))) P:receive(nil,P.lastPiece.atk,120,generateLine(P.holeRND:random(10)))
end end
end, end,
} }

View File

@@ -4,4 +4,4 @@ return{
P:receive(nil,P.lastPiece.atk,30,generateLine(P.holeRND:random(10))) P:receive(nil,P.lastPiece.atk,30,generateLine(P.holeRND:random(10)))
end end
end, end,
} }

View File

@@ -4,4 +4,4 @@ return{
P:receive(nil,P.lastPiece.atk,60,generateLine(P.holeRND:random(10))) P:receive(nil,P.lastPiece.atk,60,generateLine(P.holeRND:random(10)))
end end
end, end,
} }

View File

@@ -10,4 +10,4 @@ return{
gc.draw(IMG.electric,0,106,0,2.6) gc.draw(IMG.electric,0,106,0,2.6)
PLY.draw.cancelField(P) PLY.draw.cancelField(P)
end, end,
} }

View File

@@ -31,4 +31,4 @@ return{
end end
end end
end end
} }

View File

@@ -15,4 +15,4 @@ return{
end end
end end
end end
} }

View File

@@ -17,4 +17,4 @@ return{
end end
end end
end end
} }

View File

@@ -11,4 +11,4 @@ return{
P:win('finish') P:win('finish')
end end
end end
} }

View File

@@ -18,4 +18,4 @@ return{
end end
end end
end, end,
} }

View File

@@ -11,4 +11,4 @@ return{
P:win('finish') P:win('finish')
end end
end end
} }

View File

@@ -11,4 +11,4 @@ return{
P:win('finish') P:win('finish')
end end
end end
} }

View File

@@ -11,4 +11,4 @@ return{
P:win('finish') P:win('finish')
end end
end end
} }

View File

@@ -11,4 +11,4 @@ return{
P:win('finish') P:win('finish')
end end
end end
} }

View File

@@ -11,4 +11,4 @@ return{
P:win('finish') P:win('finish')
end end
end end
} }

View File

@@ -11,4 +11,4 @@ return{
P:win('finish') P:win('finish')
end end
end end
} }

View File

@@ -11,4 +11,4 @@ return{
P:win('finish') P:win('finish')
end end
end end
} }

View File

@@ -10,4 +10,4 @@ return{
PLAYERS[ID].control=true PLAYERS[ID].control=true
end end
end end
} }

View File

@@ -10,4 +10,4 @@ return{
PLAYERS[ID].control=true PLAYERS[ID].control=true
end end
end end
} }

View File

@@ -42,4 +42,4 @@ return{
end end
end end
end, end,
} }

View File

@@ -40,4 +40,4 @@ return{
end end
end end
end, end,
} }

View File

@@ -40,4 +40,4 @@ return{
end end
end end
end end
} }

View File

@@ -5,4 +5,4 @@ return{
end end
P.fieldBeneath=0 P.fieldBeneath=0
end, end,
} }

View File

@@ -19,4 +19,4 @@ return{
end end
end end
end, end,
} }

View File

@@ -19,4 +19,4 @@ return{
end end
end end
end, end,
} }

View File

@@ -36,4 +36,4 @@ return{
end end
end end
end, end,
} }

View File

@@ -26,4 +26,4 @@ return
end end
end end
end end
} }

Some files were not shown because too many files have changed in this diff Show More