diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d53d538b..73a16089 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,7 +54,7 @@ jobs: 7z x .\resource_hacker.zip - name: Pack Techmino run: | - 7z a -tzip .\Techmino.love .\document .\media .\parts .\Zframework .\conf.lua .\font.ttf .\main.lua .\version.lua + 7z a -tzip .\Techmino.love .\document .\font .\media .\parts .\Zframework .\conf.lua .\main.lua .\version.lua cmd /c copy /b .\love-11.3-win64\love.exe + .\Techmino.love .\love-11.3-win64\Techmino.exe del .\love-11.3-win64\love.exe del .\love-11.3-win64\lovec.exe @@ -124,7 +124,7 @@ jobs: cp ./squashfs-root/icon.png ./squashfs-root/.DirIcon chmod 777 ./squashfs-root/love mkdir -p ./squashfs-root/usr/share/Techmino - mv ./document ./media ./parts ./Zframework ./conf.lua ./font.ttf ./main.lua ./version.lua ./squashfs-root/usr/share/Techmino + mv ./document ./font ./media ./parts ./Zframework ./conf.lua ./main.lua ./version.lua ./squashfs-root/usr/share/Techmino mv ./ColdClear/CCloader.so ./squashfs-root/usr/share/Techmino mv ./ColdClear/libcold_clear.so ./squashfs-root/usr/lib chmod 777 ./appimagetool-x86_64.AppImage @@ -198,7 +198,7 @@ jobs: mkdir -p ./libAndroid/armeabi-v7a mv ./ColdClear/android_aarch64/libs/arm64-v8a/libCCloader.so ./libAndroid/arm64-v8a mv ./ColdClear/android_armv7/libs/armeabi-v7a/libCCloader.so ./libAndroid/armeabi-v7a - 7z a -tzip ./love-android/app/src/main/assets/game.love ./document ./media ./parts ./Zframework ./libAndroid ./conf.lua ./font.ttf ./main.lua ./version.lua + 7z a -tzip ./love-android/app/src/main/assets/game.love ./document ./font ./media ./parts ./Zframework ./libAndroid ./conf.lua ./main.lua ./version.lua echo "${{ secrets.SIGNING_KEY }}" | base64 -d > ./love-android/app/android.keystore python3 ./.github/workflows/updateVersion.py -T AndroidSnapshot -C $(lua ./.github/workflows/getVersion.lua -code) -N ${{ env.Version }} -S ${{ secrets.KEY_STORE_PASSWORD }} -A ${{ secrets.ALIAS }} -K ${{ secrets.KEY_PASSWORD }} chmod 777 ./love-android/gradlew @@ -238,7 +238,7 @@ jobs: python3 ./.github/workflows/updateVersion.py -T Version -H ${{ env.CommitID }} - name: Pack love run: | - 7z a -tzip ./Techmino.love ./document ./media ./parts ./Zframework ./conf.lua ./font.ttf ./main.lua ./version.lua + 7z a -tzip ./Techmino.love ./document ./font ./media ./parts ./Zframework ./conf.lua ./main.lua ./version.lua - name: Download template run: | curl -OL https://github.com/26F-Studio/Techmino/releases/download/v0.15.1/Techmino.app.zip diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 519fa700..dd36b127 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -50,7 +50,7 @@ jobs: 7z x .\resource_hacker.zip - name: Pack Techmino run: | - 7z a -tzip .\Techmino.love .\document .\media .\parts .\Zframework .\conf.lua .\font.ttf .\main.lua .\version.lua + 7z a -tzip .\Techmino.love .\document .\font .\media .\parts .\Zframework .\conf.lua .\main.lua .\version.lua cmd /c copy /b .\love-11.3-win64\love.exe + .\Techmino.love .\love-11.3-win64\Techmino.exe del .\love-11.3-win64\love.exe del .\love-11.3-win64\lovec.exe @@ -116,7 +116,7 @@ jobs: 7z x .\resource_hacker.zip - name: Pack Techmino run: | - 7z a -tzip .\Techmino.love .\document .\media .\parts .\Zframework .\conf.lua .\font.ttf .\main.lua .\version.lua + 7z a -tzip .\Techmino.love .\document .\font .\media .\parts .\Zframework .\conf.lua .\main.lua .\version.lua cmd /c copy /b .\love-11.3-win32\love.exe + .\Techmino.love .\love-11.3-win32\Techmino.exe del .\love-11.3-win32\love.exe del .\love-11.3-win32\lovec.exe @@ -184,7 +184,7 @@ jobs: cp ./squashfs-root/icon.png ./squashfs-root/.DirIcon chmod 777 ./squashfs-root/love mkdir -p ./squashfs-root/usr/share/Techmino - mv ./document ./media ./parts ./Zframework ./conf.lua ./font.ttf ./main.lua ./version.lua ./squashfs-root/usr/share/Techmino + mv ./document ./font ./media ./parts ./Zframework ./conf.lua ./main.lua ./version.lua ./squashfs-root/usr/share/Techmino mv ./ColdClear/CCloader.so ./squashfs-root/usr/share/Techmino mv ./ColdClear/libcold_clear.so ./squashfs-root/usr/lib chmod 777 ./appimagetool-x86_64.AppImage @@ -255,7 +255,7 @@ jobs: mkdir -p ./libAndroid/armeabi-v7a mv ./ColdClear/android_aarch64/libs/arm64-v8a/libCCloader.so ./libAndroid/arm64-v8a mv ./ColdClear/android_armv7/libs/armeabi-v7a/libCCloader.so ./libAndroid/armeabi-v7a - 7z a -tzip ./love-android/app/src/main/assets/game.love ./document ./media ./parts ./Zframework ./libAndroid ./conf.lua ./font.ttf ./main.lua ./version.lua + 7z a -tzip ./love-android/app/src/main/assets/game.love ./document ./font ./media ./parts ./Zframework ./libAndroid ./conf.lua ./main.lua ./version.lua echo "${{ secrets.SIGNING_KEY }}" | base64 -d > ./love-android/app/android.keystore python3 ./.github/workflows/updateVersion.py -T AndroidRelease -C $(lua ./.github/workflows/getVersion.lua -code) -N $(lua ./.github/workflows/getVersion.lua -name) -S ${{ secrets.KEY_STORE_PASSWORD }} -A ${{ secrets.ALIAS }} -K ${{ secrets.KEY_PASSWORD }} chmod 777 ./love-android/gradlew @@ -329,7 +329,7 @@ jobs: mv ./ColdClear/android_aarch64/libs/arm64-v8a/libCCloader.so ./libAndroid/arm64-v8a mv ./ColdClear/android_armv7/libs/armeabi-v7a/libCCloader.so ./libAndroid/armeabi-v7a rm -rf ./media/BGM ./media/SFX ./media/VOICE - 7z a -tzip ./love-android/app/src/main/assets/game.love ./document ./media ./parts ./Zframework ./libAndroid ./conf.lua ./font.ttf ./main.lua ./version.lua + 7z a -tzip ./love-android/app/src/main/assets/game.love ./document ./font ./media ./parts ./Zframework ./libAndroid ./conf.lua ./main.lua ./version.lua echo "${{ secrets.SIGNING_KEY }}" | base64 -d > ./love-android/app/android.keystore python3 ./.github/workflows/updateVersion.py -T AndroidRelease -C $(lua ./.github/workflows/getVersion.lua -code) -N $(lua ./.github/workflows/getVersion.lua -name) -S ${{ secrets.KEY_STORE_PASSWORD }} -A ${{ secrets.ALIAS }} -K ${{ secrets.KEY_PASSWORD }} chmod 777 ./love-android/gradlew @@ -366,7 +366,7 @@ jobs: echo "Title=${Title}" >> $GITHUB_ENV - name: Pack love run: | - 7z a -tzip ./Techmino.love ./document ./media ./parts ./Zframework ./conf.lua ./font.ttf ./main.lua ./version.lua + 7z a -tzip ./Techmino.love ./document ./font ./media ./parts ./Zframework ./conf.lua ./main.lua ./version.lua - name: Download template run: | curl -OL https://github.com/26F-Studio/Techmino/releases/download/v0.15.1/Techmino.app.zip @@ -430,7 +430,7 @@ jobs: echo "Title=${Title}" >> $GITHUB_ENV - name: Pack Techmino run: | - 7z a -tzip ./Techmino.a${{ env.Version }}.love ./document ./media ./parts ./Zframework ./conf.lua ./font.ttf ./main.lua ./version.lua + 7z a -tzip ./Techmino.a${{ env.Version }}.love ./document ./font ./media ./parts ./Zframework ./conf.lua ./main.lua ./version.lua - name: Release uses: softprops/action-gh-release@v1 with: diff --git a/Zframework/setFont.lua b/Zframework/setFont.lua index 8f78a61c..84eb7200 100644 --- a/Zframework/setFont.lua +++ b/Zframework/setFont.lua @@ -3,11 +3,11 @@ local newFont=gc.setNewFont local setNewFont=gc.setFont local fontCache,currentFontSize={} if - love.filesystem.getInfo('barlowCond.ttf')and - love.filesystem.getInfo('puhui.ttf') + love.filesystem.getInfo('font/barlowCond.ttf')and + love.filesystem.getInfo('font/puhui.ttf') then - local fontData=love.filesystem.newFile('barlowCond.ttf') - local fallback=love.filesystem.newFile('puhui.ttf') + local fontData=love.filesystem.newFile('font/barlowCond.ttf') + local fallback=love.filesystem.newFile('font/puhui.ttf') function setFont(s) if s~=currentFontSize then if not fontCache[s]then diff --git a/barlowCond.ttf b/font/barlowCond.ttf similarity index 100% rename from barlowCond.ttf rename to font/barlowCond.ttf diff --git a/puhui.ttf b/font/puhui.ttf similarity index 100% rename from puhui.ttf rename to font/puhui.ttf