版本推进

整理代码

.github/workflows/main.yml

@@ -53,13 +53,20 @@ jobs:
     runs-on: ubuntu-latest
     needs: get-info
     env:
-      PACKAGE_NAME: ./${{ needs.get-info.outputs.base-name }}_Core.love
+      OUTPUT_FOLDER: ./build
     outputs:
       download-url: ${{ steps.transfer.outputs.download-url }}
     steps:
       - uses: actions/checkout@v3
         with:
           submodules: recursive
+      - name: Process app name
+        id: process-app-name
+        shell: python3 {0}
+        run: |
+          import os
+          import re
+          os.system("echo ::set-output name=product-name::" + re.sub(r"[^A-Za-z0-9]+", "_", "${{ needs.get-info.outputs.app-name }}"))
       - uses: ./.github/actions/update-version
         if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
         with:
@@ -76,24 +83,26 @@ jobs:
           name: ${{ env.CORE_LOVE_ARTIFACT_NAME }}
           path: ${{ env.CORE_LOVE_PACKAGE_PATH }}
       - name: Rename love package
-        run: mv ${{ env.CORE_LOVE_PACKAGE_PATH }} ${{ env.PACKAGE_NAME }}
+        run: |
+          mkdir -p ${{ env.OUTPUT_FOLDER }}
+          mv ${{ env.CORE_LOVE_PACKAGE_PATH }} ${{ env.OUTPUT_FOLDER }}/${{ steps.process-app-name.outputs.product-name }}.love
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
-          name: ${{ needs.get-info.outputs.base-name }}_Core
+          name: ${{ needs.get-info.outputs.base-name }}_Core_love
-          path: ${{ env.PACKAGE_NAME }}
+          path: ${{ env.OUTPUT_FOLDER }}/${{ steps.process-app-name.outputs.product-name }}.love
       - name: Upload release
         if: ${{ startsWith(github.ref, 'refs/tags/pre') || startsWith(github.ref, 'refs/tags/v') }}
         uses: softprops/action-gh-release@v1
         with:
           body: ${{ github.event.head_commit.message }}
-          files: ${{ env.PACKAGE_NAME }}
+          files: ${{ env.OUTPUT_FOLDER }}/${{ steps.process-app-name.outputs.product-name }}.love
           prerelease: ${{ startsWith(github.ref, 'refs/tags/pre') }}
       - name: Upload to WeTransfer
         id: transfer
         run: |
           curl -sL https://git.io/file-transfer | sh 
-          ./transfer wet -s -p 16 --no-progress ${{ env.PACKAGE_NAME }} 2>&1>./wetransfer.log
+          ./transfer wet -s -p 16 --no-progress ${{ env.OUTPUT_FOLDER }}/${{ steps.process-app-name.outputs.product-name }}.love 2>&1>./wetransfer.log
           echo "::set-output name=download-url::$(cat ./wetransfer.log | grep https | cut -f3 -d" ")"
       - name: Show download link
         shell: bash
@@ -167,11 +176,6 @@ jobs:
           version-string: ${{ needs.get-info.outputs.version-string }}
           version-code: ${{ needs.get-info.outputs.version-code }}
           output-folder: ${{ env.OUTPUT_FOLDER }}
-      - name: Upload debug artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ needs.get-info.outputs.base-name }}_Android_debug
-          path: ${{ env.OUTPUT_FOLDER }}/${{ steps.process-app-name.outputs.product-name }}-debug.apk
       - name: Upload release artifact
         uses: actions/upload-artifact@v3
         with:
@@ -333,7 +337,7 @@ jobs:
       - name: Upload AppImage artifact
         uses: actions/upload-artifact@v3
         with:
-          name: ${{ needs.get-info.outputs.base-name }}_Linux
+          name: ${{ needs.get-info.outputs.base-name }}_Linux_AppImage
           path: ${{ env.OUTPUT_FOLDER }}/${{ steps.process-app-name.outputs.product-name }}.AppImage
       - name: Upload release
         if: ${{ startsWith(github.ref, 'refs/tags/pre') || startsWith(github.ref, 'refs/tags/v') }}
@@ -556,6 +560,11 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: ${{ env.CORE_LOVE_ARTIFACT_NAME }}
+      - name: Download ColdClear
+        uses: ./.github/actions/get-cc
+        with:
+          platform: Windows
+          dir: ./ColdClear
       - name: Build Windows packages
         id: build-packages
         uses: 26F-Studio/love-actions-windows@v1
@@ -563,6 +572,8 @@ jobs:
           icon-path: ./.github/build/windows/${{ env.BUILD_TYPE }}/icon.ico
           rc-path: ./.github/build/windows/${{ env.BUILD_TYPE }}/template.rc
           love-package: ${{ env.CORE_LOVE_PACKAGE_PATH }}
+          extra-assets-x86: ./ColdClear/x86/CCloader.dll ./ColdClear/x86/cold_clear.dll
+          extra-assets-x64: ./ColdClear/x64/CCloader.dll ./ColdClear/x64/cold_clear.dll
           product-name: ${{ steps.process-app-name.outputs.product-name }}
           version-string: ${{ needs.get-info.outputs.version-string }}
           output-folder: ${{ env.OUTPUT_FOLDER }}
@@ -618,6 +629,8 @@ jobs:
         build-macos-portable,
         build-windows,
       ]
+    env:
+      ACTION_TYPE: ${{ fromJSON('[["Development", "Pre-release"], ["Release", "Release"]]')[startsWith(github.ref, 'refs/tags/v')][startsWith(github.ref, 'refs/tags/pre')] }}
     steps:
       - uses: actions/checkout@v3
       - name: Cleanup
@@ -631,7 +644,7 @@ jobs:
           message: "Github Actions for **${{ github.repository }}**."
           embed: '{
             "author":{
-            "name":"${{ needs.get-info.outputs.app-name }} [Development]",
+            "name":"${{ needs.get-info.outputs.app-name }} [${{ env.ACTION_TYPE }}]",
             "url":"https://github.com/${{ github.repository }}"
             },
             "title":"${{ needs.get-info.outputs.app-name }} (${{ needs.get-info.outputs.version-name }}) Build Result",

main.lua

@@ -80,15 +80,14 @@ table.insert(_LOADTIMELIST_,("Load Zframework: %.3fs"):format(TIME()-_LOADTIME_)
 --Create shortcuts
 setFont=FONT.set
 getFont=FONT.get
-mStr=GC.mStr
 mText=GC.simpX
-mDraw=GC.draw
+mDraw=GC.mDraw
 Snd=SFX.playSample
 string.repD=STRING.repD
 string.sArg=STRING.sArg
 string.split=STRING.split
 
---Delete all naked files (from too old version)
+--Delete all naked files (from ancient versions)
 FILE.clear('')
 
 --Create directories
@@ -150,18 +149,15 @@ do--Z.setCursor
         {'dCirc',8,8,7},
         {'fCirc',8,8,3},
     }
-    local min,int,abs=math.min,math.floor,math.abs
-    local gc_setColor,gc_draw=love.graphics.setColor,love.graphics.draw
-    local ms=love.mouse
     Z.setCursor(function(time,x,y)
         if not SETTING.sysCursor then
-            local R=int((time+1)/2)%7+1
+            local R=math.floor((time+1)/2)%7+1
             _=BLOCK_COLORS[SETTING.skin[R]]
-            gc_setColor(_[1],_[2],_[3],min(abs(1-time%2),.3))
+            GC.setColor(_[1],_[2],_[3],math.min(math.abs(1-time%2),.3))
             _=DSCP[R][0]
-            gc_draw(TEXTURE.miniBlock[R],x,y,time%3.14159265359*4,8,8,2*_[2]+1,2*(#BLOCKS[R][0]-_[1])-1)
+            GC.draw(TEXTURE.miniBlock[R],x,y,time%math.pi*4,8,8,2*_[2]+1,2*(#BLOCKS[R][0]-_[1])-1)
-            gc_setColor(1,1,1)
+            GC.setColor(1,1,1)
-            gc_draw(ms.isDown(1)and holdImg or normImg,x,y,nil,nil,nil,8,8)
+            GC.draw(love.mouse.isDown(1)and holdImg or normImg,x,y,nil,nil,nil,8,8)
         end
     end)
 end
@@ -241,7 +237,7 @@ if
         pcall(TABLE.cover, loadFile('conf/virtualkey','-json -canSkip')or loadFile('conf/virtualkey','-luaon -canSkip')or{},VK_ORG)
     )
 then
-    MES.new('error',"Be careful, an error accured when loading saving, some data was lost")
+    MES.new('error',"An error occured during loading, and some data was lost.")
 end
 
 --Initialize fields, sequence, missions, gameEnv for cutsom game
@@ -277,7 +273,6 @@ IMG.init{
     lifeIcon='media/image/mess/life.png',
     badgeIcon='media/image/mess/badge.png',
     ctrlSpeedLimit='media/image/mess/ctrlSpeedLimit.png',
-    speedLimit='media/image/mess/speedLimit.png',--Not used, for future C2-mode
     pay1='media/image/mess/pay1.png',
     pay2='media/image/mess/pay2.png',